diff --git a/source/player/player.cpp b/source/player/player.cpp index 3eb6e228b..038c579a5 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -873,7 +873,7 @@ PLAYERINPUT CPlayer::readPadInput() Params: Returns: ---------------------------------------------------------------------- */ -void CPlayer::shove( DVECTOR move ) +/*void CPlayer::shove( DVECTOR move ) { int colHeight; @@ -944,7 +944,7 @@ void CPlayer::shove( DVECTOR move ) // No obstruction Pos.vy+=move.vy; } -} +}*/ void CPlayer::setPlatform(CThing *_newPlatform) { diff --git a/source/player/player.h b/source/player/player.h index 5463d08c8..39ced7743 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 e7f2caeec..5b581ce28 100644 --- a/source/thing/thing.cpp +++ b/source/thing/thing.cpp @@ -136,12 +136,12 @@ void CThingManager::thinkAllThings(int _frames) { //if ( !thing1->hasChild( thing2 ) ) { - thing1->removeAllChild(); + //thing1->removeAllChild(); if(thing1->canCollide()&& thing1->checkCollisionAgainst(thing2, _frames)) { - thing1->addChild( thing2 ); + //thing1->addChild( thing2 ); thing1->collidedWith(thing2); } @@ -729,11 +729,11 @@ void CThing::processEvent(GAME_EVENT _event,CThing *_sourceThing) Params: Returns: ---------------------------------------------------------------------- */ -void CThing::shove( DVECTOR move ) +/*void CThing::shove( DVECTOR move ) { Pos.vx += move.vx; Pos.vy += move.vy; -} +}*/ /*=========================================================================== end */ diff --git a/source/thing/thing.h b/source/thing/thing.h index 2519604b0..6dace492e 100644 --- a/source/thing/thing.h +++ b/source/thing/thing.h @@ -111,7 +111,7 @@ public: DVECTOR getPos() {return Pos;} void setPos(DVECTOR newPos) {Pos=newPos;} DVECTOR getPosDelta() {return PosDelta;} - virtual void shove(DVECTOR move); + //virtual void shove(DVECTOR move); CThing *getNext() {return Next;}