[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.489,1.490

[Max Horn]

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

Modified Files:
	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.489
retrieving revision 1.490
diff -u -d -r1.489 -r1.490
--- sound.cpp	23 Oct 2005 14:21:20 -0000	1.489
+++ sound.cpp	17 Nov 2005 23:41:53 -0000	1.490
@@ -255,7 +255,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)) {
@@ -514,7 +514,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);
@@ -749,7 +749,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;
 		}
 
@@ -761,13 +761,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;
 		}
 
@@ -792,11 +792,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;
 			}
@@ -846,7 +846,7 @@
 		}
 
 		if (!input) {
-			error("startSfxSound failed to load sound");
+			warning("startSfxSound failed to load sound");
 			return;
 		}