diff options
| author | smatz <smatz@openttd.org> | 2009-05-16 23:34:14 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2009-05-16 23:34:14 +0000 |
| commit | 6221d74644922ea4bbba3ed9cd8bbec42398f77b (patch) | |
| tree | 0069bbd6bb7525754c5d9353132f5dc64a0996cc /src/ai/api/ai_station.cpp | |
| parent | 814f153b5a98e0030cbd221e6a89e083ce62bb1d (diff) | |
| download | openttd-6221d74644922ea4bbba3ed9cd8bbec42398f77b.tar.xz | |
(svn r16325) -Codechange: replace GetPoolItem(index) by PoolItem::Get(index)
Diffstat (limited to 'src/ai/api/ai_station.cpp')
| -rw-r--r-- | src/ai/api/ai_station.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/ai/api/ai_station.cpp b/src/ai/api/ai_station.cpp index 364b09538..7a9f5cb8d 100644 --- a/src/ai/api/ai_station.cpp +++ b/src/ai/api/ai_station.cpp @@ -17,7 +17,7 @@ /* static */ bool AIStation::IsValidStation(StationID station_id) { - return ::IsValidStationID(station_id) && ::GetStation(station_id)->owner == _current_company; + return ::IsValidStationID(station_id) && ::Station::Get(station_id)->owner == _current_company; } /* static */ StationID AIStation::GetStationID(TileIndex tile) @@ -33,7 +33,7 @@ static const int len = 64; char *station_name = MallocT<char>(len); - ::SetDParam(0, GetStation(station_id)->index); + ::SetDParam(0, Station::Get(station_id)->index); ::GetString(station_name, STR_STATION, &station_name[len - 1]); return station_name; } @@ -51,7 +51,7 @@ { if (!IsValidStation(station_id)) return INVALID_TILE; - return ::GetStation(station_id)->xy; + return ::Station::Get(station_id)->xy; } /* static */ int32 AIStation::GetCargoWaiting(StationID station_id, CargoID cargo_id) @@ -59,7 +59,7 @@ if (!IsValidStation(station_id)) return -1; if (!AICargo::IsValidCargo(cargo_id)) return -1; - return ::GetStation(station_id)->goods[cargo_id].cargo.Count(); + return ::Station::Get(station_id)->goods[cargo_id].cargo.Count(); } /* static */ int32 AIStation::GetCargoRating(StationID station_id, CargoID cargo_id) @@ -67,7 +67,7 @@ if (!IsValidStation(station_id)) return -1; if (!AICargo::IsValidCargo(cargo_id)) return -1; - return ::GetStation(station_id)->goods[cargo_id].rating * 101 >> 8; + return ::Station::Get(station_id)->goods[cargo_id].rating * 101 >> 8; } /* static */ int32 AIStation::GetCoverageRadius(AIStation::StationType station_type) @@ -114,7 +114,7 @@ if (!IsValidStation(station_id)) return false; if (CountBits(station_type) != 1) return false; - return (::GetStation(station_id)->facilities & station_type) != 0; + return (::Station::Get(station_id)->facilities & station_type) != 0; } /* static */ bool AIStation::HasRoadType(StationID station_id, AIRoad::RoadType road_type) @@ -124,10 +124,10 @@ ::RoadTypes r = RoadTypeToRoadTypes((::RoadType)road_type); - for (const RoadStop *rs = ::GetStation(station_id)->GetPrimaryRoadStop(ROADSTOP_BUS); rs != NULL; rs = rs->next) { + for (const RoadStop *rs = ::Station::Get(station_id)->GetPrimaryRoadStop(ROADSTOP_BUS); rs != NULL; rs = rs->next) { if ((::GetRoadTypes(rs->xy) & r) != 0) return true; } - for (const RoadStop *rs = ::GetStation(station_id)->GetPrimaryRoadStop(ROADSTOP_TRUCK); rs != NULL; rs = rs->next) { + for (const RoadStop *rs = ::Station::Get(station_id)->GetPrimaryRoadStop(ROADSTOP_TRUCK); rs != NULL; rs = rs->next) { if ((::GetRoadTypes(rs->xy) & r) != 0) return true; } @@ -138,5 +138,5 @@ { if (!IsValidStation(station_id)) return INVALID_TOWN; - return ::GetStation(station_id)->town->index; + return ::Station::Get(station_id)->town->index; } |