[Scummvm-git-logs] scummvm master -> 15700fc001932ffdc54787e53d8d0a72cfabed4e

[sluicebox]

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:
15700fc001 SCI: Exclude GK1/QFG4 sync when SCI32 disabled


Commit: 15700fc001932ffdc54787e53d8d0a72cfabed4e
    https://github.com/scummvm/scummvm/commit/15700fc001932ffdc54787e53d8d0a72cfabed4e
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2019-03-27T12:54:11-07:00

Commit Message:
SCI: Exclude GK1/QFG4 sync when SCI32 disabled

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 893aaef..f07fb4c 100644
--- a/engines/sci/engine/guest_additions.cpp
+++ b/engines/sci/engine/guest_additions.cpp
@@ -839,6 +839,7 @@ void GuestAdditions::syncMessageTypeFromScummVMUsingDefaultStrategy() const {
 		_state->variables[VAR_GLOBAL][kGlobalVarMessageType] = make_reg(0, value);
 	}
 
+#ifdef ENABLE_SCI32
 	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
@@ -859,6 +860,7 @@ void GuestAdditions::syncMessageTypeFromScummVMUsingDefaultStrategy() const {
 			_state->variables[VAR_GLOBAL][globalNumber] &= (int16)~0x8000;
 		}
 	}
+#endif
 }
 
 #ifdef ENABLE_SCI32