[Scummvm-cvs-logs] SF.net SVN: scummvm:[51287] scummvm/trunk/engines/sci/resource.cpp

[thebluegr at users.sourceforge.net]

Revision: 51287
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51287&view=rev
Author:   thebluegr
Date:     2010-07-25 22:47:17 +0000 (Sun, 25 Jul 2010)

Log Message:
-----------
Fixed LSL6 hires resources, speech and lip sync work now (thanks to a discussion we had with clone2727)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/resource.cpp

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2010-07-25 22:32:54 UTC (rev 51286)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-07-25 22:47:17 UTC (rev 51287)
@@ -164,8 +164,15 @@
 	} else {
 		// SCI2.1+
 #ifdef ENABLE_SCI32
-		if (type < ARRAYSIZE(s_resTypeMapSci21))
-			return s_resTypeMapSci21[type];
+		if (type < ARRAYSIZE(s_resTypeMapSci21)) {
+			// LSL6 hires doesn't have the chunk resource type, to match
+			// the resource types of the lowres version, thus we use the
+			// older resource types here
+			if (g_sci && g_sci->getGameId() == GID_LSL6HIRES)
+				return s_resTypeMapSci0[type];
+			else
+				return s_resTypeMapSci21[type];
+		}
 #else
 		error("SCI32 support not compiled in");
 #endif


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