[Scummvm-cvs-logs] CVS: scummvm/sky sky.cpp,1.123,1.124

Max Horn fingolfin at users.sourceforge.net
Fri Oct 17 17:23:34 CEST 2003


Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv12549/sky

Modified Files:
	sky.cpp 
Log Message:
We proudly present the latest installment of our hit series 'Untangle the mess': 'Help! Space Invaders refactored the music detector'... in other news, I obviously need to sleep now

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- sky.cpp	17 Oct 2003 23:16:53 -0000	1.123
+++ sky.cpp	18 Oct 2003 00:22:46 -0000	1.124
@@ -265,15 +265,16 @@
 	
 	_systemVars.gameVersion = _skyDisk->determineGameVersion();
 
-	if (_detector->getMidiDriverType() == MD_ADLIB) {
+	int midiDriver = GameDetector::detectMusicDriver(_detector->_game.midi);
+	if (midiDriver == MD_ADLIB) {
 		_systemVars.systemFlags |= SF_SBLASTER;
 		_skyMusic = new SkyAdlibMusic(_mixer, _skyDisk, _system);
 	} else {
 		_systemVars.systemFlags |= SF_ROLAND;
 		if (ConfMan.getBool("native_mt32"))
-			_skyMusic = new SkyMT32Music(_detector->createMidi(), _skyDisk, _system);
+			_skyMusic = new SkyMT32Music(_detector->createMidi(midiDriver), _skyDisk, _system);
 		else
-			_skyMusic = new SkyGmMusic(_detector->createMidi(), _skyDisk, _system);
+			_skyMusic = new SkyGmMusic(_detector->createMidi(midiDriver), _skyDisk, _system);
 	}
 
 	if (isCDVersion()) {





More information about the Scummvm-git-logs mailing list