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

15
industry.h
View File

@@ -92,13 +92,18 @@ static inline bool IsValidIndustry(const Industry *industry)
VARDEF int _total_industries;
static inline IndustryID GetIndustryArraySize(void)
static inline IndustryID GetMaxIndustryIndex(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_industries - 1;
}
static inline uint GetNumIndustries(void)
{
return _total_industries;
}
@@ -107,10 +112,10 @@ static inline IndustryID GetIndustryArraySize(void)
*/
static inline Industry *GetRandomIndustry(void)
{
uint num = RandomRange(GetIndustryArraySize());
uint num = RandomRange(GetNumIndustries());
uint index = 0;
if (GetIndustryArraySize() == 0) return NULL;
if (GetNumIndustries() == 0) return NULL;
while (num > 0) {
num--;
@@ -119,7 +124,7 @@ static inline Industry *GetRandomIndustry(void)
/* Make sure we have a valid industry */
while (GetIndustry(index) == NULL) {
index++;
if (index == GetIndustryArraySize()) index = 0;
if (index > GetMaxIndustryIndex()) index = 0;
}
}