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

[eriktorbjorn at users.sourceforge.net]

Revision: 23652
Author:   eriktorbjorn
Date:     2006-08-01 03:25:10 -0700 (Tue, 01 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23652&view=rev

Log Message:
-----------
Don't start the Kyra 2 menu music until the first frame has faded up, to better
match the original behaviour.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sequences_v2.cpp
Modified: scummvm/trunk/engines/kyra/sequences_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_v2.cpp	2006-08-01 07:44:38 UTC (rev 23651)
+++ scummvm/trunk/engines/kyra/sequences_v2.cpp	2006-08-01 10:25:10 UTC (rev 23652)
@@ -48,8 +48,6 @@
 	uint8 pal[768];
 	int i;
 
-	_sound->playTrack(2);
-
 	WSAMovieV2 *title = new WSAMovieV2(this);
 	title->setDrawPage(0);
 
@@ -61,6 +59,8 @@
 	_screen->updateScreen();
 	_screen->fadePalette(pal, 0x54);
 
+	_sound->playTrack(2);
+
 	for (i = 1; i < 18 && !_quitFlag; ++i) {
 		uint32 nextRun = _system->getMillis() + 6 * _tickLength;
 		title->displayFrame(i);
@@ -78,8 +78,6 @@
 		return;
 	}
 
-	_sound->playTrack(3);
-
 	title->open("TITLE.WSA", 0, pal);
 	assert(title->opened());
 
@@ -88,6 +86,8 @@
 	_screen->updateScreen();
 	_screen->fadePalette(pal, 0x54);
 
+	_sound->playTrack(3);
+
 	for (i = 1; i < 26 && !_quitFlag; ++i) {
 		uint32 nextRun = _system->getMillis() + 6 * _tickLength;
 		title->displayFrame(i);


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