zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Charles 2001-06-18 21:49:08 +00:00
parent cdddeec2e7
commit 2a97704bfa
2 changed files with 1 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
source/enemy/nhcrab.cpp
View file

@ -82,7 +82,6 @@ void CNpcHermitCrabEnemy::processClose( int _frames )
{ {
if ( m_state == HERMIT_CRAB_NO_ATTACK ) if ( m_state == HERMIT_CRAB_NO_ATTACK )
{ {
//m_state = ( getRnd() % 2 ) + 1;
m_state = HERMIT_CRAB_ROLL_ATTACK_JUMP1; m_state = HERMIT_CRAB_ROLL_ATTACK_JUMP1;
m_movementTimer = 0; m_movementTimer = 0;
m_jumpBase = Pos.vy; m_jumpBase = Pos.vy;
@ -101,26 +100,6 @@ void CNpcHermitCrabEnemy::processClose( int _frames )
switch( m_state ) switch( m_state )
{ {
case HERMIT_CRAB_PUNCH_ATTACK:
{
if ( m_animNo != ANIM_HERMITCRAB_PUNCH )
{
m_animPlaying = true;
m_animNo = ANIM_HERMITCRAB_PUNCH;
m_frame = 0;
}
else if ( !m_animPlaying )
{
m_state = HERMIT_CRAB_NO_ATTACK;
m_controlFunc = NPC_CONTROL_MOVEMENT;
m_timerFunc = NPC_TIMER_ATTACK_DONE;
m_timerTimer = GameState::getOneSecondInFrames();
m_sensorFunc = NPC_SENSOR_NONE;
}
break;
}
case HERMIT_CRAB_ROLL_ATTACK_JUMP1: case HERMIT_CRAB_ROLL_ATTACK_JUMP1:
case HERMIT_CRAB_ROLL_ATTACK_JUMP2: case HERMIT_CRAB_ROLL_ATTACK_JUMP2:
{ {

3
source/enemy/nhcrab.h
View file

@ -32,8 +32,7 @@ protected:
enum NPC_HERMIT_CRAB_STATE enum NPC_HERMIT_CRAB_STATE
{ {
HERMIT_CRAB_NO_ATTACK = 0, HERMIT_CRAB_NO_ATTACK = 0,
HERMIT_CRAB_PUNCH_ATTACK = 1, HERMIT_CRAB_ROLL_ATTACK_JUMP1 = 1,
HERMIT_CRAB_ROLL_ATTACK_JUMP1,
HERMIT_CRAB_ROLL_ATTACK_JUMP2, HERMIT_CRAB_ROLL_ATTACK_JUMP2,
HERMIT_CRAB_ROLL_ATTACK_ROLL, HERMIT_CRAB_ROLL_ATTACK_ROLL,
}; };