rnd-20030107-2-src

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index f6eb73f8257c65f194ac55c8e44dff9699788001..ca6c12f2d0e4e843c6d4f47f27aa22be92e2117e 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -30,10 +30,11 @@
 #include "conf_gfx.h"
 #include "conf_snd.h"
 
+#define IMG_NONE               (-1)
 #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
@@ -677,12 +678,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 */
@@ -1427,11 +1428,11 @@
 #define PROGRAM_VERSION_MAJOR  2
 #define PROGRAM_VERSION_MINOR  2
 #define PROGRAM_VERSION_PATCH  0
-#define PROGRAM_VERSION_STRING "2.2.0rc1"
+#define PROGRAM_VERSION_STRING "2.2.0rc2"
 
 #define PROGRAM_TITLE_STRING   "Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING  "Holger Schemel"
-#define PROGRAM_RIGHTS_STRING  "Copyright ^1995-2002 by"
+#define PROGRAM_RIGHTS_STRING  "Copyright ^1995-2003 by"
 #define PROGRAM_DOS_PORT_STRING        "DOS port done by Guido Schulz"
 #define PROGRAM_IDENT_STRING   PROGRAM_VERSION_STRING " " TARGET_STRING
 #define WINDOW_TITLE_STRING    PROGRAM_TITLE_STRING " " PROGRAM_IDENT_STRING
@@ -1654,6 +1655,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_PERFORMANCE_WORKAROUND)
+  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;