From 83c3972a89d78cddee8c12b7616bd862fb6c30fa Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sun, 24 Jun 2012 16:23:43 +0200
Subject: [PATCH] Issue #314: added return value to addSpell function

---
 apps/openmw/mwmechanics/activespells.cpp | 6 ++++--
 apps/openmw/mwmechanics/activespells.hpp | 4 +++-
 apps/openmw/mwworld/class.cpp            | 5 +++++
 apps/openmw/mwworld/class.hpp            | 6 ++++++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index f456a0e51..e9215ec57 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -89,7 +89,7 @@ namespace MWMechanics
     : mSpellsChanged (false), mLastUpdate (MWBase::Environment::get().getWorld()->getTimeStamp())
     {}
 
-    void ActiveSpells::addSpell (const std::string& id)
+    bool ActiveSpells::addSpell (const std::string& id)
     {
         const ESM::EffectList& effects = getEffectList (id);
 
@@ -106,7 +106,7 @@ namespace MWMechanics
         }
 
         if (!found)
-            return;
+            return false;
 
         TContainer::iterator iter = mSpells.find (id);
 
@@ -119,6 +119,8 @@ namespace MWMechanics
             iter->second = std::make_pair (MWBase::Environment::get().getWorld()->getTimeStamp(), random);
 
         mSpellsChanged = true;
+
+        return true;
     }
 
     void ActiveSpells::removeSpell (const std::string& id)
diff --git a/apps/openmw/mwmechanics/activespells.hpp b/apps/openmw/mwmechanics/activespells.hpp
index 91c528587..2226cea84 100644
--- a/apps/openmw/mwmechanics/activespells.hpp
+++ b/apps/openmw/mwmechanics/activespells.hpp
@@ -43,9 +43,11 @@ namespace MWMechanics
 
             ActiveSpells();
 
-            void addSpell (const std::string& id);
+            bool addSpell (const std::string& id);
             ///< Overwrites an existing spell with the same ID. If the spell does not have any
             /// non-instant effects, it is ignored.
+            ///
+            /// \return Has the spell been added?
 
             void removeSpell (const std::string& id);
 
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index fe39406fe..dde3afbbb 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -32,6 +32,11 @@ namespace MWWorld
 
     }
 
+    bool Class::apply (const MWWorld::Ptr& ptr, const std::string& id) const
+    {
+        return false;
+    }
+
     MWMechanics::CreatureStats& Class::getCreatureStats (const Ptr& ptr) const
     {
         throw std::runtime_error ("class does not have creature stats");
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 46781d516..8dd427bde 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -164,6 +164,12 @@ namespace MWWorld
             /// effects). Throws an exception, if the object can't hold other objects.
             /// (default implementation: throws an exception)
 
+            virtual bool apply (const MWWorld::Ptr& ptr, const std::string& id) const;
+            ///< Apply \a id on \a ptr.
+            /// \return Any effect?
+            ///
+            /// (default implementation: ignore and return false)
+
             static const Class& get (const std::string& key);
             ///< If there is no class for this \a key, an exception is thrown.