X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=8632855a043f5b6a4a2a8e6094a2acaa5014d9e3;hb=59ee473b86e7cbc1d9b09a3c22b0bbd3a410f16f;hp=38a5bcbf7900b82cc6f01578cf648f97b84a6b05;hpb=5ba7f2d9a3f07f342afdf215a3307d5487cb6d43;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 38a5bcbf..8632855a 100644
--- a/src/main.h
+++ b/src/main.h
@@ -30,9 +30,11 @@
 #include "conf_snd.h"	/* include auto-generated data structure definitions */
 #include "conf_mus.h"	/* include auto-generated data structure definitions */
 
+
 #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
@@ -41,8 +43,10 @@
 #define SND_UNDEFINED			(-1)
 #define MUS_UNDEFINED			(-1)
 
+#if 0
 #define WIN_XSIZE			672
 #define WIN_YSIZE			560
+#endif
 
 #define DEFAULT_FULLSCREEN_MODE		"800x600"
 
@@ -1517,7 +1521,9 @@
 #define EL_QUICKSAND_FAST_EMPTY		861
 #define EL_QUICKSAND_FAST_FULL		862
 
-#define NUM_FILE_ELEMENTS		863
+#define EL_FROM_LEVEL_TEMPLATE		863
+
+#define NUM_FILE_ELEMENTS		864
 
 
 /* "real" (and therefore drawable) runtime elements */
@@ -1844,12 +1850,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 */
@@ -1899,8 +1908,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 */
@@ -2283,6 +2294,12 @@ struct DateInfo
   int year;
   int month;
   int day;
+
+  enum
+  {
+    DATE_SRC_CLOCK,
+    DATE_SRC_LEVELFILE
+  } src;
 };
 
 struct LevelInfo
@@ -2293,6 +2310,7 @@ struct LevelInfo
 
   /* level stored in native format for the alternative native game engines */
   struct LevelInfo_EM *native_em_level;
+  struct LevelInfo_SP *native_sp_level;
 
   int file_version;	/* file format version the level is stored with    */
   int game_version;	/* game release version the level was created with */
@@ -2385,6 +2403,7 @@ struct LevelInfo
   boolean shifted_relocation;	/* no level centering when relocating player */
   boolean can_pass_to_walkable;	/* player can pass to empty or walkable tile */
   boolean grow_into_diggable;	/* amoeba can grow into anything diggable */
+  boolean auto_exit_sokoban;	/* automatically finish solved Sokoban levels */
 
   boolean continuous_snapping;	/* repeated snapping without releasing key */
   boolean block_snap_field;	/* snapping blocks field to show animation */
@@ -2429,6 +2448,8 @@ struct GlobalInfo
   int fading_status;
   int fading_type;
 #endif
+
+  struct Rect screen;
 };
 
 struct ElementChangeInfo
@@ -2682,6 +2703,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)
@@ -2823,6 +2847,8 @@ extern int			ActiveFont[NUM_FONTS];
 extern int			lev_fieldx, lev_fieldy;
 extern int			scroll_x, scroll_y;
 
+extern int			WIN_XSIZE, WIN_YSIZE;
+
 extern int			FX, FY;
 extern int			ScrollStepSize;
 extern int			ScreenMovDir, ScreenMovPos, ScreenGfxPos;
@@ -2858,7 +2884,7 @@ extern struct TitleMessageInfo	titlemessage_initial[];
 extern struct TitleMessageInfo	titlemessage_default;
 extern struct TitleMessageInfo	titlemessage[];
 extern struct TitleMessageInfo	readme;
-extern struct InitInfo		init;
+extern struct InitInfo		init, init_last;
 extern struct MenuInfo		menu;
 extern struct DoorInfo		door_1, door_2;
 extern struct PreviewInfo	preview;