From fa5496407baa940bd88b083d76aaf30bac55fabb Mon Sep 17 00:00:00 2001
From: Diject <alexkozlovv@gmail.com>
Date: Mon, 29 Dec 2025 14:31:45 +0300
Subject: [PATCH] Change default options to skip menu and disable sound

---
 apps/openmw/engine.cpp  | 26 ++++++--------------------
 apps/openmw/options.cpp |  8 ++++----
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 54189f8a1a..d0dc9915a5 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -364,14 +364,14 @@ OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
     , mSelectDepthFormatOperation(new SceneUtil::SelectDepthFormatOperation())
     , mSelectColorFormatOperation(new SceneUtil::Color::SelectColorFormatOperation())
     , mStereoManager(nullptr)
-    , mSkipMenu(false)
-    , mUseSound(true)
+    , mSkipMenu(true)
+    , mUseSound(false)
     , mCompileAll(false)
     , mCompileAllDialogue(false)
     , mWarningsMode(1)
     , mScriptConsoleMode(false)
     , mActivationDistanceOverride(-1)
-    , mGrab(true)
+    , mGrab(false)
     , mExportFonts(false)
     , mRandomSeed(0)
     , mNewGame(false)
@@ -483,8 +483,8 @@ void OMW::Engine::addGroundcoverFile(const std::string& file)
 
 void OMW::Engine::setSkipMenu(bool skipMenu, bool newGame)
 {
-    mSkipMenu = skipMenu;
-    mNewGame = newGame;
+    mSkipMenu = true;
+    mNewGame = false;
 }
 
 void OMW::Engine::createWindow()
@@ -997,20 +997,6 @@ void OMW::Engine::go()
 
     // Map extractor
     std::unique_ptr<MapExtractor> mapExtractor;
-    if (mExtractMaps)
-    {
-        Log(Debug::Info) << "Starting map extraction mode...";
-
-        mStateManager->newGame(true);
-
-        Log(Debug::Info) << "Starting map extraction...";
-
-        //mapExtractor = std::make_unique<MapExtractor>(*mWorld, mViewer.get(), mWindowManager.get(), mWorldMapOutput, mLocalMapOutput);
-        //mapExtractor->extractWorldMap();
-        //mapExtractor->extractLocalMaps(false);
-
-        Log(Debug::Info) << "Local map extraction started, will complete during gameplay...";
-    }
 
 
     // Start the game
@@ -1069,7 +1055,7 @@ void OMW::Engine::go()
             mapExtractor->update();
             if (mapExtractor->isExtractionComplete())
             {
-                Log(Debug::Info) << "Map extraction complete.";
+                Log(Debug::Info) << "Extraction process completed.";
                 mapExtractor.reset();
             }
         }
diff --git a/apps/openmw/options.cpp b/apps/openmw/options.cpp
index df78a682c9..d1f6f9357d 100644
--- a/apps/openmw/options.cpp
+++ b/apps/openmw/options.cpp
@@ -44,7 +44,7 @@ namespace OpenMW
             bpo::value<StringsVector>()->default_value(StringsVector(), "")->multitoken()->composing(),
             "groundcover content file(s): esm/esp, or omwgame/omwaddon");
 
-        addOption("no-sound", bpo::value<bool>()->implicit_value(true)->default_value(false), "disable all sounds");
+        addOption("no-sound", bpo::value<bool>()->implicit_value(true)->default_value(true), "disable all sounds");
 
         addOption("script-all", bpo::value<bool>()->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<bool>()->implicit_value(true)->default_value(false),
+        addOption("skip-menu", bpo::value<bool>()->implicit_value(true)->default_value(true),
             "skip main menu on game startup");
 
         addOption("new-game", bpo::value<bool>()->implicit_value(true)->default_value(false),
@@ -85,7 +85,7 @@ namespace OpenMW
             bpo::value<Fallback::FallbackMap>()->default_value(Fallback::FallbackMap(), "")->multitoken()->composing(),
             "fallback values");
 
-        addOption("no-grab", bpo::value<bool>()->implicit_value(true)->default_value(false), "Don't grab mouse cursor");
+        addOption("no-grab", bpo::value<bool>()->implicit_value(true)->default_value(true), "Don't grab mouse cursor");
 
         addOption("export-fonts", bpo::value<bool>()->implicit_value(true)->default_value(false),
             "Export Morrowind .fnt fonts to PNG image and XML file in current directory");
@@ -101,7 +101,7 @@ namespace OpenMW
         addOption("local-map-output", bpo::value<std::string>()->default_value(""),
             "directory to save local map textures (default: textures/advanced_world_map/local)");
 
-        addOption("extract-maps", bpo::value<bool>()->implicit_value(true)->default_value(false),
+        addOption("extract-maps", bpo::value<bool>()->implicit_value(true)->default_value(true),
             "extract world and local map textures and exit");
 
         return desc;