Ticket #8689: sword1-balance.diff

control.cpp

@@ -310 +310 @@
                 delay(1000 / 12);
                 newMode = getClicks(mode, &retVal);
         } while ((newMode != BUTTON_DONE) && (retVal == 0) && (!SwordEngine::_systemVars.engineQuit));
+        if (SwordEngine::_systemVars.controlPanelMode == CP_NORMAL && !SwordEngine::_systemVars.engineQuit) {
+                uint8 volL, volR;
+                _music->giveVolume(&volL, &volR);
+                ConfMan.setInt("music_volume", (int)((volR + volL) / 2));
+                if (volR + volL == 0) {
+                        ConfMan.setInt("music_balance", 50);
+                } else {
+                        ConfMan.setInt("music_balance", (int)(100 * volL / (volR + volL)));
+                }
+                _sound->giveSpeechVol(&volL, &volR);
+                ConfMan.setInt("speech_volume", (int)((volR + volL) / 2));
+                if (volR + volL == 0) {
+                        ConfMan.setInt("speech_balance", 50);
+                } else {
+                        ConfMan.setInt("speech_balance", (int)(100 * volL / (volR + volL)));
+                }
+                _sound->giveSfxVol(&volL, &volR);
+                ConfMan.setInt("sfx_volume", (int)((volR + volL) / 2));
+                if (volR + volL == 0) {
+                        ConfMan.setInt("sfx_balance", 50);
+                } else {
+                        ConfMan.setInt("sfx_balance", (int)(100 * volL / (volR + volL)));
+                }
+                ConfMan.setBool("subtitles", SwordEngine::_systemVars.showText == 1);
+                ConfMan.flushToDisk();
+        }
         destroyButtons();
         _resMan->resClose(fontId);
         _resMan->resClose(redFontId);

sword1.cpp

@@ -241 +241 @@
         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 musicBal = 50;
+        if (ConfMan.hasKey("music_balance")) {
+                musicBal = ConfMan.getInt("music_balance");
+        }
+        uint speechBal = 50;
+        if (ConfMan.hasKey("speech_balance")) {
+                speechBal = ConfMan.getInt("speech_balance");
+        }
+        uint sfxBal = 50;
+        if (ConfMan.hasKey("sfx_balance")) {
+                sfxBal = ConfMan.getInt("sfx_balance");
+        }
+        uint musicVolR = musicVol;
+        if (musicBal < 100) {
+                musicVolR = 2 * musicVol * (1 - (float)musicBal / 100);
+        }
+        uint musicVolL = 2 * musicVol - musicVolR;
+        uint speechVolR = speechVol;
+        if (speechBal < 100) {
+                speechVolR = 2 * speechVol * (1 - (float)speechBal / 100);
+        }
+        uint speechVolL = 2 * speechVol - speechVolR;
+        uint sfxVolR = sfxVol;
+        if (speechBal < 100) {
+                sfxVolR = 2 * sfxVol * (1 - (float)sfxBal / 100);
+        }
+        uint sfxVolL = 2 * sfxVol - sfxVolR;
+        if (musicVolR > 255) {
+                musicVolR = 255;
+        }
+        if (musicVolL > 255) {
+                musicVolL = 255;
+        }
+        if (speechVolR > 255) {
+                speechVolR = 255;
+        }
+        if (speechVolL > 255) {
+                speechVolL = 255;
+        }
+        if (sfxVolR > 255) {
+                sfxVolR = 255;
+        }
+        if (sfxVolL > 255) {
+                sfxVolL = 255;
+        }
 
-        _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);
+        _music->setVolume(musicVolL, musicVolR);
+        _sound->setSpeechVol(speechVolL, speechVolR);
+        _sound->setSfxVol(sfxVolL, sfxVolR);
 
         _systemVars.justRestoredGame = 0;
         _systemVars.currentCD = 0;