rnd-20060121-2-src

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 50f262eba227cd1b4d88c495a4dfd6549b667d5e..9c2a781c24d24d166d433e6bb1205267b6ef1ca4 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -50,7 +50,7 @@ short                 StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short                  Back[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 boolean                        Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 boolean                        Pushed[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-boolean                        Changed[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short                  ChangeCount[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short                  ChangeEvent[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short                  WasJustMoving[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short                  WasJustFalling[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -3944,6 +3944,21 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "dripper",
     "dripper"
   },
+  {
+    "emc_spring_bumper.active",
+    "emc_spring_bumper",
+    "spring bumper",
+  },
+  {
+    "emc_android.shrinking",
+    "emc_android",
+    "android",
+  },
+  {
+    "emc_android.growing",
+    "emc_android",
+    "android",
+  },
 
   /* ----------------------------------------------------------------------- */
   /* "unreal" (and therefore not drawable) runtime elements                  */
@@ -4275,12 +4290,12 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "hide DX Boulderdash elements"
   },
   {
-    "internal_cascade_text",
+    "internal_cascade_chars",
     "internal",
     "show text elements"
   },
   {
-    "internal_cascade_text.active",
+    "internal_cascade_chars.active",
     "internal",
     "hide text elements"
   },
@@ -4327,12 +4342,12 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "internal_cascade_dynamic",
     "internal",
-    "show elements from this level"
+    "show elements used in this level"
   },
   {
     "internal_cascade_dynamic.active",
     "internal",
-    "hide elements from this level"
+    "hide elements used in this level"
   },
 
   /* keyword to stop parser: "ELEMENT_INFO_END" <-- do not change! */
@@ -4443,12 +4458,16 @@ struct ElementActionInfo element_action_info[NUM_ACTIONS + 1 + 1] =
   { NULL,                      0,                              0       }
 };
 
-struct ElementDirectionInfo element_direction_info[NUM_DIRECTIONS + 1] =
+struct ElementDirectionInfo element_direction_info[NUM_DIRECTIONS_FULL + 1] =
 {
   { ".left",           MV_BIT_LEFT                     },
   { ".right",          MV_BIT_RIGHT                    },
   { ".up",             MV_BIT_UP                       },
   { ".down",           MV_BIT_DOWN                     },
+  { ".upleft",         MV_BIT_UP                       },
+  { ".upright",                MV_BIT_RIGHT                    },
+  { ".downleft",       MV_BIT_LEFT                     },
+  { ".downright",      MV_BIT_DOWN                     },
 
   { NULL,              0                               }
 };
@@ -4499,9 +4518,13 @@ struct TokenIntPtrInfo image_config_vars[] =
   { "menu.list_size.SCORES",   &menu.list_size[GFX_SPECIAL_ARG_SCORES]    },
   { "menu.list_size.INFO",     &menu.list_size[GFX_SPECIAL_ARG_INFO]      },
 
+  { "door_1.width",            &door_1.width                              },
+  { "door_1.height",           &door_1.height                             },
   { "door_1.step_offset",      &door_1.step_offset                        },
   { "door_1.step_delay",       &door_1.step_delay                         },
   { "door_1.anim_mode",                &door_1.anim_mode                          },
+  { "door_2.width",            &door_2.width                              },
+  { "door_2.height",           &door_2.height                             },
   { "door_2.step_offset",      &door_2.step_offset                        },
   { "door_2.step_delay",       &door_2.step_delay                         },
   { "door_2.anim_mode",                &door_2.anim_mode                          },