From b23f719ab91a34be3e9d44d1165c789edd4df513 Mon Sep 17 00:00:00 2001 From: truelight Date: Tue, 22 Aug 2006 18:15:17 +0000 Subject: (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 --- aircraft_cmd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'aircraft_cmd.c') diff --git a/aircraft_cmd.c b/aircraft_cmd.c index 1f9da7aa6..6dd814da0 100644 --- a/aircraft_cmd.c +++ b/aircraft_cmd.c @@ -426,7 +426,7 @@ int32 CmdSellAircraft(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); @@ -456,7 +456,7 @@ int32 CmdStartStopAircraft(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); @@ -500,7 +500,7 @@ int32 CmdSendAircraftToHangar(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); @@ -568,7 +568,7 @@ int32 CmdRefitAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) const AircraftVehicleInfo *avi; uint16 callback = CALLBACK_FAILED; - if (!IsVehicleIndex(p1)) return CMD_ERROR; + if (!IsValidVehicleID(p1)) return CMD_ERROR; v = GetVehicle(p1); -- cgit v1.2.3-70-g09d2