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

Added encapsulation for movement points access

Browse Source
This commit is contained in:
Ivan Savenko
2023-06-21 20:38:26 +03:00
parent edf7756783
commit 08cfbe79cf
24 changed files with 86 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/NetPacksLib.cpp
View File

@@ -903,11 +903,9 @@ void SetMovePoints::applyGs(CGameState * gs) const
assert(hero);
if(absolute)
hero->movement = val;
hero->setMovementPoints(val);
else
hero->movement += val;
vstd::amax(hero->movement, 0); //not less than 0
hero->setMovementPoints(hero->movementPointsRemaining() + val);
}
void FoWChange::applyGs(CGameState *gs)
@@ -1276,7 +1274,7 @@ void TryMoveHero::applyGs(CGameState *gs)
return;
}
h->movement = movePoints;
h->setMovementPoints(movePoints);
if((result == SUCCESS || result == BLOCKING_VISIT || result == EMBARK || result == DISEMBARK) && start != end)
{
@@ -1422,11 +1420,11 @@ void HeroRecruited::applyGs(CGameState * gs) const
{ // this is a fresh hero who hasn't appeared yet
if (boatId >= 0) //Hero spawns on water
{
h->movement = h->maxMovePoints(false);
h->setMovementPoints(h->movementPointsLimit(false));
}
else
{
h->movement = h->maxMovePoints(true);
h->setMovementPoints(h->movementPointsLimit(true));
}
}
@@ -1479,7 +1477,7 @@ void GiveHero::applyGs(CGameState * gs) const
h->appearance = VLC->objtypeh->getHandlerFor(Obj::HERO, h->type->heroClass->getIndex())->getTemplates().front();
h->setOwner(player);
h->movement = h->maxMovePoints(true);
h->setMovementPoints(h->movementPointsLimit(true));
h->pos = h->convertFromVisitablePos(oldVisitablePos);
gs->map->heroesOnMap.emplace_back(h);
gs->getPlayerState(h->getOwner())->heroes.emplace_back(h);
@@ -2052,7 +2050,7 @@ void NewTurn::applyGs(CGameState *gs)
logGlobal->error("Hero %d not found in NewTurn::applyGs", h.id.getNum());
continue;
}
hero->movement = h.move;
hero->setMovementPoints(h.move);
hero->mana = h.mana;
}