This commit is contained in:
Charles 2001-04-05 15:54:40 +00:00
parent 5b8ef72209
commit 0f094cd65a
6 changed files with 61 additions and 40 deletions

View file

@ -237,6 +237,7 @@ protected:
NPC_SENSOR_FLAMING_SKULL_USER_CLOSE,
NPC_SENSOR_HERMIT_CRAB_USER_CLOSE,
NPC_SENSOR_OCTOPUS_USER_CLOSE,
NPC_SENSOR_PUFFA_FISH_USER_CLOSE,
};
enum NPC_CLOSE_FUNC
@ -265,6 +266,7 @@ protected:
NPC_CLOSE_SKELETAL_FISH_ATTACK,
NPC_CLOSE_HERMIT_CRAB_ATTACK,
NPC_CLOSE_OCTOPUS_ATTACK,
NPC_CLOSE_PUFFA_FISH_INFLATE,
};
enum NPC_MOVEMENT_FUNC
@ -349,7 +351,14 @@ protected:
{
HERMIT_CRAB_NO_ATTACK = 0,
HERMIT_CRAB_PUNCH_ATTACK = 1,
HERMIT_CRAB_ROLL_ATTACK = 2,
HERMIT_CRAB_ROLL_ATTACK,
};
enum NPC_PUFFA_FISH_STATE
{
PUFFA_FISH_NO_INFLATE = 0,
PUFFA_FISH_TURN = 1,
PUFFA_FISH_INFLATE,
};
enum
@ -445,6 +454,10 @@ protected:
void processCloseGhostPirateAttack( int _frames );
// puffa fish functions
void processClosePuffaFishInflate( int _frames );
// shark man functions
void processSharkManMovement( int _frames, s32 *moveX, s32 *moveY );
@ -543,7 +556,7 @@ protected:
bool m_reversed;
s32 m_health;
int m_frame;
s32 m_frame;
int m_animNo;
CActorGfx *m_actorGfx;
DVECTOR m_drawOffset;