From 5fd9aeb12b75a3971e86e5b7d1701115f57fbc12 Mon Sep 17 00:00:00 2001 From: truelight Date: Tue, 22 Aug 2006 20:41:26 +0000 Subject: (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. --- industry.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'industry.h') 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; -- cgit v1.2.3-70-g09d2