summaryrefslogtreecommitdiffstats
path: root/scene/3d/area.h
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2014-11-05 21:20:42 -0300
committerJuan Linietsky <reduzio@gmail.com>2014-11-05 21:20:42 -0300
commit0dbedd18fc62f700e92a4cf581e505d849bc47ad (patch)
tree8f2c85b4d9227e441fd35ab4873009faa656bcba /scene/3d/area.h
parentd14baf6e41bcdbe4968e0513beccc09dfb160ecd (diff)
downloadredot-engine-0dbedd18fc62f700e92a4cf581e505d849bc47ad.tar.gz
SceneMainLoop -> SceneTree
-=-=-=-=-=-=-=-=-=-=-=-=-=- *YOUR SOURCE MIGHT NOT WORK* For mor information on fix: https://github.com/okamstudio/godot/wiki/devel_scene_tree Other stuff: -Shower of bullets demo -Fixes all around
Diffstat (limited to 'scene/3d/area.h')
-rw-r--r--scene/3d/area.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/3d/area.h b/scene/3d/area.h
index 5558e2c719..96b8585338 100644
--- a/scene/3d/area.h
+++ b/scene/3d/area.h
@@ -56,8 +56,8 @@ private:
void _body_inout(int p_status,const RID& p_body, int p_instance, int p_body_shape,int p_area_shape);
- void _body_enter_scene(ObjectID p_id);
- void _body_exit_scene(ObjectID p_id);
+ void _body_enter_tree(ObjectID p_id);
+ void _body_exit_tree(ObjectID p_id);
struct ShapePair {
@@ -77,7 +77,7 @@ private:
struct BodyState {
int rc;
- bool in_scene;
+ bool in_tree;
VSet<ShapePair> shapes;
};