This commit is contained in:
parent
bf6a3b58fc
commit
199b0ceb7c
@ -40,6 +40,7 @@ class CNpcStaticClamEnemy : public CNpcClamEnemy
|
||||
public:
|
||||
virtual void postInit();
|
||||
virtual u8 hasBeenAttacked() {return( false );}
|
||||
virtual CRECT const *getThinkBBox() {return( &getCollisionArea() );}
|
||||
protected:
|
||||
virtual s32 getFrameShift( int _frames );
|
||||
virtual void collidedWith(CThing *_thisThing);
|
||||
|
@ -22,6 +22,7 @@ class CNpcClamPlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void render();
|
||||
virtual CRECT const *getThinkBBox() {return( &getCollisionArea() );}
|
||||
//void setBBox();
|
||||
};
|
||||
|
||||
|
@ -87,13 +87,6 @@ void CNpcJellyfishPlatform::collidedWith( CThing *_thisThing )
|
||||
m_contact = true;
|
||||
}
|
||||
}
|
||||
|
||||
if ( height < -30 )
|
||||
{
|
||||
// shock player
|
||||
|
||||
player->takeDamage( DAMAGE__SHOCK_ENEMY, REACT__GET_DIRECTION_FROM_THING, (CThing*)this );
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user