Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Charles 2001-07-04 22:02:56 +00:00
parent 941c1fe3db
commit 9172c5cadf
2 changed files with 78 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
source/enemy/nssnake.cpp
View File

@ -204,9 +204,10 @@ bool CNpcSeaSnakeEnemy::processSensor()
return( false );
}
if ( playerXDistSqr + playerYDistSqr < 40000 )
if ( playerXDistSqr + playerYDistSqr < 50000 )
{
m_controlFunc = NPC_CONTROL_CLOSE;
m_state = SEA_SNAKE_VERTICAL_LINEUP;
return( true );
}
@ -347,7 +348,6 @@ void CNpcSeaSnakeEnemy::processMovement( int _frames )
s32 moveVel = 0;
s32 moveDist = 0;
DVECTOR oldPos = Pos;
u8 skipCounter;
if ( m_snapTimer > 0 )
{
@ -539,6 +539,15 @@ void CNpcSeaSnakeEnemy::processMovement( int _frames )
Pos.vx += moveX;
Pos.vy += moveY;
updateTail( oldPos, _frames );
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcSeaSnakeEnemy::updateTail( DVECTOR &oldPos, int _frames )
{
u8 skipCounter;
m_extension += 256;
m_extension &= 4095;
@ -764,6 +773,65 @@ void CNpcSeaSnakeEnemy::processMovement( int _frames )
void CNpcSeaSnakeEnemy::processClose( int _frames )
{
DVECTOR oldPos = Pos;
switch( m_state )
{
case SEA_SNAKE_VERTICAL_LINEUP:
{
if ( playerYDistSqr > 100 )
{
processGenericGotoTarget( _frames, 0, playerYDist, m_speed );
}
else
{
m_state = SEA_SNAKE_CHARGE;
}
break;
}
case SEA_SNAKE_CHARGE:
{
if ( playerXDistSqr > 4000 )
{
processGenericGotoTarget( _frames, playerXDist, 0, m_speed );
}
else
{
s16 heading = m_heading;
CProjectile *projectile;
projectile = CProjectile::Create();
DVECTOR newPos = Pos;
newPos.vx += 50 * ( rcos( m_heading ) >> 12 );
newPos.vy += 50 * ( rsin( m_heading ) >> 12 );
int perpHeading = ( heading - 1024 ) & 4095;
newPos.vx += 20 * ( rcos( perpHeading ) >> 12 );
newPos.vy += 20 * ( rsin( perpHeading ) >> 12 );
projectile->init( newPos, heading );
projectile->setGraphic( FRM__SNAKEBILE );
m_movementTimer = GameState::getOneSecondInFrames();
m_controlFunc = NPC_CONTROL_MOVEMENT;
m_timerFunc = NPC_TIMER_ATTACK_DONE;
m_timerTimer = 5 * GameState::getOneSecondInFrames();
m_sensorFunc = NPC_SENSOR_NONE;
m_snapTimer = m_movementTimer;
}
break;
}
}
updateTail( oldPos, _frames );
/*
// fire at player
//s16 heading = ratan2( playerYDist, playerXDist ) & 4095;
@ -794,6 +862,7 @@ void CNpcSeaSnakeEnemy::processClose( int _frames )
m_snapTimer = m_movementTimer;
//m_openTimer = GameState::getOneSecondInFrames() >> 2;
*/
}

7
source/enemy/nssnake.h
View File

@ -72,6 +72,7 @@ protected:
u8 isSnakeStopped();
void moveEntireSnake( DVECTOR newPos );
void addHealthMeter();
void updateTail( DVECTOR &oldPos, int _frames );
enum
{
@ -81,6 +82,12 @@ protected:
NPC_SEA_SNAKE_CIRCLE_ANTICLOCKWISE = 2,
};
enum SEA_SNAKE_STATES
{
SEA_SNAKE_VERTICAL_LINEUP = 0,
SEA_SNAKE_CHARGE = 1,
};
// position history stuff
class CNpcPositionHistory