From f4517c8221184dc85904724b97ca86bdc59f0a91 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 4 Jan 2014 20:02:29 +0100
Subject: [PATCH] For dialogue filtering, use the Vampirism magic effect
 instead of the untouched NpcStats::mVampire

---
 apps/openmw/mwdialogue/filter.cpp    |  3 ++-
 apps/openmw/mwmechanics/npcstats.cpp | 11 -----------
 apps/openmw/mwmechanics/npcstats.hpp |  5 -----
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 9d08debffb..92738ec0ed 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -514,7 +514,8 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co
 
         case SelectWrapper::Function_PcVampire:
 
-            return MWWorld::Class::get (player).getNpcStats (player).isVampire();
+            return MWWorld::Class::get (player).getCreatureStats(player).getMagicEffects().
+                    get(ESM::MagicEffect::Vampirism).mMagnitude > 0;
 
         case SelectWrapper::Function_TalkedToPc:
 
diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp
index 0a0b51270d..94dd971867 100644
--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/apps/openmw/mwmechanics/npcstats.cpp
@@ -28,7 +28,6 @@ MWMechanics::NpcStats::NpcStats()
 , mBounty (0)
 , mLevelProgress(0)
 , mDisposition(0)
-, mVampire (0)
 , mReputation(0)
 , mWerewolfKills (0)
 , mProfit(0)
@@ -318,16 +317,6 @@ void MWMechanics::NpcStats::setFactionReputation (const std::string& faction, in
     mFactionReputation[faction] = value;
 }
 
-bool MWMechanics::NpcStats::isVampire() const
-{
-    return mVampire;
-}
-
-void MWMechanics::NpcStats::setVampire (bool set)
-{
-    mVampire = set;
-}
-
 int MWMechanics::NpcStats::getReputation() const
 {
     return mReputation;
diff --git a/apps/openmw/mwmechanics/npcstats.hpp b/apps/openmw/mwmechanics/npcstats.hpp
index 552422d843..586e068322 100644
--- a/apps/openmw/mwmechanics/npcstats.hpp
+++ b/apps/openmw/mwmechanics/npcstats.hpp
@@ -50,7 +50,6 @@ namespace MWMechanics
             int mBounty;
             std::set<std::string> mExpelled;
             std::map<std::string, int> mFactionReputation;
-            bool mVampire;
             int mReputation;
             int mWerewolfKills;
             int mProfit;
@@ -135,10 +134,6 @@ namespace MWMechanics
 
             void setFactionReputation (const std::string& faction, int value);
 
-            bool isVampire() const;
-
-            void setVampire (bool set);
-
             bool hasSkillsForRank (const std::string& factionId, int rank) const;
 
             bool isWerewolf() const;