1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00

Minor fix: apply Monday bonuses to heroes who have slept overnight

This commit is contained in:
Dmitry Orlov
2020-09-28 01:32:33 +03:00
parent fbb272bb27
commit 38fd05f655
5 changed files with 21 additions and 9 deletions

View File

@@ -2508,13 +2508,13 @@ void CGameHandler::heroVisitCastle(const CGTownInstance * obj, const CGHeroInsta
vc.tid = obj->id;
vc.flags |= 1;
sendAndApply(&vc);
vistiCastleObjects (obj, hero);
giveSpells (obj, hero);
visitCastleObjects(obj, hero);
giveSpells(obj, hero);
checkVictoryLossConditionsForPlayer(hero->tempOwner); //transported artifact?
}
void CGameHandler::vistiCastleObjects (const CGTownInstance *t, const CGHeroInstance *h)
void CGameHandler::visitCastleObjects(const CGTownInstance * t, const CGHeroInstance * h)
{
std::vector<CGTownBuilding*>::const_iterator i;
for (i = t->bonusingBuildings.begin(); i != t->bonusingBuildings.end(); i++)
@@ -3161,9 +3161,9 @@ bool CGameHandler::buildStructure(ObjectInstanceID tid, BuildingID requestedID,
sendAndApply(&fw);
if (t->visitingHero)
vistiCastleObjects (t, t->visitingHero);
visitCastleObjects(t, t->visitingHero);
if (t->garrisonHero)
vistiCastleObjects (t, t->garrisonHero);
visitCastleObjects(t, t->garrisonHero);
checkVictoryLossConditionsForPlayer(t->tempOwner);
return true;
@@ -3828,7 +3828,7 @@ bool CGameHandler::hireHero(const CGObjectInstance *obj, ui8 hid, PlayerColor pl
if (t)
{
vistiCastleObjects (t, nh);
visitCastleObjects(t, nh);
giveSpells (t,nh);
}
return true;