[Scummvm-git-logs] scummvm master -> c7b2b9c33208fe01586c7cf660f507daa5ec7c72

[elasota]

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

Summary:
b8e4beafc5 VCRUISE: Fix wrong animation speed in rotate-to-play animations
0ae6fb3354 VCRUISE: Fix wrong music mute setting handling, flush config changes to disk when quitting
c7b2b9c332 VCRUISE: Fix incorrect volume sliders when the sound volume has never been changed


Commit: b8e4beafc56896fd2c34f3a1eb643710f1e762ed
    https://github.com/scummvm/scummvm/commit/b8e4beafc56896fd2c34f3a1eb643710f1e762ed
Author: elasota (ejlasota at gmail.com)
Date: 2023-05-28T09:44:22-04:00

Commit Message:
VCRUISE: Fix wrong animation speed in rotate-to-play animations

Changed paths:
    engines/vcruise/runtime_scriptexec.cpp


diff --git a/engines/vcruise/runtime_scriptexec.cpp b/engines/vcruise/runtime_scriptexec.cpp
index b1587f70b29..8c3431467af 100644
--- a/engines/vcruise/runtime_scriptexec.cpp
+++ b/engines/vcruise/runtime_scriptexec.cpp
@@ -267,7 +267,7 @@ void Runtime::scriptOpAnimN(ScriptArg_t arg) {
 	uint stopFrame = 0;
 	if (computeFaceDirectionAnimation(stackArgs[0], faceDirectionAnimDef, initialFrame, stopFrame)) {
 		_animStopFrame = stopFrame;
-		changeAnimation(*faceDirectionAnimDef, initialFrame, false);
+		changeAnimation(*faceDirectionAnimDef, initialFrame, false, _animSpeedRotation);
 		_gameState = kGameStateWaitingForFacing;
 	}
 


Commit: 0ae6fb335441d10d1479ce8d90d7c13f2e842f7c
    https://github.com/scummvm/scummvm/commit/0ae6fb335441d10d1479ce8d90d7c13f2e842f7c
Author: elasota (ejlasota at gmail.com)
Date: 2023-05-28T09:44:22-04:00

Commit Message:
VCRUISE: Fix wrong music mute setting handling, flush config changes to disk when quitting

Changed paths:
    engines/vcruise/runtime.cpp


diff --git a/engines/vcruise/runtime.cpp b/engines/vcruise/runtime.cpp
index 427fffaea47..3235c0ef5d3 100644
--- a/engines/vcruise/runtime.cpp
+++ b/engines/vcruise/runtime.cpp
@@ -1176,6 +1176,8 @@ bool Runtime::runFrame() {
 			moreActions = bootGame(true);
 			break;
 		case kGameStateQuit:
+			// Flush any settings changes made in-game
+			ConfMan.flushToDisk();
 			return false;
 		case kGameStateIdle:
 			moreActions = runIdle();
@@ -1247,7 +1249,7 @@ bool Runtime::bootGame(bool newGame) {
 	if (!ConfMan.hasKey("vcruise_increase_drag_distance") || ConfMan.hasKey("vcruise_increase_drag_distance"))
 		_lmbDragTolerance = 3;
 
-	if (ConfMan.hasKey("vcruise_mute_music") && !ConfMan.getBool("vcruise_mute_music"))
+	if (ConfMan.hasKey("vcruise_mute_music") && ConfMan.getBool("vcruise_mute_music"))
 		_musicMute = true;
 	else
 		_musicMute = false;


Commit: c7b2b9c33208fe01586c7cf660f507daa5ec7c72
    https://github.com/scummvm/scummvm/commit/c7b2b9c33208fe01586c7cf660f507daa5ec7c72
Author: elasota (ejlasota at gmail.com)
Date: 2023-05-28T09:52:21-04:00

Commit Message:
VCRUISE: Fix incorrect volume sliders when the sound volume has never been changed

Changed paths:
    engines/vcruise/menu.cpp


diff --git a/engines/vcruise/menu.cpp b/engines/vcruise/menu.cpp
index 4f895f584f9..eaab02a725b 100644
--- a/engines/vcruise/menu.cpp
+++ b/engines/vcruise/menu.cpp
@@ -710,13 +710,8 @@ void ReahSoundMenuPage::addPageContents() {
 		_menuInterface->commitRect(Common::Rect(0, 44, soundBG->w, 44 + soundBG->h));
 	}
 
-	int sndVol = 0;
-	if (ConfMan.hasKey("sfx_volume"))
-		sndVol = ConfMan.getInt("sfx_volume");
-
-	int musVol = 0;
-	if (ConfMan.hasKey("music_volume"))
-		musVol = ConfMan.getInt("music_volume");
+	int sndVol = ConfMan.getInt("sfx_volume");
+	int musVol = musVol = ConfMan.getInt("music_volume");
 
 	bool musicMute = false;
 	if (ConfMan.hasKey("vcruise_mute_music"))
@@ -805,13 +800,8 @@ void ReahSoundMenuPage::addPageContents() {
 }
 
 void ReahSoundMenuPage::onSettingsChanged() {
-	int sndVol = 0;
-	if (ConfMan.hasKey("sfx_volume"))
-		sndVol = ConfMan.getInt("sfx_volume");
-
-	int musVol = 0;
-	if (ConfMan.hasKey("music_volume"))
-		musVol = ConfMan.getInt("music_volume");
+	int sndVol = ConfMan.getInt("sfx_volume");
+	int musVol = ConfMan.getInt("music_volume");
 
 	bool musicMute = false;
 	if (ConfMan.hasKey("vcruise_mute_music"))