diff options
| author | Jamieson Christian | 2003-05-21 05:26:29 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-05-21 05:26:29 +0000 |
| commit | ff79f10160213ec8ebcee6bf34ac9c53c1260db3 (patch) | |
| tree | d1cc199cf0dbbb1c5f326b5b7cd142e38fc5864f /simon/simon.cpp | |
| parent | f964fc1861b7bab1f9e3512b4eaa7f57ea6800f1 (diff) | |
| download | scummvm-rg350-ff79f10160213ec8ebcee6bf34ac9c53c1260db3.tar.gz scummvm-rg350-ff79f10160213ec8ebcee6bf34ac9c53c1260db3.tar.bz2 scummvm-rg350-ff79f10160213ec8ebcee6bf34ac9c53c1260db3.zip | |
Fixed Simon 1 sound effects.
More semantic fixes.
svn-id: r7765
Diffstat (limited to 'simon/simon.cpp')
| -rw-r--r-- | simon/simon.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 88d8e981c8..d009231116 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -1069,7 +1069,8 @@ void SimonState::playSting(uint a) { // midi.shutdown(); _mus_file->seek(_mus_offsets[a], SEEK_SET); - midi.playSMF (_mus_file, a); + midi.loadSMF (_mus_file, a); + midi.jump (0, 0); } Subroutine *SimonState::getSubroutineByID(uint subroutine_id) { @@ -5280,9 +5281,9 @@ void SimonState::loadMusic (uint 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); + midi.loadMultipleSMF (_game_file); } else { - midi.playXMIDI (_game_file); + midi.loadXMIDI (_game_file); } _last_music_played = music; @@ -5299,10 +5300,10 @@ void SimonState::loadMusic (uint music) { midi.stop(); if (_game & GF_WIN) { _game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET); - midi.playMultipleSMF (_game_file); + midi.loadMultipleSMF (_game_file); } else if (_game & GF_TALKIE) { _game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET); - midi.playSMF (_game_file, music); + midi.loadSMF (_game_file, music); } else { char buf[50]; File *f = new File(); @@ -5312,7 +5313,7 @@ void SimonState::loadMusic (uint music) { warning("Can't load music from '%s'", buf); return; } - midi.playSMF (f, music); + midi.loadSMF (f, music); delete f; } midi.jump (0, 0); |