do warning suppression for soundlib vars another way

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

View File

@@ -1235,13 +1235,11 @@ hit_bars(
}
} else {
if (!Deaf) {
#ifdef SND_LIB_INTEGRATED
static enum sound_effect_entries se[] = {
static enum sound_effect_entries se[] SOUNDLIBONLY = {
se_zero_invalid,
se_bars_whang, se_bars_whap, se_bars_flapp,
se_bars_clink, se_bars_clonk
};
#endif
static const char *const barsounds[] = {
"", "Whang", "Whap", "Flapp", "Clink", "Clonk"
};

View File

@@ -846,7 +846,7 @@ do_play_instrument(struct obj* instr)
}
enum instruments
obj_to_instr(struct obj *obj) {
obj_to_instr(struct obj *obj SOUNDLIBONLY) {
enum instruments ret_instr = ins_no_instrument;
#if defined(SND_LIB_INTEGRATED)
@@ -886,8 +886,6 @@ obj_to_instr(struct obj *obj) {
ret_instr = ins_melodic_tom;
break;
}
#else
nhUse(obj);
#endif
return ret_instr;
}