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

Merge branch 'macsound' into NetHack-3.7

Browse Source
This commit is contained in:
nhmall
2023-01-23 23:52:07 -05:00
parent 1d8c944c5a 3d908c49ef
commit 46f86343e6
14 changed files with 524 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/extern.h
View File

@@ -2470,9 +2470,11 @@ extern void freedynamicdata(void);
extern void store_savefileinfo(NHFILE *);
extern void store_savefileinfo(NHFILE *);
extern int nhdatatypes_size(void);
#if 0
extern void assignlog(char *, char*, int);
extern FILE *getlog(NHFILE *);
extern void closelog(NHFILE *);
#endif
/* ### sfstruct.c ### */

10
include/sndprocs.h
View File

@@ -66,7 +66,7 @@
*/
enum soundlib_ids {
soundlib_unassigned = 0,
soundlib_nosound,
#ifdef SND_LIB_QTSOUND
soundlib_qtsound,
#endif
@@ -94,7 +94,9 @@ enum soundlib_ids {
#ifdef SND_LIB_WINDSOUND
soundlib_windsound,
#endif
soundlib_nosound
#ifdef SND_LIB_MACSOUND
soundlib_macsound
#endif
};
struct sound_procs {
@@ -111,7 +113,7 @@ struct sound_procs {
extern struct sound_procs sndprocs;
#define SOUNDID(soundname) #soundname, soundlib_##soundname
#define SOUNDID(soundname) #soundname, ((enum soundlib_ids) soundlib_##soundname)
/*
* SOUNDCAP
@@ -367,7 +369,7 @@ enum sound_effect_entries {
|| defined(SND_LIB_OPENAL) || defined(SND_LIB_SDL_MIXER) \
|| defined(SND_LIB_MINIAUDIO) || defined(SND_LIB_FMOD) \
|| defined(SND_LIB_SOUND_ESCCODES) || defined(SND_LIB_VISSOUND) \
|| defined(SND_LIB_WINDSOUND)
|| defined(SND_LIB_WINDSOUND) || defined(SND_LIB_MACSOUND)
#define SND_LIB_INTEGRATED /* shortcut for conditional code in other files */