From af2a9878180dbb3e4c75f2cf8bd93cab710a1851 Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 25 Jun 2001 18:45:43 +0000 Subject: [PATCH] --- source/player/player.cpp | 10 ---------- source/player/player.h | 5 ----- source/thing/thing.cpp | 2 -- source/thing/thing.h | 2 -- 4 files changed, 19 deletions(-) diff --git a/source/player/player.cpp b/source/player/player.cpp index dce6bf280..260bc61b3 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -2396,16 +2396,6 @@ void CPlayer::clearPlatform() m_platform=NULL; } -void CPlayer::setHasPlatformCollided( bool newVal ) -{ - m_hasPlatformCollided = newVal; -} - -bool CPlayer::getHasPlatformCollided() -{ - return( m_hasPlatformCollided ); -} - diff --git a/source/player/player.h b/source/player/player.h index cdb8c2107..9d2941e3a 100644 --- a/source/player/player.h +++ b/source/player/player.h @@ -228,8 +228,6 @@ public: void buttFall(); // " " " " " virtual int moveVertical(int _moveDistance); virtual int moveHorizontal(int _moveDistance); - virtual void setHasPlatformCollided( bool newVal ); - virtual bool getHasPlatformCollided(); int isTryingToConversateWithFriend() {return m_allowConversation;} @@ -441,9 +439,6 @@ public: private: CThing *m_platform; -private: - bool m_hasPlatformCollided; - // Player collision size public: diff --git a/source/thing/thing.cpp b/source/thing/thing.cpp index e48bb4898..c9aa7e75c 100644 --- a/source/thing/thing.cpp +++ b/source/thing/thing.cpp @@ -464,8 +464,6 @@ DVECTOR const &CamPos=CLevel::getCameraPos(); if (player && playerThing) { - playerThing->setHasPlatformCollided( false ); - // Player -> Platform collision thing1=s_CollisionLists[CThing::TYPE_PLATFORM]; while(thing1) diff --git a/source/thing/thing.h b/source/thing/thing.h index 9cbe91b3f..7c35988e6 100644 --- a/source/thing/thing.h +++ b/source/thing/thing.h @@ -203,8 +203,6 @@ virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); int checkCollisionAgainstArea(CRECT *_rect); void updateCollisionArea(); virtual void collidedWith(CThing *_thisThing) {;} -virtual void setHasPlatformCollided( bool newVal ) {;} -virtual bool getHasPlatformCollided() {return false;} //virtual s32 getNewYPos( CThing *_thisThing ); public: