rnd-20020920-2-src

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 9339d8055dac753f0995fec53ab7bcff1f0a3004..ec003823255dbc89b4f4660597fb52953720e6db 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -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_BURNING           (12) */
+  6,           /* GFX_ACTION_ACTIVE            (12)  */
   6            /* GFX_ACTION_OTHER             (13) */
 };
 
@@ -359,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.actice",                         "RocksElements.pcx"     },
+  { "dynamite.actice.xpos",                    "1"                     },
+  { "dynamite.actice.ypos",                    "3"                     },
+  { "dynamite.actice.frames",                  "7"                     },
 
   { "spaceship_right",                         "RocksElements.pcx"     },
   { "spaceship_right.xpos",                    "8"                     },
@@ -454,7 +454,11 @@ 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"                     },
@@ -497,14 +501,14 @@ struct ConfigInfo image_config[] =
   { "amoeba_dead4.ypos",                       "6"                     },
   { "amoeba_dead4.frames",                     "1"                     },
 
-  { "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"                     },
+  { "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"                     },
@@ -667,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.actice",                         "RocksElements.pcx"     },
+  { "dynabomb.actice.xpos",                    "12"                    },
+  { "dynabomb.actice.ypos",                    "11"                    },
+  { "dynabomb.actice.frames",                  "4"                     },
+  { "dynabomb.actice.pingpong",                "1"                     },
   { "dynabomb_nr",                             "RocksElements.pcx"     },
   { "dynabomb_nr.xpos",                                "12"                    },
   { "dynabomb_nr.ypos",                                "11"                    },
@@ -1621,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"                     },
@@ -1860,14 +1864,14 @@ 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"                     },
@@ -2276,7 +2280,7 @@ struct ConfigInfo sound_config[] =
   { "nut.impact",                      "klumpf.wav"            },
   { "dynamite.collecting",             "pong.wav"              },
   { "dynamite.dropping",               "deng.wav"              },
-  { "dynamite.burning",                        "zisch.wav"             },
+  { "dynamite.actice",                 "zisch.wav"             },
   { "key.collecting",                  "pong.wav"              },
   { "gate.passing",                    "gate.wav"              },
   { "bug.moving",                      "klapper.wav"           },
@@ -2358,7 +2362,7 @@ struct ConfigInfo sound_config[] =
   { "dynabomb_sz.collecting",          "pong.wav"              },
   { "dynabomb_xl.collecting",          "pong.wav"              },
   { "dynabomb.dropping",               "deng.wav"              },
-  { "dynabomb.burning",                        "zisch.wav"             },
+  { "dynabomb.actice",                 "zisch.wav"             },
   { "satellite.moving",                        SND_FILE_UNDEFINED      },
   { "satellite.waiting",               SND_FILE_UNDEFINED      },
   { "satellite.pushing",               "pusch.wav"             },