Follow-up fix: check for end-of-game when leaving edit mode.

cosinekitty · cosinekitty · commit 6dd9b07110ac · 2023-06-23T21:53:07.000-04:00
If the user edits the board into a state where the game
has ended, we suppress reporting end of game until the
user leaves edit mode. At that point, check for checkmate
or draw that should result in the game being terminated.

The previous commit left the UI in a state where a player
could be checkmated, but we would still ask them to make
a move when no legal moves existed.

Now we will immediately report that the game is over
as soon as the user leaves edit mode.
diff --git a/src/uiwin32.cpp b/src/uiwin32.cpp
@@ -31,6 +31,7 @@ bool Global_SpeakMovesFlag = true;
 bool Global_EnableMateAnnounce = true;
 extern bool Global_EnableOppTime;
 extern int Global_AnalysisType;
+extern bool Global_LeftEditMode;
 
 const uintptr_t INVALID_THREAD = static_cast<uintptr_t>(-1L);
 
@@ -953,6 +954,17 @@ bool ProcessChessCommands ( ChessBoard &board, int &source, int &dest )
             MessageBox ( HwndMain, msg, "File Open Error", MB_OK | MB_ICONERROR );
         }
     }
+    else if (Global_LeftEditMode)
+    {
+        // The user just exited edit mode.
+        Global_LeftEditMode = false;
+        // We need to make a NULL move so that legal move list gets regenerated,
+        // *and* the correct player will move,
+        // *and* we will detect end-of-game properly.
+        source = 0;
+        dest = SPECIAL_MOVE_NULL;
+        itIsTimeToCruise = true;
+    }
 
     return itIsTimeToCruise;
 }
diff --git a/src/wingui.cpp b/src/wingui.cpp
@@ -32,6 +32,7 @@ bool Global_GameSaveFlag     = false;
 bool Global_HaveFilename     = false;
 bool Global_GameModifiedFlag = false;
 bool Global_TacticalBenchmarkFlag = false;
+bool Global_LeftEditMode     = false;
 bool Global_GameOverFlag     = true;   // It's over before it begins!
 bool Global_UndoMoveFlag     = false;
 bool Global_RedoMoveFlag     = false;
@@ -2619,6 +2620,12 @@ LRESULT CALLBACK ChessWndProc (
             int editMode = GetMenuState ( HmenuMain, ID_EDIT_EDITMODE, MF_BYCOMMAND );
             editMode = (editMode ^ MF_CHECKED) & MF_CHECKED;
             CheckMenuItem ( HmenuMain, ID_EDIT_EDITMODE, editMode | MF_BYCOMMAND );
+
+            // If leaving edit mode, we need to tell the human player to trigger a null move
+            // to force recalculating the game state: we need to know if the game ended
+            // and reflect the result on the board.
+            if (!editMode)
+                Global_LeftEditMode = true;
         }
         break;
 
