This commit is contained in:
parent
13fbd0d118
commit
af2a987818
@ -2396,16 +2396,6 @@ void CPlayer::clearPlatform()
|
|||||||
m_platform=NULL;
|
m_platform=NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CPlayer::setHasPlatformCollided( bool newVal )
|
|
||||||
{
|
|
||||||
m_hasPlatformCollided = newVal;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool CPlayer::getHasPlatformCollided()
|
|
||||||
{
|
|
||||||
return( m_hasPlatformCollided );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -228,8 +228,6 @@ public:
|
|||||||
void buttFall(); // " " " " "
|
void buttFall(); // " " " " "
|
||||||
virtual int moveVertical(int _moveDistance);
|
virtual int moveVertical(int _moveDistance);
|
||||||
virtual int moveHorizontal(int _moveDistance);
|
virtual int moveHorizontal(int _moveDistance);
|
||||||
virtual void setHasPlatformCollided( bool newVal );
|
|
||||||
virtual bool getHasPlatformCollided();
|
|
||||||
|
|
||||||
int isTryingToConversateWithFriend() {return m_allowConversation;}
|
int isTryingToConversateWithFriend() {return m_allowConversation;}
|
||||||
|
|
||||||
@ -441,9 +439,6 @@ public:
|
|||||||
private:
|
private:
|
||||||
CThing *m_platform;
|
CThing *m_platform;
|
||||||
|
|
||||||
private:
|
|
||||||
bool m_hasPlatformCollided;
|
|
||||||
|
|
||||||
|
|
||||||
// Player collision size
|
// Player collision size
|
||||||
public:
|
public:
|
||||||
|
@ -464,8 +464,6 @@ DVECTOR const &CamPos=CLevel::getCameraPos();
|
|||||||
|
|
||||||
if (player && playerThing)
|
if (player && playerThing)
|
||||||
{
|
{
|
||||||
playerThing->setHasPlatformCollided( false );
|
|
||||||
|
|
||||||
// Player -> Platform collision
|
// Player -> Platform collision
|
||||||
thing1=s_CollisionLists[CThing::TYPE_PLATFORM];
|
thing1=s_CollisionLists[CThing::TYPE_PLATFORM];
|
||||||
while(thing1)
|
while(thing1)
|
||||||
|
@ -203,8 +203,6 @@ virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
|
|||||||
int checkCollisionAgainstArea(CRECT *_rect);
|
int checkCollisionAgainstArea(CRECT *_rect);
|
||||||
void updateCollisionArea();
|
void updateCollisionArea();
|
||||||
virtual void collidedWith(CThing *_thisThing) {;}
|
virtual void collidedWith(CThing *_thisThing) {;}
|
||||||
virtual void setHasPlatformCollided( bool newVal ) {;}
|
|
||||||
virtual bool getHasPlatformCollided() {return false;}
|
|
||||||
//virtual s32 getNewYPos( CThing *_thisThing );
|
//virtual s32 getNewYPos( CThing *_thisThing );
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
Loading…
Reference in New Issue
Block a user