summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2014-10-13 14:07:37 +0000
committerrubidium <rubidium@openttd.org>2014-10-13 14:07:37 +0000
commita200656534ac75d0570cbfd86c9c1a1cb48e7de8 (patch)
treebdb1f55bfe0cfecf63b7b055883f00187827dfd1
parent1088ad48fceb19408f41f4f3caf0f9e525d977d9 (diff)
downloadopenttd-a200656534ac75d0570cbfd86c9c1a1cb48e7de8.tar.xz
(svn r27005) -Fix (r26999): variety distribution curve map scaling did one conversion to height_t too many
-rw-r--r--src/tgp.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tgp.cpp b/src/tgp.cpp
index 95725fc6f..8a511114b 100644
--- a/src/tgp.cpp
+++ b/src/tgp.cpp
@@ -505,7 +505,7 @@ static void HeightMapCurves(uint level)
height_t y; ///< The height to scale to.
};
/* Scaled curve maps; value is in height_ts. */
-#define F(fraction) ((height_t)(fraction * mh * I2H(1)))
+#define F(fraction) ((height_t)(fraction * mh)))
const control_point_t curve_map_1[] = { { F(0.0), F(0.0) }, { F(0.6 / 3), F(0.1) }, { F(2.4 / 3), F(0.4 / 3) }, { F(1.0), F(0.4) } };
const control_point_t curve_map_2[] = { { F(0.0), F(0.0) }, { F(0.2 / 3), F(0.1) }, { F(1.6 / 3), F(0.4 / 3) }, { F(2.4 / 3), F(0.8 / 3) }, { F(1.0), F(0.6) } };
const control_point_t curve_map_3[] = { { F(0.0), F(0.0) }, { F(0.2 / 3), F(0.1) }, { F(1.6 / 3), F(0.8 / 3) }, { F(2.4 / 3), F(1.8 / 3) }, { F(1.0), F(0.8) } };