X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=739d5be21c0185df8f84a03d4468a0346cb35044;hb=949580a3bafe5c8abd1fac99202411b65900b883;hp=0e8871c966d9a7547776549cb47bb9b1ba69605d;hpb=e3a53d28634c52a0b1de6d0609de911e5d01c344;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 0e8871c9..739d5be2 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
@@ -1517,7 +1519,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 +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 */
@@ -2283,6 +2290,12 @@ struct DateInfo
   int year;
   int month;
   int day;
+
+  enum
+  {
+    DATE_SRC_CLOCK,
+    DATE_SRC_LEVELFILE
+  } src;
 };
 
 struct LevelInfo
@@ -2386,6 +2399,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 */
@@ -2415,7 +2429,6 @@ struct GlobalInfo
 
   char *convert_leveldir;
   int convert_level_nr;
-  boolean convert_mode_special_1;
 
   char *create_images_dir;