refactor: Add override keyword to virtual function overrides in Core code (2)

Core/GameEngine/Include/Common/ArchiveFileSystem.h

@@ -126,10 +126,7 @@ class ArchiveFileSystem : public SubsystemInterface
 	ArchiveFileSystem();
 	virtual ~ArchiveFileSystem() override;
 
-	virtual void init() = 0;
-	virtual void update() = 0;
-	virtual void reset() = 0;
-	virtual void postProcessLoad() = 0;
+	virtual void postProcessLoad() override = 0;
 
 	// ArchiveFile operations
 	virtual ArchiveFile*	openArchiveFile( const Char *filename ) = 0;		///< Create new or return existing Archive file from file name

Core/GameEngine/Include/Common/GameMemory.h

@@ -619,7 +619,7 @@ private: \
 // ----------------------------------------------------------------------------
 #define MEMORY_POOL_GLUE_WITHOUT_GCMP(ARGCLASS) \
 protected: \
-	virtual ~ARGCLASS(); \
+	virtual ~ARGCLASS() override; \
 public: \
 	enum ARGCLASS##MagicEnum { ARGCLASS##_GLUE_NOT_IMPLEMENTED = 0 }; \
 public: \
@@ -665,7 +665,7 @@ protected: \
 		ARGCLASS::getClassMemoryPool()->freeBlock(p); \
 	} \
 private: \
-	virtual MemoryPool *getObjectMemoryPool() \
+	virtual MemoryPool *getObjectMemoryPool() override \
 	{ \
 		return ARGCLASS::getClassMemoryPool(); \
 	} \
@@ -690,7 +690,7 @@ private: \
 // this is the version for an Abstract Base Class, which will never be instantiated...
 #define MEMORY_POOL_GLUE_ABC(ARGCLASS) \
 protected: \
-	virtual ~ARGCLASS(); \
+	virtual ~ARGCLASS() override; \
 public: \
 	enum ARGCLASS##MagicEnum { ARGCLASS##_GLUE_NOT_IMPLEMENTED = 0 }; \
 protected: \
@@ -719,7 +719,7 @@ protected: \
 		DEBUG_CRASH(("this should be impossible to call (abstract base class)")); \
 	} \
 private: \
-	virtual MemoryPool *getObjectMemoryPool() \
+	virtual MemoryPool *getObjectMemoryPool() override \
 	{ \
 		throw ERROR_BUG; \
 		return 0; \

Core/GameEngine/Include/Common/LocalFileSystem.h

@@ -36,10 +36,6 @@ class LocalFileSystem : public SubsystemInterface
 public:
 	virtual ~LocalFileSystem() override {}
 
-	virtual void init() = 0;
-	virtual void reset() = 0;
-	virtual void update() = 0;
-
 	virtual File * openFile(const Char *filename, Int access = File::NONE, size_t bufferSize = File::BUFFERSIZE) = 0;
 	virtual Bool doesFileExist(const Char *filename) const = 0;
 	virtual void getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const = 0; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep).  Possibly search subdirectories.

Core/GameEngine/Include/GameClient/LoadScreen.h

@@ -82,7 +82,7 @@ class SinglePlayerLoadScreen : public LoadScreen
 
 	virtual void init( GameInfo *game ) override;		///< Init the loadscreen
 	virtual void reset() override;		///< Reset the system
-	virtual void update()
+	virtual void update() override
 	{
 		DEBUG_CRASH(("Call update(Int) instead.  This update isn't supported"));
 	};
@@ -132,7 +132,7 @@ class ChallengeLoadScreen : public LoadScreen
 
 	virtual void init( GameInfo *game ) override;		///< Init the loadscreen
 	virtual void reset() override;		///< Reset the system
-	virtual void update()
+	virtual void update() override
 	{
 		DEBUG_CRASH(("Call update(Int) instead.  This update isn't supported"));
 	};
@@ -204,7 +204,7 @@ class ShellGameLoadScreen : public LoadScreen
 
 	virtual void init( GameInfo *game ) override;		///< Init the loadscreen
 	virtual void reset() override;		///< Reset the system
-	virtual void update()
+	virtual void update() override
 	{
 		DEBUG_CRASH(("Call update(Int) instead.  This update isn't supported"));
 	};
@@ -232,7 +232,7 @@ class MultiPlayerLoadScreen : public LoadScreen
 
 	virtual void init( GameInfo *game ) override;		///< Init the loadscreen
 	virtual void reset() override;		///< Reset the system
