games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Merge pull request #2436 from vcmi/fix-freeze-ai-attacking-dwelling

Browse Source 
Fix freeze ai attacking dwelling
This commit is contained in:
DjWarmonger
2023-07-29 09:22:06 +02:00
committed by GitHub
parent 6c52293dd9 943e3e888c
commit 4e044a78ce
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/CGameHandler.cpp
View File

@@ -2128,6 +2128,9 @@ void CGameHandler::setupBattle(int3 tile, const CArmedInstance *armies[2], const
BattleStart bs; BattleStart bs;
bs.info = BattleInfo::setupBattle(tile, terrain, terType, armies, heroes, creatureBank, town); bs.info = BattleInfo::setupBattle(tile, terrain, terType, armies, heroes, creatureBank, town);
engageIntoBattle(bs.info->sides[0].color);
engageIntoBattle(bs.info->sides[1].color);
auto lastBattleQuery = std::dynamic_pointer_cast<CBattleQuery>(queries.topQuery(bs.info->sides[0].color)); auto lastBattleQuery = std::dynamic_pointer_cast<CBattleQuery>(queries.topQuery(bs.info->sides[0].color));
bs.info->replayAllowed = lastBattleQuery == nullptr && !bs.info->sides[1].color.isValidPlayer(); bs.info->replayAllowed = lastBattleQuery == nullptr && !bs.info->sides[1].color.isValidPlayer();
@@ -2590,9 +2593,6 @@ void CGameHandler::startBattlePrimary(const CArmedInstance *army1, const CArmedI
if(gs->curB) if(gs->curB)
gs->curB.dellNull(); gs->curB.dellNull();
engageIntoBattle(army1->tempOwner);
engageIntoBattle(army2->tempOwner);
static const CArmedInstance *armies[2]; static const CArmedInstance *armies[2];
armies[0] = army1; armies[0] = army1;
armies[1] = army2; armies[1] = army2;