[Scummvm-git-logs] scummvm master -> 497e1a1e85bbf96239d4b254fb32b7f1c6596588

[a-yyg]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
36feb1c271 SAGA2: Sync music volume on construction
497e1a1e85 SAGA2: Fix volume quantization


Commit: 36feb1c27162b1868f9b3a92d482435f38ab45c9
    https://github.com/scummvm/scummvm/commit/36feb1c27162b1868f9b3a92d482435f38ab45c9
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-07-29T19:40:13+09:00

Commit Message:
SAGA2: Sync music volume on construction

Changed paths:
    engines/saga2/music.cpp


diff --git a/engines/saga2/music.cpp b/engines/saga2/music.cpp
index 40d0d29e9c..2c4d1e2e72 100644
--- a/engines/saga2/music.cpp
+++ b/engines/saga2/music.cpp
@@ -78,6 +78,8 @@ Music::Music(hResContext *musicRes) : _musicContext(musicRes), _parser(0) {
 	_currentMusicBuffer = nullptr;
 
 	_trackNumber = 0;
+
+	syncSoundSettings();
 }
 
 Music::~Music() {


Commit: 497e1a1e85bbf96239d4b254fb32b7f1c6596588
    https://github.com/scummvm/scummvm/commit/497e1a1e85bbf96239d4b254fb32b7f1c6596588
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-07-29T19:40:14+09:00

Commit Message:
SAGA2: Fix volume quantization

Changed paths:
    engines/saga2/uidialog.cpp


diff --git a/engines/saga2/uidialog.cpp b/engines/saga2/uidialog.cpp
index 6d69cb65cf..9a0d268da4 100644
--- a/engines/saga2/uidialog.cpp
+++ b/engines/saga2/uidialog.cpp
@@ -1762,7 +1762,7 @@ inline int16 quantizedVolume(uint16 trueVolume) {
 	int16 quantized = trueVolume & 0xFFF8;
 	quantized += (quantized / 16);
 
-	quantized += 2; // In ScummVM the range is 0..255
+	quantized = CLIP(quantized, (int16)0, (int16)255);
 
 	return quantized;
 }