rnd-20020921-2-src
[rocksndiamonds.git] / src / main.c
index c56de02bbba17e4ce7f2a7f358c017d327b37f53..4c3a0dbb92c3e9db86a8786353c3d002772cb62e 100644 (file)
@@ -55,7 +55,7 @@ int           lev_fieldx,lev_fieldy, scroll_x,scroll_y;
 int            FX = SX, FY = SY, ScrollStepSize;
 int            ScreenMovDir = MV_NO_MOVING, ScreenMovPos = 0;
 int            ScreenGfxPos = 0;
-int            BorderElement = EL_BETON;
+int            BorderElement = EL_STEELWALL;
 int            GameFrameDelay = GAME_FRAME_DELAY;
 int            FfwdFrameDelay = FFWD_FRAME_DELAY;
 int            BX1 = 0, BY1 = 0, BX2 = SCR_FIELDX-1, BY2 = SCR_FIELDY-1;
@@ -143,16 +143,18 @@ int anim_action_mapping[] =
   0,           /* GFX_ACTION_DEFAULT           (1)  */
   0,           /* GFX_ACTION_WAITING           (2)  */
 
-  1,           /* GFX_ACTION_MOVING            (3)  */
-  2,           /* GFX_ACTION_DIGGING           (4)  */
-  3,           /* GFX_ACTION_COLLECTING        (5)  */
-  4,           /* GFX_ACTION_PUSHING           (6)  */
-
-  5,           /* GFX_ACTION_PASSING           (7)  */
-  5,           /* GFX_ACTION_IMPACT            (8)  */
-  5,           /* GFX_ACTION_ACTIVATING        (9)  */
-  5,           /* GFX_ACTION_BURNING           (10) */
-  5            /* GFX_ACTION_OTHER             (11) */
+  1,           /* GFX_ACTION_FALLING           (3)  */
+  2,           /* GFX_ACTION_MOVING            (4)  */
+  3,           /* GFX_ACTION_DIGGING           (5)  */
+  4,           /* GFX_ACTION_COLLECTING        (6)  */
+  5,           /* GFX_ACTION_PUSHING           (7)  */
+
+  6,           /* GFX_ACTION_PASSING           (8)  */
+  6,           /* GFX_ACTION_IMPACT            (9)  */
+  6,           /* GFX_ACTION_CRACKING          (10)  */
+  6,           /* GFX_ACTION_ACTIVATING        (11)  */
+  6,           /* GFX_ACTION_ACTIVE            (12)  */
+  6            /* GFX_ACTION_OTHER             (13) */
 };
 
 struct ConfigInfo image_config_suffix[] =
@@ -160,6 +162,9 @@ struct ConfigInfo image_config_suffix[] =
   { ".xpos",                           "0"                     },
   { ".ypos",                           "0"                     },
   { ".frames",                         "1"                     },
+#if 0
+  { ".start_frame",                    "-1"                    },
+#endif
   { ".delay",                          "1"                     },
   { ".pingpong",                       "0"                     },
   { ".pingpong2",                      "0"                     },
@@ -200,10 +205,10 @@ struct ConfigInfo image_config[] =
   { "quicksand_full.xpos",                     "3"                     },
   { "quicksand_full.ypos",                     "0"                     },
   { "quicksand_full.frames",                   "1"                     },
-  { "quicksand_slipping_through",              "RocksElements.pcx"     },
-  { "quicksand_slipping_through.xpos",         "3"                     },
-  { "quicksand_slipping_through.ypos",         "0"                     },
-  { "quicksand_slipping_through.frames",       "1"                     },
+  { "quicksand_slipping",                      "RocksElements.pcx"     },
+  { "quicksand_slipping.xpos",                 "3"                     },
+  { "quicksand_slipping.ypos",                 "0"                     },
+  { "quicksand_slipping.frames",               "1"                     },
 
   { "steelwall",                               "RocksElements.pcx"     },
   { "steelwall.xpos",                          "4"                     },
@@ -354,10 +359,10 @@ struct ConfigInfo image_config[] =
   { "dynamite.xpos",                           "0"                     },
   { "dynamite.ypos",                           "3"                     },
   { "dynamite.frames",                         "1"                     },
-  { "dynamite.burning",                                "RocksElements.pcx"     },
-  { "dynamite.burning.xpos",                   "1"                     },
-  { "dynamite.burning.ypos",                   "3"                     },
-  { "dynamite.burning.frames",                 "7"                     },
+  { "dynamite.active",                         "RocksElements.pcx"     },
+  { "dynamite.active.xpos",                    "1"                     },
+  { "dynamite.active.ypos",                    "3"                     },
+  { "dynamite.active.frames",                  "7"                     },
 
   { "spaceship_right",                         "RocksElements.pcx"     },
   { "spaceship_right.xpos",                    "8"                     },
@@ -449,33 +454,61 @@ struct ConfigInfo image_config[] =
   { "robot_wheel",                             "RocksElements.pcx"     },
   { "robot_wheel.xpos",                                "0"                     },
   { "robot_wheel.ypos",                                "6"                     },
-  { "robot_wheel.frames",                      "4"                     },
+  { "robot_wheel.frames",                      "1"                     },
+  { "robot_wheel.active",                      "RocksElements.pcx"     },
+  { "robot_wheel.active.xpos",                 "0"                     },
+  { "robot_wheel.active.ypos",                 "6"                     },
+  { "robot_wheel.active.frames",               "4"                     },
 
   { "amoeba_drop",                             "RocksElements.pcx"     },
   { "amoeba_drop.xpos",                                "5"                     },
   { "amoeba_drop.ypos",                                "6"                     },
   { "amoeba_drop.frames",                      "1"                     },
