rnd-20050525-1-src

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 012826ec7774105ef948bc504c1ad74c893a4287..8769913c2c62db8983194cd0f9b9b0ae3de4a076 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -750,7 +750,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "letter '$'"
   },
   {
-    "char_procent",
+    "char_percent",
     "char",
     "letter '%'"
   },
@@ -1782,7 +1782,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "balloon_switch_any",
     "balloon_switch",
-    "send balloon in any direction"
+    "send balloon in pressed direction"
   },
   {
     "emc_steelwall_1",
@@ -3464,91 +3464,6 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "balloon_switch",
     "stop moving balloon"
   },
-  {
-    "emc_level_border",
-    "wall",
-    "level border steelwall",
-  },
-  {
-    "emc_android",
-    "emc_android",
-    "android",
-  },
-  {
-    "emc_android_right",
-    "emc_android",
-    "android",
-  },
-  {
-    "emc_android_up",
-    "emc_android",
-    "android",
-  },
-  {
-    "emc_android_left",
-    "emc_android",
-    "android",
-  },
-  {
-    "emc_android_down",
-    "emc_android",
-    "android",
-  },
-  {
-    "emc_android_left_up",
-    "emc_android",
-    "android",
-  },
-  {
-    "emc_android_left_down",
-    "emc_android",
-    "android",
-  },
-  {
-    "emc_android_right_up",
-    "emc_android",
-    "android",
-  },
-  {
-    "emc_android_right_down",
-    "emc_android",
-    "android",
-  },
-  {
-    "emc_grass",
-    "emc_grass",
-    "grass",
-  },
-  {
-    "emc_generator_ball",
-    "emc_generator_ball",
-    "generator ball",
-  },
-  {
-    "emc_grow",
-    "emc_grow",
-    "grow",
-  },
-  {
-    "emc_gate_1",
-    "gate",
-    "door 1 (EMC style)",
-  },
-  {
-    "emc_gate_2",
-    "gate",
-    "door 2 (EMC style)",
-  },
-  {
-    "emc_gate_3",
-    "gate",
-    "door 3 (EMC style)",
-  },
-  {
-    "emc_gate_4",
-    "gate",
-    "door 4 (EMC style)",
-  },
   {
     "emc_gate_5",
     "gate",
@@ -3569,26 +3484,6 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "gate",
     "door 8 (EMC style)",
   },
-  {
-    "emc_gate_1_gray",
-    "gate",
-    "gray door (EMC style, key 1)",
-  },
-  {
-    "emc_gate_2_gray",
-    "gate",
-    "gray door (EMC style, key 2)",
-  },
-  {
-    "emc_gate_3_gray",
-    "gate",
-    "gray door (EMC style, key 3)",
-  },
-  {
-    "emc_gate_4_gray",
-    "gate",
-    "gray door (EMC style, key 4)",
-  },
   {
     "emc_gate_5_gray",
     "gate",
@@ -3609,26 +3504,6 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "gate",
     "gray door (EMC style, key 8)",
   },
-  {
-    "emc_key_1",
-    "key",
-    "key 1 (EMC style)",
-  },
-  {
-    "emc_key_2",
-    "key",
-    "key 2 (EMC style)",
-  },
-  {
-    "emc_key_3",
-    "key",
-    "key 3 (EMC style)",
-  },
-  {
-    "emc_key_4",
-    "key",
-    "key 4 (EMC style)",
-  },
   {
     "emc_key_5",
     "key",
@@ -3650,9 +3525,39 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "key 8 (EMC style)",
   },
   {
-    "emc_bumper",
-    "emc_bumper",
-    "bumper",
+    "emc_android",
+    "emc_android",
+    "android",
+  },
+  {
+    "emc_grass",
+    "emc_grass",
+    "grass",
+  },
+  {
+    "emc_magic_ball",
+    "emc_magic_ball",
+    "magic ball",
+  },
+  {
+    "emc_magic_ball.active",
+    "emc_magic_ball",
+    "magic ball (activated)",
+  },
+  {
+    "emc_magic_ball_switch",
+    "emc_magic_ball_switch",
+    "magic ball switch (off)",
+  },
+  {
+    "emc_magic_ball_switch.active",
+    "emc_magic_ball_switch",
+    "magic ball switch (on)",
+  },
+  {
+    "emc_spring_bumper",
+    "emc_spring_bumper",
+    "spring bumper",
   },
   {
     "emc_plant",
@@ -3669,6 +3574,81 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "emc_magnifier",
     "magnifier",
   },
