zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- call the proper functions to stop sounds in Shadow Warrior.

Browse source
This commit is contained in:
Christoph Oelckers 2020-02-23 17:13:18 +01:00
parent c8aa006f82
commit 83adb81756
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/sw/src/save.cpp
View file

@ -699,7 +699,7 @@ extern SWBOOL InMenuLevel;
PauseAction(); PauseAction();
TerminateLevel(); TerminateLevel();
} }
Terminate3DSounds(); StopFX();
return true; return true;
} }
@ -726,7 +726,6 @@ bool GameInterface::LoadGame(FSaveGameNode* sv)
int StateNdx; int StateNdx;
int StateEndNdx; int StateEndNdx;
StopFX();
Saveable_Init(); Saveable_Init();
auto filr = ReadSavegameChunk("snapshot.sw"); auto filr = ReadSavegameChunk("snapshot.sw");

5
source/sw/src/sounds.cpp
View file

@ -52,6 +52,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "z_music.h" #include "z_music.h"
#include "sound/s_soundinternal.h" #include "sound/s_soundinternal.h"
#include "filesystem/filesystem.h" #include "filesystem/filesystem.h"
#include "serializer.h"
BEGIN_SW_NS BEGIN_SW_NS
@ -216,7 +217,6 @@ struct AmbientSound
static TArray<AmbientSound*> ambients; static TArray<AmbientSound*> ambients;
//========================================================================== //==========================================================================
// //
// //
@ -228,6 +228,7 @@ void StopAmbientSound(void)
for (auto amb : ambients) for (auto amb : ambients)
{ {
soundEngine->StopSound(SOURCE_Ambient, amb, -1); soundEngine->StopSound(SOURCE_Ambient, amb, -1);
delete amb;
} }
ambients.Clear(); ambients.Clear();
} }
@ -267,7 +268,7 @@ void InitAmbient(int num, SPRITEp sp)
amb->sp = sp; amb->sp = sp;
amb->ambIndex = num; amb->ambIndex = num;
amb->vocIndex = vnum; amb->vocIndex = vnum;
amb->ChanFlags = 0; amb->ChanFlags = CHANF_TRANSIENT;
if (ambarray[num].ambient_flags & v3df_dontpan) amb->ChanFlags |= EChanFlags::FromInt(CHANEXF_DONTPAN); if (ambarray[num].ambient_flags & v3df_dontpan) amb->ChanFlags |= EChanFlags::FromInt(CHANEXF_DONTPAN);
if (voc[vnum].voc_flags & vf_loop) amb->ChanFlags |= CHANF_LOOP; if (voc[vnum].voc_flags & vf_loop) amb->ChanFlags |= CHANF_LOOP;
amb->maxIndex = ambarray[num].maxtics * 8; amb->maxIndex = ambarray[num].maxtics * 8;