Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Charles 2001-08-02 18:54:55 +00:00
parent a304d506fa
commit 6bea22fc1d
1 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
source/platform/praft.cpp
View File

@ -142,37 +142,69 @@ void CNpcRaftPlatform::processMovement( int _frames )
} }
// sort out rotation // sort out rotation
DVECTOR testPos1, testPos2; DVECTOR testPos1, testPos2;
testPos1 = testPos2 = Pos; testPos1 = testPos2 = Pos;
testPos1.vx -= 20; testPos1.vx -= 10;
testPos2.vx += 20; testPos2.vx += 10;
s16 heightDiff; s16 heightDiff;
bool levelOff = false;
heightDiff = CGameScene::getCollision()->getHeightFromGround( testPos1.vx, testPos1.vy, 32 ); heightDiff = CGameScene::getCollision()->getHeightFromGround( testPos1.vx, testPos1.vy, 16 );
if ( heightDiff == 32 ) if ( heightDiff == 16 )
{ {
return; levelOff = true;
} }
testPos1.vy += heightDiff; testPos1.vy += heightDiff;
heightDiff = CGameScene::getCollision()->getHeightFromGround( testPos2.vx, testPos2.vy, 32 ); heightDiff = CGameScene::getCollision()->getHeightFromGround( testPos2.vx, testPos2.vy, 16 );
if ( heightDiff == 32 ) if ( heightDiff == 16 )
{ {
return; levelOff = true;
} }
testPos2.vy += heightDiff; testPos2.vy += heightDiff;
s32 xDist = testPos2.vx - testPos1.vx; s16 heading;
s32 yDist = testPos2.vy - testPos1.vy;
s16 heading = ratan2( yDist, xDist ); if ( levelOff )
{
heading = getCollisionAngle();
if ( heading )
{
groundHeight = CGameScene::getCollision()->getHeightFromGround( Pos.vx, Pos.vy, 56 );
if ( groundHeight < 32 && groundHeight > 4 )
{
int reverseAngle = -heading;
int maxRotate = 32 * _frames;
if ( reverseAngle > maxRotate )
{
reverseAngle = maxRotate;
}
else if ( reverseAngle < -maxRotate )
{
reverseAngle = -maxRotate;
}
heading += reverseAngle;
}
}
}
else
{
s32 xDist = testPos2.vx - testPos1.vx;
s32 yDist = testPos2.vy - testPos1.vy;
heading = ratan2( yDist, xDist );
}
/*if ( heading > 512 ) /*if ( heading > 512 )
{ {