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

Code cleanup, fixes to discovered regressions

Browse Source
This commit is contained in:
Ivan Savenko
2025-01-05 15:41:42 +00:00
parent 83b9a8d750
commit 73d1675ae3
12 changed files with 75 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/mapObjects/CGHeroInstance.cpp
View File

@@ -82,7 +82,7 @@ ui32 CGHeroInstance::getTileMovementCost(const TerrainTile & dest, const Terrain
{
ret = from.getRoad()->movementCost;
}
else if(ti->hasNoTerrainPenalty(from.getTerrainID())) //no special movement bonus
else if(!ti->hasNoTerrainPenalty(from.getTerrainID())) //no special movement bonus
{
ret = VLC->terrainTypeHandler->getById(from.getTerrainID())->moveCost;
ret -= ti->getRoughTerrainDiscountValue();
@@ -235,22 +235,19 @@ int CGHeroInstance::movementPointsLimit(bool onLand) const
int CGHeroInstance::getLowestCreatureSpeed() const
{
static const CSelector selectorSTACKS_SPEED = Selector::type()(BonusType::STACKS_SPEED);
static const std::string cachingStr = "type_" + std::to_string(static_cast<si32>(BonusType::STACKS_SPEED));
if(stacksCount() != 0)
{
int minimalSpeed = std::numeric_limits<int>::max();
//TODO? should speed modifiers (eg from artifacts) affect hero movement?
for(const auto & slot : Slots())
minimalSpeed = std::min(minimalSpeed, slot.second->valOfBonuses(selectorSTACKS_SPEED, cachingStr));
minimalSpeed = std::min(minimalSpeed, slot.second->getInitiative());
return minimalSpeed;
}
else
{
if(commander && commander->alive)
return commander->valOfBonuses(selectorSTACKS_SPEED, cachingStr);
return commander->getInitiative();
}
return 10;
@@ -1348,13 +1345,6 @@ CBonusSystemNode & CGHeroInstance::whereShouldBeAttached(CGameState * gs)
int CGHeroInstance::movementPointsAfterEmbark(int MPsBefore, int basicCost, bool disembark, const TurnInfo * ti) const
{
std::unique_ptr<TurnInfo> turnInfoLocal;
if(!ti)
{
turnInfoLocal = getTurnInfo(0);
ti = turnInfoLocal.get();
}
if(!ti->hasFreeShipBoarding())
return 0; // take all MPs by default