rnd-20140515-2-src

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index 5653a982b81c2a393c22e44c89bd39ec5aec74ad..0bd31a501b444b74bc47fa1708683591d5660fc7 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -1898,16 +1898,17 @@
 #define GFX_SPECIAL_ARG_SETUP_SOUND            4
 #define GFX_SPECIAL_ARG_SETUP_ARTWORK          5
 #define GFX_SPECIAL_ARG_SETUP_INPUT            6
-#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS                7
-#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_1      8
-#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_2      9
-#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_3      10
-#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_4      11
-#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_5      12
-#define GFX_SPECIAL_ARG_SETUP_CHOOSE_ARTWORK   13
-#define GFX_SPECIAL_ARG_SETUP_CHOOSE_OTHER     14
+#define GFX_SPECIAL_ARG_SETUP_TOUCH            7
+#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS                8
+#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_1      9
+#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_2      10
+#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_3      11
+#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_4      12
+#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_5      13
+#define GFX_SPECIAL_ARG_SETUP_CHOOSE_ARTWORK   14
+#define GFX_SPECIAL_ARG_SETUP_CHOOSE_OTHER     15
 
-#define NUM_SPECIAL_GFX_SETUP_ARGS             15
+#define NUM_SPECIAL_GFX_SETUP_ARGS             16
 
 
 /* values for image configuration suffixes */
@@ -2071,10 +2072,10 @@
 
 
 /* program information and versioning definitions */
-#define PROGRAM_VERSION_MAJOR          3
-#define PROGRAM_VERSION_MINOR          3
-#define PROGRAM_VERSION_PATCH          1
-#define PROGRAM_VERSION_BUILD          3
+#define PROGRAM_VERSION_MAJOR          4
+#define PROGRAM_VERSION_MINOR          0
+#define PROGRAM_VERSION_PATCH          0
+#define PROGRAM_VERSION_BUILD          0
 
 #define PROGRAM_TITLE_STRING           "Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING          "Holger Schemel"
@@ -2093,12 +2094,11 @@
 
 #define ICON_TITLE_STRING              PROGRAM_TITLE_STRING
 #define COOKIE_PREFIX                  "ROCKSNDIAMONDS"
-#define FILENAME_PREFIX                        "Rocks"
 
 #define USERDATA_DIRECTORY_WIN32       PROGRAM_TITLE_STRING
 #define USERDATA_DIRECTORY_MACOSX      PROGRAM_TITLE_STRING
 #define USERDATA_DIRECTORY_UNIX                PROGRAM_UNIX_DATADIR_STRING
-#define USERDATA_DIRECTORY_DOS         "userdata"
+#define USERDATA_DIRECTORY_OTHER       "userdata"
 
 #if defined(PLATFORM_WIN32)
 #define USERDATA_DIRECTORY             USERDATA_DIRECTORY_WIN32
@@ -2107,13 +2107,10 @@
 #elif defined(PLATFORM_UNIX)
 #define USERDATA_DIRECTORY             USERDATA_DIRECTORY_UNIX
 #else
-#define USERDATA_DIRECTORY             USERDATA_DIRECTORY_DOS
+#define USERDATA_DIRECTORY             USERDATA_DIRECTORY_OTHER
 #endif
 
-#define X11_ICON_FILENAME              "rocks_icon.xbm"
-#define X11_ICONMASK_FILENAME          "rocks_iconmask.xbm"
 #define SDL_ICON_FILENAME              "RocksIcon32x32.png"
-#define MSDOS_POINTER_FILENAME         "mouse.pcx"
 
 /* file version numbers for resource files (levels, tapes, score, setup, etc.)
 ** currently supported/known file version numbers:
@@ -2240,8 +2237,6 @@ struct MenuMainInfo
   struct MenuMainButtonInfo button;
   struct MenuMainTextInfo text;
   struct MenuMainInputInfo input;
-
-  boolean show_game_buttons;
 };
 
 struct TitleFadingInfo
@@ -2829,11 +2824,6 @@ struct GraphicInfo
   int pressed_yoffset;
 
   boolean use_image_size;      /* use image size as default width and height */
-
-#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
 };
 
 struct SoundInfo