X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=c5d941dd093b0882faf8d9b2dbd16c1e7ea23f86;hb=c118d37bf6ad02e90d4ea7c4a4d7d34d8f745c26;hp=4b7533ad779cabe27e85c770da5dae961eaf2378;hpb=892db4c42f305573f4ca35d93f34d295b7d239d6;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index 4b7533ad..c5d941dd 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1784,7 +1784,7 @@ static void InitPlayerField(int x, int y, int element, boolean init_game)
       player->active = TRUE;
 
       // remove potentially duplicate players
-      if (StorePlayer[jx][jy] == Tile[x][y])
+      if (IN_LEV_FIELD(jx, jy) && StorePlayer[jx][jy] == Tile[x][y])
 	StorePlayer[jx][jy] = 0;
 
       StorePlayer[x][y] = Tile[x][y];
@@ -2566,7 +2566,9 @@ static void UpdateGameControlValues(void)
 	int element = gpc->value;
 	int graphic = el2panelimg(element);
 	int init_gfx_random = (graphic_info[graphic].anim_global_sync ?
-			       sync_random_frame : INIT_GFX_RANDOM());
+			       sync_random_frame :
+			       graphic_info[graphic].anim_global_anim_sync ?
+			       getGlobalAnimSyncFrame() : INIT_GFX_RANDOM());
 
 	if (gpc->value != gpc->last_value)
 	{
@@ -2601,7 +2603,9 @@ static void UpdateGameControlValues(void)
 	int last_anim_random_frame = gfx.anim_random_frame;
 	int graphic = gpc->graphic;
 	int init_gfx_random = (graphic_info[graphic].anim_global_sync ?
-			       sync_random_frame : INIT_GFX_RANDOM());
+			       sync_random_frame :
+			       graphic_info[graphic].anim_global_anim_sync ?
+			       getGlobalAnimSyncFrame() : INIT_GFX_RANDOM());
 
 	if (gpc->value != gpc->last_value)
 	{
@@ -3569,7 +3573,7 @@ void InitGame(void)
   int full_lev_fieldx = lev_fieldx + (BorderElement != EL_EMPTY ? 2 : 0);
   int full_lev_fieldy = lev_fieldy + (BorderElement != EL_EMPTY ? 2 : 0);
   int fade_mask = REDRAW_FIELD;
-
+  boolean restarting = (game_status == GAME_MODE_PLAYING);
   boolean emulate_bd = TRUE;	// unless non-BOULDERDASH elements found
   boolean emulate_sp = TRUE;	// unless non-SUPAPLEX    elements found
   int initial_move_dir = MV_DOWN;
@@ -3581,7 +3585,15 @@ void InitGame(void)
   if (!game.restart_level)
     CloseDoor(DOOR_CLOSE_1);
 
-  SetGameStatus(GAME_MODE_PLAYING);
+  if (restarting)
+  {
+    // force fading out global animations displayed during game play
+    SetGameStatus(GAME_MODE_PSEUDO_RESTARTING);
+  }
+  else
+  {
+    SetGameStatus(GAME_MODE_PLAYING);
+  }
 
   if (level_editor_test_game)
     FadeSkipNextFadeOut();
@@ -3597,6 +3609,14 @@ void InitGame(void)
 
   FadeOut(fade_mask);
 
+  if (restarting)
+  {
+    // force restarting global animations displayed during game play
+    RestartGlobalAnimsByStatus(GAME_MODE_PSEUDO_RESTARTING);
+
+    SetGameStatus(GAME_MODE_PLAYING);
+  }
+
   if (level_editor_test_game)
     FadeSkipNextFadeIn();
 
@@ -4777,6 +4797,8 @@ static void LevelSolved(void)
   game.LevelSolved = TRUE;
   game.GameOver = TRUE;
 
+  tape.solved = TRUE;
+
   // needed here to display correct panel values while player walks into exit
   LevelSolved_SetFinalGameValues();
 }
