[Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.101,1.102
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Fri Dec 30 08:38:01 CET 2005
Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19912
Modified Files:
kyra.cpp
Log Message:
Fixed compilation.
Index: kyra.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- kyra.cpp 30 Dec 2005 14:18:19 -0000 1.101
+++ kyra.cpp 30 Dec 2005 16:36:53 -0000 1.102
@@ -258,10 +258,10 @@
_system->endGFXTransaction();
// for now we prefer MIDI-to-Adlib conversion over native midi
- int midiDrv = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB/* | MDT_PREFER_MIDI*/);
- bool native_mt32 = ((midiDrv == MD_MT32) || ConfMan.getBool("native_mt32"));
+ int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB/* | MDT_PREFER_MIDI*/);
+ bool native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
- MidiDriver *driver = MidiDriver::createMidi(midiDrv);
+ MidiDriver *driver = MidiDriver::createMidi(midiDriver);
if (midiDriver == MD_ADLIB) {
// In this case we should play the Adlib tracks, but for now
// the automagic MIDI-to-Adlib conversion will do.
More information about the Scummvm-git-logs
mailing list