mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-09 08:56:39 +00:00
Code Issues Releases Wiki Activity

Feature #391 Dummy AI package classes

Browse source
This commit is contained in:
marcin 2012-11-16 18:38:15 +01:00
parent bed0280ba1
commit 51027c541e
9 changed files with 91 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwmechanics/aiactivate.cpp
View file

@ -1,9 +1,9 @@
#include "aiactivate.hpp" #include "aiactivate.hpp"
#include <iostream> #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 MWMechanics::AiActivate *MWMechanics::AiActivate::clone() const
{ {

6
apps/openmw/mwmechanics/aiactivate.hpp
View file

@ -2,7 +2,7 @@
#define GAME_MWMECHANICS_AIACTIVATE_H #define GAME_MWMECHANICS_AIACTIVATE_H
#include "aipackage.hpp" #include "aipackage.hpp"
#include <string>
namespace MWMechanics namespace MWMechanics
{ {
@ -10,14 +10,14 @@ namespace MWMechanics
class AiActivate : AiPackage class AiActivate : AiPackage
{ {
public: public:
AiActivate(const MWWorld::Ptr& object); AiActivate(const std::string &objectID);
virtual AiActivate *clone() const; virtual AiActivate *clone() const;
virtual bool execute (const MWWorld::Ptr& actor); virtual bool execute (const MWWorld::Ptr& actor);
///< \return Package completed? ///< \return Package completed?
virtual int getTypeId() const; virtual int getTypeId() const;
private: private:
const MWWorld::Ptr * mObject; std::string mObjectID;
}; };
} }
#endif // GAME_MWMECHANICS_AIACTIVATE_H #endif // GAME_MWMECHANICS_AIACTIVATE_H

4
apps/openmw/mwmechanics/aiescort.cpp
View file

@ -1,8 +1,8 @@
#include "aiescort.hpp" #include "aiescort.hpp"
#include <iostream> #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 MWMechanics::AiEscort *MWMechanics::AiEscort::clone() const

2
apps/openmw/mwmechanics/aiescort.hpp
View file

@ -9,7 +9,7 @@ namespace MWMechanics
class AiEscort : public AiPackage class AiEscort : public AiPackage
{ {
public: 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 AiEscort *clone() const;
virtual bool execute (const MWWorld::Ptr& actor); virtual bool execute (const MWWorld::Ptr& actor);

4
apps/openmw/mwmechanics/aifollow.cpp
View file

@ -1,8 +1,8 @@
#include "aifollow.hpp" #include "aifollow.hpp"
#include <iostream> #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 MWMechanics::AiFollow *MWMechanics::AiFollow::clone() const

6
apps/openmw/mwmechanics/aiwander.cpp
View file

@ -1,8 +1,8 @@
#include "aiwander.hpp" #include "aiwander.hpp"
#include <iostream> #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 int MWMechanics::AiWander::getIdle(int index) const
{ {
if(index < 0 || (uint)index > mIdle.size())
return -1;
return mIdle.at(index); return mIdle.at(index);
} }

2
apps/openmw/mwmechanics/aiwander.hpp
View file

@ -11,7 +11,7 @@ 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 AiPackage *clone() const;
virtual bool execute (const MWWorld::Ptr& actor); virtual bool execute (const MWWorld::Ptr& actor);
///< \return Package completed? ///< \return Package completed?