@@ -5116,10 +5138,11 @@ static int addScoreEntry(struct ScoreInfo *list, struct ScoreEntry *new_entry,
     if (strEqual(new_entry->tape_basename, entry->tape_basename) &&
 	!strEqual(new_entry->tape_basename, UNDEFINED_FILENAME))
     {
-      // special case: use server score instead of local score value if higher
-      // (historic scores might have been truncated to 16-bit values locally)
-      if (score_is_better)
-	entry->score = new_entry->score;
+      // add fields from server score entry not stored in local score entry
+      // (currently, this means setting platform, version and country fields;
+      // in rare cases, this may also correct an invalid score value, as
+      // historic scores might have been truncated to 16-bit values locally)
+      *entry = *new_entry;
 
       return -1;
     }
@@ -5302,6 +5325,8 @@ static void ResetGfxFrame(int x, int y)
 
   if (graphic_info[graphic].anim_global_sync)
     GfxFrame[x][y] = FrameCounter;
+  else if (graphic_info[graphic].anim_global_anim_sync)
+    GfxFrame[x][y] = getGlobalAnimSyncFrame();
   else if (ANIM_MODE(graphic) == ANIM_CE_VALUE)
     GfxFrame[x][y] = CustomValue[x][y];
   else if (ANIM_MODE(graphic) == ANIM_CE_SCORE)
@@ -5608,7 +5633,7 @@ static void setScreenCenteredToAllPlayers(int *sx, int *sy)
   *sy = (sy1 + sy2) / 2;
 }
 
-static void DrawRelocateScreen(int old_x, int old_y, int x, int y, int move_dir,
+static void DrawRelocateScreen(int old_x, int old_y, int x, int y,
 			       boolean center_screen, boolean quick_relocation)
 {
   unsigned int frame_delay_value_old = GetVideoFrameDelay();
@@ -5779,7 +5804,7 @@ static void RelocatePlayer(int jx, int jy, int el_player_raw)
   }
 
   // only visually relocate centered player
-  DrawRelocateScreen(old_jx, old_jy, player->jx, player->jy, player->MovDir,
+  DrawRelocateScreen(old_jx, old_jy, player->jx, player->jy,
 		     FALSE, level.instant_relocation);
 
   TestIfPlayerTouchesBadThing(jx, jy);
@@ -6418,7 +6443,7 @@ static void ToggleBeltSwitch(int x, int y)
   }
 }
 
-static void ToggleSwitchgateSwitch(int x, int y)
+static void ToggleSwitchgateSwitch(void)
 {
   int xx, yy;
 
@@ -6898,7 +6923,7 @@ static void Impact(int x, int y)
 		 smashed == EL_DC_SWITCHGATE_SWITCH_UP ||
 		 smashed == EL_DC_SWITCHGATE_SWITCH_DOWN)
 	{
-	  ToggleSwitchgateSwitch(x, y + 1);
+	  ToggleSwitchgateSwitch();
 	}
 	else if (smashed == EL_LIGHT_SWITCH ||
 		 smashed == EL_LIGHT_SWITCH_ACTIVE)
@@ -9656,7 +9681,7 @@ static void DrawTwinkleOnField(int x, int y)
   }
 }
 
-static void MauerWaechst(int x, int y)
+static void WallGrowing(int x, int y)
 {
   int delay = 6;
 
@@ -9706,15 +9731,59 @@ static void MauerWaechst(int x, int y)
   }
 }
 
