From d02a614ebe30542176d5b6bbc3ac2d001e96e4ce Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 9 Dec 2006 14:18:08 +0000 Subject: (svn r7452) -Fix: GetRandom(Industry|Town) must return a valid industry/town and should not need to loop over the pool for a second time. --- industry.h | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'industry.h') diff --git a/industry.h b/industry.h index e0620f35b..f8cf63c82 100644 --- a/industry.h +++ b/industry.h @@ -90,6 +90,11 @@ static inline bool IsValidIndustry(const Industry *industry) return industry->xy != 0; } +static inline bool IsValidIndustryID(IndustryID index) +{ + return index < GetIndustryPoolSize() && IsValidIndustry(GetIndustry(index)); +} + VARDEF int _total_industries; static inline IndustryID GetMaxIndustryIndex(void) @@ -108,23 +113,23 @@ static inline uint GetNumIndustries(void) } /** - * Return a random valid town. + * Return a random valid industry. */ static inline Industry *GetRandomIndustry(void) { - uint num = RandomRange(GetNumIndustries()); - uint index = 0; + int num = RandomRange(GetNumIndustries()); + IndustryID index = INVALID_INDUSTRY; if (GetNumIndustries() == 0) return NULL; - while (num > 0) { + while (num >= 0) { num--; - index++; + /* Make sure we have a valid industry */ - while (GetIndustry(index) == NULL) { + while (!IsValidIndustryID(index)) { index++; - if (index > GetMaxIndustryIndex()) index = 0; + assert(index <= GetMaxIndustryIndex()); } } -- cgit v1.2.3-70-g09d2