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

(svn r7372) - CodeChange: Rename all GetXXXArraySize() functions to GetNumXXX() and add GetMaxXXXIndex() functions. This prepares for the new pool interface.

Browse Source
This commit is contained in:
matthijs
2006-12-05 13:58:20 +00:00
parent 75ec6d9b77
commit e6ade36de1
17 changed files with 74 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
town.h
View File

@@ -164,13 +164,18 @@ static inline bool IsValidTown(const Town* town)
VARDEF uint _total_towns;
static inline TownID GetTownArraySize(void)
static inline TownID GetMaxTownIndex(void)
{
/* TODO - This isn't the real content of the function, but
* with the new pool-system this will be replaced with one that
* _really_ returns the highest index + 1. Now it just returns
* _really_ returns the highest index. Now it just returns
* the next safe value we are sure about everything is below.
*/
return _total_towns - 1;
}
static inline uint GetNumTowns(void)
{
return _total_towns;
}
@@ -179,7 +184,7 @@ static inline TownID GetTownArraySize(void)
*/
static inline Town *GetRandomTown(void)
{
uint num = RandomRange(GetTownArraySize());
uint num = RandomRange(GetNumTowns());
uint index = 0;
while (num > 0) {
@@ -189,7 +194,7 @@ static inline Town *GetRandomTown(void)
/* Make sure we have a valid industry */
while (GetTown(index) == NULL) {
index++;
if (index == GetTownArraySize()) index = 0;
if (index > GetMaxTownIndex()) index = 0;
}
}