godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #66539 from bruvzg/gdv_rename

Browse Source 
Rename `script_instance` to `_script_instance` in the `GDVIRTUAL*` wrappers to avoid shadowing `Object` member.
This commit is contained in:
Rémi Verschelde 2022-09-28 17:14:15 +02:00
commit 0ce7e2763d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/object/make_virtuals.py
View File

@ -5,11 +5,11 @@ mutable bool _gdvirtual_##m_name##_initialized = false;\\
mutable GDNativeExtensionClassCallVirtual _gdvirtual_##m_name = nullptr;\\ mutable GDNativeExtensionClassCallVirtual _gdvirtual_##m_name = nullptr;\\
template<bool required>\\ template<bool required>\\
_FORCE_INLINE_ bool _gdvirtual_##m_name##_call($CALLARGS) $CONST { \\ _FORCE_INLINE_ bool _gdvirtual_##m_name##_call($CALLARGS) $CONST { \\
ScriptInstance *script_instance = ((Object*)(this))->get_script_instance();\\ ScriptInstance *_script_instance = ((Object*)(this))->get_script_instance();\\
if (script_instance) {\\ if (_script_instance) {\\
Callable::CallError ce; \\ Callable::CallError ce; \\
$CALLSIARGS\\ $CALLSIARGS\\
$CALLSIBEGINscript_instance->callp(_gdvirtual_##m_name##_sn, $CALLSIARGPASS, ce);\\ $CALLSIBEGIN_script_instance->callp(_gdvirtual_##m_name##_sn, $CALLSIARGPASS, ce);\\
if (ce.error == Callable::CallError::CALL_OK) {\\ if (ce.error == Callable::CallError::CALL_OK) {\\
$CALLSIRET\\ $CALLSIRET\\
return true;\\ return true;\\
@ -35,9 +35,9 @@ _FORCE_INLINE_ bool _gdvirtual_##m_name##_call($CALLARGS) $CONST { \\
return false;\\ return false;\\
}\\ }\\
_FORCE_INLINE_ bool _gdvirtual_##m_name##_overridden() const { \\ _FORCE_INLINE_ bool _gdvirtual_##m_name##_overridden() const { \\
ScriptInstance *script_instance = ((Object*)(this))->get_script_instance();\\ ScriptInstance *_script_instance = ((Object*)(this))->get_script_instance();\\
if (script_instance) {\\ if (_script_instance) {\\
return script_instance->has_method(_gdvirtual_##m_name##_sn);\\ return _script_instance->has_method(_gdvirtual_##m_name##_sn);\\
}\\ }\\
if (unlikely(_get_extension() && !_gdvirtual_##m_name##_initialized)) {\\ if (unlikely(_get_extension() && !_gdvirtual_##m_name##_initialized)) {\\
_gdvirtual_##m_name = (_get_extension() && _get_extension()->get_virtual) ? _get_extension()->get_virtual(_get_extension()->class_userdata, #m_name) : (GDNativeExtensionClassCallVirtual) nullptr;\\ _gdvirtual_##m_name = (_get_extension() && _get_extension()->get_virtual) ? _get_extension()->get_virtual(_get_extension()->class_userdata, #m_name) : (GDNativeExtensionClassCallVirtual) nullptr;\\