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-07-10 21:05:15 +00:00
parent 7e3a0f69da
commit 1ced271c6c
2 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
source/enemy/nshrkman.cpp
View file

@ -45,6 +45,15 @@
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcSharkManEnemy::postInit()
{
CNpcEnemy::postInit();
m_fired = false;
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcSharkManEnemy::processMovement( int _frames ) void CNpcSharkManEnemy::processMovement( int _frames )
{ {
s32 moveX = 0, moveY = 0; s32 moveX = 0, moveY = 0;
@ -149,9 +158,10 @@ void CNpcSharkManEnemy::processClose( int _frames )
m_animNo = ANIM_MANRAY_ATTACK; m_animNo = ANIM_MANRAY_ATTACK;
m_frame = 0; m_frame = 0;
} }
else if ( !m_animPlaying ) else if ( ( ( m_frame >> 8 ) > ( ( 3 * getFrameCount() ) >> 2 ) ) && !m_fired )
{ {
// anim finished, fire // fire
DVECTOR newPos = Pos; DVECTOR newPos = Pos;
newPos.vy -= 50; newPos.vy -= 50;
@ -170,6 +180,11 @@ void CNpcSharkManEnemy::processClose( int _frames )
projectile->init( newPos, heading ); projectile->init( newPos, heading );
projectile->setGraphic( FRM__LIGHTNING2 ); projectile->setGraphic( FRM__LIGHTNING2 );
m_fired = true;
}
else if ( !m_animPlaying )
{
// anim finished
m_controlFunc = NPC_CONTROL_MOVEMENT; m_controlFunc = NPC_CONTROL_MOVEMENT;
m_timerFunc = NPC_TIMER_ATTACK_DONE; m_timerFunc = NPC_TIMER_ATTACK_DONE;
m_timerTimer = GameState::getOneSecondInFrames(); m_timerTimer = GameState::getOneSecondInFrames();
@ -177,6 +192,7 @@ void CNpcSharkManEnemy::processClose( int _frames )
m_animNo = m_data[m_type].moveAnim; m_animNo = m_data[m_type].moveAnim;
m_animPlaying = true; m_animPlaying = true;
m_frame = 0; m_frame = 0;
m_fired = false;
} }
} }

4
source/enemy/nshrkman.h
View file

@ -16,9 +16,13 @@
class CNpcSharkManEnemy : public CNpcEnemy class CNpcSharkManEnemy : public CNpcEnemy
{ {
public:
void postInit();
protected: protected:
void processClose( int _frames ); void processClose( int _frames );
void processMovement( int _frames ); void processMovement( int _frames );
u8 m_fired;
}; };
#endif #endif