rnd-20030807-1-src

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index 6709828a683a3d67597ffb8d5a8bfbbc1ef37911..24ecedf4673ee89a14b0090a0cc2fe78b30b7912 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -411,7 +411,7 @@
 #define EL_EMPTY                       EL_EMPTY_SPACE
 #define EL_SAND                                1
 #define EL_WALL                                2
-#define EL_WALL_CRUMBLED               3
+#define EL_WALL_SLIPPERY               3
 #define EL_ROCK                                4
 #define EL_KEY_OBSOLETE                        5 /* obsolete; mapped to EL_KEY_1 */
 #define EL_EMERALD                     6
@@ -677,7 +677,7 @@
 #define EL_MOLE_RIGHT                  312
 #define EL_MOLE_UP                     313
 #define EL_MOLE_DOWN                   314
-#define EL_STEELWALL_SLANTED           315
+#define EL_STEELWALL_SLIPPERY          315
 #define EL_INVISIBLE_SAND              316
 #define EL_DX_UNKNOWN_15               317
 #define EL_DX_UNKNOWN_42               318
@@ -822,21 +822,20 @@
 #define EL_INVISIBLE_STEELWALL_BOTTOMRIGHT     (EL_FIRST_DUMMY + 9)
 #define EL_INVISIBLE_STEELWALL_HORIZONTAL      (EL_FIRST_DUMMY + 10)
 #define EL_INVISIBLE_STEELWALL_VERTICAL                (EL_FIRST_DUMMY + 11)
-#define EL_SAND_CRUMBLED                       (EL_FIRST_DUMMY + 12)
-#define EL_DYNABOMB                            (EL_FIRST_DUMMY + 13)
-#define EL_DYNABOMB_ACTIVE                     (EL_FIRST_DUMMY + 14)
-#define EL_DYNABOMB_PLAYER_1                   (EL_FIRST_DUMMY + 15)
-#define EL_DYNABOMB_PLAYER_2                   (EL_FIRST_DUMMY + 16)
-#define EL_DYNABOMB_PLAYER_3                   (EL_FIRST_DUMMY + 17)
-#define EL_DYNABOMB_PLAYER_4                   (EL_FIRST_DUMMY + 18)
-#define EL_SHIELD_NORMAL_ACTIVE                        (EL_FIRST_DUMMY + 19)
-#define EL_SHIELD_DEADLY_ACTIVE                        (EL_FIRST_DUMMY + 20)
-#define EL_DEFAULT                             (EL_FIRST_DUMMY + 21)
-#define EL_BD_DEFAULT                          (EL_FIRST_DUMMY + 22)
-#define EL_SP_DEFAULT                          (EL_FIRST_DUMMY + 23)
-#define EL_SB_DEFAULT                          (EL_FIRST_DUMMY + 24)
-
-#define MAX_NUM_ELEMENTS                       (EL_FIRST_DUMMY + 25)
+#define EL_DYNABOMB                            (EL_FIRST_DUMMY + 12)
+#define EL_DYNABOMB_ACTIVE                     (EL_FIRST_DUMMY + 13)
+#define EL_DYNABOMB_PLAYER_1                   (EL_FIRST_DUMMY + 14)
+#define EL_DYNABOMB_PLAYER_2                   (EL_FIRST_DUMMY + 15)
+#define EL_DYNABOMB_PLAYER_3                   (EL_FIRST_DUMMY + 16)
+#define EL_DYNABOMB_PLAYER_4                   (EL_FIRST_DUMMY + 17)
+#define EL_SHIELD_NORMAL_ACTIVE                        (EL_FIRST_DUMMY + 18)
+#define EL_SHIELD_DEADLY_ACTIVE                        (EL_FIRST_DUMMY + 19)
+#define EL_DEFAULT                             (EL_FIRST_DUMMY + 20)
+#define EL_BD_DEFAULT                          (EL_FIRST_DUMMY + 21)
+#define EL_SP_DEFAULT                          (EL_FIRST_DUMMY + 22)
+#define EL_SB_DEFAULT                          (EL_FIRST_DUMMY + 23)
+
+#define MAX_NUM_ELEMENTS                       (EL_FIRST_DUMMY + 24)
 
 
 /* values for graphics/sounds action types */
@@ -970,11 +969,11 @@
 #define GAME_MODE_PSEUDO_TYPENAME              10
 #define GAME_MODE_QUIT                         11
 
-#define PROGRAM_VERSION_MAJOR  2
-#define PROGRAM_VERSION_MINOR  2
-#define PROGRAM_VERSION_PATCH  0
-#define PROGRAM_VERSION_RELEASE        8
-#define PROGRAM_VERSION_STRING "2.2.0rc8"
+#define PROGRAM_VERSION_MAJOR  3
+#define PROGRAM_VERSION_MINOR  0
+#define PROGRAM_VERSION_PATCH  1
+#define PROGRAM_VERSION_RELEASE        0
+#define PROGRAM_VERSION_STRING "3.0.1"
 
 #define PROGRAM_TITLE_STRING   "Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING  "Holger Schemel"
@@ -1118,7 +1117,7 @@ struct LevelInfo
   int time_light;
   int time_timegate;
   boolean double_speed;
-  boolean gravity;
+  boolean initial_gravity;
   boolean em_slippery_gems;    /* EM style "gems slip from wall" behaviour */
 
   short field[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -1180,6 +1179,7 @@ struct GameInfo
   int switchgate_pos;
   int balloon_dir;
   boolean explosions_delayed;
+  boolean current_gravity;
 };
 
 struct GlobalInfo