[Scummvm-git-logs] scummvm master -> 685e11d346730f2fddeda00f88005bb4bc611536

[alxpnv]

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

Summary:
def627e510 ASYLUM: fix GCC warnings
685e11d346 ASYLUM: fix setting global flags in PlaySpeechScene2 opcode


Commit: def627e5101fa820433379894b90a912a243d5f4
    https://github.com/scummvm/scummvm/commit/def627e5101fa820433379894b90a912a243d5f4
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-06-15T16:00:11+03:00

Commit Message:
ASYLUM: fix GCC warnings

Changed paths:
    engines/asylum/system/screen.cpp


diff --git a/engines/asylum/system/screen.cpp b/engines/asylum/system/screen.cpp
index 5995954937..3f4017de8c 100644
--- a/engines/asylum/system/screen.cpp
+++ b/engines/asylum/system/screen.cpp
@@ -946,7 +946,7 @@ void Screen::blitMasked(GraphicFrame *frame, Common::Rect *source, byte *maskDat
 	byte *mirroredBuffer = NULL;
 	int16 frameRight = frame->surface.pitch;
 	uint16 maskHeight = (uint16)sourceMask->height(); // for debugging only
-	byte nSkippedBits = sourceMask->left % 8;
+	byte nSkippedBits = ABS(sourceMask->left) % 8;
 
 	// Prepare temporary source buffer if needed
 	if (flags & kDrawFlagMirrorLeftRight) {
@@ -996,7 +996,7 @@ void Screen::blitMasked(GraphicFrame *frame, Common::Rect *source, byte *maskDat
 	}
 
 	if (destination->left > destMask->left) {
-		nSkippedBits += (destination->left - destMask->left) % 8;
+		nSkippedBits += ABS(destination->left - destMask->left) % 8;
 		maskBufferPtr += (destination->left - destMask->left) / 8 + nSkippedBits / 8;
 		nSkippedBits %= 8;
 		sourceMask->setWidth(sourceMask->width() + destMask->left - destination->left);


Commit: 685e11d346730f2fddeda00f88005bb4bc611536
    https://github.com/scummvm/scummvm/commit/685e11d346730f2fddeda00f88005bb4bc611536
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-06-15T16:00:11+03:00

Commit Message:
ASYLUM: fix setting global flags in PlaySpeechScene2 opcode

Changed paths:
    engines/asylum/resources/script.cpp


diff --git a/engines/asylum/resources/script.cpp b/engines/asylum/resources/script.cpp
index 5d2d337009..b679db29f4 100644
--- a/engines/asylum/resources/script.cpp
+++ b/engines/asylum/resources/script.cpp
@@ -1415,8 +1415,8 @@ IMPLEMENT_OPCODE(PlaySpeechScene2)
 		cmd->param5 = 2;
 
 		if (cmd->param7) {
-			getSharedData()->setFlag(kFlag1, false);
-			getSharedData()->setFlag(kFlag2, false);
+			getSharedData()->setFlag(kFlag1, true);
+			getSharedData()->setFlag(kFlag2, true);
 		}
 
 		_processNextEntry = true;