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 /train_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 'train_cmd.c')
-rw-r--r-- | train_cmd.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/train_cmd.c b/train_cmd.c index fad5245af..f5e539ce3 100644 --- a/train_cmd.c +++ b/train_cmd.c @@ -951,7 +951,7 @@ int32 CmdMoveRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) VehicleID d = GB(p1, 16, 16); Vehicle *src, *dst, *src_head, *dst_head; - if (!IsVehicleIndex(s)) return CMD_ERROR; + if (!IsValidVehicleID(s)) return CMD_ERROR; src = GetVehicle(s); @@ -1230,7 +1230,7 @@ int32 CmdStartStopTrain(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); @@ -1275,7 +1275,7 @@ int32 CmdSellRailWagon(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) Vehicle *new_f = NULL; int32 cost = 0; - if (!IsVehicleIndex(p1) || p2 > 2) return CMD_ERROR; + if (!IsValidVehicleID(p1) || p2 > 2) return CMD_ERROR; v = GetVehicle(p1); @@ -1671,7 +1671,7 @@ int32 CmdReverseTrainDirection(TileIndex tile, uint32 flags, uint32 p1, uint32 p { Vehicle *v; - if (!IsVehicleIndex(p1)) return CMD_ERROR; + if (!IsValidVehicleID(p1)) return CMD_ERROR; v = GetVehicle(p1); @@ -1720,7 +1720,7 @@ int32 CmdForceTrainProceed(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); @@ -1746,7 +1746,7 @@ int32 CmdRefitRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) int32 cost; uint num; - if (!IsVehicleIndex(p1)) return CMD_ERROR; + if (!IsValidVehicleID(p1)) return CMD_ERROR; v = GetVehicle(p1); @@ -1930,7 +1930,7 @@ int32 CmdSendTrainToDepot(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) Vehicle *v; TrainFindDepotData tfdd; - if (!IsVehicleIndex(p1)) return CMD_ERROR; + if (!IsValidVehicleID(p1)) return CMD_ERROR; v = GetVehicle(p1); |