diff --git a/polymer/eduke32/source/lunatic/control.lua b/polymer/eduke32/source/lunatic/control.lua index d4d156a66..9c1be3280 100644 --- a/polymer/eduke32/source/lunatic/control.lua +++ b/polymer/eduke32/source/lunatic/control.lua @@ -1867,7 +1867,7 @@ end function _stopallsounds(pli) if (ffiC.screenpeek==pli) then - ffiC.FX_StopAllSounds() + ffiC.S_StopAllSounds() end end diff --git a/polymer/eduke32/source/lunatic/defs.ilua b/polymer/eduke32/source/lunatic/defs.ilua index 0156af4a7..a1f8031b0 100644 --- a/polymer/eduke32/source/lunatic/defs.ilua +++ b/polymer/eduke32/source/lunatic/defs.ilua @@ -699,7 +699,7 @@ const char *KB_ScanCodeToString(uint8_t scancode); int32_t A_CheckAnySoundPlaying(int32_t i); int32_t S_CheckSoundPlaying(int32_t i, int32_t num); void S_StopEnvSound(int32_t num, int32_t i); -int32_t FX_StopAllSounds(void); +void S_StopAllSounds(void); void S_ChangeSoundPitch(int32_t num, int32_t i, int32_t pitchoffset); int32_t S_GetMusicPosition(void); void S_SetMusicPosition(int32_t position); diff --git a/polymer/eduke32/source/lunatic/dynsymlist b/polymer/eduke32/source/lunatic/dynsymlist index 4a7c1e5ab..98b04d956 100644 --- a/polymer/eduke32/source/lunatic/dynsymlist +++ b/polymer/eduke32/source/lunatic/dynsymlist @@ -230,7 +230,7 @@ KB_ScanCodeToString; A_CheckAnySoundPlaying; S_CheckSoundPlaying; S_StopEnvSound; -FX_StopAllSounds; +S_StopAllSounds; S_ChangeSoundPitch; S_GetMusicPosition; S_SetMusicPosition; diff --git a/polymer/eduke32/source/m32exec.c b/polymer/eduke32/source/m32exec.c index 35ab15a68..89030d583 100644 --- a/polymer/eduke32/source/m32exec.c +++ b/polymer/eduke32/source/m32exec.c @@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "m32def.h" #include "sounds_mapster32.h" -#include "fx_man.h" #include "osd.h" #include "keys.h" @@ -3098,7 +3097,7 @@ dodefault: case CON_STOPALLSOUNDS: insptr++; - FX_StopAllSounds(); + S_StopAllSounds(); continue; default: diff --git a/polymer/eduke32/source/sounds.c b/polymer/eduke32/source/sounds.c index bc91238a1..925f02153 100644 --- a/polymer/eduke32/source/sounds.c +++ b/polymer/eduke32/source/sounds.c @@ -761,6 +761,12 @@ void S_StopEnvSound(int32_t num, int32_t i) while (j < MAXSOUNDINSTANCES); } +// Do not remove this or make it inline. +void S_StopAllSounds(void) +{ + FX_StopAllSounds(); +} + void S_ChangeSoundPitch(int32_t num, int32_t i, int32_t pitchoffset) { diff --git a/polymer/eduke32/source/sounds.h b/polymer/eduke32/source/sounds.h index 39ca9c33f..29a491c94 100644 --- a/polymer/eduke32/source/sounds.h +++ b/polymer/eduke32/source/sounds.h @@ -102,6 +102,7 @@ int32_t S_PlaySound3D(int32_t num,int32_t i,const vec3_t *pos); void S_SoundShutdown(void); void S_SoundStartup(void); void S_StopEnvSound(int32_t num,int32_t i); +void S_StopAllSounds(void); void S_StopMusic(void); void S_Update(void); void S_ChangeSoundPitch(int32_t num, int32_t i, int32_t pitchoffset); diff --git a/polymer/eduke32/source/sounds_mapster32.c b/polymer/eduke32/source/sounds_mapster32.c index ea9c22093..946fa947a 100644 --- a/polymer/eduke32/source/sounds_mapster32.c +++ b/polymer/eduke32/source/sounds_mapster32.c @@ -374,6 +374,12 @@ void S_StopEnvSound(int32_t num,int32_t i) } } +// Do not remove this or make it inline. +void S_StopAllSounds(void) +{ + FX_StopAllSounds(); +} + void S_Update(void) { int32_t sndist, sx, sy, sz, cx, cy, cz; diff --git a/polymer/eduke32/source/sounds_mapster32.h b/polymer/eduke32/source/sounds_mapster32.h index f3a7215e2..87b41212c 100644 --- a/polymer/eduke32/source/sounds_mapster32.h +++ b/polymer/eduke32/source/sounds_mapster32.h @@ -57,6 +57,7 @@ void S_PlaySound(int32_t); int32_t A_PlaySound(uint32_t num, int32_t i); void S_StopSound(int32_t num); void S_StopEnvSound(int32_t num,int32_t i); +void S_StopAllSounds(void); void S_Update(void); int32_t A_CheckSoundPlaying(int32_t i, int32_t num); int32_t S_CheckSoundPlaying(int32_t i, int32_t num); diff --git a/polymer/eduke32/source/testgame/src/bstub.c b/polymer/eduke32/source/testgame/src/bstub.c index 33d499129..b54f2278d 100644 --- a/polymer/eduke32/source/testgame/src/bstub.c +++ b/polymer/eduke32/source/testgame/src/bstub.c @@ -672,12 +672,7 @@ int32_t A_PlaySound(uint32_t num, int32_t i) { void S_StopSound(int32_t num) { UNREFERENCED_PARAMETER(num); }; -#ifdef __cplusplus -extern "C" -#endif -int32_t FX_StopAllSounds(void) { - return 0; -}; +void S_StopAllSounds(void) { } //Just thought you might want my getnumber16 code /*