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

Access to heroes storage in CMap is now done via public methods

Browse Source
This commit is contained in:
Ivan Savenko
2025-03-14 17:07:30 +00:00
parent 1f502c0548
commit 745040def3
26 changed files with 189 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/mapView/MapViewController.cpp
View File

@ -182,7 +182,7 @@ void MapViewController::tick(uint32_t timeDelta)
assert(boat || hero);
if(!hero)
hero = boat->hero;
hero = boat->getBoardedHero();
double heroMoveTime = GAME->interface()->playerID == hero->getOwner() ?
settings["adventure"]["heroMoveTime"].Float() :
@ -249,7 +249,7 @@ void MapViewController::afterRender()
assert(boat || hero);
if(!hero)
hero = boat->hero;
hero = boat->getBoardedHero();
if(movementContext->progress >= 0.999)
{
@ -406,10 +406,10 @@ void MapViewController::removeObject(const CGObjectInstance * obj)
if (obj->ID == Obj::BOAT)
{
auto * boat = dynamic_cast<const CGBoat*>(obj);
if (boat->hero)
if (boat->getBoardedHero())
{
view->invalidate(context, boat->hero->id);
state->removeObject(boat->hero);
view->invalidate(context, boat->getBoardedHero()->id);
state->removeObject(boat->getBoardedHero());
}
}