-	virtual void update()
+	virtual void update() override
 	{
 		DEBUG_CRASH(("Call update(Int) instead.  This update isn't supported"));
 	};
@@ -263,7 +263,7 @@ class GameSpyLoadScreen : public LoadScreen
 
 	virtual void init( GameInfo *game ) override;		///< Init the loadscreen
 	virtual void reset() override;		///< Reset the system
-	virtual void update()
+	virtual void update() override
 	{
 		DEBUG_CRASH(("Call update(Int) instead.  This update isn't supported"));
 	};
@@ -301,7 +301,7 @@ class MapTransferLoadScreen : public LoadScreen
 
 	virtual void init( GameInfo *game ) override;		///< Init the loadscreen
 	virtual void reset() override;							///< Reset the system
-	virtual void update()
+	virtual void update() override
 	{
 		DEBUG_CRASH(("Call update(Int) instead.  This update isn't supported"));
 	};

Core/GameEngine/Include/GameClient/VideoPlayer.h

@@ -222,11 +222,6 @@ class VideoPlayerInterface : public SubsystemInterface
 {
 
 	public:
-
-		virtual void	init() = 0;														///< Initialize video playback
-		virtual void	reset() = 0;													///< Reset video playback
-		virtual void	update() = 0;													///< Services all video tasks. Should be called frequently
-
 		virtual void	deinit() = 0;													///< Close down player
 
 		virtual ~VideoPlayerInterface() override {};

Core/GameEngine/Include/GameNetwork/LANAPI.h

@@ -60,10 +60,6 @@ class LANAPIInterface : public SubsystemInterface
 
 	virtual ~LANAPIInterface() override { };
 
-	virtual void init() = 0;															///< Initialize or re-initialize the instance
-	virtual void reset() = 0;															///< reset the logic system
-	virtual void update() = 0;														///< update the world
-
 	virtual void setIsActive(Bool isActive ) = 0;								///< Tell TheLAN whether or not the app is active.
 
 	// Possible types of chat messages

Core/GameEngine/Include/GameNetwork/LANGameInfo.h

@@ -99,7 +99,7 @@ class LANGameInfo : public GameInfo
 
 	// Convenience functions that interface with the LANPlayer held in the slot list
 	virtual void resetAccepted() override;														///< Reset the accepted flag on all players
-	Bool amIHost();																///< Convenience function - is the local player the game host?
+	virtual Bool amIHost() const override;																///< Convenience function - is the local player the game host?
 
 	/// Get the IP of selected player or return 0
 	UnsignedInt getIP( int who )

Core/GameEngine/Include/GameNetwork/NetworkInterface.h

@@ -56,11 +56,6 @@ class NetworkInterface : public SubsystemInterface
 
 	static NetworkInterface * createNetwork();
 
-	//---------------------------------------------------------------------------------------
-	// SubsystemInterface functions
-	virtual void init() = 0;																		///< Initialize the network
-	virtual void reset() = 0;																		///< Re-initialize the network
-	virtual void update() = 0;																	///< Updates the network
 	virtual void liteupdate() = 0;															///< does a lightweight update for passing messages around.
 
 	virtual void setLocalAddress(UnsignedInt ip, UnsignedInt port) = 0;	///< Tell the network what local ip and port to bind to.

Core/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h

@@ -110,9 +110,9 @@ class WebBrowser :
 	// IUnknown methods
 	//---------------------------------------------------------------------------
 	protected:
-		HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) IUNKNOWN_NOEXCEPT;
-		ULONG STDMETHODCALLTYPE AddRef() IUNKNOWN_NOEXCEPT;
-		ULONG STDMETHODCALLTYPE Release() IUNKNOWN_NOEXCEPT;
+		HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) IUNKNOWN_NOEXCEPT override;
+		ULONG STDMETHODCALLTYPE AddRef() IUNKNOWN_NOEXCEPT override;
+		ULONG STDMETHODCALLTYPE Release() IUNKNOWN_NOEXCEPT override;
 
 	//---------------------------------------------------------------------------
 	// IBrowserDispatch methods

Core/GameEngine/Source/Common/System/LocalFileSystem.cpp

@@ -92,12 +92,3 @@ LocalFileSystem *TheLocalFileSystem = nullptr;
 //----------------------------------------------------------------------------
 //         Public Functions
 //----------------------------------------------------------------------------
-
-void LocalFileSystem::init() {
-}
-
-void LocalFileSystem::reset() {
-}
-
-void LocalFileSystem::update() {
-}

Core/GameEngine/Source/GameNetwork/LANGameInfo.cpp

