X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=6d07ec5489b05a0a8cec073449b8bd2af0e6eed3;hb=91e1f77adf5c43318040d2a8ca204652f2f036ed;hp=407184b59db9d4621e472c4abaa60dca1adb5631;hpb=2350a7216e419349f4b01a57cf3f1e6b959e2f34;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index 407184b5..6d07ec54 100644
--- a/src/game.c
+++ b/src/game.c
@@ -3313,10 +3313,10 @@ void InitGame()
 
   ClearField();
 
-  OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
-
   DrawCompleteVideoDisplay();
 
+  OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
   InitGameEngine();
   InitGameControlValues();
 
@@ -3345,10 +3345,12 @@ void InitGame()
     player->mouse_action.lx = 0;
     player->mouse_action.ly = 0;
     player->mouse_action.button = 0;
+    player->mouse_action.button_hint = 0;
 
     player->effective_mouse_action.lx = 0;
     player->effective_mouse_action.ly = 0;
     player->effective_mouse_action.button = 0;
+    player->effective_mouse_action.button_hint = 0;
 
     player->score = 0;
     player->score_final = 0;
@@ -4184,11 +4186,6 @@ void InitGame()
 
     OpenDoor(DOOR_OPEN_ALL);
 
-    PlaySound(SND_GAME_STARTING);
-
-    if (setup.sound_music)
-      PlayLevelMusic();
-
     KeyboardAutoRepeatOffUnlessAutoplay();
 
 #if DEBUG_INIT_PLAYER
@@ -4234,6 +4231,14 @@ void InitGame()
     InitGameActions_MM();
 
   SaveEngineSnapshotToListInitial();
+
+  if (!game.restart_level)
+  {
+    PlaySound(SND_GAME_STARTING);
+
+    if (setup.sound_music)
+      PlayLevelMusic();
+  }
 }
 
 void UpdateEngineValues(int actual_scroll_x, int actual_scroll_y,