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-06-19 20:07:57 +00:00
parent c574dd3894
commit adee4b97be
64 changed files with 313 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

10
source/enemy/nclam.cpp
View file

@ -133,6 +133,16 @@ void CNpcJumpingClamEnemy::setupWaypoints( sThingActor *ThisActor )
m_maxExtension = isqrt2( ( xDist * xDist ) + ( yDist * yDist ) );
}
s32 minX, maxX, minY, maxY;
m_npcPath.getPathXExtents( &minX, &maxX );
m_npcPath.getPathYExtents( &minY, &maxY );
m_thinkArea.x1 = minX;
m_thinkArea.x2 = maxX;
m_thinkArea.y1 = minY;
m_thinkArea.y2 = maxY;
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

10
source/enemy/nmjfish.cpp
View file

@ -137,6 +137,16 @@ void CNpcMotherJellyfishEnemy::setupWaypoints( sThingActor *ThisActor )
}
}
}
s32 minX, maxX, minY, maxY;
m_npcPath.getPathXExtents( &minX, &maxX );
m_npcPath.getPathYExtents( &minY, &maxY );
m_thinkArea.x1 = minX;
m_thinkArea.x2 = maxX;
m_thinkArea.y1 = minY;
m_thinkArea.y2 = maxY;
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

10
source/enemy/npc.cpp
View file

@ -519,6 +519,16 @@ void CNpcEnemy::setupWaypoints( sThingActor *ThisActor )
setHeading( newXPos, newYPos );
}
s32 minX, maxX, minY, maxY;
m_npcPath.getPathXExtents( &minX, &maxX );
m_npcPath.getPathYExtents( &minY, &maxY );
m_thinkArea.x1 = minX;
m_thinkArea.x2 = maxX;
m_thinkArea.y1 = minY;
m_thinkArea.y2 = maxY;
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

2
source/enemy/npc.h
View file

@ -125,6 +125,7 @@ public:
virtual void setupWaypoints( sThingActor *ThisActor );
virtual int canCollide();
virtual CRECT const *getThinkBBox() {return &m_thinkArea;}
bool canBeSuckedUp();
bool suckUp( DVECTOR *suckPos, int _frames );
@ -313,6 +314,7 @@ protected:
u8 m_isDying;
u32 m_RGB;
int m_soundId;
CRECT m_thinkArea;
s32 m_frame;
int m_animNo;

1
source/enemy/nsjfish.h
View file

@ -29,6 +29,7 @@ public:
virtual void render();
virtual int getFrameCount() {return( FRM_JELLYFISH1_SWIM7 - FRM_JELLYFISH1_SWIM1 + 1 );}
virtual u8 canCollideWithEnemy() {return( false );}
virtual CRECT const *getThinkBBox() {return( &getCollisionArea() );}
protected:
virtual bool processSensor();
virtual void processClose( int _frames );

4
source/enemy/nssnake.cpp
View file

@ -721,7 +721,7 @@ void CNpcSeaSnakeEnemy::processShot( int _frames )
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
const CRECT *CNpcSeaSnakeEnemy::getThinkBBox()
/*const CRECT *CNpcSeaSnakeEnemy::getThinkBBox()
{
CRECT objThinkBox = getCollisionArea();
@ -732,7 +732,7 @@ const CRECT *CNpcSeaSnakeEnemy::getThinkBBox()
objThinkBox.y2 = thinkBBox.YMax;
return &objThinkBox;
}
}*/
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

2
source/enemy/nssnake.h
View file

@ -53,7 +53,7 @@ public:
virtual void shutdown();
virtual void render();
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
virtual CRECT const *getThinkBBox();
//virtual CRECT const *getThinkBBox();
protected:
virtual bool processSensor();
virtual void processClose( int _frames );

4
source/enemy/nsstomp.cpp
View file

@ -158,7 +158,7 @@ void CNpcSkullStomperEnemy::processClose( int _frames )
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
const CRECT *CNpcSkullStomperEnemy::getThinkBBox()
/*const CRECT *CNpcSkullStomperEnemy::getThinkBBox()
{
CRECT objThinkBox = getCollisionArea();
@ -169,7 +169,7 @@ const CRECT *CNpcSkullStomperEnemy::getThinkBBox()
objThinkBox.y2 = thinkBBox.YMax;
return &objThinkBox;
}
}*/
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

2
source/enemy/nsstomp.h
View file

@ -18,7 +18,7 @@ class CNpcSkullStomperEnemy : public CNpcEnemy
{
public:
virtual void postInit();
virtual CRECT const *getThinkBBox();
//virtual CRECT const *getThinkBBox();
protected:
virtual void processEnemyCollision( CThing *thisThing );
virtual bool processSensor();