moved code for incrementing level time step counter to separate function

[rocksndiamonds.git] / src / game.c

diff --git a/src/game.c b/src/game.c
index 8ac2616131b19c07bf66ea9e47abaec49a95bb8a..11311009b5f831e1c1dc0b25f3b9fd4ee4ad10e0 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -2032,6 +2032,9 @@ static void InitField(int x, int y, boolean init_game)
       {
        GfxElementEmpty[x][y] = element;
        Tile[x][y] = EL_EMPTY;
+
+       if (element_info[element].use_gfx_element)
+         game.use_masked_elements = TRUE;
       }
 
       break;
@@ -3842,6 +3845,9 @@ void InitGame(void)
 
   game.envelope_active = FALSE;
 
+  // special case: set custom artwork setting to initial value
+  game.use_masked_elements = game.use_masked_elements_initial;
+
   for (i = 0; i < NUM_BELTS; i++)
   {
     game.belt_dir[i] = MV_NONE;
@@ -8417,6 +8423,9 @@ static void StartMoving(int x, int y)
          GfxDir[x][y] = diagonal_move_dir;
          ChangeDelay[x][y] = change_delay;
 
+         if (Store[x][y] == EL_EMPTY)
+           Store[x][y] = GfxElementEmpty[x][y];
+
          graphic = el_act_dir2img(GfxElement[x][y], GfxAction[x][y],
                                   GfxDir[x][y]);
 
@@ -11590,6 +11599,35 @@ static void CheckLevelSolved(void)
   }
 }
 
+static void CheckLevelTime_StepCounter(void)
+{
+  int i;
+
+  TimePlayed++;
+
+  if (TimeLeft > 0)
+  {
+    TimeLeft--;
+
+    if (TimeLeft <= 10 && setup.time_limit && !game.LevelSolved)
+      PlaySound(SND_GAME_RUNNING_OUT_OF_TIME);
+
+    game_panel_controls[GAME_PANEL_TIME].value = TimeLeft;
+
+    DisplayGameControlValues();
+
+    if (!TimeLeft && setup.time_limit && !game.LevelSolved)
+      for (i = 0; i < MAX_PLAYERS; i++)
+       KillPlayer(&stored_player[i]);
+  }
+  else if (game.no_time_limit && !game.all_players_gone)
+  {
+    game_panel_controls[GAME_PANEL_TIME].value = TimePlayed;
+
+    DisplayGameControlValues();
+  }
+}
+
 static void CheckLevelTime(void)
 {
   int i;
@@ -12296,6 +12334,9 @@ void GameActions_RND(void)
     graphic = el_act_dir2img(element, GfxAction[x][y], GfxDir[x][y]);
     last_gfx_frame = GfxFrame[x][y];
 
+    if (element == EL_EMPTY)
+      graphic = el2img(GfxElementEmpty[x][y]);
+
     ResetGfxFrame(x, y);
 
     if (GfxFrame[x][y] != last_gfx_frame && !Stop[x][y])
@@ -13243,33 +13284,7 @@ void ScrollPlayer(struct PlayerInfo *player, int mode)
     }
 
     if (level.use_step_counter)
-    {
-      int i;
-
-      TimePlayed++;
-
-      if (TimeLeft > 0)
-      {
-       TimeLeft--;
-
-       if (TimeLeft <= 10 && setup.time_limit && !game.LevelSolved)
-         PlaySound(SND_GAME_RUNNING_OUT_OF_TIME);
-
-       game_panel_controls[GAME_PANEL_TIME].value = TimeLeft;
-
-       DisplayGameControlValues();
-
-       if (!TimeLeft && setup.time_limit && !game.LevelSolved)
-         for (i = 0; i < MAX_PLAYERS; i++)
-           KillPlayer(&stored_player[i]);
-      }
-      else if (game.no_time_limit && !game.all_players_gone)
-      {
-       game_panel_controls[GAME_PANEL_TIME].value = TimePlayed;
-
-       DisplayGameControlValues();
-      }
-    }
+      CheckLevelTime_StepCounter();
 
     if (tape.single_step && tape.recording && !tape.pausing &&
        !player->programmed_action)