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

(svn r6979) Use the pool macros for the Industry pool

Browse Source
This commit is contained in:
tron
2006-10-28 11:32:45 +00:00
parent 0adc282c3c
commit d00a58ad69
4 changed files with 11 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
industry.h
View File

@@ -80,7 +80,7 @@ typedef struct IndustrySpec {
const IndustrySpec *GetIndustrySpec(IndustryType thistype);
extern MemoryPool _industry_pool;
DECLARE_POOL(Industry, Industry, 3, 8000)
/**
* Check if an Industry really exists.
@@ -90,22 +90,6 @@ static inline bool IsValidIndustry(const Industry *industry)
return industry->xy != 0;
}
/**
* Get the pointer to the industry with index 'index'
*/
static inline Industry *GetIndustry(uint index)
{
return (Industry*)GetItemFromPool(&_industry_pool, index);
}
/**
* Get the current size of the IndustryPool
*/
static inline uint16 GetIndustryPoolSize(void)
{
return _industry_pool.total_items;
}
VARDEF int _total_industries;
static inline IndustryID GetIndustryArraySize(void)
@@ -150,7 +134,7 @@ static inline void DeleteIndustry(Industry *i)
i->xy = 0;
}
#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_FROM(i, start) for (i = GetIndustry(start); i != NULL; i = (i->index + 1U < GetIndustryPoolSize()) ? GetIndustry(i->index + 1U) : NULL) if (IsValidIndustry(i))
#define FOR_ALL_INDUSTRIES(i) FOR_ALL_INDUSTRIES_FROM(i, 0)
VARDEF const Industry** _industry_sort;