From 7478d3483b0dc741cafff930dbcc842684653078 Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 4 Jul 2001 14:26:36 +0000 Subject: [PATCH] --- source/enemy/nanemone.h | 18 +++++++++--------- source/enemy/nbblob.h | 2 +- source/enemy/nbooger.h | 4 ++-- source/enemy/nboss.h | 2 +- source/enemy/nbuttfly.h | 8 ++++---- source/enemy/nclam.h | 24 ++++++++++++------------ source/enemy/ndogfish.h | 18 +++++++++--------- source/enemy/ndustdev.h | 6 +++--- source/enemy/neyeball.h | 16 ++++++++-------- source/enemy/nfdutch.h | 14 +++++++------- source/enemy/nffolk.h | 2 +- source/enemy/nfskull.h | 6 +++--- source/enemy/ngpirate.h | 4 ++-- source/enemy/nhcrab.h | 6 +++--- source/enemy/nmjfish.h | 10 +++++----- source/enemy/nocto.h | 6 +++--- source/enemy/npbug.h | 2 +- source/enemy/nprojjf.h | 2 +- source/enemy/npuffa.h | 4 ++-- source/enemy/nshell.h | 8 ++++---- source/enemy/nshrkman.h | 4 ++-- source/enemy/nsj2back.h | 4 ++-- source/enemy/nsjback.h | 10 +++++----- source/enemy/nsjfish.h | 4 ++-- source/enemy/nsklfish.h | 6 +++--- source/enemy/nsshark.h | 12 ++++++------ source/enemy/nssnake.h | 20 ++++++++++---------- source/enemy/nsstomp.h | 8 ++++---- source/enemy/nworm.h | 14 +++++++------- source/friend/fkrusty.h | 2 +- source/friend/fpatrick.h | 2 +- source/friend/fsandy.h | 2 +- source/friend/fsquid.h | 4 ++-- source/hazard/hbbarrel.h | 2 +- source/hazard/hboat.h | 4 ++-- source/hazard/hbrock.h | 6 +++--- source/hazard/hbwheel.h | 4 ++-- source/hazard/hcsaw.h | 2 +- source/hazard/hcswitch.h | 8 ++++---- source/hazard/hfalling.h | 4 ++-- source/hazard/hfan.h | 2 +- source/hazard/hflytrap.h | 4 ++-- source/hazard/hinert.h | 4 ++-- source/hazard/hlog.h | 2 +- source/hazard/hmasher.h | 2 +- source/hazard/hmower.h | 2 +- source/hazard/hpendulm.h | 4 ++-- source/hazard/hpswitch.h | 4 ++-- source/hazard/hrckshrd.h | 2 +- source/hazard/hrweight.h | 8 ++++---- source/hazard/hrwheel.h | 8 ++++---- source/hazard/hspikes.h | 2 +- source/hazard/hsrdfish.h | 2 +- source/platform/pbaloon.h | 4 ++-- source/platform/pbgeyser.h | 6 +++--- source/platform/pbob.h | 2 +- source/platform/pbounce.h | 4 ++-- source/platform/pbranch.h | 10 +++++----- source/platform/pbubtube.h | 8 ++++---- source/platform/pbwheel.h | 6 +++--- source/platform/pcart.h | 12 ++++++------ source/platform/pcbubble.h | 4 ++-- source/platform/pcirculr.h | 2 +- source/platform/pclam.h | 4 ++-- source/platform/pconveyr.h | 14 +++++++------- source/platform/pdrop.h | 2 +- source/platform/pdual.h | 10 +++++----- source/platform/pfalling.h | 2 +- source/platform/pfallnor.h | 6 +++--- source/platform/pfgen.h | 6 +++--- source/platform/pfishhk.h | 8 ++++---- source/platform/pgbubble.h | 4 ++-- source/platform/pgeyser.h | 4 ++-- source/platform/pjellfsh.h | 4 ++-- source/platform/plantern.h | 4 ++-- source/platform/pleaf.h | 2 +- source/platform/plift.h | 8 ++++---- source/platform/plinear.h | 2 +- source/platform/ppendulm.h | 6 +++--- source/platform/pplayer.h | 4 ++-- source/platform/praft.h | 4 ++-- source/platform/prbridge.h | 8 ++++---- source/platform/pretract.h | 2 +- source/platform/psbarrel.h | 6 +++--- source/platform/pseesaw.h | 6 +++--- source/platform/psoil.h | 2 +- source/platform/psswitch.h | 6 +++--- source/platform/ptrpdoor.h | 8 ++++---- 88 files changed, 260 insertions(+), 260 deletions(-) diff --git a/source/enemy/nanemone.h b/source/enemy/nanemone.h index f2e1ae126..cba01897a 100644 --- a/source/enemy/nanemone.h +++ b/source/enemy/nanemone.h @@ -24,8 +24,8 @@ public: virtual void postInit(); void setHeading( s32 xPos, s32 yPos ); protected: - virtual void processEnemyCollision( CThing *thisThing ); - virtual bool processSensor(); + void processEnemyCollision( CThing *thisThing ); + bool processSensor(); s32 m_fireHeading; }; @@ -33,7 +33,7 @@ protected: class CNpcAnemone1Enemy : public CNpcAnemoneEnemy { protected: - virtual void processClose( int _frames ); + void processClose( int _frames ); }; class CNpcAnemone2Enemy : public CNpcAnemoneEnemy @@ -41,12 +41,12 @@ class CNpcAnemone2Enemy : public CNpcAnemoneEnemy public: void postInit(); void shutdown(); - virtual void render(); + void render(); protected: - virtual void processClose( int _frames ); - virtual void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange ); - virtual void processShotDeathStart( int _frames ); - virtual void processShotDeathEnd( int _frames ); + void processClose( int _frames ); + void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange ); + void processShotDeathStart( int _frames ); + void processShotDeathEnd( int _frames ); u16 m_scaleX, m_scaleY; @@ -62,7 +62,7 @@ protected: class CNpcAnemone3Enemy : public CNpcAnemoneEnemy { protected: - virtual void processClose( int _frames ); + void processClose( int _frames ); }; #endif \ No newline at end of file diff --git a/source/enemy/nbblob.h b/source/enemy/nbblob.h index 6bc7d3650..9c610f2d7 100644 --- a/source/enemy/nbblob.h +++ b/source/enemy/nbblob.h @@ -19,7 +19,7 @@ class CNpcBallBlobEnemy : public CNpcEnemy public: void postInit(); protected: - virtual void processMovement( int _frames ); + void processMovement( int _frames ); DVECTOR m_velocity; }; diff --git a/source/enemy/nbooger.h b/source/enemy/nbooger.h index 0ac4f1567..f005c51ed 100644 --- a/source/enemy/nbooger.h +++ b/source/enemy/nbooger.h @@ -17,8 +17,8 @@ class CNpcBoogerMonsterEnemy : public CNpcEnemy { protected: - virtual bool processSensor(); - virtual void processClose( int _frames ); + bool processSensor(); + void processClose( int _frames ); enum { diff --git a/source/enemy/nboss.h b/source/enemy/nboss.h index 0c14248ec..1eaf78196 100644 --- a/source/enemy/nboss.h +++ b/source/enemy/nboss.h @@ -27,7 +27,7 @@ public: virtual void postInit(); virtual void shutdown(); protected: - virtual void addHealthMeter(); + void addHealthMeter(); bool m_meterOn; CFXNRGBar *m_energyBar; diff --git a/source/enemy/nbuttfly.h b/source/enemy/nbuttfly.h index 8998f6616..271da19d7 100644 --- a/source/enemy/nbuttfly.h +++ b/source/enemy/nbuttfly.h @@ -25,11 +25,11 @@ class CNpcButterflyBackgroundEnemy : public CNpcSmallJellyfishBackgroundEnemy { public: - virtual void render(); - virtual int getFrameCount() {return( FRM_BUTTERFLY_FLAP04 - FRM_BUTTERFLY_FLAP01 + 1 );} - virtual u8 canBeCaughtByNet() {return( false );} + void render(); + int getFrameCount() {return( FRM_BUTTERFLY_FLAP04 - FRM_BUTTERFLY_FLAP01 + 1 );} + u8 canBeCaughtByNet() {return( false );} 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 diff --git a/source/enemy/nclam.h b/source/enemy/nclam.h index e67603000..bccddb495 100644 --- a/source/enemy/nclam.h +++ b/source/enemy/nclam.h @@ -19,9 +19,9 @@ class CNpcClamEnemy : public CNpcEnemy public: u8 canCollideWithEnemy() {return( false );} protected: - virtual void processUserCollision( CThing *thisThing ); - virtual void processEnemyCollision( CThing *thisThing ); - virtual bool processSensor(); + void processUserCollision( CThing *thisThing ); + void processEnemyCollision( CThing *thisThing ); + bool processSensor(); }; class CNpcJumpingClamEnemy : public CNpcClamEnemy @@ -29,8 +29,8 @@ class CNpcJumpingClamEnemy : public CNpcClamEnemy public: void postInit(); protected: - virtual void processClose( int _frames ); - virtual void setupWaypoints( sThingActor *ThisActor ); + void processClose( int _frames ); + void setupWaypoints( sThingActor *ThisActor ); s32 m_maxExtension; }; @@ -39,14 +39,14 @@ class CNpcStaticClamEnemy : public CNpcClamEnemy { public: void postInit(); - virtual u8 hasBeenAttacked() {return( false );} - virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} + u8 hasBeenAttacked() {return( false );} + CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} protected: - virtual s32 getFrameShift( int _frames ); - virtual void collidedWith(CThing *_thisThing); - virtual void processClose( int _frames ); - virtual void processCollision(); - virtual void processAnimFrames( int _frames ); + s32 getFrameShift( int _frames ); + void collidedWith(CThing *_thisThing); + void processClose( int _frames ); + void processCollision(); + void processAnimFrames( int _frames ); s32 m_isStunned; }; diff --git a/source/enemy/ndogfish.h b/source/enemy/ndogfish.h index ba56d855b..e14e17931 100644 --- a/source/enemy/ndogfish.h +++ b/source/enemy/ndogfish.h @@ -29,17 +29,17 @@ public: void render(); void shutdown(); protected: - virtual void processTimer( int _frames ); - virtual bool processSensor(); - virtual void processClose( int _frames ); - virtual void processMovement( int _frames ); + void processTimer( int _frames ); + bool processSensor(); + void processClose( int _frames ); + void processMovement( int _frames ); void processStandardIronDogfishAttack( int _frames ); void processWalkToUser( int _frames, int speed ); - virtual void processCollision(); - virtual void processAttackCollision(); - virtual void hasBeenSteamed( DVECTOR &steamPos ); - virtual void processShotDeathEnd( int _frames ); - virtual void collidedWith(CThing *_thisThing); + void processCollision(); + void processAttackCollision(); + void hasBeenSteamed( DVECTOR &steamPos ); + void processShotDeathEnd( int _frames ); + void collidedWith(CThing *_thisThing); enum NPC_IRON_DOGFISH_STATE { diff --git a/source/enemy/ndustdev.h b/source/enemy/ndustdev.h index 542716d98..acf856952 100644 --- a/source/enemy/ndustdev.h +++ b/source/enemy/ndustdev.h @@ -19,9 +19,9 @@ class CNpcDustDevilEnemy : public CNpcEnemy public: void postInit(); protected: - virtual s32 getFrameShift( int _frames ); - virtual void processMovement( int _frames ); - virtual void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange ); + s32 getFrameShift( int _frames ); + void processMovement( int _frames ); + void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange ); }; #endif \ No newline at end of file diff --git a/source/enemy/neyeball.h b/source/enemy/neyeball.h index e519fe7ee..b5c76a7db 100644 --- a/source/enemy/neyeball.h +++ b/source/enemy/neyeball.h @@ -17,17 +17,17 @@ class CNpcEyeballEnemy : public CNpcEnemy { public: - virtual void render(); + void render(); void postInit(); void shutdown(); - virtual int getFrameCount() {return( 1 );} - virtual void processEvent( GAME_EVENT evt, CThing *sourceThing ); + int getFrameCount() {return( 1 );} + void processEvent( GAME_EVENT evt, CThing *sourceThing ); protected: - virtual void processEnemyCollision( CThing *thisThing ); - virtual bool processSensor(); - virtual void processClose( int _frames ); - virtual void processShotDeathStart( int _frames ); - virtual void processShotDeathEnd( int _frames ); + void processEnemyCollision( CThing *thisThing ); + bool processSensor(); + void processClose( int _frames ); + void processShotDeathStart( int _frames ); + void processShotDeathEnd( int _frames ); s32 m_fireHeading; diff --git a/source/enemy/nfdutch.h b/source/enemy/nfdutch.h index 5853ff8c0..8c0078739 100644 --- a/source/enemy/nfdutch.h +++ b/source/enemy/nfdutch.h @@ -22,17 +22,17 @@ class CNpcFlyingDutchmanEnemy : public CNpcBossEnemy { public: - virtual void think( int _frames ); + void think( int _frames ); void postInit(); void render(); void shutdown(); - virtual u8 hasBeenAttacked(); + u8 hasBeenAttacked(); protected: - virtual void processClose( int _frames ); - virtual void processMovement( int _frames ); - virtual void processShotRecoil( int _frames ); - virtual void processShotDeathEnd( int _frames ); - virtual void collidedWith(CThing *_thisThing); + void processClose( int _frames ); + void processMovement( int _frames ); + void processShotRecoil( int _frames ); + void processShotDeathEnd( int _frames ); + void collidedWith(CThing *_thisThing); enum NPC_FLYING_DUTCHMAN_STATE { diff --git a/source/enemy/nffolk.h b/source/enemy/nffolk.h index 82549e1d4..7c0601be5 100644 --- a/source/enemy/nffolk.h +++ b/source/enemy/nffolk.h @@ -19,7 +19,7 @@ class CNpcFishFolk : public CNpcEnemy public: void postInit(); 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 \ No newline at end of file diff --git a/source/enemy/nfskull.h b/source/enemy/nfskull.h index 956921274..d6d0a53e1 100644 --- a/source/enemy/nfskull.h +++ b/source/enemy/nfskull.h @@ -18,9 +18,9 @@ class CNpcFlamingSkullEnemy : public CNpcEnemy { void postInit(); protected: - virtual void processEnemyCollision( CThing *thisThing ); - virtual bool processSensor(); - virtual void processClose( int _frames ); + void processEnemyCollision( CThing *thisThing ); + bool processSensor(); + void processClose( int _frames ); s32 m_fireHeading; diff --git a/source/enemy/ngpirate.h b/source/enemy/ngpirate.h index 0da3f56d0..70daca23c 100644 --- a/source/enemy/ngpirate.h +++ b/source/enemy/ngpirate.h @@ -19,8 +19,8 @@ class CNpcGhostPirateEnemy : public CNpcEnemy public: void postInit(); protected: - virtual bool processSensor(); - virtual void processClose( int _frames ); + bool processSensor(); + void processClose( int _frames ); }; #endif \ No newline at end of file diff --git a/source/enemy/nhcrab.h b/source/enemy/nhcrab.h index 78a85ee76..b2bb5d553 100644 --- a/source/enemy/nhcrab.h +++ b/source/enemy/nhcrab.h @@ -23,9 +23,9 @@ class CNpcHermitCrabEnemy : public CNpcEnemy public: void postInit(); protected: - virtual void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange ); - virtual bool processSensor(); - virtual void processClose( int _frames ); + void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange ); + bool processSensor(); + void processClose( int _frames ); s32 m_jumpBase; diff --git a/source/enemy/nmjfish.h b/source/enemy/nmjfish.h index ac3c54d3c..a67d04561 100644 --- a/source/enemy/nmjfish.h +++ b/source/enemy/nmjfish.h @@ -30,12 +30,12 @@ public: void postInit(); void render(); void shutdown(); - virtual void setupWaypoints( sThingActor *ThisActor ); + void setupWaypoints( sThingActor *ThisActor ); protected: - virtual void processClose( int _frames ); - virtual void processMovement( int _frames ); - virtual void processShot( int _frames ); - virtual void collidedWith(CThing *_thisThing); + void processClose( int _frames ); + void processMovement( int _frames ); + void processShot( int _frames ); + void collidedWith(CThing *_thisThing); //void spawnJellyfish( int _frames ); //virtual void processUserCollision( CThing *thisThing ); diff --git a/source/enemy/nocto.h b/source/enemy/nocto.h index 09dd2d955..bdd9769f4 100644 --- a/source/enemy/nocto.h +++ b/source/enemy/nocto.h @@ -17,9 +17,9 @@ class CNpcBabyOctopusEnemy : public CNpcEnemy { protected: - virtual bool processSensor(); - virtual void processClose( int _frames ); - virtual void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange ); + bool processSensor(); + void processClose( int _frames ); + void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange ); enum { diff --git a/source/enemy/npbug.h b/source/enemy/npbug.h index fbf93d277..aa208aacc 100644 --- a/source/enemy/npbug.h +++ b/source/enemy/npbug.h @@ -21,7 +21,7 @@ class CNpcPricklyBugEnemy : public CNpcEnemy { 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 diff --git a/source/enemy/nprojjf.h b/source/enemy/nprojjf.h index 0b331e464..ffb2485e2 100644 --- a/source/enemy/nprojjf.h +++ b/source/enemy/nprojjf.h @@ -26,7 +26,7 @@ class CNpcSmallJellyfishProjectileEnemy : public CNpcSmallJellyfishEnemy { public: void postInit(); - virtual void think(int _frames); + void think(int _frames); protected: s32 m_lifetime; }; diff --git a/source/enemy/npuffa.h b/source/enemy/npuffa.h index cc89e213d..d08d914de 100644 --- a/source/enemy/npuffa.h +++ b/source/enemy/npuffa.h @@ -17,8 +17,8 @@ class CNpcPuffaFishEnemy : public CNpcEnemy { protected: - virtual bool processSensor(); - virtual void processClose( int _frames ); + bool processSensor(); + void processClose( int _frames ); enum NPC_PUFFA_FISH_STATE { diff --git a/source/enemy/nshell.h b/source/enemy/nshell.h index 877e8bf2b..23f6a6fe1 100644 --- a/source/enemy/nshell.h +++ b/source/enemy/nshell.h @@ -22,10 +22,10 @@ class CNpcShellEnemy : public CNpcEnemy { public: void postInit(); - virtual void render(); - virtual int getFrameCount() {return( 1 );} - virtual int getFrame() {return( m_shellType );} - virtual u8 hasBeenAttacked() {return( false );} + void render(); + int getFrameCount() {return( 1 );} + int getFrame() {return( m_shellType );} + u8 hasBeenAttacked() {return( false );} protected: virtual void collidedWith(CThing *_thisThing); diff --git a/source/enemy/nshrkman.h b/source/enemy/nshrkman.h index ab9321e14..fac01108a 100644 --- a/source/enemy/nshrkman.h +++ b/source/enemy/nshrkman.h @@ -17,8 +17,8 @@ class CNpcSharkManEnemy : public CNpcEnemy { protected: - virtual void processClose( int _frames ); - virtual void processMovement( int _frames ); + void processClose( int _frames ); + void processMovement( int _frames ); }; #endif \ No newline at end of file diff --git a/source/enemy/nsj2back.h b/source/enemy/nsj2back.h index cb7f859a6..74d7baa74 100644 --- a/source/enemy/nsj2back.h +++ b/source/enemy/nsj2back.h @@ -22,9 +22,9 @@ class CNpcSmallJellyfish2BackgroundEnemy : public CNpcSmallJellyfishBackgroundEn { public: void postInit(); - virtual void render(); + void render(); protected: - virtual void collidedWith(CThing *_thisThing); + void collidedWith(CThing *_thisThing); }; #endif diff --git a/source/enemy/nsjback.h b/source/enemy/nsjback.h index 9212b77c6..ef453dede 100644 --- a/source/enemy/nsjback.h +++ b/source/enemy/nsjback.h @@ -24,12 +24,12 @@ public: virtual void render(); virtual void postInit(); void shutdown(); - virtual void setTargetHeading( s16 newTargetHeading ) {m_targetHeading = newTargetHeading;} - virtual u8 hasBeenAttacked(); + void setTargetHeading( s16 newTargetHeading ) {m_targetHeading = newTargetHeading;} + u8 hasBeenAttacked(); protected: - virtual bool processSensor(); - virtual void processMovement( int _frames ); - virtual void processUserCollision( CThing *thisThing ); + bool processSensor(); + void processMovement( int _frames ); + void processUserCollision( CThing *thisThing ); virtual void collidedWith(CThing *_thisThing); s16 m_targetHeading; diff --git a/source/enemy/nsjfish.h b/source/enemy/nsjfish.h index ee309b4ea..2bc6baff7 100644 --- a/source/enemy/nsjfish.h +++ b/source/enemy/nsjfish.h @@ -26,12 +26,12 @@ class CNpcSmallJellyfishEnemy : public CNpcEnemy { public: virtual void postInit(); - void render(); + virtual void render(); int getFrameCount() {return( FRM_JELLYFISH1_SWIM7 - FRM_JELLYFISH1_SWIM1 + 1 );} u8 canCollideWithEnemy() {return( false );} CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} protected: - bool processSensor(); + virtual bool processSensor(); void processClose( int _frames ); void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange ); void fireAsProjectile( s16 heading ); diff --git a/source/enemy/nsklfish.h b/source/enemy/nsklfish.h index 5312633c4..d2f29ac92 100644 --- a/source/enemy/nsklfish.h +++ b/source/enemy/nsklfish.h @@ -17,9 +17,9 @@ class CNpcSkeletalFishEnemy : public CNpcEnemy { protected: - virtual bool processSensor(); - virtual void processClose( int _frames ); - virtual s32 getFrameShift( int _frames ); + bool processSensor(); + void processClose( int _frames ); + s32 getFrameShift( int _frames ); s32 m_chargeTime; diff --git a/source/enemy/nsshark.h b/source/enemy/nsshark.h index 574bdff22..5be33d42e 100644 --- a/source/enemy/nsshark.h +++ b/source/enemy/nsshark.h @@ -26,17 +26,17 @@ class CNpcSubSharkEnemy : public CNpcBossEnemy { public: - virtual void think( int _frames ); + void think( int _frames ); void postInit(); void render(); void shutdown(); protected: //virtual void processClose( int _frames ); - virtual s32 getFrameShift( int _frames ); - virtual void processMovement( int _frames ); - virtual void processShot( int _frames ); - virtual void collidedWith(CThing *_thisThing); - virtual void setupWaypoints( sThingActor *ThisActor ); + s32 getFrameShift( int _frames ); + void processMovement( int _frames ); + void processShot( int _frames ); + void collidedWith(CThing *_thisThing); + void setupWaypoints( sThingActor *ThisActor ); enum NPC_SUB_SHARK_STATE { diff --git a/source/enemy/nssnake.h b/source/enemy/nssnake.h index 15b04ce09..280d93e4f 100644 --- a/source/enemy/nssnake.h +++ b/source/enemy/nssnake.h @@ -58,20 +58,20 @@ class CNpcSeaSnakeEnemy : public CNpcBossEnemy public: void postInit(); void shutdown(); - virtual void render(); - virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); + void render(); + int checkCollisionAgainst(CThing *_thisThing, int _frames); protected: - virtual s32 getFrameShift( int _frames ); - virtual bool processSensor(); - virtual void processClose( int _frames ); - virtual void processMovement( int _frames ); - virtual void processShot( int _frames ); - virtual void processEnemyCollision( CThing *thisThing ); - virtual void processUserCollision( CThing *thisThing ); + s32 getFrameShift( int _frames ); + bool processSensor(); + void processClose( int _frames ); + void processMovement( int _frames ); + void processShot( int _frames ); + void processEnemyCollision( CThing *thisThing ); + void processUserCollision( CThing *thisThing ); u8 processPathMove( int _frames, s32 *moveX, s32 *moveY, s32 *moveVel, s32 *moveDist ); u8 isSnakeStopped(); void moveEntireSnake( DVECTOR newPos ); - virtual void addHealthMeter(); + void addHealthMeter(); enum { diff --git a/source/enemy/nsstomp.h b/source/enemy/nsstomp.h index e5fde37d1..7aa0e67f6 100644 --- a/source/enemy/nsstomp.h +++ b/source/enemy/nsstomp.h @@ -19,10 +19,10 @@ class CNpcSkullStomperEnemy : public CNpcEnemy public: void postInit(); protected: - virtual void processEnemyCollision( CThing *thisThing ); - virtual bool processSensor(); - virtual void processClose( int _frames ); - virtual void collidedWith(CThing *_thisThing); + void processEnemyCollision( CThing *thisThing ); + bool processSensor(); + void processClose( int _frames ); + void collidedWith(CThing *_thisThing); }; #endif \ No newline at end of file diff --git a/source/enemy/nworm.h b/source/enemy/nworm.h index d1fd42c61..1ae0e0228 100644 --- a/source/enemy/nworm.h +++ b/source/enemy/nworm.h @@ -53,15 +53,15 @@ class CNpcParasiticWormEnemy : public CNpcEnemy public: void postInit(); void shutdown(); - virtual void render(); - virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); + void render(); + int checkCollisionAgainst(CThing *_thisThing, int _frames); protected: - virtual bool processSensor(); - virtual void processClose( int _frames ); - virtual void processMovement( int _frames ); - virtual void processShotDeathEnd( int _frames ); + bool processSensor(); + void processClose( int _frames ); + void processMovement( int _frames ); + void processShotDeathEnd( int _frames ); //void resetParasiticWormHeadToTail(); - virtual void processEnemyCollision( CThing *thisThing ); + void processEnemyCollision( CThing *thisThing ); enum { diff --git a/source/friend/fkrusty.h b/source/friend/fkrusty.h index b04ad256f..c2e06f826 100644 --- a/source/friend/fkrusty.h +++ b/source/friend/fkrusty.h @@ -23,7 +23,7 @@ class CNpcKrustyFriend : public CNpcFriend public: void postInit(); protected: - virtual void startConderversation(); + void startConderversation(); FileEquate m_conversation; }; diff --git a/source/friend/fpatrick.h b/source/friend/fpatrick.h index fa2448d48..8abc557a3 100644 --- a/source/friend/fpatrick.h +++ b/source/friend/fpatrick.h @@ -23,7 +23,7 @@ class CNpcPatrickFriend : public CNpcFriend public: void postInit(); protected: - virtual void startConderversation(); + void startConderversation(); FileEquate m_conversation; }; diff --git a/source/friend/fsandy.h b/source/friend/fsandy.h index 928bb2699..5aaedf593 100644 --- a/source/friend/fsandy.h +++ b/source/friend/fsandy.h @@ -23,7 +23,7 @@ class CNpcSandyFriend : public CNpcFriend public: void postInit(); protected: - virtual void startConderversation(); + void startConderversation(); FileEquate m_conversation; }; diff --git a/source/friend/fsquid.h b/source/friend/fsquid.h index f1ed2151c..48a0bf1ea 100644 --- a/source/friend/fsquid.h +++ b/source/friend/fsquid.h @@ -21,10 +21,10 @@ class CNpcSquidwardFriend : public CNpcFriend { public: - virtual void think(int _frames); + void think(int _frames); void postInit(); protected: - virtual void startConderversation(); + void startConderversation(); FileEquate m_conversation; }; diff --git a/source/hazard/hbbarrel.h b/source/hazard/hbbarrel.h index 06780bc87..f12fc9779 100644 --- a/source/hazard/hbbarrel.h +++ b/source/hazard/hbbarrel.h @@ -25,7 +25,7 @@ public: void render(); protected: void processMovement( int _frames ); - virtual void collidedWith(CThing *_thisThing); + void collidedWith(CThing *_thisThing); DVECTOR m_lastWaypoint; diff --git a/source/hazard/hboat.h b/source/hazard/hboat.h index f2f455a06..28063c6b5 100644 --- a/source/hazard/hboat.h +++ b/source/hazard/hboat.h @@ -22,10 +22,10 @@ class CNpcBoatHazard : public CNpcHazard { public: void init(); - virtual void render(); + void render(); protected: void processMovement( int _frames ); - virtual void collidedWith(CThing *_thisThing); + void collidedWith(CThing *_thisThing); u8 m_reversed; }; diff --git a/source/hazard/hbrock.h b/source/hazard/hbrock.h index 1fff79971..52dae4afe 100644 --- a/source/hazard/hbrock.h +++ b/source/hazard/hbrock.h @@ -22,11 +22,11 @@ class CNpcBouncingRockHazard : public CNpcBouncingBarrelHazard { public: void init(); - virtual void setWaypoints( sThingHazard *ThisHazard ); - virtual void trigger(); + void setWaypoints( sThingHazard *ThisHazard ); + void trigger(); protected: void processMovement( int _frames ); - virtual void collidedWith(CThing *_thisThing); + void collidedWith(CThing *_thisThing); u8 m_isTriggered; }; diff --git a/source/hazard/hbwheel.h b/source/hazard/hbwheel.h index 21fa7dafd..7227cb8d1 100644 --- a/source/hazard/hbwheel.h +++ b/source/hazard/hbwheel.h @@ -22,11 +22,11 @@ class CNpcBigWheelHazard : public CNpcHazard { public: void init(); - virtual void render(); + void render(); bool alwaysThink() {return(true);} protected: void processMovement( int _frames ); - virtual void collidedWith(CThing *_thisThing); + void collidedWith(CThing *_thisThing); s16 m_rotation; }; diff --git a/source/hazard/hcsaw.h b/source/hazard/hcsaw.h index 211564093..37ac48752 100644 --- a/source/hazard/hcsaw.h +++ b/source/hazard/hcsaw.h @@ -22,7 +22,7 @@ class CNpcCircularSawHazard : public CNpcHazard { public: void init(); - virtual void render(); + void render(); protected: void processMovement( int _frames ); diff --git a/source/hazard/hcswitch.h b/source/hazard/hcswitch.h index 27efba2cc..3bd32a6aa 100644 --- a/source/hazard/hcswitch.h +++ b/source/hazard/hcswitch.h @@ -21,12 +21,12 @@ class CNpcConveyorSwitchHazard : public CNpcHazard { public: - virtual void setWaypoints( sThingHazard *ThisHazard ); + void setWaypoints( sThingHazard *ThisHazard ); void init(); - virtual void render(); - virtual void trigger(); + void render(); + void trigger(); protected: - virtual void collidedWith(CThing *_thisThing) {} + void collidedWith(CThing *_thisThing) {} u8 m_reversed; DVECTOR m_conveyorPos; diff --git a/source/hazard/hfalling.h b/source/hazard/hfalling.h index 473d59949..96ecb86ec 100644 --- a/source/hazard/hfalling.h +++ b/source/hazard/hfalling.h @@ -22,12 +22,12 @@ class CNpcFallingHazard : public CNpcHazard { public: void init(); - virtual void setWaypoints( sThingHazard *ThisHazard ); + void setWaypoints( sThingHazard *ThisHazard ); void render(); protected: void processMovement( int _frames ); void processTimer( int _frames ); - virtual void collidedWith(CThing *_thisThing); + void collidedWith(CThing *_thisThing); s32 m_movementTimer; u8 m_bounceFinish; diff --git a/source/hazard/hfan.h b/source/hazard/hfan.h index 2047be955..dd0bc0d00 100644 --- a/source/hazard/hfan.h +++ b/source/hazard/hfan.h @@ -22,7 +22,7 @@ class CNpcFanHazard : public CNpcHazard { public: void init(); - virtual void render(); + void render(); protected: void processMovement( int _frames ); diff --git a/source/hazard/hflytrap.h b/source/hazard/hflytrap.h index 00414988c..3b5ec2834 100644 --- a/source/hazard/hflytrap.h +++ b/source/hazard/hflytrap.h @@ -22,10 +22,10 @@ class CNpcFlyTrapHazard : public CNpcHazard { public: void init(); - virtual void render(); + void render(); protected: void processMovement( int _frames ); - virtual void collidedWith(CThing *_thisThing); + void collidedWith(CThing *_thisThing); s16 m_rotation; u8 m_shut; diff --git a/source/hazard/hinert.h b/source/hazard/hinert.h index 6d46b384a..5d717a993 100644 --- a/source/hazard/hinert.h +++ b/source/hazard/hinert.h @@ -21,9 +21,9 @@ class CNpcInertHazard : public CNpcHazard { public: - virtual void render(); + void render(); protected: - virtual void collidedWith(CThing *_thisThing); + void collidedWith(CThing *_thisThing); }; #endif \ No newline at end of file diff --git a/source/hazard/hlog.h b/source/hazard/hlog.h index a2debb299..44e617d41 100644 --- a/source/hazard/hlog.h +++ b/source/hazard/hlog.h @@ -22,7 +22,7 @@ class CNpcLogHazard : public CNpcHazard { public: void init(); - virtual void setWaypoints( sThingHazard *ThisHazard ); + void setWaypoints( sThingHazard *ThisHazard ); protected: void processMovement( int _frames ); diff --git a/source/hazard/hmasher.h b/source/hazard/hmasher.h index 86a2421e4..c0a6897c2 100644 --- a/source/hazard/hmasher.h +++ b/source/hazard/hmasher.h @@ -22,7 +22,7 @@ class CNpcMasherHazard : public CNpcHazard { public: void init(); - virtual void setGraphic( sThingHazard *ThisHazard ); + void setGraphic( sThingHazard *ThisHazard ); protected: void processMovement( int _frames ); diff --git a/source/hazard/hmower.h b/source/hazard/hmower.h index 166227ca8..1f5a904bc 100644 --- a/source/hazard/hmower.h +++ b/source/hazard/hmower.h @@ -22,7 +22,7 @@ class CNpcMowerHazard : public CNpcHazard { public: void init(); - virtual void render(); + void render(); protected: void processMovement( int _frames ); diff --git a/source/hazard/hpendulm.h b/source/hazard/hpendulm.h index 02c01fe0f..ebd5b03dd 100644 --- a/source/hazard/hpendulm.h +++ b/source/hazard/hpendulm.h @@ -22,9 +22,9 @@ class CNpcPendulumHazard : public CNpcHazard { public: void init(); - virtual void render(); + void render(); protected: - virtual void setWaypoints( sThingHazard *ThisHazard ); + void setWaypoints( sThingHazard *ThisHazard ); void processMovement( int _frames ); s32 m_length; diff --git a/source/hazard/hpswitch.h b/source/hazard/hpswitch.h index 254c831f0..525d23212 100644 --- a/source/hazard/hpswitch.h +++ b/source/hazard/hpswitch.h @@ -31,8 +31,8 @@ public: bool alwaysThink() {return(true);} //virtual void render(); protected: - virtual void setWaypoints( sThingHazard *ThisHazard ); - virtual void collidedWith(CThing *_thisThing); + void setWaypoints( sThingHazard *ThisHazard ); + void collidedWith(CThing *_thisThing); DVECTOR m_triggerPos; CNpcTrapdoorPlatform *m_platform; diff --git a/source/hazard/hrckshrd.h b/source/hazard/hrckshrd.h index 4b397e699..92f5d9afc 100644 --- a/source/hazard/hrckshrd.h +++ b/source/hazard/hrckshrd.h @@ -22,7 +22,7 @@ class CNpcRockShardHazard : public CNpcHazard { public: void init(); - virtual CRECT const *getThinkBBox(); + CRECT const *getThinkBBox(); // virtual void setWaypoints( sThingHazard *ThisHazard ); protected: void processMovement( int _frames ); diff --git a/source/hazard/hrweight.h b/source/hazard/hrweight.h index 06976f2dd..bfe67defa 100644 --- a/source/hazard/hrweight.h +++ b/source/hazard/hrweight.h @@ -22,13 +22,13 @@ class CNpcRisingWeightHazard : public CNpcHazard { public: void init(); - virtual void render(); + void render(); DVECTOR const &getWheelPos() {return( m_wheelPos );} void setTriggered() {m_triggered = true;} - virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} + CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} protected: - virtual void setWaypoints( sThingHazard *ThisHazard ); - virtual void processMovement( int _frames ); + void setWaypoints( sThingHazard *ThisHazard ); + void processMovement( int _frames ); s32 m_maxExtension; DVECTOR m_wheelPos; diff --git a/source/hazard/hrwheel.h b/source/hazard/hrwheel.h index e160d8fc2..3fad31d6b 100644 --- a/source/hazard/hrwheel.h +++ b/source/hazard/hrwheel.h @@ -28,11 +28,11 @@ public: void init(); DVECTOR const &getWheelPos() {return( m_wheelPos );} void linkToWeight( CNpcRisingWeightHazard *weight ) {m_weight = weight;} - virtual void render(); - virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} + void render(); + CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} protected: - virtual void setWaypoints( sThingHazard *ThisHazard ); - virtual void collidedWith(CThing *_thisThing); + void setWaypoints( sThingHazard *ThisHazard ); + void collidedWith(CThing *_thisThing); DVECTOR m_wheelPos; CNpcRisingWeightHazard *m_weight; diff --git a/source/hazard/hspikes.h b/source/hazard/hspikes.h index 2fa9a801c..c513efdc1 100644 --- a/source/hazard/hspikes.h +++ b/source/hazard/hspikes.h @@ -24,7 +24,7 @@ public: void init(); bool alwaysThink() {return(true);} protected: - virtual void processTimer( int _frames ); + void processTimer( int _frames ); void processMovement( int _frames ); enum SPIKES_STATE diff --git a/source/hazard/hsrdfish.h b/source/hazard/hsrdfish.h index b050ce713..978b1204e 100644 --- a/source/hazard/hsrdfish.h +++ b/source/hazard/hsrdfish.h @@ -22,7 +22,7 @@ class CNpcSwordfishHazard : public CNpcFireballHazard { public: void render(); - virtual void setWaypoints( sThingHazard *ThisHazard ); + void setWaypoints( sThingHazard *ThisHazard ); }; #endif \ No newline at end of file diff --git a/source/platform/pbaloon.h b/source/platform/pbaloon.h index 7a4d11912..781fe6a45 100644 --- a/source/platform/pbaloon.h +++ b/source/platform/pbaloon.h @@ -25,7 +25,7 @@ public: void render(); void init(); void shutdown(); - virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); + int checkCollisionAgainst(CThing *_thisThing, int _frames); protected: DVECTOR Pos; }; @@ -36,7 +36,7 @@ public: void postInit(); void render(); void shutdown(); - virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} + CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} protected: void setWaypoints( sThingPlatform *ThisPlatform ); void processMovement( int _frames ); diff --git a/source/platform/pbgeyser.h b/source/platform/pbgeyser.h index bd05590cf..e9c3f3bf9 100644 --- a/source/platform/pbgeyser.h +++ b/source/platform/pbgeyser.h @@ -22,10 +22,10 @@ class CNpcGeyserPlatformGenerator : public CNpcPlatform { public: void setTargetType( NPC_PLATFORM_UNIT_TYPE targetType ) {m_targetType = targetType;} - virtual void render(); + void render(); protected: - virtual void think( int _frames ); - virtual void collidedWith(CThing *_thisThing); + void think( int _frames ); + void collidedWith(CThing *_thisThing); NPC_PLATFORM_UNIT_TYPE m_targetType; }; diff --git a/source/platform/pbob.h b/source/platform/pbob.h index 2d653fd85..c312f6cca 100644 --- a/source/platform/pbob.h +++ b/source/platform/pbob.h @@ -23,7 +23,7 @@ class CNpcBobbingPlatform : public CNpcPlatform public: void postInit(); protected: - virtual void processMovement( int _frames ); + void processMovement( int _frames ); enum NPC_BOB_STATE { diff --git a/source/platform/pbounce.h b/source/platform/pbounce.h index 3d8ab81f0..16249d1c4 100644 --- a/source/platform/pbounce.h +++ b/source/platform/pbounce.h @@ -22,8 +22,8 @@ class CNpcBouncePlatform : public CNpcPlatform { public: void postInit(); - virtual void think( int _frames ); - virtual void render(); + void think( int _frames ); + void render(); protected: s32 m_vertScale; s32 m_vertVelocity; diff --git a/source/platform/pbranch.h b/source/platform/pbranch.h index 1c8ab04b0..c3f94a08d 100644 --- a/source/platform/pbranch.h +++ b/source/platform/pbranch.h @@ -21,12 +21,12 @@ class CNpcBranchPlatform : public CNpcPlatform { public: - virtual void postInit(); - virtual void render(); - virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} + void postInit(); + void render(); + CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} protected: - virtual void setWaypoints( sThingPlatform *ThisPlatform ); - virtual void processMovement( int _frames ); + void setWaypoints( sThingPlatform *ThisPlatform ); + void processMovement( int _frames ); s32 m_angularVelocity; u8 m_reversed; diff --git a/source/platform/pbubtube.h b/source/platform/pbubtube.h index 294d1073b..4e7d9b205 100644 --- a/source/platform/pbubtube.h +++ b/source/platform/pbubtube.h @@ -22,11 +22,11 @@ class CNpcBubbleTubePlatform : public CNpcPlatform { public: void postInit(); - virtual void setWaypoints( sThingPlatform *ThisPlatform ); + void setWaypoints( sThingPlatform *ThisPlatform ); protected: - virtual void collidedWith(CThing *_thisThing); - virtual void processMovement( int _frames ); - virtual void processTimer( int _frames ); + void collidedWith(CThing *_thisThing); + void processMovement( int _frames ); + void processTimer( int _frames ); u8 m_isActivated; u8 m_returning; diff --git a/source/platform/pbwheel.h b/source/platform/pbwheel.h index 6e3c3ead9..81cd23d04 100644 --- a/source/platform/pbwheel.h +++ b/source/platform/pbwheel.h @@ -23,10 +23,10 @@ class CNpcBigWheelPlatform : public CNpcPlatform public: bool alwaysThink() {return(true);} 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: - virtual void setWaypoints( sThingPlatform *ThisPlatform ); - virtual void processMovement( int _frames ); + void setWaypoints( sThingPlatform *ThisPlatform ); + void processMovement( int _frames ); }; #endif \ No newline at end of file diff --git a/source/platform/pcart.h b/source/platform/pcart.h index c9a7bdde1..96e8ef3f0 100644 --- a/source/platform/pcart.h +++ b/source/platform/pcart.h @@ -21,13 +21,13 @@ class CNpcCartPlatform : public CNpcPlatform { public: - virtual void postInit(); - virtual void render(); - virtual u8 isCart() {return( true );} - virtual void jump(); + void postInit(); + void render(); + u8 isCart() {return( true );} + void jump(); protected: - virtual void processMovement( int _frames ); - virtual void collidedWith(CThing *_thisThing); + void processMovement( int _frames ); + void collidedWith(CThing *_thisThing); s32 m_carSpeed; u8 m_isActivated; diff --git a/source/platform/pcbubble.h b/source/platform/pcbubble.h index 7f57aef59..b6891bc2b 100644 --- a/source/platform/pcbubble.h +++ b/source/platform/pcbubble.h @@ -22,9 +22,9 @@ class CNpcCollapsingBubblePlatform : public CNpcBubblePlatform { public: void postInit(); - virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} + CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} protected: - virtual void processLifetime( int _frames ); + void processLifetime( int _frames ); u8 m_startCollapse; }; diff --git a/source/platform/pcirculr.h b/source/platform/pcirculr.h index 2f60935e4..18d81d4e5 100644 --- a/source/platform/pcirculr.h +++ b/source/platform/pcirculr.h @@ -23,7 +23,7 @@ class CNpcCircularPlatform : public CNpcPlatform public: void postInit(); protected: - virtual void processMovement( int _frames ); + void processMovement( int _frames ); }; #endif \ No newline at end of file diff --git a/source/platform/pclam.h b/source/platform/pclam.h index 051914874..3554d0b19 100644 --- a/source/platform/pclam.h +++ b/source/platform/pclam.h @@ -22,8 +22,8 @@ class CNpcClamPlatform : public CNpcPlatform { public: void postInit(); - virtual void render(); - virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} + void render(); + CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} //void setBBox(); }; diff --git a/source/platform/pconveyr.h b/source/platform/pconveyr.h index fad5dfa1a..7376bef4d 100644 --- a/source/platform/pconveyr.h +++ b/source/platform/pconveyr.h @@ -22,11 +22,11 @@ class CNpcConveyorPlatform : public CNpcPlatform { public: void postInit(); - virtual void render(); - virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); + void render(); + int checkCollisionAgainst(CThing *_thisThing, int _frames); protected: - virtual void processMovement( int _frames ); - virtual void collidedWith(CThing *_thisThing); + void processMovement( int _frames ); + void collidedWith(CThing *_thisThing); u8 m_spinFinish; s16 m_rotation; @@ -35,10 +35,10 @@ protected: class CNpcConveyorPlatformGenerator : public CNpcPlatform { public: - virtual void render(); + void render(); protected: - virtual void think( int _frames ); - virtual void collidedWith(CThing *_thisThing); + void think( int _frames ); + void collidedWith(CThing *_thisThing); }; #endif \ No newline at end of file diff --git a/source/platform/pdrop.h b/source/platform/pdrop.h index 5d9b56c95..3c6d73e1a 100644 --- a/source/platform/pdrop.h +++ b/source/platform/pdrop.h @@ -21,7 +21,7 @@ class CNpcDropPlatform : public CNpcPlatform { protected: - virtual void processMovement( int _frames ); + void processMovement( int _frames ); }; #endif \ No newline at end of file diff --git a/source/platform/pdual.h b/source/platform/pdual.h index c7594d20f..309697b5c 100644 --- a/source/platform/pdual.h +++ b/source/platform/pdual.h @@ -24,15 +24,15 @@ public: void setMaster( u8 isMaster ); void setOtherPlatform( CNpcDualPlatform *other ); void setMovement( DVECTOR move ); - virtual u8 canDrop(); + u8 canDrop(); void setLineBase( DVECTOR base ) {m_lineBase = base;} DVECTOR getLineBase() {return( m_lineBase );} - virtual void render(); + void render(); void setThinkArea( CRECT &newArea ); protected: - virtual void setWaypoints( sThingPlatform *ThisPlatform ); - virtual void processMovement( int _frames ); - virtual void collidedWith(CThing *_thisThing); + void setWaypoints( sThingPlatform *ThisPlatform ); + void processMovement( int _frames ); + void collidedWith(CThing *_thisThing); u8 m_isMaster; CNpcDualPlatform *m_otherPlatform; diff --git a/source/platform/pfalling.h b/source/platform/pfalling.h index 9c1397309..36a78e1b1 100644 --- a/source/platform/pfalling.h +++ b/source/platform/pfalling.h @@ -23,7 +23,7 @@ class CNpcFallingPlatform : public CNpcPlatform public: void postInit(); protected: - virtual void processMovement( int _frames ); + void processMovement( int _frames ); }; #endif \ No newline at end of file diff --git a/source/platform/pfallnor.h b/source/platform/pfallnor.h index 525f26850..c0a1546d3 100644 --- a/source/platform/pfallnor.h +++ b/source/platform/pfallnor.h @@ -23,10 +23,10 @@ class CNpcFallingNoRespawnPlatform : public CNpcPlatform public: void postInit(); bool alwaysThink() {return(true);} - virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); + int checkCollisionAgainst(CThing *_thisThing, int _frames); protected: - virtual void render(); - virtual void processMovement( int _frames ); + void render(); + void processMovement( int _frames ); u8 m_spinFinish; s16 m_rotation; diff --git a/source/platform/pfgen.h b/source/platform/pfgen.h index ecb28e7be..a028e2fd1 100644 --- a/source/platform/pfgen.h +++ b/source/platform/pfgen.h @@ -22,11 +22,11 @@ class CNpcFallingPlatformGenerator : public CNpcPlatform { public: void setTargetType( NPC_PLATFORM_UNIT_TYPE targetType ) {m_targetType = targetType;} - virtual void render(); + void render(); bool alwaysThink() {return(true);} protected: - virtual void think( int _frames ); - virtual void collidedWith(CThing *_thisThing); + void think( int _frames ); + void collidedWith(CThing *_thisThing); NPC_PLATFORM_UNIT_TYPE m_targetType; }; diff --git a/source/platform/pfishhk.h b/source/platform/pfishhk.h index 8283b542c..cec5a963f 100644 --- a/source/platform/pfishhk.h +++ b/source/platform/pfishhk.h @@ -22,11 +22,11 @@ class CNpcFishHookPlatform : public CNpcPlatform { public: virtual void postInit(); - virtual void render(); - virtual CRECT const *getThinkBBox(); + void render(); + CRECT const *getThinkBBox(); protected: - virtual void processLifetime( int _frames ); - virtual void processMovement( int _frames ); + void processLifetime( int _frames ); + void processMovement( int _frames ); u8 m_isMoving; u8 m_isResetting; diff --git a/source/platform/pgbubble.h b/source/platform/pgbubble.h index 09d88a2ab..db5d02b29 100644 --- a/source/platform/pgbubble.h +++ b/source/platform/pgbubble.h @@ -23,8 +23,8 @@ class CNpcGeyserBubblePlatform : public CNpcBubblePlatform public: void postInit(); protected: - virtual void processMovement( int _frames ); - virtual void processLifetime( int _frames ); + void processMovement( int _frames ); + void processLifetime( int _frames ); }; #endif \ No newline at end of file diff --git a/source/platform/pgeyser.h b/source/platform/pgeyser.h index c2eebb8f4..bc3d45521 100644 --- a/source/platform/pgeyser.h +++ b/source/platform/pgeyser.h @@ -23,8 +23,8 @@ class CNpcGeyserPlatform : public CNpcPlatform public: void postInit(); protected: - virtual void processMovement( int _frames ); - virtual void processTimer( int _frames ); + void processMovement( int _frames ); + void processTimer( int _frames ); bool m_isFiring; diff --git a/source/platform/pjellfsh.h b/source/platform/pjellfsh.h index c4404731b..a8684ea70 100644 --- a/source/platform/pjellfsh.h +++ b/source/platform/pjellfsh.h @@ -22,9 +22,9 @@ class CNpcJellyfishPlatform : public CNpcLinearPlatform { public: void postInit(); - virtual void think( int _frames ); + void think( int _frames ); protected: - virtual void collidedWith(CThing *_thisThing); + void collidedWith(CThing *_thisThing); s32 m_vertScale; u8 m_dipCount; diff --git a/source/platform/plantern.h b/source/platform/plantern.h index e2bb480e6..d2ad55d7e 100644 --- a/source/platform/plantern.h +++ b/source/platform/plantern.h @@ -24,8 +24,8 @@ public: void postInit(); bool alwaysThink() {return(true);} protected: - virtual void setWaypoints( sThingPlatform *ThisPlatform ); - virtual void processMovement( int _frames ); + void setWaypoints( sThingPlatform *ThisPlatform ); + void processMovement( int _frames ); s32 m_length; s32 m_maxExtension; diff --git a/source/platform/pleaf.h b/source/platform/pleaf.h index 8863e4613..ef5c40fb3 100644 --- a/source/platform/pleaf.h +++ b/source/platform/pleaf.h @@ -23,7 +23,7 @@ class CNpcLeafPlatform : public CNpcPlatform public: void postInit(); protected: - virtual void processMovement( int _frames ); + void processMovement( int _frames ); u8 m_isActivated; }; diff --git a/source/platform/plift.h b/source/platform/plift.h index c445a4abc..5868a0d45 100644 --- a/source/platform/plift.h +++ b/source/platform/plift.h @@ -22,11 +22,11 @@ class CNpcLiftPlatform : public CNpcPlatform { public: void postInit(); - virtual void setWaypoints( sThingPlatform *ThisPlatform ); + void setWaypoints( sThingPlatform *ThisPlatform ); protected: - virtual void collidedWith(CThing *_thisThing); - virtual void processMovement( int _frames ); - virtual void processTimer( int _frames ); + void collidedWith(CThing *_thisThing); + void processMovement( int _frames ); + void processTimer( int _frames ); u8 m_isActivated; u8 m_returning; diff --git a/source/platform/plinear.h b/source/platform/plinear.h index 300c9778f..8dda3ef7a 100644 --- a/source/platform/plinear.h +++ b/source/platform/plinear.h @@ -23,7 +23,7 @@ class CNpcLinearPlatform : public CNpcPlatform public: virtual void postInit(); protected: - virtual void processMovement( int _frames ); + void processMovement( int _frames ); }; #endif \ No newline at end of file diff --git a/source/platform/ppendulm.h b/source/platform/ppendulm.h index d623ca726..e64325a23 100644 --- a/source/platform/ppendulm.h +++ b/source/platform/ppendulm.h @@ -22,10 +22,10 @@ class CNpcPendulumPlatform : public CNpcPlatform { public: void postInit(); - virtual void render(); + void render(); protected: - virtual void setWaypoints( sThingPlatform *ThisPlatform ); - virtual void processMovement( int _frames ); + void setWaypoints( sThingPlatform *ThisPlatform ); + void processMovement( int _frames ); s32 m_length; s32 m_maxExtension; diff --git a/source/platform/pplayer.h b/source/platform/pplayer.h index f64335875..f0bd1863b 100644 --- a/source/platform/pplayer.h +++ b/source/platform/pplayer.h @@ -21,9 +21,9 @@ class CNpcPlayerBubblePlatform : public CNpcBubblePlatform { public: - virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} + CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} protected: - virtual void processLifetime( int _frames ); + void processLifetime( int _frames ); }; #endif \ No newline at end of file diff --git a/source/platform/praft.h b/source/platform/praft.h index 1c94ec5d0..bc958e9b9 100644 --- a/source/platform/praft.h +++ b/source/platform/praft.h @@ -22,9 +22,9 @@ class CNpcRaftPlatform : public CNpcPlatform { public: void postInit(); - virtual void render(); + void render(); protected: - virtual void processMovement( int _frames ); + void processMovement( int _frames ); u8 m_isActivated; u8 m_isSinking; diff --git a/source/platform/prbridge.h b/source/platform/prbridge.h index 3296b6561..05f9a559d 100644 --- a/source/platform/prbridge.h +++ b/source/platform/prbridge.h @@ -22,11 +22,11 @@ class CNpcRisingBridgePlatform : public CNpcPlatform { public: void postInit(); - virtual void trigger(); - virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} + void trigger(); + CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} protected: - virtual void setWaypoints( sThingPlatform *ThisPlatform ); - virtual void processMovement( int _frames ); + void setWaypoints( sThingPlatform *ThisPlatform ); + void processMovement( int _frames ); s32 m_maxExtension; u8 m_triggered; diff --git a/source/platform/pretract.h b/source/platform/pretract.h index da47be64b..338a8b93f 100644 --- a/source/platform/pretract.h +++ b/source/platform/pretract.h @@ -22,7 +22,7 @@ class CNpcRetractingPlatform : public CNpcPlatform { public: void postInit(); - virtual void render(); + void render(); protected: void processTimer( int _frames ); diff --git a/source/platform/psbarrel.h b/source/platform/psbarrel.h index 9cd466250..db31f4391 100644 --- a/source/platform/psbarrel.h +++ b/source/platform/psbarrel.h @@ -21,12 +21,12 @@ class CNpcSteerableBarrelPlatform : public CNpcPlatform { public: - virtual void render(); + void render(); void postInit(); - virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} + CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} protected: virtual void processMovement( int _frames ); - virtual void collidedWith(CThing *_thisThing); + void collidedWith(CThing *_thisThing); s16 m_rotation; s32 m_currentSpeed; diff --git a/source/platform/pseesaw.h b/source/platform/pseesaw.h index 89db34065..3dff2aebe 100644 --- a/source/platform/pseesaw.h +++ b/source/platform/pseesaw.h @@ -22,10 +22,10 @@ class CNpcSeesawPlatform : public CNpcPlatform { public: void postInit(); - virtual void render(); - virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} + void render(); + CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} protected: - virtual void processMovement( int _frames ); + void processMovement( int _frames ); s32 m_angularVelocity; s32 m_currentAngle; diff --git a/source/platform/psoil.h b/source/platform/psoil.h index 598a1f1e3..287820727 100644 --- a/source/platform/psoil.h +++ b/source/platform/psoil.h @@ -21,7 +21,7 @@ class CNpcSteerableOildrumPlatform : public CNpcSteerableBarrelPlatform { protected: - virtual void processMovement( int _frames ); + void processMovement( int _frames ); }; #endif \ No newline at end of file diff --git a/source/platform/psswitch.h b/source/platform/psswitch.h index 1fb0f40af..02bc0580e 100644 --- a/source/platform/psswitch.h +++ b/source/platform/psswitch.h @@ -26,10 +26,10 @@ class CNpcSteamSwitchPlatform : public CNpcPlatform { public: void postInit(); - virtual void setWaypoints( sThingPlatform *ThisPlatform ); + void setWaypoints( sThingPlatform *ThisPlatform ); protected: - virtual void processMovement( int _frames ); - virtual void processTimer( int _frames ); + void processMovement( int _frames ); + void processTimer( int _frames ); enum NPC_STEAM_SWITCH_STATE { diff --git a/source/platform/ptrpdoor.h b/source/platform/ptrpdoor.h index 03959949b..92382aba3 100644 --- a/source/platform/ptrpdoor.h +++ b/source/platform/ptrpdoor.h @@ -24,11 +24,11 @@ public: void postInit(); DVECTOR const &getTriggerPos() {return( m_triggerPos );} void setTriggered() {m_triggered = true;} - virtual void render(); - virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} + void render(); + CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} protected: - virtual void setWaypoints( sThingPlatform *ThisPlatform ); - virtual void processMovement( int _frames ); + void setWaypoints( sThingPlatform *ThisPlatform ); + void processMovement( int _frames ); DVECTOR m_triggerPos; u8 m_triggered;