petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.

Browse Source
This commit is contained in:
rubidium
2008-09-30 20:39:50 +00:00
parent cc1e761eda
commit 3b798599b6
158 changed files with 4661 additions and 4675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/newgrf_industries.cpp
View File

@@ -267,16 +267,16 @@ uint32 IndustryGetVariable(const ResolverObject *object, byte variable, byte par
/* Layout number */
case 0x44: return industry->selected_layout;
/* player info */
/* Company info */
case 0x45: {
byte colours;
bool is_ai = false;
if (IsValidPlayerID(industry->founder)) {
const Player *p = GetPlayer(industry->founder);
const Livery *l = &p->livery[LS_DEFAULT];
if (IsValidCompanyID(industry->founder)) {
const Company *c = GetCompany(industry->founder);
const Livery *l = &c->livery[LS_DEFAULT];
is_ai = p->is_ai;
is_ai = c->is_ai;
colours = l->colour1 + l->colour2 * 16;
} else {
colours = GB(Random(), 0, 8);