rnd-20020921-4-src

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index 7c877f2dc26e56e4464d294744fa6d6138ace8a2..c2e69b87e351f5a6487a7daabfcedc2355d4c6b3 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -610,7 +610,7 @@ void InitElementInfo()
     { EL_AMOEBA_DROP,                  GFX_TROPFEN             },
     { EL_BOMB,                         GFX_BOMBE               },
     { EL_MAGIC_WALL,                   GFX_MAGIC_WALL_OFF      },
-    { EL_MAGIC_WALL_EMPTY,             GFX_MAGIC_WALL_EMPTY    },
+    { EL_MAGIC_WALL_ACTIVE,            GFX_MAGIC_WALL_EMPTY    },
     { EL_MAGIC_WALL_EMPTYING,          GFX_MAGIC_WALL_EMPTY    },
     { EL_MAGIC_WALL_FULL,              GFX_MAGIC_WALL_FULL     },
     { EL_MAGIC_WALL_DEAD,              GFX_MAGIC_WALL_DEAD     },
@@ -673,7 +673,7 @@ void InitElementInfo()
     { EL_WALL_EMERALD_PURPLE,          GFX_ERZ_EDEL_LILA       },
     { EL_DARK_YAMYAM,                  GFX_MAMPFER2            },
     { EL_BD_MAGIC_WALL,                        GFX_MAGIC_WALL_BD_OFF   },
-    { EL_BD_MAGIC_WALL_EMPTY,          GFX_MAGIC_WALL_BD_EMPTY },
+    { EL_BD_MAGIC_WALL_ACTIVE,         GFX_MAGIC_WALL_BD_EMPTY },
     { EL_BD_MAGIC_WALL_EMPTYING,       GFX_MAGIC_WALL_BD_EMPTY },
     { EL_BD_MAGIC_WALL_FULL,           GFX_MAGIC_WALL_BD_FULL  },
     { EL_BD_MAGIC_WALL_DEAD,           GFX_MAGIC_WALL_BD_DEAD  },
@@ -735,24 +735,36 @@ void InitElementInfo()
     { EL_CONVEYOR_BELT1_LEFT,          GFX_BELT1_LEFT          },
     { EL_CONVEYOR_BELT1_MIDDLE,                GFX_BELT1_MIDDLE        },
     { EL_CONVEYOR_BELT1_RIGHT,         GFX_BELT1_RIGHT         },
+    { EL_CONVEYOR_BELT1_LEFT_ACTIVE,   GFX_BELT1_LEFT          },
+    { EL_CONVEYOR_BELT1_MIDDLE_ACTIVE, GFX_BELT1_MIDDLE        },
+    { EL_CONVEYOR_BELT1_RIGHT_ACTIVE,  GFX_BELT1_RIGHT         },
     { EL_CONVEYOR_BELT1_SWITCH_LEFT,   GFX_BELT1_SWITCH_LEFT   },
     { EL_CONVEYOR_BELT1_SWITCH_MIDDLE, GFX_BELT1_SWITCH_MIDDLE },
     { EL_CONVEYOR_BELT1_SWITCH_RIGHT,  GFX_BELT1_SWITCH_RIGHT  },
     { EL_CONVEYOR_BELT2_LEFT,          GFX_BELT2_LEFT          },
     { EL_CONVEYOR_BELT2_MIDDLE,                GFX_BELT2_MIDDLE        },
     { EL_CONVEYOR_BELT2_RIGHT,         GFX_BELT2_RIGHT         },
+    { EL_CONVEYOR_BELT2_LEFT_ACTIVE,   GFX_BELT2_LEFT          },
+    { EL_CONVEYOR_BELT2_MIDDLE_ACTIVE, GFX_BELT2_MIDDLE        },
+    { EL_CONVEYOR_BELT2_RIGHT_ACTIVE,  GFX_BELT2_RIGHT         },
     { EL_CONVEYOR_BELT2_SWITCH_LEFT,   GFX_BELT2_SWITCH_LEFT   },
     { EL_CONVEYOR_BELT2_SWITCH_MIDDLE, GFX_BELT2_SWITCH_MIDDLE },
     { EL_CONVEYOR_BELT2_SWITCH_RIGHT,  GFX_BELT2_SWITCH_RIGHT  },
     { EL_CONVEYOR_BELT3_LEFT,          GFX_BELT3_LEFT          },
     { EL_CONVEYOR_BELT3_MIDDLE,                GFX_BELT3_MIDDLE        },
     { EL_CONVEYOR_BELT3_RIGHT,         GFX_BELT3_RIGHT         },