-static void MauerAbleger(int ax, int ay)
+static void CheckWallGrowing(int ax, int ay)
 {
   int element = Tile[ax][ay];
   int graphic = el2img(element);
-  boolean oben_frei = FALSE, unten_frei = FALSE;
-  boolean links_frei = FALSE, rechts_frei = FALSE;
-  boolean oben_massiv = FALSE, unten_massiv = FALSE;
-  boolean links_massiv = FALSE, rechts_massiv = FALSE;
-  boolean new_wall = FALSE;
+  boolean free_top    = FALSE;
+  boolean free_bottom = FALSE;
+  boolean free_left   = FALSE;
+  boolean free_right  = FALSE;
+  boolean stop_top    = FALSE;
+  boolean stop_bottom = FALSE;
+  boolean stop_left   = FALSE;
+  boolean stop_right  = FALSE;
+  boolean new_wall    = FALSE;
+
+  boolean is_steelwall  = (element == EL_EXPANDABLE_STEELWALL_HORIZONTAL ||
+			   element == EL_EXPANDABLE_STEELWALL_VERTICAL ||
+			   element == EL_EXPANDABLE_STEELWALL_ANY);
+
+  boolean grow_vertical   = (element == EL_EXPANDABLE_WALL_VERTICAL ||
+			     element == EL_EXPANDABLE_WALL_ANY ||
+			     element == EL_EXPANDABLE_STEELWALL_VERTICAL ||
+			     element == EL_EXPANDABLE_STEELWALL_ANY);
+
+  boolean grow_horizontal = (element == EL_EXPANDABLE_WALL_HORIZONTAL ||
+			     element == EL_EXPANDABLE_WALL_ANY ||
+			     element == EL_EXPANDABLE_WALL ||
+			     element == EL_BD_EXPANDABLE_WALL ||
+			     element == EL_EXPANDABLE_STEELWALL_HORIZONTAL ||
+			     element == EL_EXPANDABLE_STEELWALL_ANY);
+
+  boolean stop_vertical   = (element == EL_EXPANDABLE_WALL_VERTICAL ||
+			     element == EL_EXPANDABLE_STEELWALL_VERTICAL);
+
+  boolean stop_horizontal = (element == EL_EXPANDABLE_WALL_HORIZONTAL ||
+			     element == EL_EXPANDABLE_WALL ||
+			     element == EL_EXPANDABLE_STEELWALL_HORIZONTAL);
+
+  int wall_growing = (is_steelwall ?
+		      EL_EXPANDABLE_STEELWALL_GROWING :
+		      EL_EXPANDABLE_WALL_GROWING);
+
+  int gfx_wall_growing_up    = (is_steelwall ?
+				IMG_EXPANDABLE_STEELWALL_GROWING_UP :
+				IMG_EXPANDABLE_WALL_GROWING_UP);
+  int gfx_wall_growing_down  = (is_steelwall ?
+				IMG_EXPANDABLE_STEELWALL_GROWING_DOWN :
+				IMG_EXPANDABLE_WALL_GROWING_DOWN);
+  int gfx_wall_growing_left  = (is_steelwall ?
+				IMG_EXPANDABLE_STEELWALL_GROWING_LEFT :
+				IMG_EXPANDABLE_WALL_GROWING_LEFT);
+  int gfx_wall_growing_right = (is_steelwall ?
+				IMG_EXPANDABLE_STEELWALL_GROWING_RIGHT :
+				IMG_EXPANDABLE_WALL_GROWING_RIGHT);
 
   if (IS_ANIMATED(graphic))
     DrawLevelGraphicAnimationIfNeeded(ax, ay, graphic);
@@ -9730,179 +9799,83 @@ static void MauerAbleger(int ax, int ay)
   }
 
   if (IN_LEV_FIELD(ax, ay - 1) && IS_FREE(ax, ay - 1))
-    oben_frei = TRUE;
+    free_top = TRUE;
   if (IN_LEV_FIELD(ax, ay + 1) && IS_FREE(ax, ay + 1))
-    unten_frei = TRUE;
+    free_bottom = TRUE;
   if (IN_LEV_FIELD(ax - 1, ay) && IS_FREE(ax - 1, ay))
-    links_frei = TRUE;
+    free_left = TRUE;
   if (IN_LEV_FIELD(ax + 1, ay) && IS_FREE(ax + 1, ay))
-    rechts_frei = TRUE;
+    free_right = TRUE;
 
-  if (element == EL_EXPANDABLE_WALL_VERTICAL ||
-      element == EL_EXPANDABLE_WALL_ANY)
+  if (grow_vertical)
   {
-    if (oben_frei)
+    if (free_top)
     {
-      Tile[ax][ay - 1] = EL_EXPANDABLE_WALL_GROWING;
+      Tile[ax][ay - 1] = wall_growing;
       Store[ax][ay - 1] = element;
       GfxDir[ax][ay - 1] = MovDir[ax][ay - 1] = MV_UP;
+
       if (IN_SCR_FIELD(SCREENX(ax), SCREENY(ay - 1)))
-	DrawLevelGraphic(ax, ay - 1, IMG_EXPANDABLE_WALL_GROWING_UP, 0);
-      new_wall = TRUE;
-    }
-    if (unten_frei)
-    {
-      Tile[ax][ay + 1] = EL_EXPANDABLE_WALL_GROWING;
-      Store[ax][ay + 1] = element;
-      GfxDir[ax][ay + 1] = MovDir[ax][ay + 1] = MV_DOWN;
-      if (IN_SCR_FIELD(SCREENX(ax), SCREENY(ay + 1)))
-	DrawLevelGraphic(ax, ay + 1, IMG_EXPANDABLE_WALL_GROWING_DOWN, 0);
-      new_wall = TRUE;
-    }
-  }
+	DrawLevelGraphic(ax, ay - 1, gfx_wall_growing_up, 0);
 