-  { "amoeba.growing",                          "RocksElements.pcx"     },
-  { "amoeba.growing.xpos",                     "5"                     },
-  { "amoeba.growing.ypos",                     "6"                     },
-  { "amoeba.growing.frames",                   "3"                     },
-  { "amoeba",                                  "RocksElements.pcx"     },
-  { "amoeba.xpos",                             "8"                     },
-  { "amoeba.ypos",                             "6"                     },
-  { "amoeba.frames",                           "4"                     },
-  { "amoeba_dead",                             "RocksElements.pcx"     },
-  { "amoeba_dead.xpos",                                "12"                    },
-  { "amoeba_dead.ypos",                                "6"                     },
-  { "amoeba_dead.frames",                      "4"                     },
-
-  { "lamp_off",                                        "RocksElements.pcx"     },
-  { "lamp_off.xpos",                           "0"                     },
-  { "lamp_off.ypos",                           "7"                     },
-  { "lamp_off.frames",                         "1"                     },
-  { "lamp_on",                                 "RocksElements.pcx"     },
-  { "lamp_on.xpos",                            "1"                     },
-  { "lamp_on.ypos",                            "7"                     },
-  { "lamp_on.frames",                          "1"                     },
+  { "amoeba.creating",                         "RocksElements.pcx"     },
+  { "amoeba.creating.xpos",                    "5"                     },
+  { "amoeba.creating.ypos",                    "6"                     },
+  { "amoeba.creating.frames",                  "3"                     },
+  { "amoeba1",                                 "RocksElements.pcx"     },
+  { "amoeba1.xpos",                            "8"                     },
+  { "amoeba1.ypos",                            "6"                     },
+  { "amoeba1.frames",                          "1"                     },
+  { "amoeba2",                                 "RocksElements.pcx"     },
+  { "amoeba2.xpos",                            "9"                     },
+  { "amoeba2.ypos",                            "6"                     },
+  { "amoeba2.frames",                          "1"                     },
+  { "amoeba3",                                 "RocksElements.pcx"     },
+  { "amoeba3.xpos",                            "10"                    },
+  { "amoeba3.ypos",                            "6"                     },
+  { "amoeba3.frames",                          "1"                     },
+  { "amoeba4",                                 "RocksElements.pcx"     },
+  { "amoeba4.xpos",                            "11"                    },
+  { "amoeba4.ypos",                            "6"                     },
+  { "amoeba4.frames",                          "1"                     },
+  { "amoeba_dead1",                            "RocksElements.pcx"     },
+  { "amoeba_dead1.xpos",                       "12"                    },
+  { "amoeba_dead1.ypos",                       "6"                     },
+  { "amoeba_dead1.frames",                     "1"                     },
+  { "amoeba_dead2",                            "RocksElements.pcx"     },
+  { "amoeba_dead2.xpos",                       "13"                    },
+  { "amoeba_dead2.ypos",                       "6"                     },
+  { "amoeba_dead2.frames",                     "1"                     },
+  { "amoeba_dead3",                            "RocksElements.pcx"     },
+  { "amoeba_dead3.xpos",                       "14"                    },
+  { "amoeba_dead3.ypos",                       "6"                     },
+  { "amoeba_dead3.frames",                     "1"                     },
+  { "amoeba_dead4",                            "RocksElements.pcx"     },
+  { "amoeba_dead4.xpos",                       "15"                    },
+  { "amoeba_dead4.ypos",                       "6"                     },
+  { "amoeba_dead4.frames",                     "1"                     },
+
+  { "lamp",                                    "RocksElements.pcx"     },
+  { "lamp.xpos",                               "0"                     },
+  { "lamp.ypos",                               "7"                     },
+  { "lamp.frames",                             "1"                     },
+  { "lamp.active",                             "RocksElements.pcx"     },
+  { "lamp.active.xpos",                                "1"                     },
+  { "lamp.active.ypos",                                "7"                     },
+  { "lamp.active.frames",                      "1"                     },
 
   { "time_orb_full",                           "RocksElements.pcx"     },
   { "time_orb_full.xpos",                      "2"                     },
@@ -508,19 +541,19 @@ struct ConfigInfo image_config[] =
   { "magic_wall.xpos",                         "0"                     },
   { "magic_wall.ypos",                         "8"                     },
   { "magic_wall.frames",                       "1"                     },
-  { "magic_wall.running",                      "RocksElements.pcx"     },
-  { "magic_wall.running.xpos",                 "0"                     },
-  { "magic_wall.running.ypos",                 "8"                     },
-  { "magic_wall.running.frames",               "4"                     },
+  { "magic_wall.active",                       "RocksElements.pcx"     },
+  { "magic_wall.active.xpos",                  "0"                     },
+  { "magic_wall.active.ypos",                  "8"                     },
+  { "magic_wall.active.frames",                        "4"                     },
 
   { "bd_magic_wall",                           "RocksElements.pcx"     },
   { "bd_magic_wall.xpos",                      "12"                    },
   { "bd_magic_wall.ypos",                      "10"                    },
   { "bd_magic_wall.frames",                    "1"                     },
