mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-29 09:29:10 +00:00
Code Issues Activity

(svn r6053) -Codechange: renamed all IsXXXIndex to IsValidXXXID

Browse Source 
-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
This commit is contained in:
truelight
2006-08-22 18:15:17 +00:00
parent 1331b4aa9a
commit b23f719ab9
17 changed files with 88 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
train_cmd.c
View File

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