diff options
| author | Rémi Verschelde | 2017-03-19 00:36:26 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2017-03-19 00:36:26 +0100 |
| commit | f8db8a3faa30b71dca33ced38be16d3f93f43e8a (patch) | |
| tree | 3b798318132cca7eccfbca5818ab55656a2896d7 /editor/editor_run_script.cpp | |
| parent | 1d418afe863c9e553b69174ce63aef203c46d2f0 (diff) | |
| download | godot-f8db8a3faa30b71dca33ced38be16d3f93f43e8a.tar.gz godot-f8db8a3faa30b71dca33ced38be16d3f93f43e8a.tar.zst godot-f8db8a3faa30b71dca33ced38be16d3f93f43e8a.zip | |
Bring that Whole New World to the Old Continent too
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6e3e905b94b8764e99491e608122261.
Diffstat (limited to '')
| -rw-r--r-- | editor/editor_run_script.cpp | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/editor/editor_run_script.cpp b/editor/editor_run_script.cpp index 932acb11d..3cbcea528 100644 --- a/editor/editor_run_script.cpp +++ b/editor/editor_run_script.cpp @@ -29,30 +29,25 @@ #include "editor_run_script.h" #include "editor_node.h" - - - - - void EditorScript::add_root_node(Node *p_node) { if (!editor) { - EditorNode::add_io_error("EditorScript::add_root_node: "+TTR("Write your logic in the _run() method.")); + EditorNode::add_io_error("EditorScript::add_root_node: " + TTR("Write your logic in the _run() method.")); return; } if (editor->get_edited_scene()) { - EditorNode::add_io_error("EditorScript::add_root_node: "+TTR("There is an edited scene already.")); + EditorNode::add_io_error("EditorScript::add_root_node: " + TTR("There is an edited scene already.")); return; } -// editor->set_edited_scene(p_node); + // editor->set_edited_scene(p_node); } Node *EditorScript::get_scene() { if (!editor) { - EditorNode::add_io_error("EditorScript::get_scene: "+TTR("Write your logic in the _run() method.")); + EditorNode::add_io_error("EditorScript::get_scene: " + TTR("Write your logic in the _run() method.")); return NULL; } @@ -64,37 +59,32 @@ void EditorScript::_run() { Ref<Script> s = get_script(); ERR_FAIL_COND(!s.is_valid()); if (!get_script_instance()) { - EditorNode::add_io_error(TTR("Couldn't instance script:")+"\n "+s->get_path()+"\n"+TTR("Did you forget the 'tool' keyword?")); + EditorNode::add_io_error(TTR("Couldn't instance script:") + "\n " + s->get_path() + "\n" + TTR("Did you forget the 'tool' keyword?")); return; - } Variant::CallError ce; - ce.error=Variant::CallError::CALL_OK; - get_script_instance()->call("_run",NULL,0,ce); - if (ce.error!=Variant::CallError::CALL_OK) { + ce.error = Variant::CallError::CALL_OK; + get_script_instance()->call("_run", NULL, 0, ce); + if (ce.error != Variant::CallError::CALL_OK) { - EditorNode::add_io_error(TTR("Couldn't run script:")+"\n "+s->get_path()+"\n"+TTR("Did you forget the '_run' method?")); + EditorNode::add_io_error(TTR("Couldn't run script:") + "\n " + s->get_path() + "\n" + TTR("Did you forget the '_run' method?")); } } void EditorScript::set_editor(EditorNode *p_editor) { - editor=p_editor; + editor = p_editor; } - void EditorScript::_bind_methods() { - ObjectTypeDB::bind_method(_MD("add_root_node","node"),&EditorScript::add_root_node); - ObjectTypeDB::bind_method(_MD("get_scene"),&EditorScript::get_scene); - BIND_VMETHOD( MethodInfo("_run") ); - - + ObjectTypeDB::bind_method(_MD("add_root_node", "node"), &EditorScript::add_root_node); + ObjectTypeDB::bind_method(_MD("get_scene"), &EditorScript::get_scene); + BIND_VMETHOD(MethodInfo("_run")); } EditorScript::EditorScript() { - editor=NULL; + editor = NULL; } - |
