diff --git a/source/enemy/nclam.h b/source/enemy/nclam.h index 63e45b5a8..456c2b7d3 100644 --- a/source/enemy/nclam.h +++ b/source/enemy/nclam.h @@ -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); diff --git a/source/platform/pclam.h b/source/platform/pclam.h index 8cf27bb5b..5c103f8b3 100644 --- a/source/platform/pclam.h +++ b/source/platform/pclam.h @@ -22,6 +22,7 @@ class CNpcClamPlatform : public CNpcPlatform { public: virtual void render(); + virtual CRECT const *getThinkBBox() {return( &getCollisionArea() );} //void setBBox(); }; diff --git a/source/platform/pjellfsh.cpp b/source/platform/pjellfsh.cpp index abcb0afe5..6df59b2fb 100644 --- a/source/platform/pjellfsh.cpp +++ b/source/platform/pjellfsh.cpp @@ -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;