godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18810 from eska014/cmdline

Browse Source 
Fix command line II
This commit is contained in:
Rémi Verschelde 2018-05-13 19:49:09 +02:00 committed by GitHub
commit 2014bb485a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
main/main.cpp
View File

@ -337,7 +337,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
String video_driver = "";
String audio_driver = "";
String game_path;
String project_path = ".";
bool upwards = false;
String debug_mode;
String debug_host;
@ -553,7 +553,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
if (OS::get_singleton()->set_cwd(p) == OK) {
//nothing
} else {
game_path = I->next()->get(); //use game_path instead
project_path = I->next()->get(); //use project_path instead
}
N = I->next()->next();
} else {
@ -576,7 +576,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
if (OS::get_singleton()->set_cwd(path) == OK) {
// path already specified, don't override
} else {
game_path = path;
project_path = path;
}
#ifdef TOOLS_ENABLED
editor = true;
@ -672,38 +672,20 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
} else if (I->get() == "--disable-crash-handler") {
OS::get_singleton()->disable_crash_handler();
} else {
//test for game path
bool gpfound = false;
if (!I->get().begins_with("-") && game_path == "") {
DirAccess *da = DirAccess::open(I->get());
if (da != NULL) {
game_path = I->get();
gpfound = true;
memdelete(da);
}
}
if (!gpfound) {
main_args.push_back(I->get());
}
main_args.push_back(I->get());
}
I = N;
}
if (game_path.empty()) {
game_path = ".";
}
if (globals->setup(game_path, main_pack, upwards) == OK) {
if (globals->setup(project_path, main_pack, upwards) == OK) {
found_project = true;
} else {
#ifdef TOOLS_ENABLED
editor = false;
#else
OS::get_singleton()->print("Error: Could not load game path '%s'.\n", game_path.ascii().get_data());
OS::get_singleton()->print("Error: Could not load game path '%s'.\n", project_path.ascii().get_data());
goto error;
#endif
@ -994,7 +976,7 @@ error:
video_driver = "";
audio_driver = "";
game_path = "";
project_path = "";
args.clear();
main_args.clear();