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-07-31 21:25:11 +00:00
parent 0e8f3d79c4
commit ec79151e93
2 changed files with 37 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
source/platform/psbarrel.cpp
View file

@ -60,78 +60,13 @@ void CNpcSteerableBarrelPlatform::processMovement( int _frames )
s32 playerMovement = player->getMovement(); s32 playerMovement = player->getMovement();
/*s32 speedChange = -playerVel->vx << 8;
if ( speedChange > ( _frames << 5 ) )
{
speedChange = _frames << 5;
}
else if ( speedChange < -( _frames << 5 ) )
{
speedChange = -_frames << 5;
}
m_currentSpeed += speedChange;
if ( m_currentSpeed > ( m_speed << 8 ) )
{
m_currentSpeed = ( m_speed << 8 );
}
else if ( m_currentSpeed < -( m_speed << 8 ) )
{
m_currentSpeed = -( m_speed << 8 );
}*/
m_currentSpeed = -playerMovement; m_currentSpeed = -playerMovement;
/*s32 playerX = playerPos.vx - this->Pos.vx;
if ( playerX > 5 )
{
// increase barrel speed to right
m_currentSpeed += _frames << 2;
if ( m_currentSpeed > ( m_speed << 8 ) )
{
m_currentSpeed = ( m_speed << 8 );
}
}
else if ( playerX < -5 )
{
m_currentSpeed -= _frames << 2;
if ( m_currentSpeed < -( m_speed << 8 ) )
{
m_currentSpeed = -( m_speed << 8 );
}
}*/
} }
else else
{ {
// reduce speed
/*s32 speedReduce = -m_currentSpeed;
if ( speedReduce > _frames )
{
speedReduce = _frames;
}
else if ( speedReduce < -_frames )
{
speedReduce = -_frames;
}
m_currentSpeed += speedReduce;*/
m_currentSpeed = 0; m_currentSpeed = 0;
} }
/*m_moveXHighRes += m_currentSpeed * _frames;
moveX = m_moveXHighRes >> 8;
m_moveXHighRes -= moveX << 8;*/
moveX = m_currentSpeed; moveX = m_currentSpeed;
if ( m_currentSpeed ) if ( m_currentSpeed )
@ -142,14 +77,6 @@ void CNpcSteerableBarrelPlatform::processMovement( int _frames )
} }
} }
// check for collision
if ( CGameScene::getCollision()->getHeightFromGround( Pos.vx + moveX, Pos.vy ) < -maxHeight )
{
moveX = 0;
m_currentSpeed = 0;
}
m_rotation += ( m_currentSpeed * 30 * _frames ) >> 2; m_rotation += ( m_currentSpeed * 30 * _frames ) >> 2;
m_rotation &= 4095; m_rotation &= 4095;
@ -161,6 +88,41 @@ void CNpcSteerableBarrelPlatform::processMovement( int _frames )
player->shove(shove); player->shove(shove);
} }
// check for collision
if ( moveX )
{
int remainder = abs( moveX );
int sign = moveX / abs( moveX );
int testX = 0;
while ( remainder )
{
if ( remainder > 16 )
{
remainder -= 16;
testX += 16 * sign;
}
else
{
testX += remainder * sign;
remainder = 0;
}
if ( CGameScene::getCollision()->getHeightFromGround( Pos.vx + testX, Pos.vy ) < -maxHeight )
{
moveX = 0;
m_currentSpeed = 0;
}
}
}
/*if ( CGameScene::getCollision()->getHeightFromGround( Pos.vx + moveX, Pos.vy ) < -maxHeight )
{
moveX = 0;
m_currentSpeed = 0;
}*/
// check for vertical movement // check for vertical movement
groundHeight = CGameScene::getCollision()->getHeightFromGround( Pos.vx + moveX, Pos.vy, yMovement + 16 ); groundHeight = CGameScene::getCollision()->getHeightFromGround( Pos.vx + moveX, Pos.vy, yMovement + 16 );

4
source/platform/psoil.h
View file

@ -20,8 +20,8 @@
class CNpcSteerableOildrumPlatform : public CNpcSteerableBarrelPlatform class CNpcSteerableOildrumPlatform : public CNpcSteerableBarrelPlatform
{ {
protected: //protected:
void processMovement( int _frames ); //void processMovement( int _frames );
}; };
#endif #endif