diff --git a/source/player/player.cpp b/source/player/player.cpp index 6e3365e05..dedbc10fb 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -323,6 +323,10 @@ if(newmode!=-1) newmode=-1; } + if(isOnPlatform()) + { + shove(m_platform->getPosDelta()); + } for(i=0;i<_frames;i++) { // Think @@ -944,7 +948,7 @@ PLAYERINPUT CPlayer::readPadInput() Params: Returns: ---------------------------------------------------------------------- */ -/*void CPlayer::shove( DVECTOR move ) +void CPlayer::shove( DVECTOR move ) { int colHeight; @@ -1015,7 +1019,7 @@ PLAYERINPUT CPlayer::readPadInput() // No obstruction Pos.vy+=move.vy; } -}*/ +} void CPlayer::setPlatform(CThing *_newPlatform) { diff --git a/source/player/player.h b/source/player/player.h index 39ced7743..5463d08c8 100644 --- a/source/player/player.h +++ b/source/player/player.h @@ -138,7 +138,7 @@ public: virtual void shutdown(); virtual void think(int _frames); virtual void render(); - //virtual void shove(DVECTOR move); + virtual void shove(DVECTOR move); virtual void setHasPlatformCollided( bool newVal ); virtual bool getHasPlatformCollided(); diff --git a/source/thing/thing.cpp b/source/thing/thing.cpp index 1573a4107..41cd4b25b 100644 --- a/source/thing/thing.cpp +++ b/source/thing/thing.cpp @@ -380,9 +380,6 @@ void CThing::think(int _frames) PosDelta.vx=Pos.vx-PosLast.vx; PosDelta.vy=Pos.vy-PosLast.vy; PosLast=Pos; - - //m_collisionAngle += 1; - //m_collisionAngle &= 4095; } /*----------------------------------------------------------------------