[Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.18,1.19

Travis Howell kirben at users.sourceforge.net
Thu Dec 2 00:22:02 CET 2004


Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11865/kyra

Modified Files:
	kyra.cpp 
Log Message:

Fix kyra compile


Index: kyra.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- kyra.cpp	29 Nov 2004 00:25:14 -0000	1.18
+++ kyra.cpp	2 Dec 2004 08:21:49 -0000	1.19
@@ -135,10 +135,10 @@
 	_screen = new uint8[320*200];
 	memset(_screen, 0, sizeof(uint8) * 320 * 200);
 
-	int midiDrv = GameDetector::detectMusicDriver(MDT_NATIVE | MDT_ADLIB | MDT_PREFER_NATIVE);
+	int midiDrv = MidiDriver::detectMusicDriver(MDT_NATIVE | MDT_ADLIB | MDT_PREFER_NATIVE);
 	bool native_mt32 = (ConfMan.getBool("native_mt32") || (midiDrv == MD_MT32));
 
-	MidiDriver *driver = GameDetector::createMidi(midiDrv);
+	MidiDriver *driver = MidiDriver::createMidi(midiDrv);
 	if (!driver) {
 		// 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