X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=197ad64da36c0756b2eee7af7493591c0c7f9e12;hb=80b1d8bbd4ac4555c28208436fe63fbf8947d97a;hp=d3d7f513034d9f75dcc5a68d8d9819ef7073dda9;hpb=96f2e9a0b1306fa108f3f7e81ad8b8d323ca5517;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index d3d7f513..197ad64d 100644
--- a/src/game.c
+++ b/src/game.c
@@ -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_LOADING);
+  }
+  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
+    RestartGlobalAnims();
+
+    SetGameStatus(GAME_MODE_PLAYING);
+  }
+
   if (level_editor_test_game)
     FadeSkipNextFadeIn();
 
@@ -5305,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)
@@ -9853,7 +9875,7 @@ static void CheckWallGrowing(int ax, int ay)
 
   if (((stop_top && stop_bottom) || stop_horizontal) &&
       ((stop_left && stop_right) || stop_vertical))
-    Tile[ax][ay] = EL_WALL;
+    Tile[ax][ay] = (is_steelwall ? EL_STEELWALL : EL_WALL);
 
   if (new_wall)
     PlayLevelSoundAction(ax, ay, ACTION_GROWING);
@@ -11672,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)
 {
@@ -12019,6 +12056,8 @@ void GameActions_SP_Main(void)
 
 void GameActions_MM_Main(void)
 {
+  AdvanceGfxFrame();
+
   GameActions_MM(local_player->effective_mouse_action);
 }