Changeset - r23245:c5cb79c9bc26
[Not reviewed]
master
0 3 0
J0an Josep - 5 years ago 2019-01-14 22:13:12
juanjo.ng.83@gmail.com
Codechange: [NPF] Add some consts.
3 files changed with 6 insertions and 6 deletions:
0 comments (0 inline, 0 general)
src/landscape.cpp
Show inline comments
 
@@ -1098,7 +1098,7 @@ static bool FlowsDown(TileIndex begin, T
 
}
 

	
 
/* AyStar callback for checking whether we reached our destination. */
 
static int32 River_EndNodeCheck(AyStar *aystar, OpenListNode *current)
 
static int32 River_EndNodeCheck(const AyStar *aystar, const OpenListNode *current)
 
{
 
	return current->path.node.tile == *(TileIndex*)aystar->user_target ? AYSTAR_FOUND_END_NODE : AYSTAR_DONE;
 
}
src/pathfinder/npf/aystar.h
Show inline comments
 
@@ -75,7 +75,7 @@ struct AyStar;
 
 *  - #AYSTAR_FOUND_END_NODE : indicates this is the end tile
 
 *  - #AYSTAR_DONE : indicates this is not the end tile (or direction was wrong)
 
 */
 
typedef int32 AyStar_EndNodeCheck(AyStar *aystar, OpenListNode *current);
 
typedef int32 AyStar_EndNodeCheck(const AyStar *aystar, const OpenListNode *current);
 

	
 
/**
 
 * Calculate the G-value for the %AyStar algorithm.
src/pathfinder/npf/npf.cpp
Show inline comments
 
@@ -529,7 +529,7 @@ static int32 NPFRailPathCost(AyStar *as,
 
}
 

	
 
/* Will find any depot */
 
static int32 NPFFindDepot(AyStar *as, OpenListNode *current)
 
static int32 NPFFindDepot(const AyStar *as, const OpenListNode *current)
 
{
 
	AyStarUserData *user = (AyStarUserData *)as->user_data;
 
	/* It's not worth caching the result with NPF_FLAG_IS_TARGET here as below,
 
@@ -539,7 +539,7 @@ static int32 NPFFindDepot(AyStar *as, Op
 
}
 

	
 
/** Find any safe and free tile. */
 
static int32 NPFFindSafeTile(AyStar *as, OpenListNode *current)
 
static int32 NPFFindSafeTile(const AyStar *as, const OpenListNode *current)
 
{
 
	const Train *v = Train::From(((NPFFindStationOrTileData *)as->user_target)->v);
 

	
 
@@ -549,10 +549,10 @@ static int32 NPFFindSafeTile(AyStar *as,
 
}
 

	
 
/* Will find a station identified using the NPFFindStationOrTileData */
 
static int32 NPFFindStationOrTile(AyStar *as, OpenListNode *current)
 
static int32 NPFFindStationOrTile(const AyStar *as, const OpenListNode *current)
 
{
 
	NPFFindStationOrTileData *fstd = (NPFFindStationOrTileData*)as->user_target;
 
	AyStarNode *node = &current->path.node;
 
	const AyStarNode *node = &current->path.node;
 
	TileIndex tile = node->tile;
 

	
 
	if (fstd->station_index == INVALID_STATION && tile == fstd->dest_coords) return AYSTAR_FOUND_END_NODE;
0 comments (0 inline, 0 general)