# HG changeset patch
# User frosch <frosch@openttd.org>
# Date 2011-11-08 17:24:31
# Node ID a0485c95d085dab2bb718910c9f86bf69e58018a
# Parent  67a72ead899622c925016cebdc84a39973610c33

(svn r23141) -Change: [NewGRF v8] Invert result bit 10 of callbacks 149 and 157 to make them consistent with other slope check callbacks. (michi_cc)

diff --git a/src/newgrf_station.cpp b/src/newgrf_station.cpp
--- a/src/newgrf_station.cpp
+++ b/src/newgrf_station.cpp
@@ -694,8 +694,9 @@ CommandCost PerformStationTileSlopeCheck
 	/* Failed callback means success. */
 	if (cb_res == CALLBACK_FAILED) return CommandCost();
 
-	/* The meaning of bit 10 is inverted in the result of this callback. */
-	return GetErrorMessageFromLocationCallbackResult(ToggleBit(cb_res, 10), statspec->grf_prop.grffile->grfid, STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION);
+	/* The meaning of bit 10 is inverted for a grf version < 8. */
+	if (statspec->grf_prop.grffile->grf_version < 8) ToggleBit(cb_res, 10);
+	return GetErrorMessageFromLocationCallbackResult(cb_res, statspec->grf_prop.grffile->grfid, STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION);
 }
 
 
diff --git a/src/object_cmd.cpp b/src/object_cmd.cpp
--- a/src/object_cmd.cpp
+++ b/src/object_cmd.cpp
@@ -241,9 +241,10 @@ CommandCost CmdBuildObject(TileIndex til
 
 			if (callback == CALLBACK_FAILED) {
 				cost.AddCost(CheckBuildableTile(t, 0, allowed_z, false, false));
-			} else if (callback != 0) {
-				/* The meaning of bit 10 is inverted in the result of this callback. */
-				return GetErrorMessageFromLocationCallbackResult(ToggleBit(callback, 10), spec->grf_prop.grffile->grfid, STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION);
+			} else {
+				/* The meaning of bit 10 is inverted for a grf version < 8. */
+				if (spec->grf_prop.grffile->grf_version < 8) ToggleBit(callback, 10);
+				return GetErrorMessageFromLocationCallbackResult(callback, spec->grf_prop.grffile->grfid, STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION);
 			}
 		}