dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki 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 bdc1d681a7
commit 213c71be3f
17 changed files with 88 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
station_cmd.c
View File

@@ -2573,8 +2573,7 @@ void OnTick_Station(void)
i = _station_tick_ctr;
if (++_station_tick_ctr == GetStationPoolSize()) _station_tick_ctr = 0;
st = GetStation(i);
if (IsValidStation(st)) StationHandleBigTick(st);
if (IsValidStationID(i)) StationHandleBigTick(GetStation(i));
FOR_ALL_STATIONS(st) {
StationHandleSmallTick(st);
@@ -2627,10 +2626,10 @@ int32 CmdRenameStation(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
StringID str;
Station *st;
if (!IsStationIndex(p1) || _cmd_text[0] == '\0') return CMD_ERROR;
if (!IsValidStationID(p1) || _cmd_text[0] == '\0') return CMD_ERROR;
st = GetStation(p1);
if (!IsValidStation(st) || !CheckOwnership(st->owner)) return CMD_ERROR;
if (!CheckOwnership(st->owner)) return CMD_ERROR;
str = AllocateNameUnique(_cmd_text, 6);
if (str == 0) return CMD_ERROR;