X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=35accfe28eb0d15f9188a38828774405b3c1cdca;hb=39ad80f8d48b103622e36e40c951a66579444767;hp=aaf4604ec0c1a431a7e1303835135ec9adce029c;hpb=34df5c161045d8dddfd1c24d7fb1cfa29e0a9746;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index aaf4604e..35accfe2 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -118,6 +118,11 @@
 #define SCREEN_KEYBOARD_POS(h)		((h) / 2)
 #endif
 
+// values for drag-and-drop support (some parts not added before SDL 2.0.5)
+#if SDL_VERSION_ATLEAST(2,0,5)
+#define USE_DRAG_AND_DROP
+#endif
+
 // default input keys
 #define DEFAULT_KEY_LEFT		KSYM_Left
 #define DEFAULT_KEY_RIGHT		KSYM_Right
@@ -743,6 +748,26 @@
 				 getUserMusicDir() :			\
 				 NULL)
 
+#define TREE_FIRST_NODE_PTR(t)	((t) == TREE_TYPE_LEVEL_DIR ?		\
+				 &leveldir_first :			\
+				 (t) == TREE_TYPE_GRAPHICS_DIR ?	\
+				 &artwork.gfx_first :			\
+				 (t) == TREE_TYPE_SOUNDS_DIR ?		\
+				 &artwork.snd_first :			\
+				 (t) == TREE_TYPE_MUSIC_DIR ?		\
+				 &artwork.mus_first :			\
+				 NULL)
+
+#define TREE_FIRST_NODE(t)	((t) == TREE_TYPE_LEVEL_DIR ?		\
+				 leveldir_first :			\
+				 (t) == TREE_TYPE_GRAPHICS_DIR ?	\
+				 artwork.gfx_first :			\
+				 (t) == TREE_TYPE_SOUNDS_DIR ?		\
+				 artwork.snd_first :			\
+				 (t) == TREE_TYPE_MUSIC_DIR ?		\
+				 artwork.mus_first :			\
+				 NULL)
+
 // values for artwork handling
 #define LEVELDIR_ARTWORK_SET_PTR(leveldir, type)			\
 				((type) == ARTWORK_TYPE_GRAPHICS ?	\
@@ -846,6 +871,13 @@
 				 (type) == ARTWORK_TYPE_MUSIC ?		\
 				 getUserMusicDir() : "")
 
+#define ARTWORK_DEFAULT_SUBDIR(type)					\
+				((type) == ARTWORK_TYPE_GRAPHICS ?	\
+				 GFX_DEFAULT_SUBDIR :			\
+				 (type) == ARTWORK_TYPE_SOUNDS ?	\
+				 SND_DEFAULT_SUBDIR :			\
+				 MUS_DEFAULT_SUBDIR)
+
 #define UPDATE_BUSY_STATE()			\
 {						\
   if (gfx.draw_busy_anim_function != NULL)	\
@@ -1258,6 +1290,17 @@ struct SetupInternalInfo
 
   boolean choose_from_top_leveldir;
   boolean show_scaling_in_title;
+
+  boolean menu_game;
+  boolean menu_editor;
+  boolean menu_graphics;
+  boolean menu_sound;
+  boolean menu_artwork;
+  boolean menu_input;
+  boolean menu_touch;
+  boolean menu_shortcuts;
+  boolean menu_exit;
+  boolean menu_save_and_exit;
 };
 
 struct SetupDebugInfo
@@ -1611,6 +1654,8 @@ struct TextPosInfo
   int tile_size;		// special case for list of network players
   int border_size;		// special case for list of preview players
   int vertical;			// special case for list of preview players
+
+  boolean redefined;		// redefined by custom artwork
 };
 
 struct MouseActionInfo