[Scummvm-git-logs] scummvm master -> 2b7b9ec51813dec33eb669ea59d1560e01e7dfd0

[csnover]

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:
5fa0e4b780 SCI32: Improve GK1 narrator speech sync
2c1a8790b3 SCI32: Fix wrong GK1 sound volume sync
2b7b9ec518 SCI32: Remove duplicate call


Commit: 5fa0e4b780db5e2af1df9709803c53e5ffa86bb4
    https://github.com/scummvm/scummvm/commit/5fa0e4b780db5e2af1df9709803c53e5ffa86bb4
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-07-16T21:25:27-05:00

Commit Message:
SCI32: Improve GK1 narrator speech sync

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 6d9bb20..d4a2f13 100644
--- a/engines/sci/engine/guest_additions.cpp
+++ b/engines/sci/engine/guest_additions.cpp
@@ -604,12 +604,13 @@ void GuestAdditions::syncMessageTypeFromScummVMUsingDefaultStrategy() const {
 		_state->variables[VAR_GLOBAL][kGlobalVarMessageType] = make_reg(0, value);
 	}
 
-	if (g_sci->getGameId() == GID_GK1) {
-		if (value == kMessageTypeSubtitles) {
-			_state->variables[VAR_GLOBAL][kGlobalVarGK1NarratorMode] = NULL_REG;
-		} else if (value == kMessageTypeSpeech) {
-			_state->variables[VAR_GLOBAL][kGlobalVarGK1NarratorMode] = TRUE_REG;
-		}
+	if (g_sci->getGameId() == GID_GK1 && value == kMessageTypeSubtitles) {
+		// The narrator speech needs to be forced off if speech has been
+		// disabled in ScummVM, but otherwise the narrator toggle should just
+		// be allowed to persist to whatever the user chose previously, since
+		// it is controlled independently of other speech in the game and there
+		// is no equivalent option in the ScummVM GUI
+		_state->variables[VAR_GLOBAL][kGlobalVarGK1NarratorMode] = NULL_REG;
 	}
 }
 


Commit: 2c1a8790b3967d2a39f433c2978c28b750e961f5
    https://github.com/scummvm/scummvm/commit/2c1a8790b3967d2a39f433c2978c28b750e961f5
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-07-16T21:25:27-05:00

Commit Message:
SCI32: Fix wrong GK1 sound volume sync

Fixes Trac#9793.

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 d4a2f13..e5c2416 100644
--- a/engines/sci/engine/guest_additions.cpp
+++ b/engines/sci/engine/guest_additions.cpp
@@ -841,7 +841,7 @@ void GuestAdditions::syncGK1StartupVolumeFromScummVM(const int index, const reg_
 		}
 
 		case kSoundsSoundType: {
-			volume = (ConfMan.getInt("sound_volume") + 1) * MUSIC_VOLUME_MAX / Audio::Mixer::kMaxMixerVolume;
+			volume = (ConfMan.getInt("sfx_volume") + 1) * MUSIC_VOLUME_MAX / Audio::Mixer::kMaxMixerVolume;
 			selector = SELECTOR(soundVolume);
 			break;
 		}


Commit: 2b7b9ec51813dec33eb669ea59d1560e01e7dfd0
    https://github.com/scummvm/scummvm/commit/2b7b9ec51813dec33eb669ea59d1560e01e7dfd0
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-07-16T21:25:27-05:00

Commit Message:
SCI32: Remove duplicate call

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 e5c2416..873152b 100644
--- a/engines/sci/engine/guest_additions.cpp
+++ b/engines/sci/engine/guest_additions.cpp
@@ -851,7 +851,6 @@ void GuestAdditions::syncGK1StartupVolumeFromScummVM(const int index, const reg_
 		}
 
 		writeSelectorValue(_segMan, value, selector, volume);
-		writeSelectorValue(_segMan, value, selector, volume);
 	}
 }