[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.229.2.1,1.229.2.2
Travis Howell
kirben at users.sourceforge.net
Tue Feb 24 20:53:00 CET 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19433/scumm
Modified Files:
Tag: branch-0-6-0
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.229.2.1
retrieving revision 1.229.2.2
diff -u -d -r1.229.2.1 -r1.229.2.2
--- actor.cpp 17 Feb 2004 00:44:12 -0000 1.229.2.1
+++ actor.cpp 25 Feb 2004 04:37:28 -0000 1.229.2.2
@@ -1649,20 +1649,9 @@
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)
+ if (!isInCurrentRoom() || costume < 1 || costume >= _vm->_numCostumes - 1)
return;
- warning("Remap actor %d invalid costume %d", number, costume);
- return;
- }
-
akos = _vm->getResourceAddress(rtCostume, costume);
if (!akos) {
warning("Can't remap actor %d, costume %d not found", number, costume);
More information about the Scummvm-git-logs
mailing list