godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-17 14:11:06 +00:00
Code Releases Wiki Activity

Fix monitoring status of Area2D

Browse Source
This commit is contained in:
volzhs
2017-04-03 21:00:38 +09:00
parent 12749dd67a
commit 73f53a7918
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scene/2d/area_2d.cpp
View File

@@ -380,6 +380,10 @@ void Area2D::_notification(int p_what) {
switch (p_what) { switch (p_what) {
case NOTIFICATION_READY: {
is_ready = true;
} break;
case NOTIFICATION_EXIT_TREE: { case NOTIFICATION_EXIT_TREE: {
monitoring_stored = monitoring; monitoring_stored = monitoring;
@@ -387,8 +391,8 @@ void Area2D::_notification(int p_what) {
_clear_monitoring(); _clear_monitoring();
} break; } break;
case NOTIFICATION_ENTER_TREE: { case NOTIFICATION_ENTER_TREE: {
if (is_ready)
set_enable_monitoring(monitoring_stored); set_enable_monitoring(monitoring_stored);
} break; } break;
} }
} }
@@ -646,7 +650,8 @@ Area2D::Area2D()
monitorable = false; monitorable = false;
collision_mask = 1; collision_mask = 1;
layer_mask = 1; layer_mask = 1;
monitoring_stored = true; monitoring_stored = false;
is_ready = false;
set_enable_monitoring(true); set_enable_monitoring(true);
set_monitorable(true); set_monitorable(true);
} }

1
scene/2d/area_2d.h
View File

@@ -60,6 +60,7 @@ private:
bool monitoring_stored; bool monitoring_stored;
bool monitorable; bool monitorable;
bool locked; bool locked;
bool is_ready;
void _body_inout(int p_status, const RID &p_body, int p_instance, int p_body_shape, int p_area_shape); void _body_inout(int p_status, const RID &p_body, int p_instance, int p_body_shape, int p_area_shape);