From 8e0934cbd89f6f8aa5091e00bc2ef9917dc98f38 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 17 May 2020 22:00:44 +0200
Subject: [PATCH] Single AI package clone definition

---
 apps/openmw/mwmechanics/aiactivate.cpp     | 5 -----
 apps/openmw/mwmechanics/aiactivate.hpp     | 1 -
 apps/openmw/mwmechanics/aiavoiddoor.cpp    | 5 -----
 apps/openmw/mwmechanics/aiavoiddoor.hpp    | 2 --
 apps/openmw/mwmechanics/aibreathe.cpp      | 5 -----
 apps/openmw/mwmechanics/aibreathe.hpp      | 2 --
 apps/openmw/mwmechanics/aicast.cpp         | 5 -----
 apps/openmw/mwmechanics/aicast.hpp         | 2 --
 apps/openmw/mwmechanics/aicombat.cpp       | 5 -----
 apps/openmw/mwmechanics/aicombat.hpp       | 2 --
 apps/openmw/mwmechanics/aiescort.cpp       | 6 ------
 apps/openmw/mwmechanics/aiescort.hpp       | 2 --
 apps/openmw/mwmechanics/aiface.cpp         | 5 -----
 apps/openmw/mwmechanics/aiface.hpp         | 2 --
 apps/openmw/mwmechanics/aifollow.cpp       | 5 -----
 apps/openmw/mwmechanics/aifollow.hpp       | 2 --
 apps/openmw/mwmechanics/aipursue.cpp       | 4 ----
 apps/openmw/mwmechanics/aipursue.hpp       | 1 -
 apps/openmw/mwmechanics/aitravel.cpp       | 5 -----
 apps/openmw/mwmechanics/aitravel.hpp       | 2 --
 apps/openmw/mwmechanics/aiwander.cpp       | 5 -----
 apps/openmw/mwmechanics/aiwander.hpp       | 2 --
 apps/openmw/mwmechanics/typedaipackage.hpp | 4 ++++
 23 files changed, 4 insertions(+), 75 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiactivate.cpp b/apps/openmw/mwmechanics/aiactivate.cpp
index c412a7ea1d..6764eba23f 100644
--- a/apps/openmw/mwmechanics/aiactivate.cpp
+++ b/apps/openmw/mwmechanics/aiactivate.cpp
@@ -18,11 +18,6 @@ namespace MWMechanics
     {
     }
 
-    AiActivate *MWMechanics::AiActivate::clone() const
-    {
-        return new AiActivate(*this);
-    }
-
     bool AiActivate::execute(const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
     {
         const MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtr(mObjectId, false); //The target to follow
diff --git a/apps/openmw/mwmechanics/aiactivate.hpp b/apps/openmw/mwmechanics/aiactivate.hpp
index cd7a8b4228..5a9e3d6d85 100644
--- a/apps/openmw/mwmechanics/aiactivate.hpp
+++ b/apps/openmw/mwmechanics/aiactivate.hpp
@@ -28,7 +28,6 @@ namespace MWMechanics
 
             AiActivate(const ESM::AiSequence::AiActivate* activate);
 
-            AiActivate *clone() const final;
             bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) final;
             int getTypeId() const final;
 
diff --git a/apps/openmw/mwmechanics/aiavoiddoor.cpp b/apps/openmw/mwmechanics/aiavoiddoor.cpp
index 38ae981395..9cdb8d90bd 100644
--- a/apps/openmw/mwmechanics/aiavoiddoor.cpp
+++ b/apps/openmw/mwmechanics/aiavoiddoor.cpp
@@ -72,11 +72,6 @@ bool MWMechanics::AiAvoidDoor::execute (const MWWorld::Ptr& actor, CharacterCont
     return false;
 }
 
-MWMechanics::AiAvoidDoor *MWMechanics::AiAvoidDoor::clone() const
-{
-    return new AiAvoidDoor(*this);
-}
-
 int MWMechanics::AiAvoidDoor::getTypeId() const
 {
     return TypeIdAvoidDoor;
diff --git a/apps/openmw/mwmechanics/aiavoiddoor.hpp b/apps/openmw/mwmechanics/aiavoiddoor.hpp
index 312870a2e2..cc02c4de18 100644
--- a/apps/openmw/mwmechanics/aiavoiddoor.hpp
+++ b/apps/openmw/mwmechanics/aiavoiddoor.hpp
@@ -22,8 +22,6 @@ namespace MWMechanics
             /// Avoid door until the door is fully open
             AiAvoidDoor(const MWWorld::ConstPtr& doorPtr);
 
-            AiAvoidDoor *clone() const final;
-
             bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) final;
 
             int getTypeId() const final;
diff --git a/apps/openmw/mwmechanics/aibreathe.cpp b/apps/openmw/mwmechanics/aibreathe.cpp
index a919808dd6..5cb81b3d89 100644
--- a/apps/openmw/mwmechanics/aibreathe.cpp
+++ b/apps/openmw/mwmechanics/aibreathe.cpp
@@ -32,11 +32,6 @@ bool MWMechanics::AiBreathe::execute (const MWWorld::Ptr& actor, CharacterContro
     return true;
 }
 
-MWMechanics::AiBreathe *MWMechanics::AiBreathe::clone() const
-{
-    return new AiBreathe(*this);
-}
-
 int MWMechanics::AiBreathe::getTypeId() const
 {
     return TypeIdBreathe;
diff --git a/apps/openmw/mwmechanics/aibreathe.hpp b/apps/openmw/mwmechanics/aibreathe.hpp
index a9ab56c707..6e3bb912a5 100644
--- a/apps/openmw/mwmechanics/aibreathe.hpp
+++ b/apps/openmw/mwmechanics/aibreathe.hpp
@@ -10,8 +10,6 @@ namespace MWMechanics
     class AiBreathe final : public TypedAiPackage<AiBreathe>
     {
         public:
-            AiBreathe *clone() const final;
-
             bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) final;
 
             int getTypeId() const final;
diff --git a/apps/openmw/mwmechanics/aicast.cpp b/apps/openmw/mwmechanics/aicast.cpp
index b7c9bac3ba..de61851cd9 100644
--- a/apps/openmw/mwmechanics/aicast.cpp
+++ b/apps/openmw/mwmechanics/aicast.cpp
@@ -18,11 +18,6 @@ MWMechanics::AiCast::AiCast(const std::string& targetId, const std::string& spel
     mDistance = action.getCombatRange(isRanged);
 }
 
-MWMechanics::AiPackage *MWMechanics::AiCast::clone() const
-{
-    return new AiCast(*this);
-}
-
 bool MWMechanics::AiCast::execute(const MWWorld::Ptr& actor, MWMechanics::CharacterController& characterController, MWMechanics::AiState& state, float duration)
 {
     MWWorld::Ptr target;
diff --git a/apps/openmw/mwmechanics/aicast.hpp b/apps/openmw/mwmechanics/aicast.hpp
index 26eca15ef9..21b629f245 100644
--- a/apps/openmw/mwmechanics/aicast.hpp
+++ b/apps/openmw/mwmechanics/aicast.hpp
@@ -15,8 +15,6 @@ namespace MWMechanics
         public:
             AiCast(const std::string& targetId, const std::string& spellId, bool manualSpell=false);
 
-            AiPackage *clone() const final;
-
             bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) final;
 
             int getTypeId() const final;
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index ee1b9cecdc..4a3c7aee67 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -421,11 +421,6 @@ namespace MWMechanics
         return MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId);
     }
 
