summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2014-11-06 11:02:40 -0300
committerJuan Linietsky <reduzio@gmail.com>2014-11-06 11:02:40 -0300
commitfc676fa6f8de6b0b24cf54ecfa3f9221c607095c (patch)
tree61f54bf6c962b21c9047b26cc740e684db967d25 /scene
parent0dbedd18fc62f700e92a4cf581e505d849bc47ad (diff)
missing files with fixes for shower of bullets
Diffstat (limited to 'scene')
-rw-r--r--scene/2d/area_2d.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/2d/area_2d.cpp b/scene/2d/area_2d.cpp
index 48fa74cc6d..33176c4f34 100644
--- a/scene/2d/area_2d.cpp
+++ b/scene/2d/area_2d.cpp
@@ -162,7 +162,7 @@ void Area2D::_body_inout(int p_status,const RID& p_body, int p_instance, int p_b
E->get().shapes.insert(ShapePair(p_body_shape,p_area_shape));
- if (E->get().in_tree) {
+ if (!node || E->get().in_tree) {
emit_signal(SceneStringNames::get_singleton()->body_enter_shape,objid,node,p_body_shape,p_area_shape);
}
@@ -188,7 +188,7 @@ void Area2D::_body_inout(int p_status,const RID& p_body, int p_instance, int p_b
eraseit=true;
}
- if (node && E->get().in_tree) {
+ if (!node || E->get().in_tree) {
emit_signal(SceneStringNames::get_singleton()->body_exit_shape,objid,obj,p_body_shape,p_area_shape);
}