diff options
| -rw-r--r-- | simon/items.cpp | 2 | ||||
| -rw-r--r-- | simon/simon.cpp | 10 | ||||
| -rw-r--r-- | simon/simon.h | 2 | ||||
| -rw-r--r-- | simon/vga.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/simon/items.cpp b/simon/items.cpp index 99293bedd1..2e7dede61d 100644 --- a/simon/items.cpp +++ b/simon/items.cpp @@ -1462,7 +1462,7 @@ void SimonState::o_unk_127() { } else { if (a != _last_music_played) { _last_music_played = a; - playMusic(0, a); + playMusic(a); } } } 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; diff --git a/simon/simon.h b/simon/simon.h index e1f0c824c1..0917ddf5f1 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -763,7 +763,7 @@ public: void video_putchar_drawchar(FillOrCopyStruct *fcs, uint x, uint y, byte chr); void midi_play(uint music); - void playMusic(uint music, uint music_unk); + void playMusic(uint music); void checkTimerCallback(); void delay(uint delay); diff --git a/simon/vga.cpp b/simon/vga.cpp index 085d722fcc..352c8ad53b 100644 --- a/simon/vga.cpp +++ b/simon/vga.cpp @@ -1693,7 +1693,7 @@ void SimonState::vc_62_palette_thing() { if (!_video_var_3) { if (_game & GF_SIMON2) { if (_next_music_to_play != 0xFFFF) - playMusic(999, _next_music_to_play); + playMusic(_next_music_to_play); } } else _video_var_3 = true; |