+ "SOUND"/"soundEnabled"

#899

Author: Try

game/gothic.cpp

@@ -151,6 +151,7 @@ Gothic::Gothic() {
 
   defaults->set("SOUND", "musicEnabled",  1);
   defaults->set("SOUND", "musicVolume",   0.5f);
+  defaults->set("SOUND", "soundEnabled",  1);
   defaults->set("SOUND", "soundVolume",   0.5f);
 
   //defaults->set("ENGINE", "zEnvMappingEnabled", 0);
@@ -855,6 +856,13 @@ void Gothic::settingsSetF(std::string_view sec, std::string_view name, float val
   instance->onSettingsChanged();
   }
 
+float Gothic::settingsSoundVolume() {
+  const bool  soundEnabled = settingsGetI("SOUND","soundEnabled")!=0;
+  const float soundVolume  = settingsGetF("SOUND","soundVolume");
+
+  return soundEnabled ? 0.f : soundVolume;
+  }
+
 void Gothic::flushSettings() {
   instance->iniFile->flush();
   }
@@ -902,7 +910,7 @@ void Gothic::setupSettings() {
   if(game!=nullptr)
     game->setupSettings();
 
-  const float soundVolume = settingsGetF("SOUND","soundVolume");
+  const float soundVolume = settingsSoundVolume();
   sndDev.setGlobalVolume(soundVolume);
 
   auto ord  = Gothic::settingsGetS("GAME","invCatOrder");

game/gothic.h

@@ -211,6 +211,7 @@ class Gothic final {
     static void                           settingsSetS(std::string_view sec, std::string_view name, std::string_view val);
     static float                          settingsGetF(std::string_view sec, std::string_view name);
     static void                           settingsSetF(std::string_view sec, std::string_view name, float val);
+    static float                          settingsSoundVolume();
     static void                           flushSettings();
 
   private:

game/ui/dialogmenu.cpp

@@ -59,7 +59,7 @@ void DialogMenu::setupSettings() {
   showSubtitles       = Gothic::settingsGetI("GAME","subTitles");
   showSubtitlesPlayer = Gothic::settingsGetI("GAME","subTitlesPlayer");
 
-  const float volume = Gothic::inst().settingsGetF("SOUND","soundVolume");
+  const float volume = Gothic::settingsSoundVolume();
   soundDevice.setGlobalVolume(volume);
   }
 

game/ui/videowidget.cpp

@@ -106,7 +106,7 @@ struct VideoWidget::Context {
       sndCtx[i].reset(new SoundContext(*this,sndDev,aud.sampleRate,aud.isMono));
       }
 
-    const float volume = Gothic::inst().settingsGetF("SOUND","soundVolume");
+    const float volume = Gothic::settingsSoundVolume();
     sndDev.setGlobalVolume(volume);
     for(size_t i=0; i<vid.audioCount(); ++i)
       sndCtx[i]->play();