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

gemrb · Dec 28, 2013 · 47e77b2 · 47e77b2
1 parent 515da00
commit 47e77b2
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/gemrb/core/Scriptable/Actor.cpp b/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);
 	}