X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=c9a7164b796494cee3e33b1b2397a0822e3531fe;hb=959794cfda1f83edc51512211ae5a9f6b1e0b179;hp=aecccc46de7f3d3464627a8ed9fe82633125a091;hpb=2eb9cb502efacb04761fe3bfd4bb4fa8f4661f49;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index aecccc46..c9a7164b 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1898,16 +1898,17 @@
 #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		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_SHORTCUTS_5	12
-#define GFX_SPECIAL_ARG_SETUP_CHOOSE_ARTWORK	13
-#define GFX_SPECIAL_ARG_SETUP_CHOOSE_OTHER	14
+#define GFX_SPECIAL_ARG_SETUP_TOUCH		7
+#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS		8
+#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_1	9
+#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_2	10
+#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_3	11
+#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_4	12
+#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_5	13
+#define GFX_SPECIAL_ARG_SETUP_CHOOSE_ARTWORK	14
+#define GFX_SPECIAL_ARG_SETUP_CHOOSE_OTHER	15
 
-#define NUM_SPECIAL_GFX_SETUP_ARGS		15
+#define NUM_SPECIAL_GFX_SETUP_ARGS		16
 
 
 /* values for image configuration suffixes */
@@ -2071,10 +2072,10 @@
 
 
 /* program information and versioning definitions */
-#define PROGRAM_VERSION_MAJOR		3
-#define PROGRAM_VERSION_MINOR		3
-#define PROGRAM_VERSION_PATCH		1
-#define PROGRAM_VERSION_BUILD		3
+#define PROGRAM_VERSION_MAJOR		4
+#define PROGRAM_VERSION_MINOR		0
+#define PROGRAM_VERSION_PATCH		0
+#define PROGRAM_VERSION_BUILD		0
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING		"Holger Schemel"
@@ -2098,7 +2099,7 @@
 #define USERDATA_DIRECTORY_WIN32	PROGRAM_TITLE_STRING
 #define USERDATA_DIRECTORY_MACOSX	PROGRAM_TITLE_STRING
 #define USERDATA_DIRECTORY_UNIX		PROGRAM_UNIX_DATADIR_STRING
-#define USERDATA_DIRECTORY_DOS		"userdata"
+#define USERDATA_DIRECTORY_OTHER	"userdata"
 
 #if defined(PLATFORM_WIN32)
 #define USERDATA_DIRECTORY		USERDATA_DIRECTORY_WIN32
@@ -2107,13 +2108,12 @@
 #elif defined(PLATFORM_UNIX)
 #define USERDATA_DIRECTORY		USERDATA_DIRECTORY_UNIX
 #else
-#define USERDATA_DIRECTORY		USERDATA_DIRECTORY_DOS
+#define USERDATA_DIRECTORY		USERDATA_DIRECTORY_OTHER
 #endif
 
 #define X11_ICON_FILENAME		"rocks_icon.xbm"
 #define X11_ICONMASK_FILENAME		"rocks_iconmask.xbm"
 #define SDL_ICON_FILENAME		"RocksIcon32x32.png"
-#define MSDOS_POINTER_FILENAME		"mouse.pcx"
 
 /* file version numbers for resource files (levels, tapes, score, setup, etc.)
 ** currently supported/known file version numbers:
@@ -2309,6 +2309,8 @@ struct DoorInfo
   struct DoorPartPosInfo part_7;
   struct DoorPartPosInfo part_8;
 
+  struct DoorPartPosInfo panel;
+
   int width;
   int height;
   int step_offset;
@@ -2343,6 +2345,21 @@ struct PreviewInfo
   int anim_mode;
 };
 
+struct EditorPaletteInfo
+{
+  int x, y;
+  int cols, rows;
+
+  struct XY element_left;
+  struct XY element_middle;
+  struct XY element_right;
+};
+
+struct EditorInfo
+{
+  struct EditorPaletteInfo palette;
+};
+
 struct ViewportInfo
 {
   struct RectWithBorder window;
@@ -2889,7 +2906,11 @@ extern Bitmap		       *bitmap_db_store;
 extern Bitmap		       *bitmap_db_cross;
 extern Bitmap		       *bitmap_db_field;
 extern Bitmap		       *bitmap_db_panel;
+#if 0
 extern Bitmap		       *bitmap_db_door;
+#endif
+extern Bitmap		       *bitmap_db_door_1;
+extern Bitmap		       *bitmap_db_door_2;
 extern Bitmap		       *bitmap_db_toons;
 extern Pixmap			tile_clipmask[];
 extern DrawBuffer	       *fieldbuffer;
@@ -3015,6 +3036,7 @@ extern struct MenuInfo		menu;
 extern struct DoorInfo		door_1, door_2;
 extern struct RequestInfo	request;
 extern struct PreviewInfo	preview;
+extern struct EditorInfo	editor;
 extern struct ElementInfo	element_info[];
 extern struct ElementNameInfo	element_name_info[];
 extern struct ElementActionInfo	element_action_info[];