aboutsummaryrefslogtreecommitdiff
path: root/scumm/actor.cpp
diff options
context:
space:
mode:
authorTravis Howell2003-12-03 06:34:45 +0000
committerTravis Howell2003-12-03 06:34:45 +0000
commit6f567b480f4db5b1ac1092ad070d7f03228b9de8 (patch)
tree0c9005411a284db6787f1d88836fc6a0bfbbc5ee /scumm/actor.cpp
parent1799a7f307937be3b771bb7d8cc572941194e102 (diff)
downloadscummvm-rg350-6f567b480f4db5b1ac1092ad070d7f03228b9de8.tar.gz
scummvm-rg350-6f567b480f4db5b1ac1092ad070d7f03228b9de8.tar.bz2
scummvm-rg350-6f567b480f4db5b1ac1092ad070d7f03228b9de8.zip
Add fix for annoying costume warning in FT, part of patch #853099
svn-id: r11481
Diffstat (limited to 'scumm/actor.cpp')
-rw-r--r--scumm/actor.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index 02808e4c45..b1763e523b 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -1572,6 +1572,10 @@ void Actor::remapActorPalette(int r_fact, int g_fact, int b_fact, int threshold)
}
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;
}