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

[Kirben at users.sourceforge.net]

Revision: 26969
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26969&view=rev
Author:   Kirben
Date:     2007-05-27 04:46:42 -0700 (Sun, 27 May 2007)

Log Message:
-----------
Add minor code differences in Elvira 2 and Waxworks.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/vga.cpp
    scummvm/trunk/engines/agos/window.cpp

Modified: scummvm/trunk/engines/agos/vga.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga.cpp	2007-05-27 11:45:54 UTC (rev 26968)
+++ scummvm/trunk/engines/agos/vga.cpp	2007-05-27 11:46:42 UTC (rev 26969)
@@ -1258,8 +1258,10 @@
 	palptr[2] = ((color & 0x00f) >> 0) * 32;
 	palptr[3] = 0;
 
-	_paletteFlag = 2;
-	_vgaSpriteChanged++;
+	if (_lockWord & 0x20) {
+		_paletteFlag = 1;
+		_displayScreen++;
+	}
 }
 
 void AGOSEngine::vc38_ifVarNotZero() {

Modified: scummvm/trunk/engines/agos/window.cpp
===================================================================
--- scummvm/trunk/engines/agos/window.cpp	2007-05-27 11:45:54 UTC (rev 26968)
+++ scummvm/trunk/engines/agos/window.cpp	2007-05-27 11:46:42 UTC (rev 26969)
@@ -123,6 +123,10 @@
 			dst += _screenWidth;
 		}
 	} else {
+		dst = getFrontBuf() + _dxSurfacePitch * (window->y) + window->x * 8;
+		h = window->height * 8;
+		w = window->width * 8;
+
 		if (getGameType() == GType_ELVIRA2 && window->y == 146) {
 			if (window->fill_color == 1) {
 				_displayPalette[33 * 4 + 0] = 48 * 4;
@@ -134,13 +138,12 @@
 				_displayPalette[33 * 4 + 2] = 40 * 4;
 			}
 
-			_paletteFlag = 2;
+			dst -= _dxSurfacePitch;
+			h += 2;
+
+			_paletteFlag = 1;
 		}
 
-		dst = getFrontBuf() + _dxSurfacePitch * window->y + window->x * 8;
-		h = window->height * 8;
-		w = window->width * 8;
-
 		uint8 color = window->fill_color;
 		if (getGameType() == GType_ELVIRA2 || getGameType() == GType_WW)
 			color += dst[0] & 0xF0;


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