[Scummvm-cvs-logs] CVS: scummvm/queen queen.cpp,1.62,1.63
Joost Peters
joostp at users.sourceforge.net
Fri Jan 2 18:10:04 CET 2004
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv13970/queen
Modified Files:
queen.cpp
Log Message:
Allow queen to use adlib driver as well (that was surprisingly easy :))
Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- queen.cpp 2 Jan 2004 14:21:14 -0000 1.62
+++ queen.cpp 3 Jan 2004 02:08:04 -0000 1.63
@@ -168,13 +168,11 @@
_input = new Input(_resource->getLanguage(), _system);
_logic = new Logic(this);
- int midiDriver = GameDetector::detectMusicDriver(MDT_NATIVE | MDT_ADLIB | MDT_PREFER_NATIVE);
- if (midiDriver == MD_ADLIB) {
- warning("Adlib music not supported, please use native MIDI if possible");
- midiDriver = MD_NULL;
- }
-
- _music = new Music(GameDetector::createMidi(midiDriver), this);
+ MidiDriver *driver = GameDetector::createMidi(GameDetector::detectMusicDriver(MDT_NATIVE | MDT_ADLIB | MDT_PREFER_NATIVE));
+ if (!driver)
+ driver = MidiDriver_ADLIB_create(_mixer);
+
+ _music = new Music(driver, this);
_sound = Sound::giveSound(_mixer, this, _resource->compression());
_walk = new Walk(this);
_timer->installTimerProc(&timerHandler, 1000000 / 50, this); //call 50 times per second
More information about the Scummvm-git-logs
mailing list