This commit is contained in:
Charles 2001-02-22 15:39:38 +00:00
parent 895fbfd27b
commit dedfdcf295
7 changed files with 114 additions and 6 deletions

View File

@ -26,10 +26,11 @@
void CNpc::processFishFolkMovementModifier( int _frames, s32 distX, s32 distY )
{
Pos.vy += distY;
if ( m_movementTimer > 0 )
{
Pos.vx += distX;
Pos.vy += distY;
m_movementTimer -= _frames;

View File

@ -99,6 +99,75 @@ void CNpc::processGenericGetUserDist( int _frames, s32 *distX, s32 *distY )
*distY = playerPos.vy - this->Pos.vy;
}
void CNpc::processGenericFixedPathWalk( int _frames, s32 *moveX, s32 *moveY )
{
s32 maxHeight = 10;
s32 distX, distY;
s32 fallSpeed = 5;
s8 yMovement = fallSpeed * _frames;
s32 groundHeight;
*moveX = 0;
*moveY = 0;
// ignore y component of waypoint, since we are stuck to the ground
if ( m_npcPath.think2D( Pos, &distX, &distY ) )
{
// path has finished, waypoint has changed, or there are no waypoints - do not move horizontally
// check for vertical movement
groundHeight = m_layerCollision->getHeightFromGround( Pos.vx, Pos.vy, yMovement + 16 );
if ( groundHeight <= yMovement )
{
// groundHeight <= yMovement indicates either just above ground or on or below ground
*moveY = groundHeight;
}
else
{
// fall
*moveY = yMovement;
}
}
else
{
// check for collision
distX = distX / abs( distX );
if ( m_layerCollision->getHeightFromGround( Pos.vx + ( distX * m_data[m_type].speed * _frames ), Pos.vy ) < -maxHeight )
{
// there is an obstacle in the way, increment the path point (hopefully this will resolve the problem)
m_npcPath.incPath();
}
else
{
// check for vertical movement
groundHeight = m_layerCollision->getHeightFromGround( Pos.vx, Pos.vy, yMovement + 16 );
if ( groundHeight <= yMovement )
{
// groundHeight <= yMovement indicates either just above ground or on or below ground
*moveX = distX * m_data[m_type].speed * _frames;
*moveY = groundHeight;
}
else
{
// fall
*moveY = yMovement;
}
}
}
}
bool CNpc::isCollisionWithGround()
{
ASSERT(m_layerCollision);

View File

@ -54,7 +54,7 @@ class CLayerCollision *CNpc::m_layerCollision;
void CNpc::init()
{
m_type = NPC_SMALL_JELLYFISH_1;
m_type = NPC_FISH_FOLK;
m_heading = m_fireHeading = 0;
m_movementTimer = 0;
@ -231,13 +231,13 @@ void CNpc::init()
DVECTOR newPos;
newPos.vx = 100;
newPos.vy = 100;
newPos.vx = 200;
newPos.vy = 400;
m_npcPath.addWaypoint( newPos );
newPos.vx = 500;
newPos.vy = 100;
newPos.vy = 400;
m_npcPath.addWaypoint( newPos );
@ -721,6 +721,13 @@ void CNpc::processMovement(int _frames)
break;
}
case NPC_MOVEMENT_FIXED_PATH_WALK:
{
processGenericFixedPathWalk( _frames, &moveX, &moveY );
break;
}
case NPC_MOVEMENT_MOTHER_JELLYFISH:
{
processMotherJellyfishMovement( _frames );

View File

@ -166,6 +166,7 @@ protected:
{
NPC_MOVEMENT_STATIC = 0,
NPC_MOVEMENT_FIXED_PATH = 1,
NPC_MOVEMENT_FIXED_PATH_WALK,
NPC_MOVEMENT_MOTHER_JELLYFISH,
NPC_MOVEMENT_SUB_SHARK,
NPC_MOVEMENT_FLYING_DUTCHMAN,
@ -270,6 +271,7 @@ protected:
void processGenericGotoTarget( int _frames, s32 xDist, s32 yDist, s32 speed );
void processGenericGetUserDist( int _frames, s32 *distX, s32 *distY );
void processGenericFixedPathWalk( int _frames, s32 *moveX, s32 *moveY );
// small jellyfish functions

View File

@ -262,7 +262,7 @@ CNpc::NPC_DATA CNpc::m_data[NPC_UNIT_TYPE_MAX] =
{ // NPC_FISH_FOLK
NPC_INIT_FISH_FOLK,
NPC_SENSOR_NONE,
NPC_MOVEMENT_FIXED_PATH,
NPC_MOVEMENT_FIXED_PATH_WALK,
NPC_MOVEMENT_MODIFIER_FISH_FOLK,
NPC_CLOSE_NONE,
NPC_TIMER_NONE,

View File

@ -230,3 +230,31 @@ s32 CNpcPath::think( DVECTOR currentPos, bool *pathComplete, bool *waypointChang
return( headingToTarget );
}
bool CNpcPath::think2D( DVECTOR currentPos, s32 *distX, s32 *distY )
{
bool pointChange = false;
if ( !this->waypoint )
{
return( true );
}
if ( !currentWaypoint )
{
// if no currentWaypoint set, start it off
currentWaypoint = this->waypoint;
}
*distX = currentWaypoint->pos.vx - currentPos.vx;
*distY = currentWaypoint->pos.vy - currentPos.vy;
if ( abs( *distX ) < 10 )
{
pointChange = true;
incPath();
}
return( pointChange );
}

View File

@ -52,6 +52,7 @@ public:
void resetPath();
void reversePathDir();
s32 think( DVECTOR currentPos, bool *pathComplete, bool *waypointChange );
bool think2D( DVECTOR currentPos, s32 *distX, s32 *distY );
bool getDistToNextWaypoint( DVECTOR currentPos, s32 *distX, s32 *distY );
};