From 722ff2a26dcd9b3e51e75b099a7e3b5a74a0e5b2 Mon Sep 17 00:00:00 2001 From: x64-dev <202863051+x64-dev@users.noreply.github.com> Date: Thu, 4 Sep 2025 20:30:25 -0400 Subject: [PATCH 1/3] Tweaks to camera vals --- .../Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h | 4 ++-- .../GameNetwork/GeneralsOnline/GeneralsOnline_Settings.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h index 5ec6d73ef05..e528f2505f2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h @@ -46,8 +46,8 @@ //#define GENERALS_ONLINE_RUN_FAST 1 -#define GENERALS_ONLINE_DEFAULT_LOBBY_CAMERA_ZOOM 450 -#define GENERALS_ONLINE_MIN_LOBBY_CAMERA_ZOOM 400 +#define GENERALS_ONLINE_DEFAULT_LOBBY_CAMERA_ZOOM 310 +#define GENERALS_ONLINE_MIN_LOBBY_CAMERA_ZOOM 210 #define GENERALS_ONLINE_MAX_LOBBY_CAMERA_ZOOM 1000 //#define GENERALS_ONLINE_HIGH_FPS_SERVER 1 diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/GeneralsOnline_Settings.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/GeneralsOnline_Settings.cpp index 71c48f74129..f9f2e95e5cd 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/GeneralsOnline_Settings.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/GeneralsOnline_Settings.cpp @@ -6,7 +6,7 @@ #define SETTINGS_KEY_CAMERA "camera" #define SETTINGS_KEY_CAMERA_MIN_HEIGHT "min_height" #define SETTINGS_KEY_CAMERA_MOVE_SPEED_RATIO "move_speed_ratio" -#define SETTINGS_KEY_CAMERA_MAX_HEIGHT_WHEN_LOBBY_HOST "max_height_when_lobby_host" +#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" From a848e4dac83df6bf7bd07a0ea0f8821562176f4c Mon Sep 17 00:00:00 2001 From: x64-dev <202863051+x64-dev@users.noreply.github.com> Date: Thu, 4 Sep 2025 20:40:49 -0400 Subject: [PATCH 2/3] Fix bug with observer / civ in player list --- .../GameNetwork/GeneralsOnline/NextGenMP_defines.h | 2 +- .../GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h index e528f2505f2..a6c2cf0fd4c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h @@ -50,7 +50,7 @@ #define GENERALS_ONLINE_MIN_LOBBY_CAMERA_ZOOM 210 #define GENERALS_ONLINE_MAX_LOBBY_CAMERA_ZOOM 1000 -//#define GENERALS_ONLINE_HIGH_FPS_SERVER 1 +#define GENERALS_ONLINE_HIGH_FPS_SERVER 1 #if defined(GENERALS_ONLINE_HIGH_FPS_SERVER) #define GENERALS_ONLINE_CLIENT_ID "gen_online_60hz" diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp index 3b30a398c5f..3cbce41c775 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp @@ -377,10 +377,13 @@ static void playerTooltip(GameWindow *window, AsciiString sideName = "GUI:RandomSide"; if (mostGames > 0) { - const PlayerTemplate* fac = ThePlayerTemplateStore->getNthPlayerTemplate(favorite); - if (fac) + if (favorite > 1) // cant be civilian or observer { - sideName.format("SIDE:%s", fac->getSide().str()); + const PlayerTemplate* fac = ThePlayerTemplateStore->getNthPlayerTemplate(favorite); + if (fac) + { + sideName.format("SIDE:%s", fac->getSide().str()); + } } } AsciiString rankName; From 62bb16db8779402c3c006821406ce4a7596842dd Mon Sep 17 00:00:00 2001 From: x64-dev <202863051+x64-dev@users.noreply.github.com> Date: Thu, 4 Sep 2025 20:49:46 -0400 Subject: [PATCH 3/3] 30hz mainline branch --- .../Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h index a6c2cf0fd4c..e528f2505f2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h @@ -50,7 +50,7 @@ #define GENERALS_ONLINE_MIN_LOBBY_CAMERA_ZOOM 210 #define GENERALS_ONLINE_MAX_LOBBY_CAMERA_ZOOM 1000 -#define GENERALS_ONLINE_HIGH_FPS_SERVER 1 +//#define GENERALS_ONLINE_HIGH_FPS_SERVER 1 #if defined(GENERALS_ONLINE_HIGH_FPS_SERVER) #define GENERALS_ONLINE_CLIENT_ID "gen_online_60hz"