This commit is contained in:
parent
074f6e0943
commit
f9af04ae7b
4 changed files with 47 additions and 14 deletions
|
@ -28,7 +28,7 @@
|
|||
#endif
|
||||
|
||||
|
||||
void CNpcEnemy::processCloseClamAttack( int _frames )
|
||||
void CNpcEnemy::processCloseClamJumpAttack( int _frames )
|
||||
{
|
||||
s32 velocity;
|
||||
|
||||
|
@ -50,7 +50,7 @@ void CNpcEnemy::processCloseClamAttack( int _frames )
|
|||
if ( !m_animPlaying )
|
||||
{
|
||||
m_animPlaying = true;
|
||||
m_animNo = ANIM_CLAM_CLAMSIDESNAP;
|
||||
m_animNo = ANIM_CLAM_CLAMSNAPUP;
|
||||
m_frame = 0;
|
||||
}
|
||||
}
|
||||
|
@ -82,10 +82,6 @@ void CNpcEnemy::processCloseClamAttack( int _frames )
|
|||
{
|
||||
if ( !m_animPlaying )
|
||||
{
|
||||
m_animPlaying = true;
|
||||
m_animNo = ANIM_CLAM_CLAMSHUT;
|
||||
m_frame = 0;
|
||||
|
||||
m_controlFunc = NPC_CONTROL_MOVEMENT;
|
||||
m_timerFunc = NPC_TIMER_ATTACK_DONE;
|
||||
m_timerTimer = GameState::getOneSecondInFrames();
|
||||
|
@ -94,3 +90,15 @@ void CNpcEnemy::processCloseClamAttack( int _frames )
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
void CNpcEnemy::processCloseClamSnapAttack( int _frames )
|
||||
{
|
||||
if ( !m_animPlaying )
|
||||
{
|
||||
m_animPlaying = true;
|
||||
m_animNo = ANIM_CLAM_CLAMSIDESNAP;
|
||||
m_frame = 0;
|
||||
}
|
||||
|
||||
m_controlFunc = NPC_CONTROL_MOVEMENT;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue