moved gravity compatibility settings to gravity switch properties page

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index ae06a99d9c162d435725b5ae9f5e974b0a981418..0a5f1471e5790d1aa7331a2dbe26f2a2d7ebcc13 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -919,15 +919,15 @@
                                         (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 ||       \
@@ -2063,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
@@ -2097,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
@@ -3612,7 +3612,6 @@ struct LevelInfo
   boolean bd_line_shifting_borders;    // BD engine uses line-shifting wrap-around
   boolean bd_scan_first_and_last_row;  // BD engine scans top and bottom border rows
   boolean bd_short_explosions;         // BD engine uses four game cycles for explosions
-  boolean bd_gravity_affects_all;      // BD engine gravity affects all falling objects
   boolean bd_intermission;             // BD level is intermission
   boolean bd_diagonal_movements;       // BD style diagonal movements
   boolean bd_topmost_player_active;    // BD engine uses first player found on playfield
@@ -3687,6 +3686,10 @@ struct LevelInfo
   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 bd_gravity_affects_all;      // BD engine gravity affects all falling objects
 
   boolean em_slippery_gems;            // EM style "gems slip from wall" behaviour
   boolean em_explodes_by_fire;         // EM style chain explosion behaviour