X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=b7ad953fd0be259376451b30b9fedbd74a6cfb06;hb=8e17da8cdff134bfa0e766a50f408a3c06428f54;hp=ddb8c4f9ec99f01d47666045cae6fea7f1e9a3e9;hpb=d7673e6d995a9d6616f7eaefab6209e6eb60a795;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index ddb8c4f9..b7ad953f 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1462,10 +1462,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)
 
@@ -1714,8 +1714,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		9
+#define PROGRAM_VERSION_PATCH		1
+#define PROGRAM_VERSION_BUILD		0
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING		"Holger Schemel"
@@ -1725,12 +1725,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"