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

Prevent crashing when pressing auto-combat button on enemy turn

Browse Source
This commit is contained in:
Adriankhl
2023-03-17 15:40:14 +01:00
parent 02b5edd32d
commit 4718396f5f
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
client/battle/BattleInterface.cpp
View File

@ -663,33 +663,30 @@ 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
{ // the AI can take any action except end tactics phase (AI actions won't be triggered)
// Always end tactics mode. Player interface is blocked currently, so it's not possible that //TODO implement the possibility that the AI will be triggered for further actions
// the AI can take any action except end tactics phase (AI actions won't be triggered) //TODO any solution to merge tactics phase & normal phase in the way it is handled by the player and battle interface?
//TODO implement the possibility that the AI will be triggered for further actions stacksController->setActiveStack(nullptr);
//TODO any solution to merge tactics phase & normal phase in the way it is handled by the player and battle interface? tacticsMode = false;
stacksController->setActiveStack(nullptr);
tacticsMode = false;
}
else
{
givenCommand.setn(ba.release());
}
} }
else else
{ {
boost::unique_lock<boost::recursive_mutex> un(*CPlayerInterface::pim); const CStack* activeStack = stacksController->getActiveStack();
activateStack();
// If enemy is moving, activeStack can be null
if (activeStack)
{
auto ba = std::make_unique<BattleAction>(curInt->autofightingAI->activeStack(activeStack));
givenCommand.setn(ba.release());
}
} }
}); });