+    { EL_CONVEYOR_BELT3_LEFT_ACTIVE,   GFX_BELT3_LEFT          },
+    { EL_CONVEYOR_BELT3_MIDDLE_ACTIVE, GFX_BELT3_MIDDLE        },
+    { EL_CONVEYOR_BELT3_RIGHT_ACTIVE,  GFX_BELT3_RIGHT         },
     { EL_CONVEYOR_BELT3_SWITCH_LEFT,   GFX_BELT3_SWITCH_LEFT   },
     { EL_CONVEYOR_BELT3_SWITCH_MIDDLE, GFX_BELT3_SWITCH_MIDDLE },
     { EL_CONVEYOR_BELT3_SWITCH_RIGHT,  GFX_BELT3_SWITCH_RIGHT  },
     { EL_CONVEYOR_BELT4_LEFT,          GFX_BELT4_LEFT          },
     { EL_CONVEYOR_BELT4_MIDDLE,                GFX_BELT4_MIDDLE        },
     { EL_CONVEYOR_BELT4_RIGHT,         GFX_BELT4_RIGHT         },
+    { EL_CONVEYOR_BELT4_LEFT_ACTIVE,   GFX_BELT4_LEFT          },
+    { EL_CONVEYOR_BELT4_MIDDLE_ACTIVE, GFX_BELT4_MIDDLE        },
+    { EL_CONVEYOR_BELT4_RIGHT_ACTIVE,  GFX_BELT4_RIGHT         },
     { EL_CONVEYOR_BELT4_SWITCH_LEFT,   GFX_BELT4_SWITCH_LEFT   },
     { EL_CONVEYOR_BELT4_SWITCH_MIDDLE, GFX_BELT4_SWITCH_MIDDLE },
     { EL_CONVEYOR_BELT4_SWITCH_RIGHT,  GFX_BELT4_SWITCH_RIGHT  },
@@ -1140,13 +1152,13 @@ void InitElementProperties()
     EL_QUICKSAND_FILLING,
     EL_QUICKSAND_EMPTYING,
     EL_MAGIC_WALL,
-    EL_MAGIC_WALL_EMPTY,
+    EL_MAGIC_WALL_ACTIVE,
     EL_MAGIC_WALL_EMPTYING,
     EL_MAGIC_WALL_FILLING,
     EL_MAGIC_WALL_FULL,
     EL_MAGIC_WALL_DEAD,
     EL_BD_MAGIC_WALL,
-    EL_BD_MAGIC_WALL_EMPTY,
+    EL_BD_MAGIC_WALL_ACTIVE,
     EL_BD_MAGIC_WALL_EMPTYING,
     EL_BD_MAGIC_WALL_FULL,
     EL_BD_MAGIC_WALL_FILLING,
@@ -2056,6 +2068,23 @@ void InitElementProperties()
   };
   static int ep_belt_num = SIZEOF_ARRAY_INT(ep_belt);
 
+  static int ep_belt_active[] =
+  {
+    EL_CONVEYOR_BELT1_LEFT_ACTIVE,
+    EL_CONVEYOR_BELT1_MIDDLE_ACTIVE,
+    EL_CONVEYOR_BELT1_RIGHT_ACTIVE,
+    EL_CONVEYOR_BELT2_LEFT_ACTIVE,
+    EL_CONVEYOR_BELT2_MIDDLE_ACTIVE,
+    EL_CONVEYOR_BELT2_RIGHT_ACTIVE,
+    EL_CONVEYOR_BELT3_LEFT_ACTIVE,
+    EL_CONVEYOR_BELT3_MIDDLE_ACTIVE,
+    EL_CONVEYOR_BELT3_RIGHT_ACTIVE,
+    EL_CONVEYOR_BELT4_LEFT_ACTIVE,
+    EL_CONVEYOR_BELT4_MIDDLE_ACTIVE,
+    EL_CONVEYOR_BELT4_RIGHT_ACTIVE,
+  };
+  static int ep_belt_active_num = SIZEOF_ARRAY_INT(ep_belt_active);
+
   static int ep_belt_switch[] =
   {
     EL_CONVEYOR_BELT1_SWITCH_LEFT,
@@ -2126,6 +2155,7 @@ void InitElementProperties()
   static long ep2_bit[] =
   {
     EP_BIT_BELT,
+    EP_BIT_BELT_ACTIVE,
     EP_BIT_BELT_SWITCH,
     EP_BIT_TUBE
   };
@@ -2166,6 +2196,7 @@ void InitElementProperties()
   static int *ep2_array[] =
   {
     ep_belt,
+    ep_belt_active,
     ep_belt_switch,
     ep_tube
   };
@@ -2206,6 +2237,7 @@ void InitElementProperties()
   static int *ep2_num[] =
   {
     &ep_belt_num,
+    &ep_belt_active_num,
     &ep_belt_switch_num,
     &ep_tube_num
   };