From 51027c541e3ef6b448be96e91f9b24677e000a93 Mon Sep 17 00:00:00 2001
From: marcin <Gohan1989@gmail.com>
Date: Fri, 16 Nov 2012 18:38:15 +0100
Subject: [PATCH] Feature #391 Dummy AI package classes

---
 apps/openmw/mwmechanics/aiactivate.cpp |  4 +--
 apps/openmw/mwmechanics/aiactivate.hpp | 24 ++++++++--------
 apps/openmw/mwmechanics/aiescort.cpp   |  4 +--
 apps/openmw/mwmechanics/aiescort.hpp   | 40 +++++++++++++-------------
 apps/openmw/mwmechanics/aifollow.cpp   |  4 +--
 apps/openmw/mwmechanics/aifollow.hpp   | 30 +++++++++----------
 apps/openmw/mwmechanics/aitravel.hpp   | 32 ++++++++++-----------
 apps/openmw/mwmechanics/aiwander.cpp   |  6 ++--
 apps/openmw/mwmechanics/aiwander.hpp   | 40 +++++++++++++-------------
 9 files changed, 91 insertions(+), 93 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiactivate.cpp b/apps/openmw/mwmechanics/aiactivate.cpp
index 72dfae11b..464b30c7c 100644
--- a/apps/openmw/mwmechanics/aiactivate.cpp
+++ b/apps/openmw/mwmechanics/aiactivate.cpp
@@ -1,9 +1,9 @@
 #include "aiactivate.hpp"
 #include <iostream>
 
