diff --git a/source/enemy/npc.cpp b/source/enemy/npc.cpp index 87bcc9a16..14a2f86fd 100644 --- a/source/enemy/npc.cpp +++ b/source/enemy/npc.cpp @@ -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; diff --git a/source/enemy/npcdata.cpp b/source/enemy/npcdata.cpp index 983f76ef1..968cb14d1 100644 --- a/source/enemy/npcdata.cpp +++ b/source/enemy/npcdata.cpp @@ -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, diff --git a/source/enemy/nsjback.cpp b/source/enemy/nsjback.cpp index a105b79a5..4598894f0 100644 --- a/source/enemy/nsjback.cpp +++ b/source/enemy/nsjback.cpp @@ -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 ); }