[Scummvm-cvs-logs] CVS: scummvm/common gameDetector.cpp,1.127,1.128

Max Horn fingolfin at users.sourceforge.net
Sun Aug 3 15:52:02 CEST 2003


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

Modified Files:
	gameDetector.cpp 
Log Message:
fix for bug #782132 (MI1: -e null doesn't work)

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- gameDetector.cpp	1 Aug 2003 12:18:35 -0000	1.127
+++ gameDetector.cpp	3 Aug 2003 22:51:22 -0000	1.128
@@ -693,8 +693,8 @@
 	 * 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) ||
-	   ((_game.adlib & VersionSettings::ADLIB_PREFERRED) && _midi_driver == MD_AUTO)) {
+	if ((_game.adlib & VersionSettings::ADLIB_ALWAYS) && _midi_driver != MD_NULL ||
+	    (_game.adlib & VersionSettings::ADLIB_PREFERRED) && _midi_driver == MD_AUTO) {
 		_midi_driver = MD_ADLIB;
 		_use_adlib = true;
 	}





More information about the Scummvm-git-logs mailing list