[Scummvm-cvs-logs] SF.net SVN: scummvm:[40705] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 40705
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40705&view=rev
Author:   lordhoto
Date:     2009-05-18 21:45:09 +0000 (Mon, 18 May 2009)

Log Message:
-----------
Preliminary support for LoL intro demo.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/detection.cpp
    scummvm/trunk/engines/kyra/script_tim.cpp
    scummvm/trunk/engines/kyra/sequences_lol.cpp
    scummvm/trunk/engines/kyra/wsamovie.cpp

Modified: scummvm/trunk/engines/kyra/detection.cpp
===================================================================
--- scummvm/trunk/engines/kyra/detection.cpp	2009-05-18 21:37:13 UTC (rev 40704)
+++ scummvm/trunk/engines/kyra/detection.cpp	2009-05-18 21:45:09 UTC (rev 40705)
@@ -1036,9 +1036,7 @@
 		LOL_PC98_SJIS_FLAGS
 	},
 
-	// TODO: It looks like this demo version does use something between
-	// WSA v1 and WSA v2 files, that means it is probably being quite old... 
-	/*{
+	{
 		{
 			"lol",
 			"Demo",
@@ -1052,7 +1050,7 @@
 			ADGF_DEMO
 		},
 		LOL_DEMO_FLAGS
-	},*/
+	},
 
 	{
 		{

Modified: scummvm/trunk/engines/kyra/script_tim.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_tim.cpp	2009-05-18 21:37:13 UTC (rev 40704)
+++ scummvm/trunk/engines/kyra/script_tim.cpp	2009-05-18 21:45:09 UTC (rev 40705)
@@ -405,8 +405,19 @@
 
 	_drawPage2 = isLoLDemo ? 0 : 8;
 
-	uint16 wsaOpenFlags = ((wsaFlags & 0x10) != 0) ? 2 : 0;
+	uint16 wsaOpenFlags = 0;
+	if (isLoLDemo) {
+		if (!(wsaFlags & 0x10))
+			wsaOpenFlags |= 1;
+	} else {
+		if (wsaFlags & 0x10)
+			wsaOpenFlags |= 2;
+		wsaOpenFlags |= 1;
 
+		if (offscreenBuffer == 2)
+			wsaOpenFlags = 1;
+	}
+
 	char file[32];
 	snprintf(file, 32, "%s.WSA", filename);
 
@@ -461,7 +472,7 @@
 				screen()->updateScreen();
 			}
 
-			anim->wsa->displayFrame(0, x, y, 0, 0);
+			anim->wsa->displayFrame(0, 0, x, y, 0);
 		}
 
 		if (wsaFlags & 2)

Modified: scummvm/trunk/engines/kyra/sequences_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_lol.cpp	2009-05-18 21:37:13 UTC (rev 40704)
+++ scummvm/trunk/engines/kyra/sequences_lol.cpp	2009-05-18 21:45:09 UTC (rev 40705)
@@ -180,7 +180,10 @@
 		// PAK file. Therefore a new call to loadSoundFile() is required
 		// whenever the PAK file configuration changes.
 		if (_flags.platform == Common::kPlatformPC98)
-			_sound->loadSoundFile("sound.dat");
+			_sound->loadSoundFile("SOUND.DAT");
+
+		if (_flags.isDemo)
+			_sound->loadSoundFile("LOREINTR");
 	} else {
 		delete _chargenWSA; _chargenWSA = 0;
 		

Modified: scummvm/trunk/engines/kyra/wsamovie.cpp
===================================================================
--- scummvm/trunk/engines/kyra/wsamovie.cpp	2009-05-18 21:37:13 UTC (rev 40704)
+++ scummvm/trunk/engines/kyra/wsamovie.cpp	2009-05-18 21:45:09 UTC (rev 40705)
@@ -154,7 +154,7 @@
 			if (_flags & WF_OFFSCREEN_DECODE)
 				Screen::decodeFrameDelta(dst, _deltaBuffer);
 			else
-				Screen::decodeFrameDeltaPage(dst, _deltaBuffer, _width, (_flags & WF_XOR) == 0);
+				Screen::decodeFrameDeltaPage(dst, _deltaBuffer, _width, false);
 		}
 		_currentFrame = 0;
 	}


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