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

[athrxx at users.sourceforge.net]

Revision: 44116
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44116&view=rev
Author:   athrxx
Date:     2009-09-16 20:05:12 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
LOL/Floppy: fixed outro

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

Modified: scummvm/trunk/engines/kyra/script_tim.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_tim.cpp	2009-09-15 22:35:19 UTC (rev 44115)
+++ scummvm/trunk/engines/kyra/script_tim.cpp	2009-09-16 20:05:12 UTC (rev 44116)
@@ -308,7 +308,7 @@
 	}
 
 	const bool isPC98 = (_vm->gameFlags().platform == Common::kPlatformPC98);
-	if (filename[0] && (_vm->speechEnabled() || isPC98))
+	if (filename[0] && (_vm->speechEnabled() || !_vm->gameFlags().isTalkie))
 		_vm->sound()->voicePlay(filename);
 
 	if (text[0] == '$')

Modified: scummvm/trunk/engines/kyra/sequences_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_lol.cpp	2009-09-15 22:35:19 UTC (rev 44115)
+++ scummvm/trunk/engines/kyra/sequences_lol.cpp	2009-09-16 20:05:12 UTC (rev 44116)
@@ -1010,7 +1010,11 @@
 		"FINALE.PAK", "FINALE1.PAK", "FINALE2.PAK", 0
 	};
 
-	const char * const *fileList = _flags.isTalkie ? fileListCD : 0;
+	static const char * const fileListFloppy[] = {
+		"GENERAL.PAK", "INTRO.PAK", "FINALE1.PAK", "FINALE2.PAK", 0
+	};
+
+	const char * const *fileList = _flags.isTalkie ? fileListCD : fileListFloppy;
 	assert(fileList);
 
 	char filename[32];


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