games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Fixed music playback on switching between towns

Browse Source
This commit is contained in:
Ivan Savenko
2023-04-28 16:53:45 +03:00
parent 9296306fa3
commit 76d5b459f1
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/windows/CCastleInterface.cpp
View File

@@ -1206,13 +1206,17 @@ CCastleInterface::CCastleInterface(const CGTownInstance * Town, const CGTownInst
townlist->onSelect = std::bind(&CCastleInterface::townChange, this); townlist->onSelect = std::bind(&CCastleInterface::townChange, this);
recreateIcons(); recreateIcons();
adventureInt->onAudioPaused(); if (!from)
adventureInt->onAudioPaused();
CCS->musich->playMusic(town->town->clientInfo.musicTheme, true, false); CCS->musich->playMusic(town->town->clientInfo.musicTheme, true, false);
} }
CCastleInterface::~CCastleInterface() CCastleInterface::~CCastleInterface()
{ {
if (adventureInt) // may happen on exiting client with open castle interface // resume map audio if:
// adventureInt exists (may happen on exiting client with open castle interface)
// castleInt has not been replaced (happens on switching between towns inside castle interface)
if (adventureInt && LOCPLINT->castleInt == this)
adventureInt->onAudioResumed(); adventureInt->onAudioResumed();
if(LOCPLINT->castleInt == this) if(LOCPLINT->castleInt == this)
LOCPLINT->castleInt = nullptr; LOCPLINT->castleInt = nullptr;