X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=07ce33fb9e3fd35499fafb42beb026a7556a3b48;hb=18f04ed2930c70cce6231148945cc24a1c662041;hp=645adfd82b8ccdb3c1fe8b1fcc4dbc75bc22486a;hpb=bc76bd63993e350f699d1420ebd9ae3ac573f407;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 645adfd8..07ce33fb 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)
@@ -867,7 +869,7 @@
 #define MICROLEVEL_XSIZE	((STD_LEV_FIELDX + 2) * MICRO_TILEX)
 #define MICROLEVEL_YSIZE	((STD_LEV_FIELDY + 2) * MICRO_TILEY)
 #define MICROLEVEL_XPOS		(SX + (SXSIZE - MICROLEVEL_XSIZE) / 2)
-#define MICROLEVEL_YPOS		(SX + 12 * TILEY - MICRO_TILEY)
+#define MICROLEVEL_YPOS		(SY + 12 * TILEY - MICRO_TILEY)
 #define MICROLABEL1_YPOS	(MICROLEVEL_YPOS - 36)
 #define MICROLABEL2_YPOS	(MICROLEVEL_YPOS + MICROLEVEL_YSIZE + 7)
 
@@ -1714,27 +1716,37 @@
 /* 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"
-#define PROGRAM_COPYRIGHT_STRING       "Copyright ©1995-2006 by Holger Schemel"
+#define PROGRAM_COPYRIGHT_STRING	"Copyright ©1995-2006 by Holger Schemel"
+#define PROGRAM_EMAIL_STRING		"info@artsoft.org"
+#define PROGRAM_WEBSITE_STRING		"http://www.artsoft.org/"
 
 #define ICON_TITLE_STRING		PROGRAM_TITLE_STRING
 #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"
 #define X11_ICONMASK_FILENAME		"rocks_iconmask.xbm"
+#define SDL_ICON_FILENAME		"rocks_icon_32x32.pcx"
 #define MSDOS_POINTER_FILENAME		"mouse.pcx"
 
 /* file version numbers for resource files (levels, tapes, score, setup, etc.)