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-06-05 19:18:55 +00:00
parent 40bc506705
commit 35f78a39f6
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
source/platform/psbarrel.cpp
View file

@ -58,7 +58,7 @@ void CNpcSteerableBarrelPlatform::processMovement( int _frames )
DVECTOR *playerVel = player->getMoveVelocity(); DVECTOR *playerVel = player->getMoveVelocity();
s32 speedChange = -playerVel->vx << 8; /*s32 speedChange = -playerVel->vx << 8;
if ( speedChange > ( _frames << 5 ) ) if ( speedChange > ( _frames << 5 ) )
{ {
@ -78,7 +78,9 @@ void CNpcSteerableBarrelPlatform::processMovement( int _frames )
else if ( m_currentSpeed < -( m_speed << 8 ) ) else if ( m_currentSpeed < -( m_speed << 8 ) )
{ {
m_currentSpeed = -( m_speed << 8 ); m_currentSpeed = -( m_speed << 8 );
} }*/
m_currentSpeed = -playerVel->vx << 4;
/*s32 playerX = playerPos.vx - this->Pos.vx; /*s32 playerX = playerPos.vx - this->Pos.vx;
@ -107,7 +109,7 @@ void CNpcSteerableBarrelPlatform::processMovement( int _frames )
{ {
// reduce speed // reduce speed
s32 speedReduce = -m_currentSpeed; /*s32 speedReduce = -m_currentSpeed;
if ( speedReduce > _frames ) if ( speedReduce > _frames )
{ {
@ -118,13 +120,17 @@ void CNpcSteerableBarrelPlatform::processMovement( int _frames )
speedReduce = -_frames; speedReduce = -_frames;
} }
m_currentSpeed += speedReduce; m_currentSpeed += speedReduce;*/
m_currentSpeed = 0;
} }
m_moveXHighRes += m_currentSpeed * _frames; /*m_moveXHighRes += m_currentSpeed * _frames;
moveX = m_moveXHighRes >> 8; moveX = m_moveXHighRes >> 8;
m_moveXHighRes -= moveX << 8; m_moveXHighRes -= moveX << 8;*/
moveX = ( m_currentSpeed * _frames ) >> 8;
// check for collision // check for collision
@ -148,7 +154,7 @@ void CNpcSteerableBarrelPlatform::processMovement( int _frames )
if ( m_contact ) if ( m_contact )
{ {
DVECTOR shove; DVECTOR shove;
shove.vx = moveX * _frames; shove.vx = moveX;
shove.vy = 0; shove.vy = 0;
player->shove(shove); player->shove(shove);
} }