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

athrxx at users.sourceforge.net athrxx at users.sourceforge.net
Fri Dec 19 08:32:09 CET 2008


Revision: 35434
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35434&view=rev
Author:   athrxx
Date:     2008-12-19 07:32:08 +0000 (Fri, 19 Dec 2008)

Log Message:
-----------
KYRA: fix mt-32 sysex loading for LOL floppy

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/resource.cpp
    scummvm/trunk/engines/kyra/resource_intern.cpp
    scummvm/trunk/engines/kyra/sound_midi.cpp

Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp	2008-12-19 01:45:55 UTC (rev 35433)
+++ scummvm/trunk/engines/kyra/resource.cpp	2008-12-19 07:32:08 UTC (rev 35434)
@@ -91,6 +91,11 @@
 	} else if (_vm->game() == GI_LOL) {
 		if (_vm->gameFlags().useInstallerPackage)
 			_files.add("installer", loadInstallerArchive("WESTWOOD", "%d", 0), 2, false);
+		
+		// mouse pointer, fonts, etc. required for initializing
+		loadPakFile("general.pak");
+		if (_vm->gameFlags().isTalkie)
+			loadPakFile("startup.pak");
 
 		return true;
 	}

Modified: scummvm/trunk/engines/kyra/resource_intern.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource_intern.cpp	2008-12-19 01:45:55 UTC (rev 35433)
+++ scummvm/trunk/engines/kyra/resource_intern.cpp	2008-12-19 07:32:08 UTC (rev 35434)
@@ -138,7 +138,7 @@
 
 bool ResLoaderPak::checkFilename(Common::String filename) const {
 	filename.toUppercase();
-	return (filename.hasSuffix(".PAK") || filename.hasSuffix(".APK") || filename.hasSuffix(".VRM") || filename.hasSuffix(".TLK") || filename.equalsIgnoreCase(StaticResource::staticDataFilename()));
+	return (filename.hasSuffix(".PAK") || filename.hasSuffix(".APK") || filename.hasSuffix(".VRM") || filename.hasSuffix(".CMP") || filename.hasSuffix(".TLK") || filename.equalsIgnoreCase(StaticResource::staticDataFilename()));
 }
 
 bool ResLoaderPak::isLoadable(const Common::String &filename, Common::SeekableReadStream &stream) const {

Modified: scummvm/trunk/engines/kyra/sound_midi.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_midi.cpp	2008-12-19 01:45:55 UTC (rev 35433)
+++ scummvm/trunk/engines/kyra/sound_midi.cpp	2008-12-19 07:32:08 UTC (rev 35434)
@@ -515,8 +515,10 @@
 
 			if (_vm->gameFlags().isTalkie)
 				pakFile = "ENG/STARTUP.PAK";
+			else if (_vm->gameFlags().useInstallerPackage)
+				pakFile = "INTROVOC.CMP";
 			else
-				pakFile = "STARTUP.PAK";
+				pakFile = "INTROVOC.PAK";
 		}
 	
 		if (!midiFile)


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




More information about the Scummvm-git-logs mailing list