mirror of
https://github.com/TombEngine/TombEngine.git
synced 2025-04-28 15:57:59 +03:00
Fixed sounds resuming in pause mode while switching between apps
This commit is contained in:
parent
05788b7978
commit
acf385693e
2 changed files with 10 additions and 2 deletions
|
@ -1,6 +1,7 @@
|
|||
Version 1.3.1
|
||||
=============
|
||||
Version 1.4
|
||||
===========
|
||||
|
||||
* Fixed sounds resuming in pause mode while switching between apps.
|
||||
* Ported Winston from TR3 (requires updated TEN Winston wad2).
|
||||
|
||||
Version 1.3
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
#include "Game/camera.h"
|
||||
#include "Game/collision/collide_room.h"
|
||||
#include "Game/gui.h"
|
||||
#include "Game/Lara/lara.h"
|
||||
#include "Game/room.h"
|
||||
#include "Game/Setup.h"
|
||||
|
@ -15,6 +16,8 @@
|
|||
#include "Specific/trutils.h"
|
||||
#include "Specific/winmain.h"
|
||||
|
||||
using namespace TEN::Gui;
|
||||
|
||||
HSAMPLE BASS_SamplePointer[SOUND_MAX_SAMPLES];
|
||||
HSTREAM BASS_3D_Mixdown;
|
||||
HFX BASS_FXHandler[(int)SoundFilter::Count];
|
||||
|
@ -338,6 +341,10 @@ void ResumeAllSounds(SoundPauseMode mode)
|
|||
if (mode == SoundPauseMode::Global)
|
||||
BASS_Start();
|
||||
|
||||
if (g_Gui.GetInventoryMode() == InventoryMode::Pause ||
|
||||
g_Gui.GetInventoryMode() == InventoryMode::Statistics)
|
||||
return;
|
||||
|
||||
for (const auto& slot : SoundtrackSlot)
|
||||
{
|
||||
if ((slot.Channel != NULL) && (BASS_ChannelIsActive(slot.Channel) == BASS_ACTIVE_PAUSED))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue