X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgame.c;h=87c054a211c0363e6200dd8670c984c5a90a3d21;hb=64a3650ea089428b698c6a8e51f1ce864ce983a0;hp=e906d2362d832236cd08b141d0f48dd7a06a8fbe;hpb=b0c3bb42e4a0baf41242190a2855c3623267899b;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index e906d236..87c054a2 100644
--- a/src/game.c
+++ b/src/game.c
@@ -3845,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;
@@ -8420,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]);
 
@@ -11593,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;
@@ -12291,6 +12326,25 @@ void GameActions_RND(void)
     CheckElementChangeByMouse(x, y, element, CE_PRESSED_BY_MOUSE, ch_button);
     CheckTriggeredElementChangeByMouse(x, y, element, CE_MOUSE_PRESSED_ON_X,
 				       ch_button);
+
+    if (level.use_step_counter)
+    {
+      boolean counted_click = FALSE;
+
+      // element clicked that can change when clicked/pressed
+      if (CAN_CHANGE_OR_HAS_ACTION(element) &&
+	  (HAS_ANY_CHANGE_EVENT(element, CE_CLICKED_BY_MOUSE) ||
+	   HAS_ANY_CHANGE_EVENT(element, CE_PRESSED_BY_MOUSE)))
+	counted_click = TRUE;
+
+      // element clicked that can trigger change when clicked/pressed
+      if (trigger_events[element][CE_MOUSE_CLICKED_ON_X] ||
+	  trigger_events[element][CE_MOUSE_PRESSED_ON_X])
+	counted_click = TRUE;
+
+      if (new_button && counted_click)
+	CheckLevelTime_StepCounter();
+    }
   }
 
   SCAN_PLAYFIELD(x, y)
@@ -13249,33 +13303,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)