games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

fix negative tile cost from pathfinding skill

Browse Source
This commit is contained in:
Andrii Danylchenko
2021-08-21 12:05:28 +03:00
committed by Andrii Danylchenko
parent 7f175c7f19
commit 98c6215ab6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/CPathfinder.cpp
View File

@@ -1227,7 +1227,7 @@ int CPathfinderHelper::getMovementCost(
/// TODO: by the original game rules hero shouldn't be affected by terrain penalty while flying. /// TODO: by the original game rules hero shouldn't be affected by terrain penalty while flying.
/// Also flying movement only has penalty when player moving over blocked tiles. /// Also flying movement only has penalty when player moving over blocked tiles.
/// So if you only have base flying with 40% penalty you can still ignore terrain penalty while having zero flying penalty. /// So if you only have base flying with 40% penalty you can still ignore terrain penalty while having zero flying penalty.
int ret = hero->getTileCost(*dt, *ct, ti); ui32 ret = hero->getTileCost(*dt, *ct, ti);
/// Unfortunately this can't be implemented yet as server don't know when player flying and when he's not. /// Unfortunately this can't be implemented yet as server don't know when player flying and when he's not.
/// Difference in cost calculation on client and server is much worse than incorrect cost. /// Difference in cost calculation on client and server is much worse than incorrect cost.
/// So this one is waiting till server going to use pathfinder rules for path validation. /// So this one is waiting till server going to use pathfinder rules for path validation.

4
lib/mapObjects/CGHeroInstance.cpp
View File

@@ -70,7 +70,7 @@ static int lowestSpeed(const CGHeroInstance * chi)
ui32 CGHeroInstance::getTileCost(const TerrainTile & dest, const TerrainTile & from, const TurnInfo * ti) const ui32 CGHeroInstance::getTileCost(const TerrainTile & dest, const TerrainTile & from, const TurnInfo * ti) const
{ {
unsigned ret = GameConstants::BASE_MOVEMENT_COST; int64_t ret = GameConstants::BASE_MOVEMENT_COST;
//if there is road both on dest and src tiles - use road movement cost //if there is road both on dest and src tiles - use road movement cost
if(dest.roadType != ERoadType::NO_ROAD && from.roadType != ERoadType::NO_ROAD) if(dest.roadType != ERoadType::NO_ROAD && from.roadType != ERoadType::NO_ROAD)
@@ -105,7 +105,7 @@ ui32 CGHeroInstance::getTileCost(const TerrainTile & dest, const TerrainTile & f
if(ret < GameConstants::BASE_MOVEMENT_COST) if(ret < GameConstants::BASE_MOVEMENT_COST)
ret = GameConstants::BASE_MOVEMENT_COST; ret = GameConstants::BASE_MOVEMENT_COST;
} }
return ret; return (ui32)ret;
} }
ETerrainType::EETerrainType CGHeroInstance::getNativeTerrain() const ETerrainType::EETerrainType CGHeroInstance::getNativeTerrain() const