1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00

Merged master into develop

This commit is contained in:
Ivan Savenko
2023-08-03 23:38:32 +03:00
90 changed files with 1770 additions and 721 deletions

View File

@ -1381,9 +1381,8 @@ void HeroRecruited::applyGs(CGameState * gs) const
auto * boat = dynamic_cast<CGBoat *>(obj);
if (boat)
{
h->boat = boat;
h->attachTo(*boat);
boat->hero = h;
gs->map->removeBlockVisTiles(boat);
h->attachToBoat(boat);
}
}
@ -1418,9 +1417,8 @@ void GiveHero::applyGs(CGameState * gs) const
auto * boat = dynamic_cast<CGBoat *>(obj);
if (boat)
{
h->boat = boat;
h->attachTo(*boat);
boat->hero = h;
gs->map->removeBlockVisTiles(boat);
h->attachToBoat(boat);
}
}