[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.249,1.250

Travis Howell kirben at users.sourceforge.net
Sat Jul 3 20:26:07 CEST 2004


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

Modified Files:
	actor.cpp 
Log Message:

Switch warnings to debug, since they occur normally in games.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -d -r1.249 -r1.250
--- actor.cpp	4 Jul 2004 03:12:02 -0000	1.249
+++ actor.cpp	4 Jul 2004 03:25:24 -0000	1.250
@@ -1662,8 +1662,13 @@
 	int r, g, b;
 	byte akpl_color;
 
-	if (!isInCurrentRoom() || costume < 1 || costume >= _vm->_numCostumes - 1)
+	if (!isInCurrentRoom()) {
+		debugC(DEBUG_ACTORS, "Remap actor %d not in current room", number);
 		return;
+	} else if (costume < 1 || costume >= _vm->_numCostumes - 1) {
+		debugC(DEBUG_ACTORS, "Remap actor %d invalid costume %d", number, costume);
+		return;
+	}
 
 	akos = _vm->getResourceAddress(rtCostume, costume);
 	if (!akos) {
@@ -1686,7 +1691,7 @@
 	rgbs = _vm->findResource(MKID('RGBS'), akos);
 
 	if (!rgbs) {
-		warning("Can't remap actor %d costume %d doesn't contain an RGB block", number, costume);
+		debugC(DEBUG_ACTORS, "Can't remap actor %d costume %d doesn't contain an RGB block", number, costume);
 		return;
 	}
 	// skip resource header





More information about the Scummvm-git-logs mailing list