GH-794 Fix default value evaluation in ScriptPlaceHolderInstance

CraterCrash · Oct 5, 2024 · d7fa88a · d7fa88a
1 parent b89c63b
commit d7fa88a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/src/common/variant_utils.cpp b/src/common/variant_utils.cpp
@@ -301,4 +301,11 @@ namespace VariantUtils
         Variant::evaluate(p_operator, p_left, p_right, r_value, valid);
         return valid;
     }
+
+    Variant evaluate(Variant::Operator p_operator, const Variant& p_left, const Variant& p_right)
+    {
+        Variant result;
+        evaluate(p_operator, p_left, p_right, result);
+        return result;
+    }
 }
diff --git a/src/common/variant_utils.h b/src/common/variant_utils.h
@@ -76,6 +76,13 @@ namespace VariantUtils
     /// @param r_value the return value
     /// @return true if the evaluation was successful, false otherwise
     bool evaluate(Variant::Operator p_operator, const Variant& p_left, const Variant& p_right, Variant& r_value);
+
+    /// Evaluates two variants, returning the result.
+    /// @param p_operator the operation to be performed
+    /// @param p_left the left operand
+    /// @param p_right the right operand
+    /// @return the evaluated result value between the two operands
+    Variant evaluate(Variant::Operator p_operator, const Variant& p_left, const Variant& p_right);
 }
 
 #endif  // ORCHESTRATOR_VARIANT_UTILS_H
diff --git a/src/script/instances/script_instance_placeholder.cpp b/src/script/instances/script_instance_placeholder.cpp
@@ -110,10 +110,8 @@ bool OScriptPlaceHolderInstance::set(const StringName& p_name, const Variant& p_
     {
         if (_script->_has_property_default_value(p_name))
         {
-            Variant def_value = _script->get_property_default_value(p_name);
-
-            Variant result;
-            if (VariantUtils::evaluate(Variant::OP_EQUAL, def_value, p_value, result))
+            const Variant def_value = _script->get_property_default_value(p_name);
+            if (VariantUtils::evaluate(Variant::OP_EQUAL, def_value, p_value))
             {
                 _values.erase(p_name);
                 return true;
@@ -126,9 +124,8 @@ bool OScriptPlaceHolderInstance::set(const StringName& p_name, const Variant& p_
     {
         if (_script->_has_property_default_value(p_name))
         {
-            Variant def_value = _script->get_property_default_value(p_name);
-            Variant result;
-            if (VariantUtils::evaluate(Variant::OP_NOT_EQUAL, def_value, p_value, result))
+            const Variant def_value = _script->get_property_default_value(p_name);
+            if (VariantUtils::evaluate(Variant::OP_NOT_EQUAL, def_value, p_value))
                 _values[p_name] = p_value;
             return true;
         }