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.

1 files changed, 45 insertions, 56 deletions

diff --git a/modules/gdscript/register_types.cpp b/modules/gdscript/register_types.cpp
index 2fc663c85..1711f2ba8 100644
--- a/modules/gdscript/register_types.cpp
+++ b/modules/gdscript/register_types.cpp
@@ -29,111 +29,103 @@
 #include "register_types.h"
 
 #include "gd_script.h"
+#include "io/file_access_encrypted.h"
 #include "io/resource_loader.h"
 #include "os/file_access.h"
-#include "io/file_access_encrypted.h"
-
-
 
-GDScriptLanguage *script_language_gd=NULL;
-ResourceFormatLoaderGDScript *resource_loader_gd=NULL;
-ResourceFormatSaverGDScript *resource_saver_gd=NULL;
+GDScriptLanguage *script_language_gd = NULL;
+ResourceFormatLoaderGDScript *resource_loader_gd = NULL;
+ResourceFormatSaverGDScript *resource_saver_gd = NULL;
 
 #ifdef TOOLS_ENABLED
 
 #include "editor/editor_import_export.h"
-#include "gd_tokenizer.h"
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
+#include "gd_tokenizer.h"
 
 class EditorExportGDScript : public EditorExportPlugin {
 
-	OBJ_TYPE(EditorExportGDScript,EditorExportPlugin);
+	OBJ_TYPE(EditorExportGDScript, EditorExportPlugin);
 
 public:
-
-	virtual Vector<uint8_t> custom_export(String& p_path,const Ref<EditorExportPlatform> &p_platform) {
+	virtual Vector<uint8_t> custom_export(String &p_path, const Ref<EditorExportPlatform> &p_platform) {
 		//compile gdscript to bytecode
 
-		if (EditorImportExport::get_singleton()->script_get_action()!=EditorImportExport::SCRIPT_ACTION_NONE) {
+		if (EditorImportExport::get_singleton()->script_get_action() != EditorImportExport::SCRIPT_ACTION_NONE) {
 
 			if (p_path.ends_with(".gd")) {
 				Vector<uint8_t> file = FileAccess::get_file_as_array(p_path);
 				if (file.empty())
 					return file;
 				String txt;
-				txt.parse_utf8((const char*)file.ptr(),file.size());
+				txt.parse_utf8((const char *)file.ptr(), file.size());
 				file = GDTokenizerBuffer::parse_code_string(txt);
 
 				if (!file.empty()) {
 
-					if (EditorImportExport::get_singleton()->script_get_action()==EditorImportExport::SCRIPT_ACTION_ENCRYPT) {
+					if (EditorImportExport::get_singleton()->script_get_action() == EditorImportExport::SCRIPT_ACTION_ENCRYPT) {
 
-						String tmp_path=EditorSettings::get_singleton()->get_settings_path().plus_file("tmp/script.gde");
-						FileAccess *fa = FileAccess::open(tmp_path,FileAccess::WRITE);
-						String skey=EditorImportExport::get_singleton()->script_get_encryption_key().to_lower();
+						String tmp_path = EditorSettings::get_singleton()->get_settings_path().plus_file("tmp/script.gde");
+						FileAccess *fa = FileAccess::open(tmp_path, FileAccess::WRITE);
+						String skey = EditorImportExport::get_singleton()->script_get_encryption_key().to_lower();
 						Vector<uint8_t> key;
 						key.resize(32);
-						for(int i=0;i<32;i++) {
-							int v=0;
-							if (i*2<skey.length()) {
-								CharType ct = skey[i*2];
-								if (ct>='0' && ct<='9')
-									ct=ct-'0';
-								else if (ct>='a' && ct<='f')
-									ct=10+ct-'a';
-								v|=ct<<4;
+						for (int i = 0; i < 32; i++) {
+							int v = 0;
+							if (i * 2 < skey.length()) {
+								CharType ct = skey[i * 2];
+								if (ct >= '0' && ct <= '9')
+									ct = ct - '0';
+								else if (ct >= 'a' && ct <= 'f')
+									ct = 10 + ct - 'a';
+								v |= ct << 4;
 							}
 
-							if (i*2+1<skey.length()) {
-								CharType ct = skey[i*2+1];
-								if (ct>='0' && ct<='9')
-									ct=ct-'0';
-								else if (ct>='a' && ct<='f')
-									ct=10+ct-'a';
-								v|=ct;
+							if (i * 2 + 1 < skey.length()) {
+								CharType ct = skey[i * 2 + 1];
+								if (ct >= '0' && ct <= '9')
+									ct = ct - '0';
+								else if (ct >= 'a' && ct <= 'f')
+									ct = 10 + ct - 'a';
+								v |= ct;
 							}
-							key[i]=v;
+							key[i] = v;
 						}
-						FileAccessEncrypted *fae=memnew(FileAccessEncrypted);
-						Error err = fae->open_and_parse(fa,key,FileAccessEncrypted::MODE_WRITE_AES256);
-						if (err==OK) {
+						FileAccessEncrypted *fae = memnew(FileAccessEncrypted);
+						Error err = fae->open_and_parse(fa, key, FileAccessEncrypted::MODE_WRITE_AES256);
+						if (err == OK) {
 
-							fae->store_buffer(file.ptr(),file.size());
-							p_path=p_path.basename()+".gde";
+							fae->store_buffer(file.ptr(), file.size());
+							p_path = p_path.basename() + ".gde";
 						}
 
 						memdelete(fae);
 
-						file=FileAccess::get_file_as_array(tmp_path);
+						file = FileAccess::get_file_as_array(tmp_path);
 						return file;
 
-
 					} else {
 
-						p_path=p_path.basename()+".gdc";
+						p_path = p_path.basename() + ".gdc";
 						return file;
 					}
 				}
-
 			}
 		}
 
 		return Vector<uint8_t>();
 	}
 
-
-	EditorExportGDScript(){}
-
+	EditorExportGDScript() {}
 };
 
 static void register_editor_plugin() {
 
-	Ref<EditorExportGDScript> egd = memnew( EditorExportGDScript );
+	Ref<EditorExportGDScript> egd = memnew(EditorExportGDScript);
 	EditorImportExport::get_singleton()->add_export_plugin(egd);
 }
 
-
 #endif
 
 void register_gdscript_types() {
@@ -141,30 +133,27 @@ void register_gdscript_types() {
 	ObjectTypeDB::register_type<GDScript>();
 	ObjectTypeDB::register_virtual_type<GDFunctionState>();
 
-	script_language_gd=memnew( GDScriptLanguage );
+	script_language_gd = memnew(GDScriptLanguage);
 	//script_language_gd->init();
 	ScriptServer::register_language(script_language_gd);
-	resource_loader_gd=memnew( ResourceFormatLoaderGDScript );
+	resource_loader_gd = memnew(ResourceFormatLoaderGDScript);
 	ResourceLoader::add_resource_format_loader(resource_loader_gd);
-	resource_saver_gd=memnew( ResourceFormatSaverGDScript );
+	resource_saver_gd = memnew(ResourceFormatSaverGDScript);
 	ResourceSaver::add_resource_format_saver(resource_saver_gd);
 
 #ifdef TOOLS_ENABLED
 
 	EditorNode::add_init_callback(register_editor_plugin);
 #endif
-
 }
 void unregister_gdscript_types() {
 
-
 	ScriptServer::unregister_language(script_language_gd);
 
 	if (script_language_gd)
-		memdelete( script_language_gd );
+		memdelete(script_language_gd);
 	if (resource_loader_gd)
-		memdelete( resource_loader_gd );
+		memdelete(resource_loader_gd);
 	if (resource_saver_gd)
-		memdelete( resource_saver_gd );
-
+		memdelete(resource_saver_gd);
 }