X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=1357db711ec600a931715f596bb09f0635a8f464;hb=b7282fd678d6f5c7ebf6a12062eb391129a800a7;hp=0e2259a58bd9cbf579dbf59c86df5f943c2e18a1;hpb=2486a7a849210371bb59e733e37b0271a4332d8b;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 0e2259a5..1357db71 100644
--- a/src/main.h
+++ b/src/main.h
@@ -31,6 +31,7 @@
 #include "conf_mus.h"	/* include auto-generated data structure definitions */
 
 
+#define NEW_GAME_TILESIZE		1
 #define NEW_TILESIZE			1
 #define NEW_SCROLL			1
 
@@ -1950,22 +1951,23 @@
 #define GFX_ARG_POST_DELAY_RANDOM	35
 #define GFX_ARG_NAME			36
 #define GFX_ARG_SCALE_UP_FACTOR		37
-#define GFX_ARG_CLONE_FROM		38
-#define GFX_ARG_FADE_MODE		39
-#define GFX_ARG_FADE_DELAY		40
-#define GFX_ARG_POST_DELAY		41
-#define GFX_ARG_AUTO_DELAY		42
-#define GFX_ARG_ALIGN			43
-#define GFX_ARG_VALIGN			44
-#define GFX_ARG_SORT_PRIORITY		45
-#define GFX_ARG_CLASS			46
-#define GFX_ARG_STYLE			47
-#define GFX_ARG_ACTIVE_XOFFSET		48
-#define GFX_ARG_ACTIVE_YOFFSET		49
-#define GFX_ARG_PRESSED_XOFFSET		50
-#define GFX_ARG_PRESSED_YOFFSET		51
-
-#define NUM_GFX_ARGS			52
+#define GFX_ARG_TILE_SIZE		38
+#define GFX_ARG_CLONE_FROM		39
+#define GFX_ARG_FADE_MODE		40
+#define GFX_ARG_FADE_DELAY		41
+#define GFX_ARG_POST_DELAY		42
+#define GFX_ARG_AUTO_DELAY		43
+#define GFX_ARG_ALIGN			44
+#define GFX_ARG_VALIGN			45
+#define GFX_ARG_SORT_PRIORITY		46
+#define GFX_ARG_CLASS			47
+#define GFX_ARG_STYLE			48
+#define GFX_ARG_ACTIVE_XOFFSET		49
+#define GFX_ARG_ACTIVE_YOFFSET		50
+#define GFX_ARG_PRESSED_XOFFSET		51
+#define GFX_ARG_PRESSED_YOFFSET		52
+
+#define NUM_GFX_ARGS			53
 
 
 /* values for sound configuration suffixes */
@@ -2094,12 +2096,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
@@ -2108,13 +2109,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:
@@ -2796,6 +2794,7 @@ struct GraphicInfo
   int border_size;		/* border size for "crumbled" graphics */
 
   int scale_up_factor;		/* optional factor for scaling image up */
+  int tile_size;		/* optional explicitly defined tile size */
 
   int clone_from;		/* graphic for cloning *all* settings */
 
@@ -2828,11 +2827,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