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 | |
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')
-rw-r--r-- | simon/midi.cpp | 6 | ||||
-rw-r--r-- | simon/midi.h | 6 | ||||
-rw-r--r-- | simon/simon.cpp | 13 |
3 files changed, 13 insertions, 12 deletions
diff --git a/simon/midi.cpp b/simon/midi.cpp index a89638dcc4..e36f309317 100644 --- a/simon/midi.cpp +++ b/simon/midi.cpp @@ -263,7 +263,7 @@ static int simon1_gmf_size[] = { 17256, 5103, 8794, 4884, 16 }; -void MidiPlayer::playSMF (File *in, int song) { +void MidiPlayer::loadSMF (File *in, int song) { _system->lock_mutex (_mutex); clearConstructs(); @@ -298,7 +298,7 @@ void MidiPlayer::playSMF (File *in, int song) { _system->unlock_mutex (_mutex); } -void MidiPlayer::playMultipleSMF (File *in) { +void MidiPlayer::loadMultipleSMF (File *in) { // This is a special case for Simon 2 Windows. // Instead of having multiple sequences as // separate tracks in a Type 2 file, simon2win @@ -353,7 +353,7 @@ void MidiPlayer::playMultipleSMF (File *in) { // jump (0, 1); } -void MidiPlayer::playXMIDI (File *in) { +void MidiPlayer::loadXMIDI (File *in) { _system->lock_mutex (_mutex); clearConstructs(); diff --git a/simon/midi.h b/simon/midi.h index 2471250924..7daa820af0 100644 --- a/simon/midi.h +++ b/simon/midi.h @@ -57,9 +57,9 @@ public: MidiPlayer (OSystem *system); virtual ~MidiPlayer(); - void playSMF (File *in, int song); - void playMultipleSMF (File *in); - void playXMIDI (File *in); + void loadSMF (File *in, int song); + void loadMultipleSMF (File *in); + void loadXMIDI (File *in); void setLoop (bool loop); void queueTrack (byte track, bool loop); 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); |