Feature #391 Dummy AI package classes

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
 {

apps/openmw/mwmechanics/aiactivate.hpp

@@ -2,22 +2,22 @@
 #define GAME_MWMECHANICS_AIACTIVATE_H
 
 #include "aipackage.hpp"
-
+#include <string>
 
 namespace MWMechanics
 {
 
-class AiActivate : AiPackage
+    class AiActivate : AiPackage
-{
+    {
         public:
-    AiActivate(const MWWorld::Ptr& object);
+            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;
+            std::string mObjectID;
-};
+    };
 }
 #endif // GAME_MWMECHANICS_AIACTIVATE_H

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):
+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)
+mActorID(actorID), mDuration(duration), mX(x), mY(y), mZ(z)
 {
 }
 MWMechanics::AiEscort *MWMechanics::AiEscort::clone() const

apps/openmw/mwmechanics/aiescort.hpp

@@ -6,10 +6,10 @@
 
 namespace MWMechanics
 {
-class AiEscort : public AiPackage
+    class AiEscort : public AiPackage
-{
+    {
         public:
-    AiEscort(const std::string &ActorID,int Duration, float X, float Y, float Z);
+            AiEscort(const std::string &actorID,int duration, float x, float y, float z);
             virtual AiEscort *clone() const;
 
             virtual bool execute (const MWWorld::Ptr& actor);
@@ -29,6 +29,6 @@ class AiEscort : public AiPackage
             float mZ;
             int mDuration;
 
-};
+    };
 }
 #endif

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):
+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)
+mActorID(actorID), mDuration(duration), mX(x), mY(y), mZ(z)
 {
 }
 MWMechanics::AiFollow *MWMechanics::AiFollow::clone() const

apps/openmw/mwmechanics/aifollow.hpp

@@ -7,8 +7,8 @@
 namespace MWMechanics
 {
 
-class AiFollow : AiPackage
+    class AiFollow : AiPackage
-{
+    {
         public:
             AiFollow(const std::string &ActorID,float duration, float X, float Y, float Z);
             virtual AiFollow *clone() const;
@@ -22,6 +22,6 @@ class AiFollow : AiPackage
             float mY;
             float mZ;
             std::string mActorID;
-};
+    };
 }
 #endif

apps/openmw/mwmechanics/aitravel.hpp

@@ -5,8 +5,8 @@
 
 namespace MWMechanics
 {
-class AiTravel : public AiPackage
+    class AiTravel : public AiPackage
-{
+    {
         public:
             AiTravel(float x, float y, float z);
             virtual AiTravel *clone() const;
@@ -25,7 +25,7 @@ class AiTravel : public AiPackage
             float mY;
             float mZ;
 
-};
+    };
 }
 
 #endif

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):
+MWMechanics::AiWander::AiWander(int distance, int duration, int timeOfDay,std::vector<int> idle):
-    mDistance(distance), mDuration(duration), mTimeOfDay(timeOfDay), mIdle(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);
 }

apps/openmw/mwmechanics/aiwander.hpp

@@ -7,11 +7,11 @@
 namespace MWMechanics
 {
 
-class AiWander : public AiPackage
+    class AiWander : public AiPackage
-{
+    {
-public:
+    public:
 
-    AiWander(int distance, int duration, int timeOfDay,std::vector<int> Idle);
+        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?
@@ -23,12 +23,12 @@ public:
         int getTimeOfDay()const;
         int getIdle(int index) const;
 
-private:
+    private:
         int mDistance;
         int mDuration;
         int	mTimeOfDay;
         std::vector<int> mIdle;
-};
+    };
-}
+    }
 
 #endif // AIWANDER_H