Formula engine: fix abs() and modulus not working on decimals

wesnoth · Mar 18, 2016 · c1ca72f · c1ca72f
1 parent fe05f51
commit c1ca72f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/src/formula_function.cpp b/src/formula_function.cpp
@@ -165,8 +165,14 @@ class abs_function : public function_expression {
 
 private:
 	variant execute(const formula_callable& variables, formula_debugger *fdb) const {
-		const int n = args()[0]->evaluate(variables,fdb).as_int();
-		return variant(n >= 0 ? n : -n);
+		const variant input = args()[0]->evaluate(variables,fdb);
+		if(input.is_decimal()) {
+			const int n = input.as_decimal();
+			return variant(n >= 0 ? n : -n, variant::DECIMAL_VARIANT);
+		} else {
+			const int n = input.as_int();
+			return variant(n >= 0 ? n : -n);
+		}
 	}
 };
 

diff --git a/src/variant.cpp b/src/variant.cpp
@@ -696,13 +696,23 @@ variant variant::operator/(const variant& v) const
 
 variant variant::operator%(const variant& v) const
 {
-	const int numerator = as_int();
-	const int denominator = v.as_int();
-	if(denominator == 0) {
-		throw type_error((formatter() << "divide by zero error").str());
-	}
+	if(type_ == TYPE_DECIMAL || v.type_ == TYPE_DECIMAL) {
+		const int numerator = as_decimal();
+		const int denominator = v.as_decimal();
+		if(denominator == 0) {
+			throw type_error((formatter() << "divide by zero error").str());
+		}
+
+		return variant(numerator%denominator, DECIMAL_VARIANT);
+	} else {
+		const int numerator = as_int();
+		const int denominator = v.as_int();
+		if(denominator == 0) {
+			throw type_error((formatter() << "divide by zero error").str());
+		}
 
-	return variant(numerator%denominator);
+		return variant(numerator%denominator);
+	}
 }