From 56c59d1da660f57d682579dd9e14bea2da6b0c76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B6rn=20Andersson?= Date: Tue, 1 Aug 2006 10:25:10 +0000 Subject: [PATCH] Don't start the Kyra 2 menu music until the first frame has faded up, to better match the original behaviour. svn-id: r23652 --- engines/kyra/sequences_v2.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/engines/kyra/sequences_v2.cpp b/engines/kyra/sequences_v2.cpp index 58f86db6136..b7b2399a4ec 100644 --- a/engines/kyra/sequences_v2.cpp +++ b/engines/kyra/sequences_v2.cpp @@ -48,8 +48,6 @@ void KyraEngine_v2::seq_menu() { uint8 pal[768]; int i; - _sound->playTrack(2); - WSAMovieV2 *title = new WSAMovieV2(this); title->setDrawPage(0); @@ -61,6 +59,8 @@ void KyraEngine_v2::seq_menu() { _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 @@ void KyraEngine_v2::seq_menu() { return; } - _sound->playTrack(3); - title->open("TITLE.WSA", 0, pal); assert(title->opened()); @@ -88,6 +86,8 @@ void KyraEngine_v2::seq_menu() { _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);