Formula engine: fix comparison trying to cast everything to decimal

Now it only tries to cast to decimal if both are numbers.
wesnoth · Mar 18, 2016 · e78b5d7 · e78b5d7
1 parent b53ee99
commit e78b5d7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/variant.cpp b/src/variant.cpp
@@ -829,7 +829,10 @@ bool variant::operator!=(const variant& v) const
 bool variant::operator<=(const variant& v) const
 {
 	if(type_ != v.type_) {
-		if( type_ == TYPE_DECIMAL || v.type_ == TYPE_DECIMAL ) {
+		if(type_ == TYPE_DECIMAL && v.type_ == TYPE_INT) {
+			return as_decimal() <= v.as_decimal();
+		}
+		if(v.type_ == TYPE_DECIMAL && type_ == TYPE_INT) {
 			return as_decimal() <= v.as_decimal();
 		}