dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r2121) -Fix: changed the 2nd param of AyStar_EndNodeCheck back to what it should be

Browse Source
This commit is contained in:
truelight
2005-04-02 10:38:31 +00:00
parent 333376cb6a
commit 3177525871
4 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ai_pathfinder.c
View File

@@ -50,19 +50,14 @@ static bool IsRoad(TileIndex tile)
#define TILES_BETWEEN(a, b, c) (TileX(a) >= TileX(b) && TileX(a) <= TileX(c) && TileY(a) >= TileY(b) && TileY(a) <= TileY(c))
// Check if the current tile is in our end-area
static int32 AyStar_AiPathFinder_EndNodeCheck(AyStar *aystar, AyStarNode *node)
static int32 AyStar_AiPathFinder_EndNodeCheck(AyStar *aystar, OpenListNode *current)
{
Ai_PathFinderInfo *PathFinderInfo = (Ai_PathFinderInfo*)aystar->user_target;
// It is not allowed to have a station on the end of a bridge or tunnel ;)
if (node->user_data[0] != 0) return AYSTAR_DONE;
if (TILES_BETWEEN(node->tile, PathFinderInfo->end_tile_tl, PathFinderInfo->end_tile_br))
if (IsTileType(node->tile, MP_CLEAR) || IsTileType(node->tile, MP_TREES))
/* XXX: The next line used to be here, but the argument to this function
* changed to an AyStarNode* instead of an OpenListNode*, so we don't
* have the parent available here anymore. Still, if we can build a
* station in anyone direction, we can build it in any direction, right?*/
// if (current->path.parent == NULL || TestCanBuildStationHere(node->tile,AiNew_GetDirection(current->path.parent->node.tile, node->tile)))
if ( TestCanBuildStationHere(node->tile,0))
if (current->path.node.user_data[0] != 0) return AYSTAR_DONE;
if (TILES_BETWEEN(current->path.node.tile, PathFinderInfo->end_tile_tl, PathFinderInfo->end_tile_br))
if (IsTileType(current->path.node.tile, MP_CLEAR) || IsTileType(current->path.node.tile, MP_TREES))
if (current->path.parent == NULL || TestCanBuildStationHere(current->path.node.tile,AiNew_GetDirection(current->path.parent->node.tile, current->path.node.tile)))
return AYSTAR_FOUND_END_NODE;
return AYSTAR_DONE;