@@ -161,13 +161,13 @@ Int LANGameInfo::getSlotNum( UnicodeString userName )
 	return -1;
 }
 
-Bool LANGameInfo::amIHost()
+Bool LANGameInfo::amIHost() const
 {
 	DEBUG_ASSERTCRASH(m_inGame, ("Looking for game slot while not in game"));
 	if (!m_inGame)
 		return false;
 
-	return getLANSlot(0)->isLocalPlayer();
+	return getConstLANSlot(0)->isLocalPlayer();
 }
 
 void LANGameInfo::setMap( AsciiString mapName )

Core/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h

@@ -105,7 +105,7 @@ class BaseHeightMapRenderObjClass : public RenderObjClass, public DX8_CleanupHoo
 	/////////////////////////////////////////////////////////////////////////////
 	virtual RenderObjClass *	Clone() const override;
 	virtual int						Class_ID() const override;
-	virtual void					Render(RenderInfoClass & rinfo) = 0;
+	virtual void					Render(RenderInfoClass & rinfo) override = 0;
 	virtual bool					Cast_Ray(RayCollisionTestClass & raytest) override; // This CANNOT be Bool, as it will not inherit properly if you make Bool == Int
 	virtual void					Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override;
 	virtual void					Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const override;

Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h

@@ -357,7 +357,7 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
 	virtual void allocateShadows() override; ///< create shadow resources if not already present. Used by Options screen.
 
 #if defined(RTS_DEBUG)
-	virtual void getRenderCost(RenderCost & rc) const;  ///< estimates the render cost of this draw module
+	virtual void getRenderCost(RenderCost & rc) const override;  ///< estimates the render cost of this draw module
 	void getRenderCostRecursive(RenderCost & rc,RenderObjClass * robj) const;
 #endif
 
@@ -408,7 +408,7 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
 	virtual void setPauseAnimation(Bool pauseAnim) override;
 
 	//Kris: Manually set a drawable's current animation to specific frame.
-	virtual void setAnimationFrame( int frame );
+	virtual void setAnimationFrame( int frame ) override;
 
 	virtual void updateSubObjects() override;
 	virtual void showSubObject( const AsciiString& name, Bool show ) override;

Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h

@@ -64,7 +64,7 @@ class W3DTreeDrawModuleData : public ModuleData
 	virtual ~W3DTreeDrawModuleData() override;
 	static void buildFieldParse(MultiIniFieldParse& p);
 	// ugh, hack
-	virtual const W3DTreeDrawModuleData* getAsW3DTreeDrawModuleData() const { return this; }
+	virtual const W3DTreeDrawModuleData* getAsW3DTreeDrawModuleData() const override { return this; }
 };
 
 //-------------------------------------------------------------------------------------------------

Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h

@@ -168,8 +168,8 @@ class W3DView : public View, public SubsystemInterface
 
 	virtual void forceRedraw() override;
 
-	virtual Bool isDoingScriptedCamera();
-	virtual void stopDoingScriptedCamera();
+	virtual Bool isDoingScriptedCamera() override;
+	virtual void stopDoingScriptedCamera() override;
 
 	virtual void setAngle( Real radians ) override;									///< Rotate the view around the vertical axis to the given angle (yaw)
 	virtual void setPitch( Real radians ) override;									///< Rotate the view around the horizontal axis to the given angle (pitch)
@@ -188,9 +188,9 @@ class W3DView : public View, public SubsystemInterface
  	virtual void rotateCamera(Real rotations, Int frames, Real easeIn, Real easeOut) override;					///< Rotate camera about current viewpoint.
 	virtual void rotateCameraTowardObject(ObjectID id, Int milliseconds, Int holdMilliseconds, Real easeIn, Real easeOut) override;	///< Rotate camera to face an object, and hold on it
 	virtual void rotateCameraTowardPosition(const Coord3D *pLoc, Int milliseconds, Real easeIn, Real easeOut, Bool reverseRotation) override;	///< Rotate camera to face a location.
-	virtual void cameraModFreezeTime(){ m_freezeTimeForCameraMovement = true;}					///< Freezes time during the next camera movement.
+	virtual void cameraModFreezeTime() override { m_freezeTimeForCameraMovement = true;}					///< Freezes time during the next camera movement.
 	virtual void cameraModFreezeAngle() override;												///< Freezes time during the next camera movement.
