Merge pull request #36 from GeneralsOnlineDevelopmentTeam/main

main -> 60hz

Author: x64-dev

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

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;

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"