X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=9108054efe4fa91463d78b08e6198acc1645a9d0;hb=d9479668b752772803e523561bc544a6c7efe725;hp=f0f2c530fded66300de7110ba145281fa49bdb03;hpb=009c5cf7cf504775f90e2223241fe19131182e96;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index f0f2c530..9108054e 100644
--- a/src/main.h
+++ b/src/main.h
@@ -256,8 +256,11 @@
 #define CE_PRESSED_BY_MOUSE		45
 #define CE_MOUSE_CLICKED_ON_X		46
 #define CE_MOUSE_PRESSED_ON_X		47
+#define CE_NEXT_TO_PLAYER		48
+#define CE_NEXT_TO_X			49
+#define CE_PLAYER_NEXT_TO_X		50
 
-#define NUM_CHANGE_EVENTS		48
+#define NUM_CHANGE_EVENTS		51
 
 #define NUM_CE_BITFIELDS		((NUM_CHANGE_EVENTS + 31) / 32)
 
@@ -1909,7 +1912,16 @@
 #define EL_SPRING_LEFT			1215
 #define EL_SPRING_RIGHT			1216
 
-#define NUM_FILE_ELEMENTS		1217
+// ---------- begin of empty space elements section ---------------------------
+#define EL_EMPTY_SPACE_START		1217
+
+#include "conf_emp.h"	// include auto-generated data structure definitions
+
+#define NUM_EMPTY_SPACE_ELEMENTS	16
+#define EL_EMPTY_SPACE_END		1232
+// ---------- end of empty space elements section -----------------------------
+
+#define NUM_FILE_ELEMENTS		1233
 
 
 // "real" (and therefore drawable) runtime elements
@@ -2122,19 +2134,21 @@
 #define EL_INTERNAL_CASCADE_CE_ACTIVE		(EL_FIRST_INTERNAL + 29)
 #define EL_INTERNAL_CASCADE_GE			(EL_FIRST_INTERNAL + 30)
 #define EL_INTERNAL_CASCADE_GE_ACTIVE		(EL_FIRST_INTERNAL + 31)
-#define EL_INTERNAL_CASCADE_REF			(EL_FIRST_INTERNAL + 32)
-#define EL_INTERNAL_CASCADE_REF_ACTIVE		(EL_FIRST_INTERNAL + 33)
-#define EL_INTERNAL_CASCADE_USER		(EL_FIRST_INTERNAL + 34)
-#define EL_INTERNAL_CASCADE_USER_ACTIVE		(EL_FIRST_INTERNAL + 35)
-#define EL_INTERNAL_CASCADE_DYNAMIC		(EL_FIRST_INTERNAL + 36)
-#define EL_INTERNAL_CASCADE_DYNAMIC_ACTIVE	(EL_FIRST_INTERNAL + 37)
+#define EL_INTERNAL_CASCADE_ES			(EL_FIRST_INTERNAL + 32)
+#define EL_INTERNAL_CASCADE_ES_ACTIVE		(EL_FIRST_INTERNAL + 33)
+#define EL_INTERNAL_CASCADE_REF			(EL_FIRST_INTERNAL + 34)
+#define EL_INTERNAL_CASCADE_REF_ACTIVE		(EL_FIRST_INTERNAL + 35)
+#define EL_INTERNAL_CASCADE_USER		(EL_FIRST_INTERNAL + 36)
+#define EL_INTERNAL_CASCADE_USER_ACTIVE		(EL_FIRST_INTERNAL + 37)
+#define EL_INTERNAL_CASCADE_DYNAMIC		(EL_FIRST_INTERNAL + 38)
+#define EL_INTERNAL_CASCADE_DYNAMIC_ACTIVE	(EL_FIRST_INTERNAL + 39)
 
 #define EL_INTERNAL_CLIPBOARD_START	(EL_FIRST_INTERNAL + 0)
 #define EL_INTERNAL_CLIPBOARD_END	(EL_FIRST_INTERNAL + 2)
 #define EL_INTERNAL_START		(EL_FIRST_INTERNAL + 0)
