rnd-20020921-4-src
[rocksndiamonds.git] / src / main.c
index 4c3a0dbb92c3e9db86a8786353c3d002772cb62e..94fcc56e40e14e208e791218a6a68e1af7b02c36 100644 (file)
@@ -153,7 +153,7 @@ int anim_action_mapping[] =
   6,           /* GFX_ACTION_IMPACT            (9)  */
   6,           /* GFX_ACTION_CRACKING          (10)  */
   6,           /* GFX_ACTION_ACTIVATING        (11)  */
-  6,           /* GFX_ACTION_ACTIVE            (12)  */
+  6,           /* GFX_ACTION_EATING            (12)  */
   6            /* GFX_ACTION_OTHER             (13) */
 };
 
@@ -201,14 +201,18 @@ struct ConfigInfo image_config[] =
   { "quicksand_empty.xpos",                    "2"                     },
   { "quicksand_empty.ypos",                    "0"                     },
   { "quicksand_empty.frames",                  "1"                     },
+  { "quicksand.filling",                       "RocksElements.pcx"     },
+  { "quicksand.filling.xpos",                  "3"                     },
+  { "quicksand.filling.ypos",                  "0"                     },
+  { "quicksand.filling.frames",                        "1"                     },
   { "quicksand_full",                          "RocksElements.pcx"     },
   { "quicksand_full.xpos",                     "3"                     },
   { "quicksand_full.ypos",                     "0"                     },
   { "quicksand_full.frames",                   "1"                     },
-  { "quicksand_slipping",                      "RocksElements.pcx"     },
-  { "quicksand_slipping.xpos",                 "3"                     },
-  { "quicksand_slipping.ypos",                 "0"                     },
-  { "quicksand_slipping.frames",               "1"                     },
+  { "quicksand.emptying",                      "RocksElements.pcx"     },
+  { "quicksand.emptying.xpos",                 "3"                     },
+  { "quicksand.emptying.ypos",                 "0"                     },
+  { "quicksand.emptying.frames",               "1"                     },
 
   { "steelwall",                               "RocksElements.pcx"     },
   { "steelwall.xpos",                          "4"                     },
@@ -468,38 +472,38 @@ struct ConfigInfo image_config[] =
   { "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"                     },
+  { "amoeba.part1",                            "RocksElements.pcx"     },
+  { "amoeba.part1.xpos",                       "8"                     },
+  { "amoeba.part1.ypos",                       "6"                     },
+  { "amoeba.part1.frames",                     "1"                     },
+  { "amoeba.part2",                            "RocksElements.pcx"     },
+  { "amoeba.part2.xpos",                       "9"                     },
+  { "amoeba.part2.ypos",                       "6"                     },
+  { "amoeba.part2.frames",                     "1"                     },
+  { "amoeba.part3",                            "RocksElements.pcx"     },
+  { "amoeba.part3.xpos",                       "10"                    },
+  { "amoeba.part3.ypos",                       "6"                     },
+  { "amoeba.part3.frames",                     "1"                     },
+  { "amoeba.part4",                            "RocksElements.pcx"     },
+  { "amoeba.part4.xpos",                       "11"                    },
+  { "amoeba.part4.ypos",                       "6"                     },
+  { "amoeba.part4.frames",                     "1"                     },
+  { "amoeba_dead.part1",                       "RocksElements.pcx"     },
+  { "amoeba_dead.part1.xpos",                  "12"                    },
+  { "amoeba_dead.part1.ypos",                  "6"                     },
+  { "amoeba_dead.part1.frames",                        "1"                     },
+  { "amoeba_dead.part2",                       "RocksElements.pcx"     },
+  { "amoeba_dead.part2.xpos",                  "13"                    },
+  { "amoeba_dead.part2.ypos",                  "6"                     },
+  { "amoeba_dead.part2.frames",                        "1"                     },
+  { "amoeba_dead.part3",                       "RocksElements.pcx"     },
+  { "amoeba_dead.part3.xpos",                  "14"                    },
+  { "amoeba_dead.part3.ypos",                  "6"                     },
+  { "amoeba_dead.part3.frames",                        "1"                     },
+  { "amoeba_dead.part4",                       "RocksElements.pcx"     },
+  { "amoeba_dead.part4.xpos",                  "15"                    },
+  { "amoeba_dead.part4.ypos",                  "6"                     },
+  { "amoeba_dead.part4.frames",                        "1"                     },
 
   { "lamp",                                    "RocksElements.pcx"     },
   { "lamp.xpos",                               "0"                     },
