[Scummvm-git-logs] scummvm master -> 14b3ed6414feee6c8f0bfe6a546b75c8f1b866b1

csnover csnover at users.noreply.github.com
Sat Sep 9 05:50:43 CEST 2017


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

Summary:
14b3ed6414 SCI32: Fix volume config when changing volume from in-game Phant2 controls


Commit: 14b3ed6414feee6c8f0bfe6a546b75c8f1b866b1
    https://github.com/scummvm/scummvm/commit/14b3ed6414feee6c8f0bfe6a546b75c8f1b866b1
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-08T22:49:28-05:00

Commit Message:
SCI32: Fix volume config when changing volume from in-game Phant2 controls

Changed paths:
    engines/sci/engine/guest_additions.cpp


diff --git a/engines/sci/engine/guest_additions.cpp b/engines/sci/engine/guest_additions.cpp
index b184887..0452cc2 100644
--- a/engines/sci/engine/guest_additions.cpp
+++ b/engines/sci/engine/guest_additions.cpp
@@ -1081,7 +1081,9 @@ void GuestAdditions::syncAudioVolumeGlobalsToScummVM(const int index, const reg_
 	case GID_PHANTASMAGORIA2:
 		if (index == kGlobalVarPhant2MasterVolume) {
 			const int16 masterVolume = value.toSint16() * Audio::Mixer::kMaxMixerVolume / Audio32::kMaxVolume;
+			ConfMan.setInt("music_volume", masterVolume);
 			ConfMan.setInt("sfx_volume", masterVolume);
+			ConfMan.setInt("speech_volume", masterVolume);
 		}
 		break;
 





More information about the Scummvm-git-logs mailing list