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

(svn r6055) -Codechange: added GetXXXArraySize, which returns HighestID + 1 (or, will do that).

Browse Source 
It isn't the best name, but we couldn't find any better.
  This unifies the pool-system even more.
This commit is contained in:
truelight
2006-08-22 20:41:26 +00:00
parent 2e0d16026b
commit 5fd9aeb12b
18 changed files with 94 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
industry.h
View File

@@ -95,11 +95,21 @@ static inline uint16 GetIndustryPoolSize(void)
return _industry_pool.total_items;
}
VARDEF int _total_industries;
static inline IndustryID GetIndustryArraySize(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
* the next safe value we are sure about everything is below.
*/
return _total_industries + 1;
}
#define FOR_ALL_INDUSTRIES_FROM(i, start) for (i = GetIndustry(start); i != NULL; i = (i->index + 1 < GetIndustryPoolSize()) ? GetIndustry(i->index + 1) : NULL) if (IsValidIndustry(i))
#define FOR_ALL_INDUSTRIES(i) FOR_ALL_INDUSTRIES_FROM(i, 0)
VARDEF int _total_industries; // For the AI: the amount of industries active
VARDEF const Industry** _industry_sort;
VARDEF bool _industry_sort_dirty;