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-05-14 15:08:47 +00:00
parent 7031c64996
commit 35f5514dc5
3 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
source/enemy/npcpath.cpp
View file

@ -271,7 +271,7 @@ s32 CNpcPath::think( DVECTOR currentPos, bool *pathComplete, bool *waypointChang
return( headingToTarget ); return( headingToTarget );
} }
bool CNpcPath::thinkFlat( DVECTOR currentPos, bool *pathComplete, s32 *distX, s32 *distY, s32 *heading ) bool CNpcPath::thinkFlat( DVECTOR currentPos, bool *pathComplete, s32 *distX, s32 *distY, s32 *heading, u8 waypointDist )
{ {
bool pointChange = false; bool pointChange = false;
@ -292,7 +292,7 @@ bool CNpcPath::thinkFlat( DVECTOR currentPos, bool *pathComplete, s32 *distX, s3
*distX = currentWaypoint->pos.vx - currentPos.vx; *distX = currentWaypoint->pos.vx - currentPos.vx;
*distY = currentWaypoint->pos.vy - currentPos.vy; *distY = currentWaypoint->pos.vy - currentPos.vy;
if ( abs( *distX ) < 10 ) if ( abs( *distX ) < waypointDist )
{ {
pointChange = true; pointChange = true;
*pathComplete = incPath(); *pathComplete = incPath();

2
source/enemy/npcpath.h
View file

@ -45,7 +45,7 @@ public:
void resetPath(); void resetPath();
void reversePathDir(); void reversePathDir();
s32 think( DVECTOR currentPos, bool *pathComplete, bool *waypointChange, s32 *distX, s32 *distY ); s32 think( DVECTOR currentPos, bool *pathComplete, bool *waypointChange, s32 *distX, s32 *distY );
bool thinkFlat( DVECTOR currentPos, bool *pathComplete, s32 *distX, s32 *distY, s32 *heading ); bool thinkFlat( DVECTOR currentPos, bool *pathComplete, s32 *distX, s32 *distY, s32 *heading, u8 waypointDist = 10 );
bool thinkVertical( DVECTOR currentPos, bool *pathComplete, s32 *distX, s32 *distY, s32 *heading ); bool thinkVertical( DVECTOR currentPos, bool *pathComplete, s32 *distX, s32 *distY, s32 *heading );
bool getDistToNextWaypoint( DVECTOR currentPos, s32 *distX, s32 *distY ); bool getDistToNextWaypoint( DVECTOR currentPos, s32 *distX, s32 *distY );
void getPathXExtents( s32 *minExtent, s32 *maxExtent ); void getPathXExtents( s32 *minExtent, s32 *maxExtent );

20
source/hazard/hbbarrel.cpp
View file

@ -57,7 +57,7 @@ void CNpcBouncingBarrelHazard::processMovement( int _frames )
bool pathComplete; bool pathComplete;
if ( m_npcPath.thinkFlat( Pos, &pathComplete, &waypointXDist, &waypointYDist, &waypointHeading ) ) if ( m_npcPath.thinkFlat( Pos, &pathComplete, &waypointXDist, &waypointYDist, &waypointHeading, 1 ) )
{ {
if ( pathComplete ) if ( pathComplete )
{ {
@ -68,7 +68,12 @@ void CNpcBouncingBarrelHazard::processMovement( int _frames )
m_lastWaypoint = Pos; m_lastWaypoint = Pos;
} }
moveX = 3 * _frames; moveX = 4 * _frames;
if ( moveX > abs( waypointXDist ) )
{
moveX = abs( waypointXDist );
}
if ( waypointHeading == 2048 ) if ( waypointHeading == 2048 )
{ {
@ -110,15 +115,22 @@ void CNpcBouncingBarrelHazard::processMovement( int _frames )
nextWaypoint.vx = waypointXDist + Pos.vx; nextWaypoint.vx = waypointXDist + Pos.vx;
nextWaypoint.vy = waypointYDist + Pos.vy; nextWaypoint.vy = waypointYDist + Pos.vy;
s32 waypointDist = abs( nextWaypoint.vx - m_lastWaypoint.vx );
if ( waypointDist < 1 )
{
waypointDist = 1;
}
if ( waypointYDist > 0 ) if ( waypointYDist > 0 )
{ {
s32 sineVal = ( abs( Pos.vx - nextWaypoint.vx ) * 1024 ) / abs( nextWaypoint.vx - m_lastWaypoint.vx ); s32 sineVal = ( abs( Pos.vx - nextWaypoint.vx ) * 1024 ) / waypointDist;
Pos.vy = nextWaypoint.vy - ( ( abs( nextWaypoint.vy - m_lastWaypoint.vy ) * rsin( sineVal ) ) >> 12 ); Pos.vy = nextWaypoint.vy - ( ( abs( nextWaypoint.vy - m_lastWaypoint.vy ) * rsin( sineVal ) ) >> 12 );
} }
else if ( waypointYDist < 0 ) else if ( waypointYDist < 0 )
{ {
s32 sineVal = ( abs( Pos.vx - m_lastWaypoint.vx ) * 1024 ) / abs( nextWaypoint.vx - m_lastWaypoint.vx ); s32 sineVal = ( abs( Pos.vx - m_lastWaypoint.vx ) * 1024 ) / waypointDist;
Pos.vy = m_lastWaypoint.vy - ( ( abs( nextWaypoint.vy - m_lastWaypoint.vy ) * rsin( sineVal ) ) >> 12 ); Pos.vy = m_lastWaypoint.vy - ( ( abs( nextWaypoint.vy - m_lastWaypoint.vy ) * rsin( sineVal ) ) >> 12 );
} }