From 8b5a2ec0c7d99b9b4e68008a692520d9ebcc573c Mon Sep 17 00:00:00 2001 From: Charles Date: Thu, 22 Feb 2001 20:20:01 +0000 Subject: [PATCH] --- source/enemy/ngeneric.cpp | 2 +- source/enemy/npcpath.cpp | 2 +- source/enemy/npcpath.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/enemy/ngeneric.cpp b/source/enemy/ngeneric.cpp index 849cf9579..032da8626 100644 --- a/source/enemy/ngeneric.cpp +++ b/source/enemy/ngeneric.cpp @@ -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 - 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 diff --git a/source/enemy/npcpath.cpp b/source/enemy/npcpath.cpp index 777ba0847..e75685cf8 100644 --- a/source/enemy/npcpath.cpp +++ b/source/enemy/npcpath.cpp @@ -231,7 +231,7 @@ s32 CNpcPath::think( DVECTOR currentPos, bool *pathComplete, bool *waypointChang 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; diff --git a/source/enemy/npcpath.h b/source/enemy/npcpath.h index 95b6524c2..649ede359 100644 --- a/source/enemy/npcpath.h +++ b/source/enemy/npcpath.h @@ -52,7 +52,7 @@ public: void resetPath(); void reversePathDir(); 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 ); };