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

Remove pointer to boat from CGHeroInstance

Browse Source
This commit is contained in:
Ivan Savenko
2025-03-26 15:37:26 +00:00
parent 331debaa3f
commit 9e6397d1f9
24 changed files with 89 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/networkPacks/NetPacksLib.cpp
View File

@@ -1226,11 +1226,11 @@ void RemoveObject::applyGs(CGameState *gs)
gs->heroesPool->addHeroToPool(beatenHero->getHeroTypeID());
//If hero on Boat is removed, the Boat disappears
if(beatenHero->boat)
if(beatenHero->inBoat())
{
beatenHero->detachFrom(const_cast<CGBoat&>(*beatenHero->boat));
gs->getMap().eraseObject(beatenHero->boat->id);
beatenHero->boat = nullptr;
beatenHero->detachFrom(const_cast<CGBoat&>(*beatenHero->getBoat()));
gs->getMap().eraseObject(beatenHero->getBoat()->id);
beatenHero->setBoat(nullptr);
}
return;
}
@@ -1321,26 +1321,26 @@ void TryMoveHero::applyGs(CGameState *gs)
assert(boat);
gs->getMap().removeBlockVisTiles(boat); //hero blockvis mask will be used, we don't need to duplicate it with boat
h->boat = boat;
h->setBoat(boat);
h->attachTo(*boat);
boat->setBoardedHero(h);
}
else if(result == DISEMBARK) //hero leaves boat to destination tile
{
auto * b = const_cast<CGBoat *>(h->boat);
auto * b = const_cast<CGBoat *>(h->getBoat());
b->direction = h->moveDir;
b->pos = start;
b->setBoardedHero(nullptr);
gs->getMap().addBlockVisTiles(b);
h->detachFrom(*b);
h->boat = nullptr;
h->setBoat(nullptr);
}
if(start!=end && (result == SUCCESS || result == TELEPORTATION || result == EMBARK || result == DISEMBARK))
{
gs->getMap().removeBlockVisTiles(h);
h->pos = end;
if(auto * b = const_cast<CGBoat *>(h->boat))
if(auto * b = const_cast<CGBoat *>(h->getBoat()))
b->pos = end;
gs->getMap().addBlockVisTiles(h);
}
@@ -1429,7 +1429,7 @@ void HeroRecruited::applyGs(CGameState *gs)
if (boat)
{
gs->getMap().removeBlockVisTiles(boat);
h->attachToBoat(boat);
h->setBoat(boat);
}
}
@@ -1463,7 +1463,7 @@ void GiveHero::applyGs(CGameState *gs)
if (boat)
{
gs->getMap().removeBlockVisTiles(boat);
h->attachToBoat(boat);
h->setBoat(boat);
}
}