This commit is contained in:
Charles 2001-07-04 14:26:36 +00:00
parent d2971296b8
commit 7478d3483b
88 changed files with 260 additions and 260 deletions

View File

@ -24,8 +24,8 @@ public:
virtual void postInit(); virtual void postInit();
void setHeading( s32 xPos, s32 yPos ); void setHeading( s32 xPos, s32 yPos );
protected: protected:
virtual void processEnemyCollision( CThing *thisThing ); void processEnemyCollision( CThing *thisThing );
virtual bool processSensor(); bool processSensor();
s32 m_fireHeading; s32 m_fireHeading;
}; };
@ -33,7 +33,7 @@ protected:
class CNpcAnemone1Enemy : public CNpcAnemoneEnemy class CNpcAnemone1Enemy : public CNpcAnemoneEnemy
{ {
protected: protected:
virtual void processClose( int _frames ); void processClose( int _frames );
}; };
class CNpcAnemone2Enemy : public CNpcAnemoneEnemy class CNpcAnemone2Enemy : public CNpcAnemoneEnemy
@ -41,12 +41,12 @@ class CNpcAnemone2Enemy : public CNpcAnemoneEnemy
public: public:
void postInit(); void postInit();
void shutdown(); void shutdown();
virtual void render(); void render();
protected: protected:
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 processShotDeathStart( int _frames ); void processShotDeathStart( int _frames );
virtual void processShotDeathEnd( int _frames ); void processShotDeathEnd( int _frames );
u16 m_scaleX, m_scaleY; u16 m_scaleX, m_scaleY;
@ -62,7 +62,7 @@ protected:
class CNpcAnemone3Enemy : public CNpcAnemoneEnemy class CNpcAnemone3Enemy : public CNpcAnemoneEnemy
{ {
protected: protected:
virtual void processClose( int _frames ); void processClose( int _frames );
}; };
#endif #endif

View File

@ -19,7 +19,7 @@ class CNpcBallBlobEnemy : public CNpcEnemy
public: public:
void postInit(); void postInit();
protected: protected:
virtual void processMovement( int _frames ); void processMovement( int _frames );
DVECTOR m_velocity; DVECTOR m_velocity;
}; };

View File

@ -17,8 +17,8 @@
class CNpcBoogerMonsterEnemy : public CNpcEnemy class CNpcBoogerMonsterEnemy : public CNpcEnemy
{ {
protected: protected:
virtual bool processSensor(); bool processSensor();
virtual void processClose( int _frames ); void processClose( int _frames );
enum enum
{ {

View File

@ -27,7 +27,7 @@ public:
virtual void postInit(); virtual void postInit();
virtual void shutdown(); virtual void shutdown();
protected: protected:
virtual void addHealthMeter(); void addHealthMeter();
bool m_meterOn; bool m_meterOn;
CFXNRGBar *m_energyBar; CFXNRGBar *m_energyBar;

View File

@ -25,11 +25,11 @@
class CNpcButterflyBackgroundEnemy : public CNpcSmallJellyfishBackgroundEnemy class CNpcButterflyBackgroundEnemy : public CNpcSmallJellyfishBackgroundEnemy
{ {
public: public:
virtual void render(); void render();
virtual int getFrameCount() {return( FRM_BUTTERFLY_FLAP04 - FRM_BUTTERFLY_FLAP01 + 1 );} int getFrameCount() {return( FRM_BUTTERFLY_FLAP04 - FRM_BUTTERFLY_FLAP01 + 1 );}
virtual u8 canBeCaughtByNet() {return( false );} u8 canBeCaughtByNet() {return( false );}
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 );
}; };
#endif #endif

View File

@ -19,9 +19,9 @@ class CNpcClamEnemy : public CNpcEnemy
public: public:
u8 canCollideWithEnemy() {return( false );} u8 canCollideWithEnemy() {return( false );}
protected: protected:
virtual void processUserCollision( CThing *thisThing ); void processUserCollision( CThing *thisThing );
virtual void processEnemyCollision( CThing *thisThing ); void processEnemyCollision( CThing *thisThing );
virtual bool processSensor(); bool processSensor();
}; };
class CNpcJumpingClamEnemy : public CNpcClamEnemy class CNpcJumpingClamEnemy : public CNpcClamEnemy
@ -29,8 +29,8 @@ class CNpcJumpingClamEnemy : public CNpcClamEnemy
public: public:
void postInit(); void postInit();
protected: protected:
virtual void processClose( int _frames ); void processClose( int _frames );
virtual void setupWaypoints( sThingActor *ThisActor ); void setupWaypoints( sThingActor *ThisActor );
s32 m_maxExtension; s32 m_maxExtension;
}; };
@ -39,14 +39,14 @@ class CNpcStaticClamEnemy : public CNpcClamEnemy
{ {
public: public:
void postInit(); void postInit();
virtual u8 hasBeenAttacked() {return( false );} u8 hasBeenAttacked() {return( false );}
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
protected: protected:
virtual s32 getFrameShift( int _frames ); s32 getFrameShift( int _frames );
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
virtual void processClose( int _frames ); void processClose( int _frames );
virtual void processCollision(); void processCollision();
virtual void processAnimFrames( int _frames ); void processAnimFrames( int _frames );
s32 m_isStunned; s32 m_isStunned;
}; };