-  if (element == EL_EXPANDABLE_WALL_HORIZONTAL ||
-      element == EL_EXPANDABLE_WALL_ANY ||
-      element == EL_EXPANDABLE_WALL ||
-      element == EL_BD_EXPANDABLE_WALL)
-  {
-    if (links_frei)
-    {
-      Tile[ax - 1][ay] = EL_EXPANDABLE_WALL_GROWING;
-      Store[ax - 1][ay] = element;
-      GfxDir[ax - 1][ay] = MovDir[ax - 1][ay] = MV_LEFT;
-      if (IN_SCR_FIELD(SCREENX(ax - 1), SCREENY(ay)))
-	DrawLevelGraphic(ax - 1, ay, IMG_EXPANDABLE_WALL_GROWING_LEFT, 0);
       new_wall = TRUE;
     }
 
-    if (rechts_frei)
+    if (free_bottom)
     {
-      Tile[ax + 1][ay] = EL_EXPANDABLE_WALL_GROWING;
-      Store[ax + 1][ay] = element;
-      GfxDir[ax + 1][ay] = MovDir[ax + 1][ay] = MV_RIGHT;
-      if (IN_SCR_FIELD(SCREENX(ax + 1), SCREENY(ay)))
-	DrawLevelGraphic(ax + 1, ay, IMG_EXPANDABLE_WALL_GROWING_RIGHT, 0);
-      new_wall = TRUE;
-    }
-  }
-
-  if (element == EL_EXPANDABLE_WALL && (links_frei || rechts_frei))
-    TEST_DrawLevelField(ax, ay);
-
-  if (!IN_LEV_FIELD(ax, ay - 1) || IS_WALL(Tile[ax][ay - 1]))
-    oben_massiv = TRUE;
-  if (!IN_LEV_FIELD(ax, ay + 1) || IS_WALL(Tile[ax][ay + 1]))
-    unten_massiv = TRUE;
-  if (!IN_LEV_FIELD(ax - 1, ay) || IS_WALL(Tile[ax - 1][ay]))
-    links_massiv = TRUE;
-  if (!IN_LEV_FIELD(ax + 1, ay) || IS_WALL(Tile[ax + 1][ay]))
-    rechts_massiv = TRUE;
-
-  if (((oben_massiv && unten_massiv) ||
-       element == EL_EXPANDABLE_WALL_HORIZONTAL ||
-       element == EL_EXPANDABLE_WALL) &&
-      ((links_massiv && rechts_massiv) ||
-       element == EL_EXPANDABLE_WALL_VERTICAL))
-    Tile[ax][ay] = EL_WALL;
-
-  if (new_wall)
-    PlayLevelSoundAction(ax, ay, ACTION_GROWING);
-}
-
-static void MauerAblegerStahl(int ax, int ay)
-{
-  int element = Tile[ax][ay];
-  int graphic = el2img(element);
-  boolean oben_frei = FALSE, unten_frei = FALSE;
-  boolean links_frei = FALSE, rechts_frei = FALSE;
-  boolean oben_massiv = FALSE, unten_massiv = FALSE;
-  boolean links_massiv = FALSE, rechts_massiv = FALSE;
-  boolean new_wall = FALSE;
-
-  if (IS_ANIMATED(graphic))
-    DrawLevelGraphicAnimationIfNeeded(ax, ay, graphic);
-
-  if (!MovDelay[ax][ay])	// start building new wall
-    MovDelay[ax][ay] = 6;
-
-  if (MovDelay[ax][ay])		// wait some time before building new wall
-  {
-    MovDelay[ax][ay]--;
-    if (MovDelay[ax][ay])
-      return;
-  }
-
-  if (IN_LEV_FIELD(ax, ay - 1) && IS_FREE(ax, ay - 1))
-    oben_frei = TRUE;
-  if (IN_LEV_FIELD(ax, ay + 1) && IS_FREE(ax, ay + 1))
-    unten_frei = TRUE;
-  if (IN_LEV_FIELD(ax - 1, ay) && IS_FREE(ax - 1, ay))
-    links_frei = TRUE;
-  if (IN_LEV_FIELD(ax + 1, ay) && IS_FREE(ax + 1, ay))
-    rechts_frei = TRUE;
-
-  if (element == EL_EXPANDABLE_STEELWALL_VERTICAL ||
-      element == EL_EXPANDABLE_STEELWALL_ANY)
-  {
-    if (oben_frei)
-    {
-      Tile[ax][ay - 1] = EL_EXPANDABLE_STEELWALL_GROWING;
-      Store[ax][ay - 1] = element;
-      GfxDir[ax][ay - 1] = MovDir[ax][ay - 1] = MV_UP;
-      if (IN_SCR_FIELD(SCREENX(ax), SCREENY(ay - 1)))
-	DrawLevelGraphic(ax, ay - 1, IMG_EXPANDABLE_STEELWALL_GROWING_UP, 0);
-      new_wall = TRUE;
-    }
-    if (unten_frei)
-    {
-      Tile[ax][ay + 1] = EL_EXPANDABLE_STEELWALL_GROWING;
+      Tile[ax][ay + 1] = wall_growing;
       Store[ax][ay + 1] = element;
       GfxDir[ax][ay + 1] = MovDir[ax][ay + 1] = MV_DOWN;
+
       if (IN_SCR_FIELD(SCREENX(ax), SCREENY(ay + 1)))
-	DrawLevelGraphic(ax, ay + 1, IMG_EXPANDABLE_STEELWALL_GROWING_DOWN, 0);
+	DrawLevelGraphic(ax, ay + 1, gfx_wall_growing_down, 0);
+
       new_wall = TRUE;
     }
   }
 
-  if (element == EL_EXPANDABLE_STEELWALL_HORIZONTAL ||
-      element == EL_EXPANDABLE_STEELWALL_ANY)
+  if (grow_horizontal)
   {
-    if (links_frei)
+    if (free_left)
     {
-      Tile[ax - 1][ay] = EL_EXPANDABLE_STEELWALL_GROWING;
+      Tile[ax - 1][ay] = wall_growing;
       Store[ax - 1][ay] = element;
       GfxDir[ax - 1][ay] = MovDir[ax - 1][ay] = MV_LEFT;
+
       if (IN_SCR_FIELD(SCREENX(ax - 1), SCREENY(ay)))
-	DrawLevelGraphic(ax - 1, ay, IMG_EXPANDABLE_STEELWALL_GROWING_LEFT, 0);
+	DrawLevelGraphic(ax - 1, ay, gfx_wall_growing_left, 0);
+
       new_wall = TRUE;
     }
 
-    if (rechts_frei)
+    if (free_right)
     {
-      Tile[ax + 1][ay] = EL_EXPANDABLE_STEELWALL_GROWING;
+      Tile[ax + 1][ay] = wall_growing;
       Store[ax + 1][ay] = element;
       GfxDir[ax + 1][ay] = MovDir[ax + 1][ay] = MV_RIGHT;
+
       if (IN_SCR_FIELD(SCREENX(ax + 1), SCREENY(ay)))
-	DrawLevelGraphic(ax + 1, ay, IMG_EXPANDABLE_STEELWALL_GROWING_RIGHT, 0);
+	DrawLevelGraphic(ax + 1, ay, gfx_wall_growing_right, 0);
+
       new_wall = TRUE;
     }
   }
 
+  if (element == EL_EXPANDABLE_WALL && (free_left || free_right))
+    TEST_DrawLevelField(ax, ay);
+
   if (!IN_LEV_FIELD(ax, ay - 1) || IS_WALL(Tile[ax][ay - 1]))
-    oben_massiv = TRUE;
+    stop_top = TRUE;
   if (!IN_LEV_FIELD(ax, ay + 1) || IS_WALL(Tile[ax][ay + 1]))
-    unten_massiv = TRUE;
+    stop_bottom = TRUE;
   if (!IN_LEV_FIELD(ax - 1, ay) || IS_WALL(Tile[ax - 1][ay]))
-    links_massiv = TRUE;
+    stop_left = TRUE;
   if (!IN_LEV_FIELD(ax + 1, ay) || IS_WALL(Tile[ax + 1][ay]))
-    rechts_massiv = TRUE;
+    stop_right = TRUE;
 
-  if (((oben_massiv && unten_massiv) ||
-       element == EL_EXPANDABLE_STEELWALL_HORIZONTAL) &&
-      ((links_massiv && rechts_massiv) ||
-       element == EL_EXPANDABLE_STEELWALL_VERTICAL))
-    Tile[ax][ay] = EL_STEELWALL;
+  if (((stop_top && stop_bottom) || stop_horizontal) &&
+      ((stop_left && stop_right) || stop_vertical))
+    Tile[ax][ay] = (is_steelwall ? EL_STEELWALL : EL_WALL);
 
   if (new_wall)
     PlayLevelSoundAction(ax, ay, ACTION_GROWING);
@@ -11721,6 +11694,21 @@ void AdvanceFrameAndPlayerCounters(int player_nr)
   }
 }
 
