diff options
| author | Paweł Kołodziejski | 2002-11-10 17:17:11 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2002-11-10 17:17:11 +0000 |
| commit | 2965bd27086e443018cc9d63ac59befc884eed5b (patch) | |
| tree | c63c2f8de934f8ceb7093f8ed96963eba1afff6b /scumm | |
| parent | a413779432b8e0e0c036a0a5c58fd89b82d25b11 (diff) | |
| download | scummvm-rg350-2965bd27086e443018cc9d63ac59befc884eed5b.tar.gz scummvm-rg350-2965bd27086e443018cc9d63ac59befc884eed5b.tar.bz2 scummvm-rg350-2965bd27086e443018cc9d63ac59befc884eed5b.zip | |
increasing actor palette to 256
svn-id: r5505
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/actor.cpp | 10 | ||||
| -rw-r--r-- | scumm/actor.h | 2 | ||||
| -rw-r--r-- | scumm/costume.h | 2 | ||||
| -rw-r--r-- | scumm/saveload.cpp | 1 |
4 files changed, 11 insertions, 4 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index b2a62b1fa2..7e41ba5798 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -1144,8 +1144,14 @@ void Actor::setActorCostume(int c) cost.reset(); } - for (i = 0; i < 32; i++) - palette[i] = 0xFF; + if (_features & GF_AFTER_V7) { + for (i = 0; i < 256; i++) + palette[i] = 0xFF; + } else { + for (i = 0; i < 32; i++) + palette[i] = 0xFF; + } + } void Actor::startWalkActor(int destX, int destY, int dir) diff --git a/scumm/actor.h b/scumm/actor.h index ab6a1e4739..3bb5188a8d 100644 --- a/scumm/actor.h +++ b/scumm/actor.h @@ -111,7 +111,7 @@ public: int16 animVariable[16]; uint16 sound[8]; CostumeData cost; - byte palette[64]; + byte palette[256]; protected: Scumm *_vm; diff --git a/scumm/costume.h b/scumm/costume.h index 1d5c58efdc..7b2d5cc66d 100644 --- a/scumm/costume.h +++ b/scumm/costume.h @@ -82,7 +82,7 @@ public: int _imgbufoffs; byte _repcolor; byte _replen; - byte _palette[32]; + byte _palette[256]; void proc6(); void proc5(); diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp index f8a5d031b1..83917078c6 100644 --- a/scumm/saveload.cpp +++ b/scumm/saveload.cpp @@ -265,6 +265,7 @@ void Scumm::saveOrLoad(Serializer *s) MKLINE(Actor, speedy, sleUint16), MKLINE(Actor, cost.animCounter1, sleUint16), MKLINE(Actor, cost.animCounter2, sleByte), + // TODO: increase actor palette to 256 MKARRAY(Actor, palette[0], sleByte, 64), MKLINE(Actor, mask, sleByte), // FIXME: see actor.h comment MKLINE(Actor, shadow_mode, sleByte), |