aboutsummaryrefslogtreecommitdiff
path: root/scumm/actor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scumm/actor.cpp')
-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) {