X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=31a52004fc77bd999cc7f86ac9468364c0fb4057;hb=9d8d0a1e62cde9c560a65d7235e7285a1df04d53;hp=d3d7f513034d9f75dcc5a68d8d9819ef7073dda9;hpb=96f2e9a0b1306fa108f3f7e81ad8b8d323ca5517;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index d3d7f513..31a52004 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)
 	{
@@ -5305,6 +5309,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)
@@ -11672,6 +11678,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 +12040,8 @@ void GameActions_SP_Main(void)
 
 void GameActions_MM_Main(void)
 {
+  AdvanceGfxFrame();
+
   GameActions_MM(local_player->effective_mouse_action);
 }