diff --git a/ChangeLog.md b/ChangeLog.md index f8cdc796a..638a5620a 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -12,7 +12,8 @@ v1.0 - Maximum unit selection cap has been removed - Size of attack and move icons increased - Forest tilesets are more animated -- You can leave and re-join network games, even if you experience lag +- You can leave and re-join network games, even if you experience lag (buggy) +- Console now hidden by default on Windows - [Default command is changed to "attack" instead of "move", which is much more intuitive](https://github.com/ZetaGlest/zetaglest-source/commit/2c4fc340de958f6b94b40ee62eabff015625e62b) (pressing "a" not needed anymore); ["m" key can be used for "move"](https://github.com/ZetaGlest/zetaglest-source/commit/bf5a04be18f2b16b8a565acff4baabc5fbfed293). - Updated UI to look more modern diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp index ef282efa3..a1bf3911a 100644 --- a/source/glest_game/main/main.cpp +++ b/source/glest_game/main/main.cpp @@ -6267,7 +6267,7 @@ namespace Game { LuaScript::setDisableSandbox(true); } #ifdef _WIN32 - if (config.getBool("ShowConsoleWindows", "false") == false) + if (config.getBool("ShowConsoleWindows", "false") == false && GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false) ShowWindow(GetConsoleWindow(), SW_HIDE); #endif diff --git a/source/glest_game/menu/menu_state_options.cpp b/source/glest_game/menu/menu_state_options.cpp index 4682e7a4b..e67eb3545 100644 --- a/source/glest_game/menu/menu_state_options.cpp +++ b/source/glest_game/menu/menu_state_options.cpp @@ -1302,7 +1302,7 @@ namespace Game { #ifdef _WIN32 if (checkBoxShowDeveloperConsoleOnWindows.getValue()) ShowWindow(GetConsoleWindow(), SW_SHOW); - else + else if (GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false) ShowWindow(GetConsoleWindow(), SW_HIDE); #endif Renderer::getInstance().loadConfig(); diff --git a/source/glest_game/menu/menu_state_options_graphics.cpp b/source/glest_game/menu/menu_state_options_graphics.cpp index cd5c858e3..d08049912 100644 --- a/source/glest_game/menu/menu_state_options_graphics.cpp +++ b/source/glest_game/menu/menu_state_options_graphics.cpp @@ -1091,7 +1091,7 @@ namespace Game { #ifdef _WIN32 if (config.getBool("ShowConsoleWindows", "false") == true) ShowWindow(GetConsoleWindow(), SW_SHOW); - else + else if (GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false) ShowWindow(GetConsoleWindow(), SW_HIDE); #endif diff --git a/source/glest_game/menu/menu_state_options_sound.cpp b/source/glest_game/menu/menu_state_options_sound.cpp index d4bf267b5..77e754e00 100644 --- a/source/glest_game/menu/menu_state_options_sound.cpp +++ b/source/glest_game/menu/menu_state_options_sound.cpp @@ -480,7 +480,7 @@ namespace Game { #ifdef _WIN32 if (config.getBool("ShowConsoleWindows", "false") == true) ShowWindow(GetConsoleWindow(), SW_SHOW); - else + else if (GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false) ShowWindow(GetConsoleWindow(), SW_HIDE); #endif