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
include/sndprocs.h
+12 -3
View File
@@ -352,7 +352,8 @@ SoundAchievement(0, sa2_xpleveldown, level);
|| defined(SND_LIB_SOUND_ESCCODES) || defined(SND_LIB_VISSOUND) \ || defined(SND_LIB_SOUND_ESCCODES) || defined(SND_LIB_VISSOUND) \
|| defined(SND_LIB_WINDSOUND) || defined(SND_LIB_MACSOUND) || 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) \ #define Play_usersound(filename, vol, idx) \
do { \ do { \
@@ -395,14 +396,22 @@ SoundAchievement(0, sa2_xpleveldown, level);
/* void (*sound_achievement)(schar, schar, int32_t); */ /* 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 #ifdef SND_LIB_INTEGRATED
#undef SND_LIB_INTEGRATED #undef SND_LIB_INTEGRATED
#endif #endif
#define Play_usersound(filename, vol, idx) #define Play_usersound(filename, vol, idx)
#define Soundeffect(seid, vol) #define Soundeffect(seid, vol)
#define Hero_playnotes(instrument, str, vol) #define Hero_playnotes(instrument, str, vol)
#define SoundAchievement(arg1, arg2, avals) #define SoundAchievement(arg1, arg2, avals)
#ifdef SOUNDLIBONLY
#undef SOUNDLIBONLY
#endif
#define SOUNDLIBONLY UNUSED
#endif #endif
#endif /* SNDPROCS_H */ #endif /* SNDPROCS_H */
src/mthrowu.c
+1 -3
View File
@@ -1235,13 +1235,11 @@ hit_bars(
} }
} else { } else {
if (!Deaf) { if (!Deaf) {
#ifdef SND_LIB_INTEGRATED static enum sound_effect_entries se[] SOUNDLIBONLY = {
static enum sound_effect_entries se[] = {
se_zero_invalid, se_zero_invalid,
se_bars_whang, se_bars_whap, se_bars_flapp, se_bars_whang, se_bars_whap, se_bars_flapp,
se_bars_clink, se_bars_clonk se_bars_clink, se_bars_clonk
}; };
#endif
static const char *const barsounds[] = { static const char *const barsounds[] = {
"", "Whang", "Whap", "Flapp", "Clink", "Clonk" "", "Whang", "Whap", "Flapp", "Clink", "Clonk"
}; };
src/music.c
+1 -3
View File
@@ -846,7 +846,7 @@ do_play_instrument(struct obj* instr)
} }
enum instruments enum instruments
obj_to_instr(struct obj *obj) { obj_to_instr(struct obj *obj SOUNDLIBONLY) {
enum instruments ret_instr = ins_no_instrument; enum instruments ret_instr = ins_no_instrument;
#if defined(SND_LIB_INTEGRATED) #if defined(SND_LIB_INTEGRATED)
@@ -886,8 +886,6 @@ obj_to_instr(struct obj *obj) {
ret_instr = ins_melodic_tom; ret_instr = ins_melodic_tom;
break; break;
} }
#else
nhUse(obj);
#endif #endif
return ret_instr; return ret_instr;
} }