diff options
author | Travis Howell | 2003-05-19 09:59:23 +0000 |
---|---|---|
committer | Travis Howell | 2003-05-19 09:59:23 +0000 |
commit | 770a0f1d3b91877a1d8136ca11ca703eec928336 (patch) | |
tree | f19ac5f36a21afb02e6a76bdd0ca681a56742876 /simon/simon.cpp | |
parent | aa1ddc6a5a13012ef93bfcf8a8e870aed165e997 (diff) | |
download | scummvm-rg350-770a0f1d3b91877a1d8136ca11ca703eec928336.tar.gz scummvm-rg350-770a0f1d3b91877a1d8136ca11ca703eec928336.tar.bz2 scummvm-rg350-770a0f1d3b91877a1d8136ca11ca703eec928336.zip |
music_unk isn't needed in playmusic, it is always set to 999
svn-id: r7680
Diffstat (limited to 'simon/simon.cpp')
-rw-r--r-- | simon/simon.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 9cf0aaedea..5bef5e1988 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -3115,7 +3115,7 @@ void SimonState::processSpecialKeys() { if (midi._midi_sfx_toggle) midi.stop(); else - playMusic(0, _last_music_played); + playMusic(_last_music_played); } else _sound->effectsPause(_effects_paused ^= 1); break; @@ -5041,16 +5041,16 @@ 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; - if (_vc72_var1 == 999) + if (_vc72_var1 == 999) { //midi.initialize(); - + } //_midi_var11 = 0; //_midi_var12 = 1; } } -void SimonState::playMusic(uint music_unk, uint music) { +void SimonState::playMusic(uint music) { if (midi._midi_sfx_toggle) return; @@ -5063,7 +5063,7 @@ void SimonState::playMusic(uint music_unk, uint music) { midi.playXMIDI (_game_file); } _last_music_played = music; - _vc72_var1 = music_unk; + _vc72_var1 = 999; _vc70_var1 = 0xFFFF; _vc72_var3 = 0xFFFF; _next_music_to_play = 0xFFFF; |