diff options
| author | Travis Howell | 2009-06-02 06:03:49 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-06-02 06:03:49 +0000 |
| commit | d532328dd43b9fcd269310edf8b7ba5d099c2f20 (patch) | |
| tree | 8b18f026e72b5d426e7d1672ade46b65422c1b84 /engines/scumm/actor.cpp | |
| parent | a4292afcdc7be36506871bf5752d9ae0ef564b2f (diff) | |
| download | scummvm-rg350-d532328dd43b9fcd269310edf8b7ba5d099c2f20.tar.gz scummvm-rg350-d532328dd43b9fcd269310edf8b7ba5d099c2f20.tar.bz2 scummvm-rg350-d532328dd43b9fcd269310edf8b7ba5d099c2f20.zip | |
Fix palette regression in HE99+ games, the HE palette number must be set, before setting the costume palette.
svn-id: r41121
Diffstat (limited to 'engines/scumm/actor.cpp')
| -rw-r--r-- | engines/scumm/actor.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp index 9c805f4a59..cf90094112 100644 --- a/engines/scumm/actor.cpp +++ b/engines/scumm/actor.cpp @@ -1505,6 +1505,9 @@ void Actor::prepareDrawActorCostume(BaseCostumeRenderer *bcr) { } void ActorHE::prepareDrawActorCostume(BaseCostumeRenderer *bcr) { + // HE palette number must be set, before setting the costume palette + bcr->_paletteNum = _hePaletteNum; + Actor::prepareDrawActorCostume(bcr); bcr->_actorX += _heOffsX; @@ -1517,7 +1520,6 @@ void ActorHE::prepareDrawActorCostume(BaseCostumeRenderer *bcr) { } bcr->_skipLimbs = (_heSkipLimbs != 0); - bcr->_paletteNum = _hePaletteNum; if (_vm->_game.heversion >= 80 && _heNoTalkAnimation == 0 && _animProgress == 0) { if (_vm->getTalkingActor() == _number && !_vm->_string[0].no_talk_anim) { |