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;
 

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;
 };

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;
 };

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;
 };

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 );
 

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;

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;

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 );
 

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;

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

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 );
 

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 );
 

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 );
 

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;

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;

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 );

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;

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;

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

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