[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.182,2.183

Jamieson Christian jamieson630 at users.sourceforge.net
Mon May 26 16:29:03 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv32759/scummvm/scumm

Modified Files:
	scummvm.cpp 
Log Message:
Added 'mmamiga' game ID to disable PC speaker emulator

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.182
retrieving revision 2.183
diff -u -d -r2.182 -r2.183
--- scummvm.cpp	26 May 2003 22:03:03 -0000	2.182
+++ scummvm.cpp	26 May 2003 23:16:24 -0000	2.183
@@ -67,6 +67,8 @@
 	/* Scumm Version 2 */
 	{"maniac", "Maniac Mansion", GID_MANIAC, 2, 0, 0,
 	 GF_AFTER_V2 | GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING, "00.LFL"},
+	{"mmamiga", "Maniac Mansion", GID_MANIAC, 2, 0, 0,
+	 GF_AFTER_V2 | GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING | GF_AMIGA, "00.LFL"},
 	{"zak",         "Zak McKracken and the Alien Mindbenders",      GID_ZAK,     2, 0, 0,
 	 GF_AFTER_V2 | GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING, "00.LFL"},
 
@@ -612,8 +614,9 @@
 		_imuse = NULL;
 		_playerV2 = NULL;
 	} else if (_features & GF_OLD_BUNDLE && !(_features & GF_AFTER_V3)) {
-		debug (0, "Creating player");
-		_playerV2 = new Player_V2();
+		_playerV2 = NULL;
+		if (!(_features & GF_AMIGA))
+			_playerV2 = new Player_V2();
 		_imuse = NULL;
 		_imuseDigital = NULL;
 	} else {





More information about the Scummvm-git-logs mailing list