[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.475,1.476 sound.cpp,1.450,1.451

kirben kirben at users.sourceforge.net
Fri Apr 29 08:36:01 CEST 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9342/scumm

Modified Files:
	scumm.cpp sound.cpp 
Log Message:

Some sound resources in soccer2004 are compressed too.
Add Moonbase demo, as testing target only.


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -d -r1.475 -r1.476
--- scumm.cpp	29 Apr 2005 01:36:30 -0000	1.475
+++ scumm.cpp	29 Apr 2005 15:33:05 -0000	1.476
@@ -465,6 +465,8 @@
 	{"7f45ddd6dbfbf8f80c0c0efea4c295bc", "Maniac Mansion (v1)", GID_MANIAC, 1, 0, 25, MDT_PCSPK,
 	 GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALING, Common::kPlatformUnknown, 0, 0},
 
+	{"ef71a322b6530ac45b1a070f7c0795f7", "Moonbase Commander (Demo)", GID_HEGAME, 6, 100, 62, MDT_NONE,
+	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_LOCALIZED, Common::kPlatformUnknown, 0, 0},
 
 	{"37aed3f91c1ef959e0bd265f9b13781f", "Pajama Sam: No Need To Hide When It's Dark Outside (Updated)", GID_HEGAME, 6, 100, 61, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformUnknown, 0, 0}, // PajamaNHD

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -d -r1.450 -r1.451
--- sound.cpp	27 Apr 2005 04:47:02 -0000	1.450
+++ sound.cpp	29 Apr 2005 15:33:07 -0000	1.451
@@ -294,7 +294,8 @@
 		Common::MemoryReadStream stream(ptr, size);
 
 		if (!loadWAVFromStream(stream, size, rate, flags)) {
-			error("playSound: Not a valid WAV file");
+			warning("playSound: IMA ADPCM compression not supported");
+			return;
 		}
 
 		// Allocate a sound buffer, copy the data into it, and play





More information about the Scummvm-git-logs mailing list