summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2007-12-07 21:16:38 +0000
committerglx <glx@openttd.org>2007-12-07 21:16:38 +0000
commit7e7606b0d318c9f0c791ffac387073f15409e218 (patch)
tree77c019ee09c06cd40f931be3ad751b6d4b85b4d3
parentc3ae7faa133cdd646ce6bf6ece6c1bf7935da014 (diff)
downloadopenttd-7e7606b0d318c9f0c791ffac387073f15409e218.tar.xz
(svn r11590) -Fix (r11193): IsSlopeRefused() result was half wrong
-rw-r--r--src/industry_cmd.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp
index ca920aabc..84a321757 100644
--- a/src/industry_cmd.cpp
+++ b/src/industry_cmd.cpp
@@ -1184,14 +1184,14 @@ 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;