View File

@ -29,17 +29,17 @@ public:
void render(); void render();
void shutdown(); void shutdown();
protected: protected:
virtual void processTimer( int _frames ); void processTimer( int _frames );
virtual bool processSensor(); bool processSensor();
virtual void processClose( int _frames ); void processClose( int _frames );
virtual void processMovement( int _frames ); void processMovement( int _frames );
void processStandardIronDogfishAttack( int _frames ); void processStandardIronDogfishAttack( int _frames );
void processWalkToUser( int _frames, int speed ); void processWalkToUser( int _frames, int speed );
virtual void processCollision(); void processCollision();
virtual void processAttackCollision(); void processAttackCollision();
virtual void hasBeenSteamed( DVECTOR &steamPos ); void hasBeenSteamed( DVECTOR &steamPos );
virtual void processShotDeathEnd( int _frames ); void processShotDeathEnd( int _frames );
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
enum NPC_IRON_DOGFISH_STATE enum NPC_IRON_DOGFISH_STATE
{ {

View File

@ -19,9 +19,9 @@ class CNpcDustDevilEnemy : public CNpcEnemy
public: public:
void postInit(); void postInit();
protected: protected:
virtual s32 getFrameShift( int _frames ); s32 getFrameShift( int _frames );
virtual void processMovement( int _frames ); void processMovement( 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 );
}; };
#endif #endif

View File

