diff options
author | Travis Howell | 2003-05-20 04:03:21 +0000 |
---|---|---|
committer | Travis Howell | 2003-05-20 04:03:21 +0000 |
commit | dad6d27b83231c8ade3611d02a1222e52d945b02 (patch) | |
tree | bc9b031908f8629495f4cfc5306c36e2c60b16f0 /simon/simon.cpp | |
parent | 46a0be5ae817d9757630c55d0ef1954b5b634068 (diff) | |
download | scummvm-rg350-dad6d27b83231c8ade3611d02a1222e52d945b02.tar.gz scummvm-rg350-dad6d27b83231c8ade3611d02a1222e52d945b02.tar.bz2 scummvm-rg350-dad6d27b83231c8ade3611d02a1222e52d945b02.zip |
Revert music play change for Simon 2, since it caused brief tunes between location changes on main map area.
Clean up midi_play
svn-id: r7707
Diffstat (limited to 'simon/simon.cpp')
-rw-r--r-- | simon/simon.cpp | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 5bef5e1988..3f1cc07630 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -2528,7 +2528,7 @@ void SimonState::o_wait_for_vga(uint a) { processSpecialKeys(); } - delay(10); + delay(1); if (_game & GF_SIMON2) { if (_timer_1 >= 1000) { @@ -5037,16 +5037,17 @@ bool SimonState::load_game(uint slot) { return true; } -void SimonState::midi_play(uint music) { - // FIXME What exactly should this function do? - if (music != 0) { - //_midi_cur_song_ptr = ((arg_0 & 0xFFFF) << 4) + midi_songs; +void SimonState::midi_play(uint a) { + if (a == 999) + return; + if (_vc72_var1 == 999) { - //midi.initialize(); + if (_game & GF_WIN) { + midi.playMultipleSMF (_game_file); + } else { + midi.playXMIDI (_game_file); + } } - //_midi_var11 = 0; - //_midi_var12 = 1; - } } @@ -5057,11 +5058,6 @@ void SimonState::playMusic(uint music) { if (_game & GF_SIMON2) { // Simon 2 music midi.stop(); _game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music - 1], SEEK_SET); - if (_game & GF_WIN) { - midi.playMultipleSMF (_game_file); - } else { - midi.playXMIDI (_game_file); - } _last_music_played = music; _vc72_var1 = 999; _vc70_var1 = 0xFFFF; |