[Scummvm-cvs-logs] SF.net SVN: scummvm: [24302] scummvm/trunk

[kirben at users.sourceforge.net]

Revision: 24302
          http://svn.sourceforge.net/scummvm/?rev=24302&view=rev
Author:   kirben
Date:     2006-10-13 20:14:47 -0700 (Fri, 13 Oct 2006)

Log Message:
-----------
Fix introduction of WW

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

Modified: scummvm/trunk/common/file.cpp
===================================================================
--- scummvm/trunk/common/file.cpp	2006-10-14 01:18:49 UTC (rev 24301)
+++ scummvm/trunk/common/file.cpp	2006-10-14 03:14:47 UTC (rev 24302)
@@ -217,7 +217,7 @@
 		_handle = fopenNoCase(filename, "", modeStr);
 	} else if (_filesMap && _filesMap->contains(fname)) {
 		fname = (*_filesMap)[fname];
-		debug(3, "Opening hashed: %s", fname.c_str());
+		debug(0, "Opening hashed: %s", fname.c_str());
 		_handle = fopen(fname.c_str(), modeStr);
 	} else if (_filesMap && _filesMap->contains(fname + ".")) {
 		// WORKAROUND: Bug #1458388: "SIMON1: Game Detection fails"

Modified: scummvm/trunk/engines/agos/vga.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga.cpp	2006-10-14 01:18:49 UTC (rev 24301)
+++ scummvm/trunk/engines/agos/vga.cpp	2006-10-14 03:14:47 UTC (rev 24302)
@@ -2619,22 +2619,22 @@
 
 	if (a == 6) {
 		src = _curVgaFile2 + 800;
-		dst = getBackBuf();
+		dst = getFrontBuf();
 		memcpy(dst, src, 64000);
-		tmp = 4;
+		tmp = 4 - 1;
 	} else {
-		tmp = a;
+		tmp = a - 1;
 	}
 
-	src = _curVgaFile2 + 3360;
-	while (tmp--) {
-		src += 1712;
-	}
+	src = _curVgaFile2 + 3840 * 16 + 3360;
+	while (tmp--)
+		src += 1536 * 16 + 1712;
 
+
 	src += 800;
 
 	if (a != 5) {
-		dst = getBackBuf() + 7448;
+		dst = getFrontBuf() + 7448;
 		for (h = 0; h < 177; h++) {
 			memcpy(dst, src, 144);
 			src += 144;
@@ -2644,10 +2644,10 @@
 		if (a != 6)
 			return;
 
-		src += 15344;
+		src = _curVgaFile2 + 9984 * 16 + 15344;
 	}
 
-	dst = getBackBuf() + 50296;
+	dst = getFrontBuf() + 50296;
 	for (h = 0; h < 17; h++) {
 		memcpy(dst, src, 208);
 		src += 208;
@@ -2656,9 +2656,18 @@
 
 	if (a == 6) {
 		//fullFade();
+		src = _curVgaFile2 + 32;
+
+		uint8 palette[1024];
+		for (int i = 0; i < 256; i++) {
+			palette[i * 4 + 0] = *src++ * 4;
+			palette[i * 4 + 1] = *src++ * 4;
+			palette[i * 4 + 2] = *src++ * 4;
+			palette[i * 4 + 3] = 0;
+		}
+
+		_system->setPalette(palette, 0, 256);
 	}
-
-	debug(0, "vc61: stub (%d)", a);
 }
 
 void AGOSEngine::vc61_setMaskImage() {


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