diff options
| author | truelight <truelight@openttd.org> | 2006-08-22 18:15:17 +0000 |
|---|---|---|
| committer | truelight <truelight@openttd.org> | 2006-08-22 18:15:17 +0000 |
| commit | b23f719ab91a34be3e9d44d1165c789edd4df513 (patch) | |
| tree | 8fdd9f9cb1552a9d33e7f6c2bbdeccff776cfc62 /ship_cmd.c | |
| parent | 1331b4aa9a525bb87c76c38bbc42d33d099bd026 (diff) | |
| download | openttd-b23f719ab91a34be3e9d44d1165c789edd4df513.tar.xz | |
(svn r6053) -Codechange: renamed all IsXXXIndex to IsValidXXXID
-Codechange: IsValidXXXID now also checks if XXX is really valid, not if the number is within range
Both changes again in preperation of the new mem-pool system, which requires this.
IsValidXXXID is not a bit less pretty, but that will be cleaned up after the new mem-pool system
Diffstat (limited to 'ship_cmd.c')
| -rw-r--r-- | ship_cmd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ship_cmd.c b/ship_cmd.c index d5b5a1dfc..367742802 100644 --- a/ship_cmd.c +++ b/ship_cmd.c @@ -929,7 +929,7 @@ int32 CmdSellShip(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) { Vehicle *v; - if (!IsVehicleIndex(p1)) return CMD_ERROR; + if (!IsValidVehicleID(p1)) return CMD_ERROR; v = GetVehicle(p1); @@ -964,7 +964,7 @@ int32 CmdStartStopShip(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) Vehicle *v; uint16 callback; - if (!IsVehicleIndex(p1)) return CMD_ERROR; + if (!IsValidVehicleID(p1)) return CMD_ERROR; v = GetVehicle(p1); @@ -1002,7 +1002,7 @@ int32 CmdSendShipToDepot(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) Vehicle *v; const Depot *dep; - if (!IsVehicleIndex(p1)) return CMD_ERROR; + if (!IsValidVehicleID(p1)) return CMD_ERROR; v = GetVehicle(p1); @@ -1056,7 +1056,7 @@ int32 CmdRefitShip(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) byte new_subtype = GB(p2, 8, 8); uint16 capacity = CALLBACK_FAILED; - if (!IsVehicleIndex(p1)) return CMD_ERROR; + if (!IsValidVehicleID(p1)) return CMD_ERROR; v = GetVehicle(p1); |