diff options
| author | rune-scape <allie.smith.epic@gmail.com> | 2023-12-28 14:44:23 -0800 |
|---|---|---|
| committer | rune-scape <spartacrafter@gmail.com> | 2024-08-29 13:39:27 -0700 |
| commit | 154049ce1792a6e12b990e0a414a6c084c3b91c5 (patch) | |
| tree | 102bda57c74f9efaa227c970255327f734043ce9 /platform | |
| parent | 40b378e9e2338d84f897f6991cc913a713295785 (diff) | |
| download | redot-engine-154049ce1792a6e12b990e0a414a6c084c3b91c5.tar.gz | |
StringName Dictionary keys
also added 'is_string()' method to Variant
and refactored many String type comparisons to use it instead
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/java_class_wrapper.cpp | 2 | ||||
| -rw-r--r-- | platform/web/api/api.cpp | 2 | ||||
| -rw-r--r-- | platform/web/javascript_bridge_singleton.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/platform/android/java_class_wrapper.cpp b/platform/android/java_class_wrapper.cpp index a309a6ab74..2b727e4ada 100644 --- a/platform/android/java_class_wrapper.cpp +++ b/platform/android/java_class_wrapper.cpp @@ -97,7 +97,7 @@ bool JavaClass::_call_method(JavaObject *p_instance, const StringName &p_method, } } break; case ARG_TYPE_STRING: { - if (p_args[i]->get_type() != Variant::STRING) { + if (!p_args[i]->is_string()) { arg_expected = Variant::STRING; } } break; diff --git a/platform/web/api/api.cpp b/platform/web/api/api.cpp index a695091a04..9ddbe5d01d 100644 --- a/platform/web/api/api.cpp +++ b/platform/web/api/api.cpp @@ -99,7 +99,7 @@ Variant JavaScriptBridge::_create_object_bind(const Variant **p_args, int p_argc r_error.expected = 1; return Ref<JavaScriptObject>(); } - if (p_args[0]->get_type() != Variant::STRING) { + if (!p_args[0]->is_string()) { r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.argument = 0; r_error.expected = Variant::STRING; diff --git a/platform/web/javascript_bridge_singleton.cpp b/platform/web/javascript_bridge_singleton.cpp index c4dbb405a3..502e830f82 100644 --- a/platform/web/javascript_bridge_singleton.cpp +++ b/platform/web/javascript_bridge_singleton.cpp @@ -304,7 +304,7 @@ Variant JavaScriptBridge::_create_object_bind(const Variant **p_args, int p_argc r_error.expected = 1; return Ref<JavaScriptObject>(); } - if (p_args[0]->get_type() != Variant::STRING) { + if (!p_args[0]->is_string()) { r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.argument = 0; r_error.expected = Variant::STRING; |