aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2004-02-24 13:59:29 +0000
committerTravis Howell2004-02-24 13:59:29 +0000
commit43cab33e9829380f9cf3632cab07915110e9966d (patch)
tree101b444e0d7b52e6356a20218d0a1184ad584c76 /scumm
parent6bb7c782764cd4da047be703746e176c1158ec56 (diff)
downloadscummvm-rg350-43cab33e9829380f9cf3632cab07915110e9966d.tar.gz
scummvm-rg350-43cab33e9829380f9cf3632cab07915110e9966d.tar.bz2
scummvm-rg350-43cab33e9829380f9cf3632cab07915110e9966d.zip
Remove warnings, they were dummy warnings in originals.
svn-id: r13024
Diffstat (limited to 'scumm')
-rw-r--r--scumm/actor.cpp13
1 files changed, 1 insertions, 12 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index 85e03dbc5d..cc21a49577 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -1654,19 +1654,8 @@ void Actor::remapActorPalette(int r_fact, int g_fact, int b_fact, int threshold)
int r, g, b;
byte akpl_color;
- if (!isInCurrentRoom()) {
- warning("Remap actor %d not in current room", number);
+ if (!isInCurrentRoom() || costume < 1 || costume >= _vm->_numCostumes - 1)
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);
- return;
- }
akos = _vm->getResourceAddress(rtCostume, costume);
if (!akos) {