Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Charles 2001-05-22 18:11:57 +00:00
parent 708eb5d3c7
commit 0653fd307b
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/enemy/nclam.cpp
View File

@ -202,7 +202,7 @@ void CNpcStaticClamEnemy::postInit()
{ {
CNpcClamEnemy::postInit(); CNpcClamEnemy::postInit();
m_isStunned = false; m_isStunned = 0;
// create platform in same place // create platform in same place
@ -221,7 +221,7 @@ void CNpcStaticClamEnemy::postInit()
void CNpcStaticClamEnemy::processClose( int _frames ) void CNpcStaticClamEnemy::processClose( int _frames )
{ {
if ( !m_animPlaying && !m_isStunned ) if ( !m_animPlaying && m_isStunned == 0 )
{ {
m_animPlaying = true; m_animPlaying = true;
m_animNo = ANIM_CLAM_SIDESNAP; m_animNo = ANIM_CLAM_SIDESNAP;
@ -231,7 +231,17 @@ void CNpcStaticClamEnemy::processClose( int _frames )
if ( m_isStunned ) if ( m_isStunned )
{ {
m_isStunned = false; m_isStunned -= _frames;
if ( m_isStunned < 0 )
{
m_isStunned = 0;
}
}
if ( !m_isStunned )
{
m_controlFunc = NPC_CONTROL_MOVEMENT;
} }
} }
@ -253,7 +263,7 @@ void CNpcStaticClamEnemy::collidedWith( CThing *_thisThing )
CSoundMediator::playSfx( CSoundMediator::SFX_CLAM_ATTACK ); CSoundMediator::playSfx( CSoundMediator::SFX_CLAM_ATTACK );
} }
m_isStunned = true; m_isStunned = 2 * GameState::getOneSecondInFrames();
m_animPlaying = false; m_animPlaying = false;
} }
else else
@ -282,7 +292,7 @@ void CNpcStaticClamEnemy::processCollision()
m_controlFunc = m_oldControlFunc; m_controlFunc = m_oldControlFunc;
if ( !m_animPlaying && !m_isStunned ) if ( !m_animPlaying && m_isStunned == 0 )
{ {
m_animPlaying = true; m_animPlaying = true;
m_animNo = ANIM_CLAM_SIDESNAP; m_animNo = ANIM_CLAM_SIDESNAP;

2
source/enemy/nclam.h
View File

@ -47,7 +47,7 @@ protected:
virtual void processCollision(); virtual void processCollision();
virtual void processAnimFrames( int _frames ); virtual void processAnimFrames( int _frames );
u8 m_isStunned; s32 m_isStunned;
}; };
#endif #endif