X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_mm%2Fmm_game.c;h=5cdc8ed3114712b6e97fd8f11d1ce9c22a8f8b21;hb=e30d93a8b07ef8ee577768b305909e80060a3342;hp=1542db1a16da1a34e6b111d7fca4ff754d45799b;hpb=70659deab1533405938739c664235dd8bcb87371;p=rocksndiamonds.git

diff --git a/src/game_mm/mm_game.c b/src/game_mm/mm_game.c
index 1542db1a..5cdc8ed3 100644
--- a/src/game_mm/mm_game.c
+++ b/src/game_mm/mm_game.c
@@ -570,6 +570,8 @@ static void InitField(int x, int y, boolean init_game)
           game_mm.laser_green = native_mm_level.df_laser_green;
           game_mm.laser_blue  = native_mm_level.df_laser_blue;
         }
+
+	game_mm.has_mcduffin = (IS_MCDUFFIN(element));
       }
 
       break;
@@ -662,10 +664,12 @@ void InitGameEngine_MM(void)
   game_mm.laser_red = FALSE;
   game_mm.laser_green = FALSE;
   game_mm.laser_blue = TRUE;
+  game_mm.has_mcduffin = TRUE;
 
   game_mm.level_solved = FALSE;
   game_mm.game_over = FALSE;
   game_mm.game_over_cause = 0;
+  game_mm.game_over_message = NULL;
 
   game_mm.laser_overload_value = 0;
   game_mm.laser_enabled = FALSE;
@@ -802,25 +806,23 @@ static void FadeOutLaser(void)
 
 static void GameOver_MM(int game_over_cause)
 {
-  // do not handle game over if request dialog is already active
-  if (game.request_active)
-    return;
-
   game_mm.game_over = TRUE;
   game_mm.game_over_cause = game_over_cause;
-
-  // do not ask to play again if game was never actually played
-  if (!game.GamePlayed)
-    return;
-
-  if (setup.ask_on_game_over)
-    game.restart_game_message = (game_over_cause == GAME_OVER_BOMB ?
-				 "Bomb killed Mc Duffin! Play it again?" :
-				 game_over_cause == GAME_OVER_NO_ENERGY ?
-				 "Out of magic energy! Play it again?" :
-				 game_over_cause == GAME_OVER_OVERLOADED ?
-				 "Magic spell hit Mc Duffin! Play it again?" :
-				 NULL);
+  game_mm.game_over_message = (game_mm.has_mcduffin ?
+			       (game_over_cause == GAME_OVER_BOMB ?
+				"Bomb killed Mc Duffin!" :
+				game_over_cause == GAME_OVER_NO_ENERGY ?
+				"Out of magic energy!" :
+				game_over_cause == GAME_OVER_OVERLOADED ?
+				"Magic spell hit Mc Duffin!" :
+				NULL) :
+			       (game_over_cause == GAME_OVER_BOMB ?
+				"Bomb destroyed laser cannon!" :
+				game_over_cause == GAME_OVER_NO_ENERGY ?
+				"Out of laser energy!" :
+				game_over_cause == GAME_OVER_OVERLOADED ?
+				"Laser beam hit laser cannon!" :
+				NULL));
 
   SetTileCursorActive(FALSE);
 }
@@ -2830,11 +2832,9 @@ static void Explode_MM(int x, int y, int phase, int mode)
 
       Bang_MM(laser.start_edge.x, laser.start_edge.y);
 
-      GameOver_MM(GAME_OVER_DELAYED);
-
       laser.overloaded = FALSE;
     }
-    else if (IS_MCDUFFIN(center_element))
+    else if (IS_MCDUFFIN(center_element) || IS_LASER(center_element))
     {
       GameOver_MM(GAME_OVER_BOMB);
     }