@@ -523,6 +527,22 @@ struct ConfigInfo image_config[] =
   { "bd_amoeba.xpos",                          "8"                     },
   { "bd_amoeba.ypos",                          "7"                     },
   { "bd_amoeba.frames",                                "1"                     },
+  { "bd_amoeba.part1",                         "RocksElements.pcx"     },
+  { "bd_amoeba.part1.xpos",                    "8"                     },
+  { "bd_amoeba.part1.ypos",                    "6"                     },
+  { "bd_amoeba.part1.frames",                  "1"                     },
+  { "bd_amoeba.part2",                         "RocksElements.pcx"     },
+  { "bd_amoeba.part2.xpos",                    "9"                     },
+  { "bd_amoeba.part2.ypos",                    "6"                     },
+  { "bd_amoeba.part2.frames",                  "1"                     },
+  { "bd_amoeba.part3",                         "RocksElements.pcx"     },
+  { "bd_amoeba.part3.xpos",                    "10"                    },
+  { "bd_amoeba.part3.ypos",                    "6"                     },
+  { "bd_amoeba.part3.frames",                  "1"                     },
+  { "bd_amoeba.part4",                         "RocksElements.pcx"     },
+  { "bd_amoeba.part4.xpos",                    "11"                    },
+  { "bd_amoeba.part4.ypos",                    "6"                     },
+  { "bd_amoeba.part4.frames",                  "1"                     },
 
   { "sokoban_object",                          "RocksElements.pcx"     },
   { "sokoban_object.xpos",                     "9"                     },
@@ -545,6 +565,22 @@ struct ConfigInfo image_config[] =
   { "magic_wall.active.xpos",                  "0"                     },
   { "magic_wall.active.ypos",                  "8"                     },
   { "magic_wall.active.frames",                        "4"                     },
+  { "magic_wall.filling",                      "RocksElements.pcx"     },
+  { "magic_wall.filling.xpos",                 "0"                     },
+  { "magic_wall.filling.ypos",                 "8"                     },
+  { "magic_wall.filling.frames",               "4"                     },
+  { "magic_wall.full",                         "RocksElements.pcx"     },
+  { "magic_wall.full.xpos",                    "0"                     },
+  { "magic_wall.full.ypos",                    "8"                     },
+  { "magic_wall.full.frames",                  "4"                     },
+  { "magic_wall.emptying",                     "RocksElements.pcx"     },
+  { "magic_wall.emptying.xpos",                        "0"                     },
+  { "magic_wall.emptying.ypos",                        "8"                     },
+  { "magic_wall.emptying.frames",              "4"                     },
+  { "magic_wall.dead",                         "RocksElements.pcx"     },
+  { "magic_wall.dead.xpos",                    "0"                     },
+  { "magic_wall.dead.ypos",                    "8"                     },
+  { "magic_wall.dead.frames",                  "1"                     },
 
   { "bd_magic_wall",                           "RocksElements.pcx"     },
   { "bd_magic_wall.xpos",                      "12"                    },
@@ -554,6 +590,22 @@ struct ConfigInfo image_config[] =
   { "bd_magic_wall.active.xpos",               "12"                    },
   { "bd_magic_wall.active.ypos",               "10"                    },
   { "bd_magic_wall.active.frames",             "4"                     },