@ -17,17 +17,17 @@
class CNpcEyeballEnemy : public CNpcEnemy class CNpcEyeballEnemy : public CNpcEnemy
{ {
public: public:
virtual void render(); void render();
void postInit(); void postInit();
void shutdown(); void shutdown();
virtual int getFrameCount() {return( 1 );} int getFrameCount() {return( 1 );}
virtual void processEvent( GAME_EVENT evt, CThing *sourceThing ); void processEvent( GAME_EVENT evt, CThing *sourceThing );
protected: protected:
virtual void processEnemyCollision( CThing *thisThing ); void processEnemyCollision( CThing *thisThing );
virtual bool processSensor(); bool processSensor();
virtual void processClose( int _frames ); void processClose( int _frames );
virtual void processShotDeathStart( int _frames ); void processShotDeathStart( int _frames );
virtual void processShotDeathEnd( int _frames ); void processShotDeathEnd( int _frames );
s32 m_fireHeading; s32 m_fireHeading;

View File

@ -22,17 +22,17 @@
class CNpcFlyingDutchmanEnemy : public CNpcBossEnemy class CNpcFlyingDutchmanEnemy : public CNpcBossEnemy
{ {
public: public:
virtual void think( int _frames ); void think( int _frames );
void postInit(); void postInit();
void render(); void render();
void shutdown(); void shutdown();
virtual u8 hasBeenAttacked(); u8 hasBeenAttacked();
protected: protected:
virtual void processClose( int _frames ); void processClose( int _frames );
virtual void processMovement( int _frames ); void processMovement( int _frames );
virtual void processShotRecoil( int _frames ); void processShotRecoil( int _frames );
virtual void processShotDeathEnd( int _frames ); void processShotDeathEnd( int _frames );
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
enum NPC_FLYING_DUTCHMAN_STATE enum NPC_FLYING_DUTCHMAN_STATE
{ {

View File

@ -19,7 +19,7 @@ class CNpcFishFolk : public CNpcEnemy
public: public:
void postInit(); void postInit();
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 );
}; };
#endif #endif

View File

@ -18,9 +18,9 @@ class CNpcFlamingSkullEnemy : public CNpcEnemy
{ {
void postInit(); void postInit();
protected: protected:
virtual void processEnemyCollision( CThing *thisThing ); void processEnemyCollision( CThing *thisThing );
virtual bool processSensor(); bool processSensor();
virtual void processClose( int _frames ); void processClose( int _frames );
s32 m_fireHeading; s32 m_fireHeading;

View File

@ -19,8 +19,8 @@ class CNpcGhostPirateEnemy : public CNpcEnemy
public: public:
void postInit(); void postInit();
protected: protected:
virtual bool processSensor(); bool processSensor();
virtual void processClose( int _frames ); void processClose( int _frames );
}; };
#endif #endif

View File

@ -23,9 +23,9 @@ class CNpcHermitCrabEnemy : public CNpcEnemy
public: public:
void postInit(); void postInit();
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 );
s32 m_jumpBase; s32 m_jumpBase;

View File

@ -30,12 +30,12 @@ public:
void postInit(); void postInit();
void render(); void render();
void shutdown(); void shutdown();
virtual void setupWaypoints( sThingActor *ThisActor ); void setupWaypoints( sThingActor *ThisActor );
protected: protected:
virtual void processClose( int _frames ); void processClose( int _frames );
virtual void processMovement( int _frames ); void processMovement( int _frames );
virtual void processShot( int _frames ); void processShot( int _frames );
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
//void spawnJellyfish( int _frames ); //void spawnJellyfish( int _frames );
//virtual void processUserCollision( CThing *thisThing ); //virtual void processUserCollision( CThing *thisThing );

View File

@ -17,9 +17,9 @@
class CNpcBabyOctopusEnemy : public CNpcEnemy class CNpcBabyOctopusEnemy : public CNpcEnemy
{ {
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 );
enum enum
{ {

View File

@ -21,7 +21,7 @@
class CNpcPricklyBugEnemy : public CNpcEnemy class CNpcPricklyBugEnemy : public CNpcEnemy
{ {
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 );
}; };
#endif #endif

View File

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

View File

@ -17,8 +17,8 @@
class CNpcPuffaFishEnemy : public CNpcEnemy class CNpcPuffaFishEnemy : public CNpcEnemy
{ {
protected: protected:
virtual bool processSensor(); bool processSensor();
virtual void processClose( int _frames ); void processClose( int _frames );
enum NPC_PUFFA_FISH_STATE enum NPC_PUFFA_FISH_STATE
{ {

View File

@ -22,10 +22,10 @@ class CNpcShellEnemy : public CNpcEnemy
{ {
public: public:
void postInit(); void postInit();
virtual void render(); void render();
virtual int getFrameCount() {return( 1 );} int getFrameCount() {return( 1 );}
virtual int getFrame() {return( m_shellType );} int getFrame() {return( m_shellType );}
virtual u8 hasBeenAttacked() {return( false );} u8 hasBeenAttacked() {return( false );}
protected: protected:
virtual void collidedWith(CThing *_thisThing); virtual void collidedWith(CThing *_thisThing);

View File

@ -17,8 +17,8 @@
class CNpcSharkManEnemy : public CNpcEnemy class CNpcSharkManEnemy : public CNpcEnemy
{ {
protected: protected:
virtual void processClose( int _frames ); void processClose( int _frames );
virtual void processMovement( int _frames ); void processMovement( int _frames );
}; };
#endif #endif

View File

@ -22,9 +22,9 @@ class CNpcSmallJellyfish2BackgroundEnemy : public CNpcSmallJellyfishBackgroundEn
{ {
public: public:
void postInit(); void postInit();
virtual void render(); void render();
protected: protected:
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
}; };
#endif #endif

View File

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

View File

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

View File

@ -17,9 +17,9 @@
class CNpcSkeletalFishEnemy : public CNpcEnemy class CNpcSkeletalFishEnemy : public CNpcEnemy
{ {
protected: protected:
virtual bool processSensor(); bool processSensor();
virtual void processClose( int _frames ); void processClose( int _frames );
virtual s32 getFrameShift( int _frames ); s32 getFrameShift( int _frames );
s32 m_chargeTime; s32 m_chargeTime;

View File

@ -26,17 +26,17 @@
class CNpcSubSharkEnemy : public CNpcBossEnemy class CNpcSubSharkEnemy : public CNpcBossEnemy
{ {
public: public:
virtual void think( int _frames ); void think( int _frames );
void postInit(); void postInit();
void render(); void render();
void shutdown(); void shutdown();
protected: protected:
//virtual void processClose( int _frames ); //virtual void processClose( int _frames );
virtual s32 getFrameShift( int _frames ); s32 getFrameShift( int _frames );
virtual void processMovement( int _frames ); void processMovement( int _frames );
virtual void processShot( int _frames ); void processShot( int _frames );
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
virtual void setupWaypoints( sThingActor *ThisActor ); void setupWaypoints( sThingActor *ThisActor );
enum NPC_SUB_SHARK_STATE enum NPC_SUB_SHARK_STATE
{ {

View File

@ -58,20 +58,20 @@ class CNpcSeaSnakeEnemy : public CNpcBossEnemy
public: public:
void postInit(); void postInit();
void shutdown(); void shutdown();
virtual void render(); void render();
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); int checkCollisionAgainst(CThing *_thisThing, int _frames);
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 );
virtual void processMovement( int _frames ); void processMovement( int _frames );
virtual void processShot( int _frames ); void processShot( int _frames );
virtual void processEnemyCollision( CThing *thisThing ); void processEnemyCollision( CThing *thisThing );
virtual void processUserCollision( CThing *thisThing ); void processUserCollision( CThing *thisThing );
u8 processPathMove( int _frames, s32 *moveX, s32 *moveY, s32 *moveVel, s32 *moveDist ); u8 processPathMove( int _frames, s32 *moveX, s32 *moveY, s32 *moveVel, s32 *moveDist );
u8 isSnakeStopped(); u8 isSnakeStopped();
void moveEntireSnake( DVECTOR newPos ); void moveEntireSnake( DVECTOR newPos );
virtual void addHealthMeter(); void addHealthMeter();
enum enum
{ {

View File

@ -19,10 +19,10 @@ class CNpcSkullStomperEnemy : public CNpcEnemy
public: public:
void postInit(); void postInit();
protected: protected:
virtual void processEnemyCollision( CThing *thisThing ); void processEnemyCollision( CThing *thisThing );
virtual bool processSensor(); bool processSensor();
virtual void processClose( int _frames ); void processClose( int _frames );
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
}; };
#endif #endif

View File

@ -53,15 +53,15 @@ class CNpcParasiticWormEnemy : public CNpcEnemy
public: public:
void postInit(); void postInit();
void shutdown(); void shutdown();
virtual void render(); void render();
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); int checkCollisionAgainst(CThing *_thisThing, int _frames);
protected: protected:
virtual bool processSensor(); bool processSensor();
virtual void processClose( int _frames ); void processClose( int _frames );
virtual void processMovement( int _frames ); void processMovement( int _frames );
virtual void processShotDeathEnd( int _frames ); void processShotDeathEnd( int _frames );
//void resetParasiticWormHeadToTail(); //void resetParasiticWormHeadToTail();
virtual void processEnemyCollision( CThing *thisThing ); void processEnemyCollision( CThing *thisThing );
enum enum
{ {

View File

@ -23,7 +23,7 @@ class CNpcKrustyFriend : public CNpcFriend
public: public:
void postInit(); void postInit();
protected: protected:
virtual void startConderversation(); void startConderversation();
FileEquate m_conversation; FileEquate m_conversation;
}; };

View File

@ -23,7 +23,7 @@ class CNpcPatrickFriend : public CNpcFriend
public: public:
void postInit(); void postInit();
protected: protected:
virtual void startConderversation(); void startConderversation();
FileEquate m_conversation; FileEquate m_conversation;
}; };

View File

@ -23,7 +23,7 @@ class CNpcSandyFriend : public CNpcFriend
public: public:
void postInit(); void postInit();
protected: protected:
virtual void startConderversation(); void startConderversation();
FileEquate m_conversation; FileEquate m_conversation;
}; };

View File

@ -21,10 +21,10 @@
class CNpcSquidwardFriend : public CNpcFriend class CNpcSquidwardFriend : public CNpcFriend
{ {
public: public:
virtual void think(int _frames); void think(int _frames);
void postInit(); void postInit();
protected: protected:
virtual void startConderversation(); void startConderversation();
FileEquate m_conversation; FileEquate m_conversation;
}; };

View File

@ -25,7 +25,7 @@ public:
void render(); void render();
protected: protected:
void processMovement( int _frames ); void processMovement( int _frames );
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
DVECTOR m_lastWaypoint; DVECTOR m_lastWaypoint;

View File

@ -22,10 +22,10 @@ class CNpcBoatHazard : public CNpcHazard
{ {
public: public:
void init(); void init();
virtual void render(); void render();
protected: protected:
void processMovement( int _frames ); void processMovement( int _frames );
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
u8 m_reversed; u8 m_reversed;
}; };

View File

@ -22,11 +22,11 @@ class CNpcBouncingRockHazard : public CNpcBouncingBarrelHazard
{ {
public: public:
void init(); void init();
virtual void setWaypoints( sThingHazard *ThisHazard ); void setWaypoints( sThingHazard *ThisHazard );
virtual void trigger(); void trigger();
protected: protected:
void processMovement( int _frames ); void processMovement( int _frames );
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
u8 m_isTriggered; u8 m_isTriggered;
}; };

View File

@ -22,11 +22,11 @@ class CNpcBigWheelHazard : public CNpcHazard
{ {
public: public:
void init(); void init();
virtual void render(); void render();
bool alwaysThink() {return(true);} bool alwaysThink() {return(true);}
protected: protected:
void processMovement( int _frames ); void processMovement( int _frames );
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
s16 m_rotation; s16 m_rotation;
}; };

View File

@ -22,7 +22,7 @@ class CNpcCircularSawHazard : public CNpcHazard
{ {
public: public:
void init(); void init();
virtual void render(); void render();
protected: protected:
void processMovement( int _frames ); void processMovement( int _frames );

View File

@ -21,12 +21,12 @@
class CNpcConveyorSwitchHazard : public CNpcHazard class CNpcConveyorSwitchHazard : public CNpcHazard
{ {
public: public:
virtual void setWaypoints( sThingHazard *ThisHazard ); void setWaypoints( sThingHazard *ThisHazard );
void init(); void init();
virtual void render(); void render();
virtual void trigger(); void trigger();
protected: protected:
virtual void collidedWith(CThing *_thisThing) {} void collidedWith(CThing *_thisThing) {}
u8 m_reversed; u8 m_reversed;
DVECTOR m_conveyorPos; DVECTOR m_conveyorPos;

View File

@ -22,12 +22,12 @@ class CNpcFallingHazard : public CNpcHazard
{ {
public: public:
void init(); void init();
virtual void setWaypoints( sThingHazard *ThisHazard ); void setWaypoints( sThingHazard *ThisHazard );
void render(); void render();
protected: protected:
void processMovement( int _frames ); void processMovement( int _frames );
void processTimer( int _frames ); void processTimer( int _frames );
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
s32 m_movementTimer; s32 m_movementTimer;
u8 m_bounceFinish; u8 m_bounceFinish;

View File

@ -22,7 +22,7 @@ class CNpcFanHazard : public CNpcHazard
{ {
public: public:
void init(); void init();
virtual void render(); void render();
protected: protected:
void processMovement( int _frames ); void processMovement( int _frames );

View File

@ -22,10 +22,10 @@ class CNpcFlyTrapHazard : public CNpcHazard
{ {
public: public:
void init(); void init();
virtual void render(); void render();
protected: protected:
void processMovement( int _frames ); void processMovement( int _frames );
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
s16 m_rotation; s16 m_rotation;
u8 m_shut; u8 m_shut;

View File

@ -21,9 +21,9 @@
class CNpcInertHazard : public CNpcHazard class CNpcInertHazard : public CNpcHazard
{ {
public: public:
virtual void render(); void render();
protected: protected:
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
}; };
#endif #endif

View File

@ -22,7 +22,7 @@ class CNpcLogHazard : public CNpcHazard
{ {
public: public:
void init(); void init();
virtual void setWaypoints( sThingHazard *ThisHazard ); void setWaypoints( sThingHazard *ThisHazard );
protected: protected:
void processMovement( int _frames ); void processMovement( int _frames );

View File

@ -22,7 +22,7 @@ class CNpcMasherHazard : public CNpcHazard
{ {
public: public:
void init(); void init();
virtual void setGraphic( sThingHazard *ThisHazard ); void setGraphic( sThingHazard *ThisHazard );
protected: protected:
void processMovement( int _frames ); void processMovement( int _frames );

View File

@ -22,7 +22,7 @@ class CNpcMowerHazard : public CNpcHazard
{ {
public: public:
void init(); void init();
virtual void render(); void render();
protected: protected:
void processMovement( int _frames ); void processMovement( int _frames );

View File

@ -22,9 +22,9 @@ class CNpcPendulumHazard : public CNpcHazard
{ {
public: public:
void init(); void init();
virtual void render(); void render();
protected: protected:
virtual void setWaypoints( sThingHazard *ThisHazard ); void setWaypoints( sThingHazard *ThisHazard );
void processMovement( int _frames ); void processMovement( int _frames );
s32 m_length; s32 m_length;

View File

@ -31,8 +31,8 @@ public:
bool alwaysThink() {return(true);} bool alwaysThink() {return(true);}
//virtual void render(); //virtual void render();
protected: protected:
virtual void setWaypoints( sThingHazard *ThisHazard ); void setWaypoints( sThingHazard *ThisHazard );
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
DVECTOR m_triggerPos; DVECTOR m_triggerPos;
CNpcTrapdoorPlatform *m_platform; CNpcTrapdoorPlatform *m_platform;

View File

@ -22,7 +22,7 @@ class CNpcRockShardHazard : public CNpcHazard
{ {
public: public:
void init(); void init();
virtual CRECT const *getThinkBBox(); CRECT const *getThinkBBox();
// virtual void setWaypoints( sThingHazard *ThisHazard ); // virtual void setWaypoints( sThingHazard *ThisHazard );
protected: protected:
void processMovement( int _frames ); void processMovement( int _frames );

View File

@ -22,13 +22,13 @@ class CNpcRisingWeightHazard : public CNpcHazard
{ {
public: public:
void init(); void init();
virtual void render(); void render();
DVECTOR const &getWheelPos() {return( m_wheelPos );} DVECTOR const &getWheelPos() {return( m_wheelPos );}
void setTriggered() {m_triggered = true;} void setTriggered() {m_triggered = true;}
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
protected: protected:
virtual void setWaypoints( sThingHazard *ThisHazard ); void setWaypoints( sThingHazard *ThisHazard );
virtual void processMovement( int _frames ); void processMovement( int _frames );
s32 m_maxExtension; s32 m_maxExtension;
DVECTOR m_wheelPos; DVECTOR m_wheelPos;

View File

@ -28,11 +28,11 @@ public:
void init(); void init();
DVECTOR const &getWheelPos() {return( m_wheelPos );} DVECTOR const &getWheelPos() {return( m_wheelPos );}
void linkToWeight( CNpcRisingWeightHazard *weight ) {m_weight = weight;} void linkToWeight( CNpcRisingWeightHazard *weight ) {m_weight = weight;}
virtual void render(); void render();
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
protected: protected:
virtual void setWaypoints( sThingHazard *ThisHazard ); void setWaypoints( sThingHazard *ThisHazard );
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
DVECTOR m_wheelPos; DVECTOR m_wheelPos;
CNpcRisingWeightHazard *m_weight; CNpcRisingWeightHazard *m_weight;

View File

@ -24,7 +24,7 @@ public:
void init(); void init();
bool alwaysThink() {return(true);} bool alwaysThink() {return(true);}
protected: protected:
virtual void processTimer( int _frames ); void processTimer( int _frames );
void processMovement( int _frames ); void processMovement( int _frames );
enum SPIKES_STATE enum SPIKES_STATE

View File

@ -22,7 +22,7 @@ class CNpcSwordfishHazard : public CNpcFireballHazard
{ {
public: public:
void render(); void render();
virtual void setWaypoints( sThingHazard *ThisHazard ); void setWaypoints( sThingHazard *ThisHazard );
}; };
#endif #endif

View File

@ -25,7 +25,7 @@ public:
void render(); void render();
void init(); void init();
void shutdown(); void shutdown();
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); int checkCollisionAgainst(CThing *_thisThing, int _frames);
protected: protected:
DVECTOR Pos; DVECTOR Pos;
}; };
@ -36,7 +36,7 @@ public:
void postInit(); void postInit();
void render(); void render();
void shutdown(); void shutdown();
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
protected: protected:
void setWaypoints( sThingPlatform *ThisPlatform ); void setWaypoints( sThingPlatform *ThisPlatform );
void processMovement( int _frames ); void processMovement( int _frames );

View File

@ -22,10 +22,10 @@ class CNpcGeyserPlatformGenerator : public CNpcPlatform
{ {
public: public:
void setTargetType( NPC_PLATFORM_UNIT_TYPE targetType ) {m_targetType = targetType;} void setTargetType( NPC_PLATFORM_UNIT_TYPE targetType ) {m_targetType = targetType;}
virtual void render(); void render();
protected: protected:
virtual void think( int _frames ); void think( int _frames );
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
NPC_PLATFORM_UNIT_TYPE m_targetType; NPC_PLATFORM_UNIT_TYPE m_targetType;
}; };

View File

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

View File

@ -22,8 +22,8 @@ class CNpcBouncePlatform : public CNpcPlatform
{ {
public: public:
void postInit(); void postInit();
virtual void think( int _frames ); void think( int _frames );
virtual void render(); void render();
protected: protected:
s32 m_vertScale; s32 m_vertScale;
s32 m_vertVelocity; s32 m_vertVelocity;

View File

@ -21,12 +21,12 @@
class CNpcBranchPlatform : public CNpcPlatform class CNpcBranchPlatform : public CNpcPlatform
{ {
public: public:
virtual void postInit(); void postInit();
virtual void render(); void render();
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} 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 );
s32 m_angularVelocity; s32 m_angularVelocity;
u8 m_reversed; u8 m_reversed;

View File

@ -22,11 +22,11 @@ class CNpcBubbleTubePlatform : public CNpcPlatform
{ {
public: public:
void postInit(); void postInit();
virtual void setWaypoints( sThingPlatform *ThisPlatform ); void setWaypoints( sThingPlatform *ThisPlatform );
protected: protected:
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
virtual void processMovement( int _frames ); void processMovement( int _frames );
virtual void processTimer( int _frames ); void processTimer( int _frames );
u8 m_isActivated; u8 m_isActivated;
u8 m_returning; u8 m_returning;

View File

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

View File

@ -21,13 +21,13 @@
class CNpcCartPlatform : public CNpcPlatform class CNpcCartPlatform : public CNpcPlatform
{ {
public: public:
virtual void postInit(); void postInit();
virtual void render(); void render();
virtual u8 isCart() {return( true );} u8 isCart() {return( true );}
virtual void jump(); void jump();
protected: protected:
virtual void processMovement( int _frames ); void processMovement( int _frames );
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
s32 m_carSpeed; s32 m_carSpeed;
u8 m_isActivated; u8 m_isActivated;

View File

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

View File

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

View File

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

View File

@ -22,11 +22,11 @@ class CNpcConveyorPlatform : public CNpcPlatform
{ {
public: public:
void postInit(); void postInit();
virtual void render(); void render();
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); int checkCollisionAgainst(CThing *_thisThing, int _frames);
protected: protected:
virtual void processMovement( int _frames ); void processMovement( int _frames );
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
u8 m_spinFinish; u8 m_spinFinish;
s16 m_rotation; s16 m_rotation;
@ -35,10 +35,10 @@ protected:
class CNpcConveyorPlatformGenerator : public CNpcPlatform class CNpcConveyorPlatformGenerator : public CNpcPlatform
{ {
public: public:
virtual void render(); void render();
protected: protected:
virtual void think( int _frames ); void think( int _frames );
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
}; };
#endif #endif

View File

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

View File

@ -24,15 +24,15 @@ public:
void setMaster( u8 isMaster ); void setMaster( u8 isMaster );
void setOtherPlatform( CNpcDualPlatform *other ); void setOtherPlatform( CNpcDualPlatform *other );
void setMovement( DVECTOR move ); void setMovement( DVECTOR move );
virtual u8 canDrop(); u8 canDrop();
void setLineBase( DVECTOR base ) {m_lineBase = base;} void setLineBase( DVECTOR base ) {m_lineBase = base;}
DVECTOR getLineBase() {return( m_lineBase );} DVECTOR getLineBase() {return( m_lineBase );}
virtual void render(); void render();
void setThinkArea( CRECT &newArea ); void setThinkArea( CRECT &newArea );
protected: protected:
virtual void setWaypoints( sThingPlatform *ThisPlatform ); void setWaypoints( sThingPlatform *ThisPlatform );
virtual void processMovement( int _frames ); void processMovement( int _frames );
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
u8 m_isMaster; u8 m_isMaster;
CNpcDualPlatform *m_otherPlatform; CNpcDualPlatform *m_otherPlatform;

View File

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

View File

@ -23,10 +23,10 @@ class CNpcFallingNoRespawnPlatform : public CNpcPlatform
public: public:
void postInit(); void postInit();
bool alwaysThink() {return(true);} bool alwaysThink() {return(true);}
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); int checkCollisionAgainst(CThing *_thisThing, int _frames);
protected: protected:
virtual void render(); void render();
virtual void processMovement( int _frames ); void processMovement( int _frames );
u8 m_spinFinish; u8 m_spinFinish;
s16 m_rotation; s16 m_rotation;

View File

@ -22,11 +22,11 @@ class CNpcFallingPlatformGenerator : public CNpcPlatform
{ {
public: public:
void setTargetType( NPC_PLATFORM_UNIT_TYPE targetType ) {m_targetType = targetType;} void setTargetType( NPC_PLATFORM_UNIT_TYPE targetType ) {m_targetType = targetType;}
virtual void render(); void render();
bool alwaysThink() {return(true);} bool alwaysThink() {return(true);}
protected: protected:
virtual void think( int _frames ); void think( int _frames );
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
NPC_PLATFORM_UNIT_TYPE m_targetType; NPC_PLATFORM_UNIT_TYPE m_targetType;
}; };

View File

@ -22,11 +22,11 @@ class CNpcFishHookPlatform : public CNpcPlatform
{ {
public: public:
virtual void postInit(); virtual void postInit();
virtual void render(); void render();
virtual CRECT const *getThinkBBox(); CRECT const *getThinkBBox();
protected: protected:
virtual void processLifetime( int _frames ); void processLifetime( int _frames );
virtual void processMovement( int _frames ); void processMovement( int _frames );
u8 m_isMoving; u8 m_isMoving;
u8 m_isResetting; u8 m_isResetting;

View File

@ -23,8 +23,8 @@ class CNpcGeyserBubblePlatform : public CNpcBubblePlatform
public: public:
void postInit(); void postInit();
protected: protected:
virtual void processMovement( int _frames ); void processMovement( int _frames );
virtual void processLifetime( int _frames ); void processLifetime( int _frames );
}; };
#endif #endif

View File

@ -23,8 +23,8 @@ class CNpcGeyserPlatform : public CNpcPlatform
public: public:
void postInit(); void postInit();
protected: protected:
virtual void processMovement( int _frames ); void processMovement( int _frames );
virtual void processTimer( int _frames ); void processTimer( int _frames );
bool m_isFiring; bool m_isFiring;

View File

@ -22,9 +22,9 @@ class CNpcJellyfishPlatform : public CNpcLinearPlatform
{ {
public: public:
void postInit(); void postInit();
virtual void think( int _frames ); void think( int _frames );
protected: protected:
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
s32 m_vertScale; s32 m_vertScale;
u8 m_dipCount; u8 m_dipCount;

View File

@ -24,8 +24,8 @@ public:
void postInit(); void postInit();
bool alwaysThink() {return(true);} bool alwaysThink() {return(true);}
protected: protected:
virtual void setWaypoints( sThingPlatform *ThisPlatform ); void setWaypoints( sThingPlatform *ThisPlatform );
virtual void processMovement( int _frames ); void processMovement( int _frames );
s32 m_length; s32 m_length;
s32 m_maxExtension; s32 m_maxExtension;

View File

@ -23,7 +23,7 @@ class CNpcLeafPlatform : public CNpcPlatform
public: public:
void postInit(); void postInit();
protected: protected:
virtual void processMovement( int _frames ); void processMovement( int _frames );
u8 m_isActivated; u8 m_isActivated;
}; };

View File

@ -22,11 +22,11 @@ class CNpcLiftPlatform : public CNpcPlatform
{ {
public: public:
void postInit(); void postInit();
virtual void setWaypoints( sThingPlatform *ThisPlatform ); void setWaypoints( sThingPlatform *ThisPlatform );
protected: protected:
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
virtual void processMovement( int _frames ); void processMovement( int _frames );
virtual void processTimer( int _frames ); void processTimer( int _frames );
u8 m_isActivated; u8 m_isActivated;
u8 m_returning; u8 m_returning;

View File

@ -23,7 +23,7 @@ class CNpcLinearPlatform : public CNpcPlatform
public: public:
virtual void postInit(); virtual void postInit();
protected: protected:
virtual void processMovement( int _frames ); void processMovement( int _frames );
}; };
#endif #endif

View File

@ -22,10 +22,10 @@ class CNpcPendulumPlatform : public CNpcPlatform
{ {
public: public:
void postInit(); void postInit();
virtual void render(); void render();
protected: protected:
virtual void setWaypoints( sThingPlatform *ThisPlatform ); void setWaypoints( sThingPlatform *ThisPlatform );
virtual void processMovement( int _frames ); void processMovement( int _frames );
s32 m_length; s32 m_length;
s32 m_maxExtension; s32 m_maxExtension;

View File

@ -21,9 +21,9 @@
class CNpcPlayerBubblePlatform : public CNpcBubblePlatform class CNpcPlayerBubblePlatform : public CNpcBubblePlatform
{ {
public: public:
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
protected: protected:
virtual void processLifetime( int _frames ); void processLifetime( int _frames );
}; };
#endif #endif

View File

@ -22,9 +22,9 @@ class CNpcRaftPlatform : public CNpcPlatform
{ {
public: public:
void postInit(); void postInit();
virtual void render(); void render();
protected: protected:
virtual void processMovement( int _frames ); void processMovement( int _frames );
u8 m_isActivated; u8 m_isActivated;
u8 m_isSinking; u8 m_isSinking;

View File

@ -22,11 +22,11 @@ class CNpcRisingBridgePlatform : public CNpcPlatform
{ {
public: public:
void postInit(); void postInit();
virtual void trigger(); void trigger();
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} 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 );
s32 m_maxExtension; s32 m_maxExtension;
u8 m_triggered; u8 m_triggered;

View File

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

View File

@ -21,12 +21,12 @@
class CNpcSteerableBarrelPlatform : public CNpcPlatform class CNpcSteerableBarrelPlatform : public CNpcPlatform
{ {
public: public:
virtual void render(); void render();
void postInit(); void postInit();
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
protected: protected:
virtual void processMovement( int _frames ); virtual void processMovement( int _frames );
virtual void collidedWith(CThing *_thisThing); void collidedWith(CThing *_thisThing);
s16 m_rotation; s16 m_rotation;
s32 m_currentSpeed; s32 m_currentSpeed;

View File

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

View File

@ -21,7 +21,7 @@
class CNpcSteerableOildrumPlatform : public CNpcSteerableBarrelPlatform class CNpcSteerableOildrumPlatform : public CNpcSteerableBarrelPlatform
{ {
protected: protected:
virtual void processMovement( int _frames ); void processMovement( int _frames );
}; };
#endif #endif

View File

@ -26,10 +26,10 @@ class CNpcSteamSwitchPlatform : public CNpcPlatform
{ {
public: public:
void postInit(); void postInit();
virtual void setWaypoints( sThingPlatform *ThisPlatform ); void setWaypoints( sThingPlatform *ThisPlatform );
protected: protected:
virtual void processMovement( int _frames ); void processMovement( int _frames );
virtual void processTimer( int _frames ); void processTimer( int _frames );
enum NPC_STEAM_SWITCH_STATE enum NPC_STEAM_SWITCH_STATE
{ {

View File

@ -24,11 +24,11 @@ public:
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(); void render();
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} 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 );
DVECTOR m_triggerPos; DVECTOR m_triggerPos;
u8 m_triggered; u8 m_triggered;