X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=bab4957e9f861437e39851d7b8fb945dbe7bf8b5;hp=ffb8f185c41ff7bca179531e9c95b6fc3706c64e;hb=7270af24b41bc33fbb89a97227a7696e343eacbb;hpb=f11d2545f41637e871283f7624dccc8243d05138

diff --git a/src/libgame/system.h b/src/libgame/system.h
index ffb8f185..bab4957e 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -743,6 +743,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 ?	\
@@ -838,6 +858,14 @@
 				 (type) == ARTWORK_TYPE_MUSIC ?		\
 				 options.music_directory : "")
 
+#define USER_ARTWORK_DIRECTORY(type)					\
+				((type) == ARTWORK_TYPE_GRAPHICS ?	\
+				 getUserGraphicsDir() :			\
+				 (type) == ARTWORK_TYPE_SOUNDS ?	\
+				 getUserSoundsDir() :			\
+				 (type) == ARTWORK_TYPE_MUSIC ?		\
+				 getUserMusicDir() : "")
+
 #define UPDATE_BUSY_STATE()			\
 {						\
   if (gfx.draw_busy_anim_function != NULL)	\