thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small clean up of simon midi code

Browse source 
svn-id: r5419
This commit is contained in:
Travis Howell 2002-11-05 13:55:04 +00:00
parent ad201496d4
commit 0e7e17be7c
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
simon/simon.cpp
View file

@ -4994,19 +4994,17 @@ void SimonState::playMusic(uint music)
/* Simon 1 dos talkie music doesn't detect correct size of music data */ /* Simon 1 dos talkie music doesn't detect correct size of music data */
/* Simon 2 dos talkie music isn't supported */ /* Simon 2 dos talkie music isn't supported */
/* Simon 2 dos music isn't supported */ /* Simon 2 dos music isn't supported */
if (_voice_type == FORMAT_WAV) { if (_game & GAME_WIN) {
midi.shutdown(); midi.shutdown();
if (_game & GAME_TALKIE || _game & GAME_WIN) {
_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET); _game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET);
midi.read_all_songs(_game_file); midi.read_all_songs(_game_file);
}
midi.initialize(); midi.initialize();
midi.play(); midi.play();
} else if (!(_game & GAME_SIMON2)){ } else if (!(_game & GAME_SIMON2)){
midi.shutdown(); midi.shutdown();
if (_game & GAME_TALKIE || _game & GAME_WIN) { if (_game & GAME_TALKIE) {
_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET); _game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET);
midi.read_all_songs_old(_game_file); midi.read_all_songs_old(_game_file);
} else { } else {