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

soundlib terminology update - sound_triggers

Browse Source 
Switch to using the term "sound triggers" for things that
result in a call to one of the soundlib routines.

SNDCAP_* renamed to SOUND_TRIGGER_*
sndcap field in the sound_procs struct changed to sound_triggers
This commit is contained in:
nhmall
2023-01-27 22:21:53 -05:00
parent 8560e61c96
commit 90895330c5
6 changed files with 103 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
doc/sound.txt
View File

@@ -24,63 +24,71 @@ Contents:
IV. Other related routines IV. Other related routines
V. Game Startup and Soundlib Activation Sequencing V. Game Startup and Soundlib Activation Sequencing
VI. Conventions VI. Conventions
VII. Implementation and Multi-window support VII. Implementation and Multiple Soundlib Support
I. Sound Trigger Types and Terminology I. Sound Trigger Types and Terminology
There are 4 distinct types of sound triggers used by NetHack. There are 4 distinct types of sound sound_triggers used by NetHack.
SNDCAP_USERSOUNDS User-specified sounds that play based on config SOUND_TRIGGER_USERSOUNDS User-specified sounds that play based
file entries that identify a regular expression on config file entries that identify a
to match against message window text, and identify regular expression to match against
an external sound file to load in response. message window text, and identify an
The sound interface function pointer used to invoke external sound file to load in response.
it: The sound interface function pointer
used to invoke it:
void (*sound_play_usersound)(char *filename, void (*sound_play_usersound)(char *filename,
int32_t volume, int32_t idx); int32_t volume, int32_t idx);
SNDCAP_HEROMUSIC Invoked by the core when the in-game hero is SOUND_TRIGGER_HEROMUSIC Invoked by the core when the in-game hero,
playing a tune on an instrument. The sound or perhaps another creature, is playing
interface function pointer used to invoke it: a tune on an instrument. The sound interface
function pointer used to invoke it:
void (*sound_hero_playnotes)(int32_t instrument, void (*sound_hero_playnotes)
const char *str, int32_t volume); (int32_t instrument, const char *str,
int32_t volume);
SNDCAP_ACHIEVEMENTS Invoked by the core when an in-game achievement SOUND_TRIGGER_ACHIEVEMENTS Invoked by the core when an in-game
is reached. The soundlib routines could play achievement is reached. The soundlib routines
appropriate theme or mood music in response. could play appropriate theme or mood music in
There would need to be a way to map the response.
achievements to external user-specified sounds. There needs to be a way to map each
The sound interface function pointer used to achievement to a specific external
invoke it: sound file or resource. The sound
interface function pointer used to
invoke it:
void (*sound_achievement)(schar, schar, void (*sound_achievement)(schar, schar,
int32_t); int32_t);
SNDCAP_SOUNDEFFECTS Invoked by the core when something SOUND_TRIGGER_SOUNDEFFECTS Invoked by the core when something
sound-producing happens in the game. The soundlib sound-producing happens in the game. The
routines could play an appropriate sound effect soundlib routines could play an appropriate
in response. They can be public-domain or sound effect in response. They can be
suitably licensed stock sounds included with the public-domain or suitably licensed stock
game source and made available during the build sounds included with the
process, or (not-yet-implemented) a way to gamesource. The soundeffect must be made
tie particular sound effects to a user-specified available during the build process, or
sound samples in a config file. The sound (not-yet-implemented) a way to tie a
interface function pointer used to invoke it: particular sound effect to a player-specified
sound samples within the player's config
file. The sound interface function
pointer used to invoke it:
void (*sound_soundeffect)(char *desc, int32_t, void (*sound_soundeffect)
int32_t volume); (char *desc, int32_t, int32_t volume);
The types of sound triggers supported by a particular sound library The types of sound sound_triggers supported by a particular soundlib
integration are specified in that library's soundlib file, which is implementation are specified in that library's soundlib file, which is usually
usually found in sound/<library_name>/<library_name>.c found in sound/<library_name>/<library_name>.c (.m in the case of macound), in
(.m in the case of macound), in the sndcap field of the sound_procs struct: the sound_triggers field of the sound_procs struct:
struct sound_procs { struct sound_procs {
const char *soundname; const char *soundname;
enum soundlib_ids soundlib_id; enum soundlib_ids soundlib_id;
unsigned long sndcap; unsigned long sound_triggers;
void (*sound_init_nhsound)(void); void (*sound_init_nhsound)(void);
void (*sound_exit_nhsound)(const char *reason); void (*sound_exit_nhsound)(const char *reason);
void (*sound_achievement)(schar arg1, schar arg2, int32_t avals); void (*sound_achievement)(schar arg1, schar arg2, int32_t avals);
@@ -92,12 +100,13 @@ usually found in sound/<library_name>/<library_name>.c
}; };
A sound library integration support file can implement one, two, three or A sound library integration support file can implement one, two, three or
four of the sound trigger types. The more types of sound-triggers the sound four of the sound trigger types. The more types of sound_triggers the
soundlib implements, the more full-featured the sound experience will be soundlib implements, the more full-featured the sound experience will be
during the game. during the game.
The values can be or'd together in the sndcap field initialization. The values can be or'd together in the sound_triggers field initialization.
SNDCAP_USERSOUNDS | SNDCAP_HEROMUSIC | SNDCAP_ACHIEVEMENTS |SNDCAP_SOUNDEFFECTS SOUND_TRIGGER_USERSOUNDS | SOUND_TRIGGER_HEROMUSIC
| SOUND_TRIGGER_ACHIEVEMENTS | SOUND_TRIGGER_SOUNDEFFECTS
II. Interface Specification II. Interface Specification
@@ -180,7 +189,7 @@ sound_hero_playnotes(int32_t instrument, const char *notestr, int32_t volume);
be capping the number of notes at 5, but it is not be capping the number of notes at 5, but it is not
recommended that the soundlib integration support functions recommended that the soundlib integration support functions
rely on that note count cap as a hard rule. rely on that note count cap as a hard rule.
-- A soundlib integration support file that has SNDCAP_HEROMUSIC -- A soundlib integration support file that has SOUND_TRIGGER_HEROMUSIC
support is expected to play the sound at the volume specified support is expected to play the sound at the volume specified
by the volume argument (1 - 100, representing percentage of by the volume argument (1 - 100, representing percentage of
possible volume levels), if the underlying sound library supports possible volume levels), if the underlying sound library supports
@@ -192,10 +201,10 @@ sound_play_usersound(char *filename, int32_t volume, int32_t usidx);
-- NetHack will call this function when it wants a particular -- NetHack will call this function when it wants a particular
external sound file played, based on a regular expression match external sound file played, based on a regular expression match
that the player has defined in their config file. that the player has defined in their config file.
-- A soundlib integration support file that has SNDCAP_USERSOUNDS -- A soundlib integration support file that has SOUND_TRIGGER_USERSOUNDS
support is expected to play the sound file specified by the filename support is expected to play the sound file specified by the filename
argument. argument.
-- A soundlib integration support file that has SNDCAP_USERSOUNDS -- A soundlib integration support file that has SOUND_TRIGGER_USERSOUNDS
support is expected to play the sound at the volume specified support is expected to play the sound at the volume specified
by the volume argument (1 - 100, representing percentage of by the volume argument (1 - 100, representing percentage of
possible volume levels), if the underlying sound library supports possible volume levels), if the underlying sound library supports
@@ -276,7 +285,7 @@ contain _only_ soundlib code, and may be replaced completely by other
soundlib support. soundlib support.
VII. Implementation and Multiple soundlib support VII. Implementation and Multiple Soundlib Support
Multiple soundlib routines are supported in the same binary. Multiple soundlib routines are supported in the same binary.
@@ -312,8 +321,8 @@ use the following guidelines:
struct sound_procs myprefix_procs = { struct sound_procs myprefix_procs = {
SOUNDID(myprefix), SOUNDID(myprefix),
SNDCAP_USERSOUNDS | SNDCAP_HEROMUSIC SOUND_TRIGGER_USERSOUNDS | SOUND_TRIGGER_HEROMUSIC
| SNDCAP_ACHIEVEMENTS |SNDCAP_SOUNDEFFECTS, | SOUND_TRIGGER_ACHIEVEMENTS |SOUND_TRIGGER_SOUNDEFFECTS,
myprefix_init_nhsound, myprefix_init_nhsound,
myprefix_exit_nhsound, myprefix_exit_nhsound,
myprefix_achievement, myprefix_achievement,
@@ -324,9 +333,9 @@ use the following guidelines:
The first entry in this structure should be the SOUNDID(myprefix) The first entry in this structure should be the SOUNDID(myprefix)
where myprefix should be the name of your soundlib port. where myprefix should be the name of your soundlib port.
After that, the next entry is the sndcap mask that identifies After that, the next entry is the sound_triggers mask that identifies
what sound triggers your soundlib will actually react to and what sound_triggers your soundlib will actually react to and
support. Don't include the sndcap values for functions that are support. Don't include the sound_triggers values for functions that are
empty, so that the NetHack core code won't bother trying to call empty, so that the NetHack core code won't bother trying to call
them. The other entries are the function addresses. them. The other entries are the function addresses.
@@ -479,8 +488,8 @@ static void sample_play_usersound(char *, int32_t, int32_t);
struct sound_procs sample_procs = { struct sound_procs sample_procs = {
SOUNDID(sample), SOUNDID(sample),
SNDCAP_USERSOUNDS | SNDCAP_HEROMUSIC SOUND_TRIGGER_USERSOUNDS | SOUND_TRIGGER_HEROMUSIC
| SNDCAP_ACHIEVEMENTS |SNDCAP_SOUNDEFFECTS, | SOUND_TRIGGER_ACHIEVEMENTS |SOUND_TRIGGER_SOUNDEFFECTS,
sample_init_nhsound, sample_init_nhsound,
sample_exit_nhsound, sample_exit_nhsound,
sample_achievement, sample_achievement,
@@ -502,7 +511,7 @@ sample_exit_nhsound(const char *reason)
} }
/* fulfill SNDCAP_ACHIEVEMENTS */ /* fulfill SOUND_TRIGGER_ACHIEVEMENTS */
static void static void
sample_achievement(schar ach1, schar ach2, int32_t avals) sample_achievement(schar ach1, schar ach2, int32_t avals)
{ {
@@ -510,20 +519,20 @@ sample_achievement(schar ach1, schar ach2, int32_t avals)
} }
/* fulfill SNDCAP_SOUNDEFFECTS */ /* fulfill SOUND_TRIGGER_SOUNDEFFECTS */
static void static void
sample_soundeffect(char *desc, int32_t seid, int volume) sample_soundeffect(char *desc, int32_t seid, int volume)
{ {
} }
/* fulfill SNDCAP_HEROMUSIC */ /* fulfill SOUND_TRIGGER_HEROMUSIC */
static void sample_hero_playnotes(int32_t instrument, const char *str, int32_t volume) static void sample_hero_playnotes(int32_t instrument, const char *str, int32_t volume)
{ {
} }
/* fulfill SNDCAP_USERSOUNDS */ /* fulfill SOUND_TRIGGER_USERSOUNDS */
static void static void
sample_play_usersound(char *filename, int volume, int usidx) sample_play_usersound(char *filename, int volume, int usidx)
{ {

112
include/sndprocs.h
View File

@@ -5,66 +5,6 @@
#ifndef SNDPROCS_H #ifndef SNDPROCS_H
#define SNDPROCS_H #define SNDPROCS_H
/*
*
* Types of potential sound supports (all are optional):
*
* SNDCAP_USERSOUNDS User-specified sounds that play based on config
* file entries that identify a regular expression
* to match against message window text, and identify
* an external sound file to load in response.
* The sound interface function pointer used to invoke
* it:
*
* void (*sound_play_usersound)(char *filename,
* int32_t volume, int32_t idx);
*
* SNDCAP_HEROMUSIC Invoked by the core when the in-game hero is
* playing a tune on an instrument. The sound
* interface function pointer used to invoke it:
*
* void (*sound_hero_playnotes)(int32_t instrument,
* const char *str, int32_t volume);
*
* SNDCAP_ACHIEVEMENTS Invoked by the core when an in-game achievement
* is reached. The soundlib routines could play
* appropriate theme or mood music in response.
* There would need to be a way to map the
* achievements to external user-specified sounds.
* The sound interface function pointer used to
* invoke it:
*
* void (*sound_achievement)(schar, schar,
* int32_t);
*
* SNDCAP_SOUNDEFFECTS Invoked by the core when something
* sound-producing happens in the game. The soundlib
* routines could play an appropriate sound effect
* in response. They can be public-domain or
* suitably-licensed stock sounds included with the
* game source and made available during the build
* process, or (not-yet-implemented) a way to
* tie particular sound effects to a user-specified
* sound samples in a config file. The sound
* interface function pointer used to invoke it:
*
* void (*sound_soundeffect)(char *desc, int32_t,
* int32_t volume);
*
* Development notes:
* - gc.chosen_soundlib holds the soundlib_id that will be initialized
* at the appropriate time (startup or after an option change). It
* is initialized to soundlib_nosound, so that is what will be used if
* the initial value isn't replaced via an assign_soundlib() call
* prior to the call to the activate_chosen_soundlib() in
* moveloop_preamble() at the start of the game.
* - ga.active_soundlib holds the soundlib_id of the active soundlib.
* It is initialized to soundlib_unassigned. It will get changed to
* reflect the activated soundlib_id once activate_chosen_soundlib()
* has been called.
*
*/
enum soundlib_ids { enum soundlib_ids {
soundlib_nosound, soundlib_nosound,
#ifdef SND_LIB_PORTAUDIO #ifdef SND_LIB_PORTAUDIO
@@ -103,7 +43,7 @@ enum soundlib_ids {
struct sound_procs { struct sound_procs {
const char *soundname; const char *soundname;
enum soundlib_ids soundlib_id; enum soundlib_ids soundlib_id;
unsigned long sndcap; /* capabilities in the port */ unsigned long sound_triggers; /* capabilities in the port */
void (*sound_init_nhsound)(void); void (*sound_init_nhsound)(void);
void (*sound_exit_nhsound)(const char *); void (*sound_exit_nhsound)(const char *);
void (*sound_achievement)(schar, schar, int32_t); void (*sound_achievement)(schar, schar, int32_t);
@@ -117,12 +57,12 @@ extern struct sound_procs sndprocs;
#define SOUNDID(soundname) #soundname, ((enum soundlib_ids) soundlib_##soundname) #define SOUNDID(soundname) #soundname, ((enum soundlib_ids) soundlib_##soundname)
/* /*
* SOUNDCAP * Types of triggers
*/ */
#define SNDCAP_USERSOUNDS 0x0001L #define SOUND_TRIGGER_USERSOUNDS 0x0001L
#define SNDCAP_HEROMUSIC 0x0002L #define SOUND_TRIGGER_HEROMUSIC 0x0002L
#define SNDCAP_ACHIEVEMENTS 0x0004L #define SOUND_TRIGGER_ACHIEVEMENTS 0x0004L
#define SNDCAP_SOUNDEFFECTS 0x0008L #define SOUND_TRIGGER_SOUNDEFFECTS 0x0008L
/* 28 free bits */ /* 28 free bits */
extern struct sound_procs soundprocs; extern struct sound_procs soundprocs;
@@ -412,42 +352,42 @@ SoundAchievement(0, sa2_xpleveldown, level);
#define SND_LIB_INTEGRATED /* shortcut for conditional code in other files */ #define SND_LIB_INTEGRATED /* shortcut for conditional code in other files */
#define Play_usersound(filename, vol, idx) \ #define Play_usersound(filename, vol, idx) \
do { \ do { \
if (!Deaf && soundprocs.sound_play_usersound \ if (!Deaf && soundprocs.sound_play_usersound \
&& ((soundprocs.sndcap & SNDCAP_USERSOUNDS) != 0)) \ && ((soundprocs.sound_triggers & SOUND_TRIGGER_USERSOUNDS) != 0)) \
(*soundprocs.sound_play_usersound)((filename), (vol), (idx)); \ (*soundprocs.sound_play_usersound)((filename), (vol), (idx)); \
} while(0) } while(0)
#define Soundeffect(seid, vol) \ #define Soundeffect(seid, vol) \
do { \ do { \
if (!Deaf && soundprocs.sound_soundeffect \ if (!Deaf && soundprocs.sound_soundeffect \
&& ((soundprocs.sndcap & SNDCAP_SOUNDEFFECTS) != 0)) \ && ((soundprocs.sound_triggers & SOUND_TRIGGER_SOUNDEFFECTS) != 0)) \
(*soundprocs.sound_soundeffect)(emptystr, (seid), (vol)); \ (*soundprocs.sound_soundeffect)(emptystr, (seid), (vol)); \
} while(0) } while(0)
/* Player's perspective, not the hero's; no Deaf suppression */ /* Player's perspective, not the hero's; no Deaf suppression */
#define SoundeffectEvenIfDeaf(seid, vol) \ #define SoundeffectEvenIfDeaf(seid, vol) \
do { \ do { \
if (!soundprocs.sound_soundeffect \ if (!soundprocs.sound_soundeffect \
&& ((soundprocs.sndcap & SNDCAP_SOUNDEFFECTS) != 0)) \ && ((soundprocs.sound_triggers & SOUND_TRIGGER_SOUNDEFFECTS) != 0)) \
(*soundprocs.sound_soundeffect)(emptystr, (seid), (vol)); \ (*soundprocs.sound_soundeffect)(emptystr, (seid), (vol)); \
} while(0) } while(0)
#define Hero_playnotes(instrument, str, vol) \ #define Hero_playnotes(instrument, str, vol) \
do { \ do { \
if (!Deaf && soundprocs.sound_hero_playnotes \ if (!Deaf && soundprocs.sound_hero_playnotes \
&& ((soundprocs.sndcap & SNDCAP_HEROMUSIC) != 0)) \ && ((soundprocs.sound_triggers & SOUND_TRIGGER_HEROMUSIC) != 0)) \
(*soundprocs.sound_hero_playnotes)((instrument), (str), (vol)); \ (*soundprocs.sound_hero_playnotes)((instrument), (str), (vol)); \
} while(0) } while(0)
/* void (*sound_achievement)(schar, schar, int32_t); */ /* void (*sound_achievement)(schar, schar, int32_t); */
/* Player's perspective, not the hero's; no Deaf suppression */ /* Player's perspective, not the hero's; no Deaf suppression */
#define SoundAchievement(arg1, arg2, avals) \ #define SoundAchievement(arg1, arg2, avals) \
do { \ do { \
if (soundprocs.sound_achievement \ if (soundprocs.sound_achievement \
&& ((soundprocs.sndcap & SNDCAP_ACHIEVEMENTS) != 0)) \ && ((soundprocs.sound_triggers & SOUND_TRIGGER_ACHIEVEMENTS) != 0)) \
(*soundprocs.sound_achievement)((arg1), (arg2), (avals)); \ (*soundprocs.sound_achievement)((arg1), (arg2), (avals)); \
} while(0) } while(0)
/* void (*sound_achievement)(schar, schar, int32_t); */ /* void (*sound_achievement)(schar, schar, int32_t); */

64
sound/macsound/macsound.m
View File

@@ -30,13 +30,13 @@ static int affiliate(int32_t seid, const char *soundname);
/* /*
* Sound capabilities that can be enabled: * Sound capabilities that can be enabled:
* SNDCAP_USERSOUNDS | SNDCAP_HEROMUSIC * SOUND_TRIGGER_USERSOUNDS | SOUND_TRIGGER_HEROMUSIC
* | SNDCAP_ACHIEVEMENTS |SNDCAP_SOUNDEFFECTS, * | SOUND_TRIGGER_ACHIEVEMENTS | SOUND_TRIGGER_SOUNDEFFECTS,
*/ */
struct sound_procs macsound_procs = { struct sound_procs macsound_procs = {
SOUNDID(macsound), SOUNDID(macsound),
SNDCAP_HEROMUSIC | SNDCAP_SOUNDEFFECTS, SOUND_TRIGGER_HEROMUSIC | SOUND_TRIGGER_SOUNDEFFECTS,
macsound_init_nhsound, macsound_init_nhsound,
macsound_exit_nhsound, macsound_exit_nhsound,
macsound_achievement, macsound_achievement,
@@ -45,56 +45,6 @@ struct sound_procs macsound_procs = {
macsound_play_usersound, macsound_play_usersound,
}; };
/*
*
* Types of potential sound supports (all are optionally implemented):
*
* SNDCAP_USERSOUNDS User-specified sounds that play based on config
* file entries that identify a regular expression
* to match against message window text, and identify
* an external sound file to load in response.
* The sound interface function pointer used to invoke
* it:
*
* void (*sound_play_usersound)(char *filename,
* int32_t volume, int32_t idx);
*
* SNDCAP_HEROMUSIC Invoked by the core when the in-game hero is
* playing a tune on an instrument. The sound
* interface function pointer used to invoke it:
*
* void (*sound_hero_playnotes)(int32_t instrument,
* char *str, int32_t volume);
*
* SNDCAP_ACHIEVEMENTS Invoked by the core when an in-game achievement
* is reached. The soundlib routines could play
* appropriate theme or mood music in response.
* There would need to be a way to map the
* achievements to external user-specified sounds.
* The sound interface function pointer used to
* invoke it:
*
* void (*sound_achievement)(schar, schar,
* int32_t);
*
* SNDCAP_SOUNDEFFECTS Invoked by the core when something
* sound-producing happens in the game. The soundlib
* routines could play an appropriate sound effect
* in response. They can be public-domain or
* suitably-licensed stock sounds included with the
* game source and made available during the build
* process, or (not-yet-implemented) a way to
* tie particular sound effects to a user-specified
* sound macsounds in a config file. The sound
* interface function pointer used to invoke it:
*
* void (*sound_soundeffect)(char *desc, int32_t,
* int32_t volume);
*
* The routines below would call into your sound library.
* to fulfill the functionality.
*/
static void static void
macsound_init_nhsound(void) macsound_init_nhsound(void)
{ {
@@ -108,7 +58,7 @@ macsound_exit_nhsound(const char *reason UNUSED)
} }
/* fulfill SNDCAP_ACHIEVEMENTS */ /* fulfill SOUND_TRIGGER_ACHIEVEMENTS */
static void static void
macsound_achievement(schar ach1 UNUSED, schar ach2 UNUSED, int32_t repeat UNUSED) macsound_achievement(schar ach1 UNUSED, schar ach2 UNUSED, int32_t repeat UNUSED)
{ {
@@ -123,7 +73,7 @@ static int32_t affiliation[number_of_se_entries + EXTRA_SOUNDS] = { 0 };
static NSString *soundstring[number_of_se_entries + EXTRA_SOUNDS]; static NSString *soundstring[number_of_se_entries + EXTRA_SOUNDS];
static NSSound *seSound[number_of_se_entries + EXTRA_SOUNDS]; static NSSound *seSound[number_of_se_entries + EXTRA_SOUNDS];
/* fulfill SNDCAP_SOUNDEFFECTS */ /* fulfill SOUND_TRIGGER_SOUNDEFFECTS */
static void static void
macsound_soundeffect(char *desc UNUSED, int32_t seid, int volume UNUSED) macsound_soundeffect(char *desc UNUSED, int32_t seid, int volume UNUSED)
{ {
@@ -158,7 +108,7 @@ macsound_soundeffect(char *desc UNUSED, int32_t seid, int volume UNUSED)
#define WAVEMUSIC_SOUNDS #define WAVEMUSIC_SOUNDS
/* fulfill SNDCAP_HEROMUSIC */ /* fulfill SOUND_TRIGGER_HEROMUSIC */
static void macsound_hero_playnotes(int32_t instrument, static void macsound_hero_playnotes(int32_t instrument,
const char *str, int32_t vol UNUSED) const char *str, int32_t vol UNUSED)
{ {
@@ -260,7 +210,7 @@ static void macsound_hero_playnotes(int32_t instrument,
#endif #endif
} }
/* fulfill SNDCAP_USERSOUNDS */ /* fulfill SOUND_TRIGGER_USERSOUNDS */
static void static void
macsound_play_usersound(char *filename UNUSED, int volume UNUSED, int idx UNUSED) macsound_play_usersound(char *filename UNUSED, int volume UNUSED, int idx UNUSED)
{ {

3
sound/windsound/windsound.c
View File

@@ -25,7 +25,8 @@ static void windsound_play_usersound(char *, int32_t, int32_t);
struct sound_procs windsound_procs = { struct sound_procs windsound_procs = {
SOUNDID(windsound), SOUNDID(windsound),
SNDCAP_USERSOUNDS | SNDCAP_SOUNDEFFECTS | SNDCAP_HEROMUSIC, SOUND_TRIGGER_USERSOUNDS | SOUND_TRIGGER_SOUNDEFFECTS
| SOUND_TRIGGER_HEROMUSIC,
windsound_init_nhsound, windsound_init_nhsound,
windsound_exit_nhsound, windsound_exit_nhsound,
windsound_achievement, windsound_achievement,

3
src/insight.c
View File

@@ -2337,8 +2337,7 @@ record_achievement(schar achidx)
* theme music or something. We do let the sound interface know * theme music or something. We do let the sound interface know
* that it's not the original achievement though. * that it's not the original achievement though.
*/ */
if (soundprocs.sound_achievement) SoundAchievement(achidx, 0, repeat_achievement);
(*soundprocs.sound_achievement)(achidx, 0, repeat_achievement);
if (repeat_achievement) if (repeat_achievement)
return; /* already recorded, don't duplicate it */ return; /* already recorded, don't duplicate it */

2
win/Qt/qt_bind.cpp
View File

@@ -1175,7 +1175,7 @@ struct window_procs Qt_procs = {
#if defined(SND_LIB_QTSOUND) && !defined(QT_NO_SOUND) #if defined(SND_LIB_QTSOUND) && !defined(QT_NO_SOUND)
struct sound_procs qtsound_procs = { struct sound_procs qtsound_procs = {
SOUNDID(qtsound), SOUNDID(qtsound),
SNDCAP_USERSOUNDS, SOUND_TRIGGER_USERSOUNDS,
nethack_qt_::NetHackQtBind::qtsound_init_nhsound, nethack_qt_::NetHackQtBind::qtsound_init_nhsound,
nethack_qt_::NetHackQtBind::qtsound_exit_nhsound, nethack_qt_::NetHackQtBind::qtsound_exit_nhsound,
nethack_qt_::NetHackQtBind::qtsound_achievement, nethack_qt_::NetHackQtBind::qtsound_achievement,