-  { "bd_magic_wall.running",                   "RocksElements.pcx"     },
-  { "bd_magic_wall.running.xpos",              "12"                    },
-  { "bd_magic_wall.running.ypos",              "10"                    },
-  { "bd_magic_wall.running.frames",            "4"                     },
+  { "bd_magic_wall.active",                    "RocksElements.pcx"     },
+  { "bd_magic_wall.active.xpos",               "12"                    },
+  { "bd_magic_wall.active.ypos",               "10"                    },
+  { "bd_magic_wall.active.frames",             "4"                     },
 
   { "wall_emerald",                            "RocksElements.pcx"     },
   { "wall_emerald.xpos",                       "4"                     },
@@ -638,11 +671,11 @@ struct ConfigInfo image_config[] =
   { "dark_yamyam.frames",                      "4"                     },
   { "dark_yamyam.pingpong",                    "1"                     },
 
-  { "dynabomb.burning",                                "RocksElements.pcx"     },
-  { "dynabomb.burning.xpos",                   "12"                    },
-  { "dynabomb.burning.ypos",                   "11"                    },
-  { "dynabomb.burning.frames",                 "4"                     },
-  { "dynabomb.burning.pingpong",               "1"                     },
+  { "dynabomb.active",                         "RocksElements.pcx"     },
+  { "dynabomb.active.xpos",                    "12"                    },
+  { "dynabomb.active.ypos",                    "11"                    },
+  { "dynabomb.active.frames",                  "4"                     },
+  { "dynabomb.active.pingpong",                "1"                     },
   { "dynabomb_nr",                             "RocksElements.pcx"     },
   { "dynabomb_nr.xpos",                                "12"                    },
   { "dynabomb_nr.ypos",                                "11"                    },
@@ -1006,16 +1039,16 @@ struct ConfigInfo image_config[] =
   { "wall.growing_up.ypos",                    "12"                    },
   { "wall.growing_up.frames",                  "3"                     },
 
-  { "shield_passive.activated",                        "RocksHeroes.pcx"       },
-  { "shield_passive.activated.xpos",           "1"                     },
-  { "shield_passive.activated.ypos",           "13"                    },
-  { "shield_passive.activated.frames",         "3"                     },
-  { "shield_passive.activated.pingpong",       "1"                     },
-  { "shield_active.activated",                 "RocksHeroes.pcx"       },
-  { "shield_active.activated.xpos",            "5"                     },
-  { "shield_active.activated.ypos",            "13"                    },
-  { "shield_active.activated.frames",          "3"                     },
-  { "shield_active.activated.pingpong",                "1"                     },
+  { "shield_normal.active",                    "RocksHeroes.pcx"       },
+  { "shield_normal.active.xpos",               "1"                     },
+  { "shield_normal.active.ypos",               "13"                    },
+  { "shield_normal.active.frames",             "3"                     },
+  { "shield_normal.active.pingpong",           "1"                     },
+  { "shield_deadly.active",                    "RocksHeroes.pcx"       },
+  { "shield_deadly.active.xpos",               "5"                     },
+  { "shield_deadly.active.ypos",               "13"                    },
+  { "shield_deadly.active.frames",             "3"                     },
+  { "shield_deadly.active.pingpong",           "1"                     },
 
   { "pig_down",                                        "RocksHeroes.pcx"       },
   { "pig_down.xpos",                           "8"                     },
@@ -1217,16 +1250,16 @@ struct ConfigInfo image_config[] =
   { "acid.splashing_right.ypos",               "10"                    },
   { "acid.splashing_right.frames",             "4"                     },
 
-  { "sparkling_blue",                          "RocksHeroes.pcx"       },
-  { "sparkling_blue.xpos",                     "8"                     },
-  { "sparkling_blue.ypos",                     "11"                    },
-  { "sparkling_blue.frames",                   "3"                     },
-  { "sparkling_blue.pingpong",                 "1"                     },
-  { "sparkling_white",                         "RocksHeroes.pcx"       },
-  { "sparkling_white.xpos",                    "8"                     },
-  { "sparkling_white.ypos",                    "11"                    },
-  { "sparkling_white.frames",                  "3"                     },
-  { "sparkling_white.pingpong",                        "1"                     },
+  { "spark_blue",                              "RocksHeroes.pcx"       },
+  { "spark_blue.xpos",                         "8"                     },
+  { "spark_blue.ypos",                         "11"                    },
+  { "spark_blue.frames",                       "3"                     },
+  { "spark_blue.pingpong",                     "1"                     },
+  { "spark_white",                             "RocksHeroes.pcx"       },
+  { "spark_white.xpos",                                "8"                     },
+  { "spark_white.ypos",                                "11"                    },
+  { "spark_white.frames",                      "3"                     },
+  { "spark_white.pingpong",                    "1"                     },
 
   { "flames_left1",                            "RocksHeroes.pcx"       },
   { "flames_left1.xpos",                       "8"                     },
@@ -1592,28 +1625,28 @@ struct ConfigInfo image_config[] =
   { "invisible_steelwall.xpos",                        "3"                     },
   { "invisible_steelwall.ypos",                        "5"                     },
   { "invisible_steelwall.frames",              "1"                     },
-  { "invisible_steelwall_on",                  "RocksSP.pcx"           },
-  { "invisible_steelwall_on.xpos",             "1"                     },
-  { "invisible_steelwall_on.ypos",             "5"                     },
-  { "invisible_steelwall_on.frames",           "1"                     },
+  { "invisible_steelwall.active",              "RocksSP.pcx"           },
+  { "invisible_steelwall.active.xpos",         "1"                     },
+  { "invisible_steelwall.active.ypos",         "5"                     },
+  { "invisible_steelwall.active.frames",       "1"                     },
 
   { "invisible_sand",                          "RocksSP.pcx"           },
   { "invisible_sand.xpos",                     "6"                     },
   { "invisible_sand.ypos",                     "5"                     },
   { "invisible_sand.frames",                   "1"                     },
