libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-17 07:07:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed Simon 1 sound effects.

Browse Source 
More semantic fixes.

svn-id: r7765
This commit is contained in:
Jamieson Christian 2003-05-21 05:26:29 +00:00
parent f964fc1861
commit ff79f10160
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
simon/midi.cpp
View File

@ -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();

6
simon/midi.h
View File

@ -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);

13
simon/simon.cpp
View File

@ -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);