Fix issues with ready status

- Auto-ready does not apply while last map change is invalid - Fix launch button text for ready/not ready being shown wrong way around (e.g ready when not ready)
CnCNet · Jan 3, 2025 · a0f2d15 · a0f2d15
1 parent bdbd6a6
commit a0f2d15
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/DXMainClient/DXGUI/Multiplayer/GameLobby/CnCNetGameLobby.cs b/DXMainClient/DXGUI/Multiplayer/GameLobby/CnCNetGameLobby.cs
@@ -833,7 +833,7 @@ protected override void BroadcastPlayerOptions()
                 sb.Append(";");
                 if (!pInfo.IsAI)
                 {
-                    if (pInfo.AutoReady && !pInfo.IsInGame)
+                    if (pInfo.AutoReady && !pInfo.IsInGame && !LastMapChangeWasInvalid)
                         sb.Append(2);
                     else
                         sb.Append(Convert.ToInt32(pInfo.Ready));
@@ -951,7 +951,7 @@ private void ApplyPlayerOptions(string sender, string message)
                     pInfo.AutoReady = readyStatus > 1;
 
                     if (pInfo.Name == ProgramConstants.PLAYERNAME)
-                        btnLaunchGame.Text = pInfo.Ready ? BTN_LAUNCH_NOT_READY : BTN_LAUNCH_READY;
+                        btnLaunchGame.Text = pInfo.Ready ? BTN_LAUNCH_READY : BTN_LAUNCH_NOT_READY;
 
                     Players.Add(pInfo);
                     i += HUMAN_PLAYER_OPTIONS_LENGTH;

diff --git a/DXMainClient/DXGUI/Multiplayer/GameLobby/LANGameLobby.cs b/DXMainClient/DXGUI/Multiplayer/GameLobby/LANGameLobby.cs
@@ -497,7 +497,7 @@ protected override void BroadcastPlayerOptions()
                 sb.Append(pInfo.ColorId);
                 sb.Append(pInfo.StartingLocation);
                 sb.Append(pInfo.TeamId);
-                if (pInfo.AutoReady && !pInfo.IsInGame)
+                if (pInfo.AutoReady && !pInfo.IsInGame && !LastMapChangeWasInvalid)
                     sb.Append(2);
                 else
                     sb.Append(Convert.ToInt32(pInfo.IsAI || pInfo.Ready));

diff --git a/DXMainClient/DXGUI/Multiplayer/GameLobby/MultiplayerGameLobby.cs b/DXMainClient/DXGUI/Multiplayer/GameLobby/MultiplayerGameLobby.cs
@@ -108,7 +108,7 @@ protected bool Locked
 
         private bool gameSaved = false;
 
-        private bool lastMapChangeWasInvalid = false;
+        protected bool LastMapChangeWasInvalid { get; set; } = false;
 
         /// <summary>
         /// Allows derived classes to add their own chat box commands.
@@ -1108,10 +1108,10 @@ protected override void ChangeMap(GameModeMap gameModeMap)
 
             ClearReadyStatuses(resetAutoReady);
 
-            if ((lastMapChangeWasInvalid || resetAutoReady) && chkAutoReady.Checked)
+            if ((LastMapChangeWasInvalid || resetAutoReady) && chkAutoReady.Checked)
                 RequestReadyStatus();
 
-            lastMapChangeWasInvalid = resetAutoReady;
+            LastMapChangeWasInvalid = resetAutoReady;
 
             //if (IsHost)
             //    OnGameOptionChanged();