-  { "invisible_sand_on",                       "RocksSP.pcx"           },
-  { "invisible_sand_on.xpos",                  "2"                     },
-  { "invisible_sand_on.ypos",                  "5"                     },
-  { "invisible_sand_on.frames",                        "1"                     },
+  { "invisible_sand.active",                   "RocksSP.pcx"           },
+  { "invisible_sand.active.xpos",              "2"                     },
+  { "invisible_sand.active.ypos",              "5"                     },
+  { "invisible_sand.active.frames",            "1"                     },
 
   { "invisible_wall",                          "RocksSP.pcx"           },
   { "invisible_wall.xpos",                     "7"                     },
   { "invisible_wall.ypos",                     "5"                     },
   { "invisible_wall.frames",                   "1"                     },
-  { "invisible_wall_on",                       "RocksSP.pcx"           },
-  { "invisible_wall_on.xpos",                  "5"                     },
-  { "invisible_wall_on.ypos",                  "5"                     },
-  { "invisible_wall_on.frames",                        "1"                     },
+  { "invisible_wall.active",                   "RocksSP.pcx"           },
+  { "invisible_wall.active.xpos",              "5"                     },
+  { "invisible_wall.active.ypos",              "5"                     },
+  { "invisible_wall.active.frames",            "1"                     },
 
   { "em_key1",                                 "RocksSP.pcx"           },
   { "em_key1.xpos",                            "4"                     },
@@ -1678,26 +1711,26 @@ struct ConfigInfo image_config[] =
   { "conveyor_belt1_middle.xpos",              "0"                     },
   { "conveyor_belt1_middle.ypos",              "0"                     },
   { "conveyor_belt1_middle.frames",            "1"                     },
-  { "conveyor_belt1_middle.running",           "RocksDC.pcx"           },
-  { "conveyor_belt1_middle.running.xpos",      "0"                     },
-  { "conveyor_belt1_middle.running.ypos",      "0"                     },
-  { "conveyor_belt1_middle.running.frames",    "8"                     },
+  { "conveyor_belt1_middle.active",            "RocksDC.pcx"           },
+  { "conveyor_belt1_middle.active.xpos",       "0"                     },
+  { "conveyor_belt1_middle.active.ypos",       "0"                     },
+  { "conveyor_belt1_middle.active.frames",     "8"                     },
   { "conveyor_belt1_left",                     "RocksDC.pcx"           },
   { "conveyor_belt1_left.xpos",                        "0"                     },
   { "conveyor_belt1_left.ypos",                        "1"                     },
   { "conveyor_belt1_left.frames",              "1"                     },
-  { "conveyor_belt1_left.running",             "RocksDC.pcx"           },
-  { "conveyor_belt1_left.running.xpos",                "0"                     },
-  { "conveyor_belt1_left.running.ypos",                "1"                     },
-  { "conveyor_belt1_left.running.frames",      "8"                     },
+  { "conveyor_belt1_left.active",              "RocksDC.pcx"           },
+  { "conveyor_belt1_left.active.xpos",         "0"                     },
+  { "conveyor_belt1_left.active.ypos",         "1"                     },
+  { "conveyor_belt1_left.active.frames",       "8"                     },
   { "conveyor_belt1_right",                    "RocksDC.pcx"           },
   { "conveyor_belt1_right.xpos",               "0"                     },
   { "conveyor_belt1_right.ypos",               "2"                     },
   { "conveyor_belt1_right.frames",             "1"                     },
-  { "conveyor_belt1_right.running",            "RocksDC.pcx"           },
-  { "conveyor_belt1_right.running.xpos",       "0"                     },
-  { "conveyor_belt1_right.running.ypos",       "2"                     },
-  { "conveyor_belt1_right.running.frames",     "8"                     },
+  { "conveyor_belt1_right.active",             "RocksDC.pcx"           },
+  { "conveyor_belt1_right.active.xpos",                "0"                     },
+  { "conveyor_belt1_right.active.ypos",                "2"                     },
+  { "conveyor_belt1_right.active.frames",      "8"                     },
   { "conveyor_belt1_switch_left",              "RocksDC.pcx"           },
   { "conveyor_belt1_switch_left.xpos",         "0"                     },
   { "conveyor_belt1_switch_left.ypos",         "12"                    },
@@ -1715,26 +1748,26 @@ struct ConfigInfo image_config[] =
   { "conveyor_belt2_middle.xpos",              "0"                     },
   { "conveyor_belt2_middle.ypos",              "3"                     },
   { "conveyor_belt2_middle.frames",            "1"                     },
-  { "conveyor_belt2_middle.running",           "RocksDC.pcx"           },
-  { "conveyor_belt2_middle.running.xpos",      "0"                     },
-  { "conveyor_belt2_middle.running.ypos",      "3"                     },
-  { "conveyor_belt2_middle.running.frames",    "8"                     },
+  { "conveyor_belt2_middle.active",            "RocksDC.pcx"           },
+  { "conveyor_belt2_middle.active.xpos",       "0"                     },
+  { "conveyor_belt2_middle.active.ypos",       "3"                     },
+  { "conveyor_belt2_middle.active.frames",     "8"                     },
   { "conveyor_belt2_left",                     "RocksDC.pcx"           },
   { "conveyor_belt2_left.xpos",                        "0"                     },
   { "conveyor_belt2_left.ypos",                        "4"                     },
   { "conveyor_belt2_left.frames",              "1"                     },
