[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.479.2.5,1.479.2.6

Max Horn fingolfin at users.sourceforge.net
Thu Nov 17 15:43:01 CET 2005


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

Modified Files:
      Tag: branch-0-8-0
	sound.cpp 
Log Message:
Revert to warnings when certain music/speech files aren't found

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.479.2.5
retrieving revision 1.479.2.6
diff -u -d -r1.479.2.5 -r1.479.2.6
--- sound.cpp	23 Oct 2005 14:24:06 -0000	1.479.2.5
+++ sound.cpp	17 Nov 2005 23:42:04 -0000	1.479.2.6
@@ -256,7 +256,7 @@
 			strcpy(buf, buf1);
 		}
 		if (musicFile.open(buf) == false) {
-			error("playSound: Can't open music file %s", buf);
+			warning("playSound: Can't open music file %s", buf);
 			return;
 		}
 		if (!getHEMusicDetails(soundID, music_offs, size)) {
@@ -515,7 +515,7 @@
 				ptr += 0x20;
 				size -= 0x20;
 				if (size < waveSize) {
-					error("Wrong wave size in sound #%i: %i", soundID, waveSize);
+					warning("Wrong wave size in sound #%i: %i", soundID, waveSize);
 					waveSize = size;
 				}
 				sound = (char *)malloc(waveSize);
@@ -750,7 +750,7 @@
 		else if (offset == 79)
 			strcpy(roomname, "newton");
 		else {
-			error("startTalkSound: dig demo: unknown room number: %d", offset);
+			warning("startTalkSound: dig demo: unknown room number: %d", offset);
 			return;
 		}
 
@@ -762,13 +762,13 @@
 			_vm->openFile(*_sfxFile, filename);
 		}
 		if (!_sfxFile->isOpen()) {
-			error("startTalkSound: dig demo: voc file not found");
+			warning("startTalkSound: dig demo: voc file not found");
 			return;
 		}
 	} else {
 
 		if (!_sfxFile->isOpen()) {
-			error("startTalkSound: SFX file is not open");
+			warning("startTalkSound: SFX file is not open");
 			return;
 		}
 
@@ -793,11 +793,11 @@
 													sizeof(MP3OffsetTable), compareMP3OffsetTable);
 
 			if (result == NULL) {
-				error("startTalkSound: did not find sound at offset %d !", offset);
+				warning("startTalkSound: did not find sound at offset %d !", offset);
 				return;
 			}
 			if (2 * num != result->num_tags) {
-				error("startTalkSound: number of tags do not match (%d - %d) !", b,
+				warning("startTalkSound: number of tags do not match (%d - %d) !", b,
 								result->num_tags);
 				num = result->num_tags;
 			}
@@ -847,7 +847,7 @@
 		}
 
 		if (!input) {
-			error("startSfxSound failed to load sound");
+			warning("startSfxSound failed to load sound");
 			return;
 		}
 





More information about the Scummvm-git-logs mailing list