petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests 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

8
ship_cmd.c
View File

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