diff options
| author | Travis Howell | 2002-11-05 13:55:04 +0000 |
|---|---|---|
| committer | Travis Howell | 2002-11-05 13:55:04 +0000 |
| commit | 0e7e17be7c1d55c16e16aa9079c9cf6018a5185c (patch) | |
| tree | aeca8f8d7d3bb3d98da1ac0fe312311cc255ab50 /simon | |
| parent | ad201496d4f67c9859b2ca04c182f407e5fc811c (diff) | |
| download | scummvm-rg350-0e7e17be7c1d55c16e16aa9079c9cf6018a5185c.tar.gz scummvm-rg350-0e7e17be7c1d55c16e16aa9079c9cf6018a5185c.tar.bz2 scummvm-rg350-0e7e17be7c1d55c16e16aa9079c9cf6018a5185c.zip | |
Small clean up of simon midi code
svn-id: r5419
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/simon.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 2f3f7a28d0..beeca376e0 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -4994,19 +4994,17 @@ void SimonState::playMusic(uint music) /* Simon 1 dos talkie music doesn't detect correct size of music data */ /* Simon 2 dos talkie music isn't supported */ /* Simon 2 dos music isn't supported */ - if (_voice_type == FORMAT_WAV) { + if (_game & GAME_WIN) { midi.shutdown(); - if (_game & GAME_TALKIE || _game & GAME_WIN) { - _game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET); - midi.read_all_songs(_game_file); - } + _game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET); + midi.read_all_songs(_game_file); midi.initialize(); midi.play(); } else if (!(_game & GAME_SIMON2)){ 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); midi.read_all_songs_old(_game_file); } else { |