diff options
Diffstat (limited to 'scene/3d/area.cpp')
| -rw-r--r-- | scene/3d/area.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/scene/3d/area.cpp b/scene/3d/area.cpp index b4c63d629..ce54d7cd8 100644 --- a/scene/3d/area.cpp +++ b/scene/3d/area.cpp @@ -274,10 +274,6 @@ void Area::_notification(int p_what) { switch (p_what) { - case NOTIFICATION_READY: { - - is_ready = true; - } break; case NOTIFICATION_EXIT_TREE: { monitoring_stored = monitoring; @@ -285,8 +281,11 @@ void Area::_notification(int p_what) { _clear_monitoring(); } break; case NOTIFICATION_ENTER_TREE: { - if (is_ready) - set_enable_monitoring(monitoring_stored); + + if (monitoring_stored) { + set_enable_monitoring(true); + monitoring_stored = false; + } } break; } } @@ -298,6 +297,11 @@ void Area::set_enable_monitoring(bool p_enable) { } ERR_FAIL_COND(locked); + if (!is_inside_tree()) { + monitoring_stored = p_enable; + return; + } + if (p_enable == monitoring) return; @@ -418,7 +422,7 @@ void Area::_area_inout(int p_status, const RID &p_area, int p_instance, int p_ar bool Area::is_monitoring_enabled() const { - return monitoring; + return monitoring || monitoring_stored; } Array Area::get_overlapping_bodies() const { @@ -644,7 +648,6 @@ Area::Area() collision_mask = 1; layer_mask = 1; monitoring_stored = false; - is_ready = false; set_ray_pickable(false); set_enable_monitoring(true); set_monitorable(true); |