diff options
| author | James McLean | 2015-06-21 23:15:58 -0400 |
|---|---|---|
| committer | James McLean | 2015-06-21 23:15:58 -0400 |
| commit | 4e3ec18f7e0794900974f70de4e293838d48c9fe (patch) | |
| tree | 52048d583a1881a8056a6cd50aab2f6e833eb241 /main/main.cpp | |
| parent | 86c87ee66ab8601f081c89e8d85c75003b50ff78 (diff) | |
| parent | 37af8b413674936518a2ebe180f9e7bfcd5795bb (diff) | |
| download | godot-4e3ec18f7e0794900974f70de4e293838d48c9fe.tar.gz godot-4e3ec18f7e0794900974f70de4e293838d48c9fe.tar.zst godot-4e3ec18f7e0794900974f70de4e293838d48c9fe.zip | |
Merge branch 'master' of github.com:okamstudio/godot into development
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp index a00538a6a..15f969f46 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -98,6 +98,9 @@ static int video_driver_idx=-1; static int audio_driver_idx=-1; static String locale; +static bool init_maximized=false; +static int init_screen=-1; + static String unescape_cmdline(const String& p_str) { return p_str.replace("%20"," "); @@ -384,7 +387,7 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas } else if (I->get()=="-e" || I->get()=="-editor") { // fonud editor editor=true; - + init_maximized=true; } else if (I->get()=="-nowindow") { // fullscreen OS::get_singleton()->set_no_window_mode(true); @@ -789,6 +792,13 @@ Error Main::setup2() { show_logo=false; #endif + if (init_screen!=-1) { + OS::get_singleton()->set_current_screen(init_screen); + } + if (init_maximized) { + OS::get_singleton()->set_window_maximized(true); + } + if (show_logo) { //boot logo! String boot_logo_path=GLOBAL_DEF("application/boot_splash",String()); bool boot_logo_scale=GLOBAL_DEF("application/boot_splash_fullsize",true); |