diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-07-03 16:48:03 +0200 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-03 16:48:03 +0200 | 
| commit | 0705eb904a006ede23a8a837d20aa79a1d7a0b98 (patch) | |
| tree | 5a1e7655ead75c32a202681dd3e5df195f31dcac | |
| parent | 23ad85c692ebbb10df00e1a01263017e897ac4ef (diff) | |
| parent | fd17b960e977149f026b49fb9f5ffa492982872a (diff) | |
Merge pull request #19251 from YeldhamDev/script_templates_changes
Small changes to the comments in the script templates
| -rw-r--r-- | editor/plugins/script_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | modules/gdscript/gdscript_editor.cpp | 24 | ||||
| -rw-r--r-- | modules/mono/csharp_script.cpp | 14 | 
3 files changed, 19 insertions, 21 deletions
diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index 9724017787..aa4673f41e 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -2884,7 +2884,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {  	error_dialog = memnew(AcceptDialog);  	add_child(error_dialog); -	error_dialog->get_ok()->set_text(TTR("I see..")); +	error_dialog->get_ok()->set_text(TTR("I see..."));  	debugger = memnew(ScriptEditorDebugger(editor));  	debugger->connect("goto_script_line", this, "_goto_script_line"); diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp index 0e4724fec2..c0c3bd7b06 100644 --- a/modules/gdscript/gdscript_editor.cpp +++ b/modules/gdscript/gdscript_editor.cpp @@ -54,18 +54,18 @@ void GDScriptLanguage::get_string_delimiters(List<String> *p_delimiters) const {  }  Ref<Script> GDScriptLanguage::get_template(const String &p_class_name, const String &p_base_class_name) const { -	String _template = String() + -					   "extends %BASE%\n\n" + -					   "# class member variables go here, for example:\n" + -					   "# var a = 2\n" + -					   "# var b = \"textvar\"\n\n" + -					   "func _ready():\n" + -					   "%TS%# Called when the node is added to the scene for the first time.\n" + -					   "%TS%# Initialization here.\n" + -					   "%TS%pass\n\n" + -					   "#func _process(delta):\n" + -					   "#%TS%# Called every frame. Delta is time since last frame.\n" + -					   "#%TS%# Update game logic here.\n" + +	String _template = "extends %BASE%\n" +					   "\n" +					   "# Declare member variables here. Examples:\n" +					   "# var a = 2\n" +					   "# var b = \"text\"\n" +					   "\n" +					   "# Called when the node enters the scene tree for the first time.\n" +					   "func _ready():\n" +					   "%TS%pass # Replace with function body.\n" +					   "\n" +					   "# Called every frame. 'delta' is the elapsed time since the previous frame.\n" +					   "#func _process(delta):\n"  					   "#%TS%pass\n";  	_template = _template.replace("%BASE%", p_base_class_name); diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp index 46c40b2690..2420cdb4af 100644 --- a/modules/mono/csharp_script.cpp +++ b/modules/mono/csharp_script.cpp @@ -298,22 +298,20 @@ Ref<Script> CSharpLanguage::get_template(const String &p_class_name, const Strin  							 "\n"  							 "public class %CLASS_NAME% : %BASE_CLASS_NAME%\n"  							 "{\n" -							 "    // Member variables here, example:\n" +							 "    // Declare member variables here. Examples:\n"  							 "    // private int a = 2;\n" -							 "    // private string b = \"textvar\";\n" +							 "    // private string b = \"text\";\n"  							 "\n" +							 "    // Called when the node enters the scene tree for the first time."  							 "    public override void _Ready()\n"  							 "    {\n" -							 "        // Called every time the node is added to the scene.\n" -							 "        // Initialization here.\n" -							 "        \n" +							 "        "  							 "    }\n"  							 "\n" +							 "//    // Called every frame. 'delta' is the elapsed time since the previous frame."  							 "//    public override void _Process(float delta)\n"  							 "//    {\n" -							 "//        // Called every frame. Delta is time since last frame.\n" -							 "//        // Update game logic here.\n" -							 "//        \n" +							 "//        "  							 "//    }\n"  							 "}\n";  |