diff --git a/mkxp.conf.sample b/mkxp.conf.sample index c5aa528..450265f 100644 --- a/mkxp.conf.sample +++ b/mkxp.conf.sample @@ -25,12 +25,6 @@ # printFPS=false -# Game window is resizable -# (default: enabled) -# -# winResizable=true - - # Start game in fullscreen (this can # always be toggled with Alt-Enter at runtime) # (default: disabled) @@ -127,31 +121,12 @@ # anyAltToggleFS=false -# Enable F12 game reset -# (default: disabled) -# -# enableReset=false - - # Allow symlinks for game assets to be followed # (default: disabled) # # allowSymlinks=false -# Organisation / company and application / game -# name to build the directory path where mkxp -# will store game specific data (eg. key bindings). -# If not specified, mkxp will save to a common -# directory shared by all games. Note that these -# are TWO individual config entries, and both need -# to be defined for this to take effect. -# (default: none) -# -# dataPathOrg=mycompany -# dataPathApp=mygame - - # Set the game window icon to 'path/to/icon.png' # (default: none) # diff --git a/src/config.cpp b/src/config.cpp index 02424ab..f98663e 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -153,8 +153,6 @@ void Config::read(int argc, char *argv[]) PO_DESC(gameFolder, std::string, ".") \ PO_DESC(anyAltToggleFS, bool, false) \ PO_DESC(allowSymlinks, bool, false) \ - PO_DESC(dataPathOrg, std::string, "") \ - PO_DESC(dataPathApp, std::string, "") \ PO_DESC(iconPath, std::string, "") \ PO_DESC(execName, std::string, "Game") \ PO_DESC(midi.soundFont, std::string, "") \ @@ -227,9 +225,6 @@ void Config::read(int argc, char *argv[]) SE.sourceCount = clamp(SE.sourceCount, 1, 64); - if (!dataPathOrg.empty() && !dataPathApp.empty()) - customDataPath = prefPath(dataPathOrg.c_str(), dataPathApp.c_str()); - commonDataPath = prefPath(".", "Oneshot"); //Hardcode some ini/version settings diff --git a/src/config.h b/src/config.h index 7d571f3..391b896 100644 --- a/src/config.h +++ b/src/config.h @@ -53,9 +53,6 @@ struct Config bool allowSymlinks; bool pathCache; - std::string dataPathOrg; - std::string dataPathApp; - std::string iconPath; std::string execName;