mirror of
https://github.com/vcmi/vcmi.git
synced 2026-06-19 22:57:37 +02:00
fix crash in macos due to dylib typeinfo problem
(cherry picked from commit 6c78d4bb23)
This commit is contained in:
committed by
Andrey Filipenkov
parent
a3e7715e06
commit
9005a8ec2c
@@ -531,7 +531,7 @@ void AIGateway::yourTurn(QueryID queryID)
|
||||
|
||||
nullkiller->makingTurnInterruption.reset();
|
||||
|
||||
asyncTasks->run([this]() noexcept
|
||||
asyncTasks->run([this]()
|
||||
{
|
||||
ScopedThreadName guard("NK2AI::AIGateway::makingTurn");
|
||||
status.waitTillFree();
|
||||
@@ -764,7 +764,7 @@ bool AIGateway::makePossibleUpgrades(const CArmedInstance * obj)
|
||||
return upgraded;
|
||||
}
|
||||
|
||||
void AIGateway::makeTurn() noexcept
|
||||
void AIGateway::makeTurn()
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -795,12 +795,15 @@ void AIGateway::makeTurn() noexcept
|
||||
catch (const InterruptionRequestedException &)
|
||||
{
|
||||
logAi->debug("Making turn thread has been interrupted. We'll end without calling endTurn.");
|
||||
return;
|
||||
}
|
||||
catch (const TerminationRequestedException &)
|
||||
{
|
||||
logAi->debug("Making turn thread has been terminated. We'll end without calling endTurn");
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
logAi->error("Unknown exception in makeTurn. Ending turn without calling endTurn.");
|
||||
}
|
||||
}
|
||||
|
||||
void AIGateway::performObjectInteraction(const CGObjectInstance * obj, HeroPtr heroPtr)
|
||||
|
||||
@@ -155,7 +155,7 @@ public:
|
||||
|
||||
void invalidatePaths() override;
|
||||
|
||||
void makeTurn() noexcept;
|
||||
void makeTurn();
|
||||
|
||||
void buildArmyIn(const CGTownInstance * t);
|
||||
void endTurn();
|
||||
|
||||
Reference in New Issue
Block a user