-  { "conveyor_belt2_left.running",             "RocksDC.pcx"           },
-  { "conveyor_belt2_left.running.xpos",                "0"                     },
-  { "conveyor_belt2_left.running.ypos",                "4"                     },
-  { "conveyor_belt2_left.running.frames",      "8"                     },
+  { "conveyor_belt2_left.active",              "RocksDC.pcx"           },
+  { "conveyor_belt2_left.active.xpos",         "0"                     },
+  { "conveyor_belt2_left.active.ypos",         "4"                     },
+  { "conveyor_belt2_left.active.frames",       "8"                     },
   { "conveyor_belt2_right",                    "RocksDC.pcx"           },
   { "conveyor_belt2_right.xpos",               "0"                     },
   { "conveyor_belt2_right.ypos",               "5"                     },
   { "conveyor_belt2_right.frames",             "1"                     },
-  { "conveyor_belt2_right.running",            "RocksDC.pcx"           },
-  { "conveyor_belt2_right.running.xpos",       "0"                     },
-  { "conveyor_belt2_right.running.ypos",       "5"                     },
-  { "conveyor_belt2_right.running.frames",     "8"                     },
+  { "conveyor_belt2_right.active",             "RocksDC.pcx"           },
+  { "conveyor_belt2_right.active.xpos",                "0"                     },
+  { "conveyor_belt2_right.active.ypos",                "5"                     },
+  { "conveyor_belt2_right.active.frames",      "8"                     },
   { "conveyor_belt2_switch_left",              "RocksDC.pcx"           },
   { "conveyor_belt2_switch_left.xpos",         "1"                     },
   { "conveyor_belt2_switch_left.ypos",         "12"                    },
@@ -1752,26 +1785,26 @@ struct ConfigInfo image_config[] =
   { "conveyor_belt3_middle.xpos",              "0"                     },
   { "conveyor_belt3_middle.ypos",              "6"                     },
   { "conveyor_belt3_middle.frames",            "1"                     },
-  { "conveyor_belt3_middle.running",           "RocksDC.pcx"           },
-  { "conveyor_belt3_middle.running.xpos",      "0"                     },
-  { "conveyor_belt3_middle.running.ypos",      "6"                     },
-  { "conveyor_belt3_middle.running.frames",    "8"                     },
+  { "conveyor_belt3_middle.active",            "RocksDC.pcx"           },
+  { "conveyor_belt3_middle.active.xpos",       "0"                     },
+  { "conveyor_belt3_middle.active.ypos",       "6"                     },
+  { "conveyor_belt3_middle.active.frames",     "8"                     },
   { "conveyor_belt3_left",                     "RocksDC.pcx"           },
   { "conveyor_belt3_left.xpos",                        "0"                     },
   { "conveyor_belt3_left.ypos",                        "7"                     },
   { "conveyor_belt3_left.frames",              "1"                     },
-  { "conveyor_belt3_left.running",             "RocksDC.pcx"           },
-  { "conveyor_belt3_left.running.xpos",                "0"                     },
-  { "conveyor_belt3_left.running.ypos",                "7"                     },
-  { "conveyor_belt3_left.running.frames",      "8"                     },
+  { "conveyor_belt3_left.active",              "RocksDC.pcx"           },
+  { "conveyor_belt3_left.active.xpos",         "0"                     },
+  { "conveyor_belt3_left.active.ypos",         "7"                     },
+  { "conveyor_belt3_left.active.frames",       "8"                     },
   { "conveyor_belt3_right",                    "RocksDC.pcx"           },
   { "conveyor_belt3_right.xpos",               "0"                     },
   { "conveyor_belt3_right.ypos",               "8"                     },
   { "conveyor_belt3_right.frames",             "1"                     },
-  { "conveyor_belt3_right.running",            "RocksDC.pcx"           },
-  { "conveyor_belt3_right.running.xpos",       "0"                     },
-  { "conveyor_belt3_right.running.ypos",       "8"                     },
-  { "conveyor_belt3_right.running.frames",     "8"                     },
+  { "conveyor_belt3_right.active",             "RocksDC.pcx"           },
+  { "conveyor_belt3_right.active.xpos",                "0"                     },
+  { "conveyor_belt3_right.active.ypos",                "8"                     },
+  { "conveyor_belt3_right.active.frames",      "8"                     },
   { "conveyor_belt3_switch_left",              "RocksDC.pcx"           },
   { "conveyor_belt3_switch_left.xpos",         "2"                     },
   { "conveyor_belt3_switch_left.ypos",         "12"                    },
@@ -1789,26 +1822,26 @@ struct ConfigInfo image_config[] =
   { "conveyor_belt4_middle.xpos",              "0"                     },
   { "conveyor_belt4_middle.ypos",              "9"                     },
   { "conveyor_belt4_middle.frames",            "1"                     },
-  { "conveyor_belt4_middle.running",           "RocksDC.pcx"           },
-  { "conveyor_belt4_middle.running.xpos",      "0"                     },
-  { "conveyor_belt4_middle.running.ypos",      "9"                     },
-  { "conveyor_belt4_middle.running.frames",    "8"                     },
+  { "conveyor_belt4_middle.active",            "RocksDC.pcx"           },
+  { "conveyor_belt4_middle.active.xpos",       "0"                     },
+  { "conveyor_belt4_middle.active.ypos",       "9"                     },
+  { "conveyor_belt4_middle.active.frames",     "8"                     },
   { "conveyor_belt4_left",                     "RocksDC.pcx"           },
   { "conveyor_belt4_left.xpos",                        "0"                     },
   { "conveyor_belt4_left.ypos",                        "10"                    },
   { "conveyor_belt4_left.frames",              "1"                     },