-    AiCombat *MWMechanics::AiCombat::clone() const
-    {
-        return new AiCombat(*this);
-    }
-
     void AiCombat::writeState(ESM::AiSequence::AiSequence &sequence) const
     {
         std::unique_ptr<ESM::AiSequence::AiCombat> combat(new ESM::AiSequence::AiCombat());
diff --git a/apps/openmw/mwmechanics/aicombat.hpp b/apps/openmw/mwmechanics/aicombat.hpp
index 610e402e4d..2ef0298fcc 100644
--- a/apps/openmw/mwmechanics/aicombat.hpp
+++ b/apps/openmw/mwmechanics/aicombat.hpp
@@ -102,8 +102,6 @@ namespace MWMechanics
 
             void init();
 
-            AiCombat *clone() const final;
-
             bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) final;
 
             int getTypeId() const final;
diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index 03951d2798..5e1d38331d 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -55,12 +55,6 @@ namespace MWMechanics
             mDuration = 0;
     }
 
-
-    AiEscort *MWMechanics::AiEscort::clone() const
-    {
-        return new AiEscort(*this);
-    }
-
     bool AiEscort::execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
     {
         // If AiEscort has ran for as long or longer then the duration specified
diff --git a/apps/openmw/mwmechanics/aiescort.hpp b/apps/openmw/mwmechanics/aiescort.hpp
index 651abb2dda..9f5ac2f422 100644
--- a/apps/openmw/mwmechanics/aiescort.hpp
+++ b/apps/openmw/mwmechanics/aiescort.hpp
@@ -30,8 +30,6 @@ namespace MWMechanics
 
             AiEscort(const ESM::AiSequence::AiEscort* escort);
 
-            AiEscort *clone() const final;
-
             bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) final;
 
             int getTypeId() const final;
diff --git a/apps/openmw/mwmechanics/aiface.cpp b/apps/openmw/mwmechanics/aiface.cpp
index b99a8c1f45..0bfd00c878 100644
--- a/apps/openmw/mwmechanics/aiface.cpp
+++ b/apps/openmw/mwmechanics/aiface.cpp
@@ -9,11 +9,6 @@ MWMechanics::AiFace::AiFace(float targetX, float targetY)
 {
 }
 
