From bc85bb32c21cf4a1e932991eebe7e0f3d2dbd0eb Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 12 Dec 2014 02:39:59 +0100
Subject: [PATCH] Fix vampirism magic effect not applying immediately (Fixes
 #1984)

---
 apps/openmw/mwmechanics/character.cpp |  8 +++++---
 apps/openmw/mwmechanics/character.hpp |  2 +-
 apps/openmw/mwrender/animation.hpp    |  1 +
 apps/openmw/mwrender/npcanimation.cpp | 10 ++++++++++
 apps/openmw/mwrender/npcanimation.hpp |  2 ++
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 87d9a5b67..4d74133aa 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1279,7 +1279,7 @@ void CharacterController::update(float duration)
     const MWWorld::Class &cls = mPtr.getClass();
     Ogre::Vector3 movement(0.0f);
 
-    updateVisibility();
+    updateMagicEffects();
 
     if(!cls.isActor())
     {
@@ -1777,7 +1777,7 @@ void CharacterController::updateContinuousVfx()
     }
 }
 
-void CharacterController::updateVisibility()
+void CharacterController::updateMagicEffects()
 {
     if (!mPtr.getClass().isActor())
         return;
@@ -1794,9 +1794,11 @@ void CharacterController::updateVisibility()
     {
         alpha *= std::max(0.2f, (100.f - chameleon)/100.f);
     }
-
     mAnimation->setAlpha(alpha);
 
+    bool vampire = mPtr.getClass().getCreatureStats(mPtr).getMagicEffects().get(ESM::MagicEffect::Vampirism).getMagnitude() > 0.0f;
+    mAnimation->setVampire(vampire);
+
     float light = mPtr.getClass().getCreatureStats(mPtr).getMagicEffects().get(ESM::MagicEffect::Light).getMagnitude();
     mAnimation->setLightEffect(light);
 }
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 2a14c53b9..3409efedf 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -190,7 +190,7 @@ class CharacterController
 
     void castSpell(const std::string& spellid);
 
-    void updateVisibility();
+    void updateMagicEffects();
 
     void playDeath(float startpoint, CharacterState death);
     void playRandomDeath(float startpoint = 0.0f);
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index a8a9ee11e..d25d4f0b0 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -228,6 +228,7 @@ public:
     virtual void preRender (Ogre::Camera* camera);
 
     virtual void setAlpha(float alpha) {}
+    virtual void setVampire(bool vampire) {}
 
 public:
     void updatePtr(const MWWorld::Ptr &ptr);
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 4b5ddcbec..b93b37aea 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -983,4 +983,14 @@ void NpcAnimation::equipmentChanged()
     updateParts();
 }
 
+void NpcAnimation::setVampire(bool vampire)
+{
+    if (mNpcType == Type_Werewolf) // we can't have werewolf vampires, can we
+        return;
+    if ((mNpcType == Type_Vampire) != vampire)
+    {
+        rebuild();
+    }
+}
+
 }
diff --git a/apps/openmw/mwrender/npcanimation.hpp b/apps/openmw/mwrender/npcanimation.hpp
index ee62fce9c..6631c8f41 100644
--- a/apps/openmw/mwrender/npcanimation.hpp
+++ b/apps/openmw/mwrender/npcanimation.hpp
@@ -168,6 +168,8 @@ public:
     /// Make the NPC only partially visible
     virtual void setAlpha(float alpha);
 
+    virtual void setVampire(bool vampire);
+
     /// Prepare this animation for being rendered with \a camera (rotates billboard nodes)
     virtual void preRender (Ogre::Camera* camera);
 };