-  { "conveyor_belt4_left.running",             "RocksDC.pcx"           },
-  { "conveyor_belt4_left.running.xpos",                "0"                     },
-  { "conveyor_belt4_left.running.ypos",                "10"                    },
-  { "conveyor_belt4_left.running.frames",      "8"                     },
+  { "conveyor_belt4_left.active",              "RocksDC.pcx"           },
+  { "conveyor_belt4_left.active.xpos",         "0"                     },
+  { "conveyor_belt4_left.active.ypos",         "10"                    },
+  { "conveyor_belt4_left.active.frames",       "8"                     },
   { "conveyor_belt4_right",                    "RocksDC.pcx"           },
   { "conveyor_belt4_right.xpos",               "0"                     },
   { "conveyor_belt4_right.ypos",               "11"                    },
   { "conveyor_belt4_right.frames",             "1"                     },
-  { "conveyor_belt4_right.running",            "RocksDC.pcx"           },
-  { "conveyor_belt4_right.running.xpos",       "0"                     },
-  { "conveyor_belt4_right.running.ypos",       "11"                    },
-  { "conveyor_belt4_right.running.frames",     "8"                     },
+  { "conveyor_belt4_right.active",             "RocksDC.pcx"           },
+  { "conveyor_belt4_right.active.xpos",                "0"                     },
+  { "conveyor_belt4_right.active.ypos",                "11"                    },
+  { "conveyor_belt4_right.active.frames",      "8"                     },
   { "conveyor_belt4_switch_left",              "RocksDC.pcx"           },
   { "conveyor_belt4_switch_left.xpos",         "3"                     },
   { "conveyor_belt4_switch_left.ypos",         "12"                    },
@@ -1831,23 +1864,23 @@ struct ConfigInfo image_config[] =
   { "switchgate_switch_down.ypos",             "12"                    },
   { "switchgate_switch_down.frames",           "1"                     },
 
-  { "light_switch_off",                                "RocksDC.pcx"           },
-  { "light_switch_off.xpos",                   "6"                     },
-  { "light_switch_off.ypos",                   "12"                    },
-  { "light_switch_off.frames",                 "1"                     },
-  { "light_switch_on",                         "RocksDC.pcx"           },
-  { "light_switch_on.xpos",                    "7"                     },
-  { "light_switch_on.ypos",                    "12"                    },
-  { "light_switch_on.frames",                  "1"                     },
+  { "light_switch",                            "RocksDC.pcx"           },
+  { "light_switch.xpos",                       "6"                     },
+  { "light_switch.ypos",                       "12"                    },
+  { "light_switch.frames",                     "1"                     },
+  { "light_switch.active",                     "RocksDC.pcx"           },
+  { "light_switch.active.xpos",                        "7"                     },
+  { "light_switch.active.ypos",                        "12"                    },
+  { "light_switch.active.frames",              "1"                     },
 
   { "timegate_wheel",                          "RocksDC.pcx"           },
   { "timegate_wheel.xpos",                     "0"                     },
   { "timegate_wheel.ypos",                     "15"                    },
   { "timegate_wheel.frames",                   "1"                     },
-  { "timegate_wheel.running",                  "RocksDC.pcx"           },
-  { "timegate_wheel.running.xpos",             "0"                     },
-  { "timegate_wheel.running.ypos",             "15"                    },
-  { "timegate_wheel.running.frames",           "4"                     },
+  { "timegate_wheel.active",                   "RocksDC.pcx"           },
+  { "timegate_wheel.active.xpos",              "0"                     },
+  { "timegate_wheel.active.ypos",              "15"                    },
+  { "timegate_wheel.active.frames",            "4"                     },
 
   { "envelope",                                        "RocksDC.pcx"           },
   { "envelope.xpos",                           "4"                     },
@@ -1879,15 +1912,15 @@ struct ConfigInfo image_config[] =
   { "extra_time.ypos",                         "0"                     },
   { "extra_time.frames",                       "6"                     },
 
-  { "shield_active",                           "RocksDC.pcx"           },
-  { "shield_active.xpos",                      "8"                     },
-  { "shield_active.ypos",                      "1"                     },
-  { "shield_active.frames",                    "6"                     },
+  { "shield_deadly",                           "RocksDC.pcx"           },
+  { "shield_deadly.xpos",                      "8"                     },
+  { "shield_deadly.ypos",                      "1"                     },
+  { "shield_deadly.frames",                    "6"                     },
 
-  { "shield_passive",                          "RocksDC.pcx"           },
-  { "shield_passive.xpos",                     "8"                     },
-  { "shield_passive.ypos",                     "2"                     },
-  { "shield_passive.frames",                   "6"                     },
+  { "shield_normal",                           "RocksDC.pcx"           },
+  { "shield_normal.xpos",                      "8"                     },
+  { "shield_normal.ypos",                      "2"                     },
+  { "shield_normal.frames",                    "6"                     },
 
   { "switchgate_closed",                       "RocksDC.pcx"           },
   { "switchgate_closed.xpos",                  "8"                     },
