X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=6477029738e89dce11254f11f2ca1a398644a6f1;hb=7e9fd58541ecb47c252415fe1feb0a741a1f6caa;hp=2ae8886f5c6d7fe80f49c4676c4ccc7568240b21;hpb=894166c9259ba08cd327cd40cb27929177ce98f7;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index 2ae8886f..64770297 100644
--- a/src/game.c
+++ b/src/game.c
@@ -4515,7 +4515,6 @@ void InitGame(void)
   }
 
   game.restart_level = FALSE;
-  game.restart_game_message = NULL;
 
   game.request_active = FALSE;
   game.request_active_or_moving = FALSE;
@@ -15633,10 +15632,8 @@ void RequestQuitGame(boolean escape_key_pressed)
 		     "Do you really want to quit the game?");
 }
 
-void RequestRestartGame(char *message)
+static void RequestRestartGame(char *message)
 {
-  game.restart_game_message = NULL;
-
   boolean has_started_game = hasStartedNetworkGame();
   int request_mode = (has_started_game ? REQ_ASK : REQ_CONFIRM);
   int door_state = DOOR_CLOSE_1;
@@ -15668,33 +15665,27 @@ static char *getRestartGameMessage(void)
   char *game_over_text = "Game over!";
   char *play_again_text = " Play it again?";
 
+  if (level.game_engine_type == GAME_ENGINE_TYPE_MM &&
+      game_mm.game_over_message != NULL)
+    game_over_text = game_mm.game_over_message;
+
   snprintf(message, MAX_OUTPUT_LINESIZE, "%s%s", game_over_text,
 	   (play_again ? play_again_text : ""));
 
   return message;
 }
 
-void CheckGameOver(void)
+boolean CheckRestartGame(void)
 {
-  static boolean last_game_over = FALSE;
   static int game_over_delay = 0;
   int game_over_delay_value = 50;
   boolean game_over = checkGameFailed();
 
-  // do not handle game over if request dialog is already active
-  if (game.request_active)
-    return;
-
-  // do not ask to play again if game was never actually played
-  if (!game.GamePlayed)
-    return;
-
   if (!game_over)
   {
-    last_game_over = FALSE;
     game_over_delay = game_over_delay_value;
 
-    return;
+    return FALSE;
   }
 
   if (game_over_delay > 0)
@@ -15704,13 +15695,24 @@ void CheckGameOver(void)
 
     game_over_delay--;
 
-    return;
+    return FALSE;
   }
 
-  if (last_game_over != game_over)
-    game.restart_game_message = getRestartGameMessage();
+  // do not handle game over if request dialog is already active
+  if (game.request_active)
+    return FALSE;
+
+  // do not ask to play again if game was never actually played
+  if (!game.GamePlayed)
+    return FALSE;
+
+  // do not ask to play again if this was disabled in setup menu
+  if (!setup.ask_on_game_over)
+    return FALSE;
+
+  RequestRestartGame(getRestartGameMessage());
 
-  last_game_over = game_over;
+  return TRUE;
 }
 
 boolean checkGameSolved(void)