[Scummvm-cvs-logs] SF.net SVN: scummvm:[38642] scummvm/trunk/engines/sci/sfx/iterator.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Sat Feb 21 00:19:47 CET 2009


Revision: 38642
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38642&view=rev
Author:   thebluegr
Date:     2009-02-20 23:19:47 +0000 (Fri, 20 Feb 2009)

Log Message:
-----------
Downgraded some errors to warnings and printf's

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/iterator.cpp

Modified: scummvm/trunk/engines/sci/sfx/iterator.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/iterator.cpp	2009-02-20 23:17:13 UTC (rev 38641)
+++ scummvm/trunk/engines/sci/sfx/iterator.cpp	2009-02-20 23:19:47 UTC (rev 38642)
@@ -1823,14 +1823,14 @@
 	do {
 		retval = (*it)->next(*it, buf, result);
 		if (retval == SI_MORPH) {
-			error("  Morphing %p (stored at %p)\n", (void *)*it, (void *)it);
+			printf("  Morphing %p (stored at %p)\n", (void *)*it, (void *)it);
 			if (!SIMSG_SEND((*it), SIMSG_ACK_MORPH)) {
 				BREAKPOINT();
-			} else error("SI_MORPH successful\n");
+			} else printf("SI_MORPH successful\n");
 		}
 
 		if (retval == SI_FINISHED)
-			error("[song-iterator] Song finished. mask = %04x, cm=%04x\n",
+			printf("[song-iterator] Song finished. mask = %04x, cm=%04x\n",
 			        mask, (*it)->channel_mask);
 		if (retval == SI_FINISHED
 		        && (mask & IT_READER_MAY_CLEAN)
@@ -1873,8 +1873,8 @@
 	int i;
 
 	if (!data || size < 22) {
-		error(SIPFX "Attempt to instantiate song iterator for null"
-		        " song data\n");
+		warning(SIPFX "Attempt to instantiate song iterator for null"
+		        " song data");
 		return NULL;
 	}
 
@@ -1923,7 +1923,7 @@
 
 	default:
 		/**-- Invalid/unsupported sound resources --**/
-		error(SIPFX "Attempt to instantiate invalid/unknown"
+		warning(SIPFX "Attempt to instantiate invalid/unknown"
 		        " song iterator type %d\n", type);
 		return NULL;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list