diff options
| author | Paweł Kołodziejski | 2002-11-10 17:35:02 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2002-11-10 17:35:02 +0000 |
| commit | 2a58faff8f15b19ea17e545eb97ddc346bf157f3 (patch) | |
| tree | 9cdff1b3d38c242d8ee92c21759d95463be9bb55 /scumm | |
| parent | da5a347d3e6220f6dcd141706e9fb6243bb6d319 (diff) | |
| download | scummvm-rg350-2a58faff8f15b19ea17e545eb97ddc346bf157f3.tar.gz scummvm-rg350-2a58faff8f15b19ea17e545eb97ddc346bf157f3.tar.bz2 scummvm-rg350-2a58faff8f15b19ea17e545eb97ddc346bf157f3.zip | |
revert costume palette table to 32 and fix actor.cpp compilation
svn-id: r5507
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/actor.cpp | 2 | ||||
| -rw-r--r-- | scumm/costume.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index 7e41ba5798..5089c2f92f 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -1144,7 +1144,7 @@ void Actor::setActorCostume(int c) cost.reset(); } - if (_features & GF_AFTER_V7) { + if (_vm->_features & GF_AFTER_V7) { for (i = 0; i < 256; i++) palette[i] = 0xFF; } else { diff --git a/scumm/costume.h b/scumm/costume.h index 7b2d5cc66d..1d5c58efdc 100644 --- a/scumm/costume.h +++ b/scumm/costume.h @@ -82,7 +82,7 @@ public: int _imgbufoffs; byte _repcolor; byte _replen; - byte _palette[256]; + byte _palette[32]; void proc6(); void proc5(); |