+void AdvanceFrameCounter(void)
+{
+  FrameCounter++;
+}
+
+void AdvanceGfxFrame(void)
+{
+  int x, y;
+
+  SCAN_PLAYFIELD(x, y)
+  {
+    GfxFrame[x][y]++;
+  }
+}
+
 void StartGameActions(boolean init_network_game, boolean record_tape,
 		      int random_seed)
 {
@@ -11916,7 +11904,7 @@ static void GameActionsExt(void)
     TapeRecordAction(tape_action);
 
   // remember if game was played (especially after tape stopped playing)
-  if (!tape.playing && summarized_player_action)
+  if (!tape.playing && summarized_player_action && !checkGameFailed())
     game.GamePlayed = TRUE;
 
 #if USE_NEW_PLAYER_ASSIGNMENTS
@@ -12039,25 +12027,23 @@ void GameActions(void)
 void GameActions_EM_Main(void)
 {
   byte effective_action[MAX_PLAYERS];
-  boolean warp_mode = (tape.playing && tape.warp_forward && !tape.pausing);
   int i;
 
   for (i = 0; i < MAX_PLAYERS; i++)
     effective_action[i] = stored_player[i].effective_action;
 
-  GameActions_EM(effective_action, warp_mode);
+  GameActions_EM(effective_action);
 }
 
 void GameActions_SP_Main(void)
 {
   byte effective_action[MAX_PLAYERS];
-  boolean warp_mode = (tape.playing && tape.warp_forward && !tape.pausing);
   int i;
 
   for (i = 0; i < MAX_PLAYERS; i++)
     effective_action[i] = stored_player[i].effective_action;
 
-  GameActions_SP(effective_action, warp_mode);
+  GameActions_SP(effective_action);
 
   for (i = 0; i < MAX_PLAYERS; i++)
   {
@@ -12070,9 +12056,9 @@ void GameActions_SP_Main(void)
 
 void GameActions_MM_Main(void)
 {
-  boolean warp_mode = (tape.playing && tape.warp_forward && !tape.pausing);
+  AdvanceGfxFrame();
 
-  GameActions_MM(local_player->effective_mouse_action, warp_mode);
+  GameActions_MM(local_player->effective_mouse_action);
 }
 
 void GameActions_RND_Main(void)
@@ -12136,7 +12122,7 @@ void GameActions_RND(void)
     game.centered_player_nr = game.centered_player_nr_next;
     game.set_centered_player = FALSE;
 
-    DrawRelocateScreen(0, 0, sx, sy, MV_NONE, TRUE, setup.quick_switch);
+    DrawRelocateScreen(0, 0, sx, sy, TRUE, setup.quick_switch);
     DrawGameDoorValues();
   }
 
@@ -12433,17 +12419,16 @@ void GameActions_RND(void)
       CheckExitSP(x, y);
     else if (element == EL_EXPANDABLE_WALL_GROWING ||
 	     element == EL_EXPANDABLE_STEELWALL_GROWING)
-      MauerWaechst(x, y);
+      WallGrowing(x, y);
     else if (element == EL_EXPANDABLE_WALL ||
 	     element == EL_EXPANDABLE_WALL_HORIZONTAL ||
 	     element == EL_EXPANDABLE_WALL_VERTICAL ||
 	     element == EL_EXPANDABLE_WALL_ANY ||
-	     element == EL_BD_EXPANDABLE_WALL)
-      MauerAbleger(x, y);
-    else if (element == EL_EXPANDABLE_STEELWALL_HORIZONTAL ||
+	     element == EL_BD_EXPANDABLE_WALL ||
+	     element == EL_EXPANDABLE_STEELWALL_HORIZONTAL ||
 	     element == EL_EXPANDABLE_STEELWALL_VERTICAL ||
 	     element == EL_EXPANDABLE_STEELWALL_ANY)
-      MauerAblegerStahl(x, y);
+      CheckWallGrowing(x, y);
     else if (element == EL_FLAMES)
       CheckForDragon(x, y);
     else if (element == EL_EXPLOSION)
@@ -14013,7 +13998,6 @@ void BuryPlayer(struct PlayerInfo *player)
     return;
 
   PlayLevelSoundElementAction(jx, jy, player->artwork_element, ACTION_DYING);
-  PlayLevelSound(jx, jy, SND_GAME_LOSING);
 
   RemovePlayer(player);
 
@@ -14671,7 +14655,7 @@ static int DigField(struct PlayerInfo *player,
 
 	LevelSolved();
 
-	PlayLevelSound(x, y, SND_GAME_SOKOBAN_SOLVING);
+	PlaySound(SND_GAME_SOKOBAN_SOLVING);
       }
     }
     else
@@ -14756,7 +14740,7 @@ static int DigField(struct PlayerInfo *player,
 	     element == EL_DC_SWITCHGATE_SWITCH_UP ||
 	     element == EL_DC_SWITCHGATE_SWITCH_DOWN)
     {
-      ToggleSwitchgateSwitch(x, y);
+      ToggleSwitchgateSwitch();
     }
     else if (element == EL_LIGHT_SWITCH ||
 	     element == EL_LIGHT_SWITCH_ACTIVE)
@@ -15655,15 +15639,21 @@ void RequestRestartGame(char *message)
 
   boolean has_started_game = hasStartedNetworkGame();
   int request_mode = (has_started_game ? REQ_ASK : REQ_CONFIRM);
+  int door_state = DOOR_CLOSE_1;
 
-  if (Request(message, request_mode | REQ_STAY_CLOSED) && has_started_game)
+  if (Request(message, request_mode | REQ_STAY_OPEN) && has_started_game)
   {
+    CloseDoor(door_state);
+
     StartGameActions(network.enabled, setup.autorecord, level.random_seed);
   }
   else
   {
-    // needed in case of envelope request to close game panel
-    CloseDoor(DOOR_CLOSE_1);
+    // if game was invoked from level editor, also close tape recorder door
+    if (level_editor_test_game)
+      door_state = DOOR_CLOSE_ALL;
+
+    CloseDoor(door_state);
 
     SetGameStatus(GAME_MODE_MAIN);
 
@@ -15671,42 +15661,73 @@ void RequestRestartGame(char *message)
   }
 }
 
