added support for gravity settings in BD engine to level editor

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index 1abf844f2ff2132b1b26536d080136b7dbaa568e..57ce9d12dfcf7b2048be39dc2786d9346a963ddd 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -913,20 +913,21 @@
 
 #define IS_BD_EXPANDABLE_WALL(e)       ((e) == EL_BD_EXPANDABLE_WALL_HORIZONTAL ||     \
                                         (e) == EL_BD_EXPANDABLE_WALL_VERTICAL ||       \
-                                        (e) == EL_BD_EXPANDABLE_WALL_ANY ||            \
-                                        (e) == EL_BD_EXPANDABLE_STEELWALL_HORIZONTAL ||\
+                                        (e) == EL_BD_EXPANDABLE_WALL_ANY)
+
+#define IS_BD_EXPANDABLE_STEELWALL(e)  ((e) == EL_BD_EXPANDABLE_STEELWALL_HORIZONTAL ||\
                                         (e) == EL_BD_EXPANDABLE_STEELWALL_VERTICAL ||  \
                                         (e) == EL_BD_EXPANDABLE_STEELWALL_ANY)
 
-#define IS_BD_CONVEYOR_BELT(e)         ((e) == EL_BD_CONVEYOR_LEFT ||                  \
-                                        (e) == EL_BD_CONVEYOR_LEFT_ACTIVE ||           \
-                                        (e) == EL_BD_CONVEYOR_RIGHT ||                 \
+#define IS_BD_CONVEYOR_BELT(e)         ((e) == EL_BD_CONVEYOR_LEFT ||          \
+                                        (e) == EL_BD_CONVEYOR_LEFT_ACTIVE ||   \
+                                        (e) == EL_BD_CONVEYOR_RIGHT ||         \
                                         (e) == EL_BD_CONVEYOR_RIGHT_ACTIVE)
 
-#define IS_BD_CONVEYOR_BELT_SWITCH(e)  ((e) == EL_BD_CONVEYOR_SWITCH ||                \
-                                        (e) == EL_BD_CONVEYOR_SWITCH_ACTIVE ||         \
-                                        (e) == EL_BD_CONVEYOR_DIR_SWITCH_NORMAL ||     \
-                                        (e) == EL_BD_CONVEYOR_DIR_SWITCH_CHANGED)
+#define IS_BD_CONVEYOR_BELT_SWITCH(e)  ((e) == EL_BD_CONVEYOR_SWITCH ||        \
+                                        (e) == EL_BD_CONVEYOR_SWITCH_ACTIVE || \
+                                        (e) == EL_BD_CONVEYOR_DIR_SWITCH ||    \
+                                        (e) == EL_BD_CONVEYOR_DIR_SWITCH_ACTIVE)
 
 #define IS_SOKOBAN_OBJECT_OR_FIELD(e)  ((e) == EL_SOKOBAN_OBJECT ||            \
                                         (e) == EL_SOKOBAN_FIELD_EMPTY ||       \
@@ -2062,8 +2063,8 @@
 #define EL_BD_EXPANDABLE_STEELWALL_HORIZONTAL  1284
 #define EL_BD_EXPANDABLE_STEELWALL_VERTICAL    1285
 #define EL_BD_EXPANDABLE_STEELWALL_ANY         1286
-#define EL_BD_EXPANDABLE_WALL_SWITCH_HORIZONTAL        1287
-#define EL_BD_EXPANDABLE_WALL_SWITCH_VERTICAL  1288
+#define EL_BD_EXPANDABLE_WALL_SWITCH           1287
+#define EL_BD_EXPANDABLE_WALL_SWITCH_ACTIVE    1288
 #define EL_BD_INBOX                            1289
 #define EL_BD_EXIT_CLOSED                      1290
 #define EL_BD_EXIT_OPEN                                1291
@@ -2096,8 +2097,8 @@
 #define EL_BD_CONVEYOR_RIGHT_ACTIVE            1318
 #define EL_BD_CONVEYOR_SWITCH                  1319
 #define EL_BD_CONVEYOR_SWITCH_ACTIVE           1320
-#define EL_BD_CONVEYOR_DIR_SWITCH_NORMAL       1321
-#define EL_BD_CONVEYOR_DIR_SWITCH_CHANGED      1322
+#define EL_BD_CONVEYOR_DIR_SWITCH              1321
+#define EL_BD_CONVEYOR_DIR_SWITCH_ACTIVE       1322
 #define EL_BD_GRAVITY_SWITCH                   1323
 #define EL_BD_GRAVITY_SWITCH_ACTIVE            1324
 #define EL_BD_ACID                             1325
@@ -3675,12 +3676,20 @@ struct LevelInfo
   boolean bd_conveyor_belts_active;    // BD conveyor belts start in active state if enabled
   boolean bd_conveyor_belts_changed;   // BD conveyor belts direction is changed if enabled
   boolean bd_water_cannot_flow_down;   // BD water does not flow downwards if enabled
-  boolean bd_nut_content;              // BD nut contains the specified game element
+  int bd_nut_content;                  // BD nut contains the specified game element
   int bd_hammer_walls_break_delay;     // BD hammer time for breaking walls (in BD frames)
   boolean bd_hammer_walls_reappear;    // BD hammered walls are reappearing after some delay
   int bd_hammer_walls_reappear_delay;  // BD hammer time for reappearing walls (in BD frames)
   int bd_num_skeletons_needed_for_pot; // BD skeletons amount must be collected to use a pot
   int bd_skeleton_worth_num_diamonds;  // BD skeleton collected is worth this number of diamonds
+  int bd_expanding_wall_looks_like;    // BD expanding wall looks like this other game element
+  int bd_sand_looks_like;              // BD sand looks like this other game element
+  boolean bd_creatures_start_backwards;        // BD creatures start moving in opposite direction
+  boolean bd_creatures_turn_on_hatching;// BD creatures change direction after hatching
+  int bd_creatures_auto_turn_delay;    // BD creatures change direction after delay (in seconds)
+  int bd_gravity_direction;            // BD engine initial gravity direction
+  boolean bd_gravity_switch_active;    // BD engine gravity switch starts in active state
+  int bd_gravity_switch_delay;         // BD engine gravity change delay for switch (in seconds)
 
   boolean em_slippery_gems;            // EM style "gems slip from wall" behaviour
   boolean em_explodes_by_fire;         // EM style chain explosion behaviour