diff --git a/source/enemy/nbuttfly.h b/source/enemy/nbuttfly.h index fb5bee38f..8998f6616 100644 --- a/source/enemy/nbuttfly.h +++ b/source/enemy/nbuttfly.h @@ -27,6 +27,7 @@ class CNpcButterflyBackgroundEnemy : public CNpcSmallJellyfishBackgroundEnemy public: virtual void render(); virtual int getFrameCount() {return( FRM_BUTTERFLY_FLAP04 - FRM_BUTTERFLY_FLAP01 + 1 );} + virtual u8 canBeCaughtByNet() {return( false );} protected: virtual void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange ); }; diff --git a/source/enemy/npc.cpp b/source/enemy/npc.cpp index bfc7a8489..168e5e47a 100644 --- a/source/enemy/npc.cpp +++ b/source/enemy/npc.cpp @@ -1392,7 +1392,7 @@ void CNpcEnemy::processEvent( GAME_EVENT evt, CThing *sourceThing ) //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -bool CNpcEnemy::canBeCaughtByNet() +u8 CNpcEnemy::canBeCaughtByNet() { return( m_isActive && !m_isDying && m_data[m_type].canBeNetted ); } diff --git a/source/enemy/npc.h b/source/enemy/npc.h index 5df45027b..63099c5dd 100644 --- a/source/enemy/npc.h +++ b/source/enemy/npc.h @@ -105,7 +105,7 @@ public: void setPathType( u8 newType ) {m_npcPath.setPathType( newType );} void setStartPos( s32 xPos, s32 yPos ); virtual u8 hasBeenAttacked(); - bool canBeCaughtByNet(); + virtual u8 canBeCaughtByNet(); void caughtWithNet(); virtual int getFrameCount(); void setSpeed( s16 newSpeed ) {m_speed = newSpeed;}