diff --git a/source/platform/plantern.cpp b/source/platform/plantern.cpp index df630423e..32aac4fb9 100644 --- a/source/platform/plantern.cpp +++ b/source/platform/plantern.cpp @@ -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; -}*/ +} diff --git a/source/platform/plantern.h b/source/platform/plantern.h index 561cdb7c6..d4d558aa3 100644 --- a/source/platform/plantern.h +++ b/source/platform/plantern.h @@ -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 ); diff --git a/source/platform/praft.cpp b/source/platform/praft.cpp index e892831cd..928f9a022 100644 --- a/source/platform/praft.cpp +++ b/source/platform/praft.cpp @@ -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; }