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

[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:
a1d950945f SCI: Add cast to prev commit to fix builds


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

Commit Message:
SCI: Add cast to prev commit to fix builds

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 b8d6334..893aaef 100644
--- a/engines/sci/engine/guest_additions.cpp
+++ b/engines/sci/engine/guest_additions.cpp
@@ -854,9 +854,9 @@ void GuestAdditions::syncMessageTypeFromScummVMUsingDefaultStrategy() const {
 		uint flagNumber = 400;
 		uint globalNumber = kGlobalVarQFG4Flags + (flagNumber / 16);
 		if (value & kMessageTypeSpeech) {
-			_state->variables[VAR_GLOBAL][globalNumber] |= 0x8000;
+			_state->variables[VAR_GLOBAL][globalNumber] |= (int16)0x8000;
 		} else {
-			_state->variables[VAR_GLOBAL][globalNumber] &= ~0x8000;
+			_state->variables[VAR_GLOBAL][globalNumber] &= (int16)~0x8000;
 		}
 	}
 }