settings cleanup to match changes made by SH

Author: x64-dev

GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/GeneralsOnline_Settings.h

@@ -11,8 +11,6 @@ class GenOnlineSettings
 
 	float DetermineCameraMaxHeight();
 
-	bool Input_LockCursorToGameWindow() const { return m_Input_LockCursorToGameWindow; }
-
 	void Save_Camera_MaxHeight_WhenLobbyHost(float maxHeight)
 	{
 		if (maxHeight >= GENERALS_ONLINE_MIN_LOBBY_CAMERA_ZOOM || maxHeight <= GENERALS_ONLINE_MAX_LOBBY_CAMERA_ZOOM)
@@ -50,8 +48,6 @@ class GenOnlineSettings
 
 	float m_Camera_MaxHeight_LobbyHost = GENERALS_ONLINE_DEFAULT_LOBBY_CAMERA_ZOOM;
 
-	bool m_Input_LockCursorToGameWindow = true;
-
 	bool m_bInitialized = false;
 
 	bool m_bVerbose = false;
@@ -60,4 +56,4 @@ class GenOnlineSettings
 	bool m_Render_LimitFramerate = true;
 	int m_Render_FramerateLimit_FPSVal = 60;
 	int m_Chat_LifeSeconds = 30;
-};
+};

GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/GeneralsOnline_Settings.cpp

@@ -8,9 +8,6 @@
 #define SETTINGS_KEY_CAMERA_MOVE_SPEED_RATIO "move_speed_ratio"
 #define SETTINGS_KEY_CAMERA_MAX_HEIGHT_WHEN_LOBBY_HOST "max_height_only_when_lobby_host"
 
-#define SETTINGS_KEY_INPUT "input"
-#define SETTINGS_KEY_INPUT_LOCK_CURSOR_TO_GAME_WINDOW "lock_cursor_to_game_window"
-
 #define SETTINGS_KEY_RENDER "render"
 #define SETTINGS_KEY_RENDER_LIMIT_FRAMERATE "limit_framerate"
 #define SETTINGS_KEY_RENDER_FRAMERATE_LIMIT_FPS_VAL "fps_limit"
@@ -126,16 +123,6 @@ void GenOnlineSettings::Load(void)
 				}
 			}
 
-			if (jsonSettings.contains(SETTINGS_KEY_INPUT))
-			{
-				auto inputSettings = jsonSettings[SETTINGS_KEY_INPUT];
-
-				if (inputSettings.contains(SETTINGS_KEY_INPUT_LOCK_CURSOR_TO_GAME_WINDOW))
-				{
-					m_Input_LockCursorToGameWindow = inputSettings[SETTINGS_KEY_INPUT_LOCK_CURSOR_TO_GAME_WINDOW];
-				}
-			}
-
 			if (jsonSettings.contains(SETTINGS_KEY_RENDER))
 			{
 				auto renderSettings = jsonSettings[SETTINGS_KEY_RENDER];
@@ -188,7 +175,6 @@ void GenOnlineSettings::Load(void)
 	{
 		m_Camera_MinHeight = m_Camera_MinHeight_default;
 		m_Camera_MaxHeight_LobbyHost = m_Camera_MaxHeight_LobbyHost;
-		m_Input_LockCursorToGameWindow = true;
 		m_bVerbose = false;
 		m_Render_LimitFramerate = true;
 		m_Render_FramerateLimit_FPSVal = 60;
@@ -217,13 +203,6 @@ void GenOnlineSettings::Save()
 				}
 		  },
 
-			{
-				SETTINGS_KEY_INPUT,
-					{
-						{SETTINGS_KEY_INPUT_LOCK_CURSOR_TO_GAME_WINDOW, m_Input_LockCursorToGameWindow}
-					}
-			},
-
 		{
 			SETTINGS_KEY_RENDER,
 				{
@@ -257,4 +236,4 @@ void GenOnlineSettings::Save()
 		fwrite(strData.data(), 1, strData.size(), file);
 		fclose(file);
 	}
-}
+}