-MWMechanics::AiActivate::AiActivate(const MWWorld::Ptr& object)
+MWMechanics::AiActivate::AiActivate(const std::string &objectID):
+mObjectID(objectID)
 {
-    mObject = &object;
 }
 MWMechanics::AiActivate *MWMechanics::AiActivate::clone() const
 {
diff --git a/apps/openmw/mwmechanics/aiactivate.hpp b/apps/openmw/mwmechanics/aiactivate.hpp
index c314cb2f5..5744cb25b 100644
--- a/apps/openmw/mwmechanics/aiactivate.hpp
+++ b/apps/openmw/mwmechanics/aiactivate.hpp
@@ -2,22 +2,22 @@
 #define GAME_MWMECHANICS_AIACTIVATE_H
 
 #include "aipackage.hpp"
-
+#include <string>
 
 namespace MWMechanics
 {
 
-class AiActivate : AiPackage
-{
-    public:
-    AiActivate(const MWWorld::Ptr& object);
-    virtual AiActivate *clone() const;
-    virtual bool execute (const MWWorld::Ptr& actor);
-            ///< \return Package completed?
-    virtual int getTypeId() const;
+    class AiActivate : AiPackage
+    {
+        public:
+            AiActivate(const std::string &objectID);
+            virtual AiActivate *clone() const;
+            virtual bool execute (const MWWorld::Ptr& actor);
+                    ///< \return Package completed?
+            virtual int getTypeId() const;
 
-    private:
-    const MWWorld::Ptr * mObject;
-};
+        private:
+            std::string mObjectID;
+    };
 }
 #endif // GAME_MWMECHANICS_AIACTIVATE_H
diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index fd7b9bf32..9f170ef6e 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -1,8 +1,8 @@
 #include "aiescort.hpp"
 #include <iostream>
 
-MWMechanics::AiEscort::AiEscort(const std::string &ActorID,int Duration, float X, float Y, float Z):
-mActorID(ActorID), mDuration(Duration), mX(X), mY(Y), mZ(Z)
+MWMechanics::AiEscort::AiEscort(const std::string &actorID,int duration, float x, float y, float z):
+mActorID(actorID), mDuration(duration), mX(x), mY(y), mZ(z)
 {
 }
 MWMechanics::AiEscort *MWMechanics::AiEscort::clone() const
diff --git a/apps/openmw/mwmechanics/aiescort.hpp b/apps/openmw/mwmechanics/aiescort.hpp
index e39327e04..4bd3f4b22 100644
--- a/apps/openmw/mwmechanics/aiescort.hpp
+++ b/apps/openmw/mwmechanics/aiescort.hpp
@@ -6,29 +6,29 @@
 
 namespace MWMechanics
 {
-class AiEscort : public AiPackage
-{
-    public:
-    AiEscort(const std::string &ActorID,int Duration, float X, float Y, float Z);
-    virtual AiEscort *clone() const;
+    class AiEscort : public AiPackage
+    {
+        public:
+            AiEscort(const std::string &actorID,int duration, float x, float y, float z);
+            virtual AiEscort *clone() const;
 
-    virtual bool execute (const MWWorld::Ptr& actor);
-            ///< \return Package completed?
+            virtual bool execute (const MWWorld::Ptr& actor);
+                    ///< \return Package completed?
 
-    virtual int getTypeId() const;
-    float getX();
-    float getY();
-    float getZ();
-    std::string getActorID();
-    int getDuration();
+            virtual int getTypeId() const;
+            float getX();
+            float getY();
+            float getZ();
+            std::string getActorID();
+            int getDuration();
 
-    private:
-    std::string mActorID;
-    float mX;
-    float mY;
-    float mZ;
-    int mDuration;
+        private:
+            std::string mActorID;
+            float mX;
+            float mY;
+            float mZ;
+            int mDuration;
 
-};
+    };
 }
 #endif
diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index abb51102b..6478544bc 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -1,8 +1,8 @@
 #include "aifollow.hpp"
 #include <iostream>
 
-MWMechanics::AiFollow::AiFollow(const std::string &ActorID,float duration, float X, float Y, float Z):
-mActorID(ActorID), mDuration(duration), mX(X), mY(Y), mZ(Z)
+MWMechanics::AiFollow::AiFollow(const std::string &actorID,float duration, float x, float y, float z):
+mActorID(actorID), mDuration(duration), mX(x), mY(y), mZ(z)
 {
 }
 MWMechanics::AiFollow *MWMechanics::AiFollow::clone() const
diff --git a/apps/openmw/mwmechanics/aifollow.hpp b/apps/openmw/mwmechanics/aifollow.hpp
index f2e716ebf..079c3c381 100644
--- a/apps/openmw/mwmechanics/aifollow.hpp
+++ b/apps/openmw/mwmechanics/aifollow.hpp
@@ -7,21 +7,21 @@
 namespace MWMechanics
 {
 
-class AiFollow : AiPackage
-{
-    public:
-    AiFollow(const std::string &ActorID,float duration, float X, float Y, float Z);
-    virtual AiFollow *clone() const;
-    virtual bool execute (const MWWorld::Ptr& actor);
-            ///< \return Package completed?
-    virtual int getTypeId() const;
+    class AiFollow : AiPackage
+    {
+        public:
+            AiFollow(const std::string &ActorID,float duration, float X, float Y, float Z);
+            virtual AiFollow *clone() const;
+            virtual bool execute (const MWWorld::Ptr& actor);
+                    ///< \return Package completed?
+            virtual int getTypeId() const;
 
-    private:
-    float mDuration;
-    float mX;
-    float mY;
-    float mZ;
-    std::string mActorID;
-};
+        private:
+            float mDuration;
+            float mX;
+            float mY;
+            float mZ;
+            std::string mActorID;
+    };
 }
 #endif
diff --git a/apps/openmw/mwmechanics/aitravel.hpp b/apps/openmw/mwmechanics/aitravel.hpp
index 86032cf54..813ba81eb 100644
--- a/apps/openmw/mwmechanics/aitravel.hpp
+++ b/apps/openmw/mwmechanics/aitravel.hpp
@@ -5,27 +5,27 @@
 
 namespace MWMechanics
 {
-class AiTravel : public AiPackage
-{
-    public:
-    AiTravel(float x, float y, float z);
-    virtual AiTravel *clone() const;
+    class AiTravel : public AiPackage
+    {
+        public:
+            AiTravel(float x, float y, float z);
+            virtual AiTravel *clone() const;
 
-    virtual bool execute (const MWWorld::Ptr& actor);
-            ///< \return Package completed?
+            virtual bool execute (const MWWorld::Ptr& actor);
+                    ///< \return Package completed?
 
-    virtual int getTypeId() const;
-    float getX();
-    float getY();
-    float getZ();
+            virtual int getTypeId() const;
+            float getX();
+            float getY();
+            float getZ();
 
 
-    private:
-    float mX;
-    float mY;
-    float mZ;
+        private:
+            float mX;
+            float mY;
+            float mZ;
 
-};
+    };
 }
 
 #endif
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 71159b94b..38d913f5f 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -1,8 +1,8 @@
 #include "aiwander.hpp"
 #include <iostream>
 
-MWMechanics::AiWander::AiWander(int distance, int duration, int timeOfDay,std::vector<int> Idle):
-    mDistance(distance), mDuration(duration), mTimeOfDay(timeOfDay), mIdle(Idle)
+MWMechanics::AiWander::AiWander(int distance, int duration, int timeOfDay,std::vector<int> idle):
+    mDistance(distance), mDuration(duration), mTimeOfDay(timeOfDay), mIdle(idle)
 {
 }
 
@@ -39,7 +39,5 @@ int MWMechanics::AiWander::getTypeId() const
 
 int MWMechanics::AiWander::getIdle(int index) const
 {
-    if(index < 0 || (uint)index > mIdle.size())
-        return -1;
     return mIdle.at(index);
 }
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index 64168042c..6b53390a1 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -7,28 +7,28 @@
 namespace MWMechanics
 {
 
-class AiWander : public AiPackage
-{
-public:
+    class AiWander : public AiPackage
+    {
+    public:
 
-    AiWander(int distance, int duration, int timeOfDay,std::vector<int> Idle);
-    virtual AiPackage *clone() const;
-    virtual bool execute (const MWWorld::Ptr& actor);
-    ///< \return Package completed?
-    virtual int getTypeId() const;
-    ///< 0: Wander
+        AiWander(int distance, int duration, int timeOfDay,std::vector<int> idle);
+        virtual AiPackage *clone() const;
+        virtual bool execute (const MWWorld::Ptr& actor);
+        ///< \return Package completed?
+        virtual int getTypeId() const;
+        ///< 0: Wander
 
-    int getDistance() const;
-    int getDuration()const;
-    int getTimeOfDay()const;
-    int getIdle(int index) const;
+        int getDistance() const;
+        int getDuration()const;
+        int getTimeOfDay()const;
+        int getIdle(int index) const;
 
-private:
-    int mDistance;
-    int mDuration;
-    int	mTimeOfDay;
-    std::vector<int> mIdle;
-};
-}
+    private:
+        int mDistance;
+        int mDuration;
+        int	mTimeOfDay;
+        std::vector<int> mIdle;
+    };
+    }
 
 #endif // AIWANDER_H