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 12dc0ab0174e31444c1f84486234a1bcdb845a32..6ebcd68e99c7943a04995959825cdb7aebb222fe 100644 (file)
--- 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 2d700de56c57f00881fff17891060d930621781f..da757eabdd1d22e3970fc0979782850832e65be1 100644 (file)
--- 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 28e62676ac7227553680ac5c0a12ba2066ce3801..994c04f3f124846da6029299f01dd44c1bfba131 100644 (file)
--- 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--;