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 /town_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 'town_cmd.c')
-rw-r--r-- | town_cmd.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/town_cmd.c b/town_cmd.c index e43726dce..46837cbde 100644 --- a/town_cmd.c +++ b/town_cmd.c @@ -409,14 +409,11 @@ void OnTick_Town(void) _cur_town_iter >= TOWN_GROWTH_FREQUENCY; _cur_town_iter -= TOWN_GROWTH_FREQUENCY) { uint32 i = _cur_town_ctr; - Town *t; if (++_cur_town_ctr >= GetTownPoolSize()) _cur_town_ctr = 0; - t = GetTown(i); - - if (IsValidTown(t)) TownTickHandler(t); + if (IsValidTownID(i)) TownTickHandler(GetTown(i)); } } @@ -1348,7 +1345,7 @@ int32 CmdRenameTown(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) StringID str; Town *t; - if (!IsTownIndex(p1) || _cmd_text[0] == '\0') return CMD_ERROR; + if (!IsValidTownID(p1) || _cmd_text[0] == '\0') return CMD_ERROR; t = GetTown(p1); @@ -1605,7 +1602,7 @@ int32 CmdDoTownAction(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) int32 cost; Town *t; - if (!IsTownIndex(p1) || p2 > lengthof(_town_action_proc)) return CMD_ERROR; + if (!IsValidTownID(p1) || p2 > lengthof(_town_action_proc)) return CMD_ERROR; t = GetTown(p1); |