+  { "bd_magic_wall.filling",                   "RocksElements.pcx"     },
+  { "bd_magic_wall.filling.xpos",              "12"                    },
+  { "bd_magic_wall.filling.ypos",              "10"                    },
+  { "bd_magic_wall.filling.frames",            "4"                     },
+  { "bd_magic_wall.full",                      "RocksElements.pcx"     },
+  { "bd_magic_wall.full.xpos",                 "12"                    },
+  { "bd_magic_wall.full.ypos",                 "10"                    },
+  { "bd_magic_wall.full.frames",               "4"                     },
+  { "bd_magic_wall.emptying",                  "RocksElements.pcx"     },
+  { "bd_magic_wall.emptying.xpos",             "12"                    },
+  { "bd_magic_wall.emptying.ypos",             "10"                    },
+  { "bd_magic_wall.emptying.frames",           "4"                     },
+  { "bd_magic_wall.dead",                      "RocksElements.pcx"     },
+  { "bd_magic_wall.dead.xpos",                 "12"                    },
+  { "bd_magic_wall.dead.ypos",                 "10"                    },
+  { "bd_magic_wall.dead.frames",               "1"                     },
 
   { "wall_emerald",                            "RocksElements.pcx"     },
   { "wall_emerald.xpos",                       "4"                     },
@@ -685,23 +737,6 @@ struct ConfigInfo image_config[] =
   { "dynabomb_sz.ypos",                                "11"                    },
   { "dynabomb_sz.frames",                      "1"                     },
 
-  { "arrow_left",                              "RocksElements.pcx"     },
-  { "arrow_left.xpos",                         "0"                     },
-  { "arrow_left.ypos",                         "12"                    },
-  { "arrow_left.frames",                       "1"                     },
-  { "arrow_right",                             "RocksElements.pcx"     },
-  { "arrow_right.xpos",                                "1"                     },
-  { "arrow_right.ypos",                                "12"                    },
-  { "arrow_right.frames",                      "1"                     },
-  { "arrow_up",                                        "RocksElements.pcx"     },
-  { "arrow_up.xpos",                           "2"                     },
-  { "arrow_up.ypos",                           "12"                    },
-  { "arrow_up.frames",                         "1"                     },
-  { "arrow_down",                              "RocksElements.pcx"     },
-  { "arrow_down.xpos",                         "3"                     },
-  { "arrow_down.ypos",                         "12"                    },
-  { "arrow_down.frames",                       "1"                     },
-
   { "bd_butterfly",                            "RocksElements.pcx"     },
   { "bd_butterfly.xpos",                       "4"                     },
   { "bd_butterfly.ypos",                       "12"                    },
@@ -769,39 +804,51 @@ struct ConfigInfo image_config[] =
   { "steelwall_topright.ypos",                 "13"                    },
   { "steelwall_topright.frames",               "1"                     },
   { "steelwall_bottomleft",                    "RocksElements.pcx"     },
-  { "steelwall_bottomleft.xpos",               "1"                     },
+  { "steelwall_bottomleft.xpos",               "2"                     },
   { "steelwall_bottomleft.ypos",               "13"                    },
   { "steelwall_bottomleft.frames",             "1"                     },
   { "steelwall_bottomright",                   "RocksElements.pcx"     },
-  { "steelwall_bottomright.xpos",              "1"                     },
+  { "steelwall_bottomright.xpos",              "3"                     },
   { "steelwall_bottomright.ypos",              "13"                    },
   { "steelwall_bottomright.frames",            "1"                     },
   { "steelwall_horizontal",                    "RocksElements.pcx"     },
-  { "steelwall_horizontal.xpos",               "1"                     },
+  { "steelwall_horizontal.xpos",               "4"                     },
   { "steelwall_horizontal.ypos",               "13"                    },
   { "steelwall_horizontal.frames",             "1"                     },
+  { "steelwall_vertical",                      "RocksElements.pcx"     },
+  { "steelwall_vertical.xpos",                 "5"                     },
+  { "steelwall_vertical.ypos",                 "13"                    },
+  { "steelwall_vertical.frames",               "1"                     },
 
   { "invisible_steelwall_topleft",             "RocksElements.pcx"     },
-  { "invisible_steelwall_topleft.xpos",                "0"                     },
+  { "invisible_steelwall_topleft.xpos",                "6"                     },
   { "invisible_steelwall_topleft.ypos",                "13"                    },
   { "invisible_steelwall_topleft.frames",      "1"                     },
   { "invisible_steelwall_topright",            "RocksElements.pcx"     },
-  { "invisible_steelwall_topright.xpos",       "1"                     },
+  { "invisible_steelwall_topright.xpos",       "7"                     },
   { "invisible_steelwall_topright.ypos",       "13"                    },
   { "invisible_steelwall_topright.frames",     "1"                     },
   { "invisible_steelwall_bottomleft",          "RocksElements.pcx"     },
