diff options
author | Norbert Lange | 2009-08-14 13:15:40 +0000 |
---|---|---|
committer | Norbert Lange | 2009-08-14 13:15:40 +0000 |
commit | 2b147c57161cdacf3cdc5bc572ce46160cbd6b5e (patch) | |
tree | c1164c49d1b2987b77a93d64eb26e432dabb221b /engines/kyra/sound_amiga.cpp | |
parent | 29b145310c6263124d3a4930136cb7ecba8eb1d8 (diff) | |
download | scummvm-rg350-2b147c57161cdacf3cdc5bc572ce46160cbd6b5e.tar.gz scummvm-rg350-2b147c57161cdacf3cdc5bc572ce46160cbd6b5e.tar.bz2 scummvm-rg350-2b147c57161cdacf3cdc5bc572ce46160cbd6b5e.zip |
changed handling of finale - music should use right tempo now
svn-id: r43364
Diffstat (limited to 'engines/kyra/sound_amiga.cpp')
-rw-r--r-- | engines/kyra/sound_amiga.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/engines/kyra/sound_amiga.cpp b/engines/kyra/sound_amiga.cpp index 6602759b33..0b64e67525 100644 --- a/engines/kyra/sound_amiga.cpp +++ b/engines/kyra/sound_amiga.cpp @@ -120,13 +120,14 @@ void SoundAmiga::loadSoundFile(uint file) { void SoundAmiga::playTrack(uint8 track) { debugC(5, kDebugLevelSound, "SoundAmiga::playTrack(%d)", track); - static const byte tempoIntro[6] = { 0x46, 0x55, 0x3C, 0x41, 0x78, 0x50 }; - static const byte tempoIngame[23] = { + static const byte tempoIntro[] = { 0x46, 0x55, 0x3C, 0x41 }; + static const byte tempoFinal[] = { 0x78, 0x50 }; + static const byte tempoIngame[] = { 0x64, 0x64, 0x64, 0x64, 0x64, 0x73, 0x4B, 0x64, 0x64, 0x64, 0x55, 0x9C, 0x6E, 0x91, 0x78, 0x84, 0x32, 0x64, 0x64, 0x6E, 0x3C, 0xD8, 0xAF }; - static const byte loopIngame[23] = { + static const byte loopIngame[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00 @@ -139,17 +140,6 @@ void SoundAmiga::playTrack(uint8 track) { switch (_fileLoaded) { - case kFileFinal: - // score 0 gets started immediately after loading the music-files with different tempo. - // we need to define a track-value for the fake call of this function - if (track == 10) { - score = 0; - loop = true; - tempo = 0x78; - break; - } - // if this is not the hardcoded start of the song then - // Fallthrough case kFileIntro: if (track >= 2 && track < ARRAYSIZE(tempoIntro) + 2) { score = track - 2; @@ -165,6 +155,16 @@ void SoundAmiga::playTrack(uint8 track) { } break; + case kFileFinal: + // score 0 gets started immediately after loading the music-files with different tempo. + // we need to define a track-value for the fake call of this function + if (track >= 2 && track < ARRAYSIZE(tempoFinal) + 2) { + score = track - 2; + loop = true; + tempo = tempoFinal[score]; + } + break; + default: return; } |