Browse Source

Merge pull request #44661 from AndreaCatania/AndreaCatania-patch-5

Fixes: GDscript min and max are inverted
Rémi Verschelde 4 years ago
parent
commit
eea3287c2d
1 changed files with 2 additions and 2 deletions
  1. 2 2
      core/variant/variant_utility.cpp

+ 2 - 2
core/variant/variant_utility.cpp

@@ -291,7 +291,7 @@ struct VariantUtilityFunctions {
 		Variant ret;
 		Variant ret;
 		for (int i = 1; i < p_argcount; i++) {
 		for (int i = 1; i < p_argcount; i++) {
 			bool valid;
 			bool valid;
-			Variant::evaluate(Variant::OP_GREATER, base, *p_args[i], ret, valid);
+			Variant::evaluate(Variant::OP_LESS, base, *p_args[i], ret, valid);
 			if (!valid) {
 			if (!valid) {
 				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.expected = base.get_type();
 				r_error.expected = base.get_type();
@@ -324,7 +324,7 @@ struct VariantUtilityFunctions {
 		Variant ret;
 		Variant ret;
 		for (int i = 1; i < p_argcount; i++) {
 		for (int i = 1; i < p_argcount; i++) {
 			bool valid;
 			bool valid;
-			Variant::evaluate(Variant::OP_LESS, base, *p_args[i], ret, valid);
+			Variant::evaluate(Variant::OP_GREATER, base, *p_args[i], ret, valid);
 			if (!valid) {
 			if (!valid) {
 				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.expected = base.get_type();
 				r_error.expected = base.get_type();