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

(svn r18725) -Add: [NoAI] AIWaypoint::WaypointType and AIWaypoint::HasWaypointType().

Browse Source 
-Change: [NoAI] Constructor of AIWaypoint now takes a WaypointType to also handle buoys.
-Remove: [NoAI] AIBuoyList.
This commit is contained in:
frosch
2010-01-04 19:42:29 +00:00
parent 27fc22a76b
commit 1ed599f5cf
17 changed files with 68 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ai/api/ai_waypoint.cpp
View File

@@ -11,18 +11,27 @@
#include "ai_waypoint.hpp"
#include "ai_rail.hpp"
#include "ai_marine.hpp"
#include "../../company_func.h"
#include "../../waypoint_base.h"
/* static */ bool AIWaypoint::IsValidWaypoint(StationID waypoint_id)
{
const Waypoint *wp = ::Waypoint::GetIfValid(waypoint_id);
return wp != NULL && wp->owner == _current_company;
return wp != NULL && (wp->owner == _current_company || wp->owner == OWNER_NONE);
}
/* static */ StationID AIWaypoint::GetWaypointID(TileIndex tile)
{
if (!AIRail::IsRailWaypointTile(tile)) return STATION_INVALID;
if (!AIRail::IsRailWaypointTile(tile) && !AIMarine::IsBuoyTile(tile)) return STATION_INVALID;
return ::GetStationIndex(tile);
}
/* static */ bool AIWaypoint::HasWaypointType(StationID waypoint_id, WaypointType waypoint_type)
{
if (!IsValidWaypoint(waypoint_id)) return false;
if (CountBits(waypoint_type) != 1) return false;
return (::Waypoint::Get(waypoint_id)->facilities & waypoint_type) != 0;
}