X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.h;h=640a4fc962bf99ef94b31f99d048abe6e3bf4ef3;hb=328e3b0f53ca41e626fda33427f5c51325bc700b;hp=13f6f8120af639c0d16d3d49420123518cde066a;hpb=2d769736ea3634a55a88c1d792ffdbefb190d1f3;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 13f6f812..640a4fc9 100644
--- a/src/main.h
+++ b/src/main.h
@@ -33,7 +33,8 @@
 
 #define IMG_UNDEFINED			(-1)
 #define IMG_EMPTY			IMG_EMPTY_SPACE
-#define IMG_SP_EMPTY			IMG_SP_EMPTY_SPACE
+#define IMG_SP_EMPTY			IMG_EMPTY_SPACE
+#define IMG_SP_EMPTY_SPACE		IMG_EMPTY_SPACE
 #define IMG_EXPLOSION			IMG_DEFAULT_EXPLODING
 #define IMG_CHAR_START			IMG_CHAR_SPACE
 #define IMG_STEEL_CHAR_START		IMG_STEEL_CHAR_SPACE
@@ -1847,12 +1848,15 @@
 #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_1	7
-#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_2	8
-#define GFX_SPECIAL_ARG_SETUP_CHOOSE_ARTWORK	9
-#define GFX_SPECIAL_ARG_SETUP_CHOOSE_OTHER	10
+#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_CHOOSE_ARTWORK	12
+#define GFX_SPECIAL_ARG_SETUP_CHOOSE_OTHER	13
 
-#define NUM_SPECIAL_GFX_SETUP_ARGS		11
+#define NUM_SPECIAL_GFX_SETUP_ARGS		14
 
 
 /* values for image configuration suffixes */
@@ -1902,8 +1906,10 @@
 #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 NUM_GFX_ARGS			46
+#define NUM_GFX_ARGS			48
 
 
 /* values for sound configuration suffixes */
@@ -2286,6 +2292,12 @@ struct DateInfo
   int year;
   int month;
   int day;
+
+  enum
+  {
+    DATE_SRC_CLOCK,
+    DATE_SRC_LEVELFILE
+  } src;
 };
 
 struct LevelInfo
@@ -2687,6 +2699,9 @@ struct GraphicInfo
   int align, valign;		/* optional setting for drawing title screens */
   int sort_priority;		/* optional setting for drawing title screens */
 
+  int class;
+  int style;
+
   boolean use_image_size;	/* use image size as default width and height */
 
 #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)