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

(svn r16634) -Codechange: use Company::IsHumanID() instead of IsHumanCompany()

Browse Source
This commit is contained in:
smatz
2009-06-23 12:11:35 +00:00
parent 192b9bda7b
commit 22cf8d8480
5 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/company_base.h
View File

@@ -82,15 +82,20 @@ struct Company : CompanyPool::PoolItem<&_company_pool> {
static FORCEINLINE bool IsValidAiID(size_t index)
{
const Company *c = GetIfValid(index);
const Company *c = Company::GetIfValid(index);
return c != NULL && c->is_ai;
}
static FORCEINLINE bool IsValidHumanID(size_t index)
{
const Company *c = GetIfValid(index);
const Company *c = Company::GetIfValid(index);
return c != NULL && !c->is_ai;
}
static FORCEINLINE bool IsHumanID(size_t index)
{
return !Company::Get(index)->is_ai;
}
};
#define FOR_ALL_COMPANIES_FROM(var, start) FOR_ALL_ITEMS_FROM(Company, company_index, var, start)
@@ -98,12 +103,6 @@ struct Company : CompanyPool::PoolItem<&_company_pool> {
Money CalculateCompanyValue(const Company *c);
static inline bool IsHumanCompany(CompanyID company)
{
return !Company::Get(company)->is_ai;
}
extern uint _next_competitor_start;
extern uint _cur_company_tick_index;