From b0c4a16e9d513bfb54cda8ced5c7ee176290741a Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 12 Oct 2014 11:53:13 +0000 Subject: [PATCH] (svn r27000) -Fix (r26999): compilation error with some versions of GCC --- src/tgp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tgp.cpp b/src/tgp.cpp index a918a0d7d8..7ee2f6e924 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) (fraction * mh * I2H(1)) +#define F(fraction) ((height_t)(fraction * mh * I2H(1))) 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) } };