[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.128,1.129 scummvm.cpp,2.332,2.333

[Travis Howell]

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

Modified Files:
	resource.cpp scummvm.cpp 
Log Message:

Add roland support for loom )ega)
Enable roland support for monkeyega


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- resource.cpp	14 Aug 2003 09:27:33 -0000	1.128
+++ resource.cpp	14 Aug 2003 10:28:16 -0000	1.129
@@ -1426,7 +1426,20 @@
 
 	debug(4, "readSoundResourceSmallHeader(%s,%d)", resTypeFromId(type), idx);
 
-	if ((_features & GF_OLD_BUNDLE)) {
+	if ((_gameId == GID_LOOM) && VAR_SOUNDCARD == 4) {
+		byte *ptr, *src_ptr;
+		ro_offs = _fileHandle.pos();
+		ro_size = _fileHandle.readUint16LE();
+
+		src_ptr = (byte *) calloc(ro_size - 4, 1);
+		_fileHandle.seek(ro_offs +4, SEEK_SET);
+		_fileHandle.read(src_ptr, ro_size -4);
+
+		ptr = createResource(type, idx, ro_size + 2);
+		memcpy(ptr, "RO", 2); ptr += 2;
+		memcpy(ptr, src_ptr, ro_size - 4); ptr += ro_size - 4;
+		return 1;
+	} else if (_features & GF_OLD_BUNDLE) {
 		wa_offs = _fileHandle.pos();
 		wa_size = _fileHandle.readUint16LE();
 		_fileHandle.seek(wa_size - 2, SEEK_CUR);

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.332
retrieving revision 2.333
diff -u -d -r2.332 -r2.333
--- scummvm.cpp	14 Aug 2003 08:26:59 -0000	2.332
+++ scummvm.cpp	14 Aug 2003 10:28:16 -0000	2.333
@@ -82,11 +82,11 @@
 	 GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALING | GF_OLD256 | GF_FEW_LOCALS, "00.LFL"},
 	{"zak256", "Zak McKracken and the Alien Mindbenders (256)", GID_ZAK256, 3, VersionSettings::ADLIB_ALWAYS,
 	 GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALING | GF_OLD256 | GF_FMTOWNS | GF_AUDIOTRACKS, "00.LFL"},
-	{"loom", "Loom", GID_LOOM, 3, VersionSettings::ADLIB_ALWAYS,
+	{"loom", "Loom", GID_LOOM, 3, VersionSettings::ADLIB_PREFERRED,
 	 GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALING | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE, "00.LFL"},
 
 	/* Scumm Version 4 */
-	{"monkeyEGA", "Monkey Island 1 (EGA)", GID_MONKEY_EGA, 4, VersionSettings::ADLIB_ALWAYS,
+	{"monkeyEGA", "Monkey Island 1 (EGA)", GID_MONKEY_EGA, 4, VersionSettings::ADLIB_PREFERRED,
 	 GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR, "000.LFL"},
 	{"pass", "Passport to Adventure", GID_PASS, 4, VersionSettings::ADLIB_ALWAYS,
 	 GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR, "000.LFL"},