Reformatting

This commit is contained in:
Walter Julius Hennecke 2014-03-09 02:15:48 +01:00
parent f98ce24dec
commit 28213f6679

View file

@ -41,11 +41,10 @@ class RotateToEntity;
//
// Method of Use: State machine or called from another behavior
//--------------------------------------------------------------
class DoAttack : public Behavior
{
public: // States
typedef enum
{
class DoAttack : public Behavior {
public:
// States
typedef enum {
ATTACK_STATE_SETUP,
ATTACK_STATE_ROTATE,
ATTACK_STATE_START_ANIM,
@ -54,21 +53,6 @@ class DoAttack : public Behavior
ATTACK_STATE_FAILED
} attackStates_t;
private: // Parameters
str _anim;
float _turnspeed;
bool _forceAttack;
str _rotateAnim;
protected:
void _setupRotate ( Actor &self );
void _rotate ( Actor &self );
void _playAttackAnim ( Actor &self );
bool _canAttack ( Actor &self );
void init ( Actor &self );
public:
CLASS_PROTOTYPE(DoAttack);
void SetArgs(Event* ev);
@ -83,34 +67,43 @@ class DoAttack : public Behavior
void SetForceAttack(bool force);
void SetRotateAnim(const str& animName);
protected:
void _setupRotate(Actor& self);
void _rotate(Actor& self);
void _playAttackAnim(Actor& self);
bool _canAttack(Actor& self);
void init(Actor& self);
private:
// Parameters
str _anim;
float _turnspeed;
bool _forceAttack;
str _rotateAnim;
unsigned int _state;
RotateToEntity _rotateBehavior;
};
inline void DoAttack::SetAnim( const str &animName )
{
inline void DoAttack::SetAnim(const str& animName) {
_anim = animName;
}
inline void DoAttack::SetTurnSpeed( float turnSpeed )
{
inline void DoAttack::SetTurnSpeed(float turnSpeed) {
_turnspeed = turnSpeed;
}
inline void DoAttack::SetForceAttack( bool force )
{
inline void DoAttack::SetForceAttack(bool force) {
_forceAttack = force;
}
inline void DoAttack::SetRotateAnim( const str &animName )
{
inline void DoAttack::SetRotateAnim(const str& animName) {
_rotateAnim = animName;
}
inline void DoAttack::Archive( Archiver &arc )
{
inline void DoAttack::Archive(Archiver& arc) {
Behavior::Archive(arc);
// Archive Parameters