cpp/openttd-patchpack/source Changeset - r15041:2fd57765f7c4

Changeset - r15041:2fd57765f7c4

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

frosch - 14 years ago 2010-04-18 17:13:01
frosch@openttd.org

(svn r19671) -Fix (r19670): RoundDiv() needs to deal with signed numerators.

3 files changed with 13 insertions and 7 deletions:

src/core/math_func.hpp

src/gfx.cpp

src/terraform_gui.cpp

0 comments (0 inline, 0 general)

src/core/math_func.hpp

➞

Show inline comments

@@ @@ -330,14 +330,20 @@ static FORCEINLINE uint CeilDiv(uint a, @@
+}
 /**
- * Computes round(a / b) for non-negative a and b.
+ * Computes round(a / b) for signed a and unsigned b.
  * @param a Numerator
  * @param b Denominator
  * @return Quotient, rounded to nearest
  */
-static FORCEINLINE uint RoundDiv(uint a, uint b)
+static FORCEINLINE int RoundDivSU(int a, uint b)
+{
 	return (a + b / 2) / b;
 	if (a > 0) {
 		/* 0.5 is rounded to 1 */
 		return (a + (int)b / 2) / (int)b;
 	} else {
 		/* -0.5 is rounded to 0 */
 		return (a - ((int)b - 1) / 2) / (int)b;
+	}
+}
 #endif /* MATH_FUNC_HPP */

src/gfx.cpp

➞

Show inline comments

@@ @@ -550,7 +550,7 @@ static int DrawString(int left, int righ @@
 				break;
 			case SA_CENTER:
-				left  = RoundDiv(initial_right + 1 + initial_left - w, 2);
+				left  = RoundDivSU(initial_right + 1 + initial_left - w, 2);
 				/* right + 1 = left + w */
 				right = left + w - 1;
 				break;
@@ @@ -823,7 +823,7 @@ int DrawStringMultiLine(int left, int ri @@
 		total_height = (num + 1) * mt;
+	}
-	int y = (align == SA_CENTER) ? RoundDiv(bottom + top - total_height, 2) : top;
+	int y = (align == SA_CENTER) ? RoundDivSU(bottom + top - total_height, 2) : top;
 	const char *src = buffer;
 	for (;;) {

src/terraform_gui.cpp

➞

Show inline comments

@@ @@ -649,8 +649,8 @@ struct ScenarioEditorLandscapeGeneration @@
+	{
 		if (widget != ETTW_DOTS) return;
 		int center_x = RoundDiv(r.left + r.right, 2);
 		int center_y = RoundDiv(r.top + r.bottom, 2);
 		int center_x = RoundDivSU(r.left + r.right, 2);
 		int center_y = RoundDivSU(r.top + r.bottom, 2);
 		int n = _terraform_size * _terraform_size;
 		const int8 *coords = &_multi_terraform_coords[0][0];

0 comments (0 inline, 0 general)