X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame.c;h=6e64d55c532278896e9ada1b2a4b39c4765a30bc;hp=e5e128f8539c9158c916effcb0802c2a015326c6;hb=14801844faf14be284c590b66f030c6bf7cea5c2;hpb=9dc1a9b929ed268df501e7d2b00f51f4521f8b5e

diff --git a/src/game.c b/src/game.c
index e5e128f8..6e64d55c 100644
--- a/src/game.c
+++ b/src/game.c
@@ -2308,7 +2308,7 @@ void UpdateGameControlValues()
   game_panel_controls[GAME_PANEL_TIME_MM].value = (time / 60) % 60;
   game_panel_controls[GAME_PANEL_TIME_SS].value = time % 60;
 
-  if (game.no_time_limit)
+  if (level.time == 0)
     game_panel_controls[GAME_PANEL_TIME_ANIM].value = 100;
   else
     game_panel_controls[GAME_PANEL_TIME_ANIM].value = time * 100 / level.time;
@@ -3298,24 +3298,25 @@ void InitGame()
   else
     FadeSetEnterScreen();
 
-  if (CheckIfGlobalBorderHasChanged())
+  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
     fade_mask = REDRAW_ALL;
 
   FadeLevelSoundsAndMusic();
 
   ExpireSoundLoops(TRUE);
 
-  FadeOut(fade_mask);
+  if (!level_editor_test_game)
+    FadeOut(fade_mask);
 
   /* needed if different viewport properties defined for playing */
   ChangeViewportPropertiesIfNeeded();
 
   ClearField();
 
-  OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
-
   DrawCompleteVideoDisplay();
 
+  OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
   InitGameEngine();
   InitGameControlValues();
 
@@ -4227,6 +4228,7 @@ void InitGame()
   }
 
   game.restart_level = FALSE;
+  game.restart_game_message = NULL;
 
   if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
     InitGameActions_MM();
@@ -4692,14 +4694,16 @@ void GameEnd()
 
   local_player->LevelSolved_GameEnd = TRUE;
 
-  if (!global.use_envelope_request)
-    CloseDoor(DOOR_CLOSE_1);
-
   if (local_player->LevelSolved_SaveTape)
   {
-    SaveTapeChecked(tape.level_nr);	/* ask to save tape */
+    /* make sure that request dialog to save tape does not open door again */
+    if (!global.use_envelope_request)
+      CloseDoor(DOOR_CLOSE_1);
+
+    SaveTapeChecked_LevelSolved(tape.level_nr);		/* ask to save tape */
   }
 
+  /* if no tape is to be saved, close both doors simultaneously */
   CloseDoor(DOOR_CLOSE_ALL);
 
   if (level_editor_test_game)
@@ -14956,6 +14960,22 @@ void RequestQuitGame(boolean ask_if_really_quit)
 		     "Do you really want to quit the game?");
 }
 
+void RequestRestartGame(char *message)
+{
+  game.restart_game_message = NULL;
+
+  if (Request(message, REQ_ASK | REQ_STAY_CLOSED))
+  {
+    StartGameActions(options.network, setup.autorecord, level.random_seed);
+  }
+  else
+  {
+    SetGameStatus(GAME_MODE_MAIN);
+
+    DrawMainMenu();
+  }
+}
+
 
 /* ------------------------------------------------------------------------- */
 /* random generator functions                                                */
@@ -15266,7 +15286,7 @@ void LoadEngineSnapshotValues()
     LoadEngineSnapshotValues_EM();
   if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
     LoadEngineSnapshotValues_SP();
-  if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
+  if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
     LoadEngineSnapshotValues_MM();
 }
 
@@ -15787,7 +15807,8 @@ static void HandleGameButtonsExt(int id, int button)
 
 	SetAudioMode(setup.sound);
 
-	PlayLevelMusic();
+	if (game_status == GAME_MODE_PLAYING)
+	  PlayLevelMusic();
       }
 
       RedrawSoundButtonGadget(id);