mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r13868) -Fix: Parent scope of industry variables.

release/0.7
frosch 2008-07-29 19:51:30 +00:00
parent da4dc32a6f
commit 814c91843a
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/newgrf_industries.cpp
View File

@ -210,6 +210,23 @@ uint32 IndustryGetVariable(const ResolverObject *object, byte variable, byte par
IndustryType type = object->u.industry.type; IndustryType type = object->u.industry.type;
const IndustrySpec *indspec = GetIndustrySpec(type); const IndustrySpec *indspec = GetIndustrySpec(type);
/* Shall the variable get resolved in parent scope and are we not yet in parent scope? */
if (object->u.industry.gfx == INVALID_INDUSTRYTILE && object->scope == VSG_SCOPE_PARENT) {
/* Pass the request on to the town of the industry */
const Town *t;
if (industry != NULL) {
t = industry->town;
} else if (tile != INVALID_TILE) {
t = ClosestTownFromTile(tile, UINT_MAX);
} else {
*available = false;
return UINT_MAX;
}
return TownGetVariable(variable, parameter, available, t);
}
if (industry == NULL) { if (industry == NULL) {
/* industry does not exist, only use those variables that are "safe" */ /* industry does not exist, only use those variables that are "safe" */
switch (variable) { switch (variable) {