[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.457,1.458
Eugene Sandulenko
sev at users.sourceforge.net
Fri Oct 22 17:37:05 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.64,1.65 midi.h,1.24,1.25 simon.cpp,1.456,1.457 simon.h,1.126,1.127
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/midi/mt32 synth.cpp,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3178
Modified Files:
simon.cpp
Log Message:
oops
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -d -r1.457 -r1.458
--- simon.cpp 23 Oct 2004 00:02:35 -0000 1.457
+++ simon.cpp 23 Oct 2004 00:36:09 -0000 1.458
@@ -5125,7 +5125,7 @@
if (_game & GF_SIMON2) { // Simon 2 music
midi.stop();
_game_file->seek(_game_offsets_ptr[MUSIC_INDEX_BASE + music - 1], SEEK_SET);
- if (_game & GF_WIN && !(ConfMan.getBool("native_mt32") || (_midiDriver == MD_MT32))) {
+ if (_game & GF_WIN && !(ConfMan.getBool("native_mt32") && (_midiDriver != MD_MT32))) {
midi.loadMultipleSMF (_game_file);
} else {
midi.loadXMIDI (_game_file);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.64,1.65 midi.h,1.24,1.25 simon.cpp,1.456,1.457 simon.h,1.126,1.127
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/midi/mt32 synth.cpp,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list