nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

do warning suppression for soundlib vars another way

Browse Source 
Instead of introducing a bunch of preprocessor #ifdef blocks,
this approach is less-intrusive.
This commit is contained in:
nhmall
2023-01-28 14:55:54 -05:00
parent 734dcfdabe
commit 4575d564c7
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/sndprocs.h
View File

@@ -352,7 +352,8 @@ SoundAchievement(0, sa2_xpleveldown, level);
|| defined(SND_LIB_SOUND_ESCCODES) || defined(SND_LIB_VISSOUND) \
|| defined(SND_LIB_WINDSOUND) || defined(SND_LIB_MACSOUND)
#define SND_LIB_INTEGRATED /* shortcut for conditional code in other files */
/* shortcut for conditional code in other files */
#define SND_LIB_INTEGRATED
#define Play_usersound(filename, vol, idx) \
do { \
@@ -395,14 +396,22 @@ SoundAchievement(0, sa2_xpleveldown, level);
/* void (*sound_achievement)(schar, schar, int32_t); */
#else
#ifdef SOUNDLIBONLY
#undef SOUNDLIBONLY
#endif
#define SOUNDLIBONLY
#else /* NO SOUNDLIB SELECTED AFTER THIS */
#ifdef SND_LIB_INTEGRATED
#undef SND_LIB_INTEGRATED
#undef SND_LIB_INTEGRATED
#endif
#define Play_usersound(filename, vol, idx)
#define Soundeffect(seid, vol)
#define Hero_playnotes(instrument, str, vol)
#define SoundAchievement(arg1, arg2, avals)
#ifdef SOUNDLIBONLY
#undef SOUNDLIBONLY
#endif
#define SOUNDLIBONLY UNUSED
#endif
#endif /* SNDPROCS_H */