aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorTorbjörn Andersson2006-08-01 10:25:10 +0000
committerTorbjörn Andersson2006-08-01 10:25:10 +0000
commit56c59d1da660f57d682579dd9e14bea2da6b0c76 (patch)
treecd9373b6e61d5fd7ff7881f98a000bfe351b4edb /engines/kyra
parentafe26b5ea5cb35c68da4db510a134df47a81814b (diff)
downloadscummvm-rg350-56c59d1da660f57d682579dd9e14bea2da6b0c76.tar.gz
scummvm-rg350-56c59d1da660f57d682579dd9e14bea2da6b0c76.tar.bz2
scummvm-rg350-56c59d1da660f57d682579dd9e14bea2da6b0c76.zip
Don't start the Kyra 2 menu music until the first frame has faded up, to better
match the original behaviour. svn-id: r23652
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/sequences_v2.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/sequences_v2.cpp b/engines/kyra/sequences_v2.cpp
index 58f86db613..b7b2399a4e 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);