[Scummvm-cvs-logs] scummvm master -> da9e27361a845f78c7fcf3b15c7fb47a53c726bf

[lordhoto]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
da9e27361a KYRA: Fix missing music in Kyra 1 DOS intro.


Commit: da9e27361a845f78c7fcf3b15c7fb47a53c726bf
    https://github.com/scummvm/scummvm/commit/da9e27361a845f78c7fcf3b15c7fb47a53c726bf
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-05-01T06:07:15-07:00

Commit Message:
KYRA: Fix missing music in Kyra 1 DOS intro.

This is a regression from 93e69aa4da0558b05fc235684355ed38eed9863d.
Thanks to eriktorbjorn to noticing that the music is missing.

Changed paths:
    engines/kyra/staticres.cpp



diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index bac31f0..57a0f8d 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -818,7 +818,7 @@ void KyraEngine_LoK::initStaticResource() {
 		for (int i = 0; i < soundFilesSize; i++)
 			soundFiles[i] = (i < size1) ? soundfiles1[i] : soundfiles2[i - size1];
 	}
-	const char *const *soundFilesIntro = _staticres->loadStrings(k1AudioTracksIntro, temp);
+	const char *const *soundFilesIntro = _staticres->loadStrings(k1AudioTracksIntro, soundFilesIntroSize);
 	const int32 *cdaTable = (const int32 *)_staticres->loadRawData(k1TownsCDATable, cdaTableSize);
 
 	// FIXME: It seems Kyra1 MAC CD includes AdLib and MIDI music and sfx, thus we enable