This commit is contained in:
parent
f2e64f6401
commit
b9075b5399
20 changed files with 36 additions and 26 deletions
|
@ -133,3 +133,9 @@ void CNpcFallingHazard::processTimer( int _frames )
|
|||
m_bounceFinish = false;
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
void CNpcFallingHazard::collidedWith( CThing *_thisThing )
|
||||
{
|
||||
if (!m_bounceFinish && m_movementTimer<=0) CNpcHazard::collidedWith(_thisThing);
|
||||
}
|
||||
|
|
|
@ -25,6 +25,7 @@ public:
|
|||
protected:
|
||||
void processMovement( int _frames );
|
||||
void processTimer( int _frames );
|
||||
virtual void collidedWith(CThing *_thisThing);
|
||||
|
||||
s32 m_movementTimer;
|
||||
u8 m_bounceFinish;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue