Merge remote-tracking branch 'GuyAllard/aiPlayerTweaks' into development

Conflicts:
	Engine/source/T3D/aiPlayer.cpp
	Engine/source/T3D/aiPlayer.h
This commit is contained in:
Daniel Buckmaster 2015-02-22 21:51:56 +11:00
commit 02c88201c6
2 changed files with 100 additions and 2 deletions

View file

@ -63,6 +63,9 @@ private:
Point3F mAimOffset;
// move triggers
bool mMoveTriggers[MaxTriggerKeys];
// Utility Methods
void throwCallback( const char *name );
@ -175,6 +178,11 @@ public:
Point3F getMoveDestination() const { return mMoveDestination; }
void stopMove();
// Trigger sets/gets
void setMoveTrigger( U32 slot, const bool isSet = true );
bool getMoveTrigger( U32 slot ) const;
void clearMoveTriggers();
#ifdef TORQUE_NAVIGATION_ENABLED
/// @name Pathfinding
/// @{