[Scummvm-cvs-logs] SF.net SVN: scummvm: [31015] scummvm/trunk/engines/agos

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Sat Mar 1 04:59:56 CET 2008


Revision: 31015
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31015&view=rev
Author:   Kirben
Date:     2008-02-29 19:59:56 -0800 (Fri, 29 Feb 2008)

Log Message:
-----------
Fix subtitle regressions in DOS Floppy demo of Simon the Sorcerer 1.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/draw.cpp
    scummvm/trunk/engines/agos/string.cpp

Modified: scummvm/trunk/engines/agos/draw.cpp
===================================================================
--- scummvm/trunk/engines/agos/draw.cpp	2008-02-29 22:24:52 UTC (rev 31014)
+++ scummvm/trunk/engines/agos/draw.cpp	2008-03-01 03:59:56 UTC (rev 31015)
@@ -100,7 +100,7 @@
 
 		vsp = &_vgaSprites[slot];
 
-		vsp->windowNum &= 0x7FFF;
+		vsp->windowNum &= ~0x8000;
 
 		vpe = &_vgaBufferPointers[vsp->zoneNum];
 		_curVgaFile1 = vpe->vgaFile1;
@@ -134,7 +134,7 @@
 
 	vsp = _vgaSprites;
 	while (vsp->id) {
-		vsp->windowNum &= 0x7FFF;
+		vsp->windowNum &= ~0x8000;
 
 		vpe = &_vgaBufferPointers[vsp->zoneNum];
 		_curVgaFile1 = vpe->vgaFile1;
@@ -211,7 +211,7 @@
 			continue;
 		}
 
-		vsp->windowNum &= 0x7FFF;
+		vsp->windowNum &= ~0x8000;
 
 		vpe = &_vgaBufferPointers[vsp->zoneNum];
 		_curVgaFile1 = vpe->vgaFile1;
@@ -446,7 +446,7 @@
 			continue;
 		}
 
-		_windowNum = animTable->windowNum & 0x7FFF;
+		_windowNum = animTable->windowNum & ~0x8000;
 
 		VC10_state state;
 		state.srcPtr  = animTable->srcPtr;
@@ -840,7 +840,7 @@
 	uint8 *src, *dst;
 	int c, p;
 
-	_fastFadeInFlag &= 0x7fff;
+	_fastFadeInFlag &= ~0x8000;
 	_paletteFlag = false;
 
 	memset(_videoBuf1, 0, 1024);

Modified: scummvm/trunk/engines/agos/string.cpp
===================================================================
--- scummvm/trunk/engines/agos/string.cpp	2008-02-29 22:24:52 UTC (rev 31014)
+++ scummvm/trunk/engines/agos/string.cpp	2008-03-01 03:59:56 UTC (rev 31015)
@@ -365,6 +365,8 @@
 	}
 
 	uint16 windowNum = (!getBitFlag(133)) ? 3 : 4;
+	if (getGameType() == GType_SIMON1 && (getFeatures() & GF_DEMO))
+		windowNum = 4;
 
 	x /= 8;
 	if (y < 2)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list