From b6e036bf51ae19e3592675113c3c7d293c66fa77 Mon Sep 17 00:00:00 2001 From: Charles Date: Tue, 3 Jul 2001 22:17:20 +0000 Subject: [PATCH] --- source/enemy/nanemone.h | 6 +++--- source/enemy/nbblob.h | 2 +- source/enemy/nclam.h | 6 +++--- source/enemy/ndogfish.h | 4 ++-- source/enemy/ndustdev.h | 2 +- source/enemy/neyeball.h | 4 ++-- source/enemy/nfdutch.h | 4 ++-- source/enemy/nffolk.h | 2 +- source/enemy/nfskull.h | 2 +- source/enemy/ngen.h | 8 ++++---- source/enemy/ngpirate.h | 2 +- source/enemy/nhcrab.h | 2 +- source/enemy/nmjback.h | 2 +- source/enemy/nmjfish.h | 4 ++-- source/enemy/npc.h | 2 -- source/enemy/nprojjf.h | 2 +- source/enemy/nscrab.h | 16 ++++++++-------- source/enemy/nsdart.h | 12 ++++++------ source/enemy/nshell.h | 2 +- source/enemy/nsj2back.h | 2 +- source/enemy/nsjback.h | 2 +- source/enemy/nsjfish.h | 16 ++++++++-------- source/enemy/nsshark.h | 4 ++-- source/enemy/nssnake.h | 28 ++++++++++++++-------------- source/enemy/nsstomp.h | 2 +- source/enemy/nworm.h | 28 ++++++++++++++-------------- source/friend/fgary.h | 10 +++++----- source/friend/fkrusty.h | 2 +- source/friend/fpatrick.h | 2 +- source/friend/fplnkton.h | 10 +++++----- source/friend/fsandy.h | 2 +- source/friend/fsquid.h | 2 +- source/platform/pbaloon.h | 14 +++++++------- source/platform/pbob.h | 2 +- source/platform/pbounce.h | 2 +- source/platform/pbubble.h | 10 +++++----- source/platform/pbubtube.h | 2 +- source/platform/pbwheel.h | 2 +- source/platform/pcbubble.h | 2 +- source/platform/pcirculr.h | 2 +- source/platform/pclam.h | 2 +- source/platform/pconveyr.h | 2 +- source/platform/pfalling.h | 2 +- source/platform/pfallnor.h | 2 +- source/platform/pfishhk3.h | 2 +- source/platform/pgbubble.h | 2 +- source/platform/pgeyser.h | 2 +- source/platform/pjellfsh.h | 2 +- source/platform/plantern.h | 2 +- source/platform/pleaf.h | 2 +- source/platform/plift.h | 2 +- source/platform/plurve.h | 2 +- source/platform/ppendulm.h | 2 +- source/platform/pplayer.cpp | 12 ------------ source/platform/pplayer.h | 1 - source/platform/praft.h | 2 +- source/platform/prbridge.h | 2 +- source/platform/pretract.h | 2 +- source/platform/psbarrel.h | 2 +- source/platform/pseesaw.h | 2 +- source/platform/psswitch.h | 2 +- source/platform/ptrpdoor.h | 2 +- 62 files changed, 134 insertions(+), 149 deletions(-) diff --git a/source/enemy/nanemone.h b/source/enemy/nanemone.h index a7a3e2f98..f2e1ae126 100644 --- a/source/enemy/nanemone.h +++ b/source/enemy/nanemone.h @@ -22,7 +22,7 @@ class CNpcAnemoneEnemy : public CNpcEnemy { public: virtual void postInit(); - virtual void setHeading( s32 xPos, s32 yPos ); + void setHeading( s32 xPos, s32 yPos ); protected: virtual void processEnemyCollision( CThing *thisThing ); virtual bool processSensor(); @@ -39,8 +39,8 @@ protected: class CNpcAnemone2Enemy : public CNpcAnemoneEnemy { public: - virtual void postInit(); - virtual void shutdown(); + void postInit(); + void shutdown(); virtual void render(); protected: virtual void processClose( int _frames ); diff --git a/source/enemy/nbblob.h b/source/enemy/nbblob.h index 4c7ea5607..6bc7d3650 100644 --- a/source/enemy/nbblob.h +++ b/source/enemy/nbblob.h @@ -17,7 +17,7 @@ class CNpcBallBlobEnemy : public CNpcEnemy { public: - virtual void postInit(); + void postInit(); protected: virtual void processMovement( int _frames ); diff --git a/source/enemy/nclam.h b/source/enemy/nclam.h index 1f10d025c..e67603000 100644 --- a/source/enemy/nclam.h +++ b/source/enemy/nclam.h @@ -17,7 +17,7 @@ class CNpcClamEnemy : public CNpcEnemy { public: - virtual u8 canCollideWithEnemy() {return( false );} + u8 canCollideWithEnemy() {return( false );} protected: virtual void processUserCollision( CThing *thisThing ); virtual void processEnemyCollision( CThing *thisThing ); @@ -27,7 +27,7 @@ protected: class CNpcJumpingClamEnemy : public CNpcClamEnemy { public: - virtual void postInit(); + void postInit(); protected: virtual void processClose( int _frames ); virtual void setupWaypoints( sThingActor *ThisActor ); @@ -38,7 +38,7 @@ protected: class CNpcStaticClamEnemy : public CNpcClamEnemy { public: - virtual void postInit(); + void postInit(); virtual u8 hasBeenAttacked() {return( false );} virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} protected: diff --git a/source/enemy/ndogfish.h b/source/enemy/ndogfish.h index 6ae63aa77..ba56d855b 100644 --- a/source/enemy/ndogfish.h +++ b/source/enemy/ndogfish.h @@ -25,9 +25,9 @@ class CNpcIronDogfishEnemy : public CNpcBossEnemy { public: - virtual void postInit(); + void postInit(); void render(); - virtual void shutdown(); + void shutdown(); protected: virtual void processTimer( int _frames ); virtual bool processSensor(); diff --git a/source/enemy/ndustdev.h b/source/enemy/ndustdev.h index 5fd821c0d..542716d98 100644 --- a/source/enemy/ndustdev.h +++ b/source/enemy/ndustdev.h @@ -17,7 +17,7 @@ class CNpcDustDevilEnemy : public CNpcEnemy { public: - virtual void postInit(); + void postInit(); protected: virtual s32 getFrameShift( int _frames ); virtual void processMovement( int _frames ); diff --git a/source/enemy/neyeball.h b/source/enemy/neyeball.h index 54165adf0..e519fe7ee 100644 --- a/source/enemy/neyeball.h +++ b/source/enemy/neyeball.h @@ -18,8 +18,8 @@ class CNpcEyeballEnemy : public CNpcEnemy { public: virtual void render(); - virtual void postInit(); - virtual void shutdown(); + void postInit(); + void shutdown(); virtual int getFrameCount() {return( 1 );} virtual void processEvent( GAME_EVENT evt, CThing *sourceThing ); protected: diff --git a/source/enemy/nfdutch.h b/source/enemy/nfdutch.h index 5c5c71927..5853ff8c0 100644 --- a/source/enemy/nfdutch.h +++ b/source/enemy/nfdutch.h @@ -23,9 +23,9 @@ class CNpcFlyingDutchmanEnemy : public CNpcBossEnemy { public: virtual void think( int _frames ); - virtual void postInit(); + void postInit(); void render(); - virtual void shutdown(); + void shutdown(); virtual u8 hasBeenAttacked(); protected: virtual void processClose( int _frames ); diff --git a/source/enemy/nffolk.h b/source/enemy/nffolk.h index e15f8d2a4..82549e1d4 100644 --- a/source/enemy/nffolk.h +++ b/source/enemy/nffolk.h @@ -17,7 +17,7 @@ class CNpcFishFolk : public CNpcEnemy { public: - virtual void postInit(); + void postInit(); protected: virtual void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange ); }; diff --git a/source/enemy/nfskull.h b/source/enemy/nfskull.h index 1c854ee08..956921274 100644 --- a/source/enemy/nfskull.h +++ b/source/enemy/nfskull.h @@ -16,7 +16,7 @@ class CNpcFlamingSkullEnemy : public CNpcEnemy { - virtual void postInit(); + void postInit(); protected: virtual void processEnemyCollision( CThing *thisThing ); virtual bool processSensor(); diff --git a/source/enemy/ngen.h b/source/enemy/ngen.h index 83b3ece17..58fddb4f8 100644 --- a/source/enemy/ngen.h +++ b/source/enemy/ngen.h @@ -21,12 +21,12 @@ class CNpcEnemyGenerator : public CNpcEnemy { public: - virtual void shutdown(); - virtual void processEnemyCollision( CThing *thisThing ); + void shutdown(); + void processEnemyCollision( CThing *thisThing ); void render(); void think(int _frames); - virtual u8 canCollideWithEnemy() {return( false );} - virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} + u8 canCollideWithEnemy() {return( false );} + CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} }; #endif \ No newline at end of file diff --git a/source/enemy/ngpirate.h b/source/enemy/ngpirate.h index 27d9cc095..0da3f56d0 100644 --- a/source/enemy/ngpirate.h +++ b/source/enemy/ngpirate.h @@ -17,7 +17,7 @@ class CNpcGhostPirateEnemy : public CNpcEnemy { public: - virtual void postInit(); + void postInit(); protected: virtual bool processSensor(); virtual void processClose( int _frames ); diff --git a/source/enemy/nhcrab.h b/source/enemy/nhcrab.h index a428c6e10..78a85ee76 100644 --- a/source/enemy/nhcrab.h +++ b/source/enemy/nhcrab.h @@ -21,7 +21,7 @@ class CNpcHermitCrabEnemy : public CNpcEnemy { public: - virtual void postInit(); + void postInit(); protected: virtual void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange ); virtual bool processSensor(); diff --git a/source/enemy/nmjback.h b/source/enemy/nmjback.h index 90b22e1e6..9b6801362 100644 --- a/source/enemy/nmjback.h +++ b/source/enemy/nmjback.h @@ -21,7 +21,7 @@ class CNpcMotherJellyfishBackground : public CNpcEnemy { public: - virtual void postInit(); + void postInit(); void render(); }; diff --git a/source/enemy/nmjfish.h b/source/enemy/nmjfish.h index fac72ac58..ac3c54d3c 100644 --- a/source/enemy/nmjfish.h +++ b/source/enemy/nmjfish.h @@ -27,9 +27,9 @@ class CNpcMotherJellyfishEnemy : public CNpcBossEnemy { public: - virtual void postInit(); + void postInit(); void render(); - virtual void shutdown(); + void shutdown(); virtual void setupWaypoints( sThingActor *ThisActor ); protected: virtual void processClose( int _frames ); diff --git a/source/enemy/npc.h b/source/enemy/npc.h index 46412f19d..aff1411b4 100644 --- a/source/enemy/npc.h +++ b/source/enemy/npc.h @@ -104,8 +104,6 @@ public: static NPC_UNIT_TYPE getTypeFromMapEdit( u16 newType ); void setHeading( s32 newHeading ) {m_heading = newHeading;} virtual void setHeading( s32 xPos, s32 yPos ); - //void addWaypoint( u16 *ptr ); - //void addWaypoint( u16 *ptrX, u16 *ptrY ); void setWaypointPtr( u16 *newPtr ) {m_npcPath.setWaypointPtr( newPtr );} void setWaypointCount( u8 newCount ) {m_npcPath.setWaypointCount( newCount );} void setPathType( u8 newType ) {m_npcPath.setPathType( newType );} diff --git a/source/enemy/nprojjf.h b/source/enemy/nprojjf.h index 2eb1b85d4..0b331e464 100644 --- a/source/enemy/nprojjf.h +++ b/source/enemy/nprojjf.h @@ -25,7 +25,7 @@ class CNpcSmallJellyfishProjectileEnemy : public CNpcSmallJellyfishEnemy { public: - virtual void postInit(); + void postInit(); virtual void think(int _frames); protected: s32 m_lifetime; diff --git a/source/enemy/nscrab.h b/source/enemy/nscrab.h index cd8094445..eccebf15d 100644 --- a/source/enemy/nscrab.h +++ b/source/enemy/nscrab.h @@ -21,15 +21,15 @@ class CNpcSpiderCrabEnemy : public CNpcEnemy { public: - virtual void postInit(); - virtual u8 canCollideWithEnemy(); - virtual void processEnemyCollision( CThing *thisThing ); + void postInit(); + u8 canCollideWithEnemy(); + void processEnemyCollision( CThing *thisThing ); protected: - virtual void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange ); - virtual bool processSensor(); - virtual void processClose( int _frames ); - virtual void processCollision(); - virtual void processMovement( int _frames ); + void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange ); + bool processSensor(); + void processClose( int _frames ); + void processCollision(); + void processMovement( int _frames ); void processSpiderCrabInitJumpMovement( int _frames ); s32 m_attackDist; diff --git a/source/enemy/nsdart.h b/source/enemy/nsdart.h index 888141324..39b8a011c 100644 --- a/source/enemy/nsdart.h +++ b/source/enemy/nsdart.h @@ -22,13 +22,13 @@ class CNpcSquidDartEnemy : public CNpcEnemy { public: void render(); - virtual int getFrameCount() {return( FRM_SQUIDDART_SWIM0004 - FRM_SQUIDDART_SWIM0001 + 1 );} - virtual u8 canCollideWithEnemy() {return( false );} - virtual void fireAsProjectile( s16 heading ); + int getFrameCount() {return( FRM_SQUIDDART_SWIM0004 - FRM_SQUIDDART_SWIM0001 + 1 );} + u8 canCollideWithEnemy() {return( false );} + void fireAsProjectile( s16 heading ); protected: - virtual s32 getFrameShift( int _frames ); - virtual bool processSensor(); - virtual void processClose( int _frames ); + s32 getFrameShift( int _frames ); + bool processSensor(); + void processClose( int _frames ); s32 m_xPos; u8 m_attack; diff --git a/source/enemy/nshell.h b/source/enemy/nshell.h index 7d51bce6e..877e8bf2b 100644 --- a/source/enemy/nshell.h +++ b/source/enemy/nshell.h @@ -21,7 +21,7 @@ class CNpcShellEnemy : public CNpcEnemy { public: - virtual void postInit(); + void postInit(); virtual void render(); virtual int getFrameCount() {return( 1 );} virtual int getFrame() {return( m_shellType );} diff --git a/source/enemy/nsj2back.h b/source/enemy/nsj2back.h index 944674f1a..cb7f859a6 100644 --- a/source/enemy/nsj2back.h +++ b/source/enemy/nsj2back.h @@ -21,7 +21,7 @@ class CNpcSmallJellyfish2BackgroundEnemy : public CNpcSmallJellyfishBackgroundEnemy { public: - virtual void postInit(); + void postInit(); virtual void render(); protected: virtual void collidedWith(CThing *_thisThing); diff --git a/source/enemy/nsjback.h b/source/enemy/nsjback.h index 8ae22a421..9212b77c6 100644 --- a/source/enemy/nsjback.h +++ b/source/enemy/nsjback.h @@ -23,12 +23,12 @@ class CNpcSmallJellyfishBackgroundEnemy : public CNpcSmallJellyfishEnemy public: virtual void render(); virtual void postInit(); + void shutdown(); virtual void setTargetHeading( s16 newTargetHeading ) {m_targetHeading = newTargetHeading;} virtual u8 hasBeenAttacked(); protected: virtual bool processSensor(); virtual void processMovement( int _frames ); - virtual void shutdown(); virtual void processUserCollision( CThing *thisThing ); virtual void collidedWith(CThing *_thisThing); diff --git a/source/enemy/nsjfish.h b/source/enemy/nsjfish.h index 105c4a52d..ee309b4ea 100644 --- a/source/enemy/nsjfish.h +++ b/source/enemy/nsjfish.h @@ -26,15 +26,15 @@ class CNpcSmallJellyfishEnemy : public CNpcEnemy { public: virtual void postInit(); - virtual void render(); - virtual int getFrameCount() {return( FRM_JELLYFISH1_SWIM7 - FRM_JELLYFISH1_SWIM1 + 1 );} - virtual u8 canCollideWithEnemy() {return( false );} - virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} + void render(); + int getFrameCount() {return( FRM_JELLYFISH1_SWIM7 - FRM_JELLYFISH1_SWIM1 + 1 );} + u8 canCollideWithEnemy() {return( false );} + CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} protected: - virtual bool processSensor(); - virtual void processClose( int _frames ); - virtual void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange ); - virtual void fireAsProjectile( s16 heading ); + bool processSensor(); + void processClose( int _frames ); + void processMovementModifier( int _frames, s32 distX, s32 distY, s32 dist, s16 headingChange ); + void fireAsProjectile( s16 heading ); enum { diff --git a/source/enemy/nsshark.h b/source/enemy/nsshark.h index e3831bfa9..574bdff22 100644 --- a/source/enemy/nsshark.h +++ b/source/enemy/nsshark.h @@ -27,9 +27,9 @@ class CNpcSubSharkEnemy : public CNpcBossEnemy { public: virtual void think( int _frames ); - virtual void postInit(); + void postInit(); void render(); - virtual void shutdown(); + void shutdown(); protected: //virtual void processClose( int _frames ); virtual s32 getFrameShift( int _frames ); diff --git a/source/enemy/nssnake.h b/source/enemy/nssnake.h index f01f16d38..15b04ce09 100644 --- a/source/enemy/nssnake.h +++ b/source/enemy/nssnake.h @@ -22,20 +22,20 @@ class CNpcSeaSnakeSegment { public: - virtual void init(); - virtual void shutdown(); - virtual void render(); - virtual void processEnemyCollision( CThing *thisThing ); - virtual void setScale( u16 scale ) {m_scale = scale;} + void init(); + void shutdown(); + void render(); + void processEnemyCollision( CThing *thisThing ); + void setScale( u16 scale ) {m_scale = scale;} CNpcSeaSnakeSegment *m_nextSegment; - virtual void setPos( DVECTOR newPos ) {Pos = newPos;} - virtual DVECTOR getPos() {return( Pos );} - virtual void setHeading( s16 newHeading ) {m_heading = newHeading;} + void setPos( DVECTOR newPos ) {Pos = newPos;} + DVECTOR getPos() {return( Pos );} + void setHeading( s16 newHeading ) {m_heading = newHeading;} void updateCollisionArea(); - virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); - virtual void setCollisionSize(int _w,int _h); - virtual void setCollisionCentreOffset(int _x,int _y) {m_collisionCentreOffset.vx=_x;m_collisionCentreOffset.vy=_y;} - virtual CRECT const &getCollisionArea() {return m_collisionArea;} + int checkCollisionAgainst(CThing *_thisThing, int _frames); + void setCollisionSize(int _w,int _h); + void setCollisionCentreOffset(int _x,int _y) {m_collisionCentreOffset.vx=_x;m_collisionCentreOffset.vy=_y;} + CRECT const &getCollisionArea() {return m_collisionArea;} DVECTOR const &getCollisionCentre() {return m_collisionCentre;} int getCollisionRadius() {return m_collisionRadius;} void setAnim( int newAnim ) {m_anim = newAnim;} @@ -56,8 +56,8 @@ protected: class CNpcSeaSnakeEnemy : public CNpcBossEnemy { public: - virtual void postInit(); - virtual void shutdown(); + void postInit(); + void shutdown(); virtual void render(); virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); protected: diff --git a/source/enemy/nsstomp.h b/source/enemy/nsstomp.h index 934785bd8..e5fde37d1 100644 --- a/source/enemy/nsstomp.h +++ b/source/enemy/nsstomp.h @@ -17,7 +17,7 @@ class CNpcSkullStomperEnemy : public CNpcEnemy { public: - virtual void postInit(); + void postInit(); protected: virtual void processEnemyCollision( CThing *thisThing ); virtual bool processSensor(); diff --git a/source/enemy/nworm.h b/source/enemy/nworm.h index 6c9314139..d1fd42c61 100644 --- a/source/enemy/nworm.h +++ b/source/enemy/nworm.h @@ -17,20 +17,20 @@ class CNpcParasiticWormSegment { public: - virtual void init(); - virtual void shutdown(); - virtual void render(); - virtual void processEnemyCollision( CThing *thisThing ); - virtual void setScale( u16 scale ) {m_scale = scale;} + void init(); + void shutdown(); + void render(); + void processEnemyCollision( CThing *thisThing ); + void setScale( u16 scale ) {m_scale = scale;} CNpcParasiticWormSegment *m_nextSegment; - virtual void setPos( DVECTOR newPos ) {Pos = newPos;} - virtual DVECTOR getPos() {return( Pos );} - virtual void setHeading( s16 newHeading ) {m_heading = newHeading;} + void setPos( DVECTOR newPos ) {Pos = newPos;} + DVECTOR getPos() {return( Pos );} + void setHeading( s16 newHeading ) {m_heading = newHeading;} void updateCollisionArea(); - virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); - virtual void setCollisionSize(int _w,int _h); - virtual void setCollisionCentreOffset(int _x,int _y) {m_collisionCentreOffset.vx=_x;m_collisionCentreOffset.vy=_y;} - virtual CRECT const &getCollisionArea() {return m_collisionArea;} + int checkCollisionAgainst(CThing *_thisThing, int _frames); + void setCollisionSize(int _w,int _h); + void setCollisionCentreOffset(int _x,int _y) {m_collisionCentreOffset.vx=_x;m_collisionCentreOffset.vy=_y;} + CRECT const &getCollisionArea() {return m_collisionArea;} DVECTOR const &getCollisionCentre() {return m_collisionCentre;} int getCollisionRadius() {return m_collisionRadius;} void setAnim( int newAnim ) {m_animNo = newAnim;} @@ -51,8 +51,8 @@ protected: class CNpcParasiticWormEnemy : public CNpcEnemy { public: - virtual void postInit(); - virtual void shutdown(); + void postInit(); + void shutdown(); virtual void render(); virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); protected: diff --git a/source/friend/fgary.h b/source/friend/fgary.h index 2caba3794..d6e22e54a 100644 --- a/source/friend/fgary.h +++ b/source/friend/fgary.h @@ -21,17 +21,17 @@ class CNpcGaryFriend : public CNpcFriend { public: - virtual void postInit(); - virtual void shutdown(); - virtual void think( int _frames ); - virtual void setupWaypoints( sThingActor *ThisActor ); + void postInit(); + void shutdown(); + void think( int _frames ); + void setupWaypoints( sThingActor *ThisActor ); bool alwaysThink() {return(true);} DVECTOR const &getTriggerPos() {return( m_triggerPos );} void start(); void stop(); void startLeft(); void startRight(); - virtual void render(); + void render(); protected: DVECTOR m_triggerPos; diff --git a/source/friend/fkrusty.h b/source/friend/fkrusty.h index 2add8486d..b04ad256f 100644 --- a/source/friend/fkrusty.h +++ b/source/friend/fkrusty.h @@ -21,7 +21,7 @@ class CNpcKrustyFriend : public CNpcFriend { public: - virtual void postInit(); + void postInit(); protected: virtual void startConderversation(); diff --git a/source/friend/fpatrick.h b/source/friend/fpatrick.h index 003bd8617..fa2448d48 100644 --- a/source/friend/fpatrick.h +++ b/source/friend/fpatrick.h @@ -21,7 +21,7 @@ class CNpcPatrickFriend : public CNpcFriend { public: - virtual void postInit(); + void postInit(); protected: virtual void startConderversation(); diff --git a/source/friend/fplnkton.h b/source/friend/fplnkton.h index e16952bc6..2c8c2c783 100644 --- a/source/friend/fplnkton.h +++ b/source/friend/fplnkton.h @@ -21,12 +21,12 @@ class CNpcPlanktonFriend : public CNpcFriend { public: - virtual void init(); - virtual void render(); - virtual void think(int _frames); - virtual void shutdown(); + void init(); + void render(); + void think(int _frames); + void shutdown(); protected: - virtual void startConderversation(); + void startConderversation(); }; #endif \ No newline at end of file diff --git a/source/friend/fsandy.h b/source/friend/fsandy.h index 55457af49..928bb2699 100644 --- a/source/friend/fsandy.h +++ b/source/friend/fsandy.h @@ -21,7 +21,7 @@ class CNpcSandyFriend : public CNpcFriend { public: - virtual void postInit(); + void postInit(); protected: virtual void startConderversation(); diff --git a/source/friend/fsquid.h b/source/friend/fsquid.h index a7d38742d..f1ed2151c 100644 --- a/source/friend/fsquid.h +++ b/source/friend/fsquid.h @@ -22,7 +22,7 @@ class CNpcSquidwardFriend : public CNpcFriend { public: virtual void think(int _frames); - virtual void postInit(); + void postInit(); protected: virtual void startConderversation(); diff --git a/source/platform/pbaloon.h b/source/platform/pbaloon.h index 947f65da0..7a4d11912 100644 --- a/source/platform/pbaloon.h +++ b/source/platform/pbaloon.h @@ -21,7 +21,7 @@ class CBridgeBalloon { public: - virtual void setPos( DVECTOR newPos ) {Pos = newPos;} + void setPos( DVECTOR newPos ) {Pos = newPos;} void render(); void init(); void shutdown(); @@ -33,14 +33,14 @@ protected: class CNpcBalloonBridgePlatform : public CNpcPlatform { public: - virtual void postInit(); - virtual void render(); - virtual void shutdown(); + void postInit(); + void render(); + void shutdown(); virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} protected: - virtual void setWaypoints( sThingPlatform *ThisPlatform ); - virtual void processMovement( int _frames ); - virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); + void setWaypoints( sThingPlatform *ThisPlatform ); + void processMovement( int _frames ); + int checkCollisionAgainst(CThing *_thisThing, int _frames); s32 m_maxExtension; s8 m_balloonCount; diff --git a/source/platform/pbob.h b/source/platform/pbob.h index 15c8f3477..2d653fd85 100644 --- a/source/platform/pbob.h +++ b/source/platform/pbob.h @@ -21,7 +21,7 @@ class CNpcBobbingPlatform : public CNpcPlatform { public: - virtual void postInit(); + void postInit(); protected: virtual void processMovement( int _frames ); diff --git a/source/platform/pbounce.h b/source/platform/pbounce.h index 102e260b3..3d8ab81f0 100644 --- a/source/platform/pbounce.h +++ b/source/platform/pbounce.h @@ -21,7 +21,7 @@ class CNpcBouncePlatform : public CNpcPlatform { public: - virtual void postInit(); + void postInit(); virtual void think( int _frames ); virtual void render(); protected: diff --git a/source/platform/pbubble.h b/source/platform/pbubble.h index bf0898d3e..665a09439 100644 --- a/source/platform/pbubble.h +++ b/source/platform/pbubble.h @@ -21,13 +21,13 @@ class CNpcBubblePlatform : public CNpcPlatform { public: - virtual void render(); + void render(); virtual void postInit(); - virtual void shutdown(); - virtual void setGraphic( sThingPlatform *ThisPlatform ) {} - virtual void setGraphic( u8 graphicNum ) {} + void shutdown(); + void setGraphic( sThingPlatform *ThisPlatform ) {} + void setGraphic( u8 graphicNum ) {} protected: - virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); + int checkCollisionAgainst(CThing *_thisThing, int _frames); u8 m_pop; s16 m_scale; diff --git a/source/platform/pbubtube.h b/source/platform/pbubtube.h index 24216133c..294d1073b 100644 --- a/source/platform/pbubtube.h +++ b/source/platform/pbubtube.h @@ -21,7 +21,7 @@ class CNpcBubbleTubePlatform : public CNpcPlatform { public: - virtual void postInit(); + void postInit(); virtual void setWaypoints( sThingPlatform *ThisPlatform ); protected: virtual void collidedWith(CThing *_thisThing); diff --git a/source/platform/pbwheel.h b/source/platform/pbwheel.h index 3c5759e4e..6e3c3ead9 100644 --- a/source/platform/pbwheel.h +++ b/source/platform/pbwheel.h @@ -22,7 +22,7 @@ class CNpcBigWheelPlatform : public CNpcPlatform { public: bool alwaysThink() {return(true);} - virtual void postInit(); + void postInit(); virtual int getHeightFromPlatformAtPosition(int _x,int _y, int offsetX = 0, int offsetY = 0); protected: virtual void setWaypoints( sThingPlatform *ThisPlatform ); diff --git a/source/platform/pcbubble.h b/source/platform/pcbubble.h index 0d2d92ca4..7f57aef59 100644 --- a/source/platform/pcbubble.h +++ b/source/platform/pcbubble.h @@ -21,7 +21,7 @@ class CNpcCollapsingBubblePlatform : public CNpcBubblePlatform { public: - virtual void postInit(); + void postInit(); virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} protected: virtual void processLifetime( int _frames ); diff --git a/source/platform/pcirculr.h b/source/platform/pcirculr.h index e1c2547e7..2f60935e4 100644 --- a/source/platform/pcirculr.h +++ b/source/platform/pcirculr.h @@ -21,7 +21,7 @@ class CNpcCircularPlatform : public CNpcPlatform { public: - virtual void postInit(); + void postInit(); protected: virtual void processMovement( int _frames ); }; diff --git a/source/platform/pclam.h b/source/platform/pclam.h index 367a1958b..051914874 100644 --- a/source/platform/pclam.h +++ b/source/platform/pclam.h @@ -21,7 +21,7 @@ class CNpcClamPlatform : public CNpcPlatform { public: - virtual void postInit(); + void postInit(); virtual void render(); virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} //void setBBox(); diff --git a/source/platform/pconveyr.h b/source/platform/pconveyr.h index bec62ad46..fad5dfa1a 100644 --- a/source/platform/pconveyr.h +++ b/source/platform/pconveyr.h @@ -21,7 +21,7 @@ class CNpcConveyorPlatform : public CNpcPlatform { public: - virtual void postInit(); + void postInit(); virtual void render(); virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); protected: diff --git a/source/platform/pfalling.h b/source/platform/pfalling.h index 5190c7a78..9c1397309 100644 --- a/source/platform/pfalling.h +++ b/source/platform/pfalling.h @@ -21,7 +21,7 @@ class CNpcFallingPlatform : public CNpcPlatform { public: - virtual void postInit(); + void postInit(); protected: virtual void processMovement( int _frames ); }; diff --git a/source/platform/pfallnor.h b/source/platform/pfallnor.h index 0d97d9f2d..525f26850 100644 --- a/source/platform/pfallnor.h +++ b/source/platform/pfallnor.h @@ -21,7 +21,7 @@ class CNpcFallingNoRespawnPlatform : public CNpcPlatform { public: - virtual void postInit(); + void postInit(); bool alwaysThink() {return(true);} virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); protected: diff --git a/source/platform/pfishhk3.h b/source/platform/pfishhk3.h index 057799cc2..02cf6b4e9 100644 --- a/source/platform/pfishhk3.h +++ b/source/platform/pfishhk3.h @@ -21,7 +21,7 @@ class CNpcFishHook3Platform : public CNpcFishHookPlatform { public: - virtual void postInit(); + void postInit(); }; #endif \ No newline at end of file diff --git a/source/platform/pgbubble.h b/source/platform/pgbubble.h index 399d6f66a..09d88a2ab 100644 --- a/source/platform/pgbubble.h +++ b/source/platform/pgbubble.h @@ -21,7 +21,7 @@ class CNpcGeyserBubblePlatform : public CNpcBubblePlatform { public: - virtual void postInit(); + void postInit(); protected: virtual void processMovement( int _frames ); virtual void processLifetime( int _frames ); diff --git a/source/platform/pgeyser.h b/source/platform/pgeyser.h index 98664f54d..c2eebb8f4 100644 --- a/source/platform/pgeyser.h +++ b/source/platform/pgeyser.h @@ -21,7 +21,7 @@ class CNpcGeyserPlatform : public CNpcPlatform { public: - virtual void postInit(); + void postInit(); protected: virtual void processMovement( int _frames ); virtual void processTimer( int _frames ); diff --git a/source/platform/pjellfsh.h b/source/platform/pjellfsh.h index 60c6e52fd..c4404731b 100644 --- a/source/platform/pjellfsh.h +++ b/source/platform/pjellfsh.h @@ -21,7 +21,7 @@ class CNpcJellyfishPlatform : public CNpcLinearPlatform { public: - virtual void postInit(); + void postInit(); virtual void think( int _frames ); protected: virtual void collidedWith(CThing *_thisThing); diff --git a/source/platform/plantern.h b/source/platform/plantern.h index 8f03715df..e2bb480e6 100644 --- a/source/platform/plantern.h +++ b/source/platform/plantern.h @@ -21,7 +21,7 @@ class CNpcLanternPlatform : public CNpcPlatform { public: - virtual void postInit(); + void postInit(); bool alwaysThink() {return(true);} protected: virtual void setWaypoints( sThingPlatform *ThisPlatform ); diff --git a/source/platform/pleaf.h b/source/platform/pleaf.h index 6185c7314..8863e4613 100644 --- a/source/platform/pleaf.h +++ b/source/platform/pleaf.h @@ -21,7 +21,7 @@ class CNpcLeafPlatform : public CNpcPlatform { public: - virtual void postInit(); + void postInit(); protected: virtual void processMovement( int _frames ); diff --git a/source/platform/plift.h b/source/platform/plift.h index 9993acf75..c445a4abc 100644 --- a/source/platform/plift.h +++ b/source/platform/plift.h @@ -21,7 +21,7 @@ class CNpcLiftPlatform : public CNpcPlatform { public: - virtual void postInit(); + void postInit(); virtual void setWaypoints( sThingPlatform *ThisPlatform ); protected: virtual void collidedWith(CThing *_thisThing); diff --git a/source/platform/plurve.h b/source/platform/plurve.h index df20cec7f..6f803d04f 100644 --- a/source/platform/plurve.h +++ b/source/platform/plurve.h @@ -21,7 +21,7 @@ class CNpcLoveBoatPlatform : public CNpcCartPlatform { public: - virtual void postInit(); + void postInit(); }; #endif \ No newline at end of file diff --git a/source/platform/ppendulm.h b/source/platform/ppendulm.h index a6b54f958..d623ca726 100644 --- a/source/platform/ppendulm.h +++ b/source/platform/ppendulm.h @@ -21,7 +21,7 @@ class CNpcPendulumPlatform : public CNpcPlatform { public: - virtual void postInit(); + void postInit(); virtual void render(); protected: virtual void setWaypoints( sThingPlatform *ThisPlatform ); diff --git a/source/platform/pplayer.cpp b/source/platform/pplayer.cpp index 1a5c82e3a..2a7bab8ad 100644 --- a/source/platform/pplayer.cpp +++ b/source/platform/pplayer.cpp @@ -24,18 +24,6 @@ #endif -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/*void CNpcPlayerBubblePlatform::postInit() -{ - CNpcBubblePlatform::postInit(); - - setCollisionSize( 30, 30 ); - setCollisionCentreOffset( 0, -15 ); - - calculateNonRotatedCollisionData(); -}*/ - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// void CNpcPlayerBubblePlatform::processLifetime( int _frames ) diff --git a/source/platform/pplayer.h b/source/platform/pplayer.h index 9dee2f3de..f64335875 100644 --- a/source/platform/pplayer.h +++ b/source/platform/pplayer.h @@ -21,7 +21,6 @@ class CNpcPlayerBubblePlatform : public CNpcBubblePlatform { public: - //virtual void postInit(); virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} protected: virtual void processLifetime( int _frames ); diff --git a/source/platform/praft.h b/source/platform/praft.h index 7d0e66ee9..1c94ec5d0 100644 --- a/source/platform/praft.h +++ b/source/platform/praft.h @@ -21,7 +21,7 @@ class CNpcRaftPlatform : public CNpcPlatform { public: - virtual void postInit(); + void postInit(); virtual void render(); protected: virtual void processMovement( int _frames ); diff --git a/source/platform/prbridge.h b/source/platform/prbridge.h index 65ab1fc7f..3296b6561 100644 --- a/source/platform/prbridge.h +++ b/source/platform/prbridge.h @@ -21,7 +21,7 @@ class CNpcRisingBridgePlatform : public CNpcPlatform { public: - virtual void postInit(); + void postInit(); virtual void trigger(); virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} protected: diff --git a/source/platform/pretract.h b/source/platform/pretract.h index 49abb47cc..da47be64b 100644 --- a/source/platform/pretract.h +++ b/source/platform/pretract.h @@ -21,7 +21,7 @@ class CNpcRetractingPlatform : public CNpcPlatform { public: - virtual void postInit(); + void postInit(); virtual void render(); protected: void processTimer( int _frames ); diff --git a/source/platform/psbarrel.h b/source/platform/psbarrel.h index 46cfc901c..9cd466250 100644 --- a/source/platform/psbarrel.h +++ b/source/platform/psbarrel.h @@ -22,7 +22,7 @@ class CNpcSteerableBarrelPlatform : public CNpcPlatform { public: virtual void render(); - virtual void postInit(); + void postInit(); virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} protected: virtual void processMovement( int _frames ); diff --git a/source/platform/pseesaw.h b/source/platform/pseesaw.h index bdb8745c1..89db34065 100644 --- a/source/platform/pseesaw.h +++ b/source/platform/pseesaw.h @@ -21,7 +21,7 @@ class CNpcSeesawPlatform : public CNpcPlatform { public: - virtual void postInit(); + void postInit(); virtual void render(); virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );} protected: diff --git a/source/platform/psswitch.h b/source/platform/psswitch.h index 802db4fb8..1fb0f40af 100644 --- a/source/platform/psswitch.h +++ b/source/platform/psswitch.h @@ -25,7 +25,7 @@ class CNpcSteamSwitchPlatform : public CNpcPlatform { public: - virtual void postInit(); + void postInit(); virtual void setWaypoints( sThingPlatform *ThisPlatform ); protected: virtual void processMovement( int _frames ); diff --git a/source/platform/ptrpdoor.h b/source/platform/ptrpdoor.h index 39f23f2e7..03959949b 100644 --- a/source/platform/ptrpdoor.h +++ b/source/platform/ptrpdoor.h @@ -21,7 +21,7 @@ class CNpcTrapdoorPlatform : public CNpcPlatform { public: - virtual void postInit(); + void postInit(); DVECTOR const &getTriggerPos() {return( m_triggerPos );} void setTriggered() {m_triggered = true;} virtual void render();