thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix palette regression in HE99+ games, the HE palette number must be set, before setting the costume palette.

Browse source 
svn-id: r41121
This commit is contained in:
Travis Howell 2009-06-02 06:03:49 +00:00
parent a4292afcdc
commit d532328dd4
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/scumm/actor.cpp
View file

@ -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) {