This commit is contained in:
parent
1cb38b14cc
commit
b6e036bf51
62 changed files with 134 additions and 149 deletions
|
@ -22,7 +22,7 @@ class CNpcAnemoneEnemy : public CNpcEnemy
|
|||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
virtual void setHeading( s32 xPos, s32 yPos );
|
||||
void setHeading( s32 xPos, s32 yPos );
|
||||
protected:
|
||||
virtual void processEnemyCollision( CThing *thisThing );
|
||||
virtual bool processSensor();
|
||||
|
@ -39,8 +39,8 @@ protected:
|
|||
class CNpcAnemone2Enemy : public CNpcAnemoneEnemy
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
virtual void shutdown();
|
||||
void postInit();
|
||||
void shutdown();
|
||||
virtual void render();
|
||||
protected:
|
||||
virtual void processClose( int _frames );
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
class CNpcBallBlobEnemy : public CNpcEnemy
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
class CNpcClamEnemy : public CNpcEnemy
|
||||
{
|
||||
public:
|
||||
virtual u8 canCollideWithEnemy() {return( false );}
|
||||
u8 canCollideWithEnemy() {return( false );}
|
||||
protected:
|
||||
virtual void processUserCollision( CThing *thisThing );
|
||||
virtual void processEnemyCollision( CThing *thisThing );
|
||||
|
@ -27,7 +27,7 @@ protected:
|
|||
class CNpcJumpingClamEnemy : public CNpcClamEnemy
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
protected:
|
||||
virtual void processClose( int _frames );
|
||||
virtual void setupWaypoints( sThingActor *ThisActor );
|
||||
|
@ -38,7 +38,7 @@ protected:
|
|||
class CNpcStaticClamEnemy : public CNpcClamEnemy
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
virtual u8 hasBeenAttacked() {return( false );}
|
||||
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
protected:
|
||||
|
|
|
@ -25,9 +25,9 @@
|
|||
class CNpcIronDogfishEnemy : public CNpcBossEnemy
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
void render();
|
||||
virtual void shutdown();
|
||||
void shutdown();
|
||||
protected:
|
||||
virtual void processTimer( int _frames );
|
||||
virtual bool processSensor();
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
class CNpcDustDevilEnemy : public CNpcEnemy
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
protected:
|
||||
virtual s32 getFrameShift( int _frames );
|
||||
virtual void processMovement( int _frames );
|
||||
|
|
|
@ -18,8 +18,8 @@ class CNpcEyeballEnemy : public CNpcEnemy
|
|||
{
|
||||
public:
|
||||
virtual void render();
|
||||
virtual void postInit();
|
||||
virtual void shutdown();
|
||||
void postInit();
|
||||
void shutdown();
|
||||
virtual int getFrameCount() {return( 1 );}
|
||||
virtual void processEvent( GAME_EVENT evt, CThing *sourceThing );
|
||||
protected:
|
||||
|
|
|
@ -23,9 +23,9 @@ class CNpcFlyingDutchmanEnemy : public CNpcBossEnemy
|
|||
{
|
||||
public:
|
||||
virtual void think( int _frames );
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
void render();
|
||||
virtual void shutdown();
|
||||
void shutdown();
|
||||
virtual u8 hasBeenAttacked();
|
||||
protected:
|
||||
virtual void processClose( int _frames );
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
class CNpcFishFolk : public CNpcEnemy
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
protected:
|
||||
virtual void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange );
|
||||
};
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
class CNpcFlamingSkullEnemy : public CNpcEnemy
|
||||
{
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
protected:
|
||||
virtual void processEnemyCollision( CThing *thisThing );
|
||||
virtual bool processSensor();
|
||||
|
|
|
@ -21,12 +21,12 @@
|
|||
class CNpcEnemyGenerator : public CNpcEnemy
|
||||
{
|
||||
public:
|
||||
virtual void shutdown();
|
||||
virtual void processEnemyCollision( CThing *thisThing );
|
||||
void shutdown();
|
||||
void processEnemyCollision( CThing *thisThing );
|
||||
void render();
|
||||
void think(int _frames);
|
||||
virtual u8 canCollideWithEnemy() {return( false );}
|
||||
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
u8 canCollideWithEnemy() {return( false );}
|
||||
CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
};
|
||||
|
||||
#endif
|
|
@ -17,7 +17,7 @@
|
|||
class CNpcGhostPirateEnemy : public CNpcEnemy
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
protected:
|
||||
virtual bool processSensor();
|
||||
virtual void processClose( int _frames );
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcHermitCrabEnemy : public CNpcEnemy
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
protected:
|
||||
virtual void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange );
|
||||
virtual bool processSensor();
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcMotherJellyfishBackground : public CNpcEnemy
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
void render();
|
||||
};
|
||||
|
||||
|
|
|
@ -27,9 +27,9 @@
|
|||
class CNpcMotherJellyfishEnemy : public CNpcBossEnemy
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
void render();
|
||||
virtual void shutdown();
|
||||
void shutdown();
|
||||
virtual void setupWaypoints( sThingActor *ThisActor );
|
||||
protected:
|
||||
virtual void processClose( int _frames );
|
||||
|
|
|
@ -104,8 +104,6 @@ public:
|
|||
static NPC_UNIT_TYPE getTypeFromMapEdit( u16 newType );
|
||||
void setHeading( s32 newHeading ) {m_heading = newHeading;}
|
||||
virtual void setHeading( s32 xPos, s32 yPos );
|
||||
//void addWaypoint( u16 *ptr );
|
||||
//void addWaypoint( u16 *ptrX, u16 *ptrY );
|
||||
void setWaypointPtr( u16 *newPtr ) {m_npcPath.setWaypointPtr( newPtr );}
|
||||
void setWaypointCount( u8 newCount ) {m_npcPath.setWaypointCount( newCount );}
|
||||
void setPathType( u8 newType ) {m_npcPath.setPathType( newType );}
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
class CNpcSmallJellyfishProjectileEnemy : public CNpcSmallJellyfishEnemy
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
virtual void think(int _frames);
|
||||
protected:
|
||||
s32 m_lifetime;
|
||||
|
|
|
@ -21,15 +21,15 @@
|
|||
class CNpcSpiderCrabEnemy : public CNpcEnemy
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
virtual u8 canCollideWithEnemy();
|
||||
virtual void processEnemyCollision( CThing *thisThing );
|
||||
void postInit();
|
||||
u8 canCollideWithEnemy();
|
||||
void processEnemyCollision( CThing *thisThing );
|
||||
protected:
|
||||
virtual void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange );
|
||||
virtual bool processSensor();
|
||||
virtual void processClose( int _frames );
|
||||
virtual void processCollision();
|
||||
virtual void processMovement( int _frames );
|
||||
void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange );
|
||||
bool processSensor();
|
||||
void processClose( int _frames );
|
||||
void processCollision();
|
||||
void processMovement( int _frames );
|
||||
void processSpiderCrabInitJumpMovement( int _frames );
|
||||
|
||||
s32 m_attackDist;
|
||||
|
|
|
@ -22,13 +22,13 @@ class CNpcSquidDartEnemy : public CNpcEnemy
|
|||
{
|
||||
public:
|
||||
void render();
|
||||
virtual int getFrameCount() {return( FRM_SQUIDDART_SWIM0004 - FRM_SQUIDDART_SWIM0001 + 1 );}
|
||||
virtual u8 canCollideWithEnemy() {return( false );}
|
||||
virtual void fireAsProjectile( s16 heading );
|
||||
int getFrameCount() {return( FRM_SQUIDDART_SWIM0004 - FRM_SQUIDDART_SWIM0001 + 1 );}
|
||||
u8 canCollideWithEnemy() {return( false );}
|
||||
void fireAsProjectile( s16 heading );
|
||||
protected:
|
||||
virtual s32 getFrameShift( int _frames );
|
||||
virtual bool processSensor();
|
||||
virtual void processClose( int _frames );
|
||||
s32 getFrameShift( int _frames );
|
||||
bool processSensor();
|
||||
void processClose( int _frames );
|
||||
|
||||
s32 m_xPos;
|
||||
u8 m_attack;
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcShellEnemy : public CNpcEnemy
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
virtual void render();
|
||||
virtual int getFrameCount() {return( 1 );}
|
||||
virtual int getFrame() {return( m_shellType );}
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcSmallJellyfish2BackgroundEnemy : public CNpcSmallJellyfishBackgroundEnemy
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
virtual void render();
|
||||
protected:
|
||||
virtual void collidedWith(CThing *_thisThing);
|
||||
|
|
|
@ -23,12 +23,12 @@ class CNpcSmallJellyfishBackgroundEnemy : public CNpcSmallJellyfishEnemy
|
|||
public:
|
||||
virtual void render();
|
||||
virtual void postInit();
|
||||
void shutdown();
|
||||
virtual void setTargetHeading( s16 newTargetHeading ) {m_targetHeading = newTargetHeading;}
|
||||
virtual u8 hasBeenAttacked();
|
||||
protected:
|
||||
virtual bool processSensor();
|
||||
virtual void processMovement( int _frames );
|
||||
virtual void shutdown();
|
||||
virtual void processUserCollision( CThing *thisThing );
|
||||
virtual void collidedWith(CThing *_thisThing);
|
||||
|
||||
|
|
|
@ -26,15 +26,15 @@ class CNpcSmallJellyfishEnemy : public CNpcEnemy
|
|||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
virtual void render();
|
||||
virtual int getFrameCount() {return( FRM_JELLYFISH1_SWIM7 - FRM_JELLYFISH1_SWIM1 + 1 );}
|
||||
virtual u8 canCollideWithEnemy() {return( false );}
|
||||
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
void render();
|
||||
int getFrameCount() {return( FRM_JELLYFISH1_SWIM7 - FRM_JELLYFISH1_SWIM1 + 1 );}
|
||||
u8 canCollideWithEnemy() {return( false );}
|
||||
CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
protected:
|
||||
virtual bool processSensor();
|
||||
virtual void processClose( int _frames );
|
||||
virtual void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange );
|
||||
virtual void fireAsProjectile( s16 heading );
|
||||
bool processSensor();
|
||||
void processClose( int _frames );
|
||||
void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange );
|
||||
void fireAsProjectile( s16 heading );
|
||||
|
||||
enum
|
||||
{
|
||||
|
|
|
@ -27,9 +27,9 @@ class CNpcSubSharkEnemy : public CNpcBossEnemy
|
|||
{
|
||||
public:
|
||||
virtual void think( int _frames );
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
void render();
|
||||
virtual void shutdown();
|
||||
void shutdown();
|
||||
protected:
|
||||
//virtual void processClose( int _frames );
|
||||
virtual s32 getFrameShift( int _frames );
|
||||
|
|
|
@ -22,20 +22,20 @@
|
|||
class CNpcSeaSnakeSegment
|
||||
{
|
||||
public:
|
||||
virtual void init();
|
||||
virtual void shutdown();
|
||||
virtual void render();
|
||||
virtual void processEnemyCollision( CThing *thisThing );
|
||||
virtual void setScale( u16 scale ) {m_scale = scale;}
|
||||
void init();
|
||||
void shutdown();
|
||||
void render();
|
||||
void processEnemyCollision( CThing *thisThing );
|
||||
void setScale( u16 scale ) {m_scale = scale;}
|
||||
CNpcSeaSnakeSegment *m_nextSegment;
|
||||
virtual void setPos( DVECTOR newPos ) {Pos = newPos;}
|
||||
virtual DVECTOR getPos() {return( Pos );}
|
||||
virtual void setHeading( s16 newHeading ) {m_heading = newHeading;}
|
||||
void setPos( DVECTOR newPos ) {Pos = newPos;}
|
||||
DVECTOR getPos() {return( Pos );}
|
||||
void setHeading( s16 newHeading ) {m_heading = newHeading;}
|
||||
void updateCollisionArea();
|
||||
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
|
||||
virtual void setCollisionSize(int _w,int _h);
|
||||
virtual void setCollisionCentreOffset(int _x,int _y) {m_collisionCentreOffset.vx=_x;m_collisionCentreOffset.vy=_y;}
|
||||
virtual CRECT const &getCollisionArea() {return m_collisionArea;}
|
||||
int checkCollisionAgainst(CThing *_thisThing, int _frames);
|
||||
void setCollisionSize(int _w,int _h);
|
||||
void setCollisionCentreOffset(int _x,int _y) {m_collisionCentreOffset.vx=_x;m_collisionCentreOffset.vy=_y;}
|
||||
CRECT const &getCollisionArea() {return m_collisionArea;}
|
||||
DVECTOR const &getCollisionCentre() {return m_collisionCentre;}
|
||||
int getCollisionRadius() {return m_collisionRadius;}
|
||||
void setAnim( int newAnim ) {m_anim = newAnim;}
|
||||
|
@ -56,8 +56,8 @@ protected:
|
|||
class CNpcSeaSnakeEnemy : public CNpcBossEnemy
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
virtual void shutdown();
|
||||
void postInit();
|
||||
void shutdown();
|
||||
virtual void render();
|
||||
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
|
||||
protected:
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
class CNpcSkullStomperEnemy : public CNpcEnemy
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
protected:
|
||||
virtual void processEnemyCollision( CThing *thisThing );
|
||||
virtual bool processSensor();
|
||||
|
|
|
@ -17,20 +17,20 @@
|
|||
class CNpcParasiticWormSegment
|
||||
{
|
||||
public:
|
||||
virtual void init();
|
||||
virtual void shutdown();
|
||||
virtual void render();
|
||||
virtual void processEnemyCollision( CThing *thisThing );
|
||||
virtual void setScale( u16 scale ) {m_scale = scale;}
|
||||
void init();
|
||||
void shutdown();
|
||||
void render();
|
||||
void processEnemyCollision( CThing *thisThing );
|
||||
void setScale( u16 scale ) {m_scale = scale;}
|
||||
CNpcParasiticWormSegment *m_nextSegment;
|
||||
virtual void setPos( DVECTOR newPos ) {Pos = newPos;}
|
||||
virtual DVECTOR getPos() {return( Pos );}
|
||||
virtual void setHeading( s16 newHeading ) {m_heading = newHeading;}
|
||||
void setPos( DVECTOR newPos ) {Pos = newPos;}
|
||||
DVECTOR getPos() {return( Pos );}
|
||||
void setHeading( s16 newHeading ) {m_heading = newHeading;}
|
||||
void updateCollisionArea();
|
||||
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
|
||||
virtual void setCollisionSize(int _w,int _h);
|
||||
virtual void setCollisionCentreOffset(int _x,int _y) {m_collisionCentreOffset.vx=_x;m_collisionCentreOffset.vy=_y;}
|
||||
virtual CRECT const &getCollisionArea() {return m_collisionArea;}
|
||||
int checkCollisionAgainst(CThing *_thisThing, int _frames);
|
||||
void setCollisionSize(int _w,int _h);
|
||||
void setCollisionCentreOffset(int _x,int _y) {m_collisionCentreOffset.vx=_x;m_collisionCentreOffset.vy=_y;}
|
||||
CRECT const &getCollisionArea() {return m_collisionArea;}
|
||||
DVECTOR const &getCollisionCentre() {return m_collisionCentre;}
|
||||
int getCollisionRadius() {return m_collisionRadius;}
|
||||
void setAnim( int newAnim ) {m_animNo = newAnim;}
|
||||
|
@ -51,8 +51,8 @@ protected:
|
|||
class CNpcParasiticWormEnemy : public CNpcEnemy
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
virtual void shutdown();
|
||||
void postInit();
|
||||
void shutdown();
|
||||
virtual void render();
|
||||
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
|
||||
protected:
|
||||
|
|
|
@ -21,17 +21,17 @@
|
|||
class CNpcGaryFriend : public CNpcFriend
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
virtual void shutdown();
|
||||
virtual void think( int _frames );
|
||||
virtual void setupWaypoints( sThingActor *ThisActor );
|
||||
void postInit();
|
||||
void shutdown();
|
||||
void think( int _frames );
|
||||
void setupWaypoints( sThingActor *ThisActor );
|
||||
bool alwaysThink() {return(true);}
|
||||
DVECTOR const &getTriggerPos() {return( m_triggerPos );}
|
||||
void start();
|
||||
void stop();
|
||||
void startLeft();
|
||||
void startRight();
|
||||
virtual void render();
|
||||
void render();
|
||||
|
||||
protected:
|
||||
DVECTOR m_triggerPos;
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcKrustyFriend : public CNpcFriend
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
protected:
|
||||
virtual void startConderversation();
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcPatrickFriend : public CNpcFriend
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
protected:
|
||||
virtual void startConderversation();
|
||||
|
||||
|
|
|
@ -21,12 +21,12 @@
|
|||
class CNpcPlanktonFriend : public CNpcFriend
|
||||
{
|
||||
public:
|
||||
virtual void init();
|
||||
virtual void render();
|
||||
virtual void think(int _frames);
|
||||
virtual void shutdown();
|
||||
void init();
|
||||
void render();
|
||||
void think(int _frames);
|
||||
void shutdown();
|
||||
protected:
|
||||
virtual void startConderversation();
|
||||
void startConderversation();
|
||||
};
|
||||
|
||||
#endif
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcSandyFriend : public CNpcFriend
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
protected:
|
||||
virtual void startConderversation();
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ class CNpcSquidwardFriend : public CNpcFriend
|
|||
{
|
||||
public:
|
||||
virtual void think(int _frames);
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
protected:
|
||||
virtual void startConderversation();
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CBridgeBalloon
|
||||
{
|
||||
public:
|
||||
virtual void setPos( DVECTOR newPos ) {Pos = newPos;}
|
||||
void setPos( DVECTOR newPos ) {Pos = newPos;}
|
||||
void render();
|
||||
void init();
|
||||
void shutdown();
|
||||
|
@ -33,14 +33,14 @@ protected:
|
|||
class CNpcBalloonBridgePlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
virtual void render();
|
||||
virtual void shutdown();
|
||||
void postInit();
|
||||
void render();
|
||||
void shutdown();
|
||||
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
protected:
|
||||
virtual void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
virtual void processMovement( int _frames );
|
||||
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
|
||||
void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
void processMovement( int _frames );
|
||||
int checkCollisionAgainst(CThing *_thisThing, int _frames);
|
||||
|
||||
s32 m_maxExtension;
|
||||
s8 m_balloonCount;
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcBobbingPlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcBouncePlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
virtual void think( int _frames );
|
||||
virtual void render();
|
||||
protected:
|
||||
|
|
|
@ -21,13 +21,13 @@
|
|||
class CNpcBubblePlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void render();
|
||||
void render();
|
||||
virtual void postInit();
|
||||
virtual void shutdown();
|
||||
virtual void setGraphic( sThingPlatform *ThisPlatform ) {}
|
||||
virtual void setGraphic( u8 graphicNum ) {}
|
||||
void shutdown();
|
||||
void setGraphic( sThingPlatform *ThisPlatform ) {}
|
||||
void setGraphic( u8 graphicNum ) {}
|
||||
protected:
|
||||
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
|
||||
int checkCollisionAgainst(CThing *_thisThing, int _frames);
|
||||
|
||||
u8 m_pop;
|
||||
s16 m_scale;
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcBubbleTubePlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
virtual void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
protected:
|
||||
virtual void collidedWith(CThing *_thisThing);
|
||||
|
|
|
@ -22,7 +22,7 @@ class CNpcBigWheelPlatform : public CNpcPlatform
|
|||
{
|
||||
public:
|
||||
bool alwaysThink() {return(true);}
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
virtual int getHeightFromPlatformAtPosition(int _x,int _y, int offsetX = 0, int offsetY = 0);
|
||||
protected:
|
||||
virtual void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcCollapsingBubblePlatform : public CNpcBubblePlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
protected:
|
||||
virtual void processLifetime( int _frames );
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcCircularPlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
};
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcClamPlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
virtual void render();
|
||||
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
//void setBBox();
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcConveyorPlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
virtual void render();
|
||||
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
|
||||
protected:
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcFallingPlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
};
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcFallingNoRespawnPlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
bool alwaysThink() {return(true);}
|
||||
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
|
||||
protected:
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcFishHook3Platform : public CNpcFishHookPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
};
|
||||
|
||||
#endif
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcGeyserBubblePlatform : public CNpcBubblePlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
virtual void processLifetime( int _frames );
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcGeyserPlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
virtual void processTimer( int _frames );
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcJellyfishPlatform : public CNpcLinearPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
virtual void think( int _frames );
|
||||
protected:
|
||||
virtual void collidedWith(CThing *_thisThing);
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcLanternPlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
bool alwaysThink() {return(true);}
|
||||
protected:
|
||||
virtual void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcLeafPlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcLiftPlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
virtual void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
protected:
|
||||
virtual void collidedWith(CThing *_thisThing);
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcLoveBoatPlatform : public CNpcCartPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
};
|
||||
|
||||
#endif
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcPendulumPlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
virtual void render();
|
||||
protected:
|
||||
virtual void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
|
|
|
@ -24,18 +24,6 @@
|
|||
#endif
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
/*void CNpcPlayerBubblePlatform::postInit()
|
||||
{
|
||||
CNpcBubblePlatform::postInit();
|
||||
|
||||
setCollisionSize( 30, 30 );
|
||||
setCollisionCentreOffset( 0, -15 );
|
||||
|
||||
calculateNonRotatedCollisionData();
|
||||
}*/
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
void CNpcPlayerBubblePlatform::processLifetime( int _frames )
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
class CNpcPlayerBubblePlatform : public CNpcBubblePlatform
|
||||
{
|
||||
public:
|
||||
//virtual void postInit();
|
||||
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
protected:
|
||||
virtual void processLifetime( int _frames );
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcRaftPlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
virtual void render();
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcRisingBridgePlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
virtual void trigger();
|
||||
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
protected:
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcRetractingPlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
virtual void render();
|
||||
protected:
|
||||
void processTimer( int _frames );
|
||||
|
|
|
@ -22,7 +22,7 @@ class CNpcSteerableBarrelPlatform : public CNpcPlatform
|
|||
{
|
||||
public:
|
||||
virtual void render();
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcSeesawPlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
virtual void render();
|
||||
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
protected:
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
class CNpcSteamSwitchPlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
virtual void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcTrapdoorPlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
void postInit();
|
||||
DVECTOR const &getTriggerPos() {return( m_triggerPos );}
|
||||
void setTriggered() {m_triggered = true;}
|
||||
virtual void render();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue