From c8077925ccc5c957b408acb37195c6ea0675c3db Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sat, 1 Mar 2008 03:59:56 +0000
Subject: Fix subtitle regressions in DOS Floppy demo of Simon the Sorcerer 1.

svn-id: r31015
---
 engines/agos/draw.cpp   | 10 +++++-----
 engines/agos/string.cpp |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/agos/draw.cpp b/engines/agos/draw.cpp
index 0eb42c1bc3..737f5317af 100644
--- a/engines/agos/draw.cpp
+++ b/engines/agos/draw.cpp
@@ -100,7 +100,7 @@ void AGOSEngine_Feeble::animateSpritesByY() {
 
 		vsp = &_vgaSprites[slot];
 
-		vsp->windowNum &= 0x7FFF;
+		vsp->windowNum &= ~0x8000;
 
 		vpe = &_vgaBufferPointers[vsp->zoneNum];
 		_curVgaFile1 = vpe->vgaFile1;
@@ -134,7 +134,7 @@ void AGOSEngine_Feeble::animateSprites() {
 
 	vsp = _vgaSprites;
 	while (vsp->id) {
-		vsp->windowNum &= 0x7FFF;
+		vsp->windowNum &= ~0x8000;
 
 		vpe = &_vgaBufferPointers[vsp->zoneNum];
 		_curVgaFile1 = vpe->vgaFile1;
@@ -211,7 +211,7 @@ void AGOSEngine::animateSprites() {
 			continue;
 		}
 
-		vsp->windowNum &= 0x7FFF;
+		vsp->windowNum &= ~0x8000;
 
 		vpe = &_vgaBufferPointers[vsp->zoneNum];
 		_curVgaFile1 = vpe->vgaFile1;
@@ -446,7 +446,7 @@ void AGOSEngine::restoreBackGround() {
 			continue;
 		}
 
-		_windowNum = animTable->windowNum & 0x7FFF;
+		_windowNum = animTable->windowNum & ~0x8000;
 
 		VC10_state state;
 		state.srcPtr  = animTable->srcPtr;
@@ -840,7 +840,7 @@ void AGOSEngine::slowFadeIn() {
 	uint8 *src, *dst;
 	int c, p;
 
-	_fastFadeInFlag &= 0x7fff;
+	_fastFadeInFlag &= ~0x8000;
 	_paletteFlag = false;
 
 	memset(_videoBuf1, 0, 1024);
diff --git a/engines/agos/string.cpp b/engines/agos/string.cpp
index dbfa36279b..84bcbf5d28 100644
--- a/engines/agos/string.cpp
+++ b/engines/agos/string.cpp
@@ -365,6 +365,8 @@ void AGOSEngine::printScreenText(uint vgaSpriteId, uint color, const char *strin
 	}
 
 	uint16 windowNum = (!getBitFlag(133)) ? 3 : 4;
+	if (getGameType() == GType_SIMON1 && (getFeatures() & GF_DEMO))
+		windowNum = 4;
 
 	x /= 8;
 	if (y < 2)
-- 
cgit v1.2.3