Ticket #8689: sword1-options.diff

engines/sword1/sword1.cpp

@@ -238 +238 @@
         _logic = new Logic(_objectMan, _resMan, _screen, _mouse, _sound, _music, _menu, _system, _mixer);
         _mouse->useLogicAndMenu(_logic, _menu);
 
-        uint musicVol = ConfMan.getInt("music_volume");
-        uint speechVol = ConfMan.getInt("speech_volume");
-        uint sfxVol = ConfMan.getInt("sfx_volume");
-        if (musicVol > 255)
-                musicVol = 255;
-        if (speechVol > 255)
-                speechVol = 255;
-        if (sfxVol > 255)
-                sfxVol = 255;
+        uint musicVolL, musicVolR;
+        uint speechVolL, speechVolR;
+        uint sfxVolL, sfxVolR;
 
-        _music->setVolume(musicVol, musicVol);      // these routines expect left and right volume,
-        _sound->setSpeechVol(speechVol, speechVol); // but our config manager doesn't support it.
-        _sound->setSfxVol(sfxVol, sfxVol);
+        getVolumeFromConfig("music_volume", musicVolL, musicVolR);
+        getVolumeFromConfig("speech_volume", speechVolL, speechVolR);
+        getVolumeFromConfig("sfx_volume", sfxVolL, sfxVolR);    
+        
+        _music->setVolume(musicVolL, musicVolR);
+        _sound->setSpeechVol(speechVolL, speechVolR);
+        _sound->setSfxVol(sfxVolL, sfxVolR);
 
         _systemVars.justRestoredGame = 0;
         _systemVars.currentCD = 0;
@@ -295 +293 @@
         return 0;
 }
 
+void SwordEngine::getVolumeFromConfig(Common::String prefix, uint &volL, uint &volR) {
+        // There might not be any sensible way of doing this. Any user who have
+        // changed the volume settings both with the ScummVM options dialog and
+        // the Broken Sword 1 options dialog will almost certainly have brought
+        // them out of sync.
+        if (ConfMan.hasKey(prefix, ConfMan.getActiveDomainName())) {
+                // If we have the standard setting specifically for this game,
+                // use that.
+                volL = volR = ConfMan.getInt(prefix, ConfMan.getActiveDomainName());
+        } else {
+                // If we have the left/right settings, which are almost
+                // certainly made by the Broken Sword 1 options dialog, use
+                // them. Otherwise, use the default settings.
+                if (ConfMan.hasKey(prefix + "_left")) {
+                        volL = ConfMan.getInt(prefix + "_left");
+                } else {
+                        volL = ConfMan.getInt(prefix);
+                }
+                if (ConfMan.hasKey(prefix + "_right")) {
+                        volR = ConfMan.getInt(prefix + "_right");
+                } else {
+                        volR = ConfMan.getInt(prefix);
+                }
+        }
+        if (volL > 255)
+                volL = 255;
+        if (volR > 255)
+                volR = 255;
+}
+
 void SwordEngine::reinitialize(void) {
         _resMan->flush(); // free everything that's currently alloced and opened. (*evil*)
 

engines/sword1/control.h

@@ -108 +108 @@
         uint8 handleButtonClick(uint8 id, uint8 mode, uint8 *retVal);
         void handleVolumeClicks(void);
         void changeVolume(uint8 id, uint8 action);
+        void saveVolume(Common::String prefix, uint8 left, uint8 right);
 
         void setupMainPanel(void);
         void setupSaveRestorePanel(bool saving);

engines/sword1/control.cpp

@@ -24 +24 @@
  */
 
 #include "common/stdafx.h"
+#include "common/config-manager.h"
 #include "common/file.h"
 #include "common/util.h"
 #include "common/savefile.h"
@@ -309 +310 @@
                 delay(1000 / 12);
                 newMode = getClicks(mode, &retVal);
         } while ((newMode != BUTTON_DONE) && (retVal == 0) && (!SwordEngine::_systemVars.engineQuit));
+        if (SwordEngine::_systemVars.controlPanelMode == CP_NORMAL) {
+                uint8 volL, volR;
+                _music->giveVolume(&volL, &volR);
+                saveVolume("music_volume", volL, volR);
+                _sound->giveSpeechVol(&volL, &volR);
+                saveVolume("speech_volume", volL, volR);
+                _sound->giveSfxVol(&volL, &volR);
+                saveVolume("sfx_volume", volL, volR);
+                ConfMan.setBool("subtitles", SwordEngine::_systemVars.showText);
+                ConfMan.flushToDisk();
+        }
         destroyButtons();
         _resMan->resClose(fontId);
         _resMan->resClose(redFontId);
@@ -606 +618 @@
         renderVolumeBar(id, volL, volR);
 }
 
+void Control::saveVolume(Common::String prefix, uint8 volL, uint8 volR) {
+        // We save either the left/right volume or the main one. Never both.
+        if (volL == volR) {
+                ConfMan.removeKey(prefix + "_left", ConfMan.getActiveDomainName());
+                ConfMan.removeKey(prefix + "_right", ConfMan.getActiveDomainName());
+                ConfMan.setInt(prefix, volL);
+        } else {
+                ConfMan.setInt(prefix + "_left", volL);
+                ConfMan.setInt(prefix + "_right", volR);
+                ConfMan.removeKey(prefix, ConfMan.getActiveDomainName());
+        }
+}
+
 bool Control::getConfirm(const uint8 *title) {
         ControlButton *panel = new ControlButton(0, 0, SR_CONFIRM, 0, 0, _resMan, _screenBuf, _system);
         panel->draw();

engines/sword1/sword1.h

@@ -88 +88 @@
         void checkCdFiles(void);
         void checkCd(void);
         void showFileErrorMsg(uint8 type, bool *fileExists);
+        void getVolumeFromConfig(Common::String prefix, uint &volL, uint &volR);
         void flagsToBool(bool *dest, uint8 flags);
         uint8 mainLoop(void);