This commit is contained in:
Paul 2001-01-25 15:25:46 +00:00
parent 6c5c1fba9b
commit f81d0c4b5e
15 changed files with 424 additions and 211 deletions

View file

@ -52,8 +52,9 @@ typedef enum
STATE_BUTTBOUNCE,
STATE_BUTTFALL,
STATE_BUTTLAND,
STATE_CHOP,
STATE_RUNCHOP,
STATE_ATTACK,
STATE_RUNATTACK,
STATE_AIRATTACK,
STATE_DUCK,
STATE_SOAKUP,
STATE_GETUP,
@ -106,6 +107,8 @@ public:
void think(int _frames);
void render();
DVECTOR getCameraPos();
protected:
const PlayerMetrics *getPlayerMetrics();
@ -135,6 +138,14 @@ friend class CPlayerState;
private:
typedef struct
{
PlayerMetrics m_metrics;
class CPlayerState *m_states[NUM_STATES];
}PlayerMode;
static PlayerMode s_modes;
int m_animFrame;
int m_animNo;
PLAYER_STATE m_state;
@ -142,6 +153,7 @@ private:
DVECTOR m_moveVel;
int m_facing;
int m_fallFrames;
enum
{
@ -150,14 +162,13 @@ private:
};
int m_invincibleFrameCount;
static class CPlayerState *s_states[NUM_STATES];
class CPlayerState *m_currentState;
class CPlayerState *m_currentState;
int m_lives;
DVECTOR m_cameraOffsetTarget;
DVECTOR m_cameraOffset;
};