[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.383,2.384

Travis Howell kirben at users.sourceforge.net
Wed Sep 10 04:44:43 CEST 2003


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

Modified Files:
	scummvm.cpp 
Log Message:

Check for Roland patch in loom and monkeyega, give better error if patch not found.


Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.383
retrieving revision 2.384
diff -u -d -r2.383 -r2.384
--- scummvm.cpp	10 Sep 2003 00:28:26 -0000	2.383
+++ scummvm.cpp	10 Sep 2003 11:43:19 -0000	2.384
@@ -1129,9 +1129,28 @@
 		case MD_PCSPK:
 		case MD_PCJR:  VAR(VAR_SOUNDCARD) = 1; break;
 		default:       
-			if (_features & GF_SMALL_HEADER && !(_features & GF_AMIGA))
+			if ((_gameId == GID_MONKEY_EGA) || ((_gameId == GID_MONKEY_VGA) && !(_features & GF_AMIGA))
+			   || (_gameId == GID_LOOM)) {
+				if (_gameId == GID_LOOM) {
+					char buf[50];
+					uint i = 82;
+					File f;
+					while (i < 86) {
+						sprintf(buf, "%d.LFL", i);
+						f.open(buf, _gameDataPath);
+						if (f.isOpen() == false)
+							error("Native MIDI support requires Roland patch from LucasArts");
+						f.close();
+						i++;
+					}
+				} else if (_gameId == GID_MONKEY_EGA) {
+						File f;
+						f.open("DISK09.LEC", _gameDataPath);
+						if (f.isOpen() == false)
+							error("Native MIDI support requires Roland patch from LucasArts");
+				}
 				VAR(VAR_SOUNDCARD) = 4;
-			else
+			} else
 				VAR(VAR_SOUNDCARD) = 3;
 		}
 		VAR(VAR_VIDEOMODE) = 0x13;





More information about the Scummvm-git-logs mailing list