+  {
+    "emc_wall_9",
+    "wall",
+    "normal wall"
+  },
+  {
+    "emc_wall_10",
+    "wall",
+    "normal wall"
+  },
+  {
+    "emc_wall_11",
+    "wall",
+    "normal wall"
+  },
+  {
+    "emc_wall_12",
+    "wall",
+    "normal wall"
+  },
+  {
+    "emc_wall_13",
+    "wall",
+    "normal wall"
+  },
+  {
+    "emc_wall_14",
+    "wall",
+    "normal wall"
+  },
+  {
+    "emc_wall_15",
+    "wall",
+    "normal wall"
+  },
+  {
+    "emc_wall_16",
+    "wall",
+    "normal wall"
+  },
+  {
+    "emc_wall_slippery_1",
+    "wall",
+    "slippery wall"
+  },
+  {
+    "emc_wall_slippery_2",
+    "wall",
+    "slippery wall"
+  },
+  {
+    "emc_wall_slippery_3",
+    "wall",
+    "slippery wall"
+  },
+  {
+    "emc_wall_slippery_4",
+    "wall",
+    "slippery wall"
+  },
+  {
+    "emc_fake_grass",
+    "fake grass",
+    "fake grass"
+  },
+  {
+    "emc_fake_acid",
+    "fake acid",
+    "fake acid"
+  },
+  {
+    "emc_dripper",
+    "dripper",
+    "dripper"
+  },
 
   /* ----------------------------------------------------------------------- */
   /* "real" (and therefore drawable) runtime elements                        */
@@ -4208,6 +4188,11 @@ struct ElementActionInfo element_action_info[NUM_ACTIONS + 1 + 1] =
   { ".turning_from_right",     ACTION_TURNING_FROM_RIGHT,      FALSE   },
   { ".turning_from_up",                ACTION_TURNING_FROM_UP,         FALSE   },
   { ".turning_from_down",      ACTION_TURNING_FROM_DOWN,       FALSE   },
+  { ".smashed_by_rock",                ACTION_SMASHED_BY_ROCK,         FALSE   },
+  { ".smashed_by_spring",      ACTION_SMASHED_BY_SPRING,       FALSE   },
+  { ".slurped_by_spring",      ACTION_SLURPED_BY_SPRING,       FALSE   },
+  { ".twinkling",              ACTION_TWINKLING,               FALSE   },
+  { ".splashing",              ACTION_SPLASHING,               FALSE   },
   { ".other",                  ACTION_OTHER,                   FALSE   },
 
   /* empty suffix always matches -- check as last entry in InitSoundInfo() */
@@ -4250,8 +4235,8 @@ struct TokenIntPtrInfo image_config_vars[] =
 {
   { "global.num_toons",                &global.num_toons                          },
 
-  { "menu.draw_xoffset",       &menu.draw_xoffset_default                 },
-  { "menu.draw_yoffset",       &menu.draw_yoffset_default                 },
+  { "menu.draw_xoffset",       &menu.draw_xoffset[GFX_SPECIAL_ARG_DEFAULT]},
+  { "menu.draw_yoffset",       &menu.draw_yoffset[GFX_SPECIAL_ARG_DEFAULT]},
   { "menu.draw_xoffset.MAIN",  &menu.draw_xoffset[GFX_SPECIAL_ARG_MAIN]   },
   { "menu.draw_yoffset.MAIN",  &menu.draw_yoffset[GFX_SPECIAL_ARG_MAIN]   },
   { "menu.draw_xoffset.LEVELS",        &menu.draw_xoffset[GFX_SPECIAL_ARG_LEVELS] },
@@ -4267,7 +4252,7 @@ struct TokenIntPtrInfo image_config_vars[] =
 
   { "menu.scrollbar_xoffset",  &menu.scrollbar_xoffset                    },
 
-  { "menu.list_size",          &menu.list_size_default                    },
+  { "menu.list_size",          &menu.list_size[GFX_SPECIAL_ARG_DEFAULT]   },
   { "menu.list_size.LEVELS",   &menu.list_size[GFX_SPECIAL_ARG_LEVELS]    },
   { "menu.list_size.SCORES",   &menu.list_size[GFX_SPECIAL_ARG_SCORES]    },
   { "menu.list_size.INFO",     &menu.list_size[GFX_SPECIAL_ARG_INFO]      },