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

wjp wjp at usecode.org
Sun Feb 27 18:25:21 CET 2011


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:
d17a889400 SCI: Fix negative window origin alignment.


Commit: d17a88940078f573b843de5a9415feb5292dffc3
    https://github.com/scummvm/scummvm/commit/d17a88940078f573b843de5a9415feb5292dffc3
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-02-27T09:17:22-08:00

Commit Message:
SCI: Fix negative window origin alignment.

SSCI does a shr 1; shl 1 here in SetOrigin.
This fixes a crash in the ending scene of SQ3 (#3194199).

Changed paths:
    engines/sci/graphics/ports.cpp



diff --git a/engines/sci/graphics/ports.cpp b/engines/sci/graphics/ports.cpp
index 57c7612..b19a862 100644
--- a/engines/sci/graphics/ports.cpp
+++ b/engines/sci/graphics/ports.cpp
@@ -311,7 +311,7 @@ Window *GfxPorts::addWindow(const Common::Rect &dims, const Common::Rect *restor
 	// bit of the left dimension in their interpreter. It seems Sierra did it
 	// for EGA byte alignment (EGA uses 1 byte for 2 pixels) and left it in
 	// their interpreter even in the newer VGA games.
-	r.left = r.left & 0x7FFE;
+	r.left = r.left & 0xFFFE;
 
 	if (r.width() > _screen->getWidth()) {
 		// We get invalid dimensions at least at the end of sq3 (script bug!).






More information about the Scummvm-git-logs mailing list