games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-17 00:07:41 +02:00
Code Issues Releases Activity

Fix garrisons hero

Browse Source
This commit is contained in:
nordsoft
2023-05-02 15:09:02 +04:00
parent 7996123dfa
commit 92dcfd1f68
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mapObjects/CGTownBuilding.cpp
View File

@ -444,7 +444,7 @@ void CTownRewardableBuilding::onHeroVisit(const CGHeroInstance *h) const
cb->showBlockingDialog(&sd); cb->showBlockingDialog(&sd);
}; };
if(!town->hasBuilt(bID)) if(!town->hasBuilt(bID) || cb->isVisitCoveredByAnotherQuery(town, h))
return; return;
if(!wasVisitedBefore(h)) if(!wasVisitedBefore(h))
@ -496,7 +496,7 @@ void CTownRewardableBuilding::onHeroVisit(const CGHeroInstance *h) const
if (!visitedRewards.empty()) if (!visitedRewards.empty())
grantRewardWithMessage(visitedRewards[0]); grantRewardWithMessage(visitedRewards[0]);
else else
logMod->warn("No applicable message for visiting already visited object!"); logMod->debug("No applicable message for visiting already visited object!");
} }
} }

2
server/CGameHandler.cpp
View File

@ -3614,7 +3614,7 @@ bool CGameHandler::buildStructure(ObjectInstanceID tid, BuildingID requestedID,
if(t->visitingHero) if(t->visitingHero)
objectVisited(t, t->visitingHero); objectVisited(t, t->visitingHero);
if(t->garrisonHero) if(t->garrisonHero)
objectVisited(t, t->garrisonHero); visitCastleObjects(t, t->garrisonHero);
checkVictoryLossConditionsForPlayer(t->tempOwner); checkVictoryLossConditionsForPlayer(t->tempOwner);
return true; return true;