[Scummvm-cvs-logs] SF.net SVN: scummvm:[41121] scummvm/trunk/engines/scumm/actor.cpp

[Kirben at users.sourceforge.net]

Revision: 41121
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41121&view=rev
Author:   Kirben
Date:     2009-06-02 06:03:49 +0000 (Tue, 02 Jun 2009)

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

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/actor.cpp

Modified: scummvm/trunk/engines/scumm/actor.cpp
===================================================================
--- scummvm/trunk/engines/scumm/actor.cpp	2009-06-02 00:10:13 UTC (rev 41120)
+++ scummvm/trunk/engines/scumm/actor.cpp	2009-06-02 06:03:49 UTC (rev 41121)
@@ -1505,6 +1505,9 @@
 }
 
 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 @@
 	}
 
 	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) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.