rnd-20030105-1-src

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index 8b9925115583f297b12396b225040dbe0b62f095..37fcb08bc6ca75734a5f16832f52554813a55bc7 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -33,7 +33,7 @@
 #define IMG_EMPTY              IMG_EMPTY_SPACE
 #define IMG_SP_EMPTY           IMG_SP_EMPTY_SPACE
 #define IMG_CHAR_START         IMG_CHAR_SPACE
-#define IMG_GENERIC_START      IMG_GENERIC_0
+#define IMG_CUSTOM_START       IMG_CUSTOM_0
 
 #define WIN_XSIZE      672
 #define WIN_YSIZE      560
@@ -262,7 +262,7 @@
 #define VXSIZE                 DXSIZE
 #define VYSIZE                 100
 #define EXSIZE                 DXSIZE
-#define EYSIZE                 (VXSIZE + 44)
+#define EYSIZE                 (VYSIZE + 44)
 #define FULL_SXSIZE            (2 + SXSIZE + 2)
 #define FULL_SYSIZE            (2 + SYSIZE + 2)
 #define MICROLEV_XSIZE         ((STD_LEV_FIELDX + 2) * MICRO_TILEX)
@@ -677,12 +677,12 @@
 #define EL_UNUSED_358                  358
 #define EL_UNUSED_359                  359
 
-#define EL_GENERIC_START               360
-#define EL_GENERIC_0                   (EL_GENERIC_START + 0)
-#define EL_GENERIC_31                  (EL_GENERIC_START + 31)
-#define EL_GENERIC_END                 (EL_GENERIC_START + 31)
+#define EL_CUSTOM_START                        360
+#define EL_CUSTOM_0                    (EL_CUSTOM_START + 0)
+#define EL_CUSTOM_31                   (EL_CUSTOM_START + 127)
+#define EL_CUSTOM_END                  (EL_CUSTOM_START + 127)
 
-#define NUM_FILE_ELEMENTS              392
+#define NUM_FILE_ELEMENTS              488
 
 
 /* "real" (and therefore drawable) runtime elements */
@@ -1425,9 +1425,9 @@
 #define SETUP                  8
 
 #define PROGRAM_VERSION_MAJOR  2
-#define PROGRAM_VERSION_MINOR  1
-#define PROGRAM_VERSION_PATCH  2
-#define PROGRAM_VERSION_STRING "2.1.2"
+#define PROGRAM_VERSION_MINOR  2
+#define PROGRAM_VERSION_PATCH  0
+#define PROGRAM_VERSION_STRING "2.2.0rc2"
 
 #define PROGRAM_TITLE_STRING   "Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING  "Holger Schemel"
@@ -1618,6 +1618,9 @@ struct GameInfo
 
 struct GlobalInfo
 {
+  char *autoplay_leveldir;
+  int autoplay_level_nr;
+
   float frames_per_second;
   boolean fps_slowdown;
   int fps_slowdown_factor;
@@ -1651,6 +1654,11 @@ struct NewGraphicInfo
   int anim_delay;              /* important: delay of 1 means "no delay"! */
   int anim_mode;
   boolean anim_global_sync;
+
+#if defined(TARGET_X11_NATIVE)
+  Pixmap clip_mask;            /* single-graphic-only clip mask for X11 */
+  GC clip_gc;                  /* single-graphic-only clip gc for X11 */
+#endif
 };
 
 extern GC              tile_clip_gc;