Smashed bugs, upgraded config files

Solved issue #2 and confirmed solution for issue #4
Upgraded config file system to auto-upgrade.

Author: Drahsid

Config.h

@@ -21,67 +21,83 @@ inline bool stob(std::string&s)
 	return (s == "1" || s == "on" || s == "true") || false;
 }
 
-struct UserConfig {
-	double requestedMinFrameTime = 0;
-	double requestedMinFrameTimeMenus = (double)1LL / (double)60LL;
-	double requestedMinFrameTimeNoFocus = (double)1LL / (double)24LL;
-	double mainThreadUpdateCoef = 2;
-	float fov = 83;
+struct UserConfig 
+{
+	int version = -1;
+	double requestedMinFrameTime = 90;
+	double requestedMinFrameTimeMenus = 60;
+	double requestedMinFrameTimeMovies = 60;
+	double requestedMinFrameTimeNoFocus = 24;
+	double mainThreadUpdateCoef = 1;
+	float fov = 45;
 	float gamma = 45;
 	float igmState0Override = 1;
 	float igmState1Override = 2;
 	float igmState2Override = 4;
 	float lockedMouseMulti = 1;
 	bool bEnableFullSpeedMode = false;
-	bool bEnableAdaptiveIGM = false;
+	bool bEnableAdaptiveIGM = true;
 	bool bEnableAdaptiveMouse = true;
 	bool bEnableLockedMouseMulti = true;
 	bool bEnableTransitionSpeedRamp = true;
 };
 
 namespace Config {
+
+	int cVERSION = 1;
+
+	void newUserConfig(UserConfig&uConfig, std::fstream&config, const bool usePriorValues) 
+	{
+		config.open("fpsconfig.ini", std::fstream::trunc | std::fstream::out);
+		config.close();
+		config.open("fpsconfig.ini", std::fstream::in | std::fstream::out);
+
+		config
+			<< "#File version. Changing this will cause the config to update.\n"
+			<< "version=" << cVERSION << "\n\n"
+			<< "#In game frametime target. [Default: 60, Recommended: A limit that your PC can hit]\n"
+			<< "requestedMinFrameTime=" << (usePriorValues ? uConfig.requestedMinFrameTime : 90) << "\n\n"
+			<< "#Don't want superfast menus? [Default: 60, Recommended: Keep at 60]\n"
+			<< "requestedMinFrameTimeMenus=" << (usePriorValues ? uConfig.requestedMinFrameTimeMenus : 60) << "\n\n"
+			<< "#The frametime target when you are not tabbed into the game. [Default: 60, Recommended: <60]\n"
+			<< "requestedMinFrameTimeNoFocus=" << (usePriorValues ? uConfig.requestedMinFrameTimeNoFocus : 24) << "\n\n"
+			<< "#The frametime target when you are in a pre-rendered movie. [Default: 29.98, Reccomended: 29.98]\n"
+			<< "requestedMinFrameTimeMovie=" << (usePriorValues ? uConfig.requestedMinFrameTimeMovies : 60) << "\n\n"
+			<< "#The in-game field of view. [Default: 45, Recommended: User Preference]\n"
+			<< "Fov=" << (usePriorValues ? uConfig.fov : 45) << "\n\n"
+			<< "#The in game gamma (brightness). [Default: 45, Recommended: User Preference]\n"
+			<< "gamma=" << (usePriorValues ? uConfig.gamma : 45) << "\n\n"
+			<< "#How many times per frame should the main loop run? Raising this will increase the CPU usage of the program. If you're experiencing performance problems, consider lowering this.\n"
+			<< "#I suggest not going below one, because that will make the program much less accurate. 0 will crash the program. [Recommended: User Preference]\n"
+			<< "mainThreadUpdateCoef=" << (usePriorValues ? uConfig.mainThreadUpdateCoef : 1) << "\n\n"
+			<< "#IGMState overrides change the base multiplier for each state. [Default: 0=1, 1=2, 2=4, Recommended: User Preference]\n"
+			<< "igmState0Override=" << (usePriorValues ? uConfig.igmState0Override : 1) << "\n"
+			<< "igmState1Override=" << (usePriorValues ? uConfig.igmState1Override : 2) << "\n"
+			<< "igmState2Override=" << (usePriorValues ? uConfig.igmState2Override : 4) << "\n\n"
+			<< "#This works in conjunction with bEnableLockedMouseMulti and bEnableAdaptiveMouse. At least one of them must be enabled for this to be used. [Recommended: User Preference]\n"
+			<< "lockedMouseMulti=" << (usePriorValues ? uConfig.lockedMouseMulti : 1) << "\n\n"
+			<< "#If you want to completely disable the speed limiter, enable this. Might have some bad side effects. Setting the minimum frametime to 0 has the same effect, but is theoretically safer. [Recommended: keep off]\n"
+			<< "bEnableFullSpeedMode=" << (usePriorValues ? uConfig.bEnableFullSpeedMode : false) << "\n\n"
+			<< "#If your in game animations are running at an incorrect speed, enabling this option may help. [Recommended: keep on]\n"
+			<< "bEnableAdaptiveIGM=" << (usePriorValues ? uConfig.bEnableAdaptiveIGM : true) << "\n\n"
+			<< "#If you like the game's default sensitivity scaling, disable this. Enables my relative mouse speed algorithm. [Recommended: User Preference]\n"
+			<< "bEnableAdaptiveMouse=" << (usePriorValues ? uConfig.bEnableAdaptiveMouse : true) << "\n\n"
+			<< "#Enabling this will disable the in game mouse sensitivity controller, and lock the relative sensitivity to a desired variable. [Recommended: User Preference]\n"
+			<< "bEnableLockedMouseMulti=" << (usePriorValues ? uConfig.bEnableLockedMouseMulti : true) << "\n\n"
+			<< "#This attempts to fix the slowdowns that happen when changing scenes and entering/exiting some menus. Not perfect. [Recommended: keep on]\n"
+			<< "bEnableTransitionSpeedRamp=" << (usePriorValues ? uConfig.bEnableTransitionSpeedRamp : true) << "\n\n";
+
+		config.close();
+	}
+
 	void UpdateUserConfig(UserConfig&uConfig)
 	{
 		std::fstream config;
 		config.open("fpsconfig.ini", std::fstream::in | std::fstream::out);
 		if (!config)
 		{
 			std::cout << "Config file not found! Writing a new one...\n\n";
-			config.open("fpsconfig.ini", std::fstream::trunc | std::fstream::out);
-			config.close();
-			config.open("fpsconfig.ini", std::fstream::in | std::fstream::out);
-
-			config << "#In game frametime target. [Default: 60, Recommended: A limit that your PC can hit]\n"
-				<< "requestedMinFrameTime=90\n\n"
-				<< "#Don't want superfast menus? [Default: 60, Recommended: Keep at 60]\n"
-				<< "requestedMinFrameTimeMenus=60\n\n"
-				<< "#The frametime target when you are not tabbed into the game.[Default: 60, Recommended: <60]\n"
-				<< "requestedMinFrameTimeNoFocus=24\n\n"
-				<< "#The in-game field of view. [Default: 45, Recommended: User Preference]\n"
-				<< "Fov=45\n\n"
-				<< "#The in game gamma (brightness). [Default: 45, Recommended: User Preference]\n"
-				<< "gamma=45\n\n"
-				<< "#How many times per frame should the main loop run? Raising this will increase the CPU usage of the program. If you're experiencing performance problems, consider lowering this.\n"
-				<< "#I suggest not going below one, because that will make the program much less accurate. 0 will crash the program. [Recommended: User Preference]\n"
-				<< "mainThreadUpdateCoef=2\n\n"
-				<< "#IGMState overrides change the base multiplier for each state. [Default: 0=1, 1=2, 2=4, Recommended: User Preference]\n"
-				<< "igmState0Override=1\n"
-				<< "igmState1Override=2\n"
-				<< "igmState2Override=4\n\n"
-				<< "#This works in conjunction with bEnableLockedMouseMulti and bEnableAdaptiveMouse. At least one of them must be enabled for this to be used. [Recommended: User Preference]\n"
-				<< "lockedMouseMulti=1\n\n"
-				<< "#If you want to completely disable the speed limiter, enable this. Might have some bad side effects. Setting the minimum frametime to 0 has the same effect, but is theoretically safer. [Recommended: keep off]\n"
-				<< "bEnableFullSpeedMode=false\n\n"
-				<< "#If your in game animations are running at an incorrect speed, enabling this option may help. [Recommended: keep on]\n"
-				<< "bEnableAdaptiveIGM=true\n\n"
-				<< "#If you like the game's default sensitivity scaling, disable this. Enables my relative mouse speed algorithm. [Recommended: User Preference]\n"
-				<< "bEnableAdaptiveMouse=true\n\n"
-				<< "#Enabling this will disable the in game mouse sensitivity controller, and lock the relative sensitivity to a desired variable. [Recommended: User Preference]\n"
-				<< "bEnableLockedMouseMulti=true\n\n"
-				<< "#This attempts to fix the slowdowns that happen when changing scenes and entering/exiting some menus. Not perfect. [Recommended: keep on]\n"
-				<< "bEnableTransitionSpeedRamp=true\n\n";
-
-			config.close();
+			newUserConfig(uConfig, config, false);
 		}
 		else
 		{
@@ -93,7 +109,12 @@ namespace Config {
 				{
 					refLine = inLine.substr(0, inLine.find("=") + 1);
 
-					if (refLine == "requestedMinFrameTime=")
+					if (refLine == "version=") 
+					{
+						std::string val = inLine.substr(inLine.find("=") + 1);
+						uConfig.version = std::stoi(val.c_str());
+					}
+					else if (refLine == "requestedMinFrameTime=")
 					{
 						std::string val = inLine.substr(inLine.find("=") + 1);
 						uConfig.requestedMinFrameTime = stod(val.c_str());
@@ -103,6 +124,11 @@ namespace Config {
 						std::string val = inLine.substr(inLine.find("=") + 1);
 						uConfig.requestedMinFrameTimeMenus = stod(val.c_str());
 					}
+					else if (refLine == "requestedMinFrameTimeMovies=")
+					{
+						std::string val = inLine.substr(inLine.find("=") + 1);
+						uConfig.requestedMinFrameTimeMovies = stod(val.c_str());
+					}
 					else if (refLine == "requestedMinFrameTimeNoFocus=")
 					{
 						std::string val = inLine.substr(inLine.find("=") + 1);
@@ -175,8 +201,11 @@ namespace Config {
 			}
 			config.close();
 
-			std::cout << "Loaded config \nrequestedMinFrameTime=" << uConfig.requestedMinFrameTime
+			std::cout << "Loaded config..."
+				<< "\nconfig version=" << uConfig.version << " cVersion=" << cVERSION
+				<< "\nrequestedMinFrameTime=" << uConfig.requestedMinFrameTime
 				<< "\nrequestedMinFrameTimeMenus=" << uConfig.requestedMinFrameTimeMenus
+				<< "\nrequestedMinFrameTimeMovies=" << uConfig.requestedMinFrameTimeMovies
 				<< "\nrequestedMinFrameTimeNoFocus=" << uConfig.requestedMinFrameTimeNoFocus
 				<< "\nmainThreadUpdateCoef=" << uConfig.mainThreadUpdateCoef
 				<< "\nfov=" << uConfig.fov
@@ -186,12 +215,18 @@ namespace Config {
 				<< "\nigmState2Override=" << uConfig.igmState2Override
 				<< "\nlockedMouseMulti=" << uConfig.lockedMouseMulti
 				<< "\nbEnableFullSpeedMode=" << uConfig.bEnableFullSpeedMode
-				<< "\nbEnableAdaptiveIGM=" << uConfig.bEnableAdaptiveIGM 
+				<< "\nbEnableAdaptiveIGM=" << uConfig.bEnableAdaptiveIGM
 				<< "\nbEnableAdaptiveMouse=" << uConfig.bEnableAdaptiveMouse
 				<< "\nbEnableLockedMouseMulti=" << uConfig.bEnableLockedMouseMulti
 				<< "\nbEnableTransitionSpeedRamp=" << uConfig.bEnableTransitionSpeedRamp
-				
 				<< std::endl << std::endl;
+
+			if (uConfig.version != cVERSION) 
+			{
+				std::cout << "Config out of date! Updating...\n";
+				newUserConfig(uConfig, config, true);
+			}
+
 		}
 	}
 }