From 83194b2188c2cbaf205b8926b7d7641a2003f85f Mon Sep 17 00:00:00 2001
From: Florian Kagerer <athrxx@users.sourceforge.net>
Date: Fri, 19 Dec 2008 07:32:08 +0000
Subject: [PATCH] KYRA: fix mt-32 sysex loading for LOL floppy

svn-id: r35434
---
 engines/kyra/resource.cpp        | 5 +++++
 engines/kyra/resource_intern.cpp | 2 +-
 engines/kyra/sound_midi.cpp      | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp
index d4b468fed5f..bb4baf79967 100644
--- a/engines/kyra/resource.cpp
+++ b/engines/kyra/resource.cpp
@@ -91,6 +91,11 @@ bool Resource::reset() {
 	} 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;
 	}
diff --git a/engines/kyra/resource_intern.cpp b/engines/kyra/resource_intern.cpp
index 341f9a6735a..827af4892f9 100644
--- a/engines/kyra/resource_intern.cpp
+++ b/engines/kyra/resource_intern.cpp
@@ -138,7 +138,7 @@ Common::SeekableReadStream *CachedArchive::openFile(const Common::String &name)
 
 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 {
diff --git a/engines/kyra/sound_midi.cpp b/engines/kyra/sound_midi.cpp
index b3eb06877d1..357a1d1a0a5 100644
--- a/engines/kyra/sound_midi.cpp
+++ b/engines/kyra/sound_midi.cpp
@@ -515,8 +515,10 @@ bool SoundMidiPC::init() {
 
 			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)