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

CPathfinder: add const to appropriate methods

Browse Source
This commit is contained in:
ArseniyShestakov
2015-11-08 08:39:00 +03:00
parent f590b364c5
commit be37e1cd8b
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/CPathfinder.cpp
View File

@@ -255,7 +255,7 @@ void CPathfinder::addTeleportExits(bool noTeleportExcludes)
} }
} }
bool CPathfinder::isLayerTransitionPossible() bool CPathfinder::isLayerTransitionPossible() const
{ {
if((cp->layer == ELayer::AIR || cp->layer == ELayer::WATER) if((cp->layer == ELayer::AIR || cp->layer == ELayer::WATER)
&& dp->layer != ELayer::LAND) && dp->layer != ELayer::LAND)
@@ -379,7 +379,7 @@ bool CPathfinder::isMovementToDestPossible()
return true; return true;
} }
bool CPathfinder::isMovementAfterDestPossible() bool CPathfinder::isMovementAfterDestPossible() const
{ {
switch(destAction) switch(destAction)
{ {
@@ -411,17 +411,17 @@ bool CPathfinder::isMovementAfterDestPossible()
return false; return false;
} }
bool CPathfinder::isSourceInitialPosition() bool CPathfinder::isSourceInitialPosition() const
{ {
return cp->coord == out.hpos; return cp->coord == out.hpos;
} }
int3 CPathfinder::getSourceGuardPosition() int3 CPathfinder::getSourceGuardPosition() const
{ {
return gs->map->guardingCreaturePositions[cp->coord.x][cp->coord.y][cp->coord.z]; return gs->map->guardingCreaturePositions[cp->coord.x][cp->coord.y][cp->coord.z];
} }
bool CPathfinder::isSourceGuarded() bool CPathfinder::isSourceGuarded() const
{ {
//map can start with hero on guarded tile or teleport there using dimension door //map can start with hero on guarded tile or teleport there using dimension door
//so threat tile hero standing on like it's not guarded because it's should be possible to move out of here //so threat tile hero standing on like it's not guarded because it's should be possible to move out of here
@@ -429,7 +429,7 @@ bool CPathfinder::isSourceGuarded()
{ {
//special case -> hero embarked a boat standing on a guarded tile -> we must allow to move away from that tile //special case -> hero embarked a boat standing on a guarded tile -> we must allow to move away from that tile
if(cp->accessible != CGPathNode::VISITABLE if(cp->accessible != CGPathNode::VISITABLE
|| !cp->theNodeBefore->layer != ELayer::LAND || cp->theNodeBefore->layer == ELayer::LAND
|| ct->topVisitableId() != Obj::BOAT) || ct->topVisitableId() != Obj::BOAT)
{ {
return true; return true;
@@ -439,7 +439,7 @@ bool CPathfinder::isSourceGuarded()
return false; return false;
} }
bool CPathfinder::isDestinationGuarded(bool ignoreAccessibility) bool CPathfinder::isDestinationGuarded(const bool ignoreAccessibility) const
{ {
if(gs->map->guardingCreaturePositions[dp->coord.x][dp->coord.y][dp->coord.z].valid() if(gs->map->guardingCreaturePositions[dp->coord.x][dp->coord.y][dp->coord.z].valid()
&& (ignoreAccessibility || dp->accessible == CGPathNode::BLOCKVIS)) && (ignoreAccessibility || dp->accessible == CGPathNode::BLOCKVIS))
@@ -450,7 +450,7 @@ bool CPathfinder::isDestinationGuarded(bool ignoreAccessibility)
return false; return false;
} }
bool CPathfinder::isDestinationGuardian() bool CPathfinder::isDestinationGuardian() const
{ {
return getSourceGuardPosition() == dp->coord; return getSourceGuardPosition() == dp->coord;
} }

14
lib/CPathfinder.h
View File

@@ -149,15 +149,15 @@ private:
void addNeighbours(const int3 &coord); void addNeighbours(const int3 &coord);
void addTeleportExits(bool noTeleportExcludes = false); void addTeleportExits(bool noTeleportExcludes = false);
bool isLayerTransitionPossible(); bool isLayerTransitionPossible() const;
bool isMovementToDestPossible(); bool isMovementToDestPossible();
bool isMovementAfterDestPossible(); bool isMovementAfterDestPossible() const;
bool isSourceInitialPosition(); bool isSourceInitialPosition() const;
int3 getSourceGuardPosition(); int3 getSourceGuardPosition() const;
bool isSourceGuarded(); bool isSourceGuarded() const;
bool isDestinationGuarded(bool ignoreAccessibility = true); bool isDestinationGuarded(const bool ignoreAccessibility = true) const;
bool isDestinationGuardian(); bool isDestinationGuardian() const;
void initializeGraph(); void initializeGraph();