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

Fix crash on attacking town with garrison but without defending heroes

Browse Source
This commit is contained in:
Ivan Savenko
2025-06-20 17:23:19 +03:00
parent b5255ce8a5
commit 102d932641
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mapObjects/CGTownInstance.cpp
View File

@@ -310,7 +310,7 @@ void CGTownInstance::onHeroVisit(IGameEventCallback & gameEvents, const CGHeroIn
const CArmedInstance * defendingArmy = defendingHero ? static_cast<const CArmedInstance*>(defendingHero) : this;
const bool isBattleOutside = isBattleOutsideTown(defendingHero);
if(!isBattleOutside && defendingHero == getVisitingHero())
if(!isBattleOutside && defendingHero && defendingHero == getVisitingHero())
mergeGarrisonOnSiege(gameEvents);
gameEvents.startBattle(h, defendingArmy, getSightCenter(), h, defendingHero, BattleLayout::createDefaultLayout(*cb, h, defendingArmy), (isBattleOutside ? nullptr : this));