Merge pull request OpenXcom#1018 from myk002/allow_config_param

allow -config as an alias to -cfg

Author: Warboy1982

README.md

@@ -87,6 +87,10 @@ passing a commandline argument when running OpenXcom.  For example:
 
     openxcom -data "$HOME/bin/OpenXcom/usr/share/openxcom"
 
+or, if you have a fully self-contained installation:
+
+    openxcom -data "$HOME/games/openxcom/data" -user "$HOME/games/openxcom/user" -config "$HOME/games/openxcom/config"
+
 ### Windows
 
 User and Config folder:

src/Engine/Options.cpp

@@ -369,7 +369,7 @@ void loadArgs(int argc, char *argv[])
 				{
 					_userFolder = CrossPlatform::endPath(argv[i]);
 				}
-				else if (argname == "cfg")
+				else if (argname == "cfg" || argname == "config")
 				{
 					_configFolder = CrossPlatform::endPath(argv[i]);
 				}
@@ -401,7 +401,7 @@ bool showHelp(int argc, char *argv[])
 	help << "        use PATH as the default Data Folder instead of auto-detecting" << std::endl << std::endl;
 	help << "-user PATH" << std::endl;
 	help << "        use PATH as the default User Folder instead of auto-detecting" << std::endl << std::endl;
-	help << "-cfg PATH" << std::endl;
+	help << "-cfg PATH  or  -config PATH" << std::endl;
 	help << "        use PATH as the default Config Folder instead of auto-detecting" << std::endl << std::endl;
 	help << "-KEY VALUE" << std::endl;
 	help << "        set option KEY to VALUE instead of default/loaded value (eg. -displayWidth 640)" << std::endl << std::endl;
@@ -798,9 +798,9 @@ void updateOptions()
 		save();
 	}
 
-    // now apply options set on the command line, overriding defaults and those loaded from config file
+	// now apply options set on the command line, overriding defaults and those loaded from config file
 	//if (!_commandLine.empty())
-    for (std::vector<OptionInfo>::iterator i = _info.begin(); i != _info.end(); ++i)
+	for (std::vector<OptionInfo>::iterator i = _info.begin(); i != _info.end(); ++i)
 	{
 		i->load(_commandLine);
 	}