diff options
| author | David Snopek <dsnopek@gmail.com> | 2024-08-07 15:53:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-07 15:53:54 -0500 |
| commit | 3f4590f8e18b2bc0b5d21043ef42a5424211c4b9 (patch) | |
| tree | 78e9c837452ca5afe56cdb2b8f19c6b781235c61 | |
| parent | e3e8101e8c2d025b3b7d13545d4355f326454b8f (diff) | |
| parent | c77d44f3f6abbacfc5b4a5efff580387e8b297b8 (diff) | |
| download | redot-cpp-3f4590f8e18b2bc0b5d21043ef42a5424211c4b9.tar.gz | |
Merge pull request #1539 from Naros/dispatch-get-set-up-hierarchy
Make sure `_get` and `_set` dispatch up the class hierarchy
| -rw-r--r-- | include/godot_cpp/classes/wrapped.hpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/godot_cpp/classes/wrapped.hpp b/include/godot_cpp/classes/wrapped.hpp index 9cc1d39..6d9bef7 100644 --- a/include/godot_cpp/classes/wrapped.hpp +++ b/include/godot_cpp/classes/wrapped.hpp @@ -274,23 +274,27 @@ public: } \ \ static GDExtensionBool set_bind(GDExtensionClassInstancePtr p_instance, GDExtensionConstStringNamePtr p_name, GDExtensionConstVariantPtr p_value) { \ - if (p_instance && m_class::_get_set()) { \ + if (p_instance) { \ + if (m_inherits::set_bind(p_instance, p_name, p_value)) { \ + return true; \ + } \ if (m_class::_get_set() != m_inherits::_get_set()) { \ m_class *cls = reinterpret_cast<m_class *>(p_instance); \ return cls->_set(*reinterpret_cast<const ::godot::StringName *>(p_name), *reinterpret_cast<const ::godot::Variant *>(p_value)); \ } \ - return m_inherits::set_bind(p_instance, p_name, p_value); \ } \ return false; \ } \ \ static GDExtensionBool get_bind(GDExtensionClassInstancePtr p_instance, GDExtensionConstStringNamePtr p_name, GDExtensionVariantPtr r_ret) { \ - if (p_instance && m_class::_get_get()) { \ + if (p_instance) { \ + if (m_inherits::get_bind(p_instance, p_name, r_ret)) { \ + return true; \ + } \ if (m_class::_get_get() != m_inherits::_get_get()) { \ m_class *cls = reinterpret_cast<m_class *>(p_instance); \ return cls->_get(*reinterpret_cast<const ::godot::StringName *>(p_name), *reinterpret_cast<::godot::Variant *>(r_ret)); \ } \ - return m_inherits::get_bind(p_instance, p_name, r_ret); \ } \ return false; \ } \ |