moved requesting game restart to function that checks for game over

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index d10b95d101f3bd9ad5112ed6cb34aef2a06c74b5..c4955e8c7bdcac56ddaad9ceaed82a8e6e96a246 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -5118,6 +5118,9 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
          {
            // store level set if chosen from "last played level set" menu
            StoreLastPlayedLevels(leveldir_current);
+
+           // store if level set chosen from "last played level set" menu
+           SaveLevelSetup_LastSeries();
          }
          else if (game_status == GAME_MODE_NAMES)
          {
@@ -9524,15 +9527,8 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
 
 void HandleGameActions(void)
 {
-  if (setup.ask_on_game_over)
-    CheckGameOver();
-
-  if (game.restart_game_message != NULL)
-  {
-    RequestRestartGame(game.restart_game_message);
-
+  if (CheckRestartGame())
     return;
-  }
 
   if (game_status != GAME_MODE_PLAYING)
     return;