games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-03 13:01:33 +02:00
Code Issues Releases Activity

Fix battle start when hero has tactics and no battle sounds mod is on

Browse Source
This commit is contained in:
Ivan Savenko 2022-12-30 11:55:22 +02:00
parent 81164100da
commit a9808a6541
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/battle/BattleInterface.cpp
View File

@ -108,11 +108,14 @@ BattleInterface::BattleInterface(const CCreatureSet *army1, const CCreatureSet *
}
};
CCS->soundh->setCallback(battleIntroSoundChannel, onIntroPlayed);
GH.pushInt(windowObject);
windowObject->blockUI(true);
windowObject->updateQueue();
if (battleIntroSoundChannel != -1)
CCS->soundh->setCallback(battleIntroSoundChannel, onIntroPlayed);
else
onIntroSoundPlayed();
}
void BattleInterface::onIntroSoundPlayed()
@ -228,11 +231,6 @@ void BattleInterface::stackAttacking( const StackAttackInfo & attackInfo )
void BattleInterface::newRoundFirst( int round )
{
if (battleIntroSoundChannel == -1 &&
getAnimationCondition(EAnimationEvents::OPENING) == true)
{
onIntroSoundPlayed();
}
waitForAnimationCondition(EAnimationEvents::OPENING, false);
}