[Scummvm-cvs-logs] scummvm master -> f94f48ae2bdd3ad596c6bdf6a9875461079d4a7b

[eriktorbjorn]

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:
f94f48ae2b AGOS: Fix invisibility in Amiga CD32 Simon the Sorcerer 1 demo


Commit: f94f48ae2bdd3ad596c6bdf6a9875461079d4a7b
    https://github.com/scummvm/scummvm/commit/f94f48ae2bdd3ad596c6bdf6a9875461079d4a7b
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2014-11-19T22:59:34+01:00

Commit Message:
AGOS: Fix invisibility in Amiga CD32 Simon the Sorcerer 1 demo

This probably affects the full version as well, but I haven't
verified that. Either way, the old code was obviously wrong while
the new makes it look right to me.

Changed paths:
    engines/agos/gfx.cpp



diff --git a/engines/agos/gfx.cpp b/engines/agos/gfx.cpp
index 33145b7..5a1f9f1 100644
--- a/engines/agos/gfx.cpp
+++ b/engines/agos/gfx.cpp
@@ -547,7 +547,7 @@ void AGOSEngine_Simon1::drawMaskedImage(VC10_state *state) {
 						if ((dst[count * 2] & 0xF0) == 0x20)
 							dst[count * 2] = src[count * 2];
 					if (mask[count + state->x_skip] & 0x0F)
-						if ((dst[count * 2 + 1] & 0x0F) == 0x20)
+						if ((dst[count * 2 + 1] & 0xF0) == 0x20)
 							dst[count * 2 + 1] = src[count * 2 + 1];
 				} else {
 					/* no transparency */