zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Charles 2001-04-04 13:15:53 +00:00
parent 6c32ee7a11
commit 99a191237b
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
source/enemy/npc.cpp
View file

@ -275,7 +275,7 @@ void CNpcEnemy::init()
m_drawOffset.vx = 0; m_drawOffset.vx = 0;
m_drawOffset.vy = -( ofs.vy >> 1 ); m_drawOffset.vy = -( ofs.vy >> 1 );
setCollisionCentreOffset( 0, -( ofs.vy >> 1 ) ); setCollisionCentreOffset( m_drawOffset.vx, m_drawOffset.vy );
m_positionHistory = NULL; m_positionHistory = NULL;
} }
@ -1372,8 +1372,8 @@ void CNpcEnemy::render()
//renderPos.vx = ( Pos.vx + m_drawOffset.vx - offset.vx - ( VidGetScrW() >> 1 ) );// * 20; //renderPos.vx = ( Pos.vx + m_drawOffset.vx - offset.vx - ( VidGetScrW() >> 1 ) );// * 20;
//renderPos.vy = ( Pos.vy + m_drawOffset.vy - offset.vy - ( VidGetScrH() >> 1 ) );// * 20; //renderPos.vy = ( Pos.vy + m_drawOffset.vy - offset.vy - ( VidGetScrH() >> 1 ) );// * 20;
renderPos.vx = Pos.vx - offset.vx; renderPos.vx = Pos.vx + m_drawOffset.vx - offset.vx;
renderPos.vy = Pos.vy - offset.vy; renderPos.vy = Pos.vy + m_drawOffset.vy - offset.vy;
m_actorGfx->Render(renderPos,m_animNo,m_frame,m_reversed); m_actorGfx->Render(renderPos,m_animNo,m_frame,m_reversed);
} }

7
source/enemy/nsjfish.cpp
View file

@ -29,7 +29,8 @@ void CNpcEnemy::processSmallJellyfishMovementModifier( int _frames, s32 distX, s
s32 newX, newY; s32 newX, newY;
s32 preShiftX, preShiftY; s32 preShiftX, preShiftY;
u16 jellyfishData[5] = { 96, 192, 256, 192, 128, }; //u16 jellyfishData[5] = { 96, 192, 256, 192, 128, };
u16 jellyfishData[6] = { 256, 192, 96, 48, 96, 128, };
u32 dataPoint; u32 dataPoint;
@ -40,13 +41,15 @@ void CNpcEnemy::processSmallJellyfishMovementModifier( int _frames, s32 distX, s
m_movementTimer = 0; m_movementTimer = 0;
} }
dataPoint = 4 * m_movementTimer; dataPoint = 5 * m_movementTimer;
if ( dataPoint != 0 ) if ( dataPoint != 0 )
{ {
dataPoint /= GameState::getOneSecondInFrames(); dataPoint /= GameState::getOneSecondInFrames();
} }
m_frame = ( m_movementTimer * m_actorGfx->getFrameCount(m_animNo) ) / GameState::getOneSecondInFrames();
s32 resistance; s32 resistance;
s32 absVelocity = abs( m_velocity ); s32 absVelocity = abs( m_velocity );
s32 reqVelocity = dist; s32 reqVelocity = dist;