This commit is contained in:
parent
e9788db8c2
commit
68d51431c6
@ -240,7 +240,7 @@ void CNpcFlyingDutchmanEnemy::processClose( int _frames )
|
|||||||
|
|
||||||
// charge player
|
// charge player
|
||||||
|
|
||||||
if ( ( playerXDistSqr + playerYDistSqr ) > 25000 )
|
if ( ( playerXDistSqr + playerYDistSqr ) > 31250 )
|
||||||
{
|
{
|
||||||
processGenericGotoTarget( _frames, playerXDist, playerYDist, 8 );
|
processGenericGotoTarget( _frames, playerXDist, playerYDist, 8 );
|
||||||
}
|
}
|
||||||
@ -694,11 +694,15 @@ void CNpcFlyingDutchmanEnemy::render()
|
|||||||
setShadeTex(SprFrame,0);
|
setShadeTex(SprFrame,0);
|
||||||
setSemiTrans( SprFrame, true );
|
setSemiTrans( SprFrame, true );
|
||||||
SprFrame->tpage|=1<<5;
|
SprFrame->tpage|=1<<5;
|
||||||
m_actorGfx->RotateScale( SprFrame, renderPos, 0, 4096, 4096 );
|
m_actorGfx->RotateScale( SprFrame, renderPos, 0, 5120, 5120 );
|
||||||
setRGB0( SprFrame, m_fadeVal, m_fadeVal, m_fadeVal );
|
setRGB0( SprFrame, m_fadeVal, m_fadeVal, m_fadeVal );
|
||||||
|
|
||||||
sBBox boundingBox = m_actorGfx->GetBBox();
|
sBBox boundingBox = m_actorGfx->GetBBox();
|
||||||
setCollisionSize( ( boundingBox.XMax - boundingBox.XMin ), ( boundingBox.YMax - boundingBox.YMin ) );
|
|
||||||
|
int xSize = boundingBox.XMax - boundingBox.XMin;
|
||||||
|
int ySize = boundingBox.YMax - boundingBox.YMin;
|
||||||
|
|
||||||
|
setCollisionSize( xSize + ( xSize >> 2 ), ySize + ( ySize >> 2 ) );
|
||||||
setCollisionCentreOffset( ( boundingBox.XMax + boundingBox.XMin ) >> 1, ( boundingBox.YMax + boundingBox.YMin ) >> 1 );
|
setCollisionCentreOffset( ( boundingBox.XMax + boundingBox.XMin ) >> 1, ( boundingBox.YMax + boundingBox.YMin ) >> 1 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user