X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=9f9b253d4ca37f62f23b8c7cbd7cd034f0adf3dd;hb=8cea50fbd1b74a2bc164a79cbd26bdbb3abd6689;hp=747858fc78231d71a660eed3fa06fdbc57280828;hpb=f2d0f3fed679ea3573f51aa298adce2d9a78d8be;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 747858fc..9f9b253d 100644
--- a/src/main.h
+++ b/src/main.h
@@ -42,6 +42,8 @@
 #define WIN_XSIZE			672
 #define WIN_YSIZE			560
 
+#define DEFAULT_FULLSCREEN_MODE		"800x600"
+
 #define SCR_FIELDX			17
 #define SCR_FIELDY			17
 #define MAX_BUF_XSIZE			(SCR_FIELDX + 2)
@@ -784,6 +786,11 @@
 				 IS_EDITOR_CASCADE_ACTIVE(e)   ? (e) - 1 : (e))
 
 #define EL_NAME(e)		((e) >= 0 ? element_info[e].token_name : "(?)")
+#define MV_TEXT(d)		((d) == MV_NONE  ? "MV_NONE"  :		\
+				 (d) == MV_LEFT  ? "MV_LEFT"  :		\
+				 (d) == MV_RIGHT ? "MV_RIGHT" :		\
+				 (d) == MV_UP    ? "MV_UP"    :		\
+				 (d) == MV_DOWN  ? "MV_DOWN"  : "(various)")
 
 /* fundamental game speed values */
 #define MICROLEVEL_SCROLL_DELAY	50	/* delay for scrolling micro level */
@@ -1302,7 +1309,9 @@
 #define EL_YAMYAM_UP			711
 #define EL_YAMYAM_DOWN			712
 
-#define NUM_FILE_ELEMENTS		713
+#define EL_BD_EXPANDABLE_WALL		713
+
+#define NUM_FILE_ELEMENTS		714
 
 
 /* "real" (and therefore drawable) runtime elements */
@@ -1455,10 +1464,10 @@
 #define EL_INTERNAL_CASCADE_CE_ACTIVE		(EL_FIRST_INTERNAL + 23)
 #define EL_INTERNAL_CASCADE_GE			(EL_FIRST_INTERNAL + 24)
 #define EL_INTERNAL_CASCADE_GE_ACTIVE		(EL_FIRST_INTERNAL + 25)
-#define EL_INTERNAL_CASCADE_USER		(EL_FIRST_INTERNAL + 26)
-#define EL_INTERNAL_CASCADE_USER_ACTIVE		(EL_FIRST_INTERNAL + 27)
-#define EL_INTERNAL_CASCADE_GENERIC		(EL_FIRST_INTERNAL + 28)
-#define EL_INTERNAL_CASCADE_GENERIC_ACTIVE	(EL_FIRST_INTERNAL + 29)
+#define EL_INTERNAL_CASCADE_REF			(EL_FIRST_INTERNAL + 26)
+#define EL_INTERNAL_CASCADE_REF_ACTIVE		(EL_FIRST_INTERNAL + 27)
+#define EL_INTERNAL_CASCADE_USER		(EL_FIRST_INTERNAL + 28)
+#define EL_INTERNAL_CASCADE_USER_ACTIVE		(EL_FIRST_INTERNAL + 29)
 #define EL_INTERNAL_CASCADE_DYNAMIC		(EL_FIRST_INTERNAL + 30)
 #define EL_INTERNAL_CASCADE_DYNAMIC_ACTIVE	(EL_FIRST_INTERNAL + 31)
 
@@ -1707,8 +1716,8 @@
 /* program information and versioning definitions */
 #define PROGRAM_VERSION_MAJOR		3
 #define PROGRAM_VERSION_MINOR		2
-#define PROGRAM_VERSION_PATCH		0
-#define PROGRAM_VERSION_BUILD		8
+#define PROGRAM_VERSION_PATCH		1
+#define PROGRAM_VERSION_BUILD		0
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING		"Holger Schemel"
@@ -1718,12 +1727,19 @@
 #define COOKIE_PREFIX			"ROCKSNDIAMONDS"
 #define FILENAME_PREFIX			"Rocks"
 
-#if defined(PLATFORM_UNIX)
-#define USERDATA_DIRECTORY		".rocksndiamonds"
-#elif defined(PLATFORM_WIN32)
-#define USERDATA_DIRECTORY		PROGRAM_TITLE_STRING
+#define USERDATA_DIRECTORY_WIN32	PROGRAM_TITLE_STRING
+#define USERDATA_DIRECTORY_MACOSX	PROGRAM_TITLE_STRING
+#define USERDATA_DIRECTORY_UNIX		".rocksndiamonds"
+#define USERDATA_DIRECTORY_DOS		"userdata"
+
+#if defined(PLATFORM_WIN32)
+#define USERDATA_DIRECTORY		USERDATA_DIRECTORY_WIN32
+#elif defined(PLATFORM_MACOSX)
+#define USERDATA_DIRECTORY		USERDATA_DIRECTORY_MACOSX
+#elif defined(PLATFORM_UNIX)
+#define USERDATA_DIRECTORY		USERDATA_DIRECTORY_UNIX
 #else
-#define USERDATA_DIRECTORY		"userdata"
+#define USERDATA_DIRECTORY		USERDATA_DIRECTORY_DOS
 #endif
 
 #define X11_ICON_FILENAME		"rocks_icon.xbm"
@@ -1741,16 +1757,18 @@
 #define FILE_VERSION_1_2		VERSION_IDENT(1,2,0,0)
 #define FILE_VERSION_1_4		VERSION_IDENT(1,4,0,0)
 #define FILE_VERSION_2_0		VERSION_IDENT(2,0,0,0)
+#define FILE_VERSION_3_0		VERSION_IDENT(3,0,0,0)
 
 /* file version does not change for every program version, but is changed
    when new features are introduced that are incompatible with older file
    versions, so that they can be treated accordingly */
-#define FILE_VERSION_ACTUAL		FILE_VERSION_2_0
+#define FILE_VERSION_ACTUAL		FILE_VERSION_3_0
 
 #define GAME_VERSION_1_0		FILE_VERSION_1_0
 #define GAME_VERSION_1_2		FILE_VERSION_1_2
 #define GAME_VERSION_1_4		FILE_VERSION_1_4
 #define GAME_VERSION_2_0		FILE_VERSION_2_0
+#define GAME_VERSION_3_0		FILE_VERSION_3_0
 
 #define GAME_VERSION_ACTUAL		VERSION_IDENT(PROGRAM_VERSION_MAJOR, \
 						      PROGRAM_VERSION_MINOR, \
@@ -1838,6 +1856,13 @@ struct LevelFileInfo
   char *filename;
 };
 
+struct DateInfo
+{
+  int year;
+  int month;
+  int day;
+};
+
 struct LevelInfo
 {
   struct LevelFileInfo file_info;
@@ -1850,6 +1875,8 @@ struct LevelInfo
   int file_version;	/* file format version the level is stored with    */
   int game_version;	/* game release version the level was created with */
 
+  struct DateInfo creation_date;
+
   boolean encoding_16bit_field;		/* level contains 16-bit elements  */
   boolean encoding_16bit_yamyam;	/* yamyam contains 16-bit elements */
   boolean encoding_16bit_amoeba;	/* amoeba contains 16-bit elements */