This commit is contained in:
Charles 2001-05-14 15:48:34 +00:00
parent cd451daab6
commit 2f03cdf648
3 changed files with 6 additions and 6 deletions

View File

@ -1484,7 +1484,7 @@ void CNpcEnemy::processUserCollision( CThing *thisThing )
s16 headingFromTarget = ratan2( yDist, xDist );
if ( ( xDist > 0 && otherDelta.vx < 0 ) || ( xDist < 0 && otherDelta.vx > 0 ) )
/*if ( ( xDist > 0 && otherDelta.vx < 0 ) || ( xDist < 0 && otherDelta.vx > 0 ) )
{
otherDelta.vx = -otherDelta.vx;
}
@ -1505,7 +1505,7 @@ void CNpcEnemy::processUserCollision( CThing *thisThing )
else
{
Pos.vy += otherDelta.vy;
}
}*/
m_heading = headingFromTarget;

View File

@ -1043,7 +1043,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
2,
128,
DETECT_ALL_COLLISION,
DETECT_NO_COLLISION,
DAMAGE__NONE,
16,
FRM_JELLYFISH1_SWIM1,
@ -1089,7 +1089,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
2,
128,
DETECT_ALL_COLLISION,
DETECT_NO_COLLISION,
DAMAGE__NONE,
16,
FRM_JELLYFISH1_SWIM1,

View File

@ -153,11 +153,11 @@ void CNpcSmallJellyfishBackgroundEnemy::processMovement( int _frames )
moveVel = ( _frames * m_speed ) << 8;
if ( processGroundCollisionReverse( &moveX, &moveY ) )
/*if ( processGroundCollisionReverse( &moveX, &moveY ) )
{
m_targetHeading += 1024;
m_targetHeading &= 4095;
}
}*/
processMovementModifier( _frames, moveX, moveY, moveVel, moveDist );
}