Issue #356: Some CreatureStats cleanup

apps/openmw/mwmechanics/creaturestats.cpp

@@ -75,4 +75,176 @@ namespace MWMechanics
         return store.gameSettings.find ("fFatigueBase")->getFloat()
             - store.gameSettings.find ("fFatigueMult")->getFloat() * (1-normalised);
     }
+    
+    const Stat<int> &CreatureStats::getAttribute(int index) const
+    {
+        if (index < 0 || index > 7) {
+            throw std::runtime_error("attribute index is out of range");
+        }
+        return mAttributes[index];
+    }
+
+    const DynamicStat<int> &CreatureStats::getHealth() const
+    {
+        return mDynamic[0];
+    }
+
+    const DynamicStat<int> &CreatureStats::getMagicka() const
+    {
+        return mDynamic[1];
+    }
+
+    const DynamicStat<int> &CreatureStats::getFatigue() const
+    {
+        return mDynamic[2];
+    }
+
+    const Spells &CreatureStats::getSpells() const
+    {
+        return mSpells;
+    }
+
+    const ActiveSpells &CreatureStats::getActiveSpells() const
+    {
+        return mActiveSpells;
+    }
+
+    const MagicEffects &CreatureStats::getMagicEffects() const
+    {
+        return mMagicEffects;
+    }
+
+    int CreatureStats::getLevel() const
+    {
+        return mLevel;
+    }
+   
+    int CreatureStats::getHello() const
+    {
+        return mHello;
+    }
+
+    int CreatureStats::getFight() const
+    {
+        return mFight;
+    }
+
+    int CreatureStats::getFlee() const
+    {
+        return mFlee;
+    }
+
+    int CreatureStats::getAlarm() const
+    {
+        return mAlarm;
+    }
+
+    Stat<int> &CreatureStats::getAttribute(int index)
+    {
+        if (index < 0 || index > 7) {
+            throw std::runtime_error("attribute index is out of range");
+        }
+        return mAttributes[index];
+    }
+
+    DynamicStat<int> &CreatureStats::getHealth()
+    {
+        return mDynamic[0];
+    }
+
+    DynamicStat<int> &CreatureStats::getMagicka()
+    {
+        return mDynamic[1];
+    }
+
+    DynamicStat<int> &CreatureStats::getFatigue()
+    {
+        return mDynamic[2];
+    }
+
+    DynamicStat<int> &CreatureStats::getDynamic(int index)
+    {
+        if (index < 0 || index > 2) {
+            throw std::runtime_error("dynamic stat index is out of range");
+        }
+        return mDynamic[index];
+    }
+
+    Spells &CreatureStats::getSpells()
+    {
+        return mSpells;
+    }
+
+    void CreatureStats::setSpells(const Spells &spells)
+    {
+        mSpells = spells;
+    }
+
+    ActiveSpells &CreatureStats::getActiveSpells()
+    {
+        return mActiveSpells;
+    }
+
+    MagicEffects &CreatureStats::getMagicEffects()
+    {
+        return mMagicEffects;
+    }
+
+    void CreatureStats::setAttribute(int index, const Stat<int> &value)
+    {
+        if (index < 0 || index > 7) {
+            throw std::runtime_error("attribute index is out of range");
+        }
+        mAttributes[index] = value;
+    }
+
+    void CreatureStats::setHealth(const DynamicStat<int> &value)
+    {
+        mDynamic[0] = value;
+    }
+
+    void CreatureStats::setMagicka(const DynamicStat<int> &value)
+    {
+        mDynamic[1] = value;
+    }
+
+    void CreatureStats::setFatigue(const DynamicStat<int> &value)
+    {
+        mDynamic[2] = value;
+    }
+
+    void CreatureStats::setLevel(int level)
+    {
+        mLevel = level;
+    }
+
+    void CreatureStats::setActiveSpells(const ActiveSpells &active)
+    {
+        mActiveSpells = active;
+    }
+
+    void CreatureStats::setMagicEffects(const MagicEffects &effects)
+    {
+        mMagicEffects = effects;
+    }
+
+    void CreatureStats::setHello(int value)
+    {
+        mHello = value;
+    }
+
+    void CreatureStats::setFight(int value)
+    {
+        mFight = value;
+    }
+
+    void CreatureStats::setFlee(int value)
+    {
+        mFlee = value;
+    }
+
+    void CreatureStats::setAlarm(int value)
+    {
+        mAlarm = value;
+    }    
 }

apps/openmw/mwmechanics/creaturestats.hpp

