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-06-05 14:54:56 +00:00
parent bcb3843739
commit aa041ffe1e
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
source/enemy/nsshark.cpp
View file

@ -180,7 +180,10 @@ void CNpcSubSharkEnemy::processClose( int _frames )
processGenericGotoTarget( _frames, playerXDist, 0, m_speed ); processGenericGotoTarget( _frames, playerXDist, 0, m_speed );
if ( playerXDistSqr < 100 ) s32 minX, maxX;
m_npcPath.getPathXExtents( &minX, &maxX );
if ( Pos.vx < minX || Pos.vx > maxX || playerXDistSqr < 100 )
{ {
// fire at player // fire at player
@ -206,7 +209,10 @@ void CNpcSubSharkEnemy::processClose( int _frames )
processGenericGotoTarget( _frames, playerXDist, 0, NPC_SUB_SHARK_HIGH_SPEED ); processGenericGotoTarget( _frames, playerXDist, 0, NPC_SUB_SHARK_HIGH_SPEED );
if ( playerXDistSqr < 10000 ) s32 minX, maxX;
m_npcPath.getPathXExtents( &minX, &maxX );
if ( Pos.vx < minX || Pos.vx > maxX || playerXDistSqr < 10000 )
{ {
m_animPlaying = true; m_animPlaying = true;
m_animNo = ANIM_SHARKSUB_CHOMP; m_animNo = ANIM_SHARKSUB_CHOMP;
@ -223,9 +229,13 @@ void CNpcSubSharkEnemy::processClose( int _frames )
// if ( collision ) // if ( collision )
// else // else
s32 minX, maxX;
m_npcPath.getPathXExtents( &minX, &maxX );
if ( m_extendDir == EXTEND_RIGHT ) if ( m_extendDir == EXTEND_RIGHT )
{ {
s32 xDist = 600 - Pos.vx; //s32 xDist = 600 - Pos.vx;
s32 xDist = maxX - Pos.vx;
s32 xDistSqr = xDist * xDist; s32 xDistSqr = xDist * xDist;
if ( xDistSqr > 100 ) if ( xDistSqr > 100 )
@ -239,7 +249,8 @@ void CNpcSubSharkEnemy::processClose( int _frames )
} }
else else
{ {
s32 xDist = 100 - Pos.vx; //s32 xDist = 100 - Pos.vx;
s32 xDist = minX - Pos.vx;
s32 xDistSqr = xDist * xDist; s32 xDistSqr = xDist * xDist;
if ( xDistSqr > 100 ) if ( xDistSqr > 100 )