From aee2ff57e866ac88472a48e5cf966be5fa1fb8fe Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Fri, 27 Jan 2023 01:25:05 -0500
Subject: [PATCH] additional Soundeffect, additional SoundAchievement

Also adds a macro SoundeffectEvenIfDeaf for a couple of proposed
special cases where Deafness shouldn't factor in.
---
 include/sndprocs.h | 55 ++++++++++++++++++++++++++++++++++++++++++++++
 src/allmain.c      |  3 +++
 src/sounds.c       |  5 +++++
 3 files changed, 63 insertions(+)
 mode change 100644 => 100755 include/sndprocs.h

diff --git a/include/sndprocs.h b/include/sndprocs.h
old mode 100644
new mode 100755
index 6a2d05dd0..691fc6de1
--- a/include/sndprocs.h
+++ b/include/sndprocs.h
@@ -371,9 +371,38 @@ enum sound_effect_entries {
     se_bone_rattle                    = 185,
     se_orc_grunt                      = 186,
     se_avian_screak                   = 187,
+    se_paranoid_confirmation          = 188,
+    se_bars_whap                      = 189,
+    se_bars_flapp                     = 190,
+    se_bars_clink                     = 191,
+    se_bars_clonk                     = 192,
     number_of_se_entries
 };
 
+enum achievements_arg2 {
+    sa2_splashscreen, sa2_newgame_nosplash, sa2_restoregame,
+    sa2_xplevelup, sa2_xpleveldown
+};
+
+/*
+Arguments for sound_achievement(schar arg1, schar arg2, int32_t aflags)
+
+Arguments for actual achievements, those in you.h,
+        arg1 = the achievement value.
+        arg2 = 0 (irrelevant).
+      aflags = 0 for first time, 1 for repeat.
+
+These next ones make use of arg2, and aflags may be
+filled with additional int values dependent on arg2.
+arg1 must always be 0 for these.
+
+SoundAchievement(0, sa2_splashscreen, 0);
+SoundAchievement(0, sa2_newgame_nosplash, 0);
+SoundAchievement(0, sa2_restoregame, 0);
+SoundAchievement(0, sa2_levelup, level);
+SoundAchievement(0, sa2_xpleveldown, level);
+*/
+
 #if defined(SND_LIB_QTSOUND) || defined(SND_LIB_PORTAUDIO) \
         || defined(SND_LIB_OPENAL) || defined(SND_LIB_SDL_MIXER) \
         || defined(SND_LIB_MINIAUDIO) || defined(SND_LIB_FMOD) \
@@ -396,12 +425,37 @@ enum sound_effect_entries {
             (*soundprocs.sound_soundeffect)(emptystr, (seid), (vol)); \
     } while(0)
 
+#define SoundeffectEvenIfDeaf(seid, vol) \
+    do {                                                              \
+        if (!soundprocs.sound_soundeffect                             \
+            && ((soundprocs.sndcap & SNDCAP_SOUNDEFFECTS) != 0))      \
+            (*soundprocs.sound_soundeffect)(emptystr, (seid), (vol)); \
+    } while(0)
+
 #define Hero_playnotes(instrument, str, vol) \
     do {                                                                    \
         if (!Deaf && soundprocs.sound_hero_playnotes                        \
             && ((soundprocs.sndcap & SNDCAP_HEROMUSIC) != 0))               \
             (*soundprocs.sound_hero_playnotes)((instrument), (str), (vol)); \
     } while(0)
+
+/*  void (*sound_achievement)(schar, schar, int32_t); */
+
+#define SoundAchievement(arg1, arg2, avals) \
+    do {                                                                  \
+        if (soundprocs.sound_achievement                                  \
+            && ((soundprocs.sndcap & SNDCAP_ACHIEVEMENTS) != 0))          \
+            (*soundprocs.sound_achievement)((arg1), (arg2), (avals));     \
+    } while(0)
+
+/*  void (*sound_achievement)(schar, schar, int32_t); */
+
+#define SoundAchievement(arg1, arg2, aflags) \
+    do {                                                                  \
+        if (soundprocs.sound_achievement                                  \
+            && ((soundprocs.sndcap & SNDCAP_ACHIEVEMENTS) != 0))          \
+            (*soundprocs.sound_achievement)((arg1), (arg2), (aflags));    \
+    } while(0)
 #else
 #ifdef SND_LIB_INTEGRATED
 #undef  SND_LIB_INTEGRATED
@@ -409,6 +463,7 @@ enum sound_effect_entries {
 #define Play_usersound(filename, vol, idx)
 #define Soundeffect(seid, vol)
 #define Hero_playnotes(instrument, str, vol)
+#define SoundAchievement(arg1, arg2, avals)
 #endif
 
 #endif /* SNDPROCS_H */
diff --git a/src/allmain.c b/src/allmain.c
index 3dfc63a7d..29aee3360 100644
--- a/src/allmain.c
+++ b/src/allmain.c
@@ -626,6 +626,9 @@ init_sound_and_display_gamewindows(void)
 
     activate_chosen_soundlib();
 
+    SoundAchievement(0, sa2_splashscreen, 0);
+    /* ToDo: new splash screen invocation will go here */
+
     WIN_MESSAGE = create_nhwindow(NHW_MESSAGE);
     if (VIA_WINDOWPORT()) {
         status_initialize(0);
diff --git a/src/sounds.c b/src/sounds.c
index 2c68a78f8..f12726367 100644
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -2033,6 +2033,11 @@ static const struct soundeffect_automapping
     { se_bone_rattle,                   "bone_rattle" },
     { se_orc_grunt,                     "orc_grunt" },
     { se_avian_screak,                  "avian_screak" },
+    { se_paranoid_confirmation,         "paranoid_confirmation" },
+    { se_bars_whap,                     "bars_whap" },
+    { se_bars_flapp,                    "bars_flapp" },
+    { se_bars_clink,                    "bars_clink" },
+    { se_bars_clonk,                    "bars_clonk" },
 };
 
 static const char *semap_basenames[SIZE(se_mappings_init)];