asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #16758 from PJB3005/18-02-16-project-manager-nontools-flag-fix

Browse source 
Ignore tools CLI flags in non-tools-builds.
This commit is contained in:
Rémi Verschelde 2018-02-17 19:04:11 +01:00 committed by GitHub
commit 16baf62363
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
main/main.cpp
View file

@ -514,12 +514,14 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
//video_mode.fullscreen=false; //video_mode.fullscreen=false;
init_fullscreen = true; init_fullscreen = true;
#ifdef TOOLS_ENABLED
} else if (I->get() == "-e" || I->get() == "--editor") { // starts editor } else if (I->get() == "-e" || I->get() == "--editor") { // starts editor
editor = true; editor = true;
} else if (I->get() == "-p" || I->get() == "--project-manager") { // starts project manager } else if (I->get() == "-p" || I->get() == "--project-manager") { // starts project manager
project_manager = true; project_manager = true;
#endif
} else if (I->get() == "--no-window") { // disable window creation, Windows only } else if (I->get() == "--no-window") { // disable window creation, Windows only
OS::get_singleton()->set_no_window_mode(true); OS::get_singleton()->set_no_window_mode(true);
@ -1226,24 +1228,27 @@ bool Main::start() {
//parameters that do not have an argument to the right //parameters that do not have an argument to the right
if (args[i] == "--no-docbase") { if (args[i] == "--no-docbase") {
doc_base = false; doc_base = false;
#ifdef TOOLS_ENABLED
} else if (args[i] == "-e" || args[i] == "--editor") { } else if (args[i] == "-e" || args[i] == "--editor") {
editor = true; editor = true;
} else if (args[i] == "-p" || args[i] == "--project-manager") { } else if (args[i] == "-p" || args[i] == "--project-manager") {
project_manager = true; project_manager = true;
#endif
} else if (args[i].length() && args[i][0] != '-' && game_path == "") { } else if (args[i].length() && args[i][0] != '-' && game_path == "") {
game_path = args[i]; game_path = args[i];
} }
//parameters that have an argument to the right //parameters that have an argument to the right
else if (i < (args.size() - 1)) { else if (i < (args.size() - 1)) {
bool parsed_pair = true; bool parsed_pair = true;
if (args[i] == "--doctool") { if (args[i] == "-s" || args[i] == "--script") {
doc_tool = args[i + 1];
for (int j = i + 2; j < args.size(); j++)
removal_docs.push_back(args[j]);
} else if (args[i] == "-s" || args[i] == "--script") {
script = args[i + 1]; script = args[i + 1];
} else if (args[i] == "--test") { } else if (args[i] == "--test") {
test = args[i + 1]; test = args[i + 1];
#ifdef TOOLS_ENABLED
} else if (args[i] == "--doctool") {
doc_tool = args[i + 1];
for (int j = i + 2; j < args.size(); j++)
removal_docs.push_back(args[j]);
} else if (args[i] == "--export") { } else if (args[i] == "--export") {
editor = true; //needs editor editor = true; //needs editor
if (i + 1 < args.size()) { if (i + 1 < args.size()) {
@ -1261,6 +1266,7 @@ bool Main::start() {
return false; return false;
} }
export_debug = true; export_debug = true;
#endif
} else { } else {
// The parameter does not match anything known, don't skip the next argument // The parameter does not match anything known, don't skip the next argument
parsed_pair = false; parsed_pair = false;