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

some macsound instrument play refinements

Browse Source 
Also some better core placement of some of the Hero_playnotes calls.
This commit is contained in:
nhmall
2023-01-24 13:02:29 -05:00
parent 09fa9a865d
commit 5171fcdc1d
7 changed files with 81 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sys/unix/hints/macOS.370
View File

@@ -170,12 +170,16 @@ ifeq "$(HAVE_SNDLIB)" "1"
SNDCFLAGS+= -DUSER_SOUNDS
endif
CFLAGS+= $(PKGCFLAGS) $(WINCFLAGS) #WINCFLAGS set from multiw-2.370
CFLAGS+= $(SNDCFLAGS) #SNDCFLAGS set from multiw-2.370
#WINCFLAGS set from multiw-2.370
#SNDCFLAGS set from multiw-2.370
CFLAGS+= $(PKGCFLAGS) $(WINCFLAGS)
CFLAGS+= $(SNDCFLAGS)
CFLAGS+= $(NHCFLAGS)
CCXXFLAGS+= $(WINCFLAGS) #WINCFLAGS set from multiw-2.370
CCXXFLAGS+= $(SNDCFLAGS) #SNDCFLAGS set from multiw-2.370
#WINCFLAGS set from multiw-2.370
#SNDCFLAGS set from multiw-2.370
CCXXFLAGS+= $(WINCFLAGS)
CCXXFLAGS+= $(SNDCFLAGS)
CCXXFLAGS+= $(NHCFLAGS)
VARDATND =

11
sys/unix/unixmain.c
View File

@@ -39,6 +39,9 @@ ATTRNORETURN static void opt_terminate(void) NORETURN;
ATTRNORETURN static void opt_usage(const char *) NORETURN;
static void opt_showpaths(const char *);
ATTRNORETURN static void scores_only(int, char **, const char *) NORETURN;
#ifdef SND_LIB_INTEGRATED
uint32_t soundlibchoice = soundlib_nosound;
#endif
#ifdef _M_UNIX
extern void check_sco_console(void);
@@ -107,10 +110,12 @@ main(int argc, char *argv[])
* We can leave a hint here for activate_chosen_soundlib later.
* assign_soundlib() just sets an indicator, it doesn't initialize
* any soundlib, and the indicator could be overturned before
* activate_chosen_soundlib() gets called.
* activate_chosen_soundlib() gets called. Qt will place its own
* hint if qt_init_nhwindow() is invoked.
*/
#if defined(SND_LIB_MACSOUND) && !defined(SND_LIB_QTSOUND)
assign_soundlib(soundlib_macsound);
#if defined(SND_LIB_MACSOUND)
soundlibchoice = soundlib_macsound;
assign_soundlib(soundlibchoice);
#endif
#endif