[Scummvm-cvs-logs] CVS: scummvm/common gameDetector.cpp,1.137,1.138 gameDetector.h,1.53,1.54

[Robert G?ffringmann]

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

Modified Files:
	gameDetector.cpp gameDetector.h 
Log Message:
added VersionSettings flag MDT_PREFER_NATIVE for defaulting to midi music

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.cpp,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- gameDetector.cpp	16 Aug 2003 10:16:07 -0000	1.137
+++ gameDetector.cpp	18 Aug 2003 23:19:53 -0000	1.138
@@ -704,8 +704,12 @@
 	 * 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 (_midi_driver == MD_AUTO)
-		_midi_driver = MD_ADLIB;
+	if (_midi_driver == MD_AUTO) {
+		if (_game.midi & MDT_PREFER_NATIVE)
+			_midi_driver = getMidiDriverType();
+		else
+			_midi_driver = MD_ADLIB;
+	}
 	bool nativeMidiDriver =
 		(_midi_driver != MD_NULL && _midi_driver != MD_ADLIB &&
 		 _midi_driver != MD_PCSPK && _midi_driver != MD_PCJR);

Index: gameDetector.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- gameDetector.h	15 Aug 2003 10:19:06 -0000	1.53
+++ gameDetector.h	18 Aug 2003 23:19:53 -0000	1.54
@@ -65,7 +65,8 @@
 	MDT_NONE   = 0,
 	MDT_PCSPK  = 1, // MD_PCSPK and MD_PCJR
 	MDT_ADLIB  = 2, // MD_ADLIB
-	MDT_NATIVE = 4  // Everything else
+	MDT_NATIVE = 4,  // Everything else
+	MDT_PREFER_NATIVE = 8
 };
 
 struct VersionSettings {