diff options
| author | smatz <smatz@openttd.org> | 2009-05-18 16:21:28 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2009-05-18 16:21:28 +0000 |
| commit | 8808f3beea881af5652716c883a21c8031b5e390 (patch) | |
| tree | bc14c65d1e66c407b72d254fc926d105eea2f1e4 /src/ai/api/ai_vehicle.cpp | |
| parent | 5fe906e14992f7a301ae94c357e80af076ab7a63 (diff) | |
| download | openttd-8808f3beea881af5652716c883a21c8031b5e390.tar.xz | |
(svn r16352) -Codechange: use PoolItem::GetIfValid() instead of PoolItem::IsValidID() and PoolItem::Get()
Diffstat (limited to 'src/ai/api/ai_vehicle.cpp')
| -rw-r--r-- | src/ai/api/ai_vehicle.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ai/api/ai_vehicle.cpp b/src/ai/api/ai_vehicle.cpp index 5d1579364..3e30601fe 100644 --- a/src/ai/api/ai_vehicle.cpp +++ b/src/ai/api/ai_vehicle.cpp @@ -19,9 +19,8 @@ /* static */ bool AIVehicle::IsValidVehicle(VehicleID vehicle_id) { - if (!::Vehicle::IsValidID(vehicle_id)) return false; - const Vehicle *v = ::Vehicle::Get(vehicle_id); - return v->owner == _current_company && (v->IsPrimaryVehicle() || (v->type == VEH_TRAIN && ::IsFreeWagon(v))); + const Vehicle *v = ::Vehicle::GetIfValid(vehicle_id); + return v != NULL && v->owner == _current_company && (v->IsPrimaryVehicle() || (v->type == VEH_TRAIN && ::IsFreeWagon(v))); } /* static */ int32 AIVehicle::GetNumWagons(VehicleID vehicle_id) |