mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: [NPF] Add some consts.

pull/7154/head
J0an Josep 2019-01-14 23:13:12 +01:00 committed by Charles Pigott
parent 96c5e5e73a
commit 19be1f4ace
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/landscape.cpp
View File

@ -1098,7 +1098,7 @@ static bool FlowsDown(TileIndex begin, TileIndex end)
} }
/* AyStar callback for checking whether we reached our destination. */ /* 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; return current->path.node.tile == *(TileIndex*)aystar->user_target ? AYSTAR_FOUND_END_NODE : AYSTAR_DONE;
} }

2
src/pathfinder/npf/aystar.h
View File

@ -75,7 +75,7 @@ struct AyStar;
* - #AYSTAR_FOUND_END_NODE : indicates this is the end tile * - #AYSTAR_FOUND_END_NODE : indicates this is the end tile
* - #AYSTAR_DONE : indicates this is not the end tile (or direction was wrong) * - #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. * Calculate the G-value for the %AyStar algorithm.

8
src/pathfinder/npf/npf.cpp
View File

@ -529,7 +529,7 @@ static int32 NPFRailPathCost(AyStar *as, AyStarNode *current, OpenListNode *pare
} }
/* Will find any depot */ /* 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; AyStarUserData *user = (AyStarUserData *)as->user_data;
/* It's not worth caching the result with NPF_FLAG_IS_TARGET here as below, /* It's not worth caching the result with NPF_FLAG_IS_TARGET here as below,
@ -539,7 +539,7 @@ static int32 NPFFindDepot(AyStar *as, OpenListNode *current)
} }
/** Find any safe and free tile. */ /** 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); const Train *v = Train::From(((NPFFindStationOrTileData *)as->user_target)->v);
@ -549,10 +549,10 @@ static int32 NPFFindSafeTile(AyStar *as, OpenListNode *current)
} }
/* Will find a station identified using the NPFFindStationOrTileData */ /* 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; NPFFindStationOrTileData *fstd = (NPFFindStationOrTileData*)as->user_target;
AyStarNode *node = &current->path.node; const AyStarNode *node = &current->path.node;
TileIndex tile = node->tile; TileIndex tile = node->tile;
if (fstd->station_index == INVALID_STATION && tile == fstd->dest_coords) return AYSTAR_FOUND_END_NODE; if (fstd->station_index == INVALID_STATION && tile == fstd->dest_coords) return AYSTAR_FOUND_END_NODE;