-	virtual Bool isTimeFrozen(){ return m_freezeTimeForCameraMovement;}					///< Freezes time during the next camera movement.
+	virtual Bool isTimeFrozen() override { return m_freezeTimeForCameraMovement;}					///< Freezes time during the next camera movement.
 	virtual void cameraModFinalZoom(Real finalZoom, Real easeIn, Real easeOut) override;	///< Final zoom for current camera movement.
 	virtual void cameraModRollingAverage(Int framesToAverage) override;			///< Number of frames to average movement for current camera movement.
 	virtual void cameraModFinalTimeMultiplier(Int finalMultiplier) override; ///< Final time multiplier for current camera movement.
@@ -314,7 +314,7 @@ class W3DView : public View, public SubsystemInterface
 	void clipCameraIntoAreaConstraints();
 	Bool isWithinCameraAreaConstraints() const;
 	Bool isWithinCameraHeightConstraints() const;
-	virtual void setUserControlled(Bool value);
+	virtual void setUserControlled(Bool value) override;
 	Bool hasScriptedState(ScriptedState state) const;
 	void addScriptedState(ScriptedState state);
 	void removeScriptedState(ScriptedState state);

Core/Libraries/Source/WWVegas/WW3D2/texture.h

@@ -261,7 +261,7 @@ class TextureBaseClass : public RefCountClass
 ** modes.
 **
 *************************************************************************/
-class TextureClass : public TextureBaseClass
+class TextureClass : public W3DMPO, public TextureBaseClass
 {
 	W3DMPO_GLUE(TextureClass)
 //	friend DX8Wrapper;

Core/Libraries/Source/WWVegas/WWAudio/FilteredSound.h

@@ -65,7 +65,7 @@ class FilteredSoundClass : public SoundPseudo3DClass
 		//////////////////////////////////////////////////////////////////////
 		//	Identification methods
 		//////////////////////////////////////////////////////////////////////
-		virtual SOUND_CLASSID	Get_Class_ID () { return CLASSID_FILTERED; }
+		virtual SOUND_CLASSID	Get_Class_ID () const override { return CLASSID_FILTERED; }
 
 		//////////////////////////////////////////////////////////////////////
 		//	Conversion methods

Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h

@@ -145,7 +145,7 @@ class Sound3DClass : public AudibleSoundClass
 		//	This is the distance where the sound can not be heard any longer.  (its vol is 0)
 		//
 		virtual void			Set_DropOff_Radius (float radius = 1) override;
-		virtual float			Get_DropOff_Radius ()  {return(m_DropOffRadius);}
+		virtual float			Get_DropOff_Radius () const override {return(m_DropOffRadius);}
 
 		// From PersistClass
 		virtual const PersistFactoryClass &	Get_Factory () const override;

Core/Libraries/Source/WWVegas/WWLib/always.h

@@ -144,7 +144,7 @@ private: \
 		return The##ARGCLASS##Pool; \
 	} \
 protected: \
-	virtual void glueEnforcer() const { } \
+	virtual void glueEnforcer() const override { } \
 public: \
 	inline void* operator new(size_t s) { return allocateFromW3DMemPool(getClassMemoryPool(), s); } \
 	inline void operator delete(void *p) { freeFromW3DMemPool(getClassMemoryPool(), p); } \

Core/Libraries/Source/WWVegas/WWMath/cardinalspline.cpp

@@ -218,9 +218,9 @@ bool CardinalSpline3DClass::Load(ChunkLoadClass &cload)
 /*
 ** CardinalSpline1DClass Implementation
 */
-int CardinalSpline1DClass::Add_Key(float point,float t)
+int CardinalSpline1DClass::Add_Key(float point,float t,unsigned int extra)
 {
-	int index = HermiteSpline1DClass::Add_Key(point,t);
+	int index = HermiteSpline1DClass::Add_Key(point,t,extra);
 	float tightness = 0.5f;
 	Tightness.Insert(index,tightness);
 	return index;

Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h

@@ -74,7 +74,7 @@ class CardinalSpline1DClass : public HermiteSpline1DClass
 {
 public:
 
-	virtual int			Add_Key(float point,float t);
+	virtual int			Add_Key(float point,float t,unsigned int extra=0) override;
 	virtual void		Remove_Key(int i) override;
 	virtual void		Clear_Keys() override;
 

Core/Tools/ParticleEditor/CColorAlphaDialog.h

@@ -40,7 +40,7 @@ class CColorAlphaDialog : public CDialog
 
 
 	protected:
-		virtual BOOL OnInitDialog();
+		virtual BOOL OnInitDialog() override;
 
 		afx_msg void OnColor1();
 		afx_msg void OnColor2();