@@ -2191,8 +2224,8 @@ struct ConfigInfo sound_config[] =
   { "bd_rock.pushing",                 "pusch.wav"             },
   { "bd_rock.impact",                  "klopf.wav"             },
   { "bd_magic_wall.activating",                "quirk.wav"             },
+  { "bd_magic_wall.active",            "miep.wav"              },
   { "bd_magic_wall.changing",          "quirk.wav"             },
-  { "bd_magic_wall.running",           "miep.wav"              },
   { "bd_amoeba.waiting",               SND_FILE_UNDEFINED      },
   { "bd_amoeba.creating",              "amoebe.wav"            },
   { "bd_amoeba.turning_to_gem",                "pling.wav"             },
@@ -2201,7 +2234,7 @@ struct ConfigInfo sound_config[] =
   { "bd_butterfly.waiting",            "klapper.wav"           },
   { "bd_firefly.moving",               "roehr.wav"             },
   { "bd_firefly.waiting",              "roehr.wav"             },
-  { "bd_exit.entering",                        "buing.wav"             },
+  { "bd_exit.passing",                 "buing.wav"             },
 
   /* sounds for Supaplex style elements and actions */
   { "sp_empty_space.digging",          "empty.wav"             },
@@ -2216,18 +2249,20 @@ struct ConfigInfo sound_config[] =
   { "sp_disk_orange.pushing",          "zonkpush.wav"          },
   { "sp_disk_yellow.pushing",          "pusch.wav"             },
   { "sp_port.passing",                 "gate.wav"              },
-  { "sp_exit.entering",                        "exit.wav"              },
+  { "sp_exit.passing",                 "exit.wav"              },
+  { "sp_exit.opening",                 SND_FILE_UNDEFINED      },
   { "sp_element.exploding",            "booom.wav"             },
   { "sp_sniksnak.moving",              SND_FILE_UNDEFINED      },
   { "sp_sniksnak.waiting",             SND_FILE_UNDEFINED      },
   { "sp_electron.moving",              SND_FILE_UNDEFINED      },
   { "sp_electron.waiting",             SND_FILE_UNDEFINED      },
   { "sp_terminal.activating",          SND_FILE_UNDEFINED      },
+  { "sp_terminal.active",              SND_FILE_UNDEFINED      },
 
   /* sounds for Sokoban style elements and actions */
   { "sokoban_object.pushing",          "pusch.wav"             },
   { "sokoban_field.filling",           "deng.wav"              },
-  { "sokoban_field.clearing",          SND_FILE_UNDEFINED      },
+  { "sokoban_field.emptying",          SND_FILE_UNDEFINED      },
   { "sokoban_game.solving",            "buing.wav"             },
 
   /* sounds for Emerald Mine style elements and actions */
@@ -2245,8 +2280,8 @@ struct ConfigInfo sound_config[] =
   { "nut.cracking",                    "knack.wav"             },
   { "nut.impact",                      "klumpf.wav"            },
   { "dynamite.collecting",             "pong.wav"              },
-  { "dynamite.placing",                        "deng.wav"              },
-  { "dynamite.burning",                        "zisch.wav"             },
+  { "dynamite.dropping",               "deng.wav"              },
+  { "dynamite.active",                 "zisch.wav"             },
   { "key.collecting",                  "pong.wav"              },
   { "gate.passing",                    "gate.wav"              },
   { "bug.moving",                      "klapper.wav"           },
@@ -2255,23 +2290,23 @@ struct ConfigInfo sound_config[] =
   { "spaceship.waiting",               "roehr.wav"             },
   { "yamyam.moving",                   SND_FILE_UNDEFINED      },
   { "yamyam.waiting",                  "njam.wav"              },
-  { "yamyam.eating_diamond",           SND_FILE_UNDEFINED      },
+  { "yamyam.eating",                   SND_FILE_UNDEFINED      },
   { "robot.stepping",                  "schlurf.wav"           },
   { "robot.waiting",                   SND_FILE_UNDEFINED      },
   { "robot_wheel.activating",          "deng.wav"              },
-  { "robot_wheel.running",             "miep.wav"              },
+  { "robot_wheel.active",              "miep.wav"              },
   { "magic_wall.activating",           "quirk.wav"             },
+  { "magic_wall.active",               "miep.wav"              },
   { "magic_wall.changing",             "quirk.wav"             },
-  { "magic_wall.running",              "miep.wav"              },
   { "amoeba.waiting",                  SND_FILE_UNDEFINED      },
   { "amoeba.creating",                 "amoebe.wav"            },
-  { "amoeba.dropping",                 SND_FILE_UNDEFINED      },
+  { "amoeba_drop.creating",            SND_FILE_UNDEFINED      },
   { "acid.splashing",                  "blurb.wav"             },
   { "quicksand.filling",               SND_FILE_UNDEFINED      },
-  { "quicksand.slipping_through",      SND_FILE_UNDEFINED      },
+  { "quicksand.slipping",              SND_FILE_UNDEFINED      },
   { "quicksand.emptying",              SND_FILE_UNDEFINED      },
   { "exit.opening",                    "oeffnen.wav"           },
-  { "exit.entering",                   "buing.wav"             },
+  { "exit.passing",                    "buing.wav"             },
 
   /* sounds for Emerald Mine Club style elements and actions */
   { "balloon.moving",                  SND_FILE_UNDEFINED      },
@@ -2291,25 +2326,26 @@ struct ConfigInfo sound_config[] =
   { "crystal.impact",                  "pling.wav"             },
   { "envelope.collecting",             "pong.wav"              },
   { "sand_invisible.digging",          "schlurf.wav"           },
