summaryrefslogtreecommitdiff
path: root/src/autoreplace_cmd.cpp
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2009-05-18 16:21:28 +0000
committersmatz <smatz@openttd.org>2009-05-18 16:21:28 +0000
commit8808f3beea881af5652716c883a21c8031b5e390 (patch)
treebc14c65d1e66c407b72d254fc926d105eea2f1e4 /src/autoreplace_cmd.cpp
parent5fe906e14992f7a301ae94c357e80af076ab7a63 (diff)
downloadopenttd-8808f3beea881af5652716c883a21c8031b5e390.tar.xz
(svn r16352) -Codechange: use PoolItem::GetIfValid() instead of PoolItem::IsValidID() and PoolItem::Get()
Diffstat (limited to 'src/autoreplace_cmd.cpp')
-rw-r--r--src/autoreplace_cmd.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/autoreplace_cmd.cpp b/src/autoreplace_cmd.cpp
index 076cc7187..066f6bac7 100644
--- a/src/autoreplace_cmd.cpp
+++ b/src/autoreplace_cmd.cpp
@@ -608,8 +608,9 @@ CommandCost CmdAutoreplaceVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1
CommandCost cost = CommandCost(EXPENSES_NEW_VEHICLES, 0);
bool nothing_to_do = true;
- if (!Vehicle::IsValidID(p1)) return CMD_ERROR;
- Vehicle *v = Vehicle::Get(p1);
+ Vehicle *v = Vehicle::GetIfValid(p1);
+ if (v == NULL) return CMD_ERROR;
+
if (!CheckOwnership(v->owner)) return CMD_ERROR;
if (!v->IsInDepot()) return CMD_ERROR;
if (HASBITS(v->vehstatus, VS_CRASHED)) return CMD_ERROR;