(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
This commit is contained in:
4
town.h
4
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))
|
||||
|
||||
Reference in New Issue
Block a user