[Scummvm-cvs-logs] CVS: scummvm/common gameDetector.cpp,1.134,1.135

[Jamieson Christian]

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv13978/scummvm/common

Modified Files:
	gameDetector.cpp 
Log Message:
Fix ALWAYS_ADLIB override of native driver selection

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.cpp,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- gameDetector.cpp	13 Aug 2003 14:07:56 -0000	1.134
+++ gameDetector.cpp	13 Aug 2003 15:34:00 -0000	1.135
@@ -704,7 +704,10 @@
 	 * and the game is one of those that want adlib as
 	 * default, OR if the game is an older game that doesn't
 	 * support anything else anyway. */
-	if ((_game.adlib & VersionSettings::ADLIB_ALWAYS) && _midi_driver != MD_NULL ||
+	bool nativeMidiDriver =
+		(_midi_driver != MD_NULL && _midi_driver != MD_ADLIB &&
+		 _midi_driver != MD_PCSPK && _midi_driver != MD_PCJR);
+	if ((_game.adlib & VersionSettings::ADLIB_ALWAYS) && nativeMidiDriver ||
 	    (_game.adlib & VersionSettings::ADLIB_PREFERRED) && _midi_driver == MD_AUTO) {
 		_midi_driver = MD_ADLIB;
 	}