summaryrefslogtreecommitdiff
path: root/town.h
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2006-08-22 18:15:17 +0000
committertruelight <truelight@openttd.org>2006-08-22 18:15:17 +0000
commitb23f719ab91a34be3e9d44d1165c789edd4df513 (patch)
tree8fdd9f9cb1552a9d33e7f6c2bbdeccff776cfc62 /town.h
parent1331b4aa9a525bb87c76c38bbc42d33d099bd026 (diff)
downloadopenttd-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.h')
-rw-r--r--town.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/town.h b/town.h
index 16c5dbffa..4bccadb1b 100644
--- a/town.h
+++ b/town.h
@@ -179,9 +179,9 @@ static inline uint16 GetTownPoolSize(void)
return _town_pool.total_items;
}
-static inline bool IsTownIndex(uint index)
+static inline bool IsValidTownID(uint index)
{
- return index < GetTownPoolSize();
+ return index < GetTownPoolSize() && IsValidTown(GetTown(index));
}
#define FOR_ALL_TOWNS_FROM(t, start) for (t = GetTown(start); t != NULL; t = (t->index + 1 < GetTownPoolSize()) ? GetTown(t->index + 1) : NULL) if (IsValidTown(t))