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

[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:
020b30abde VCRUISE: Fix inventory not rendering after cutscene.
f761228f3e VCRUISE: Fix crash when executing music volume ramp while music is muted
fab95bdea1 VCRUISE: Fix music mute not persisting through save states


Commit: 020b30abdefd059bdc8038f9a667bdcad455b368
    https://github.com/scummvm/scummvm/commit/020b30abdefd059bdc8038f9a667bdcad455b368
Author: elasota (1137273+elasota at users.noreply.github.com)
Date: 2024-01-29T20:16:40-05:00

Commit Message:
VCRUISE: Fix inventory not rendering after cutscene.

Changed paths:
    engines/vcruise/runtime.cpp


diff --git a/engines/vcruise/runtime.cpp b/engines/vcruise/runtime.cpp
index 21c2d613b14..be0de881e27 100644
--- a/engines/vcruise/runtime.cpp
+++ b/engines/vcruise/runtime.cpp
@@ -2217,7 +2217,7 @@ void Runtime::terminateScript() {
 			return;
 	}
 
-	drawCompass();
+	redrawTray();
 
 	if (exitToMenu && _gameState == kGameStateIdle) {
 		quitToMenu();
@@ -4671,7 +4671,9 @@ bool Runtime::isTrayVisible() const {
 		// This is important in some situations, e.g. after "reuniting" with Hannah in the lower temple, if you go left,
 		// a ghost will give you a key.  Since that animation has sound, you'll return to idle in that animation,
 		// which will keep the tray hidden because it has sound.
-		if (_gameID == GID_REAH && _loadedAnimationHasSound)
+		//
+		// Ignore this condition if we're at the last frame (fixes inventory not drawing after trading weights in Reah)
+		if (_gameID == GID_REAH && _loadedAnimationHasSound && _animDisplayingFrame != _animLastFrame)
 			return false;
 
 		// Don't display tray during the intro cinematic.


Commit: f761228f3ebb2d15dbe200606fd0bd8d9ab30024
    https://github.com/scummvm/scummvm/commit/f761228f3ebb2d15dbe200606fd0bd8d9ab30024
Author: elasota (1137273+elasota at users.noreply.github.com)
Date: 2024-01-29T20:16:40-05:00

Commit Message:
VCRUISE: Fix crash when executing music volume ramp while music is muted

Changed paths:
    engines/vcruise/runtime.cpp


diff --git a/engines/vcruise/runtime.cpp b/engines/vcruise/runtime.cpp
index be0de881e27..c7577b3cefd 100644
--- a/engines/vcruise/runtime.cpp
+++ b/engines/vcruise/runtime.cpp
@@ -3874,7 +3874,8 @@ void Runtime::updateSounds(uint32 timestamp) {
 			newVolume += static_cast<int32>(ramp);
 
 		if (newVolume != _musicVolume) {
-			_musicPlayer->setVolume(applyVolumeScale(newVolume));
+			if (_musicPlayer)
+				_musicPlayer->setVolume(applyVolumeScale(newVolume));
 			_musicVolume = newVolume;
 		}
 


Commit: fab95bdea1f66a1141845957c8029dd22e71aa26
    https://github.com/scummvm/scummvm/commit/fab95bdea1f66a1141845957c8029dd22e71aa26
Author: elasota (1137273+elasota at users.noreply.github.com)
Date: 2024-01-29T20:16:40-05:00

Commit Message:
VCRUISE: Fix music mute not persisting through save states

Changed paths:
    engines/vcruise/runtime.cpp


diff --git a/engines/vcruise/runtime.cpp b/engines/vcruise/runtime.cpp
index c7577b3cefd..c833f994cf2 100644
--- a/engines/vcruise/runtime.cpp
+++ b/engines/vcruise/runtime.cpp
@@ -5526,8 +5526,8 @@ void Runtime::restoreSaveGameSnapshot() {
 	_musicActive = mainState->musicActive;
 
 	if (_musicActive) {
-		bool musicMutedBeforeRestore = (_musicMute && _musicMuteDisabled);
-		bool musicMutedAfterRestore = (_musicMute && mainState->musicMuteDisabled);
+		bool musicMutedBeforeRestore = (_musicMute && !_musicMuteDisabled);
+		bool musicMutedAfterRestore = (_musicMute && !mainState->musicMuteDisabled);
 		bool isNewTrack = (_scoreTrack != mainState->scoreTrack);
 
 		_musicMuteDisabled = mainState->musicMuteDisabled;