(svn r11590) -Fix (r11193): IsSlopeRefused() result was half wrong
authorglx
Fri, 07 Dec 2007 21:16:38 +0000
changeset 8030 135a60c84e95
parent 8029 6cc607fe1d3d
child 8031 5e19ea672f5c
(svn r11590) -Fix (r11193): IsSlopeRefused() result was half wrong
src/industry_cmd.cpp
--- a/src/industry_cmd.cpp	Fri Dec 07 21:14:54 2007 +0000
+++ b/src/industry_cmd.cpp	Fri Dec 07 21:16:38 2007 +0000
@@ -1184,14 +1184,14 @@
 {
 	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;