This commit is contained in:
parent
f6ec01a950
commit
8b5a2ec0c7
@ -112,7 +112,7 @@ void CNpc::processGenericFixedPathWalk( int _frames, s32 *moveX, s32 *moveY, s32
|
|||||||
|
|
||||||
// ignore y component of waypoint, since we are stuck to the ground
|
// ignore y component of waypoint, since we are stuck to the ground
|
||||||
|
|
||||||
if ( m_npcPath.think2D( Pos, &distX, &distY, heading ) )
|
if ( m_npcPath.thinkFlat( Pos, &distX, &distY, heading ) )
|
||||||
{
|
{
|
||||||
// path has finished, waypoint has changed, or there are no waypoints - do not move horizontally
|
// path has finished, waypoint has changed, or there are no waypoints - do not move horizontally
|
||||||
|
|
||||||
|
@ -231,7 +231,7 @@ s32 CNpcPath::think( DVECTOR currentPos, bool *pathComplete, bool *waypointChang
|
|||||||
return( headingToTarget );
|
return( headingToTarget );
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CNpcPath::think2D( DVECTOR currentPos, s32 *distX, s32 *distY, s32 *heading )
|
bool CNpcPath::thinkFlat( DVECTOR currentPos, s32 *distX, s32 *distY, s32 *heading )
|
||||||
{
|
{
|
||||||
bool pointChange = false;
|
bool pointChange = false;
|
||||||
|
|
||||||
|
@ -52,7 +52,7 @@ public:
|
|||||||
void resetPath();
|
void resetPath();
|
||||||
void reversePathDir();
|
void reversePathDir();
|
||||||
s32 think( DVECTOR currentPos, bool *pathComplete, bool *waypointChange );
|
s32 think( DVECTOR currentPos, bool *pathComplete, bool *waypointChange );
|
||||||
bool think2D( DVECTOR currentPos, s32 *distX, s32 *distY, s32 *heading );
|
bool thinkFlat( DVECTOR currentPos, s32 *distX, s32 *distY, s32 *heading );
|
||||||
bool getDistToNextWaypoint( DVECTOR currentPos, s32 *distX, s32 *distY );
|
bool getDistToNextWaypoint( DVECTOR currentPos, s32 *distX, s32 *distY );
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user