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

(svn r16352) -Codechange: use PoolItem::GetIfValid() instead of PoolItem::IsValidID() and PoolItem::Get()

Browse Source
This commit is contained in:
smatz
2009-05-18 16:21:28 +00:00
parent 1eca6aefeb
commit 512db5248e
35 changed files with 201 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ai/api/ai_group.cpp
View File

@@ -16,7 +16,8 @@
/* static */ bool AIGroup::IsValidGroup(GroupID group_id)
{
return ::Group::IsValidID(group_id) && ::Group::Get(group_id)->owner == _current_company;
const Group *g = ::Group::GetIfValid(group_id);
return g != NULL && g->owner == _current_company;
}
/* static */ AIGroup::GroupID AIGroup::CreateGroup(AIVehicle::VehicleType vehicle_type)

3
src/ai/api/ai_sign.cpp
View File

@@ -20,7 +20,8 @@
/* static */ bool AISign::IsValidSign(SignID sign_id)
{
return ::Sign::IsValidID(sign_id) && ::Sign::Get(sign_id)->owner == _current_company;
const Sign *si = ::Sign::GetIfValid(sign_id);
return si != NULL && si->owner == _current_company;
}
/* static */ bool AISign::SetName(SignID sign_id, const char *name)

3
src/ai/api/ai_station.cpp
View File

@@ -17,7 +17,8 @@
/* static */ bool AIStation::IsValidStation(StationID station_id)
{
return ::Station::IsValidID(station_id) && ::Station::Get(station_id)->owner == _current_company;
const Station *st = ::Station::GetIfValid(station_id);
return st != NULL && st->owner == _current_company;
}
/* static */ StationID AIStation::GetStationID(TileIndex tile)

5
src/ai/api/ai_vehicle.cpp
View File

@@ -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)

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

@@ -14,7 +14,8 @@
/* static */ bool AIWaypoint::IsValidWaypoint(WaypointID waypoint_id)
{
return ::Waypoint::IsValidID(waypoint_id) && ::Waypoint::Get(waypoint_id)->owner == _current_company;
const Waypoint *wp = ::Waypoint::GetIfValid(waypoint_id);
return wp != NULL && wp->owner == _current_company;
}
/* static */ WaypointID AIWaypoint::GetWaypointID(TileIndex tile)