diff options
| author | Rémi Verschelde | 2017-04-08 22:47:44 +0200 |
|---|---|---|
| committer | GitHub | 2017-04-08 22:47:44 +0200 |
| commit | c9eb0f5f4518e5edd2d867e5ff002c61484cd3c8 (patch) | |
| tree | 457198a3bd5f90f535b948577f8787540f91643e /scene/2d/area_2d.cpp | |
| parent | 4b561e3e04aba9e4a248862c06154e495a56f48f (diff) | |
| parent | c3c0cfd2070c3aec30c1c7dc2392818a8a65ee65 (diff) | |
| download | godot-c9eb0f5f4518e5edd2d867e5ff002c61484cd3c8.tar.gz godot-c9eb0f5f4518e5edd2d867e5ff002c61484cd3c8.tar.zst godot-c9eb0f5f4518e5edd2d867e5ff002c61484cd3c8.zip | |
Merge pull request #8317 from RandomShaper/fix-area-monitoring-2.1
Fix side effects of the bookkepping of Area/Area2D's monitoring (2.1)
Diffstat (limited to 'scene/2d/area_2d.cpp')
| -rw-r--r-- | scene/2d/area_2d.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/scene/2d/area_2d.cpp b/scene/2d/area_2d.cpp index f5f4ce072..514663a04 100644 --- a/scene/2d/area_2d.cpp +++ b/scene/2d/area_2d.cpp @@ -381,10 +381,6 @@ void Area2D::_notification(int p_what) { switch (p_what) { - case NOTIFICATION_READY: { - - is_ready = true; - } break; case NOTIFICATION_EXIT_TREE: { monitoring_stored = monitoring; @@ -392,16 +388,25 @@ void Area2D::_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; } } void Area2D::set_enable_monitoring(bool p_enable) { + if (!is_inside_tree()) { + monitoring_stored = p_enable; + return; + } + if (p_enable == monitoring) return; + if (locked) { ERR_EXPLAIN("Function blocked during in/out signal. Use call_deferred(\"set_enable_monitoring\",true/false)"); } @@ -423,7 +428,7 @@ void Area2D::set_enable_monitoring(bool p_enable) { bool Area2D::is_monitoring_enabled() const { - return monitoring; + return monitoring || monitoring_stored; } void Area2D::set_monitorable(bool p_enable) { @@ -652,7 +657,6 @@ Area2D::Area2D() collision_mask = 1; layer_mask = 1; monitoring_stored = false; - is_ready = false; set_enable_monitoring(true); set_monitorable(true); } |