summaryrefslogtreecommitdiff
path: root/scene/main
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-12 00:51:08 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-12 00:51:08 -0300
commit83cb84753fb17d0c3e4dbe15388279ee93f97e3e (patch)
tree202b22d5061cc3b79d2ffca8280d50e1ad107a72 /scene/main
parentc84d618b4ea944e5c386d21f45265f9cb6fa783e (diff)
Renamed most signals so they refer to:
-An action being requested to the user in present tense: (ie, draw, gui_input, etc) -A notification that an action happened, in past tense (ie, area_entered, modal_closed, etc).
Diffstat (limited to 'scene/main')
-rw-r--r--scene/main/node.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index 672f54e187..32cefa6085 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -232,7 +232,7 @@ void Node::_propagate_enter_tree() {
get_script_instance()->call_multilevel_reversed(SceneStringNames::get_singleton()->_enter_tree,NULL,0);
}
- emit_signal(SceneStringNames::get_singleton()->enter_tree);
+ emit_signal(SceneStringNames::get_singleton()->tree_entered);
data.blocked++;
@@ -298,7 +298,7 @@ void Node::_propagate_exit_tree() {
Variant::CallError err;
get_script_instance()->call_multilevel(SceneStringNames::get_singleton()->_exit_tree,NULL,0);
}
- emit_signal(SceneStringNames::get_singleton()->exit_tree);
+ emit_signal(SceneStringNames::get_singleton()->tree_exited);
notification(NOTIFICATION_EXIT_TREE,true);
if (data.tree)
@@ -3047,8 +3047,8 @@ void Node::_bind_methods() {
BIND_CONSTANT( PAUSE_MODE_PROCESS );
ADD_SIGNAL( MethodInfo("renamed") );
- ADD_SIGNAL( MethodInfo("enter_tree") );
- ADD_SIGNAL( MethodInfo("exit_tree") );
+ ADD_SIGNAL( MethodInfo("tree_entered") );
+ ADD_SIGNAL( MethodInfo("tree_exited") );
// ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "process/process" ),_SCS("set_process"),_SCS("is_processing") );
// ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "process/fixed_process" ), _SCS("set_fixed_process"),_SCS("is_fixed_processing") );