games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-17 01:32:21 +02:00
Code Issues Releases Activity

Merge pull request #1703 from Adriankhl/fix_auto_fighting

Browse Source 
Prevent crashing when pressing auto-combat button on enemy turn
This commit is contained in:
Ivan Savenko
2023-03-17 22:15:11 +02:00
committed by GitHub
parent 95d56d3f2a 4718396f5f
commit e7f8ef7627
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/battle/BattleInterface.cpp
View File

@ -663,15 +663,11 @@ void BattleInterface::requestAutofightingAIToTakeAction()
boost::thread aiThread([&]() boost::thread aiThread([&]()
{ {
auto ba = std::make_unique<BattleAction>(curInt->autofightingAI->activeStack(stacksController->getActiveStack()));
if(curInt->cb->battleIsFinished()) if(curInt->cb->battleIsFinished())
{ {
return; // battle finished with spellcast return; // battle finished with spellcast
} }
if (curInt->isAutoFightOn)
{
if (tacticsMode) if (tacticsMode)
{ {
// Always end tactics mode. Player interface is blocked currently, so it's not possible that // Always end tactics mode. Player interface is blocked currently, so it's not possible that
@ -683,14 +679,15 @@ void BattleInterface::requestAutofightingAIToTakeAction()
} }
else else
{ {
const CStack* activeStack = stacksController->getActiveStack();
// If enemy is moving, activeStack can be null
if (activeStack)
{
auto ba = std::make_unique<BattleAction>(curInt->autofightingAI->activeStack(activeStack));
givenCommand.setn(ba.release()); givenCommand.setn(ba.release());
} }
} }
else
{
boost::unique_lock<boost::recursive_mutex> un(*CPlayerInterface::pim);
activateStack();
}
}); });
aiThread.detach(); aiThread.detach();