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-04 20:00:05 +00:00
parent 8fb41f98ee
commit 4cefba60e7
2 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

36
source/enemy/ndogfish.cpp
View file

@ -252,15 +252,24 @@ void CNpcIronDogfishEnemy::processStandardIronDogfishAttack( int _frames )
s16 headingToPlayer = ratan2( playerYDist, playerXDist ) & 4095; s16 headingToPlayer = ratan2( playerYDist, playerXDist ) & 4095;
/*CProjectile *projectile; CProjectile *projectile;
projectile = CProjectile::Create(); projectile = CProjectile::Create();
DVECTOR startPos = Pos; DVECTOR startPos = Pos;
startPos.vy -= 20; if ( m_heading == 0 )
projectile->init( startPos, headingToPlayer );*/ {
startPos.vx += 60;
}
else
{
startPos.vx -= 60;
}
startPos.vy -= 45;
m_laserTimer = GameState::getOneSecondInFrames(); projectile->init( startPos, headingToPlayer );
m_effect = (CFXLaser*) CFX::Create( CFX::FX_TYPE_LASER, this ); m_laserTimer = GameState::getOneSecondInFrames() >> 1;
/*m_effect = (CFXLaser*) CFX::Create( CFX::FX_TYPE_LASER, this );
DVECTOR offsetPos; DVECTOR offsetPos;
if ( m_heading == 0 ) if ( m_heading == 0 )
@ -278,7 +287,7 @@ void CNpcIronDogfishEnemy::processStandardIronDogfishAttack( int _frames )
targetPos.vy -= 45; targetPos.vy -= 45;
m_effect->setTarget( targetPos ); m_effect->setTarget( targetPos );
m_effect->setRGB( 255, 0, 0 ); m_effect->setRGB( 255, 0, 0 );*/
m_state++; m_state++;
@ -301,18 +310,14 @@ void CNpcIronDogfishEnemy::processStandardIronDogfishAttack( int _frames )
} }
else else
{ {
m_effect->killFX(); //m_effect->killFX();
m_state++; m_state++;
if ( m_state > IRON_DOGFISH_LASER_EYE_2_WAIT ) if ( m_state == IRON_DOGFISH_LASER_EYE_2_WAIT )
{ {
// return to first state m_movementTimer = GameState::getOneSecondInFrames() * 3;
m_state = IRON_DOGFISH_THUMP_1;
} }
m_movementTimer = GameState::getOneSecondInFrames() * 3;
} }
break; break;
@ -362,7 +367,10 @@ void CNpcIronDogfishEnemy::processStandardIronDogfishAttack( int _frames )
else if ( !m_animPlaying ) else if ( !m_animPlaying )
{ {
m_movementTimer = GameState::getOneSecondInFrames() * 3; m_movementTimer = GameState::getOneSecondInFrames() * 3;
m_state++;
// return to first state
m_state = IRON_DOGFISH_THUMP_1;
} }
} }

4
source/enemy/ndogfish.h
View file

@ -46,10 +46,10 @@ protected:
IRON_DOGFISH_THUMP_1 = 0, IRON_DOGFISH_THUMP_1 = 0,
IRON_DOGFISH_LASER_EYE_1 = 1, IRON_DOGFISH_LASER_EYE_1 = 1,
IRON_DOGFISH_LASER_EYE_1_WAIT, IRON_DOGFISH_LASER_EYE_1_WAIT,
IRON_DOGFISH_THUMP_2,
IRON_DOGFISH_ROLL,
IRON_DOGFISH_LASER_EYE_2, IRON_DOGFISH_LASER_EYE_2,
IRON_DOGFISH_LASER_EYE_2_WAIT, IRON_DOGFISH_LASER_EYE_2_WAIT,
IRON_DOGFISH_THUMP_2,
IRON_DOGFISH_ROLL,
}; };
s32 m_steamTimer; s32 m_steamTimer;