-#define EL_INTERNAL_END			(EL_FIRST_INTERNAL + 37)
+#define EL_INTERNAL_END			(EL_FIRST_INTERNAL + 39)
 
-#define MAX_NUM_ELEMENTS		(EL_FIRST_INTERNAL + 38)
+#define MAX_NUM_ELEMENTS		(EL_FIRST_INTERNAL + 40)
 
 
 // values for graphics/sounds action types
@@ -2574,9 +2588,9 @@ enum
 
 // program information and versioning definitions
 #define PROGRAM_VERSION_SUPER		4
-#define PROGRAM_VERSION_MAJOR		2
-#define PROGRAM_VERSION_MINOR		3
-#define PROGRAM_VERSION_PATCH		2
+#define PROGRAM_VERSION_MAJOR		3
+#define PROGRAM_VERSION_MINOR		1
+#define PROGRAM_VERSION_PATCH		0
 #define PROGRAM_VERSION_EXTRA		""
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"
@@ -2624,7 +2638,7 @@ enum
 // values for game_emulation
 #define EMU_NONE			0
 #define EMU_BOULDERDASH			1
-#define EMU_SOKOBAN			2
+#define EMU_UNUSED_2			2
 #define EMU_SUPAPLEX			3
 
 // values for level file type identifier
@@ -2655,7 +2669,9 @@ enum
 #define AUTOPLAY_FFWD			(1 << 1)
 #define AUTOPLAY_WARP			(1 << 2)
 #define AUTOPLAY_TEST			(1 << 3)
-#define AUTOPLAY_FIX			(1 << 4)
+#define AUTOPLAY_SAVE			(1 << 4)
+#define AUTOPLAY_UPLOAD			(1 << 5)
+#define AUTOPLAY_FIX			(1 << 6)
 #define AUTOPLAY_WARP_NO_DISPLAY	AUTOPLAY_TEST
 
 #define AUTOPLAY_MODE_NONE		0
@@ -2663,6 +2679,8 @@ enum
 #define AUTOPLAY_MODE_FFWD		(AUTOPLAY_MODE_PLAY | AUTOPLAY_FFWD)
 #define AUTOPLAY_MODE_WARP		(AUTOPLAY_MODE_FFWD | AUTOPLAY_WARP)
 #define AUTOPLAY_MODE_TEST		(AUTOPLAY_MODE_WARP | AUTOPLAY_TEST)
+#define AUTOPLAY_MODE_SAVE		(AUTOPLAY_MODE_TEST | AUTOPLAY_SAVE)
+#define AUTOPLAY_MODE_UPLOAD		(AUTOPLAY_MODE_TEST | AUTOPLAY_UPLOAD)
 #define AUTOPLAY_MODE_FIX		(AUTOPLAY_MODE_TEST | AUTOPLAY_FIX)
 #define AUTOPLAY_MODE_WARP_NO_DISPLAY	AUTOPLAY_MODE_TEST
 
@@ -3059,6 +3077,7 @@ struct ScoreInfo
   int last_added_local;
 
   boolean updated;
+  boolean uploaded;
   boolean force_last_added;
 
   struct ScoreEntry entry[MAX_SCORE_ENTRIES];
@@ -3263,8 +3282,9 @@ struct GlobalInfo
 {
   char *autoplay_leveldir;
   int autoplay_level[MAX_TAPES_PER_SET];
+  int autoplay_mode;
   boolean autoplay_all;
-  boolean autoplay_mode;
+  time_t autoplay_time;
 
   char *patchtapes_mode;
   char *patchtapes_leveldir;
@@ -3729,6 +3749,7 @@ extern int			PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 
 extern int			GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern int			GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern int			GfxRandomStatic[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern int 			GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern int			GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern int 			GfxDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];