diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2017-03-05 16:44:50 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-03-05 16:44:50 +0100 |
commit | 5dbf1809c6e3e905b94b8764e99491e608122261 (patch) | |
tree | 5e5a5360db15d86d59ec8c6e4f7eb511388c5a9a /editor/editor_run_script.cpp | |
parent | 45438e9918d421b244bfd7776a30e67dc7f2d3e3 (diff) | |
download | redot-engine-5dbf1809c6e3e905b94b8764e99491e608122261.tar.gz |
A Whole New World (clang-format edition)
I can show you the code
Pretty, with proper whitespace
Tell me, coder, now when did
You last write readable code?
I can open your eyes
Make you see your bad indent
Force you to respect the style
The core devs agreed upon
A whole new world
A new fantastic code format
A de facto standard
With some sugar
Enforced with clang-format
A whole new world
A dazzling style we all dreamed of
And when we read it through
It's crystal clear
That now we're in a whole new world of code
Diffstat (limited to 'editor/editor_run_script.cpp')
-rw-r--r-- | editor/editor_run_script.cpp | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/editor/editor_run_script.cpp b/editor/editor_run_script.cpp index 77dc7bd4bf..21c97b4587 100644 --- a/editor/editor_run_script.cpp +++ b/editor/editor_run_script.cpp @@ -30,16 +30,15 @@ #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; } @@ -49,7 +48,7 @@ void EditorScript::add_root_node(Node *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; } @@ -61,37 +60,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() { - ClassDB::bind_method(D_METHOD("add_root_node","node"),&EditorScript::add_root_node); - ClassDB::bind_method(D_METHOD("get_scene"),&EditorScript::get_scene); - BIND_VMETHOD( MethodInfo("_run") ); - - + ClassDB::bind_method(D_METHOD("add_root_node", "node"), &EditorScript::add_root_node); + ClassDB::bind_method(D_METHOD("get_scene"), &EditorScript::get_scene); + BIND_VMETHOD(MethodInfo("_run")); } EditorScript::EditorScript() { - editor=NULL; + editor = NULL; } - |