-  { "invisible_steelwall_bottomleft.xpos",     "1"                     },
+  { "invisible_steelwall_bottomleft.xpos",     "8"                     },
   { "invisible_steelwall_bottomleft.ypos",     "13"                    },
   { "invisible_steelwall_bottomleft.frames",   "1"                     },
   { "invisible_steelwall_bottomright",         "RocksElements.pcx"     },
-  { "invisible_steelwall_bottomright.xpos",    "1"                     },
+  { "invisible_steelwall_bottomright.xpos",    "9"                     },
   { "invisible_steelwall_bottomright.ypos",    "13"                    },
   { "invisible_steelwall_bottomright.frames",  "1"                     },
   { "invisible_steelwall_horizontal",          "RocksElements.pcx"     },
-  { "invisible_steelwall_horizontal.xpos",     "1                    },
+  { "invisible_steelwall_horizontal.xpos",     "10"                    },
   { "invisible_steelwall_horizontal.ypos",     "13"                    },
   { "invisible_steelwall_horizontal.frames",   "1"                     },
-
+  { "invisible_steelwall_vertical",            "RocksElements.pcx"     },
+  { "invisible_steelwall_vertical.xpos",       "11"                    },
+  { "invisible_steelwall_vertical.ypos",       "13"                    },
+  { "invisible_steelwall_vertical.frames",     "1"                     },
+
+  { "player1",                                 "RocksHeroes.pcx"       },
+  { "player1.xpos",                            "0"                     },
+  { "player1.ypos",                            "0"                     },
+  { "player1.frames",                          "1"                     },
   { "player1_down",                            "RocksHeroes.pcx"       },
   { "player1_down.xpos",                       "0"                     },
   { "player1_down.ypos",                       "0"                     },
@@ -859,6 +906,10 @@ struct ConfigInfo image_config[] =
   { "player1_right.pushing.ypos",              "2"                     },
   { "player1_right.pushing.frames",            "4"                     },
 
+  { "player2",                                 "RocksHeroes.pcx"       },
+  { "player2.xpos",                            "0"                     },
+  { "player2.ypos",                            "3"                     },
+  { "player2.frames",                          "1"                     },
   { "player2_down",                            "RocksHeroes.pcx"       },
   { "player2_down.xpos",                       "0"                     },
   { "player2_down.ypos",                       "3"                     },
@@ -916,6 +967,10 @@ struct ConfigInfo image_config[] =
   { "player2_right.pushing.ypos",              "5"                     },
   { "player2_right.pushing.frames",            "4"                     },
 
+  { "player3",                                 "RocksHeroes.pcx"       },
+  { "player3.xpos",                            "0"                     },
+  { "player3.ypos",                            "6"                     },
+  { "player3.frames",                          "1"                     },
   { "player3_down",                            "RocksHeroes.pcx"       },
   { "player3_down.xpos",                       "0"                     },
   { "player3_down.ypos",                       "6"                     },
@@ -973,6 +1028,10 @@ struct ConfigInfo image_config[] =
   { "player3_right.pushing.ypos",              "8"                     },
   { "player3_right.pushing.frames",            "4"                     },
 
+  { "player4",                                 "RocksHeroes.pcx"       },
+  { "player4.xpos",                            "0"                     },
+  { "player4.ypos",                            "9"                     },
+  { "player4.frames",                          "1"                     },
   { "player4_down",                            "RocksHeroes.pcx"       },
   { "player4_down.xpos",                       "0"                     },
   { "player4_down.ypos",                       "9"                     },
@@ -1250,68 +1309,68 @@ struct ConfigInfo image_config[] =
   { "acid.splashing_right.ypos",               "10"                    },
   { "acid.splashing_right.frames",             "4"                     },
 
-  { "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"                     },
-  { "flames_left1.ypos",                       "12"                    },
-  { "flames_left1.frames",                     "2"                     },
-  { "flames_left2",                            "RocksHeroes.pcx"       },
-  { "flames_left2.xpos",                       "9"                     },
-  { "flames_left2.ypos",                       "12"                    },
-  { "flames_left2.frames",                     "2"                     },
-  { "flames_left3",                            "RocksHeroes.pcx"       },
-  { "flames_left3.xpos",                       "10"                    },
-  { "flames_left3.ypos",                       "12"                    },
-  { "flames_left3.frames",                     "2"                     },
-
-  { "flames_right1",                           "RocksHeroes.pcx"       },
-  { "flames_right1.xpos",                      "8"                     },
-  { "flames_right1.ypos",                      "13"                    },
-  { "flames_right1.frames",                    "2"                     },
-  { "flames_right2",                           "RocksHeroes.pcx"       },
-  { "flames_right2.xpos",                      "9"                     },
-  { "flames_right2.ypos",                      "13"                    },
-  { "flames_right2.frames",                    "2"                     },
-  { "flames_right3",                           "RocksHeroes.pcx"       },
-  { "flames_right3.xpos",                      "10"                    },
-  { "flames_right3.ypos",                      "13"                    },
-  { "flames_right3.frames",                    "2"                     },
-
-  { "flames_up1",                              "RocksHeroes.pcx"       },
-  { "flames_up1.xpos",                         "8"                     },
-  { "flames_up1.ypos",                         "14"                    },
-  { "flames_up1.frames",                       "2"                     },
-  { "flames_up2",                              "RocksHeroes.pcx"       },
-  { "flames_up2.xpos",                         "9"                     },
-  { "flames_up2.ypos",                         "14"                    },
-  { "flames_up2.frames",                       "2"                     },
-  { "flames_up3",                              "RocksHeroes.pcx"       },
-  { "flames_up3.xpos",                         "10"                    },
-  { "flames_up3.ypos",                         "14"                    },
-  { "flames_up3.frames",                       "2"                     },
-
-  { "flames_down1",                            "RocksHeroes.pcx"       },
-  { "flames_down1.xpos",                       "8"                     },
-  { "flames_down1.ypos",                       "15"                    },
-  { "flames_down1.frames",                     "2"                     },
-  { "flames_down2",                            "RocksHeroes.pcx"       },
-  { "flames_down2.xpos",                       "9"                     },
-  { "flames_down2.ypos",                       "15"                    },
-  { "flames_down2.frames",                     "2"                     },
-  { "flames_down3",                            "RocksHeroes.pcx"       },
-  { "flames_down3.xpos",                       "10"                    },
-  { "flames_down3.ypos",                       "15"                    },
-  { "flames_down3.frames",                     "2"                     },
+  { "twinkle_blue",                            "RocksHeroes.pcx"       },
+  { "twinkle_blue.xpos",                       "8"                     },
+  { "twinkle_blue.ypos",                       "11"                    },
+  { "twinkle_blue.frames",                     "3"                     },
+  { "twinkle_blue.pingpong",                   "1"                     },
+  { "twinkle_white",                           "RocksHeroes.pcx"       },
+  { "twinkle_white.xpos",                      "8"                     },
+  { "twinkle_white.ypos",                      "11"                    },
+  { "twinkle_white.frames",                    "3"                     },
+  { "twinkle_white.pingpong",                  "1"                     },
+
+  { "dragon_fire_left1",                       "RocksHeroes.pcx"       },
+  { "dragon_fire_left1.xpos",                  "8"                     },
+  { "dragon_fire_left1.ypos",                  "12"                    },
+  { "dragon_fire_left1.frames",                        "2"                     },
+  { "dragon_fire_left2",                       "RocksHeroes.pcx"       },
+  { "dragon_fire_left2.xpos",                  "9"                     },
+  { "dragon_fire_left2.ypos",                  "12"                    },
+  { "dragon_fire_left2.frames",                        "2"                     },
+  { "dragon_fire_left3",                       "RocksHeroes.pcx"       },
+  { "dragon_fire_left3.xpos",                  "10"                    },
+  { "dragon_fire_left3.ypos",                  "12"                    },
+  { "dragon_fire_left3.frames",                        "2"                     },
+
+  { "dragon_fire_right1",                      "RocksHeroes.pcx"       },
+  { "dragon_fire_right1.xpos",                 "8"                     },
+  { "dragon_fire_right1.ypos",                 "13"                    },
+  { "dragon_fire_right1.frames",               "2"                     },
+  { "dragon_fire_right2",                      "RocksHeroes.pcx"       },
+  { "dragon_fire_right2.xpos",                 "9"                     },
+  { "dragon_fire_right2.ypos",                 "13"                    },
+  { "dragon_fire_right2.frames",               "2"                     },
+  { "dragon_fire_right3",                      "RocksHeroes.pcx"       },
+  { "dragon_fire_right3.xpos",                 "10"                    },
+  { "dragon_fire_right3.ypos",                 "13"                    },
+  { "dragon_fire_right3.frames",               "2"                     },
+
+  { "dragon_fire_up1",                         "RocksHeroes.pcx"       },
+  { "dragon_fire_up1.xpos",                    "8"                     },
+  { "dragon_fire_up1.ypos",                    "14"                    },
+  { "dragon_fire_up1.frames",                  "2"                     },
+  { "dragon_fire_up2",                         "RocksHeroes.pcx"       },
+  { "dragon_fire_up2.xpos",                    "9"                     },
+  { "dragon_fire_up2.ypos",                    "14"                    },
+  { "dragon_fire_up2.frames",                  "2"                     },
+  { "dragon_fire_up3",                         "RocksHeroes.pcx"       },
+  { "dragon_fire_up3.xpos",                    "10"                    },
+  { "dragon_fire_up3.ypos",                    "14"                    },
+  { "dragon_fire_up3.frames",                  "2"                     },
+
+  { "dragon_fire_down1",                       "RocksHeroes.pcx"       },
+  { "dragon_fire_down1.xpos",                  "8"                     },
+  { "dragon_fire_down1.ypos",                  "15"                    },
+  { "dragon_fire_down1.frames",                        "2"                     },
+  { "dragon_fire_down2",                       "RocksHeroes.pcx"       },
+  { "dragon_fire_down2.xpos",                  "9"                     },
+  { "dragon_fire_down2.ypos",                  "15"                    },
+  { "dragon_fire_down2.frames",                        "2"                     },
+  { "dragon_fire_down3",                       "RocksHeroes.pcx"       },
+  { "dragon_fire_down3.xpos",                  "10"                    },
+  { "dragon_fire_down3.ypos",                  "15"                    },
+  { "dragon_fire_down3.frames",                        "2"                     },
 
   { "sp_empty_space",                          "RocksSP.pcx"           },
   { "sp_empty_space.xpos",                     "0"                     },
@@ -1582,19 +1641,19 @@ struct ConfigInfo image_config[] =
   { "sp_terminal.xpos",                                "8"                     },
   { "sp_terminal.ypos",                                "11"                    },
   { "sp_terminal.frames",                      "7"                     },
-  { "sp_terminal_active",                      "RocksSP.pcx"           },
-  { "sp_terminal_active.xpos",                 "8"                     },
-  { "sp_terminal_active.ypos",                 "12"                    },
-  { "sp_terminal_active.frames",               "7"                     },
+  { "sp_terminal.active",                      "RocksSP.pcx"           },
+  { "sp_terminal.active.xpos",                 "8"                     },
+  { "sp_terminal.active.ypos",                 "12"                    },
+  { "sp_terminal.active.frames",               "7"                     },
 
   { "sp_buggy_base",                           "RocksSP.pcx"           },
   { "sp_buggy_base.xpos",                      "1"                     },
   { "sp_buggy_base.ypos",                      "3"                     },
   { "sp_buggy_base.frames",                    "1"                     },
-  { "sp_buggy_base.activating",                        "RocksSP.pcx"           },
-  { "sp_buggy_base.activating.xpos",           "8"                     },
-  { "sp_buggy_base.activating.ypos",           "6"                     },
-  { "sp_buggy_base.activating.frames",         "4"                     },
+  { "sp_buggy_base.active",                    "RocksSP.pcx"           },
+  { "sp_buggy_base.active.xpos",               "8"                     },
+  { "sp_buggy_base.active.ypos",               "6"                     },
+  { "sp_buggy_base.active.frames",             "4"                     },
 
   { "sp_hard_base1",                           "RocksSP.pcx"           },
   { "sp_hard_base1.xpos",                      "4"                     },
@@ -1873,14 +1932,14 @@ struct ConfigInfo image_config[] =
   { "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.active",                   "RocksDC.pcx"           },
-  { "timegate_wheel.active.xpos",              "0"                     },
-  { "timegate_wheel.active.ypos",              "15"                    },
-  { "timegate_wheel.active.frames",            "4"                     },
+  { "timegate_switch",                         "RocksDC.pcx"           },
+  { "timegate_switch.xpos",                    "0"                     },
+  { "timegate_switch.ypos",                    "15"                    },
+  { "timegate_switch.frames",                  "1"                     },
+  { "timegate_switch.active",                  "RocksDC.pcx"           },
+  { "timegate_switch.active.xpos",             "0"                     },
+  { "timegate_switch.active.ypos",             "15"                    },
+  { "timegate_switch.active.frames",           "4"                     },
 
   { "envelope",                                        "RocksDC.pcx"           },
   { "envelope.xpos",                           "4"                     },
@@ -1968,26 +2027,26 @@ struct ConfigInfo image_config[] =
   { "balloon.moving.frames",                   "4"                     },
   { "balloon.moving.pingpong",                 "1"                     },
 
-  { "balloon_windrose_left",                   "RocksDC.pcx"           },
-  { "balloon_windrose_left.xpos",              "8"                     },
-  { "balloon_windrose_left.ypos",              "7"                     },
-  { "balloon_windrose_left.frames",            "1"                     },
-  { "balloon_windrose_right",                  "RocksDC.pcx"           },
-  { "balloon_windrose_right.xpos",             "9"                     },
-  { "balloon_windrose_right.ypos",             "7"                     },
-  { "balloon_windrose_right.frames",           "1"                     },
-  { "balloon_windrose_up",                     "RocksDC.pcx"           },
-  { "balloon_windrose_up.xpos",                        "10"                    },
-  { "balloon_windrose_up.ypos",                        "7"                     },
-  { "balloon_windrose_up.frames",              "1"                     },
-  { "balloon_windrose_down",                   "RocksDC.pcx"           },
-  { "balloon_windrose_down.xpos",              "11"                    },
-  { "balloon_windrose_down.ypos",              "7"                     },
-  { "balloon_windrose_down.frames",            "1"                     },
-  { "balloon_windrose_all",                    "RocksDC.pcx"           },
-  { "balloon_windrose_all.xpos",               "7"                     },
-  { "balloon_windrose_all.ypos",               "0"                     },
-  { "balloon_windrose_all.frames",             "1"                     },
+  { "balloon_send_left",                       "RocksDC.pcx"           },
+  { "balloon_send_left.xpos",                  "8"                     },
+  { "balloon_send_left.ypos",                  "7"                     },
+  { "balloon_send_left.frames",                        "1"                     },
+  { "balloon_send_right",                      "RocksDC.pcx"           },
+  { "balloon_send_right.xpos",                 "9"                     },
+  { "balloon_send_right.ypos",                 "7"                     },
+  { "balloon_send_right.frames",               "1"                     },
+  { "balloon_send_up",                         "RocksDC.pcx"           },
+  { "balloon_send_up.xpos",                    "10"                    },
+  { "balloon_send_up.ypos",                    "7"                     },
+  { "balloon_send_up.frames",                  "1"                     },
+  { "balloon_send_down",                       "RocksDC.pcx"           },
+  { "balloon_send_down.xpos",                  "11"                    },
+  { "balloon_send_down.ypos",                  "7"                     },
+  { "balloon_send_down.frames",                        "1"                     },
+  { "balloon_send_any_direction",              "RocksDC.pcx"           },
+  { "balloon_send_any_direction.xpos",         "7"                     },
+  { "balloon_send_any_direction.ypos",         "0"                     },
+  { "balloon_send_any_direction.frames",       "1"                     },
 
   { "emc_steelwall1",                          "RocksDC.pcx"           },
   { "emc_steelwall1.xpos",                     "14"                    },
@@ -2175,18 +2234,14 @@ struct ConfigInfo image_config[] =
   { "tube_left_up.ypos",                       "7"                     },
   { "tube_left_up.frames",                     "1"                     },
 
-  { "trap_inactive",                           "RocksMore.pcx"         },
-  { "trap_inactive.xpos",                      "4"                     },
-  { "trap_inactive.ypos",                      "0"                     },
-  { "trap_inactive.frames",                    "1"                     },
-  { "trap_active",                             "RocksMore.pcx"         },
-  { "trap_active.xpos",                                "7"                     },
-  { "trap_active.ypos",                                "0"                     },
-  { "trap_active.frames",                      "1"                     },
-  { "trap.activating",                         "RocksMore.pcx"         },
-  { "trap.activating.xpos",                    "4"                     },
-  { "trap.activating.ypos",                    "0"                     },
-  { "trap.activating.frames",                  "4"                     },
+  { "trap",                                    "RocksMore.pcx"         },
+  { "trap.xpos",                               "4"                     },
+  { "trap.ypos",                               "0"                     },
+  { "trap.frames",                             "1"                     },
+  { "trap.active",                             "RocksMore.pcx"         },
+  { "trap.active.xpos",                                "4"                     },
+  { "trap.active.ypos",                                "0"                     },
+  { "trap.active.frames",                      "4"                     },
 
   { "bd_wall",                                 "RocksMore.pcx"         },
   { "bd_wall.xpos",                            "4"                     },
@@ -2206,10 +2261,10 @@ struct ConfigInfo image_config[] =
   { "bd_rock.pushing.ypos",                    "2"                     },
   { "bd_rock.pushing.frames",                  "4"                     },
 
-  { "dx_bomb",                                 "RocksMore.pcx"         },
-  { "dx_bomb.xpos",                            "7"                     },
-  { "dx_bomb.ypos",                            "1"                     },
-  { "dx_bomb.frames",                          "1"                     },
+  { "dx_supabomb",                             "RocksMore.pcx"         },
+  { "dx_supabomb.xpos",                                "7"                     },
+  { "dx_supabomb.ypos",                                "1"                     },
+  { "dx_supabomb.frames",                      "1"                     },
 
   { NULL,                                      NULL                    }
 };
