From: Holger Schemel <info@artsoft.org>
Date: Sun, 25 Apr 2004 08:04:16 +0000 (+0200)
Subject: rnd-20040425-1-src
X-Git-Tag: 3.1.0^2~13
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=68e816d72b11953beea9c8e2f3d7281110e3712e;p=rocksndiamonds.git

rnd-20040425-1-src
* fixed (removed) "indestructible" / "can explode" dependency in editor
* fixed (removed) "accessible inside" / "protected" dependency
* fixed (removed) "step mode" / "shield time" dependency
---

diff --git a/ChangeLog b/ChangeLog
index 12dc0ab0..6ebcd68e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-24
+	* fixed (removed) "indestructible" / "can explode" dependency in editor
+	* fixed (removed) "accessible inside" / "protected" dependency
+	* fixed (removed) "step mode" / "shield time" dependency
+
 2004-04-23
 	* fixed dynabombs exploding now into anything diggable
 	* fixed Supaplex style gravity movement into buggy base now impossible
diff --git a/src/conftime.h b/src/conftime.h
index 2d700de5..da757eab 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2004-04-24 21:58]"
+#define COMPILE_DATE_STRING "[2004-04-24 22:56]"
diff --git a/src/game.c b/src/game.c
index 28e62676..994c04f3 100644
--- a/src/game.c
+++ b/src/game.c
@@ -8785,22 +8785,22 @@ void GameActions()
     TimeFrames = 0;
     TapeTime++;
 
-    if (!level.use_step_counter)
+    for (i = 0; i < MAX_PLAYERS; i++)
     {
-      TimePlayed++;
+      struct PlayerInfo *player = &stored_player[i];
 
-      for (i = 0; i < MAX_PLAYERS; i++)
+      if (SHIELD_ON(player))
       {
-	struct PlayerInfo *player = &stored_player[i];
+	player->shield_normal_time_left--;
 
-	if (SHIELD_ON(player))
-	{
-	  player->shield_normal_time_left--;
-
-	  if (player->shield_deadly_time_left > 0)
-	    player->shield_deadly_time_left--;
-	}
+	if (player->shield_deadly_time_left > 0)
+	  player->shield_deadly_time_left--;
       }
+    }
+
+    if (!level.use_step_counter)
+    {
+      TimePlayed++;
 
       if (TimeLeft > 0)
       {
@@ -9708,19 +9708,6 @@ void ScrollPlayer(struct PlayerInfo *player, int mode)
 
       TimePlayed++;
 
-      for (i = 0; i < MAX_PLAYERS; i++)
-      {
-	struct PlayerInfo *player = &stored_player[i];
-
-	if (SHIELD_ON(player))
-	{
-	  player->shield_normal_time_left--;
-
-	  if (player->shield_deadly_time_left > 0)
-	    player->shield_deadly_time_left--;
-	}
-      }
-
       if (TimeLeft > 0)
       {
 	TimeLeft--;