From 9e812b938c90df92a57d6f7cce8bca0d59d3bc5b Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 16 May 2001 14:35:36 +0000 Subject: [PATCH] --- source/enemy/nclam.h | 3 +++ source/enemy/npcdata.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/source/enemy/nclam.h b/source/enemy/nclam.h index e07d0a736..b2e6ef1fe 100644 --- a/source/enemy/nclam.h +++ b/source/enemy/nclam.h @@ -16,6 +16,8 @@ class CNpcClamEnemy : public CNpcEnemy { +public: + virtual u8 canCollideWithEnemy() {return( false );} protected: virtual void processUserCollision( CThing *thisThing ); virtual void processEnemyCollision( CThing *thisThing ); @@ -35,6 +37,7 @@ class CNpcStaticClamEnemy : public CNpcClamEnemy public: virtual void postInit(); //virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); + virtual u8 hasBeenAttacked() {return( false );} protected: virtual void collidedWith(CThing *_thisThing); //virtual void processShot( int _frames ); diff --git a/source/enemy/npcdata.cpp b/source/enemy/npcdata.cpp index eaf5b9aac..17a05f311 100644 --- a/source/enemy/npcdata.cpp +++ b/source/enemy/npcdata.cpp @@ -882,7 +882,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = false, 3, 2048, - DETECT_NO_COLLISION, + DETECT_ALL_COLLISION, DAMAGE__HIT_ENEMY, 256, ANIM_FLYINGDUTCHMAN_FLY,