@@ -2240,7 +2295,7 @@ struct ConfigInfo sound_config[] =
   { "sp_empty_space.digging",          "empty.wav"             },
   { "sp_base.digging",                 "base.wav"              },
   { "sp_buggy_base.digging",           "base.wav"              },
-  { "sp_buggy_base.activating",                "bug.wav"               },
+  { "sp_buggy_base.active",            "bug.wav"               },
   { "sp_infotron.collecting",          "infotron.wav"          },
   { "sp_infotron.impact",              "pling.wav"             },
   { "sp_zonk.pushing",                 "zonkpush.wav"          },
@@ -2338,8 +2393,8 @@ struct ConfigInfo sound_config[] =
   { "switchgate.opening",              "oeffnen.wav"           },
   { "switchgate.closing",              "oeffnen.wav"           },
   { "switchgate.passing",              "gate.wav"              },
-  { "timegate_wheel.activating",       "deng.wav"              },
-  { "timegate_wheel.active",           "miep.wav"              },
+  { "timegate_switch.activating",      "deng.wav"              },
+  { "timegate_switch.active",          "miep.wav"              },
   { "timegate.opening",                        "oeffnen.wav"           },
   { "timegate.closing",                        "oeffnen.wav"           },
   { "timegate.passing",                        "gate.wav"              },
@@ -2768,11 +2823,11 @@ struct ElementInfo element_info[MAX_ELEMENTS] =
   { "shield_deadly",           "shield (deadly, kills enemies)"},
   { "timegate",                        "time gate (open)"              },
   { "timegate",                        "time gate (closed)"            },
-  { "timegate_wheel",          "switch for time gate"          },
-  { "timegate_wheel",          "switch for time gate"          },
+  { "timegate_switch",         "switch for time gate"          },
+  { "timegate_switch",         "switch for time gate"          },
   { "balloon",                 "balloon"                       },
-  { "wall",                    "send balloon to the left"      },
-  { "wall",                    "send balloon to the right"     },
+  { "balloon_switch",          "send balloon to the left"      },
+  { "balloon_switch",          "send balloon to the right"     },
   { "balloon_switch",          "send balloon up"               },
   { "balloon_switch",          "send balloon down"             },    /* 330 */
   { "balloon_switch",          "send balloon in any direction" },