libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 01:07:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TITANIC: Workaround for wrong ambient music on load

Browse Source
This commit is contained in:
Paul Gilbert 2017-10-13 19:54:01 -04:00
parent c339e3261d
commit 75a736bbc8
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engines/titanic/sound/auto_music_player_base.cpp
View File

@ -21,6 +21,7 @@
*/
#include "titanic/sound/auto_music_player_base.h"
#include "titanic/game_manager.h"
namespace Titanic {
@ -69,9 +70,19 @@ bool CAutoMusicPlayerBase::TimerMsg(CTimerMsg *msg) {
}
bool CAutoMusicPlayerBase::LoadSuccessMsg(CLoadSuccessMsg *msg) {
if (_isEnabled)
if (_isEnabled) {
// WORKAROUND: A problem was encountered with the EmbLobby music player
// not getting turned off when room was left, so was turned on again
// when loading a savegame elsewhere. This guards against it
CRoomItem *newRoom = getGameManager()->getRoom();
if (findRoom() != newRoom) {
_isEnabled = false;
return true;
}
playAmbientSound(_filename, _volumeMode, _initialMute, true, 0,
Audio::Mixer::kMusicSoundType);
}
return true;
}