rnd-20030527-1-src

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index aba60774b3f5c75e9e1cf2d1245ad468779cb660..2ab42de2c8ddb1131f11f387118a12633f542d3c 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -1251,6 +1251,79 @@ void InitElementPropertiesStatic()
     -1
   };
 
+  static int ep_can_explode[] =
+  {
+    EL_BOMB,
+    EL_DYNAMITE_ACTIVE,
+    EL_DYNAMITE,
+    EL_DYNABOMB_PLAYER_1_ACTIVE,
+    EL_DYNABOMB_PLAYER_2_ACTIVE,
+    EL_DYNABOMB_PLAYER_3_ACTIVE,
+    EL_DYNABOMB_PLAYER_4_ACTIVE,
+    EL_DYNABOMB_INCREASE_NUMBER,
+    EL_DYNABOMB_INCREASE_SIZE,
+    EL_DYNABOMB_INCREASE_POWER,
+    EL_SP_DISK_RED_ACTIVE,
+    EL_BUG,
+    EL_MOLE,
+    EL_PENGUIN,
+    EL_PIG,
+    EL_DRAGON,
+    EL_SATELLITE,
+    EL_SP_DISK_RED,
+    EL_SP_DISK_ORANGE,
+    EL_SP_DISK_YELLOW,
+    EL_SP_SNIKSNAK,
+    EL_SP_ELECTRON,
+    EL_DX_SUPABOMB,
+    -1
+  };
+
+  static int ep_can_move[] =
+  {
+    /* only stored in level file */
+    EL_BUG_RIGHT,
+    EL_BUG_UP,
+    EL_BUG_LEFT,
+    EL_BUG_DOWN,
+    EL_SPACESHIP_RIGHT,
+    EL_SPACESHIP_UP,
+    EL_SPACESHIP_LEFT,
+    EL_SPACESHIP_DOWN,
+    EL_BD_BUTTERFLY_RIGHT,
+    EL_BD_BUTTERFLY_UP,
+    EL_BD_BUTTERFLY_LEFT,
+    EL_BD_BUTTERFLY_DOWN,
+    EL_BD_FIREFLY_RIGHT,
+    EL_BD_FIREFLY_UP,
+    EL_BD_FIREFLY_LEFT,
+    EL_BD_FIREFLY_DOWN,
+    EL_PACMAN_RIGHT,
+    EL_PACMAN_UP,
+    EL_PACMAN_LEFT,
+    EL_PACMAN_DOWN,
+
+    /* level file and runtime elements */
+    EL_BUG,
+    EL_SPACESHIP,
+    EL_BD_BUTTERFLY,
+    EL_BD_FIREFLY,
+    EL_YAMYAM,
+    EL_DARK_YAMYAM,
+    EL_ROBOT,
+    EL_PACMAN,
+    EL_MOLE,
+    EL_PENGUIN,
+    EL_PIG,
+    EL_DRAGON,
+    EL_SATELLITE,
+    EL_SP_SNIKSNAK,
+    EL_SP_ELECTRON,
+    EL_BALLOON,
+    EL_SPRING,
+    -1
+  };
+
   static int ep_can_fall[] =
   {
     EL_ROCK,
@@ -1382,28 +1455,19 @@ void InitElementPropertiesStatic()
   static int ep_pushable[] =
   {
     EL_ROCK,
-    EL_BD_ROCK,
     EL_BOMB,
+    EL_DX_SUPABOMB,
     EL_NUT,
     EL_TIME_ORB_EMPTY,
-    EL_SOKOBAN_FIELD_FULL,
-    EL_SOKOBAN_OBJECT,
-    EL_SATELLITE,
     EL_SP_ZONK,
     EL_SP_DISK_ORANGE,
+    EL_SPRING,
+    EL_BD_ROCK,
+    EL_SOKOBAN_OBJECT,
+    EL_SOKOBAN_FIELD_FULL,
+    EL_SATELLITE,
     EL_SP_DISK_YELLOW,
     EL_BALLOON,
-    EL_SPRING,
-    EL_DX_SUPABOMB,
-    -1
-  };
-
-  static int ep_player[] =
-  {
-    EL_PLAYER_1,
-    EL_PLAYER_2,
-    EL_PLAYER_3,
-    EL_PLAYER_4,
     -1
   };
 
@@ -1416,48 +1480,12 @@ void InitElementPropertiesStatic()
     -1
   };
 
-  static int ep_can_move[] =
+  static int ep_player[] =
   {
-    /* only stored in level file */
-    EL_BUG_RIGHT,
-    EL_BUG_UP,
-    EL_BUG_LEFT,
-    EL_BUG_DOWN,
-    EL_SPACESHIP_RIGHT,
-    EL_SPACESHIP_UP,
-    EL_SPACESHIP_LEFT,
-    EL_SPACESHIP_DOWN,
-    EL_BD_BUTTERFLY_RIGHT,
-    EL_BD_BUTTERFLY_UP,
-    EL_BD_BUTTERFLY_LEFT,
-    EL_BD_BUTTERFLY_DOWN,
-    EL_BD_FIREFLY_RIGHT,
-    EL_BD_FIREFLY_UP,
-    EL_BD_FIREFLY_LEFT,
-    EL_BD_FIREFLY_DOWN,
-    EL_PACMAN_RIGHT,
-    EL_PACMAN_UP,
-    EL_PACMAN_LEFT,
-    EL_PACMAN_DOWN,
-
-    /* level file and runtime elements */
-    EL_BUG,
-    EL_SPACESHIP,
-    EL_BD_BUTTERFLY,
-    EL_BD_FIREFLY,
-    EL_YAMYAM,
-    EL_DARK_YAMYAM,
-    EL_ROBOT,
-    EL_PACMAN,
-    EL_MOLE,
-    EL_PENGUIN,
-    EL_PIG,
-    EL_DRAGON,
-    EL_SATELLITE,
-    EL_SP_SNIKSNAK,
-    EL_SP_ELECTRON,
-    EL_BALLOON,
-    EL_SPRING,
+    EL_PLAYER_1,
+    EL_PLAYER_2,
+    EL_PLAYER_3,
+    EL_PLAYER_4,
     -1
   };
 
@@ -1553,34 +1581,6 @@ void InitElementPropertiesStatic()
     -1
   };
 
-  static int ep_can_explode[] =
-  {
-    EL_BOMB,
-    EL_DYNAMITE_ACTIVE,
-    EL_DYNAMITE,
-    EL_DYNABOMB_PLAYER_1_ACTIVE,
-    EL_DYNABOMB_PLAYER_2_ACTIVE,
-    EL_DYNABOMB_PLAYER_3_ACTIVE,
-    EL_DYNABOMB_PLAYER_4_ACTIVE,
-    EL_DYNABOMB_INCREASE_NUMBER,
-    EL_DYNABOMB_INCREASE_SIZE,
-    EL_DYNABOMB_INCREASE_POWER,
-    EL_SP_DISK_RED_ACTIVE,
-    EL_BUG,
-    EL_MOLE,
-    EL_PENGUIN,
-    EL_PIG,
-    EL_DRAGON,
-    EL_SATELLITE,
-    EL_SP_DISK_RED,
-    EL_SP_DISK_ORANGE,
-    EL_SP_DISK_YELLOW,
-    EL_SP_SNIKSNAK,
-    EL_SP_ELECTRON,
-    EL_DX_SUPABOMB,
-    -1
-  };
-
   static int ep_bd_element[] =
   {
     EL_EMPTY,
@@ -2474,6 +2474,18 @@ void InitElementPropertiesEngine(int engine_version)
                 (level.em_slippery_gems &&
                  engine_version > VERSION_IDENT(2,0,1)));
   }
+
+  /* dynamically adjust element properties according to game engine version */
+  if (engine_version < RELEASE_IDENT(2,2,0,7))
+  {
+    for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
+    {
+      int element = EL_CUSTOM_START + i;
+
+      element_info[element].push_delay_fixed = 2;
+      element_info[element].push_delay_random = 8;
+    }
+  }
 }
 
 static void InitGlobal()