diff options
author | truelight <truelight@openttd.org> | 2006-08-22 20:41:26 +0000 |
---|---|---|
committer | truelight <truelight@openttd.org> | 2006-08-22 20:41:26 +0000 |
commit | 15aff22c965913598652666046c522eaa0c76641 (patch) | |
tree | c177232d70dec4fb6d7cd2dbac79206e86ee2daa /industry.h | |
parent | f2b804f0a6d2b668a73f8c0daa8ed20c81afa4d3 (diff) | |
download | openttd-15aff22c965913598652666046c522eaa0c76641.tar.xz |
(svn r6055) -Codechange: added GetXXXArraySize, which returns HighestID + 1 (or, will do that).
It isn't the best name, but we couldn't find any better.
This unifies the pool-system even more.
Diffstat (limited to 'industry.h')
-rw-r--r-- | industry.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/industry.h b/industry.h index ee92c6969..dcd489b95 100644 --- a/industry.h +++ b/industry.h @@ -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; |