This commit is contained in:
Charles 2001-01-22 19:14:00 +00:00
parent baf02fd535
commit d236bd4b00
3 changed files with 5 additions and 5 deletions

View file

@ -44,14 +44,14 @@ void CNpc::processCloseAnemone1Attack( int _frames )
s16 headingToPlayer = ratan2( yDist, xDist ); s16 headingToPlayer = ratan2( yDist, xDist );
decDir = m_baseHeading - headingToPlayer; decDir = m_fireHeading - headingToPlayer;
if ( decDir < 0 ) if ( decDir < 0 )
{ {
decDir += ONE; decDir += ONE;
} }
incDir = headingToPlayer - m_baseHeading; incDir = headingToPlayer - m_fireHeading;
if ( incDir < 0 ) if ( incDir < 0 )
{ {
@ -136,7 +136,7 @@ void CNpc::processCloseAnemone2Attack( int _frames )
for ( fireLoop = 0 ; fireLoop < 5 ; fireLoop++ ) for ( fireLoop = 0 ; fireLoop < 5 ; fireLoop++ )
{ {
heading = m_baseHeading - 1024 + ( fireLoop * 512 ); heading = m_heading - 1024 + ( fireLoop * 512 );
heading %= 4096; heading %= 4096;
projectile = new( "test projectile" ) CProjectile; projectile = new( "test projectile" ) CProjectile;

View file

@ -385,7 +385,7 @@ void CNpc::init()
{ {
m_type = NPC_ANEMONE_1; m_type = NPC_ANEMONE_1;
m_heading = m_baseHeading = 0; m_heading = m_fireHeading = 0;
m_movementTimer = 0; m_movementTimer = 0;
m_timerTimer = 0; m_timerTimer = 0;
m_velocity = 0; m_velocity = 0;

View file

@ -208,7 +208,7 @@ protected:
NPC_SENSOR_FUNC m_sensorFunc; NPC_SENSOR_FUNC m_sensorFunc;
CNpcPath m_npcPath; CNpcPath m_npcPath;
s32 m_heading; s32 m_heading;
s32 m_baseHeading; s32 m_fireHeading;
s32 m_movementTimer; s32 m_movementTimer;
s32 m_velocity; s32 m_velocity;
bool m_evadeClockwise; bool m_evadeClockwise;