[Scummvm-cvs-logs] CVS: scummvm/saga music.cpp,1.34,1.35
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Sun Nov 21 08:20:19 CET 2004
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15607
Modified Files:
music.cpp
Log Message:
But surely we should still call setGM(true) in the GM case, right...?
Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/music.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- music.cpp 21 Nov 2004 00:37:18 -0000 1.34
+++ music.cpp 21 Nov 2004 16:15:58 -0000 1.35
@@ -463,8 +463,13 @@
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 @@
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();
}
More information about the Scummvm-git-logs
mailing list