Permalink
Browse files

Actor::RefreshEffects: don't trample the silly pst disguise system

  • Loading branch information...
1 parent 515da00 commit 47e77b2d546a866dd8f7e58576b07880e32d0ebc @lynxlynxlynx lynxlynxlynx committed Dec 28, 2013
Showing with 6 additions and 1 deletion.
  1. +6 −1 gemrb/core/Scriptable/Actor.cpp
View
7 gemrb/core/Scriptable/Actor.cpp
@@ -2902,7 +2902,12 @@ void Actor::RefreshEffects(EffectQueue *fx)
RefreshPCStats();
//if the animation ID was not modified by any effect, it may still be modified by something else
- if (Modified[IE_ANIMATION_ID] == BaseStats[IE_ANIMATION_ID]) {
+ // but not if pst is playing disguise tricks (GameScript::SetNamelessDisguise)
+ ieDword appearance = 0;
+ if (pstflags) {
+ core->GetGame()->locals->Lookup("APPEARANCE", appearance);
+ }
+ if (Modified[IE_ANIMATION_ID] == BaseStats[IE_ANIMATION_ID] && appearance == 0) {
UpdateAnimationID(true);
}

0 comments on commit 47e77b2

Please sign in to comment.