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-25 13:53:02 +00:00
parent bfa96dcf14
commit 33b3ec96e2
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
source/platform/plantern.cpp
View file

@ -121,7 +121,7 @@ void CNpcLanternPlatform::processMovement( int _frames )
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/*const CRECT *CNpcLanternPlatform::getThinkBBox()
const CRECT *CNpcLanternPlatform::getThinkBBox()
{
CRECT objThinkBox = getCollisionArea();
@ -132,4 +132,4 @@ void CNpcLanternPlatform::processMovement( int _frames )
objThinkBox.y2 = thinkBBox.YMax;
return &objThinkBox;
}*/
}

2
source/platform/plantern.h
View file

@ -22,7 +22,7 @@ class CNpcLanternPlatform : public CNpcPlatform
{
public:
virtual void postInit();
//virtual CRECT const *getThinkBBox();
virtual CRECT const *getThinkBBox();
protected:
virtual void setWaypoints( sThingPlatform *ThisPlatform );
virtual void processMovement( int _frames );

9
source/platform/praft.cpp
View file

@ -108,6 +108,7 @@ void CNpcRaftPlatform::processMovement( int _frames )
{
// fall
moveX = distX * m_speed * _frames;
moveY = yMovement;
}
}
@ -150,18 +151,18 @@ void CNpcRaftPlatform::processMovement( int _frames )
s16 heightDiff;
heightDiff = CGameScene::getCollision()->getHeightFromGround( testPos1.vx, testPos1.vy, 16 );
heightDiff = CGameScene::getCollision()->getHeightFromGround( testPos1.vx, testPos1.vy, 32 );
if ( heightDiff == 16 )
if ( heightDiff == 32 )
{
return;
}
testPos1.vy += heightDiff;
heightDiff = CGameScene::getCollision()->getHeightFromGround( testPos2.vx, testPos2.vy, 16 );
heightDiff = CGameScene::getCollision()->getHeightFromGround( testPos2.vx, testPos2.vy, 32 );
if ( heightDiff == 16 )
if ( heightDiff == 32 )
{
return;
}