Merge pull request OpenXcom#540 from cfailde/options

Load options.cfg with -user parameter

Author: SupSuper

src/Engine/Options.cpp

@@ -269,45 +269,41 @@ void loadArgs(int argc, char** args)
 			std::transform(argname.begin(), argname.end(), argname.begin(), ::tolower);
 			if (argc > i + 1)
 			{
-                if (argname == "data")
+				if (argname == "data")
 				{
 					_dataFolder = CrossPlatform::endPath(args[i+1]);
 				}
 				else if (argname == "user")
 				{
 					_userFolder = CrossPlatform::endPath(args[i+1]);
 				}
-				else
-				{
-                    // case insensitive lookup of the argument
-                    bool found = false;
-                    for(std::map<std::string, std::string>::iterator it = _options.begin(); it != _options.end(); ++it)
-                    {
-                        std::string option = it->first;
-                        std::transform(option.begin(), option.end(), option.begin(), ::tolower);
-                        if (option == argname)
-                        {
-                            //save this command line option for now, we will apply it later
-                            _commandLineOptions[it->first]= args[i+1];
-                            found = true;
-                            break;
-                        }
-                    }
-                    if(!found)
-                    {
-                        Log(LOG_WARNING) << "Unknown option: " << argname;
-                    }
-                }
-			}
-			else
-			{
-				Log(LOG_WARNING) << "Unknown option: " << argname;
-			}
-		}
-	}
-	if (_userFolder != "")
-	{
-		load();
+				else
+				{
+					// case insensitive lookup of the argument
+					bool found = false;
+					for(std::map<std::string, std::string>::iterator it = _options.begin(); it != _options.end(); ++it)
+					{
+ 						std::string option = it->first;
+						std::transform(option.begin(), option.end(), option.begin(), ::tolower);
+						if (option == argname)
+						{
+							//save this command line option for now, we will apply it later
+							_commandLineOptions[it->first]= args[i+1];
+							found = true;
+							break;
+						}
+					}
+					if(!found)
+					{
+						Log(LOG_WARNING) << "Unknown option: " << argname;
+					}
+				}
+			}
+			else
+			{
+				Log(LOG_WARNING) << "Unknown option: " << argname;
+			}
+		}
 	}
 }
 
@@ -363,14 +359,9 @@ bool init(int argc, char** args)
 	if (showHelp(argc, args))
 		return false;
 	createDefault();
-	loadArgs(argc, args);
-	if (_dataFolder == "")
-	{
-		_dataList = CrossPlatform::findDataFolders();
-		// Missing data folder is handled in StartState
-	}
-	if (_userFolder == "")
-		setUserFolder();
+	loadArgs(argc, args);
+	setFolders();
+	updateOptions();
 
 	std::string s = getUserFolder();
 	s += "openxcom.log";
@@ -393,15 +384,88 @@ bool init(int argc, char** args)
 	Log(LOG_INFO) << "User folder is: " << _userFolder;
 	Log(LOG_INFO) << "Config folder is: " << _configFolder;
 	Log(LOG_INFO) << "Options loaded successfully.";
+	return true;
+}
+
+/**
+ * Sets up the game's Data folder where the data files
+ * are loaded from and the User folder and Config
+ * folder where settings and saves are stored in.
+ */
+void setFolders()
+{
+    if (_dataFolder == "")
+    {
+        _dataList = CrossPlatform::findDataFolders();
+        // Missing data folder is handled in StartState
+    }
+    if (_userFolder == "")
+    {
+        std::vector<std::string> user = CrossPlatform::findUserFolders();
+        _configFolder = CrossPlatform::findConfigFolder();
+
+		// Look for an existing user folder
+        for (std::vector<std::string>::iterator i = user.begin(); i != user.end(); ++i)
+		{
+			if (CrossPlatform::folderExists(*i))
+			{
+				_userFolder = *i;
+				break;
+			}
+		}
+
+		// Set up folders
+		if (_userFolder == "")
+		{
+			for (std::vector<std::string>::iterator i = user.begin(); i != user.end(); ++i)
+			{
+				if (CrossPlatform::createFolder(*i))
+				{
+					_userFolder = *i;
+					break;
+				}
+			}
+		}
+	}
+
+	if (_configFolder == "")
+	{
+		_configFolder = _userFolder;
+	}
+}
+
+/**
+ * Updates the game's options with those in the configuation
+ * file, if it exists yet, and any supplied on the command line.
+ */
+void updateOptions()
+{
+	// Load existing options
+	if (CrossPlatform::folderExists(_configFolder))
+	{
+		try
+		{
+			load();
+		}
+		catch (YAML::Exception &e)
+		{
+			Log(LOG_ERROR) << e.what();
+		}
+	}
+	// Create config folder and save options
+	else
+	{
+		CrossPlatform::createFolder(_configFolder);
+		save();
+	}
 
     // now apply options set on the command line, overriding defaults and those loaded from config file
     for(std::map<std::string, std::string>::const_iterator it = _commandLineOptions.begin(); it != _commandLineOptions.end(); ++it)
     {
         _options[it->first] = it->second;
     }
-	return true;
 }
-
+
 /**
  * Loads options from a YAML file.
  * @param filename YAML filename.
@@ -509,62 +573,6 @@ std::string getUserFolder()
 	return _userFolder;
 }
 
-/**
- * Sets up the game's User folder where settings
- * and saves are stored in.
- */
-void setUserFolder()
-{
-    std::vector<std::string> user = CrossPlatform::findUserFolders();
-    _configFolder = CrossPlatform::findConfigFolder();
-
-    // Look for an existing user folder
-    for (std::vector<std::string>::iterator i = user.begin(); i != user.end(); ++i)
-    {
-        if (CrossPlatform::folderExists(*i))
-        {
-            _userFolder = *i;
-            break;
-        }
-    }
-
-    // Set up folders
-    if (_userFolder == "")
-    {
-        for (std::vector<std::string>::iterator i = user.begin(); i != user.end(); ++i)
-        {
-            if (CrossPlatform::createFolder(*i))
-            {
-                _userFolder = *i;
-                break;
-            }
-        }
-    }
-    if (_configFolder == "")
-    {
-        _configFolder = _userFolder;
-    }
-
-    // Load existing options
-    if (CrossPlatform::folderExists(_configFolder))
-    {
-        try
-        {
-            load();
-        }
-        catch (YAML::Exception &e)
-        {
-            Log(LOG_ERROR) << e.what();
-        }
-    }
-    // Create config folder and save options
-    else
-    {
-        CrossPlatform::createFolder(_configFolder);
-        save();
-    }
-}
-
 /**
  * Returns an option in string format.
  * @param id Option ID.

src/Engine/Options.h

@@ -57,8 +57,10 @@ namespace Options
 	std::vector<std::string> *getDataList();
 	/// Gets the game's user folder.
 	std::string getUserFolder();
-	/// Sets the game's user folder.
-	void setUserFolder();
+	/// Sets the game's data, user and config folders.
+	void setFolders();
+	/// Update game options from config file and command line.
+	void updateOptions();
 	/// Gets a string option.
 	std::string getString(const std::string& id);
 	/// Gets an integer option.