This commit is contained in:
parent
5ea56903c9
commit
65d028c0b3
@ -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)
|
||||
{
|
||||
|
@ -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();
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------
|
||||
|
Loading…
Reference in New Issue
Block a user