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

unlock adventure map UI after closing battle result dialog

Browse Source
This commit is contained in:
Andrey Filipenkov
2022-09-30 15:06:50 +03:00
parent 35f2fb01ab
commit 4de0300c76
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/CPlayerInterface.cpp
View File

@@ -930,7 +930,6 @@ void CPlayerInterface::battleEnd(const BattleResult *br)
isAutoFightOn = false;
cb->unregisterBattleInterface(autofightingAI);
autofightingAI.reset();
adventureInt->quickCombatUnlock();
if (!battleInt)
{
@@ -938,6 +937,7 @@ void CPlayerInterface::battleEnd(const BattleResult *br)
// #1490 - during AI turn when quick combat is on, we need to display the message and wait for user to close it.
// Otherwise NewTurn causes freeze.
waitWhileDialog();
adventureInt->quickCombatUnlock();
return;
}
}
@@ -945,6 +945,7 @@ void CPlayerInterface::battleEnd(const BattleResult *br)
BATTLE_EVENT_POSSIBLE_RETURN;
battleInt->battleFinished(*br);
adventureInt->quickCombatUnlock();
}
void CPlayerInterface::battleLogMessage(const std::vector<MetaString> & lines)