[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.234,1.235

Travis Howell kirben at users.sourceforge.net
Tue Feb 24 06:14:13 CET 2004


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

Modified Files:
	actor.cpp 
Log Message:

Remove warnings, they were dummy warnings in originals.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -d -r1.234 -r1.235
--- actor.cpp	21 Feb 2004 11:41:46 -0000	1.234
+++ actor.cpp	24 Feb 2004 13:59:29 -0000	1.235
@@ -1654,19 +1654,8 @@
 	int r, g, b;
 	byte akpl_color;
 
-	if (!isInCurrentRoom()) {
-		warning("Remap actor %d not in current room", number);
-		return;
-	}
-
-	if (costume < 1 || costume >= _vm->_numCostumes - 1) {
-		// in FT costume 0 is a normal situation
-		if (_vm->_gameId == GID_FT && !costume)
-			return;
-
-		warning("Remap actor %d invalid costume %d", number, costume);
+	if (!isInCurrentRoom() || costume < 1 || costume >= _vm->_numCostumes - 1)
 		return;
-	}
 
 	akos = _vm->getResourceAddress(rtCostume, costume);
 	if (!akos) {





More information about the Scummvm-git-logs mailing list