This commit is contained in:
Charles 2001-06-20 18:00:43 +00:00
parent bf6a3b58fc
commit 199b0ceb7c
3 changed files with 2 additions and 7 deletions

View File

@ -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);

View File

@ -22,6 +22,7 @@ class CNpcClamPlatform : public CNpcPlatform
{
public:
virtual void render();
virtual CRECT const *getThinkBBox() {return( &getCollisionArea() );}
//void setBBox();
};

View File

@ -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;