From 1bb1053569f42d27e5a4f995a4c69aa6ce8c386a Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 18 May 2022 19:58:53 +0200
Subject: [PATCH] Make all MWMechanics::Actor functions inline

---
 apps/openmw/CMakeLists.txt        |  2 +-
 apps/openmw/mwmechanics/actor.cpp | 82 -------------------------------
 apps/openmw/mwmechanics/actor.hpp | 36 ++++++++------
 3 files changed, 22 insertions(+), 98 deletions(-)
 delete mode 100644 apps/openmw/mwmechanics/actor.cpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 9a19c3e1d6..3ec86df232 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -95,7 +95,7 @@ add_openmw_dir (mwmechanics
     mechanicsmanagerimp stat creaturestats magiceffects movement actorutil spelllist
     drawstate spells activespells npcstats aipackage aisequence aipursue alchemy aiwander aitravel aifollow aiavoiddoor aibreathe
     aicast aiescort aiface aiactivate aicombat recharge repair enchanting pathfinding pathgrid security spellcasting spellresistance
-    disease pickpocket levelledlist combat steering obstacle autocalcspell difficultyscaling aicombataction actor summoning
+    disease pickpocket levelledlist combat steering obstacle autocalcspell difficultyscaling aicombataction summoning
     character actors objects aistate trading weaponpriority spellpriority weapontype spellutil
     spelleffects
     )
diff --git a/apps/openmw/mwmechanics/actor.cpp b/apps/openmw/mwmechanics/actor.cpp
deleted file mode 100644
index 2af3b50aa1..0000000000
--- a/apps/openmw/mwmechanics/actor.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-#include "actor.hpp"
-
-#include "character.hpp"
-
-namespace MWMechanics
-{
-    Actor::Actor(const MWWorld::Ptr &ptr, MWRender::Animation *animation)
-        : mCharacterController(ptr, animation)
-        , mPositionAdjusted(false)
-    {
-    }
-
-    const MWWorld::Ptr& Actor::getPtr() const
-    {
-        return mCharacterController.getPtr();
-    }
-
-    void Actor::updatePtr(const MWWorld::Ptr &newPtr)
-    {
-        mCharacterController.updatePtr(newPtr);
-    }
-
-    CharacterController& Actor::getCharacterController()
-    {
-        return mCharacterController;
-    }
-
-    int Actor::getGreetingTimer() const
-    {
-        return mGreetingTimer;
-    }
-
-    void Actor::setGreetingTimer(int timer)
-    {
-        mGreetingTimer = timer;
-    }
-
-    float Actor::getAngleToPlayer() const
-    {
-        return mTargetAngleRadians;
-    }
-
-    void Actor::setAngleToPlayer(float angle)
-    {
-        mTargetAngleRadians = angle;
-    }
-
-    GreetingState Actor::getGreetingState() const
-    {
-        return mGreetingState;
-    }
-
-    void Actor::setGreetingState(GreetingState state)
-    {
-        mGreetingState = state;
-    }
-
-    bool Actor::isTurningToPlayer() const
-    {
-        return mIsTurningToPlayer;
-    }
-
-    void Actor::setTurningToPlayer(bool turning)
-    {
-        mIsTurningToPlayer = turning;
-    }
-
-    Misc::TimerStatus Actor::updateEngageCombatTimer(float duration)
-    {
-        return mEngageCombat.update(duration, MWBase::Environment::get().getWorld()->getPrng());
-    }
-
-    void Actor::setPositionAdjusted(bool adjusted)
-    {
-        mPositionAdjusted = adjusted;
-    }
-
-    bool Actor::getPositionAdjusted() const
-    {
-        return mPositionAdjusted;
-    }
-}
diff --git a/apps/openmw/mwmechanics/actor.hpp b/apps/openmw/mwmechanics/actor.hpp
index 06fdc79a14..14f21193ea 100644
--- a/apps/openmw/mwmechanics/actor.hpp
+++ b/apps/openmw/mwmechanics/actor.hpp
@@ -23,31 +23,37 @@ namespace MWMechanics
     class Actor
     {
     public:
-        Actor(const MWWorld::Ptr& ptr, MWRender::Animation* animation);
+        Actor(const MWWorld::Ptr& ptr, MWRender::Animation* animation)
+            : mCharacterController(ptr, animation)
+            , mPositionAdjusted(false)
+        {}
 
-        const MWWorld::Ptr& getPtr() const;
+        const MWWorld::Ptr& getPtr() const { return mCharacterController.getPtr(); }
 
         /// Notify this actor of its new base object Ptr, use when the object changed cells
-        void updatePtr(const MWWorld::Ptr& newPtr);
+        void updatePtr(const MWWorld::Ptr& newPtr) { mCharacterController.updatePtr(newPtr); }
 
-        CharacterController& getCharacterController();
+        CharacterController& getCharacterController() { return mCharacterController; }
 
-        int getGreetingTimer() const;
-        void setGreetingTimer(int timer);
+        int getGreetingTimer() const { return mGreetingTimer; }
+        void setGreetingTimer(int timer) { mGreetingTimer = timer; }
 
-        float getAngleToPlayer() const;
-        void setAngleToPlayer(float angle);
+        float getAngleToPlayer() const { return mTargetAngleRadians; }
+        void setAngleToPlayer(float angle) { mTargetAngleRadians = angle; }
 
-        GreetingState getGreetingState() const;
-        void setGreetingState(GreetingState state);
+        GreetingState getGreetingState() const { return mGreetingState; }
+        void setGreetingState(GreetingState state) { mGreetingState = state; }
 
-        bool isTurningToPlayer() const;
-        void setTurningToPlayer(bool turning);
+        bool isTurningToPlayer() const { return mIsTurningToPlayer; }
+        void setTurningToPlayer(bool turning) { mIsTurningToPlayer = turning; }
 
-        Misc::TimerStatus updateEngageCombatTimer(float duration);
+        Misc::TimerStatus updateEngageCombatTimer(float duration)
+        {
+            return mEngageCombat.update(duration, MWBase::Environment::get().getWorld()->getPrng());
+        }
 
-        void setPositionAdjusted(bool adjusted);
-        bool getPositionAdjusted() const;
+        void setPositionAdjusted(bool adjusted) { mPositionAdjusted = adjusted; }
+        bool getPositionAdjusted() const { return mPositionAdjusted; }
 
     private:
         CharacterController mCharacterController;