dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r16326) -Codechange: replace GetPoolItemPoolSize() by PoolItem::GetPoolSize()

Browse Source
This commit is contained in:
smatz
2009-05-16 23:44:36 +00:00
parent 6221d74644
commit ed1e54bd84
26 changed files with 66 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/town.h
View File

@@ -302,7 +302,7 @@ TileIndexDiff GetHouseNorthPart(HouseID &house);
*/
static inline bool IsValidTownID(TownID index)
{
return index < GetTownPoolSize() && Town::Get(index)->IsValid();
return index < Town::GetPoolSize() && Town::Get(index)->IsValid();
}
static inline TownID GetMaxTownIndex()
@@ -312,7 +312,7 @@ static inline TownID GetMaxTownIndex()
* _really_ returns the highest index. Now it just returns
* the next safe value we are sure about everything is below.
*/
return GetTownPoolSize() - 1;
return Town::GetPoolSize() - 1;
}
static inline uint GetNumTowns()
@@ -346,7 +346,7 @@ static inline Town *GetRandomTown()
Town *CalcClosestTownFromTile(TileIndex tile, uint threshold = UINT_MAX);
#define FOR_ALL_TOWNS_FROM(t, start) for (t = Town::Get(start); t != NULL; t = (t->index + 1U < GetTownPoolSize()) ? Town::Get(t->index + 1U) : NULL) if (t->IsValid())
#define FOR_ALL_TOWNS_FROM(t, start) for (t = Town::Get(start); t != NULL; t = (t->index + 1U < Town::GetPoolSize()) ? Town::Get(t->index + 1U) : NULL) if (t->IsValid())
#define FOR_ALL_TOWNS(t) FOR_ALL_TOWNS_FROM(t, 0)
extern Town *_cleared_town;