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 /station_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 'station_cmd.c')
| -rw-r--r-- | station_cmd.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/station_cmd.c b/station_cmd.c index 974d7be1d..e5124c927 100644 --- a/station_cmd.c +++ b/station_cmd.c @@ -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; |