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

1 files changed, 17 insertions, 0 deletions

diff --git a/src/newgrf_industries.cpp b/src/newgrf_industries.cpp
index 68739f9ca..16a36dc6a 100644
--- a/src/newgrf_industries.cpp
+++ b/src/newgrf_industries.cpp
@@ -210,6 +210,23 @@ uint32 IndustryGetVariable(const ResolverObject *object, byte variable, byte par
 	IndustryType type = object->u.industry.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) {
 		/* industry does not exist, only use those variables that are "safe" */
 		switch (variable) {