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

Author: Caball009

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() {
-}