-  { "shield_passive.collecting",       "pong.wav"              },
-  { "shield_passive.activated",                SND_FILE_UNDEFINED      },
-  { "shield_active.collecting",                "pong.wav"              },
-  { "shield_active.activated",         SND_FILE_UNDEFINED      },
+  { "shield_normal.collecting",                "pong.wav"              },
+  { "shield_normal.active",            SND_FILE_UNDEFINED      },
+  { "shield_deadly.collecting",                "pong.wav"              },
+  { "shield_deadly.active",            SND_FILE_UNDEFINED      },
   { "extra_time.collecting",           "gong.wav"              },
   { "mole.moving",                     SND_FILE_UNDEFINED      },
   { "mole.waiting",                    SND_FILE_UNDEFINED      },
-  { "mole.eating_amoeba",              "blurb.wav"             },
+  { "mole.eating",                     "blurb.wav"             },
   { "switchgate_switch.activating",    SND_FILE_UNDEFINED      },
   { "switchgate.opening",              "oeffnen.wav"           },
   { "switchgate.closing",              "oeffnen.wav"           },
   { "switchgate.passing",              "gate.wav"              },
   { "timegate_wheel.activating",       "deng.wav"              },
-  { "timegate_wheel.running",          "miep.wav"              },
+  { "timegate_wheel.active",           "miep.wav"              },
   { "timegate.opening",                        "oeffnen.wav"           },
   { "timegate.closing",                        "oeffnen.wav"           },
   { "timegate.passing",                        "gate.wav"              },
   { "conveyor_belt_switch.activating", SND_FILE_UNDEFINED      },
-  { "conveyor_belt.running",           SND_FILE_UNDEFINED      },
+  { "conveyor_belt_switch.deactivating",SND_FILE_UNDEFINED     },
+  { "conveyor_belt.active",            SND_FILE_UNDEFINED      },
   { "light_switch.activating",         SND_FILE_UNDEFINED      },
   { "light_switch.deactivating",       SND_FILE_UNDEFINED      },
 
@@ -2326,8 +2362,8 @@ struct ConfigInfo sound_config[] =
   { "dynabomb_nr.collecting",          "pong.wav"              },
   { "dynabomb_sz.collecting",          "pong.wav"              },
   { "dynabomb_xl.collecting",          "pong.wav"              },
-  { "dynabomb.placing",                        "deng.wav"              },
-  { "dynabomb.burning",                        "zisch.wav"             },
+  { "dynabomb.dropping",               "deng.wav"              },
+  { "dynabomb.active",                 "zisch.wav"             },
   { "satellite.moving",                        SND_FILE_UNDEFINED      },
   { "satellite.waiting",               SND_FILE_UNDEFINED      },
   { "satellite.pushing",               "pusch.wav"             },
@@ -2343,16 +2379,16 @@ struct ConfigInfo sound_config[] =
   { "biomaze.creating",                        "amoebe.wav"            },
   { "pacman.moving",                   SND_FILE_UNDEFINED      },
   { "pacman.waiting",                  SND_FILE_UNDEFINED      },
-  { "pacman.eating_amoeba",            SND_FILE_UNDEFINED      },
+  { "pacman.eating",                   SND_FILE_UNDEFINED      },
   { "dark_yamyam.moving",              SND_FILE_UNDEFINED      },
   { "dark_yamyam.waiting",             "njam.wav"              },
-  { "dark_yamyam.eating_any",          SND_FILE_UNDEFINED      },
+  { "dark_yamyam.eating",              SND_FILE_UNDEFINED      },
   { "penguin.moving",                  SND_FILE_UNDEFINED      },
   { "penguin.waiting",                 SND_FILE_UNDEFINED      },
-  { "penguin.entering_exit",           "buing.wav"             },
+  { "penguin.passing_exit",            "buing.wav"             },
   { "pig.moving",                      SND_FILE_UNDEFINED      },
   { "pig.waiting",                     SND_FILE_UNDEFINED      },
-  { "pig.eating_gem",                  SND_FILE_UNDEFINED      },
+  { "pig.eating",                      SND_FILE_UNDEFINED      },
   { "dragon.moving",                   SND_FILE_UNDEFINED      },
   { "dragon.waiting",                  SND_FILE_UNDEFINED      },
   { "dragon.attacking",                        SND_FILE_UNDEFINED      },
@@ -2671,7 +2707,7 @@ struct ElementInfo element_info[MAX_ELEMENTS] =
   { "gate",                    "white door"                    },    /* 260 */
   { "gate",                    "gray door (opened by white key)"},
   { "key",                     "white key"                     },
-  { "shield_passive",          "shield (passive)"              },
+  { "shield_normal",           "shield (normal)"               },
   { "extra_time",              "extra time"                    },
   { "switchgate",              "switch gate (open)"            },
   { "switchgate",              "switch gate (closed)"          },
@@ -2729,7 +2765,7 @@ struct ElementInfo element_info[MAX_ELEMENTS] =
   { NULL,                      "dx unknown 42"                 },
   { NULL,                      "-"                             },
   { NULL,                      "-"                             },    /* 320 */
-  { "shield_active",           "shield (active, kills enemies)"},
+  { "shield_deadly",           "shield (deadly, kills enemies)"},
   { "timegate",                        "time gate (open)"              },
   { "timegate",                        "time gate (closed)"            },
   { "timegate_wheel",          "switch for time gate"          },