games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Rework and simplify logic of attaching heroes to bonus system

Browse Source
This commit is contained in:
Ivan Savenko
2025-06-17 14:37:25 +03:00
parent 0218e47c25
commit 0ad4e80c7d
12 changed files with 57 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/mapObjects/CGTownInstance.cpp
View File

@@ -307,19 +307,12 @@ void CGTownInstance::onHeroVisit(IGameEventCallback & gameEvents, const CGHeroIn
if(armedGarrison() || getVisitingHero())
{
const CGHeroInstance * defendingHero = getVisitingHero() ? getVisitingHero() : getGarrisonHero();
const CArmedInstance * defendingArmy = defendingHero ? (CArmedInstance *)defendingHero : this;
const CArmedInstance * defendingArmy = defendingHero ? static_cast<const CArmedInstance*>(defendingHero) : this;
const bool isBattleOutside = isBattleOutsideTown(defendingHero);
if(!isBattleOutside && getVisitingHero() && defendingHero == getVisitingHero())
{
//we have two approaches to merge armies: mergeGarrisonOnSiege() and used in the CGameHandler::garrisonSwap(ObjectInstanceID tid)
auto * nodeSiege = defendingHero->whereShouldBeAttachedOnSiege(isBattleOutside);
if(!isBattleOutside && defendingHero == getVisitingHero())
mergeGarrisonOnSiege(gameEvents);
if(nodeSiege == (CBonusSystemNode *)this)
gameEvents.swapGarrisonOnSiege(this->id);
const_cast<CGHeroInstance *>(defendingHero)->setVisitedTown(this, false); //hack to return visitor from garrison after battle
}
gameEvents.startBattle(h, defendingArmy, getSightCenter(), h, defendingHero, BattleLayout::createDefaultLayout(*cb, h, defendingArmy), (isBattleOutside ? nullptr : this));
}
else