summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHennadii Chernyshchyk <genaloner@gmail.com>2021-09-04 12:14:51 +0300
committerHennadii Chernyshchyk <genaloner@gmail.com>2021-09-04 12:14:54 +0300
commit2b78353e793fbe75c50b786a31628d492c7cac3d (patch)
tree6a51ba0071fc7c097698d5e2be447f3233af694c
parentd20031ccaec4c9ff50bc718cb8d79eefba0d7f11 (diff)
Remove extra get_script_instance check
Otherwise, `_ready()` will not be called on classes that define this function and doesn't have a script attached.
-rw-r--r--scene/main/node.cpp35
1 files changed, 17 insertions, 18 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index f2a2648140..b3fa90e14e 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -123,28 +123,27 @@ void Node::_notification(int p_notification) {
}
} break;
case NOTIFICATION_READY: {
- if (get_script_instance()) {
- if (GDVIRTUAL_IS_OVERRIDDEN(_input)) {
- set_process_input(true);
- }
-
- if (GDVIRTUAL_IS_OVERRIDDEN(_unhandled_input)) {
- set_process_unhandled_input(true);
- }
+ if (GDVIRTUAL_IS_OVERRIDDEN(_input)) {
+ set_process_input(true);
+ }
- if (GDVIRTUAL_IS_OVERRIDDEN(_unhandled_key_input)) {
- set_process_unhandled_key_input(true);
- }
+ if (GDVIRTUAL_IS_OVERRIDDEN(_unhandled_input)) {
+ set_process_unhandled_input(true);
+ }
- if (GDVIRTUAL_IS_OVERRIDDEN(_process)) {
- set_process(true);
- }
- if (GDVIRTUAL_IS_OVERRIDDEN(_physics_process)) {
- set_physics_process(true);
- }
+ if (GDVIRTUAL_IS_OVERRIDDEN(_unhandled_key_input)) {
+ set_process_unhandled_key_input(true);
+ }
- GDVIRTUAL_CALL(_ready);
+ 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()) {
ERR_FAIL_COND(!is_inside_tree());
get_multiplayer()->scene_enter_exit_notify(data.filename, this, true);