@@ -110,184 +110,6 @@ namespace MWMechanics
         float getFatigueTerm() const;
         ///< Return effective fatigue
     };
-
-    // Inline const getters
-
-    inline const Stat<int> &
-    CreatureStats::getAttribute(int index) const {
-        if (index < 0 || index > 7) {
-            throw std::runtime_error("attribute index is out of range");
-        }
-        return mAttributes[index];
-    }
-
-    inline const DynamicStat<int> &
-    CreatureStats::getHealth() const {
-        return mDynamic[0];
-    }
-
-    inline const DynamicStat<int> &
-    CreatureStats::getMagicka() const {
-        return mDynamic[1];
-    }
-
-    inline const DynamicStat<int> &
-    CreatureStats::getFatigue() const {
-        return mDynamic[2];
-    }
-
-    inline const Spells &
-    CreatureStats::getSpells() const {
-        return mSpells;
-    }
-
-    inline const ActiveSpells & 
-    CreatureStats::getActiveSpells() const {
-        return mActiveSpells;
-    }
-
-    inline const MagicEffects & 
-    CreatureStats::getMagicEffects() const {
-        return mMagicEffects;
-    }
-
-    inline int
-    CreatureStats::getLevel() const {
-        return mLevel;
-    }
-   
-    inline int
-    CreatureStats::getHello() const {
-        return mHello;
-    }
-
-    inline int
-    CreatureStats::getFight() const {
-        return mFight;
-    }
-
-    inline int
-    CreatureStats::getFlee() const {
-        return mFlee;
-    }
-
-    inline int
-    CreatureStats::getAlarm() const {
-        return mAlarm;
-    }
-
-    // Inline non-const getters
-
-    inline Stat<int> &
-    CreatureStats::getAttribute(int index) {
-        if (index < 0 || index > 7) {
-            throw std::runtime_error("attribute index is out of range");
-        }
-        return mAttributes[index];
-    }
-
-    inline DynamicStat<int> &
-    CreatureStats::getHealth() {
-        return mDynamic[0];
-    }
-
-    inline DynamicStat<int> &
-    CreatureStats::getMagicka() {
-        return mDynamic[1];
-    }
-
-    inline DynamicStat<int> &
-    CreatureStats::getFatigue() {
-        return mDynamic[2];
-    }
-
-    inline DynamicStat<int> &
-    CreatureStats::getDynamic(int index) {
-        if (index < 0 || index > 2) {
-            throw std::runtime_error("dynamic stat index is out of range");
-        }
-        return mDynamic[index];
-    }
-
-    inline Spells & 
-    CreatureStats::getSpells() {
-        return mSpells;
-    }
-
-    inline void 
-    CreatureStats::setSpells(const Spells &spells) {
-        mSpells = spells;
-    }
-
-    inline ActiveSpells & 
-    CreatureStats::getActiveSpells() {
-        return mActiveSpells;
-    }
-
-    inline MagicEffects & 
-    CreatureStats::getMagicEffects() {
-        return mMagicEffects;
-    }
-
-    // Inline setters
-
-    inline void
-    CreatureStats::setAttribute(int index, const Stat<int> &value) {
-        if (index < 0 || index > 7) {
-            throw std::runtime_error("attribute index is out of range");
-        }
-        mAttributes[index] = value;
-    }
-
-    inline void
-    CreatureStats::setHealth(const DynamicStat<int> &value) {
-        mDynamic[0] = value;
-    }
-
-    inline void
-    CreatureStats::setMagicka(const DynamicStat<int> &value) {
-        mDynamic[1] = value;
-    }
-
-    inline void
-    CreatureStats::setFatigue(const DynamicStat<int> &value) {
-        mDynamic[2] = value;
-    }
-
-    inline void
-    CreatureStats::setLevel(int level) {
-        mLevel = level;
-    }
-
-    inline void 
-    CreatureStats::setActiveSpells(const ActiveSpells &active) {
-        mActiveSpells = active;
-    }
-
-    inline void 
-    CreatureStats::setMagicEffects(const MagicEffects &effects) {
-        mMagicEffects = effects;
-    }
-
-    inline void
-    CreatureStats::setHello(int value) {
-        mHello = value;
-    }
-
-    inline void
-    CreatureStats::setFight(int value) {
-        mFight = value;
-    }
-
-    inline void
-    CreatureStats::setFlee(int value) {
-        mFlee = value;
-    }
-
-    inline void
-    CreatureStats::setAlarm(int value) {
-        mAlarm = value;
-    }
 }
 
 #endif