-void CheckGameOver(void)
+static char *getRestartGameMessage(void)
+{
+  boolean play_again = hasStartedNetworkGame();
+  static char message[MAX_OUTPUT_LINESIZE];
+  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;
+}
+
+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)
   {
+    if (game_over_delay == game_over_delay_value / 2)
+      PlaySound(SND_GAME_LOSING);
+
     game_over_delay--;
 
-    return;
+    return FALSE;
   }
 
+  // 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;
+
   if (last_game_over != game_over)
-    game.restart_game_message = (hasStartedNetworkGame() ?
-				 "Game over! Play it again?" :
-				 "Game over!");
+    game.restart_game_message = getRestartGameMessage();
 
   last_game_over = game_over;
+
+  if (game.restart_game_message != NULL)
+  {
+    RequestRestartGame(game.restart_game_message);
+
+    return TRUE;
+  }
+
+  return FALSE;
 }
 
 boolean checkGameSolved(void)
@@ -15890,7 +15911,7 @@ static ListNode *SaveEngineSnapshotBuffers(void)
   if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
     SaveEngineSnapshotValues_SP(&buffers);
   if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
-    SaveEngineSnapshotValues_MM(&buffers);
+    SaveEngineSnapshotValues_MM();
 
   // save values stored in special snapshot structure