summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorAriel Manzur <ariel@okamstudio.com>2016-02-25 03:02:09 -0300
committerAriel Manzur <ariel@okamstudio.com>2016-02-25 03:02:09 -0300
commitea751724a21e3513ff2291aa24491e9d91c8c0f0 (patch)
treeefb3ad7ce7993e42022535d9ea315af094fff668 /main
parentc91b1daad82a5c1097eac1510d30897399ca9f61 (diff)
adds -pm and -project_manager command line options to start project manager
fixes bug where the user has an engine.cfg on the executable directory so it runs the game instead of opening the project manager
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 68c40a6f2b..8c0c31835f 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -1011,6 +1011,7 @@ bool Main::start() {
bool noquit=false;
bool convert_old=false;
bool export_debug=false;
+ bool project_manager_request = false;
List<String> args = OS::get_singleton()->get_cmdline_args();
for (int i=0;i<args.size();i++) {
//parameters that do not have an argument to the right
@@ -1022,6 +1023,8 @@ bool Main::start() {
convert_old=true;
} else if (args[i]=="-editor" || args[i]=="-e") {
editor=true;
+ } else if (args[i] == "-pm" || args[i] == "-project_manager") {
+ project_manager_request = true;
} else if (args[i].length() && args[i][0] != '-' && game_path == "") {
game_path=args[i];
}
@@ -1255,7 +1258,7 @@ bool Main::start() {
}
- if (game_path!="") {
+ if (game_path!="" && !project_manager_request) {
String local_game_path=game_path.replace("\\","/");
@@ -1462,7 +1465,7 @@ bool Main::start() {
};
}
*/
- if (script=="" && test=="" && game_path=="" && !editor) {
+ if (project_manager_request || (script=="" && test=="" && game_path=="" && !editor)) {
ProjectManager *pmanager = memnew( ProjectManager );
sml->get_root()->add_child(pmanager);