zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Charles 2001-05-16 14:35:36 +00:00
parent 048742ccbd
commit 9e812b938c
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/enemy/nclam.h
View file

@ -16,6 +16,8 @@
class CNpcClamEnemy : public CNpcEnemy class CNpcClamEnemy : public CNpcEnemy
{ {
public:
virtual u8 canCollideWithEnemy() {return( false );}
protected: protected:
virtual void processUserCollision( CThing *thisThing ); virtual void processUserCollision( CThing *thisThing );
virtual void processEnemyCollision( CThing *thisThing ); virtual void processEnemyCollision( CThing *thisThing );
@ -35,6 +37,7 @@ class CNpcStaticClamEnemy : public CNpcClamEnemy
public: public:
virtual void postInit(); virtual void postInit();
//virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); //virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
virtual u8 hasBeenAttacked() {return( false );}
protected: protected:
virtual void collidedWith(CThing *_thisThing); virtual void collidedWith(CThing *_thisThing);
//virtual void processShot( int _frames ); //virtual void processShot( int _frames );

2
source/enemy/npcdata.cpp
View file

@ -882,7 +882,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false, false,
3, 3,
2048, 2048,
DETECT_NO_COLLISION, DETECT_ALL_COLLISION,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
256, 256,
ANIM_FLYINGDUTCHMAN_FLY, ANIM_FLYINGDUTCHMAN_FLY,