cpp/openttd-patchpack/source Changeset - r21848:51b8d3a84b66

Changeset - r21848:51b8d3a84b66

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 10 years ago 2014-10-12 11:53:13
rubidium@openttd.org

(svn r27000) -Fix (r26999): compilation error with some versions of GCC

1 file changed with 1 insertions and 1 deletions:

src/tgp.cpp

0 comments (0 inline, 0 general)

src/tgp.cpp

➞

Show inline comments

@@ @@ -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)  } };

0 comments (0 inline, 0 general)