diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index 2dec1d478e..162c2cdfb3 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -483,8 +483,8 @@ void OMW::Engine::addGroundcoverFile(const std::string& file) void OMW::Engine::setSkipMenu(bool skipMenu, bool newGame) { - mSkipMenu = true; - mNewGame = false; + mSkipMenu = skipMenu; + mNewGame = newGame; } void OMW::Engine::createWindow() diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp index 1f0d7c2e56..f50da3312c 100644 --- a/apps/openmw/main.cpp +++ b/apps/openmw/main.cpp @@ -73,7 +73,7 @@ bool parseOptions(int argc, char** argv, OMW::Engine& engine, Files::Configurati MWGui::DebugWindow::startLogRecording(); - engine.setGrabMouse(!variables["no-grab"].as()); + engine.setGrabMouse(false); // Font encoding settings std::string encoding(variables["encoding"].as()); @@ -146,9 +146,7 @@ bool parseOptions(int argc, char** argv, OMW::Engine& engine, Files::Configurati // startup-settings engine.setCell(variables["start"].as()); - engine.setSkipMenu(variables["skip-menu"].as(), variables["new-game"].as()); - if (!variables["skip-menu"].as() && variables["new-game"].as()) - Log(Debug::Warning) << "Warning: new-game used without skip-menu -> ignoring it"; + engine.setSkipMenu(true, false); // scripts engine.setCompileAll(variables["script-all"].as()); @@ -160,7 +158,7 @@ bool parseOptions(int argc, char** argv, OMW::Engine& engine, Files::Configurati // other settings Fallback::Map::init(variables["fallback"].as().mMap); - engine.setSoundUsage(!variables["no-sound"].as()); + engine.setSoundUsage(false); engine.setActivationDistanceOverride(variables["activate-dist"].as()); engine.enableFontExport(variables["export-fonts"].as()); engine.setRandomSeed(variables["random-seed"].as()); diff --git a/apps/openmw/options.cpp b/apps/openmw/options.cpp index 26720bc448..356a98bb79 100644 --- a/apps/openmw/options.cpp +++ b/apps/openmw/options.cpp @@ -44,7 +44,7 @@ namespace OpenMW bpo::value()->default_value(StringsVector(), "")->multitoken()->composing(), "groundcover content file(s): esm/esp, or omwgame/omwaddon"); - addOption("no-sound", bpo::value()->implicit_value(true)->default_value(true), "disable all sounds"); + addOption("no-sound", bpo::value()->implicit_value(true)->default_value(false), "disable all sounds"); addOption("script-all", bpo::value()->implicit_value(true)->default_value(false), "compile all scripts (excluding dialogue scripts) at startup"); @@ -68,7 +68,7 @@ namespace OpenMW "load a save game file on game startup (specify an absolute filename or a filename relative to the current " "working directory)"); - addOption("skip-menu", bpo::value()->implicit_value(true)->default_value(true), + addOption("skip-menu", bpo::value()->implicit_value(true)->default_value(false), "skip main menu on game startup"); addOption("new-game", bpo::value()->implicit_value(true)->default_value(false), @@ -85,7 +85,7 @@ namespace OpenMW bpo::value()->default_value(Fallback::FallbackMap(), "")->multitoken()->composing(), "fallback values"); - addOption("no-grab", bpo::value()->implicit_value(true)->default_value(true), "Don't grab mouse cursor"); + addOption("no-grab", bpo::value()->implicit_value(true)->default_value(false), "Don't grab mouse cursor"); addOption("export-fonts", bpo::value()->implicit_value(true)->default_value(false), "Export Morrowind .fnt fonts to PNG image and XML file in current directory");