games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

Wrong player was engaged for 5lvl dwelling

Browse Source
This commit is contained in:
Andrii Danylchenko 2023-07-28 14:19:12 +03:00
parent a188d55685
commit 8e1dc785eb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/CGameHandler.cpp
View File

@ -2118,6 +2118,9 @@ void CGameHandler::setupBattle(int3 tile, const CArmedInstance *armies[2], const
//send info about battles
BattleStart bs;
bs.info = BattleInfo::setupBattle(tile, terrain, terType, armies, heroes, creatureBank, town);
engageIntoBattle(bs.info->sides[0].color);
engageIntoBattle(bs.info->sides[1].color);
sendAndApply(&bs);
}
@ -2577,9 +2580,6 @@ void CGameHandler::startBattlePrimary(const CArmedInstance *army1, const CArmedI
if(gs->curB)
gs->curB.dellNull();
engageIntoBattle(army1->tempOwner);
engageIntoBattle(army2->tempOwner);
static const CArmedInstance *armies[2];
armies[0] = army1;
armies[1] = army2;