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-25 20:44:53 +00:00
parent c76bf22672
commit 32048ee446
2 changed files with 138 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

265
source/enemy/nssnake.cpp
View file

@ -167,6 +167,7 @@ void CNpcSeaSnakeEnemy::postInit()
m_collTimer = 0; m_collTimer = 0;
m_meterOn=false; m_meterOn=false;
m_turnDir = 0; m_turnDir = 0;
m_waitTimer = 0;
} }
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -250,159 +251,167 @@ void CNpcSeaSnakeEnemy::processMovement( int _frames )
} }
} }
switch( m_turnDir ) if ( m_waitTimer > 0 )
{ {
case NPC_SEA_SNAKE_CIRCLE_CLOCKWISE: m_waitTimer -= _frames;
}
else
{
switch( m_turnDir )
{ {
m_circleHeading += m_data[m_type].turnSpeed; case NPC_SEA_SNAKE_CIRCLE_CLOCKWISE:
if ( m_circleHeading > 4096 )
{ {
m_circleHeading = 0; m_circleHeading += m_data[m_type].turnSpeed;
m_turnDir = 0;
}
m_heading = ( m_origHeading + m_circleHeading ) & 4095; if ( m_circleHeading > 4096 )
s32 preShiftX = _frames * m_speed * rcos( m_heading );
s32 preShiftY = _frames * m_speed * rsin( m_heading );
s32 moveX = preShiftX >> 12;
if ( !moveX && preShiftX )
{
moveX = preShiftX / abs( preShiftX );
}
s32 moveY = preShiftY >> 12;
if ( !moveY && preShiftY )
{
moveY = preShiftY / abs( preShiftY );
}
Pos.vx += moveX;
Pos.vy += moveY;
break;
}
case NPC_SEA_SNAKE_CIRCLE_ANTICLOCKWISE:
{
m_circleHeading -= m_data[m_type].turnSpeed;
if ( m_circleHeading < -4096 )
{
m_circleHeading = 0;
m_turnDir = 0;
}
m_heading = ( m_origHeading + m_circleHeading ) & 4095;
s32 preShiftX = _frames * m_speed * rcos( m_heading );
s32 preShiftY = _frames * m_speed * rsin( m_heading );
s32 moveX = preShiftX >> 12;
if ( !moveX && preShiftX )
{
moveX = preShiftX / abs( preShiftX );
}
s32 moveY = preShiftY >> 12;
if ( !moveY && preShiftY )
{
moveY = preShiftY / abs( preShiftY );
}
Pos.vx += moveX;
Pos.vy += moveY;
break;
}
default:
{
DVECTOR waypointPos;
m_npcPath.getCurrentWaypointPos( &waypointPos );
waypointPos.vy -= 8;
if ( CGameScene::getCollision()->getHeightFromGround( waypointPos.vx, waypointPos.vy ) < 0 )
{
// waypoint is either start or end waypoint
s32 distX, distY;
distX = waypointPos.vx - Pos.vx;
distY = waypointPos.vy - Pos.vy;
if( !distX && !distY )
{ {
if ( isSnakeStopped() ) m_circleHeading = 0;
m_turnDir = 0;
}
m_heading = ( m_origHeading + m_circleHeading ) & 4095;
s32 preShiftX = _frames * m_speed * rcos( m_heading );
s32 preShiftY = _frames * m_speed * rsin( m_heading );
s32 moveX = preShiftX >> 12;
if ( !moveX && preShiftX )
{
moveX = preShiftX / abs( preShiftX );
}
s32 moveY = preShiftY >> 12;
if ( !moveY && preShiftY )
{
moveY = preShiftY / abs( preShiftY );
}
Pos.vx += moveX;
Pos.vy += moveY;
break;
}
case NPC_SEA_SNAKE_CIRCLE_ANTICLOCKWISE:
{
m_circleHeading -= m_data[m_type].turnSpeed;
if ( m_circleHeading < -4096 )
{
m_circleHeading = 0;
m_turnDir = 0;
}
m_heading = ( m_origHeading + m_circleHeading ) & 4095;
s32 preShiftX = _frames * m_speed * rcos( m_heading );
s32 preShiftY = _frames * m_speed * rsin( m_heading );
s32 moveX = preShiftX >> 12;
if ( !moveX && preShiftX )
{
moveX = preShiftX / abs( preShiftX );
}
s32 moveY = preShiftY >> 12;
if ( !moveY && preShiftY )
{
moveY = preShiftY / abs( preShiftY );
}
Pos.vx += moveX;
Pos.vy += moveY;
break;
}
default:
{
DVECTOR waypointPos;
m_npcPath.getCurrentWaypointPos( &waypointPos );
waypointPos.vy -= 8;
if ( CGameScene::getCollision()->getHeightFromGround( waypointPos.vx, waypointPos.vy ) < 0 )
{
// waypoint is either start or end waypoint
s32 distX, distY;
distX = waypointPos.vx - Pos.vx;
distY = waypointPos.vy - Pos.vy;
if( !distX && !distY )
{ {
m_npcPath.incPath(); if ( isSnakeStopped() )
m_npcPath.getCurrentWaypointPos( &waypointPos );
waypointPos.vy -= 8;
if ( CGameScene::getCollision()->getHeightFromGround( waypointPos.vx, waypointPos.vy ) < 0 )
{ {
// if next waypoint is ALSO a start/end waypoint, teleport directly to it
moveEntireSnake( waypointPos );
oldPos.vx = waypointPos.vx;
oldPos.vy = waypointPos.vy;
// increment path
m_npcPath.incPath(); m_npcPath.incPath();
// point snake in correct direction
m_npcPath.getCurrentWaypointPos( &waypointPos ); m_npcPath.getCurrentWaypointPos( &waypointPos );
waypointPos.vy -= 8;
m_heading = ratan2( waypointPos.vy - Pos.vy, waypointPos.vx - Pos.vx ) & 4095; if ( CGameScene::getCollision()->getHeightFromGround( waypointPos.vx, waypointPos.vy ) < 0 )
{
// if next waypoint is ALSO a start/end waypoint, teleport directly to it
moveEntireSnake( waypointPos );
m_waitTimer = 3 * GameState::getOneSecondInFrames();
oldPos.vx = waypointPos.vx;
oldPos.vy = waypointPos.vy;
// increment path
m_npcPath.incPath();
// point snake in correct direction
m_npcPath.getCurrentWaypointPos( &waypointPos );
m_heading = ratan2( waypointPos.vy - Pos.vy, waypointPos.vx - Pos.vx ) & 4095;
}
} }
} }
else
{
processGenericGotoTarget( _frames, distX, distY, m_speed );
}
} }
else else
{ {
processGenericGotoTarget( _frames, distX, distY, m_speed ); if ( processGenericFixedPathMove( _frames, &moveX, &moveY, &moveVel, &moveDist ) )
}
}
else
{
if ( processGenericFixedPathMove( _frames, &moveX, &moveY, &moveVel, &moveDist ) )
{
// path has changed
DVECTOR newWaypointPos;
m_npcPath.getCurrentWaypointPos( &newWaypointPos );
newWaypointPos.vy -= 8;
if ( newWaypointPos.vy == waypointPos.vy )
{ {
int testDir = newWaypointPos.vx - waypointPos.vx; // path has changed
if ( testDir > 0 && testDir <= 16 ) DVECTOR newWaypointPos;
m_npcPath.getCurrentWaypointPos( &newWaypointPos );
newWaypointPos.vy -= 8;
if ( newWaypointPos.vy == waypointPos.vy )
{ {
// clockwise int testDir = newWaypointPos.vx - waypointPos.vx;
m_turnDir = NPC_SEA_SNAKE_CIRCLE_CLOCKWISE; if ( testDir > 0 && testDir <= 16 )
m_circleHeading = 0; {
m_origHeading = m_heading; // clockwise
m_npcPath.incPath();
}
else if ( testDir < 0 && testDir >= -16 )
{
// anticlockwise
m_turnDir = NPC_SEA_SNAKE_CIRCLE_ANTICLOCKWISE; m_turnDir = NPC_SEA_SNAKE_CIRCLE_CLOCKWISE;
m_circleHeading = 0; m_circleHeading = 0;
m_origHeading = m_heading; m_origHeading = m_heading;
m_npcPath.incPath(); m_npcPath.incPath();
}
else if ( testDir < 0 && testDir >= -16 )
{
// anticlockwise
m_turnDir = NPC_SEA_SNAKE_CIRCLE_ANTICLOCKWISE;
m_circleHeading = 0;
m_origHeading = m_heading;
m_npcPath.incPath();
}
} }
} }
} }
}
break; break;
}
} }
} }

1
source/enemy/nssnake.h
View file

@ -97,6 +97,7 @@ protected:
u8 m_turnDir; u8 m_turnDir;
s16 m_circleHeading; s16 m_circleHeading;
s16 m_origHeading; s16 m_origHeading;
s32 m_waitTimer;
}; };
#endif #endif