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

sluicebox 22204938+sluicebox at users.noreply.github.com
Wed Aug 14 17:32:02 CEST 2019


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:
aea7da4410 SCI: Fix Macintosh kDrawPic mirror flag handling


Commit: aea7da44109140ed58c841d2d856fa24cd0617e9
    https://github.com/scummvm/scummvm/commit/aea7da44109140ed58c841d2d856fa24cd0617e9
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2019-08-14T08:29:12-07:00

Commit Message:
SCI: Fix Macintosh kDrawPic mirror flag handling

Fixes the KQ6 Mac peppermint cave room

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


diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index a050310..7294bb1 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -563,8 +563,13 @@ reg_t kDrawPic(EngineState *s, int argc, reg_t *argv) {
 		if (flags & K_DRAWPIC_FLAGS_ANIMATIONBLACKOUT)
 			animationBlackoutFlag = true;
 		animationNr = flags & 0xFF;
-		if (flags & K_DRAWPIC_FLAGS_MIRRORED)
-			mirroredFlag = true;
+		// Mac interpreters ignored the mirrored flag and didn't mirror pics.
+		//  KQ6 PC room 390 drew pic 390 mirrored so Mac added pic 395, which
+		//  is a mirror of 390, but the script continued to pass this flag.
+		if (g_sci->getPlatform() != Common::kPlatformMacintosh) {
+			if (flags & K_DRAWPIC_FLAGS_MIRRORED)
+				mirroredFlag = true;
+		}
 	}
 	if (argc >= 3) {
 		if (!argv[2].isNull())





More information about the Scummvm-git-logs mailing list