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

Remove extra get_script_instance check

Browse Source 
Otherwise, `_ready()` will not be called on classes
that define this function and doesn't have a script attached.
This commit is contained in:
Hennadii Chernyshchyk 2021-09-04 12:14:51 +03:00
parent d20031ccae
commit 2b78353e79
No known key found for this signature in database
GPG Key ID: 24623302B8395825
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
scene/main/node.cpp
View File

@ -123,28 +123,27 @@ void Node::_notification(int p_notification) {
} }
} break; } break;
case NOTIFICATION_READY: { case NOTIFICATION_READY: {
if (get_script_instance()) { if (GDVIRTUAL_IS_OVERRIDDEN(_input)) {
if (GDVIRTUAL_IS_OVERRIDDEN(_input)) { set_process_input(true);
set_process_input(true);
}
if (GDVIRTUAL_IS_OVERRIDDEN(_unhandled_input)) {
set_process_unhandled_input(true);
}
if (GDVIRTUAL_IS_OVERRIDDEN(_unhandled_key_input)) {
set_process_unhandled_key_input(true);
}
if (GDVIRTUAL_IS_OVERRIDDEN(_process)) {
set_process(true);
}
if (GDVIRTUAL_IS_OVERRIDDEN(_physics_process)) {
set_physics_process(true);
}
GDVIRTUAL_CALL(_ready);
} }
if (GDVIRTUAL_IS_OVERRIDDEN(_unhandled_input)) {
set_process_unhandled_input(true);
}
if (GDVIRTUAL_IS_OVERRIDDEN(_unhandled_key_input)) {
set_process_unhandled_key_input(true);
}
if (GDVIRTUAL_IS_OVERRIDDEN(_process)) {
set_process(true);
}
if (GDVIRTUAL_IS_OVERRIDDEN(_physics_process)) {
set_physics_process(true);
}
GDVIRTUAL_CALL(_ready);
if (data.filename.length()) { if (data.filename.length()) {
ERR_FAIL_COND(!is_inside_tree()); ERR_FAIL_COND(!is_inside_tree());
get_multiplayer()->scene_enter_exit_notify(data.filename, this, true); get_multiplayer()->scene_enter_exit_notify(data.filename, this, true);