Load defaults.bin instead of settings-default.cfg. Do not decode yet.

apps/launcher/maindialog.cpp

@@ -424,11 +424,11 @@ bool Launcher::MainDialog::setupGraphicsSettings()
     mEngineSettings.clear();
 
     // Create the settings manager and load default settings file
-    const std::string localDefault = (mCfgMgr.getLocalPath() / "settings-default.cfg").string();
+    const std::string localDefault = (mCfgMgr.getLocalPath() / "defaults.bin").string();
-    const std::string globalDefault = (mCfgMgr.getGlobalPath() / "settings-default.cfg").string();
+    const std::string globalDefault = (mCfgMgr.getGlobalPath() / "defaults.bin").string();
     std::string defaultPath;
 
-    // Prefer the settings-default.cfg in the current directory.
+    // Prefer the defaults.bin in the current directory.
     if (boost::filesystem::exists(localDefault))
         defaultPath = localDefault;
     else if (boost::filesystem::exists(globalDefault))

apps/openmw/engine.cpp

@@ -478,8 +478,8 @@ void OMW::Engine::setSkipMenu (bool skipMenu, bool newGame)
 std::string OMW::Engine::loadSettings (Settings::Manager & settings)
 {
     // Create the settings manager and load default settings file
-    const std::string localdefault = (mCfgMgr.getLocalPath() / "settings-default.cfg").string();
+    const std::string localdefault = (mCfgMgr.getLocalPath() / "defaults.bin").string();
-    const std::string globaldefault = (mCfgMgr.getGlobalPath() / "settings-default.cfg").string();
+    const std::string globaldefault = (mCfgMgr.getGlobalPath() / "defaults.bin").string();
 
     // prefer local
     if (boost::filesystem::exists(localdefault))

components/settings/parser.cpp

@@ -7,7 +7,7 @@
 
 #include <boost/filesystem/fstream.hpp>
 
-void Settings::SettingsFileParser::loadSettingsFile(const std::string& file, CategorySettingValueMap& settings)
+void Settings::SettingsFileParser::loadSettingsFile(const std::string& file, CategorySettingValueMap& settings, bool base64Encoded)
 {
     mFile = file;
     boost::filesystem::ifstream stream;

components/settings/parser.hpp

@@ -10,7 +10,7 @@ namespace Settings
     class SettingsFileParser
     {
     public:
-        void loadSettingsFile(const std::string& file, CategorySettingValueMap& settings);
+        void loadSettingsFile(const std::string& file, CategorySettingValueMap& settings, bool base64encoded = false);
 
         void saveSettingsFile(const std::string& file, const CategorySettingValueMap& settings);
 

components/settings/settings.cpp

@@ -22,7 +22,7 @@ void Manager::clear()
 void Manager::loadDefault(const std::string &file)
 {
     SettingsFileParser parser;
-    parser.loadSettingsFile(file, mDefaultSettings);
+    parser.loadSettingsFile(file, mDefaultSettings, true);
 }
 
 void Manager::loadUser(const std::string &file)