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-31 16:24:48 +00:00
parent 7bb3c7353e
commit 579cb15a9d
20 changed files with 71 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/enemy/nmjfish.cpp
View file

@ -91,7 +91,7 @@ void CNpcMotherJellyfishEnemy::setupWaypoints( sThingActor *ThisActor )
setStartPos( newXPos, newYPos );
startX = newXPos << 4;
startX = ( newXPos << 4 ) + 8;
if ( ThisActor->PointCount > 1 )
{
@ -109,13 +109,13 @@ void CNpcMotherJellyfishEnemy::setupWaypoints( sThingActor *ThisActor )
if ( pointNum == ThisActor->PointCount - 2 )
{
startX = newXPos << 4;
startX = ( newXPos << 4 ) + 8;
m_base.vx = startX;
m_base.vy = newYPos << 4;
m_base.vy = ( newYPos << 4 ) + 16;
}
else if ( pointNum == ThisActor->PointCount - 1 )
{
m_cycleWidth = abs( startX - ( newXPos << 4 ) );
m_cycleWidth = abs( startX - ( ( newXPos << 4 ) + 8 ) );
m_halfCycleWidth = m_cycleWidth >> 1;
m_base.vx += m_halfCycleWidth;
}

4
source/enemy/npc.cpp
View file

@ -507,8 +507,8 @@ void CNpcEnemy::addWaypoint( u16 *ptrX, u16 *ptrY )
void CNpcEnemy::setStartPos( s32 xPos, s32 yPos )
{
Pos.vx = xPos << 4;
Pos.vy = yPos << 4;
Pos.vx = ( xPos << 4 ) + 8;
Pos.vy = ( yPos << 4 ) + 16;
m_initPos = m_base = Pos;
}

32
source/enemy/npcpath.cpp
View file

@ -25,12 +25,12 @@ bool CNpcPath::isPointNear( DVECTOR testPos, s32 *xDist, s32 *yDist )
u16 *waypoint = waypointPtr;
waypoint += 2 * currentWaypoint;
*xDist = ( *waypoint << 4 ) - testPos.vx;
*xDist = ( ( *waypoint << 4 ) + 8 ) - testPos.vx;
xDistSqr = (*xDist) * (*xDist);
waypoint++;
*yDist = ( *waypoint << 4 ) - testPos.vy;
*yDist = ( ( *waypoint << 4 ) + 16 ) - testPos.vy;
yDistSqr = (*yDist) * (*yDist);
if ( xDistSqr + yDistSqr < 100 )
@ -114,9 +114,9 @@ void CNpcPath::setPathExtents()
if ( tempPtr )
{
mapPos.vx = *tempPtr << 4;
mapPos.vx = ( *tempPtr << 4 ) + 8;
*tempPtr++;
mapPos.vy = *tempPtr << 4;
mapPos.vy = ( *tempPtr << 4 ) + 16;
*tempPtr++;
minX = maxX = mapPos.vx;
@ -124,9 +124,9 @@ void CNpcPath::setPathExtents()
for ( tempWaypoint = 1 ; tempWaypoint <= waypointCount ; tempWaypoint++ )
{
mapPos.vx = *tempPtr << 4;
mapPos.vx = ( *tempPtr << 4 ) + 8;
*tempPtr++;
mapPos.vy = *tempPtr << 4;
mapPos.vy = ( *tempPtr << 4 ) + 16;
*tempPtr++;
if ( mapPos.vx < minX )
@ -263,9 +263,9 @@ s32 CNpcPath::think( DVECTOR currentPos, bool *pathComplete, bool *waypointChang
u16 *waypoint = waypointPtr;
waypoint += 2 * currentWaypoint;
*distX = ( *waypoint << 4 ) - currentPos.vx;
*distX = ( ( *waypoint << 4 ) + 8 ) - currentPos.vx;
waypoint++;
*distY = ( *waypoint << 4 ) - currentPos.vy;
*distY = ( ( *waypoint << 4 ) + 16 ) - currentPos.vy;
}
s32 headingToTarget = ratan2( *distY, *distX );
@ -289,9 +289,9 @@ bool CNpcPath::thinkFlat( DVECTOR currentPos, bool *pathComplete, s32 *distX, s3
u16 *waypoint = waypointPtr;
waypoint += 2 * currentWaypoint;
*distX = ( *waypoint << 4 ) - currentPos.vx;
*distX = ( ( *waypoint << 4 ) + 8 ) - currentPos.vx;
waypoint++;
*distY = ( *waypoint << 4 ) - currentPos.vy;
*distY = ( ( *waypoint << 4 ) + 16 ) - currentPos.vy;
if ( abs( *distX ) < waypointDist )
{
@ -302,9 +302,9 @@ bool CNpcPath::thinkFlat( DVECTOR currentPos, bool *pathComplete, s32 *distX, s3
waypoint = waypointPtr;
waypoint += 2 * currentWaypoint;
*distX = ( *waypoint << 4 ) - currentPos.vx;
*distX = ( ( *waypoint << 4 ) + 8 ) - currentPos.vx;
waypoint++;
*distY = ( *waypoint << 4 ) - currentPos.vy;
*distY = ( ( *waypoint << 4 ) + 16 ) - currentPos.vy;
if ( *distX > 0 )
{
@ -334,9 +334,9 @@ bool CNpcPath::thinkVertical( DVECTOR currentPos, bool *pathComplete, s32 *distX
u16 *waypoint = waypointPtr;
waypoint += 2 * currentWaypoint;
*distX = ( *waypoint << 4 ) - currentPos.vx;
*distX = ( ( *waypoint << 4 ) + 8 ) - currentPos.vx;
waypoint++;
*distY = ( *waypoint << 4 ) - currentPos.vy;
*distY = ( ( *waypoint << 4 ) + 16 ) - currentPos.vy;
if ( abs( *distY ) < 10 )
{
@ -347,9 +347,9 @@ bool CNpcPath::thinkVertical( DVECTOR currentPos, bool *pathComplete, s32 *distX
waypoint = waypointPtr;
waypoint += 2 * currentWaypoint;
*distX = ( *waypoint << 4 ) - currentPos.vx;
*distX = ( ( *waypoint << 4 ) + 8 ) - currentPos.vx;
waypoint++;
*distY = ( *waypoint << 4 ) - currentPos.vy;
*distY = ( ( *waypoint << 4 ) + 16 ) - currentPos.vy;
if ( *distY > 0 )
{