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

9
town_cmd.c
View File

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