cpp/openttd-patchpack/source Changeset - r8030:87f5c8990099

Changeset - r8030:87f5c8990099

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

glx - 16 years ago 2007-12-07 21:16:38
glx@openttd.org

(svn r11590) -Fix (r11193): IsSlopeRefused() result was half wrong

1 file changed with 5 insertions and 5 deletions:

src/industry_cmd.cpp

0 comments (0 inline, 0 general)

src/industry_cmd.cpp

➞

Show inline comments

@@ @@ -1175,32 +1175,32 @@ static const Town *CheckMultipleIndustry @@
 			_error_message = STR_0287_ONLY_ONE_ALLOWED_PER_TOWN;
 			return NULL;
+		}
+	}
 	return t;
+}
 bool IsSlopeRefused(Slope current, Slope refused)
+{
 	if (IsSteepSlope(current)) return true;
 	if (current != SLOPE_FLAT) {
-		if (refused & SLOPE_STEEP) return true;
+		if (IsSteepSlope(refused)) return true;
 		Slope t = ComplementSlope(current);
 		if (refused & 1 && (t & SLOPE_NW)) return false;
 		if (refused & 2 && (t & SLOPE_NE)) return false;
 		if (refused & 4 && (t & SLOPE_SW)) return false;
 		if (refused & 8 && (t & SLOPE_SE)) return false;
 		if (refused & SLOPE_W && (t & SLOPE_NW)) return true;
 		if (refused & SLOPE_S && (t & SLOPE_NE)) return true;
 		if (refused & SLOPE_E && (t & SLOPE_SW)) return true;
 		if (refused & SLOPE_N && (t & SLOPE_SE)) return true;
+	}
 	return false;
+}
 static bool CheckIfIndustryTilesAreFree(TileIndex tile, const IndustryTileTable *it, uint itspec_index, int type, bool *custom_shape_check = NULL)
+{
 	_error_message = STR_0239_SITE_UNSUITABLE;
 	bool refused_slope = false;
 	bool custom_shape = false;
 	do {

0 comments (0 inline, 0 general)