projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed memory leak
[rocksndiamonds.git]
/
src
/
libgame
/
system.h
diff --git
a/src/libgame/system.h
b/src/libgame/system.h
index ffb8f185c41ff7bca179531e9c95b6fc3706c64e..5249adfcb599df787c497ba9aa6ba153949eedfb 100644
(file)
--- a/
src/libgame/system.h
+++ b/
src/libgame/system.h
@@
-743,6
+743,16
@@
getUserMusicDir() : \
NULL)
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)
+
// values for artwork handling
#define LEVELDIR_ARTWORK_SET_PTR(leveldir, type) \
((type) == ARTWORK_TYPE_GRAPHICS ? \
// values for artwork handling
#define LEVELDIR_ARTWORK_SET_PTR(leveldir, type) \
((type) == ARTWORK_TYPE_GRAPHICS ? \
@@
-838,6
+848,14
@@
(type) == ARTWORK_TYPE_MUSIC ? \
options.music_directory : "")
(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) \
#define UPDATE_BUSY_STATE() \
{ \
if (gfx.draw_busy_anim_function != NULL) \