diff options
author | Travis Howell | 2003-05-20 07:26:19 +0000 |
---|---|---|
committer | Travis Howell | 2003-05-20 07:26:19 +0000 |
commit | 6b07f4f3973d7b31b200fdd7c9983564432b1e70 (patch) | |
tree | 7b22f249149f7271b9d7e4655ce4d8a8ddda27b6 /simon/simon.cpp | |
parent | 16c2fe1436f83eca6fa88fcbf2b17668bcc964af (diff) | |
download | scummvm-rg350-6b07f4f3973d7b31b200fdd7c9983564432b1e70.tar.gz scummvm-rg350-6b07f4f3973d7b31b200fdd7c9983564432b1e70.tar.bz2 scummvm-rg350-6b07f4f3973d7b31b200fdd7c9983564432b1e70.zip |
I broke simon, so revert my last change and added fixmes instead.
svn-id: r7709
Diffstat (limited to 'simon/simon.cpp')
-rw-r--r-- | simon/simon.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index bdc2185dca..006c64a6aa 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -5042,11 +5042,7 @@ void SimonState::midi_play(uint a) { return; if (_vc72_var1 == 999) { - if (_game & GF_WIN) { - midi.playMultipleSMF (_game_file); - } else { - midi.playXMIDI (_game_file); - } + //FIXME Original game started music at this point } } @@ -5058,6 +5054,13 @@ 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); + //FIXME The original game only loaded music file at this point + if (_game & GF_WIN) { + midi.playMultipleSMF (_game_file); + } else { + midi.playXMIDI (_game_file); + } + _last_music_played = music; _vc72_var1 = 999; _vc70_var1 = 0xFFFF; |