godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Fix arguments always being found and returned some items back to normal

Browse Source
This commit is contained in:
Gordon MacPherson
2020-07-24 14:16:02 +01:00
parent 3f1fc5af7a
commit 2bdbdc4702
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main/main.cpp
View File

@@ -400,7 +400,7 @@ int Main::test_entrypoint(int argc, char *argv[], bool &tests_need_run) {
OS::get_singleton()->initialize(); OS::get_singleton()->initialize();
StringName::setup(); StringName::setup();
for (int x = 0; x < argc; x++) { for (int x = 0; x < argc; x++) {
if (strncmp(argv[x], "--test", 6)) { if (strncmp(argv[x], "--test", 6) == 0) {
tests_need_run = true; tests_need_run = true;
return test_main(argc, argv); return test_main(argc, argv);
} }
@@ -1829,7 +1829,7 @@ bool Main::start() {
print_line("Generating new docs..."); print_line("Generating new docs...");
doc.save_classes(index_path, doc_data_classes); doc.save_classes(index_path, doc_data_classes);
return FAILED; return false;
} }
if (_export_preset != "") { if (_export_preset != "") {
@@ -1837,7 +1837,7 @@ bool Main::start() {
String err = "Command line includes export parameter option, but no destination path was given.\n"; String err = "Command line includes export parameter option, but no destination path was given.\n";
err += "Please specify the binary's file path to export to. Aborting export."; err += "Please specify the binary's file path to export to. Aborting export.";
ERR_PRINT(err); ERR_PRINT(err);
return FAILED; return false;
} }
} }
#endif #endif
@@ -1859,7 +1859,7 @@ bool Main::start() {
if (!script_res->is_valid()) { if (!script_res->is_valid()) {
OS::get_singleton()->set_exit_code(1); OS::get_singleton()->set_exit_code(1);
} }
return FAILED; return false;
} }
if (script_res->can_instance()) { if (script_res->can_instance()) {
@@ -1878,7 +1878,7 @@ bool Main::start() {
script_loop->set_init_script(script_res); script_loop->set_init_script(script_res);
main_loop = script_loop; main_loop = script_loop;
} else { } else {
return FAILED; return false;
} }
} else { } else {
@@ -1892,7 +1892,7 @@ bool Main::start() {
if (!main_loop) { if (!main_loop) {
if (!ClassDB::class_exists(main_loop_type)) { if (!ClassDB::class_exists(main_loop_type)) {
DisplayServer::get_singleton()->alert("Error: MainLoop type doesn't exist: " + main_loop_type); DisplayServer::get_singleton()->alert("Error: MainLoop type doesn't exist: " + main_loop_type);
return FAILED; return false;
} else { } else {
Object *ml = ClassDB::instance(main_loop_type); Object *ml = ClassDB::instance(main_loop_type);
ERR_FAIL_COND_V_MSG(!ml, false, "Can't instance MainLoop type."); ERR_FAIL_COND_V_MSG(!ml, false, "Can't instance MainLoop type.");
@@ -2251,7 +2251,7 @@ bool Main::start() {
OS::get_singleton()->set_main_loop(main_loop); OS::get_singleton()->set_main_loop(main_loop);
return OK; return true;
} }
/* Main iteration /* Main iteration