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

[athrxx at users.sourceforge.net]

Revision: 45933
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45933&view=rev
Author:   athrxx
Date:     2009-11-15 23:26:47 +0000 (Sun, 15 Nov 2009)

Log Message:
-----------
LOL: fixed minor glitch in the ending sequence

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

Modified: scummvm/trunk/engines/kyra/script_tim.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_tim.cpp	2009-11-15 22:01:34 UTC (rev 45932)
+++ scummvm/trunk/engines/kyra/script_tim.cpp	2009-11-15 23:26:47 UTC (rev 45933)
@@ -734,7 +734,7 @@
 
 	_vocFiles[index] = (const char *)(_currentTim->text + READ_LE_UINT16(_currentTim->text + (stringId << 1)));
 
-	if (index == 2 && _currentTim->isLoLOutro) {
+	if (index == 2 && _currentTim->isLoLOutro && _vm->gameFlags().isTalkie) {
 		_vocFiles[index] = "CONGRATA.VOC";
 
 		switch (_currentTim->lolCharacter) {

Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp	2009-11-15 22:01:34 UTC (rev 45932)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp	2009-11-15 23:26:47 UTC (rev 45933)
@@ -4172,10 +4172,13 @@
 	beginFadeOut();
 
 	char musicfile[13];
-	if (fileListLen() == 1)
+	if (fileListLen() == 1) {
 		sprintf(musicfile, fileListEntry(0), track);
-	else
+	} else {
 		strcpy(musicfile, fileListEntry(track));
+		if (!musicfile[0])
+			return;
+	}
 	delete[] _musicTrackData;
 
 	_musicTrackData = _vm->resource()->fileData(musicfile, 0);


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