diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-03 17:38:06 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-03 17:38:06 +0200 |
| commit | 13a90e938f0e3ae567f7d7256e35c38bf744e59d (patch) | |
| tree | 120e69941581aa607fcd43349f32666ea9d59d1b /platform | |
| parent | 514c564a8c855d798ec6b5a52860e5bca8d57bc9 (diff) | |
| parent | 154049ce1792a6e12b990e0a414a6c084c3b91c5 (diff) | |
| download | redot-engine-13a90e938f0e3ae567f7d7256e35c38bf744e59d.tar.gz | |
Merge pull request #70096 from rune-scape/stringname-dict
StringName Dictionary keys
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 f8553ca397..c92717e922 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; |