diff options
| author | Torbjörn Andersson | 2004-11-21 16:15:58 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2004-11-21 16:15:58 +0000 |
| commit | a607d2248f32a62e5eb4688eb9854b5173d59058 (patch) | |
| tree | 70bd6d7aa6f9c336ef3b82f2e9d986208de1986e /saga | |
| parent | fb32e12095d14cde2407ac4375ad06511d96b168 (diff) | |
| download | scummvm-rg350-a607d2248f32a62e5eb4688eb9854b5173d59058.tar.gz scummvm-rg350-a607d2248f32a62e5eb4688eb9854b5173d59058.tar.bz2 scummvm-rg350-a607d2248f32a62e5eb4688eb9854b5173d59058.zip | |
But surely we should still call setGM(true) in the GM case, right...?
svn-id: r15854
Diffstat (limited to 'saga')
| -rw-r--r-- | saga/music.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/saga/music.cpp b/saga/music.cpp index d731667142..73e23a36bd 100644 --- a/saga/music.cpp +++ b/saga/music.cpp @@ -463,8 +463,13 @@ int Music::play(uint32 music_rn, uint16 flags) { if (hasAdlib()) { rsc_ctxt = GAME_GetFileContext(GAME_MUSICFILE_FM, 0); + // FIXME: This is weird, but this way Adlib + // sounds closer to original, though instrument + // mapping is not correct. + _player->setGM(false); } else { rsc_ctxt = GAME_GetFileContext(GAME_MUSICFILE_GM, 0); + _player->setGM(true); } } @@ -474,12 +479,6 @@ int Music::play(uint32 music_rn, uint16 flags) { return FAILURE; } - // FIXME: This is weird, but this way Adlib sounds closer to original, - // though instrument mapping is not correct - if (hasAdlib()) { - _player->setGM(false); - } - parser = MidiParser::createParser_XMIDI(); } |