This commit is contained in:
Charles 2001-07-03 22:17:20 +00:00
parent 1cb38b14cc
commit b6e036bf51
62 changed files with 134 additions and 149 deletions

View File

@ -22,7 +22,7 @@ class CNpcAnemoneEnemy : public CNpcEnemy
{ {
public: public:
virtual void postInit(); virtual void postInit();
virtual void setHeading( s32 xPos, s32 yPos ); void setHeading( s32 xPos, s32 yPos );
protected: protected:
virtual void processEnemyCollision( CThing *thisThing ); virtual void processEnemyCollision( CThing *thisThing );
virtual bool processSensor(); virtual bool processSensor();
@ -39,8 +39,8 @@ protected:
class CNpcAnemone2Enemy : public CNpcAnemoneEnemy class CNpcAnemone2Enemy : public CNpcAnemoneEnemy
{ {
public: public:
virtual void postInit(); void postInit();
virtual void shutdown(); void shutdown();
virtual void render(); virtual void render();
protected: protected:
virtual void processClose( int _frames ); virtual void processClose( int _frames );

View File

@ -17,7 +17,7 @@
class CNpcBallBlobEnemy : public CNpcEnemy class CNpcBallBlobEnemy : public CNpcEnemy
{ {
public: public:
virtual void postInit(); void postInit();
protected: protected:
virtual void processMovement( int _frames ); virtual void processMovement( int _frames );

View File

@ -17,7 +17,7 @@
class CNpcClamEnemy : public CNpcEnemy class CNpcClamEnemy : public CNpcEnemy
{ {
public: public:
virtual u8 canCollideWithEnemy() {return( false );} 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 );
@ -27,7 +27,7 @@ protected:
class CNpcJumpingClamEnemy : public CNpcClamEnemy class CNpcJumpingClamEnemy : public CNpcClamEnemy
{ {
public: public:
virtual void postInit(); void postInit();
protected: protected:
virtual void processClose( int _frames ); virtual void processClose( int _frames );
virtual void setupWaypoints( sThingActor *ThisActor ); virtual void setupWaypoints( sThingActor *ThisActor );
@ -38,7 +38,7 @@ protected:
class CNpcStaticClamEnemy : public CNpcClamEnemy class CNpcStaticClamEnemy : public CNpcClamEnemy
{ {
public: public:
virtual void postInit(); void postInit();
virtual u8 hasBeenAttacked() {return( false );} virtual u8 hasBeenAttacked() {return( false );}
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
protected: protected:

View File

@ -25,9 +25,9 @@
class CNpcIronDogfishEnemy : public CNpcBossEnemy class CNpcIronDogfishEnemy : public CNpcBossEnemy
{ {
public: public:
virtual void postInit(); void postInit();
void render(); void render();
virtual void shutdown(); void shutdown();
protected: protected:
virtual void processTimer( int _frames ); virtual void processTimer( int _frames );
virtual bool processSensor(); virtual bool processSensor();

View File

@ -17,7 +17,7 @@
class CNpcDustDevilEnemy : public CNpcEnemy class CNpcDustDevilEnemy : public CNpcEnemy
{ {
public: public:
virtual void postInit(); void postInit();
protected: protected:
virtual s32 getFrameShift( int _frames ); virtual s32 getFrameShift( int _frames );
virtual void processMovement( int _frames ); virtual void processMovement( int _frames );

View File

@ -18,8 +18,8 @@ class CNpcEyeballEnemy : public CNpcEnemy
{ {
public: public:
virtual void render(); virtual void render();
virtual void postInit(); void postInit();
virtual void shutdown(); void shutdown();
virtual int getFrameCount() {return( 1 );} virtual int getFrameCount() {return( 1 );}
virtual void processEvent( GAME_EVENT evt, CThing *sourceThing ); virtual void processEvent( GAME_EVENT evt, CThing *sourceThing );
protected: protected:

View File

@ -23,9 +23,9 @@ class CNpcFlyingDutchmanEnemy : public CNpcBossEnemy
{ {
public: public:
virtual void think( int _frames ); virtual void think( int _frames );
virtual void postInit(); void postInit();
void render(); void render();
virtual void shutdown(); void shutdown();
virtual u8 hasBeenAttacked(); virtual u8 hasBeenAttacked();
protected: protected:
virtual void processClose( int _frames ); virtual void processClose( int _frames );

View File

@ -17,7 +17,7 @@
class CNpcFishFolk : public CNpcEnemy class CNpcFishFolk : public CNpcEnemy
{ {
public: public:
virtual void postInit(); void postInit();
protected: protected:
virtual void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange ); virtual void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange );
}; };

View File

@ -16,7 +16,7 @@
class CNpcFlamingSkullEnemy : public CNpcEnemy class CNpcFlamingSkullEnemy : public CNpcEnemy
{ {
virtual void postInit(); void postInit();
protected: protected:
virtual void processEnemyCollision( CThing *thisThing ); virtual void processEnemyCollision( CThing *thisThing );
virtual bool processSensor(); virtual bool processSensor();

View File

@ -21,12 +21,12 @@
class CNpcEnemyGenerator : public CNpcEnemy class CNpcEnemyGenerator : public CNpcEnemy
{ {
public: public:
virtual void shutdown(); void shutdown();
virtual void processEnemyCollision( CThing *thisThing ); void processEnemyCollision( CThing *thisThing );
void render(); void render();
void think(int _frames); void think(int _frames);
virtual u8 canCollideWithEnemy() {return( false );} u8 canCollideWithEnemy() {return( false );}
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
}; };
#endif #endif

View File

@ -17,7 +17,7 @@
class CNpcGhostPirateEnemy : public CNpcEnemy class CNpcGhostPirateEnemy : public CNpcEnemy
{ {
public: public:
virtual void postInit(); void postInit();
protected: protected:
virtual bool processSensor(); virtual bool processSensor();
virtual void processClose( int _frames ); virtual void processClose( int _frames );

View File

@ -21,7 +21,7 @@
class CNpcHermitCrabEnemy : public CNpcEnemy class CNpcHermitCrabEnemy : public CNpcEnemy
{ {
public: public:
virtual void postInit(); void postInit();
protected: protected:
virtual void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange ); virtual void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange );
virtual bool processSensor(); virtual bool processSensor();

View File

@ -21,7 +21,7 @@
class CNpcMotherJellyfishBackground : public CNpcEnemy class CNpcMotherJellyfishBackground : public CNpcEnemy
{ {
public: public:
virtual void postInit(); void postInit();
void render(); void render();
}; };

View File

@ -27,9 +27,9 @@
class CNpcMotherJellyfishEnemy : public CNpcBossEnemy class CNpcMotherJellyfishEnemy : public CNpcBossEnemy
{ {
public: public:
virtual void postInit(); void postInit();
void render(); void render();
virtual void shutdown(); void shutdown();
virtual void setupWaypoints( sThingActor *ThisActor ); virtual void setupWaypoints( sThingActor *ThisActor );
protected: protected:
virtual void processClose( int _frames ); virtual void processClose( int _frames );

View File

@ -104,8 +104,6 @@ public:
static NPC_UNIT_TYPE getTypeFromMapEdit( u16 newType ); static NPC_UNIT_TYPE getTypeFromMapEdit( u16 newType );
void setHeading( s32 newHeading ) {m_heading = newHeading;} void setHeading( s32 newHeading ) {m_heading = newHeading;}
virtual void setHeading( s32 xPos, s32 yPos ); 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 setWaypointPtr( u16 *newPtr ) {m_npcPath.setWaypointPtr( newPtr );}
void setWaypointCount( u8 newCount ) {m_npcPath.setWaypointCount( newCount );} void setWaypointCount( u8 newCount ) {m_npcPath.setWaypointCount( newCount );}
void setPathType( u8 newType ) {m_npcPath.setPathType( newType );} void setPathType( u8 newType ) {m_npcPath.setPathType( newType );}

View File

@ -25,7 +25,7 @@
class CNpcSmallJellyfishProjectileEnemy : public CNpcSmallJellyfishEnemy class CNpcSmallJellyfishProjectileEnemy : public CNpcSmallJellyfishEnemy
{ {
public: public:
virtual void postInit(); void postInit();
virtual void think(int _frames); virtual void think(int _frames);
protected: protected:
s32 m_lifetime; s32 m_lifetime;

View File

@ -21,15 +21,15 @@
class CNpcSpiderCrabEnemy : public CNpcEnemy class CNpcSpiderCrabEnemy : public CNpcEnemy
{ {
public: public:
virtual void postInit(); void postInit();
virtual u8 canCollideWithEnemy(); u8 canCollideWithEnemy();
virtual void processEnemyCollision( CThing *thisThing ); void processEnemyCollision( CThing *thisThing );
protected: protected:
virtual void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange ); void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange );
virtual bool processSensor(); bool processSensor();
virtual void processClose( int _frames ); void processClose( int _frames );
virtual void processCollision(); void processCollision();
virtual void processMovement( int _frames ); void processMovement( int _frames );
void processSpiderCrabInitJumpMovement( int _frames ); void processSpiderCrabInitJumpMovement( int _frames );
s32 m_attackDist; s32 m_attackDist;

View File

@ -22,13 +22,13 @@ class CNpcSquidDartEnemy : public CNpcEnemy
{ {
public: public:
void render(); void render();
virtual int getFrameCount() {return( FRM_SQUIDDART_SWIM0004 - FRM_SQUIDDART_SWIM0001 + 1 );} int getFrameCount() {return( FRM_SQUIDDART_SWIM0004 - FRM_SQUIDDART_SWIM0001 + 1 );}
virtual u8 canCollideWithEnemy() {return( false );} u8 canCollideWithEnemy() {return( false );}
virtual void fireAsProjectile( s16 heading ); void fireAsProjectile( s16 heading );
protected: protected:
virtual s32 getFrameShift( int _frames ); s32 getFrameShift( int _frames );
virtual bool processSensor(); bool processSensor();
virtual void processClose( int _frames ); void processClose( int _frames );
s32 m_xPos; s32 m_xPos;
u8 m_attack; u8 m_attack;

View File

@ -21,7 +21,7 @@
class CNpcShellEnemy : public CNpcEnemy class CNpcShellEnemy : public CNpcEnemy
{ {
public: public:
virtual void postInit(); void postInit();
virtual void render(); virtual void render();
virtual int getFrameCount() {return( 1 );} virtual int getFrameCount() {return( 1 );}
virtual int getFrame() {return( m_shellType );} virtual int getFrame() {return( m_shellType );}

View File

@ -21,7 +21,7 @@
class CNpcSmallJellyfish2BackgroundEnemy : public CNpcSmallJellyfishBackgroundEnemy class CNpcSmallJellyfish2BackgroundEnemy : public CNpcSmallJellyfishBackgroundEnemy
{ {
public: public:
virtual void postInit(); void postInit();
virtual void render(); virtual void render();
protected: protected:
virtual void collidedWith(CThing *_thisThing); virtual void collidedWith(CThing *_thisThing);

View File

@ -23,12 +23,12 @@ class CNpcSmallJellyfishBackgroundEnemy : public CNpcSmallJellyfishEnemy
public: public:
virtual void render(); virtual void render();
virtual void postInit(); virtual void postInit();
void shutdown();
virtual void setTargetHeading( s16 newTargetHeading ) {m_targetHeading = newTargetHeading;} virtual void setTargetHeading( s16 newTargetHeading ) {m_targetHeading = newTargetHeading;}
virtual u8 hasBeenAttacked(); virtual u8 hasBeenAttacked();
protected: protected:
virtual bool processSensor(); virtual bool processSensor();
virtual void processMovement( int _frames ); virtual void processMovement( int _frames );
virtual void shutdown();
virtual void processUserCollision( CThing *thisThing ); virtual void processUserCollision( CThing *thisThing );
virtual void collidedWith(CThing *_thisThing); virtual void collidedWith(CThing *_thisThing);

View File

@ -26,15 +26,15 @@ class CNpcSmallJellyfishEnemy : public CNpcEnemy
{ {
public: public:
virtual void postInit(); virtual void postInit();
virtual void render(); void render();
virtual int getFrameCount() {return( FRM_JELLYFISH1_SWIM7 - FRM_JELLYFISH1_SWIM1 + 1 );} int getFrameCount() {return( FRM_JELLYFISH1_SWIM7 - FRM_JELLYFISH1_SWIM1 + 1 );}
virtual u8 canCollideWithEnemy() {return( false );} u8 canCollideWithEnemy() {return( false );}
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
protected: protected:
virtual bool processSensor(); bool processSensor();
virtual void processClose( int _frames ); void processClose( int _frames );
virtual void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange ); void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange );
virtual void fireAsProjectile( s16 heading ); void fireAsProjectile( s16 heading );
enum enum
{ {

View File

@ -27,9 +27,9 @@ class CNpcSubSharkEnemy : public CNpcBossEnemy
{ {
public: public:
virtual void think( int _frames ); virtual void think( int _frames );
virtual void postInit(); void postInit();
void render(); void render();
virtual void shutdown(); void shutdown();
protected: protected:
//virtual void processClose( int _frames ); //virtual void processClose( int _frames );
virtual s32 getFrameShift( int _frames ); virtual s32 getFrameShift( int _frames );

View File

@ -22,20 +22,20 @@
class CNpcSeaSnakeSegment class CNpcSeaSnakeSegment
{ {
public: public:
virtual void init(); void init();
virtual void shutdown(); void shutdown();
virtual void render(); void render();
virtual void processEnemyCollision( CThing *thisThing ); void processEnemyCollision( CThing *thisThing );
virtual void setScale( u16 scale ) {m_scale = scale;} void setScale( u16 scale ) {m_scale = scale;}
CNpcSeaSnakeSegment *m_nextSegment; CNpcSeaSnakeSegment *m_nextSegment;
virtual void setPos( DVECTOR newPos ) {Pos = newPos;} void setPos( DVECTOR newPos ) {Pos = newPos;}
virtual DVECTOR getPos() {return( Pos );} DVECTOR getPos() {return( Pos );}
virtual void setHeading( s16 newHeading ) {m_heading = newHeading;} void setHeading( s16 newHeading ) {m_heading = newHeading;}
void updateCollisionArea(); void updateCollisionArea();
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); int checkCollisionAgainst(CThing *_thisThing, int _frames);
virtual void setCollisionSize(int _w,int _h); void setCollisionSize(int _w,int _h);
virtual void setCollisionCentreOffset(int _x,int _y) {m_collisionCentreOffset.vx=_x;m_collisionCentreOffset.vy=_y;} void setCollisionCentreOffset(int _x,int _y) {m_collisionCentreOffset.vx=_x;m_collisionCentreOffset.vy=_y;}
virtual CRECT const &getCollisionArea() {return m_collisionArea;} CRECT const &getCollisionArea() {return m_collisionArea;}
DVECTOR const &getCollisionCentre() {return m_collisionCentre;} DVECTOR const &getCollisionCentre() {return m_collisionCentre;}
int getCollisionRadius() {return m_collisionRadius;} int getCollisionRadius() {return m_collisionRadius;}
void setAnim( int newAnim ) {m_anim = newAnim;} void setAnim( int newAnim ) {m_anim = newAnim;}
@ -56,8 +56,8 @@ protected:
class CNpcSeaSnakeEnemy : public CNpcBossEnemy class CNpcSeaSnakeEnemy : public CNpcBossEnemy
{ {
public: public:
virtual void postInit(); void postInit();
virtual void shutdown(); void shutdown();
virtual void render(); virtual void render();
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
protected: protected:

View File

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

View File

@ -17,20 +17,20 @@
class CNpcParasiticWormSegment class CNpcParasiticWormSegment
{ {
public: public:
virtual void init(); void init();
virtual void shutdown(); void shutdown();
virtual void render(); void render();
virtual void processEnemyCollision( CThing *thisThing ); void processEnemyCollision( CThing *thisThing );
virtual void setScale( u16 scale ) {m_scale = scale;} void setScale( u16 scale ) {m_scale = scale;}
CNpcParasiticWormSegment *m_nextSegment; CNpcParasiticWormSegment *m_nextSegment;
virtual void setPos( DVECTOR newPos ) {Pos = newPos;} void setPos( DVECTOR newPos ) {Pos = newPos;}
virtual DVECTOR getPos() {return( Pos );} DVECTOR getPos() {return( Pos );}
virtual void setHeading( s16 newHeading ) {m_heading = newHeading;} void setHeading( s16 newHeading ) {m_heading = newHeading;}
void updateCollisionArea(); void updateCollisionArea();
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); int checkCollisionAgainst(CThing *_thisThing, int _frames);
virtual void setCollisionSize(int _w,int _h); void setCollisionSize(int _w,int _h);
virtual void setCollisionCentreOffset(int _x,int _y) {m_collisionCentreOffset.vx=_x;m_collisionCentreOffset.vy=_y;} void setCollisionCentreOffset(int _x,int _y) {m_collisionCentreOffset.vx=_x;m_collisionCentreOffset.vy=_y;}
virtual CRECT const &getCollisionArea() {return m_collisionArea;} CRECT const &getCollisionArea() {return m_collisionArea;}
DVECTOR const &getCollisionCentre() {return m_collisionCentre;} DVECTOR const &getCollisionCentre() {return m_collisionCentre;}
int getCollisionRadius() {return m_collisionRadius;} int getCollisionRadius() {return m_collisionRadius;}
void setAnim( int newAnim ) {m_animNo = newAnim;} void setAnim( int newAnim ) {m_animNo = newAnim;}
@ -51,8 +51,8 @@ protected:
class CNpcParasiticWormEnemy : public CNpcEnemy class CNpcParasiticWormEnemy : public CNpcEnemy
{ {
public: public:
virtual void postInit(); void postInit();
virtual void shutdown(); void shutdown();
virtual void render(); virtual void render();
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
protected: protected:

View File

@ -21,17 +21,17 @@
class CNpcGaryFriend : public CNpcFriend class CNpcGaryFriend : public CNpcFriend
{ {
public: public:
virtual void postInit(); void postInit();
virtual void shutdown(); void shutdown();
virtual void think( int _frames ); void think( int _frames );
virtual void setupWaypoints( sThingActor *ThisActor ); void setupWaypoints( sThingActor *ThisActor );
bool alwaysThink() {return(true);} bool alwaysThink() {return(true);}
DVECTOR const &getTriggerPos() {return( m_triggerPos );} DVECTOR const &getTriggerPos() {return( m_triggerPos );}
void start(); void start();
void stop(); void stop();
void startLeft(); void startLeft();
void startRight(); void startRight();
virtual void render(); void render();
protected: protected:
DVECTOR m_triggerPos; DVECTOR m_triggerPos;

View File

@ -21,7 +21,7 @@
class CNpcKrustyFriend : public CNpcFriend class CNpcKrustyFriend : public CNpcFriend
{ {
public: public:
virtual void postInit(); void postInit();
protected: protected:
virtual void startConderversation(); virtual void startConderversation();

View File

@ -21,7 +21,7 @@
class CNpcPatrickFriend : public CNpcFriend class CNpcPatrickFriend : public CNpcFriend
{ {
public: public:
virtual void postInit(); void postInit();
protected: protected:
virtual void startConderversation(); virtual void startConderversation();

View File

@ -21,12 +21,12 @@
class CNpcPlanktonFriend : public CNpcFriend class CNpcPlanktonFriend : public CNpcFriend
{ {
public: public:
virtual void init(); void init();
virtual void render(); void render();
virtual void think(int _frames); void think(int _frames);
virtual void shutdown(); void shutdown();
protected: protected:
virtual void startConderversation(); void startConderversation();
}; };
#endif #endif

View File

@ -21,7 +21,7 @@
class CNpcSandyFriend : public CNpcFriend class CNpcSandyFriend : public CNpcFriend
{ {
public: public:
virtual void postInit(); void postInit();
protected: protected:
virtual void startConderversation(); virtual void startConderversation();

View File

@ -22,7 +22,7 @@ class CNpcSquidwardFriend : public CNpcFriend
{ {
public: public:
virtual void think(int _frames); virtual void think(int _frames);
virtual void postInit(); void postInit();
protected: protected:
virtual void startConderversation(); virtual void startConderversation();

View File

@ -21,7 +21,7 @@
class CBridgeBalloon class CBridgeBalloon
{ {
public: public:
virtual void setPos( DVECTOR newPos ) {Pos = newPos;} void setPos( DVECTOR newPos ) {Pos = newPos;}
void render(); void render();
void init(); void init();
void shutdown(); void shutdown();
@ -33,14 +33,14 @@ protected:
class CNpcBalloonBridgePlatform : public CNpcPlatform class CNpcBalloonBridgePlatform : public CNpcPlatform
{ {
public: public:
virtual void postInit(); void postInit();
virtual void render(); void render();
virtual void shutdown(); void shutdown();
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
protected: protected:
virtual void setWaypoints( sThingPlatform *ThisPlatform ); void setWaypoints( sThingPlatform *ThisPlatform );
virtual void processMovement( int _frames ); void processMovement( int _frames );
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); int checkCollisionAgainst(CThing *_thisThing, int _frames);
s32 m_maxExtension; s32 m_maxExtension;
s8 m_balloonCount; s8 m_balloonCount;

View File

@ -21,7 +21,7 @@
class CNpcBobbingPlatform : public CNpcPlatform class CNpcBobbingPlatform : public CNpcPlatform
{ {
public: public:
virtual void postInit(); void postInit();
protected: protected:
virtual void processMovement( int _frames ); virtual void processMovement( int _frames );

View File

@ -21,7 +21,7 @@
class CNpcBouncePlatform : public CNpcPlatform class CNpcBouncePlatform : public CNpcPlatform
{ {
public: public:
virtual void postInit(); void postInit();
virtual void think( int _frames ); virtual void think( int _frames );
virtual void render(); virtual void render();
protected: protected:

View File

@ -21,13 +21,13 @@
class CNpcBubblePlatform : public CNpcPlatform class CNpcBubblePlatform : public CNpcPlatform
{ {
public: public:
virtual void render(); void render();
virtual void postInit(); virtual void postInit();
virtual void shutdown(); void shutdown();
virtual void setGraphic( sThingPlatform *ThisPlatform ) {} void setGraphic( sThingPlatform *ThisPlatform ) {}
virtual void setGraphic( u8 graphicNum ) {} void setGraphic( u8 graphicNum ) {}
protected: protected:
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); int checkCollisionAgainst(CThing *_thisThing, int _frames);
u8 m_pop; u8 m_pop;
s16 m_scale; s16 m_scale;

View File

@ -21,7 +21,7 @@
class CNpcBubbleTubePlatform : public CNpcPlatform class CNpcBubbleTubePlatform : public CNpcPlatform
{ {
public: public:
virtual void postInit(); void postInit();
virtual void setWaypoints( sThingPlatform *ThisPlatform ); virtual void setWaypoints( sThingPlatform *ThisPlatform );
protected: protected:
virtual void collidedWith(CThing *_thisThing); virtual void collidedWith(CThing *_thisThing);

View File

@ -22,7 +22,7 @@ class CNpcBigWheelPlatform : public CNpcPlatform
{ {
public: public:
bool alwaysThink() {return(true);} bool alwaysThink() {return(true);}
virtual void postInit(); void postInit();
virtual int getHeightFromPlatformAtPosition(int _x,int _y, int offsetX = 0, int offsetY = 0); virtual int getHeightFromPlatformAtPosition(int _x,int _y, int offsetX = 0, int offsetY = 0);
protected: protected:
virtual void setWaypoints( sThingPlatform *ThisPlatform ); virtual void setWaypoints( sThingPlatform *ThisPlatform );

View File

@ -21,7 +21,7 @@
class CNpcCollapsingBubblePlatform : public CNpcBubblePlatform class CNpcCollapsingBubblePlatform : public CNpcBubblePlatform
{ {
public: public:
virtual void postInit(); void postInit();
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
protected: protected:
virtual void processLifetime( int _frames ); virtual void processLifetime( int _frames );

View File

@ -21,7 +21,7 @@
class CNpcCircularPlatform : public CNpcPlatform class CNpcCircularPlatform : public CNpcPlatform
{ {
public: public:
virtual void postInit(); void postInit();
protected: protected:
virtual void processMovement( int _frames ); virtual void processMovement( int _frames );
}; };

View File

@ -21,7 +21,7 @@
class CNpcClamPlatform : public CNpcPlatform class CNpcClamPlatform : public CNpcPlatform
{ {
public: public:
virtual void postInit(); void postInit();
virtual void render(); virtual void render();
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
//void setBBox(); //void setBBox();

View File

@ -21,7 +21,7 @@
class CNpcConveyorPlatform : public CNpcPlatform class CNpcConveyorPlatform : public CNpcPlatform
{ {
public: public:
virtual void postInit(); void postInit();
virtual void render(); virtual void render();
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
protected: protected:

View File

@ -21,7 +21,7 @@
class CNpcFallingPlatform : public CNpcPlatform class CNpcFallingPlatform : public CNpcPlatform
{ {
public: public:
virtual void postInit(); void postInit();
protected: protected:
virtual void processMovement( int _frames ); virtual void processMovement( int _frames );
}; };

View File

@ -21,7 +21,7 @@
class CNpcFallingNoRespawnPlatform : public CNpcPlatform class CNpcFallingNoRespawnPlatform : public CNpcPlatform
{ {
public: public:
virtual void postInit(); void postInit();
bool alwaysThink() {return(true);} bool alwaysThink() {return(true);}
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
protected: protected:

View File

@ -21,7 +21,7 @@
class CNpcFishHook3Platform : public CNpcFishHookPlatform class CNpcFishHook3Platform : public CNpcFishHookPlatform
{ {
public: public:
virtual void postInit(); void postInit();
}; };
#endif #endif

View File

@ -21,7 +21,7 @@
class CNpcGeyserBubblePlatform : public CNpcBubblePlatform class CNpcGeyserBubblePlatform : public CNpcBubblePlatform
{ {
public: public:
virtual void postInit(); void postInit();
protected: protected:
virtual void processMovement( int _frames ); virtual void processMovement( int _frames );
virtual void processLifetime( int _frames ); virtual void processLifetime( int _frames );

View File

@ -21,7 +21,7 @@
class CNpcGeyserPlatform : public CNpcPlatform class CNpcGeyserPlatform : public CNpcPlatform
{ {
public: public:
virtual void postInit(); void postInit();
protected: protected:
virtual void processMovement( int _frames ); virtual void processMovement( int _frames );
virtual void processTimer( int _frames ); virtual void processTimer( int _frames );

View File

@ -21,7 +21,7 @@
class CNpcJellyfishPlatform : public CNpcLinearPlatform class CNpcJellyfishPlatform : public CNpcLinearPlatform
{ {
public: public:
virtual void postInit(); void postInit();
virtual void think( int _frames ); virtual void think( int _frames );
protected: protected:
virtual void collidedWith(CThing *_thisThing); virtual void collidedWith(CThing *_thisThing);

View File

@ -21,7 +21,7 @@
class CNpcLanternPlatform : public CNpcPlatform class CNpcLanternPlatform : public CNpcPlatform
{ {
public: public:
virtual void postInit(); void postInit();
bool alwaysThink() {return(true);} bool alwaysThink() {return(true);}
protected: protected:
virtual void setWaypoints( sThingPlatform *ThisPlatform ); virtual void setWaypoints( sThingPlatform *ThisPlatform );

View File

@ -21,7 +21,7 @@
class CNpcLeafPlatform : public CNpcPlatform class CNpcLeafPlatform : public CNpcPlatform
{ {
public: public:
virtual void postInit(); void postInit();
protected: protected:
virtual void processMovement( int _frames ); virtual void processMovement( int _frames );

View File

@ -21,7 +21,7 @@
class CNpcLiftPlatform : public CNpcPlatform class CNpcLiftPlatform : public CNpcPlatform
{ {
public: public:
virtual void postInit(); void postInit();
virtual void setWaypoints( sThingPlatform *ThisPlatform ); virtual void setWaypoints( sThingPlatform *ThisPlatform );
protected: protected:
virtual void collidedWith(CThing *_thisThing); virtual void collidedWith(CThing *_thisThing);

View File

@ -21,7 +21,7 @@
class CNpcLoveBoatPlatform : public CNpcCartPlatform class CNpcLoveBoatPlatform : public CNpcCartPlatform
{ {
public: public:
virtual void postInit(); void postInit();
}; };
#endif #endif

View File

@ -21,7 +21,7 @@
class CNpcPendulumPlatform : public CNpcPlatform class CNpcPendulumPlatform : public CNpcPlatform
{ {
public: public:
virtual void postInit(); void postInit();
virtual void render(); virtual void render();
protected: protected:
virtual void setWaypoints( sThingPlatform *ThisPlatform ); virtual void setWaypoints( sThingPlatform *ThisPlatform );

View File

@ -24,18 +24,6 @@
#endif #endif
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/*void CNpcPlayerBubblePlatform::postInit()
{
CNpcBubblePlatform::postInit();
setCollisionSize( 30, 30 );
setCollisionCentreOffset( 0, -15 );
calculateNonRotatedCollisionData();
}*/
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcPlayerBubblePlatform::processLifetime( int _frames ) void CNpcPlayerBubblePlatform::processLifetime( int _frames )

View File

@ -21,7 +21,6 @@
class CNpcPlayerBubblePlatform : public CNpcBubblePlatform class CNpcPlayerBubblePlatform : public CNpcBubblePlatform
{ {
public: public:
//virtual void postInit();
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
protected: protected:
virtual void processLifetime( int _frames ); virtual void processLifetime( int _frames );

View File

@ -21,7 +21,7 @@
class CNpcRaftPlatform : public CNpcPlatform class CNpcRaftPlatform : public CNpcPlatform
{ {
public: public:
virtual void postInit(); void postInit();
virtual void render(); virtual void render();
protected: protected:
virtual void processMovement( int _frames ); virtual void processMovement( int _frames );

View File

@ -21,7 +21,7 @@
class CNpcRisingBridgePlatform : public CNpcPlatform class CNpcRisingBridgePlatform : public CNpcPlatform
{ {
public: public:
virtual void postInit(); void postInit();
virtual void trigger(); virtual void trigger();
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
protected: protected:

View File

@ -21,7 +21,7 @@
class CNpcRetractingPlatform : public CNpcPlatform class CNpcRetractingPlatform : public CNpcPlatform
{ {
public: public:
virtual void postInit(); void postInit();
virtual void render(); virtual void render();
protected: protected:
void processTimer( int _frames ); void processTimer( int _frames );

View File

@ -22,7 +22,7 @@ class CNpcSteerableBarrelPlatform : public CNpcPlatform
{ {
public: public:
virtual void render(); virtual void render();
virtual void postInit(); void postInit();
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
protected: protected:
virtual void processMovement( int _frames ); virtual void processMovement( int _frames );

View File

@ -21,7 +21,7 @@
class CNpcSeesawPlatform : public CNpcPlatform class CNpcSeesawPlatform : public CNpcPlatform
{ {
public: public:
virtual void postInit(); void postInit();
virtual void render(); virtual void render();
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
protected: protected:

View File

@ -25,7 +25,7 @@
class CNpcSteamSwitchPlatform : public CNpcPlatform class CNpcSteamSwitchPlatform : public CNpcPlatform
{ {
public: public:
virtual void postInit(); void postInit();
virtual void setWaypoints( sThingPlatform *ThisPlatform ); virtual void setWaypoints( sThingPlatform *ThisPlatform );
protected: protected:
virtual void processMovement( int _frames ); virtual void processMovement( int _frames );

View File

@ -21,7 +21,7 @@
class CNpcTrapdoorPlatform : public CNpcPlatform class CNpcTrapdoorPlatform : public CNpcPlatform
{ {
public: public:
virtual void postInit(); void postInit();
DVECTOR const &getTriggerPos() {return( m_triggerPos );} DVECTOR const &getTriggerPos() {return( m_triggerPos );}
void setTriggered() {m_triggered = true;} void setTriggered() {m_triggered = true;}
virtual void render(); virtual void render();