From be1334b202d219995869b5d0eedba08c6f2aca22 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 9 Nov 2012 18:16:29 +0100
Subject: [PATCH] disease tests

---
 apps/openmw/mwmechanics/creaturestats.cpp | 10 ++++++++
 apps/openmw/mwmechanics/creaturestats.hpp |  4 ++++
 apps/openmw/mwmechanics/spells.cpp        | 28 +++++++++++++++++++++++
 apps/openmw/mwmechanics/spells.hpp        |  4 ++++
 4 files changed, 46 insertions(+)

diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 95e721c01..e94adf458 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -232,4 +232,14 @@ namespace MWMechanics
                 mDead = false;
         }
     }
+    
+    bool CreatureStats::hasCommonDisease() const
+    {
+        return mSpells.hasCommonDisease();
+    }
+
+    bool CreatureStats::hasBlightDisease() const
+    {
+        return mSpells.hasBlightDisease();
+    }
 }
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index 671dcd439..cdeee6853 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -109,6 +109,10 @@ namespace MWMechanics
         bool isDead() const;
         
         void resurrect();
+        
+        bool hasCommonDisease() const;
+
+        bool hasBlightDisease() const;         
     };
 }
 
diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp
index 3ff10cdb8..ef084f479 100644
--- a/apps/openmw/mwmechanics/spells.cpp
+++ b/apps/openmw/mwmechanics/spells.cpp
@@ -75,4 +75,32 @@ namespace MWMechanics
     {
         return mSelectedSpell;
     }
+    
+    bool Spells::hasCommonDisease() const
+    {
+        for (TIterator iter = mSpells.begin(); iter!=mSpells.end(); ++iter)
+        {
+            const ESM::Spell *spell =
+                MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (*iter);
+        
+            if (spell->mData.mFlags & ESM::Spell::ST_Disease)
+                return true;
+        }
+        
+        return false;
+    }
+
+    bool Spells::hasBlightDisease() const
+    {
+        for (TIterator iter = mSpells.begin(); iter!=mSpells.end(); ++iter)
+        {
+            const ESM::Spell *spell =
+                MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (*iter);
+        
+            if (spell->mData.mFlags & ESM::Spell::ST_Blight)
+                return true;
+        }
+        
+        return false;    
+    }
 }
diff --git a/apps/openmw/mwmechanics/spells.hpp b/apps/openmw/mwmechanics/spells.hpp
index d90f5b502..12308661b 100644
--- a/apps/openmw/mwmechanics/spells.hpp
+++ b/apps/openmw/mwmechanics/spells.hpp
@@ -55,6 +55,10 @@ namespace MWMechanics
 
             const std::string getSelectedSpell() const;
             ///< May return an empty string.
+            
+            bool hasCommonDisease() const;
+
+            bool hasBlightDisease() const;            
     };
 }