-MWMechanics::AiPackage *MWMechanics::AiFace::clone() const
-{
-    return new AiFace(*this);
-}
-
 bool MWMechanics::AiFace::execute(const MWWorld::Ptr& actor, MWMechanics::CharacterController& /*characterController*/, MWMechanics::AiState& /*state*/, float /*duration*/)
 {
     osg::Vec3f dir = osg::Vec3f(mTargetX, mTargetY, 0) - actor.getRefData().getPosition().asVec3();
diff --git a/apps/openmw/mwmechanics/aiface.hpp b/apps/openmw/mwmechanics/aiface.hpp
index 9defaf2f2d..ce1c9847bd 100644
--- a/apps/openmw/mwmechanics/aiface.hpp
+++ b/apps/openmw/mwmechanics/aiface.hpp
@@ -10,8 +10,6 @@ namespace MWMechanics
         public:
             AiFace(float targetX, float targetY);
 
-            AiPackage *clone() const final;
-
             bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) final;
 
             int getTypeId() const final;
diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index 09e8d0ecd8..bffa238d5d 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -201,11 +201,6 @@ std::string AiFollow::getFollowedActor()
     return mTargetActorRefId;
 }
 
-AiFollow *MWMechanics::AiFollow::clone() const
-{
-    return new AiFollow(*this);
-}
-
 int AiFollow::getTypeId() const
 {
     return TypeIdFollow;
diff --git a/apps/openmw/mwmechanics/aifollow.hpp b/apps/openmw/mwmechanics/aifollow.hpp
index 3d22af9b19..39a10294b1 100644
--- a/apps/openmw/mwmechanics/aifollow.hpp
+++ b/apps/openmw/mwmechanics/aifollow.hpp
@@ -57,8 +57,6 @@ namespace MWMechanics
             bool followTargetThroughDoors() const final { return true; }
             bool shouldCancelPreviousAi() const final { return !mCommanded; }
 
-            AiFollow *clone() const final;
-
             bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) final;
 
             int getTypeId() const final;
diff --git a/apps/openmw/mwmechanics/aipursue.cpp b/apps/openmw/mwmechanics/aipursue.cpp
index 52b2866bba..76b4ac0c9f 100644
--- a/apps/openmw/mwmechanics/aipursue.cpp
+++ b/apps/openmw/mwmechanics/aipursue.cpp
@@ -27,10 +27,6 @@ AiPursue::AiPursue(const ESM::AiSequence::AiPursue *pursue)
     mTargetActorId = pursue->mTargetActorId;
 }
 
-AiPursue *MWMechanics::AiPursue::clone() const
-{
-    return new AiPursue(*this);
-}
 bool AiPursue::execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
 {
     if(actor.getClass().getCreatureStats(actor).isDead())
diff --git a/apps/openmw/mwmechanics/aipursue.hpp b/apps/openmw/mwmechanics/aipursue.hpp
index 5f1976dd56..6898a8dd34 100644
--- a/apps/openmw/mwmechanics/aipursue.hpp
+++ b/apps/openmw/mwmechanics/aipursue.hpp
@@ -26,7 +26,6 @@ namespace MWMechanics
 
             AiPursue(const ESM::AiSequence::AiPursue* pursue);
 
-            AiPursue *clone() const final;
             bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) final;
             int getTypeId() const final;
 
diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index dba70316ba..94c782c025 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -36,11 +36,6 @@ namespace MWMechanics
     {
     }
 
-    AiTravel *MWMechanics::AiTravel::clone() const
-    {
-        return new AiTravel(*this);
-    }
-
     bool AiTravel::execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
     {
         auto& stats = actor.getClass().getCreatureStats(actor);
diff --git a/apps/openmw/mwmechanics/aitravel.hpp b/apps/openmw/mwmechanics/aitravel.hpp
index c1420987a8..beaf2819fe 100644
--- a/apps/openmw/mwmechanics/aitravel.hpp
+++ b/apps/openmw/mwmechanics/aitravel.hpp
@@ -26,8 +26,6 @@ namespace MWMechanics
 
             void writeState(ESM::AiSequence::AiSequence &sequence) const final;
 
-            AiTravel *clone() const final;
-
             bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) final;
 
             int getTypeId() const final;
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 597453409f..158a62c1d8 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -115,11 +115,6 @@ namespace MWMechanics
             mDuration = 0;
     }
 
-    AiPackage * MWMechanics::AiWander::clone() const
-    {
-        return new AiWander(*this);
-    }
-
     /*
      * AiWander high level states (0.29.0). Not entirely accurate in some cases
      * e.g. non-NPC actors do not greet and some creatures may be moving even in
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index f887fae679..bb5872eef2 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -91,8 +91,6 @@ namespace MWMechanics
 
             AiWander (const ESM::AiSequence::AiWander* wander);
 
-            AiPackage *clone() const final;
-
             bool execute(const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration) final;
 
             int getTypeId() const final;
diff --git a/apps/openmw/mwmechanics/typedaipackage.hpp b/apps/openmw/mwmechanics/typedaipackage.hpp
index a298bce715..2801accc4c 100644
--- a/apps/openmw/mwmechanics/typedaipackage.hpp
+++ b/apps/openmw/mwmechanics/typedaipackage.hpp
@@ -8,6 +8,10 @@ namespace MWMechanics
     template <class T>
     struct TypedAiPackage : public AiPackage
     {
+        virtual TypedAiPackage<T> *clone() const override
+        {
+            return new T(*static_cast<const T*>(this));
+        }
     };
 }