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

[lordhoto at users.sourceforge.net]

Revision: 40781
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40781&view=rev
Author:   lordhoto
Date:     2009-05-22 00:58:09 +0000 (Fri, 22 May 2009)

Log Message:
-----------
Properly initialize MT-32 for LoL demos.

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

Modified: scummvm/trunk/engines/kyra/sound_midi.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_midi.cpp	2009-05-22 00:37:41 UTC (rev 40780)
+++ scummvm/trunk/engines/kyra/sound_midi.cpp	2009-05-22 00:58:09 UTC (rev 40781)
@@ -513,12 +513,23 @@
 		} else if (_vm->gameFlags().gameID == GI_LOL) {
 			midiFile = "LOREINTR";
 
-			if (_vm->gameFlags().isTalkie)
-				pakFile = "ENG/STARTUP.PAK";
-			else if (_vm->gameFlags().useInstallerPackage)
-				pakFile = "INTROVOC.CMP";
-			else
-				pakFile = "INTROVOC.PAK";
+			if (_vm->gameFlags().isDemo) {
+				if (!_vm->gameFlags().useAltShapeHeader) {
+					// Intro demo
+					pakFile = "INTROVOC.PAK";
+				} else {
+					// Kyra2 SEQ player based demo
+					pakFile = "GENERAL.PAK";
+					midiFile = "LOREDEMO";
+				}
+			} else {
+				if (_vm->gameFlags().isTalkie)
+					pakFile = "ENG/STARTUP.PAK";
+				else if (_vm->gameFlags().useInstallerPackage)
+					pakFile = "INTROVOC.CMP";
+				else
+					pakFile = "INTROVOC.PAK";
+			}
 		}
 
 		if (!midiFile)


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