From dcecfee629b014101077e6d77530933e5f7410ae Mon Sep 17 00:00:00 2001
From: bobtista <bobtista@gmail.com>
Date: Wed, 24 Dec 2025 11:51:27 -0500
Subject: [PATCH 1/8] applied clang-tidy
 cppcoreguidelines-explicit-virtual-functions fixes

---
 .../Source/GameNetwork/GameSpy/GSConfig.cpp   | 42 ++++-----
 .../W3DDevice/GameClient/W3DShaderManager.cpp | 84 +++++++++---------
 .../W3DDevice/GameClient/W3DTerrainVisual.cpp |  4 +-
 .../W3DDevice/GameClient/W3DTreeBuffer.cpp    |  2 +-
 .../W3DDevice/GameClient/WorldHeightMap.cpp   |  2 +-
 .../GameEngine/Source/GameClient/FXList.cpp   | 24 ++---
 .../GUI/GUICallbacks/Menus/DownloadMenu.cpp   | 10 +--
 .../GameEngine/Source/GameClient/GameText.cpp | 24 ++---
 .../GameEngine/Source/GameLogic/AI/AI.cpp     |  4 +-
 .../Source/GameLogic/AI/AIStates.cpp          | 12 +--
 .../GameLogic/Object/ObjectCreationList.cpp   | 16 ++--
 .../Update/AIUpdate/ChinookAIUpdate.cpp       | 56 ++++++------
 .../Object/Update/AIUpdate/DozerAIUpdate.cpp  | 66 +++++++-------
 .../Object/Update/AIUpdate/JetAIUpdate.cpp    | 86 +++++++++---------
 .../Update/AIUpdate/RailroadGuideAIUpdate.cpp |  2 +-
 .../Update/AIUpdate/SupplyTruckAIUpdate.cpp   | 24 ++---
 .../Object/Update/AIUpdate/WorkerAIUpdate.cpp | 20 ++---
 .../Object/Update/FireSpreadUpdate.cpp        |  2 +-
 .../GameLogic/Object/Update/HordeUpdate.cpp   |  2 +-
 .../Object/Update/StealthDetectorUpdate.cpp   |  2 +-
 .../Object/Update/TensileFormationUpdate.cpp  |  2 +-
 .../ScriptEngine/VictoryConditions.cpp        | 24 ++---
 .../GameEngine/Source/GameClient/FXList.cpp   | 24 ++---
 .../GUI/GUICallbacks/Menus/DownloadMenu.cpp   | 10 +--
 .../GameEngine/Source/GameClient/GameText.cpp | 24 ++---
 .../GameEngine/Source/GameLogic/AI/AI.cpp     |  4 +-
 .../Source/GameLogic/AI/AIStates.cpp          | 12 +--
 .../GameLogic/Object/ObjectCreationList.cpp   | 16 ++--
 .../Update/AIUpdate/ChinookAIUpdate.cpp       | 66 +++++++-------
 .../Object/Update/AIUpdate/DozerAIUpdate.cpp  | 66 +++++++-------
 .../Object/Update/AIUpdate/JetAIUpdate.cpp    | 88 +++++++++----------
 .../Update/AIUpdate/RailroadGuideAIUpdate.cpp |  2 +-
 .../Update/AIUpdate/SupplyTruckAIUpdate.cpp   | 24 ++---
 .../Object/Update/AIUpdate/WorkerAIUpdate.cpp | 20 ++---
 .../Object/Update/FireSpreadUpdate.cpp        |  2 +-
 .../GameLogic/Object/Update/HordeUpdate.cpp   |  2 +-
 .../Object/Update/SpectreGunshipUpdate.cpp    |  2 +-
 .../Object/Update/StealthDetectorUpdate.cpp   |  2 +-
 .../Object/Update/TensileFormationUpdate.cpp  |  2 +-
 .../ScriptEngine/VictoryConditions.cpp        | 24 ++---
 .../Source/WWVegas/WW3D2/assetmgr.cpp         | 26 +++---
 .../Libraries/Source/WWVegas/WW3D2/dazzle.cpp |  6 +-
 42 files changed, 466 insertions(+), 466 deletions(-)

diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp
index c4d593bbe1a..750477e0018 100644
--- a/Core/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp
+++ b/Core/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp
@@ -45,40 +45,40 @@ class GameSpyConfig : public GameSpyConfigInterface
 {
 public:
 	GameSpyConfig( AsciiString config );
-	~GameSpyConfig() {}
+	~GameSpyConfig() override {}
 
 	// Pings
-	std::list<AsciiString> getPingServers(void)	{ return m_pingServers; }
-	Int getNumPingRepetitions(void)							{ return m_pingReps; }
-	Int getPingTimeoutInMs(void)								{ return m_pingTimeout; }
-	virtual Int getPingCutoffGood( void )				{	return m_pingCutoffGood; }
-	virtual Int getPingCutoffBad( void )				{ return m_pingCutoffBad;	}
+	std::list<AsciiString> getPingServers(void) override	{ return m_pingServers; }
+	Int getNumPingRepetitions(void) override							{ return m_pingReps; }
+	Int getPingTimeoutInMs(void) override								{ return m_pingTimeout; }
+	Int getPingCutoffGood( void ) override				{	return m_pingCutoffGood; }
+	Int getPingCutoffBad( void ) override				{ return m_pingCutoffBad;	}
 
 	// QM
-	std::list<AsciiString> getQMMaps(void)			{ return m_qmMaps; }
-	Int getQMBotID(void)												{ return m_qmBotID; }
-	Int getQMChannel(void)											{ return m_qmChannel; }
-	void setQMChannel(Int channel)							{ m_qmChannel = channel; }
+	std::list<AsciiString> getQMMaps(void) override			{ return m_qmMaps; }
+	Int getQMBotID(void) override												{ return m_qmBotID; }
+	Int getQMChannel(void) override											{ return m_qmChannel; }
+	void setQMChannel(Int channel) override							{ m_qmChannel = channel; }
 
 	// Player Info
-	Int getPointsForRank(Int rank);
-	virtual Bool isPlayerVIP(Int id);
+	Int getPointsForRank(Int rank) override;
+	Bool isPlayerVIP(Int id) override;
 
-	virtual Bool getManglerLocation(Int index, AsciiString& host, UnsignedShort& port);
+	Bool getManglerLocation(Int index, AsciiString& host, UnsignedShort& port) override;
 
 	// Ladder / Any other external parsing
-	AsciiString getLeftoverConfig(void)					{ return m_leftoverConfig; }
+	AsciiString getLeftoverConfig(void) override					{ return m_leftoverConfig; }
 
 	// NAT Timeouts
-	virtual Int getTimeBetweenRetries() { return m_natRetryInterval; }
-	virtual Int getMaxManglerRetries() { return m_natMaxManglerRetries; }
-	virtual time_t getRetryInterval() { return m_natManglerRetryInterval; }
-	virtual time_t getKeepaliveInterval() { return m_natKeepaliveInterval; }
-	virtual time_t getPortTimeout() { return m_natPortTimeout; }
-	virtual time_t getRoundTimeout() { return m_natRoundTimeout; }
+	Int getTimeBetweenRetries() override { return m_natRetryInterval; }
+	Int getMaxManglerRetries() override { return m_natMaxManglerRetries; }
+	time_t getRetryInterval() override { return m_natManglerRetryInterval; }
+	time_t getKeepaliveInterval() override { return m_natKeepaliveInterval; }
+	time_t getPortTimeout() override { return m_natPortTimeout; }
+	time_t getRoundTimeout() override { return m_natRoundTimeout; }
 
 	// Custom match
-	virtual Bool restrictGamesToLobby() { return m_restrictGamesToLobby; }
+	Bool restrictGamesToLobby() override { return m_restrictGamesToLobby; }
 
 protected:
 	std::list<AsciiString> m_pingServers;
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp
index 94c9331c4d7..96d3ec2709e 100644
--- a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp
@@ -120,13 +120,13 @@ IDirect3DSurface8 *W3DShaderManager::m_oldDepthSurface=nullptr;	///<previous dep
 class ScreenDefaultFilter : public W3DFilterInterface
 {
 public:
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode); ///< Set up at start of render.  Only applies to screen filter shaders.
-	virtual Bool postRender(FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender); ///< Called after render.  Only applies to screen filter shaders.
-	virtual Bool setup(FilterModes mode){return true;} ///< Called when the filter is started, one time before the first prerender.
+	Int init(void) override;			///<perform any one time initialization and validation
+	Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode) override; ///< Set up at start of render.  Only applies to screen filter shaders.
+	Bool postRender(FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender) override; ///< Called after render.  Only applies to screen filter shaders.
+	Bool setup(FilterModes mode) override{return true;} ///< Called when the filter is started, one time before the first prerender.
 protected:
-	virtual Int set(FilterModes mode);		///<setup shader for the specified rendering pass.
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
+	Int set(FilterModes mode) override;		///<setup shader for the specified rendering pass.
+	void reset(void) override;		///<do any custom resetting necessary to bring W3D in sync.
 };
 
 ScreenDefaultFilter screenDefaultFilter;
@@ -1177,9 +1177,9 @@ Int ScreenMotionBlurFilter::shutdown(void)
 ///Shroud layer rendering shader
 class ShroudTextureShader : public W3DShaderInterface
 {
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
+	Int set(Int pass) override;		///<setup shader for the specified rendering pass.
+	Int init(void) override;			///<perform any one time initialization and validation
+	void reset(void) override;		///<do any custom resetting necessary to bring W3D in sync.
 	Int m_stageOfSet;
 } shroudTextureShader;
 
@@ -1277,9 +1277,9 @@ void ShroudTextureShader::reset(void)
 ///Shroud layer rendering shader
 class FlatShroudTextureShader : public W3DShaderInterface
 {
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
+	Int set(Int pass) override;		///<setup shader for the specified rendering pass.
+	Int init(void) override;			///<perform any one time initialization and validation
+	void reset(void) override;		///<do any custom resetting necessary to bring W3D in sync.
 	Int m_stageOfSet;
 } flatShroudTextureShader;
 
@@ -1370,9 +1370,9 @@ void FlatShroudTextureShader::reset(void)
 ///Mask layer rendering shader
 class MaskTextureShader : public W3DShaderInterface
 {
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
+	Int set(Int pass) override;		///<setup shader for the specified rendering pass.
+	Int init(void) override;			///<perform any one time initialization and validation
+	void reset(void) override;		///<do any custom resetting necessary to bring W3D in sync.
 } maskTextureShader;
 
 ///List of different shroud shader implementations in order of preference
@@ -1486,9 +1486,9 @@ class TerrainShader2Stage : public W3DShaderInterface
 	float m_xOffset;
 	float m_yOffset;
 
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
+	Int set(Int pass) override;		///<setup shader for the specified rendering pass.
+	Int init(void) override;			///<perform any one time initialization and validation
+	void reset(void) override;		///<do any custom resetting necessary to bring W3D in sync.
 
 	void updateCloud();
 	void updateNoise1 (D3DXMATRIX *destMatrix,D3DXMATRIX *curViewInverse, Bool doUpdate=true);	///<generate the uv coordinates for Noise1 (i.e clouds)
@@ -1499,9 +1499,9 @@ class TerrainShader2Stage : public W3DShaderInterface
 class FlatTerrainShader2Stage : public W3DShaderInterface
 {
 public:
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
+	Int set(Int pass) override;		///<setup shader for the specified rendering pass.
+	Int init(void) override;			///<perform any one time initialization and validation
+	void reset(void) override;		///<do any custom resetting necessary to bring W3D in sync.
 } flatTerrainShader2Stage;
 
 ///regular terrain shader that should work on all multi-texture video cards (slowest version)
@@ -1512,18 +1512,18 @@ class FlatTerrainShaderPixelShader : public W3DShaderInterface
 	DWORD					m_dwBaseNoise1PixelShader;	///<handle to terrain/single noise D3D pixel shader
 	DWORD					m_dwBaseNoise2PixelShader;	///<handle to terrain/double noise D3D pixel shader
 	DWORD					m_dwBase0PixelShader;	///<handle to terrain only pixel shader
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	virtual Int shutdown(void);			///<release resources used by shader
+	Int set(Int pass) override;		///<setup shader for the specified rendering pass.
+	Int init(void) override;			///<perform any one time initialization and validation
+	void reset(void) override;		///<do any custom resetting necessary to bring W3D in sync.
+	Int shutdown(void) override;			///<release resources used by shader
 } flatTerrainShaderPixelShader;
 
 ///8 stage terrain shader which only works on certain Nvidia cards.
 class TerrainShader8Stage : public W3DShaderInterface
 {
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	virtual Int init(void);			///<perform any one time initialization and validation
+	Int set(Int pass) override;		///<setup shader for the specified rendering pass.
+	void reset(void) override;		///<do any custom resetting necessary to bring W3D in sync.
+	Int init(void) override;			///<perform any one time initialization and validation
 } terrainShader8Stage;
 
 //Offsets into constant register pool used by vertex shader
@@ -1536,10 +1536,10 @@ class TerrainShaderPixelShader : public W3DShaderInterface
 	DWORD					m_dwBaseNoise1PixelShader;	///<handle to terrain/single noise D3D pixel shader
 	DWORD					m_dwBaseNoise2PixelShader;	///<handle to terrain/double noise D3D pixel shader
 
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual Int shutdown(void);			///<release resources used by shader
+	Int set(Int pass) override;		///<setup shader for the specified rendering pass.
+	void reset(void) override;		///<do any custom resetting necessary to bring W3D in sync.
+	Int init(void) override;			///<perform any one time initialization and validation
+	Int shutdown(void) override;			///<release resources used by shader
 } terrainShaderPixelShader;
 
 ///List of different terrain shader implementations in order of preference
@@ -2133,9 +2133,9 @@ void TerrainShaderPixelShader::reset(void)
 ///Cloud layer rendering shader - used for objects similar to terrain which only need the cloud layer.
 class CloudTextureShader : public W3DShaderInterface
 {
-	virtual Int set(Int stage);		///<setup shader for the specified rendering pass.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
+	Int set(Int stage) override;		///<setup shader for the specified rendering pass.
+	Int init(void) override;			///<perform any one time initialization and validation
+	void reset(void) override;		///<do any custom resetting necessary to bring W3D in sync.
 	Int m_stageOfSet;
 } cloudTextureShader;
 
@@ -2208,18 +2208,18 @@ class RoadShaderPixelShader : public W3DShaderInterface
 {
 	DWORD					m_dwBaseNoise2PixelShader;	///<handle to road/double noise D3D pixel shader
 
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual Int shutdown(void);			///<release resources used by shader
+	Int set(Int pass) override;		///<setup shader for the specified rendering pass.
+	void reset(void) override;		///<do any custom resetting necessary to bring W3D in sync.
+	Int init(void) override;			///<perform any one time initialization and validation
+	Int shutdown(void) override;			///<release resources used by shader
 } roadShaderPixelShader;
 
 class RoadShader2Stage : public W3DShaderInterface
 {	friend class RoadShaderPixelShader;	//pixel shader version uses some of the same features.
 
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual void reset(void);
+	Int set(Int pass) override;		///<setup shader for the specified rendering pass.
+	Int init(void) override;			///<perform any one time initialization and validation
+	void reset(void) override;
 } roadShader2Stage;
 
 ///List of different terrain shader implementations in order of preference
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
index c76cdb1a23e..d67c42f1c71 100644
--- a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
@@ -69,7 +69,7 @@
 class TestSeismicFilter : public SeismicSimulationFilterBase
 {
 
-  virtual SeismicSimStatusCode filterCallback( WorldHeightMapInterfaceClass *heightMap, const SeismicSimulationNode *node )
+  SeismicSimStatusCode filterCallback( WorldHeightMapInterfaceClass *heightMap, const SeismicSimulationNode *node ) override
   {
 
 
@@ -140,7 +140,7 @@ class TestSeismicFilter : public SeismicSimulationFilterBase
       return SEISMIC_STATUS_ZERO_ENERGY;
   }
 
-  virtual Real applyGravityCallback( Real velocityIn )
+  Real applyGravityCallback( Real velocityIn ) override
   {
     Real velocityOut = velocityIn;
     velocityOut -= 1.5f;
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
index 204b14ec293..3c6724deae9 100644
--- a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
@@ -421,7 +421,7 @@ class GDIFileStream2 : public InputStream
 public:
 	GDIFileStream2():m_file(nullptr) {};
 	GDIFileStream2(File* pFile):m_file(pFile) {};
-	virtual Int read(void *pData, Int numBytes) {
+	Int read(void *pData, Int numBytes) override {
 		return(m_file?m_file->read(pData, numBytes):0);
 	};
 };
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp
index 92715500831..c51e928956d 100644
--- a/Core/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp
@@ -73,7 +73,7 @@ class GDIFileStream : public InputStream
 	File* m_file;
 public:
 	GDIFileStream(File* pFile):m_file(pFile) {};
-	virtual Int read(void *pData, Int numBytes) {
+	Int read(void *pData, Int numBytes) override {
 			return(m_file->read(pData, numBytes));
 	};
 };
diff --git a/Generals/Code/GameEngine/Source/GameClient/FXList.cpp b/Generals/Code/GameEngine/Source/GameClient/FXList.cpp
index 6290a3ddaac..324af0ef91d 100644
--- a/Generals/Code/GameEngine/Source/GameClient/FXList.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/FXList.cpp
@@ -95,7 +95,7 @@ class SoundFXNugget : public FXNugget
 
 public:
 
-	virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const
+	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override
 	{
 		AudioEventRTS sound(m_soundName);
 
@@ -107,7 +107,7 @@ class SoundFXNugget : public FXNugget
 		TheAudio->addAudioEvent(&sound);
 	}
 
-	virtual void doFXObj(const Object* primary, const Object* secondary = nullptr) const
+	void doFXObj(const Object* primary, const Object* secondary = nullptr) const override
 	{
 		AudioEventRTS sound(m_soundName);
 		if (primary)
@@ -165,7 +165,7 @@ class TracerFXNugget : public FXNugget
 		m_probability = 1.0f;
 	}
 
-	virtual void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real primarySpeed, const Coord3D *secondary, const Real /*overrideRadius*/ ) const
+	void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real primarySpeed, const Coord3D *secondary, const Real /*overrideRadius*/ ) const override
 	{
 		if (m_probability <= GameClientRandomValueReal(0, 1))
 			return;
@@ -263,7 +263,7 @@ class RayEffectFXNugget : public FXNugget
 		m_secondaryOffset.x = m_secondaryOffset.y = m_secondaryOffset.z = 0;
 	}
 
-	virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * secondary, const Real /*overrideRadius*/ ) const
+	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * secondary, const Real /*overrideRadius*/ ) const override
 	{
 		const ThingTemplate* tmpl = TheThingFactory->findTemplate(m_templateName);
 		DEBUG_ASSERTCRASH(tmpl, ("RayEffect %s not found",m_templateName.str()));
@@ -320,7 +320,7 @@ class LightPulseFXNugget : public FXNugget
 		m_color.red = m_color.green = m_color.blue = 0;
 	}
 
-	virtual void doFXObj(const Object* primary, const Object* /*secondary*/) const
+	void doFXObj(const Object* primary, const Object* /*secondary*/) const override
 	{
 		if (primary)
 		{
@@ -337,7 +337,7 @@ class LightPulseFXNugget : public FXNugget
 		}
 	}
 
-	virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const
+	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override
 	{
 		if (primary)
 		{
@@ -385,7 +385,7 @@ class ViewShakeFXNugget : public FXNugget
 	{
 	}
 
-	virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const
+	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override
 	{
 		if (primary)
 		{
@@ -445,7 +445,7 @@ class TerrainScorchFXNugget : public FXNugget
 	{
 	}
 
-	virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const
+	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override
 	{
 		if (primary)
 		{
@@ -523,7 +523,7 @@ class ParticleSystemFXNugget : public FXNugget
 		m_rotateX = m_rotateY = m_rotateZ = 0;
 	}
 
-	virtual void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real overrideRadius ) const
+	void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real overrideRadius ) const override
 	{
 		if (primary)
 		{
@@ -535,7 +535,7 @@ class ParticleSystemFXNugget : public FXNugget
 		}
 	}
 
-	virtual void doFXObj(const Object* primary, const Object* secondary) const
+	void doFXObj(const Object* primary, const Object* secondary) const override
 	{
 		if (primary)
 		{
@@ -694,12 +694,12 @@ class FXListAtBonePosFXNugget : public FXNugget
     m_orientToBone = true;
 	}
 
-	virtual void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const
+	void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override
 	{
 		DEBUG_CRASH(("You must use the object form for this effect"));
 	}
 
-	virtual void doFXObj(const Object* primary, const Object* /*secondary*/) const
+	void doFXObj(const Object* primary, const Object* /*secondary*/) const override
 	{
 		if (primary)
 		{
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
index 0bb3ba5f974..92878f9bd3f 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
@@ -122,11 +122,11 @@ class DownloadManagerMunkee : public DownloadManager
 {
 public:
 	DownloadManagerMunkee() {m_shouldQuitOnSuccess = true; m_shouldQuitOnSuccess = false;}
-	virtual HRESULT OnError( Int error );
-	virtual HRESULT OnEnd();
-	virtual HRESULT OnProgressUpdate( Int bytesread, Int totalsize, Int timetaken, Int timeleft );
-	virtual HRESULT OnStatusUpdate( Int status );
-	virtual HRESULT downloadFile( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume );
+	HRESULT OnError( Int error ) override;
+	HRESULT OnEnd() override;
+	HRESULT OnProgressUpdate( Int bytesread, Int totalsize, Int timetaken, Int timeleft ) override;
+	HRESULT OnStatusUpdate( Int status ) override;
+	HRESULT downloadFile( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume ) override;
 
 private:
 	Bool m_shouldQuitOnSuccess;
diff --git a/Generals/Code/GameEngine/Source/GameClient/GameText.cpp b/Generals/Code/GameEngine/Source/GameClient/GameText.cpp
index e0ecde33a31..93680f5e397 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GameText.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GameText.cpp
@@ -138,23 +138,23 @@ class GameTextManager : public GameTextInterface
 	public:
 
 		GameTextManager();
-		virtual ~GameTextManager();
+		~GameTextManager() override;
 
-		virtual void					init( void );						///< Initializes the text system
+		void					init( void ) override;						///< Initializes the text system
 		virtual void					deinit( void );					///< Shuts down the text system
-		virtual void					update( void ) {};			///< update text manager
-		virtual void					reset( void );					///< Resets the text system
+		void					update( void ) override {};			///< update text manager
+		void					reset( void ) override;					///< Resets the text system
 
-		virtual UnicodeString fetch( const Char *label, Bool *exists = nullptr );		///< Returns the associated labeled unicode text
-		virtual UnicodeString fetch( AsciiString label, Bool *exists = nullptr );		///< Returns the associated labeled unicode text
-		virtual UnicodeString fetchFormat( const Char *label, ... );
-		virtual UnicodeString fetchOrSubstitute( const Char *label, const WideChar *substituteText );
-		virtual UnicodeString fetchOrSubstituteFormat( const Char *label, const WideChar *substituteFormat, ... );
-		virtual UnicodeString fetchOrSubstituteFormatVA( const Char *label, const WideChar *substituteFormat, va_list args );
+		UnicodeString fetch( const Char *label, Bool *exists = nullptr ) override;		///< Returns the associated labeled unicode text
+		UnicodeString fetch( AsciiString label, Bool *exists = nullptr ) override;		///< Returns the associated labeled unicode text
+		UnicodeString fetchFormat( const Char *label, ... ) override;
+		UnicodeString fetchOrSubstitute( const Char *label, const WideChar *substituteText ) override;
+		UnicodeString fetchOrSubstituteFormat( const Char *label, const WideChar *substituteFormat, ... ) override;
+		UnicodeString fetchOrSubstituteFormatVA( const Char *label, const WideChar *substituteFormat, va_list args ) override;
 
-		virtual AsciiStringVec& getStringsWithLabelPrefix(AsciiString label);
+		AsciiStringVec& getStringsWithLabelPrefix(AsciiString label) override;
 
-		virtual void					initMapStringFile( const AsciiString& filename );
+		void					initMapStringFile( const AsciiString& filename ) override;
 
 	protected:
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp
index 81cc830ee89..cc5c5a8d138 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp
@@ -513,7 +513,7 @@ class PartitionFilterLiveMapEnemies : public PartitionFilter
 public:
 	PartitionFilterLiveMapEnemies(const Object *obj) : m_obj(obj) { }
 
-	virtual Bool allow(Object *objOther)
+	Bool allow(Object *objOther) override
 	{
 		// this is way fast (bit test) so do it first.
 		if (objOther->isEffectivelyDead())
@@ -543,7 +543,7 @@ class PartitionFilterWithinAttackRange : public PartitionFilter
 public:
 	PartitionFilterWithinAttackRange(const Object* obj) : m_obj(obj) { }
 
-	virtual Bool allow(Object* objOther)
+	Bool allow(Object* objOther) override
 	{
 		for (Int i = 0; i < WEAPONSLOT_COUNT;	i++ )
 		{
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
index bef5b206ba8..58e6383372b 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
@@ -1906,9 +1906,9 @@ class AIAttackMoveStateMachine : public StateMachine
 
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess();
+	void crc( Xfer *xfer ) override;
+	void xfer( Xfer *xfer ) override;
+	void loadPostProcess() override;
 };
 
 // ------------------------------------------------------------------------------------------------
@@ -5535,9 +5535,9 @@ class AIAttackThenIdleStateMachine : public StateMachine
 	AIAttackThenIdleStateMachine( Object *owner, AsciiString name );
 protected:
 	// snapshot interface .
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess();
+	void crc( Xfer *xfer ) override;
+	void xfer( Xfer *xfer ) override;
+	void loadPostProcess() override;
 };
 
 // ------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
index 57d77b20d77..19e788423e9 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
@@ -123,7 +123,7 @@ class FireWeaponNugget : public ObjectCreationNugget
 	{
 	}
 
-	virtual Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const
+	Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const override
 	{
 		if (!primaryObj || !primary || !secondary)
 		{
@@ -170,7 +170,7 @@ class AttackNugget : public ObjectCreationNugget
 	{
 	}
 
-	virtual Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const
+	Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const override
 	{
 		if (!primaryObj || !primary || !secondary)
 		{
@@ -252,12 +252,12 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 		m_transportName.clear();
 	}
 
-	virtual Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, UnsignedInt lifetimeFrames = 0 ) const
+	Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, UnsignedInt lifetimeFrames = 0 ) const override
 	{
 		return create( primaryObj, primary, secondary, true, lifetimeFrames );
 	}
 
-	virtual Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Bool createOwner, UnsignedInt lifetimeFrames = 0 ) const
+	Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Bool createOwner, UnsignedInt lifetimeFrames = 0 ) const override
 	{
 		if (!primaryObj || !primary || !secondary)
 		{
@@ -610,7 +610,7 @@ class ApplyRandomForceNugget : public ObjectCreationNugget
 	{
 	}
 
-	virtual Object* create( const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const
+	Object* create( const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const override
 	{
 		if (primary)
 		{
@@ -641,7 +641,7 @@ class ApplyRandomForceNugget : public ObjectCreationNugget
 		return nullptr;
 	}
 
-	virtual Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const
+	Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const override
 	{
 		DEBUG_CRASH(("You must call this effect with an object, not a location"));
 		return nullptr;
@@ -765,7 +765,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 		m_offset.zero();
 	}
 
-	virtual Object* create(const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const
+	Object* create(const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const override
 	{
 		if (primary)
 		{
@@ -781,7 +781,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 		return nullptr;
 	}
 
-	virtual Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const
+	Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const override
 	{
 		if (primary)
 		{
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
index 399e6a73f04..26bd4c7abf1 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
@@ -110,13 +110,13 @@ class ChinookEvacuateState : public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookEvacuateState, "ChinookEvacuateState")
 protected:
 	// snapshot interface	STUBBED - no member vars to save. jba.
-	virtual void crc( Xfer *xfer ){};
-	virtual void xfer( Xfer *xfer ){};
-	virtual void loadPostProcess(){};
+	void crc( Xfer *xfer ) override{};
+	void xfer( Xfer *xfer ) override{};
+	void loadPostProcess() override{};
 public:
 	ChinookEvacuateState( StateMachine *machine ) : State( machine, "ChinookEvacuateState" ) { }
 
-	StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* obj = getMachineOwner();
 		if( obj->getContain() )
@@ -127,7 +127,7 @@ class ChinookEvacuateState : public State
 		return STATE_SUCCESS;
 	}
 
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		return STATE_SUCCESS;
 	}
@@ -141,13 +141,13 @@ class ChinookHeadOffMapState :  public State
 	//I'm outta here
 protected:
 	// snapshot interface	STUBBED - no member vars to save. jba.
-	virtual void crc( Xfer *xfer ){};
-	virtual void xfer( Xfer *xfer ){};
-	virtual void loadPostProcess(){};
+	void crc( Xfer *xfer ) override{};
+	void xfer( Xfer *xfer ) override{};
+	void loadPostProcess() override{};
 public:
 	ChinookHeadOffMapState( StateMachine *machine ) : State( machine, "ChinookHeadOffMapState" ) {}
 
-	StateReturnType onEnter() // Give move order out of town
+	StateReturnType onEnter() override // Give move order out of town
 	{
 		Object *owner = getMachineOwner();
 		AIUpdateInterface *ai = owner->getAIUpdateInterface();
@@ -170,7 +170,7 @@ class ChinookHeadOffMapState :  public State
 		return STATE_CONTINUE;
 	}
 
-	StateReturnType update()
+	StateReturnType update() override
 	{
 		Object *owner = getMachineOwner();
 
@@ -197,12 +197,12 @@ class ChinookTakeoffOrLandingState : public State
 
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer )
+	void crc( Xfer *xfer ) override
 	{
 		// empty
 	}
 
-	virtual void xfer( Xfer *xfer )
+	void xfer( Xfer *xfer ) override
 	{
 		// version
 		XferVersion currentVersion = 1;
@@ -213,7 +213,7 @@ class ChinookTakeoffOrLandingState : public State
 		xfer->xferBool(&m_landing);
 	}
 
-	virtual void loadPostProcess()
+	void loadPostProcess() override
 	{
 		// empty
 	}
@@ -224,7 +224,7 @@ class ChinookTakeoffOrLandingState : public State
 		m_destLoc.zero();
 	}
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -281,7 +281,7 @@ class ChinookTakeoffOrLandingState : public State
 		return STATE_CONTINUE;
 	}
 
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		Object* obj = getMachineOwner();
 		if (obj->isEffectivelyDead())
@@ -299,7 +299,7 @@ class ChinookTakeoffOrLandingState : public State
 		return STATE_CONTINUE;
 	}
 
-	virtual void onExit( StateExitType status )
+	void onExit( StateExitType status ) override
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -415,12 +415,12 @@ class ChinookCombatDropState : public State
 
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer )
+	void crc( Xfer *xfer ) override
 	{
 		// empty
 	}
 
-	virtual void xfer( Xfer *xfer )
+	void xfer( Xfer *xfer ) override
 	{
 		// version
 		const XferVersion currentVersion = 2;
@@ -467,7 +467,7 @@ class ChinookCombatDropState : public State
 		}
 	}
 
-	virtual void loadPostProcess()
+	void loadPostProcess() override
 	{
 		for (std::vector<RopeInfo>::iterator it = m_ropes.begin(); it != m_ropes.end(); ++it)
 		{
@@ -481,7 +481,7 @@ class ChinookCombatDropState : public State
 	ChinookCombatDropState( StateMachine *machine ): State( machine, "ChinookCombatDropState" ) { }
 
 	// --------------
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* obj = getMachineOwner();
 		Drawable* draw = obj->getDrawable();
@@ -547,7 +547,7 @@ class ChinookCombatDropState : public State
 	}
 
 	// --------------
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -639,7 +639,7 @@ class ChinookCombatDropState : public State
 	}
 
 	// --------------
-	virtual void onExit( StateExitType status )
+	void onExit( StateExitType status ) override
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -697,12 +697,12 @@ class ChinookMoveToBldgState : public AIMoveToState
 	Real m_destZ;
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer )
+	void crc( Xfer *xfer ) override
 	{
 		// empty
 	}
 
-	virtual void xfer( Xfer *xfer )
+	void xfer( Xfer *xfer ) override
 	{
 		// version
 		XferVersion currentVersion = 1;
@@ -714,7 +714,7 @@ class ChinookMoveToBldgState : public AIMoveToState
 		xfer->xferReal(&m_destZ);
 	}
 
-	virtual void loadPostProcess()
+	void loadPostProcess() override
 	{
 		// empty
 	}
@@ -722,7 +722,7 @@ class ChinookMoveToBldgState : public AIMoveToState
 public:
 	ChinookMoveToBldgState( StateMachine *machine ): AIMoveToState( machine ) { }
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -753,7 +753,7 @@ class ChinookMoveToBldgState : public AIMoveToState
 		return AIMoveToState::onEnter();
 	}
 
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		Object* obj = getMachineOwner();
 
@@ -767,7 +767,7 @@ class ChinookMoveToBldgState : public AIMoveToState
 		return status;
 	}
 
-	virtual void onExit( StateExitType status )
+	void onExit( StateExitType status ) override
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
index 13478282f35..0c1f27bf541 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
@@ -86,13 +86,13 @@ class DozerActionPickActionPosState : public State
 public:
 
 	DozerActionPickActionPosState( StateMachine *machine, DozerTask task );
-	virtual StateReturnType update( void );
+	StateReturnType update( void ) override;
 
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess();
+	void crc( Xfer *xfer ) override;
+	void xfer( Xfer *xfer ) override;
+	void loadPostProcess() override;
 
 protected:
 
@@ -243,13 +243,13 @@ class DozerActionMoveToActionPosState : public State
 public:
 
 	DozerActionMoveToActionPosState( StateMachine *machine, DozerTask task ) : State( machine, "DozerActionMoveToActionPosState" ) { m_task = task; }
-	virtual StateReturnType update( void );
+	StateReturnType update( void ) override;
 
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess();
+	void crc( Xfer *xfer ) override;
+	void xfer( Xfer *xfer ) override;
+	void loadPostProcess() override;
 
 protected:
 
@@ -386,15 +386,15 @@ class DozerActionDoActionState : public State
 		m_task = task;
 		m_enterFrame = 0;
 	}
-	virtual StateReturnType update( void );
-	virtual StateReturnType onEnter( void );
-	virtual void onExit( StateExitType status ) { }
+	StateReturnType update( void ) override;
+	StateReturnType onEnter( void ) override;
+	void onExit( StateExitType status ) override { }
 
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess();
+	void crc( Xfer *xfer ) override;
+	void xfer( Xfer *xfer ) override;
+	void loadPostProcess() override;
 
 protected:
 
@@ -792,9 +792,9 @@ class DozerActionStateMachine : public StateMachine
 
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess();
+	void crc( Xfer *xfer ) override;
+	void xfer( Xfer *xfer ) override;
+	void loadPostProcess() override;
 
 protected:
 
@@ -967,15 +967,15 @@ class DozerPrimaryIdleState : public State
 		m_idlePlayerNumber = 0;
 		m_isMarkedAsIdle   = FALSE;
 	}
-	virtual StateReturnType update( void );
-	virtual StateReturnType onEnter( void );
-	virtual void onExit( StateExitType status );
+	StateReturnType update( void ) override;
+	StateReturnType onEnter( void ) override;
+	void onExit( StateExitType status ) override;
 
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess();
+	void crc( Xfer *xfer ) override;
+	void xfer( Xfer *xfer ) override;
+	void loadPostProcess() override;
 
 protected:
 
@@ -1154,16 +1154,16 @@ class DozerActionState : public State
 		Note that we DON'T use CONVERT_SLEEP_TO_CONTINUE; since we're not doing anything else
 		interesting in update, we can sleep when this machine sleeps
 	*/
-	virtual StateReturnType update( void ) { return m_actionMachine->updateStateMachine(); }
+	StateReturnType update( void ) override { return m_actionMachine->updateStateMachine(); }
 
-	virtual StateReturnType onEnter( void );
-	virtual void onExit( StateExitType status );
+	StateReturnType onEnter( void ) override;
+	void onExit( StateExitType status ) override;
 
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess();
+	void crc( Xfer *xfer ) override;
+	void xfer( Xfer *xfer ) override;
+	void loadPostProcess() override;
 
 protected:
 
@@ -1253,14 +1253,14 @@ class DozerPrimaryGoingHomeState : public State
 
 protected:
 	// snapshot interface	 STUBBED no member vars
-	virtual void crc( Xfer *xfer ){};
-	virtual void xfer( Xfer *xfer ){};
-	virtual void loadPostProcess(){};
+	void crc( Xfer *xfer ) override{};
+	void xfer( Xfer *xfer ) override{};
+	void loadPostProcess() override{};
 
 public:
 
 	DozerPrimaryGoingHomeState( StateMachine *machine ) : State( machine, "DozerPrimaryGoingHomeState" ) { }
-	virtual StateReturnType update( void ) { return STATE_FAILURE; }
+	StateReturnType update( void ) override { return STATE_FAILURE; }
 
 };
 EMPTY_DTOR(DozerPrimaryGoingHomeState)
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
index 5e08e1cd8a0..463d6bca28d 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
@@ -134,7 +134,7 @@ class PartitionFilterHasParkingPlace : public PartitionFilter
 #if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterHasParkingPlace"; }
 #endif
-	virtual Bool allow(Object *objOther)
+	Bool allow(Object *objOther) override
 	{
 		ParkingPlaceBehaviorInterface* pp = getPP(objOther->getID());
 		if (pp != nullptr && pp->reserveSpace(m_id, 0.0f, nullptr))
@@ -182,16 +182,16 @@ class JetAwaitingRunwayState : public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetAwaitingRunwayState, "JetAwaitingRunwayState")
 protected:
 	// snapshot interface STUBBED.
-	virtual void crc( Xfer *xfer ){};
-	virtual void xfer( Xfer *xfer ){XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
-	virtual void loadPostProcess(){};
+	void crc( Xfer *xfer ) override{};
+	void xfer( Xfer *xfer ) override{XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
+	void loadPostProcess() override{};
 private:
 	const Bool m_landing;
 
 public:
 	JetAwaitingRunwayState( StateMachine *machine, Bool landing ) : m_landing(landing), State( machine, "JetAwaitingRunwayState") { }
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -204,7 +204,7 @@ class JetAwaitingRunwayState : public State
 		return STATE_CONTINUE;
 	}
 
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		Object* jet = getMachineOwner();
 		if (jet->isEffectivelyDead())
@@ -238,7 +238,7 @@ class JetAwaitingRunwayState : public State
 		return STATE_CONTINUE;
 	}
 
-	virtual void onExit(StateExitType status)
+	void onExit(StateExitType status) override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -264,9 +264,9 @@ class JetOrHeliCirclingDeadAirfieldState : public State
 protected:
 	// snapshot interface	 STUBBED.
 	// The state will check immediately after a load game, but I think that's ok.  jba.
-	virtual void crc( Xfer *xfer ){};
-	virtual void xfer( Xfer *xfer ){XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
-	virtual void loadPostProcess(){};
+	void crc( Xfer *xfer ) override{};
+	void xfer( Xfer *xfer ) override{XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
+	void loadPostProcess() override{};
 
 private:
 	Int m_checkAirfield;
@@ -282,7 +282,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State
 		State( machine, "JetOrHeliCirclingDeadAirfieldState"),
 		m_checkAirfield(0) { }
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -313,7 +313,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State
 		return STATE_CONTINUE;
 	}
 
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -369,7 +369,7 @@ class JetOrHeliReturningToDeadAirfieldState : public AIInternalMoveToState
 public:
 	JetOrHeliReturningToDeadAirfieldState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturningToDeadAirfieldState") { }
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -430,7 +430,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
 public:
 	JetOrHeliTaxiState( StateMachine *machine, TaxiType m ) : m_taxiMode(m), AIMoveOutOfTheWayState( machine ) { }
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -509,7 +509,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
 		return ret;
 	}
 
-	virtual void onExit( StateExitType status )
+	void onExit( StateExitType status ) override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -550,7 +550,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 public:
 	JetTakeoffOrLandingState( StateMachine *machine, Bool landing ) : m_landing(landing), AIFollowPathState( machine, "JetTakeoffOrLandingState" ) { }
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -633,7 +633,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 		return ret;
 	}
 
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		Object* jet = getMachineOwner();
 		if (jet->isEffectivelyDead())
@@ -695,7 +695,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 		return ret;
 	}
 
-	virtual void onExit( StateExitType status )
+	void onExit( StateExitType status ) override
 	{
 		AIFollowPathState::onExit(status);
 
@@ -753,12 +753,12 @@ class HeliTakeoffOrLandingState : public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(HeliTakeoffOrLandingState, "HeliTakeoffOrLandingState")
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer )
+	void crc( Xfer *xfer ) override
 	{
 		// empty. jba.
 	}
 
-	virtual void xfer( Xfer *xfer )
+	void xfer( Xfer *xfer ) override
 	{
 		// version
 		XferVersion currentVersion = 1;
@@ -772,7 +772,7 @@ class HeliTakeoffOrLandingState : public State
 		xfer->xferCoord3D(&m_parkingLoc);
 		xfer->xferReal(&m_parkingOrientation);
 	}
-	virtual void loadPostProcess()
+	void loadPostProcess() override
 	{
 		// empty. jba.
 	}
@@ -790,7 +790,7 @@ class HeliTakeoffOrLandingState : public State
 			m_parkingLoc.zero();
 		}
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -856,7 +856,7 @@ class HeliTakeoffOrLandingState : public State
 		return STATE_CONTINUE;
 	}
 
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		Object* jet = getMachineOwner();
 		if (jet->isEffectivelyDead())
@@ -918,7 +918,7 @@ class HeliTakeoffOrLandingState : public State
 		return STATE_CONTINUE;
 	}
 
-	virtual void onExit( StateExitType status )
+	void onExit( StateExitType status ) override
 	{
 		// just in case.
 		Object* jet = getMachineOwner();
@@ -965,14 +965,14 @@ class JetOrHeliParkOrientState : public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliParkOrientState, "JetOrHeliParkOrientState")
 protected:
 	// snapshot interface STUBBED.
-	virtual void crc( Xfer *xfer ){};
-	virtual void xfer( Xfer *xfer ){XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
-	virtual void loadPostProcess(){};
+	void crc( Xfer *xfer ) override{};
+	void xfer( Xfer *xfer ) override{XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
+	void loadPostProcess() override{};
 
 public:
 	JetOrHeliParkOrientState( StateMachine *machine ) : State( machine, "JetOrHeliParkOrientState") { }
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -991,7 +991,7 @@ class JetOrHeliParkOrientState : public State
 		return STATE_CONTINUE;
 	}
 
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		Object* jet = getMachineOwner();
 		if (jet->isEffectivelyDead())
@@ -1026,7 +1026,7 @@ class JetOrHeliParkOrientState : public State
 		return STATE_CONTINUE;
 	}
 
-	virtual void onExit( StateExitType status )
+	void onExit( StateExitType status ) override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1046,12 +1046,12 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetPauseBeforeTakeoffState, "JetPauseBeforeTakeoffState")
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer )
+	void crc( Xfer *xfer ) override
 	{
 		// empty. jba.
 	}
 
-	virtual void xfer( Xfer *xfer )
+	void xfer( Xfer *xfer ) override
 	{
 		// version
 #if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
@@ -1085,7 +1085,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 		xfer->xferObjectID(&m_waitedForTaxiID);
 	}
 
-	virtual void loadPostProcess()
+	void loadPostProcess() override
 	{
 		// empty. jba.
 	}
@@ -1177,7 +1177,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 		// nothing
 	}
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1209,7 +1209,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 	}
 
 #if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1336,7 +1336,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 	}
 #endif
 
-	virtual void onExit(StateExitType status)
+	void onExit(StateExitType status) override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1359,12 +1359,12 @@ class JetOrHeliReloadAmmoState : public State
 protected:
 
 	// snapshot interface
-	virtual void crc( Xfer *xfer )
+	void crc( Xfer *xfer ) override
 	{
 		// empty. jba.
 	}
 
-	virtual void xfer( Xfer *xfer )
+	void xfer( Xfer *xfer ) override
 	{
 		// version
 		XferVersion currentVersion = 1;
@@ -1375,7 +1375,7 @@ class JetOrHeliReloadAmmoState : public State
 		xfer->xferUnsignedInt(&m_reloadTime);
 		xfer->xferUnsignedInt(&m_reloadDoneFrame);
 	}
-	virtual void loadPostProcess()
+	void loadPostProcess() override
 	{
 		// empty. jba.
 	}
@@ -1383,7 +1383,7 @@ class JetOrHeliReloadAmmoState : public State
 public:
 	JetOrHeliReloadAmmoState( StateMachine *machine ) : State( machine, "JetOrHeliReloadAmmoState") { }
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1420,7 +1420,7 @@ class JetOrHeliReloadAmmoState : public State
 		return STATE_CONTINUE;
 	}
 
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		Object* jet = getMachineOwner();
 		UnsignedInt now = TheGameLogic->getFrame();
@@ -1446,7 +1446,7 @@ class JetOrHeliReloadAmmoState : public State
 		return STATE_CONTINUE;
 	}
 
-	virtual void onExit(StateExitType status)
+	void onExit(StateExitType status) override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1468,7 +1468,7 @@ class JetOrHeliReturnForLandingState : public AIInternalMoveToState
 public:
 	JetOrHeliReturnForLandingState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturnForLandingState") { }
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp
index 48c43912c05..6be654c08fd 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp
@@ -866,7 +866,7 @@ class PartitionFilterIsValidCarriage : public PartitionFilter
 	virtual const char* debugGetName() { return "PartitionFilterIsValidCarriage"; }
 #endif
 
-	virtual Bool allow(Object *objOther)
+	Bool allow(Object *objOther) override
 	{
 
 		// must exist!
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
index 80c142b8a86..29b8d7bf564 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
@@ -287,13 +287,13 @@ class SupplyTruckBusyState :  public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckBusyState, "SupplyTruckBusyState")
 protected:
 	// snapshot interface STUBBED.
-	virtual void crc( Xfer *xfer ){};
-	virtual void xfer( Xfer *xfer ){};
-	virtual void loadPostProcess(){};
+	void crc( Xfer *xfer ) override{};
+	void xfer( Xfer *xfer ) override{};
+	void loadPostProcess() override{};
 
 public:
 	SupplyTruckBusyState( StateMachine *machine ) : State( machine, "SupplyTruckBusyState" ) { }
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		if( getMachineOwner() && getMachineOwner()->getAI() )
 		{
@@ -311,11 +311,11 @@ TheInGameUI->DEBUG_addFloatingText("entering busy state", getMachineOwner()->get
 #endif
 		return STATE_CONTINUE;
 	}
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		return STATE_CONTINUE;
 	}
-	virtual void onExit(StateExitType status)
+	void onExit(StateExitType status) override
 	{
 #ifdef DEBUG_SUPPLY_STATE
 TheInGameUI->DEBUG_addFloatingText("exiting busy state", getMachineOwner()->getPosition(), GameMakeColor(255, 0, 0, 255));
@@ -331,18 +331,18 @@ class SupplyTruckIdleState :  public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckIdleState, "SupplyTruckIdleState")
 protected:
 	// snapshot interface STUBBED.
-	virtual void crc( Xfer *xfer ){};
-	virtual void xfer( Xfer *xfer ){};
-	virtual void loadPostProcess(){};
+	void crc( Xfer *xfer ) override{};
+	void xfer( Xfer *xfer ) override{};
+	void loadPostProcess() override{};
 
 public:
 	SupplyTruckIdleState( StateMachine *machine ) : State( machine, "SupplyTruckIdleState" ) { }
-	virtual StateReturnType onEnter();
-	virtual StateReturnType update()
+	StateReturnType onEnter() override;
+	StateReturnType update() override
 	{
 		return STATE_CONTINUE;
 	}
-	virtual void onExit(StateExitType status)
+	void onExit(StateExitType status) override
 	{
 #ifdef DEBUG_SUPPLY_STATE
 TheInGameUI->DEBUG_addFloatingText("exiting idle state", getMachineOwner()->getPosition(), GameMakeColor(255, 0, 0, 255));
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
index 5615f8d7794..ea11e35f459 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
@@ -1154,14 +1154,14 @@ class ActAsDozerState :  public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ActAsDozerState, "ActAsDozerState")
 protected:
 	// snapshot interface STUBBED.
-	virtual void crc( Xfer *xfer ){};
-	virtual void xfer( Xfer *xfer ){};
-	virtual void loadPostProcess(){};
+	void crc( Xfer *xfer ) override{};
+	void xfer( Xfer *xfer ) override{};
+	void loadPostProcess() override{};
 
 public:
 	ActAsDozerState( StateMachine *machine ) :State( machine, "ActAsDozerState" ){}
-	virtual StateReturnType onEnter();
-	virtual StateReturnType update();
+	StateReturnType onEnter() override;
+	StateReturnType update() override;
 	virtual StateReturnType onExit();
 };
 EMPTY_DTOR(ActAsDozerState)
@@ -1173,14 +1173,14 @@ class ActAsSupplyTruckState :  public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ActAsSupplyTruckState, "ActAsSupplyTruckState")
 protected:
 	// snapshot interface STUBBED.
-	virtual void crc( Xfer *xfer ){};
-	virtual void xfer( Xfer *xfer ){};
-	virtual void loadPostProcess(){};
+	void crc( Xfer *xfer ) override{};
+	void xfer( Xfer *xfer ) override{};
+	void loadPostProcess() override{};
 
 public:
 	ActAsSupplyTruckState( StateMachine *machine ) :State( machine, "ActAsSupplyTruckState" ){}
-	virtual StateReturnType onEnter();
-	virtual StateReturnType update();
+	StateReturnType onEnter() override;
+	StateReturnType update() override;
 	virtual StateReturnType onExit();
 };
 EMPTY_DTOR(ActAsSupplyTruckState)
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp
index cb0da1c915f..6a57363053a 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp
@@ -50,7 +50,7 @@ class PartitionFilterFlammable : public PartitionFilter
 
 	PartitionFilterFlammable(){ }
 
-	virtual Bool allow(Object *objOther);
+	Bool allow(Object *objOther) override;
 #if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterFlammable"; }
 #endif
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp
index f8dd42765c1..0a4b9cbd23a 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp
@@ -78,7 +78,7 @@ class PartitionFilterHordeMember : public PartitionFilter
 	virtual const char* debugGetName() { return "PartitionFilterHordeMember"; }
 #endif
 
-	virtual Bool allow(Object *objOther)
+	Bool allow(Object *objOther) override
 	{
 		// must be exact same type as us (well, maybe)
 		if (m_data->m_exactMatch && m_obj->getTemplate() != objOther->getTemplate())
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp
index 89ad057dce0..4e557bbf8d7 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp
@@ -114,7 +114,7 @@ class PartitionFilterStealthedOrStealthGarrisoned : public PartitionFilter
 public:
 	PartitionFilterStealthedOrStealthGarrisoned() { }
 
-	virtual Bool allow(Object *objOther);
+	Bool allow(Object *objOther) override;
 
 #if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterStealthedOrStealthGarrisoned"; }
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp
index 73d0eb5523d..fcd2ca251cd 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp
@@ -74,7 +74,7 @@ class PartitionFilterTensileFormationMember : public PartitionFilter
 #if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterTensileFormationMember"; }
 #endif
-	virtual Bool allow( Object *objOther )
+	Bool allow( Object *objOther ) override
 	{
 		return ( getTFU( objOther ) != nullptr );
 	}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp
index 7779e98180e..027c589c9d6 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp
@@ -76,21 +76,21 @@ class VictoryConditions : public VictoryConditionsInterface
 public:
 	VictoryConditions();
 
-	void init( void );
-	void reset( void );
-	void update( void );
+	void init( void ) override;
+	void reset( void ) override;
+	void update( void ) override;
 
-	Bool hasAchievedVictory(Player *player);					///< has a specific player and his allies won?
-	Bool hasBeenDefeated(Player *player);							///< has a specific player and his allies lost?
-	Bool hasSinglePlayerBeenDefeated(Player *player);	///< has a specific player lost?
+	Bool hasAchievedVictory(Player *player) override;					///< has a specific player and his allies won?
+	Bool hasBeenDefeated(Player *player) override;							///< has a specific player and his allies lost?
+	Bool hasSinglePlayerBeenDefeated(Player *player) override;	///< has a specific player lost?
 
-	void cachePlayerPtrs( void );											///< players have been created - cache the ones of interest
+	void cachePlayerPtrs( void ) override;											///< players have been created - cache the ones of interest
 
-	Bool isLocalAlliedVictory( void );								///< convenience function
-	Bool isLocalAlliedDefeat( void );									///< convenience function
-	Bool isLocalDefeat( void );												///< convenience function
-	Bool amIObserver( void ) { return m_isObserver;} 	///< Am I an observer?( need this for scripts )
-	virtual UnsignedInt getEndFrame( void ) { return m_endFrame; }	///< on which frame was the game effectively over?
+	Bool isLocalAlliedVictory( void ) override;								///< convenience function
+	Bool isLocalAlliedDefeat( void ) override;									///< convenience function
+	Bool isLocalDefeat( void ) override;												///< convenience function
+	Bool amIObserver( void ) override { return m_isObserver;} 	///< Am I an observer?( need this for scripts )
+	UnsignedInt getEndFrame( void ) override { return m_endFrame; }	///< on which frame was the game effectively over?
 private:
 	Player*				m_players[MAX_PLAYER_COUNT];
 	Int						m_localSlotNum;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/FXList.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/FXList.cpp
index e04a65bca4f..a7b2ceda3ca 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/FXList.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/FXList.cpp
@@ -95,7 +95,7 @@ class SoundFXNugget : public FXNugget
 
 public:
 
-	virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const
+	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override
 	{
 		AudioEventRTS sound(m_soundName);
 
@@ -107,7 +107,7 @@ class SoundFXNugget : public FXNugget
 		TheAudio->addAudioEvent(&sound);
 	}
 
-	virtual void doFXObj(const Object* primary, const Object* secondary = nullptr) const
+	void doFXObj(const Object* primary, const Object* secondary = nullptr) const override
 	{
 		AudioEventRTS sound(m_soundName);
 		if (primary)
@@ -165,7 +165,7 @@ class TracerFXNugget : public FXNugget
 		m_probability = 1.0f;
 	}
 
-	virtual void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real primarySpeed, const Coord3D *secondary, const Real /*overrideRadius*/ ) const
+	void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real primarySpeed, const Coord3D *secondary, const Real /*overrideRadius*/ ) const override
 	{
 		if (m_probability <= GameClientRandomValueReal(0, 1))
 			return;
@@ -263,7 +263,7 @@ class RayEffectFXNugget : public FXNugget
 		m_secondaryOffset.x = m_secondaryOffset.y = m_secondaryOffset.z = 0;
 	}
 
-	virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * secondary, const Real /*overrideRadius*/ ) const
+	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * secondary, const Real /*overrideRadius*/ ) const override
 	{
 		const ThingTemplate* tmpl = TheThingFactory->findTemplate(m_templateName);
 		DEBUG_ASSERTCRASH(tmpl, ("RayEffect %s not found",m_templateName.str()));
@@ -320,7 +320,7 @@ class LightPulseFXNugget : public FXNugget
 		m_color.red = m_color.green = m_color.blue = 0;
 	}
 
-	virtual void doFXObj(const Object* primary, const Object* /*secondary*/) const
+	void doFXObj(const Object* primary, const Object* /*secondary*/) const override
 	{
 		if (primary)
 		{
@@ -337,7 +337,7 @@ class LightPulseFXNugget : public FXNugget
 		}
 	}
 
-	virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const
+	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override
 	{
 		if (primary)
 		{
@@ -385,7 +385,7 @@ class ViewShakeFXNugget : public FXNugget
 	{
 	}
 
-	virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const
+	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override
 	{
 		if (primary)
 		{
@@ -445,7 +445,7 @@ class TerrainScorchFXNugget : public FXNugget
 	{
 	}
 
-	virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const
+	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override
 	{
 		if (primary)
 		{
@@ -523,7 +523,7 @@ class ParticleSystemFXNugget : public FXNugget
 		m_rotateX = m_rotateY = m_rotateZ = 0;
 	}
 
-	virtual void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real overrideRadius ) const
+	void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real overrideRadius ) const override
 	{
 		if (primary)
 		{
@@ -535,7 +535,7 @@ class ParticleSystemFXNugget : public FXNugget
 		}
 	}
 
-	virtual void doFXObj(const Object* primary, const Object* secondary) const
+	void doFXObj(const Object* primary, const Object* secondary) const override
 	{
 		if (primary)
 		{
@@ -694,12 +694,12 @@ class FXListAtBonePosFXNugget : public FXNugget
     m_orientToBone = true;
 	}
 
-	virtual void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const
+	void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override
 	{
 		DEBUG_CRASH(("You must use the object form for this effect"));
 	}
 
-	virtual void doFXObj(const Object* primary, const Object* /*secondary*/) const
+	void doFXObj(const Object* primary, const Object* /*secondary*/) const override
 	{
 		if (primary)
 		{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
index f40010e506e..a445ce9b500 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
@@ -122,11 +122,11 @@ class DownloadManagerMunkee : public DownloadManager
 {
 public:
 	DownloadManagerMunkee() {m_shouldQuitOnSuccess = true; m_shouldQuitOnSuccess = false;}
-	virtual HRESULT OnError( Int error );
-	virtual HRESULT OnEnd();
-	virtual HRESULT OnProgressUpdate( Int bytesread, Int totalsize, Int timetaken, Int timeleft );
-	virtual HRESULT OnStatusUpdate( Int status );
-	virtual HRESULT downloadFile( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume );
+	HRESULT OnError( Int error ) override;
+	HRESULT OnEnd() override;
+	HRESULT OnProgressUpdate( Int bytesread, Int totalsize, Int timetaken, Int timeleft ) override;
+	HRESULT OnStatusUpdate( Int status ) override;
+	HRESULT downloadFile( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume ) override;
 
 private:
 	Bool m_shouldQuitOnSuccess;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp
index 97a2c9d5dfa..936d8f87258 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp
@@ -138,23 +138,23 @@ class GameTextManager : public GameTextInterface
 	public:
 
 		GameTextManager();
-		virtual ~GameTextManager();
+		~GameTextManager() override;
 
-		virtual void					init( void );						///< Initializes the text system
+		void					init( void ) override;						///< Initializes the text system
 		virtual void					deinit( void );					///< Shuts down the text system
-		virtual void					update( void ) {};			///< update text manager
-		virtual void					reset( void );					///< Resets the text system
+		void					update( void ) override {};			///< update text manager
+		void					reset( void ) override;					///< Resets the text system
 
-		virtual UnicodeString fetch( const Char *label, Bool *exists = nullptr );		///< Returns the associated labeled unicode text
-		virtual UnicodeString fetch( AsciiString label, Bool *exists = nullptr );		///< Returns the associated labeled unicode text
-		virtual UnicodeString fetchFormat( const Char *label, ... );
-		virtual UnicodeString fetchOrSubstitute( const Char *label, const WideChar *substituteText );
-		virtual UnicodeString fetchOrSubstituteFormat( const Char *label, const WideChar *substituteFormat, ... );
-		virtual UnicodeString fetchOrSubstituteFormatVA( const Char *label, const WideChar *substituteFormat, va_list args );
+		UnicodeString fetch( const Char *label, Bool *exists = nullptr ) override;		///< Returns the associated labeled unicode text
+		UnicodeString fetch( AsciiString label, Bool *exists = nullptr ) override;		///< Returns the associated labeled unicode text
+		UnicodeString fetchFormat( const Char *label, ... ) override;
+		UnicodeString fetchOrSubstitute( const Char *label, const WideChar *substituteText ) override;
+		UnicodeString fetchOrSubstituteFormat( const Char *label, const WideChar *substituteFormat, ... ) override;
+		UnicodeString fetchOrSubstituteFormatVA( const Char *label, const WideChar *substituteFormat, va_list args ) override;
 
-		virtual AsciiStringVec& getStringsWithLabelPrefix(AsciiString label);
+		AsciiStringVec& getStringsWithLabelPrefix(AsciiString label) override;
 
-		virtual void					initMapStringFile( const AsciiString& filename );
+		void					initMapStringFile( const AsciiString& filename ) override;
 
 	protected:
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp
index 087f324eadc..6716ce4f26a 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp
@@ -516,7 +516,7 @@ class PartitionFilterLiveMapEnemies : public PartitionFilter
 public:
 	PartitionFilterLiveMapEnemies(const Object *obj) : m_obj(obj) { }
 
-	virtual Bool allow(Object *objOther)
+	Bool allow(Object *objOther) override
 	{
 		// this is way fast (bit test) so do it first.
 		if (objOther->isEffectivelyDead())
@@ -546,7 +546,7 @@ class PartitionFilterWithinAttackRange : public PartitionFilter
 public:
 	PartitionFilterWithinAttackRange(const Object* obj) : m_obj(obj) { }
 
-	virtual Bool allow(Object* objOther)
+	Bool allow(Object* objOther) override
 	{
 		for (Int i = 0; i < WEAPONSLOT_COUNT;	i++ )
 		{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
index 8bd80191ef2..7064d9e587a 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
@@ -1950,9 +1950,9 @@ class AIAttackMoveStateMachine : public StateMachine
 
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess();
+	void crc( Xfer *xfer ) override;
+	void xfer( Xfer *xfer ) override;
+	void loadPostProcess() override;
 };
 
 // ------------------------------------------------------------------------------------------------
@@ -5747,9 +5747,9 @@ class AIAttackThenIdleStateMachine : public StateMachine
 	AIAttackThenIdleStateMachine( Object *owner, AsciiString name );
 protected:
 	// snapshot interface .
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess();
+	void crc( Xfer *xfer ) override;
+	void xfer( Xfer *xfer ) override;
+	void loadPostProcess() override;
 };
 
 // ------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
index f2052eed8c6..2507bd24707 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
@@ -132,7 +132,7 @@ class FireWeaponNugget : public ObjectCreationNugget
 	{
 	}
 
-	virtual Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const
+	Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const override
 	{
 		if (!primaryObj || !primary || !secondary)
 		{
@@ -179,7 +179,7 @@ class AttackNugget : public ObjectCreationNugget
 	{
 	}
 
-	virtual Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const
+	Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const override
 	{
 		if (!primaryObj || !primary || !secondary)
 		{
@@ -261,12 +261,12 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 		m_transportName.clear();
 	}
 
-	virtual Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const
+	Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const override
 	{
 		return create( primaryObj, primary, secondary, true, lifetimeFrames );
 	}
 
-	virtual Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Bool createOwner, UnsignedInt lifetimeFrames = 0 ) const
+	Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Bool createOwner, UnsignedInt lifetimeFrames = 0 ) const override
 	{
 		if (!primaryObj || !primary || !secondary)
 		{
@@ -619,7 +619,7 @@ class ApplyRandomForceNugget : public ObjectCreationNugget
 	{
 	}
 
-	virtual Object* create( const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const
+	Object* create( const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const override
 	{
 		if (primary)
 		{
@@ -650,7 +650,7 @@ class ApplyRandomForceNugget : public ObjectCreationNugget
 		return nullptr;
 	}
 
-	virtual Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const
+	Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const override
 	{
 		DEBUG_CRASH(("You must call this effect with an object, not a location"));
 		return nullptr;
@@ -775,7 +775,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 		m_offset.zero();
 	}
 
-	virtual Object* create(const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const
+	Object* create(const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const override
 	{
 		if (primary)
 		{
@@ -791,7 +791,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 		return nullptr;
 	}
 
-	virtual Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const
+	Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const override
 	{
 		if (primary)
 		{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
index cf6e61f99b3..88671bfe422 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
@@ -114,13 +114,13 @@ class ChinookEvacuateState : public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookEvacuateState, "ChinookEvacuateState")
 protected:
 	// snapshot interface	STUBBED - no member vars to save. jba.
-	virtual void crc( Xfer *xfer ){};
-	virtual void xfer( Xfer *xfer ){};
-	virtual void loadPostProcess(){};
+	void crc( Xfer *xfer ) override{};
+	void xfer( Xfer *xfer ) override{};
+	void loadPostProcess() override{};
 public:
 	ChinookEvacuateState( StateMachine *machine ) : State( machine, "ChinookEvacuateState" ) { }
 
-	StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* obj = getMachineOwner();
 		if( obj->getContain() )
@@ -131,7 +131,7 @@ class ChinookEvacuateState : public State
 		return STATE_SUCCESS;
 	}
 
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		return STATE_SUCCESS;
 	}
@@ -145,13 +145,13 @@ class ChinookHeadOffMapState :  public State
 	//I'm outta here
 protected:
 	// snapshot interface	STUBBED - no member vars to save. jba.
-	virtual void crc( Xfer *xfer ){};
-	virtual void xfer( Xfer *xfer ){};
-	virtual void loadPostProcess(){};
+	void crc( Xfer *xfer ) override{};
+	void xfer( Xfer *xfer ) override{};
+	void loadPostProcess() override{};
 public:
 	ChinookHeadOffMapState( StateMachine *machine ) : State( machine, "ChinookHeadOffMapState" ) {}
 
-	StateReturnType onEnter() // Give move order out of town
+	StateReturnType onEnter() override // Give move order out of town
 	{
 		Object *owner = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)owner->getAIUpdateInterface();
@@ -163,7 +163,7 @@ class ChinookHeadOffMapState :  public State
 		return STATE_CONTINUE;
 	}
 
-	StateReturnType update()
+	StateReturnType update() override
 	{
 		Object *owner = getMachineOwner();
 
@@ -196,12 +196,12 @@ class ChinookTakeoffOrLandingState : public State
 
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer )
+	void crc( Xfer *xfer ) override
 	{
 		// empty
 	}
 
-	virtual void xfer( Xfer *xfer )
+	void xfer( Xfer *xfer ) override
 	{
 		// version
 		XferVersion currentVersion = 1;
@@ -212,7 +212,7 @@ class ChinookTakeoffOrLandingState : public State
 		xfer->xferBool(&m_landing);
 	}
 
-	virtual void loadPostProcess()
+	void loadPostProcess() override
 	{
 		// empty
 	}
@@ -223,7 +223,7 @@ class ChinookTakeoffOrLandingState : public State
 		m_destLoc.zero();
 	}
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -280,7 +280,7 @@ class ChinookTakeoffOrLandingState : public State
 		return STATE_CONTINUE;
 	}
 
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		Object* obj = getMachineOwner();
 		if (obj->isEffectivelyDead())
@@ -298,7 +298,7 @@ class ChinookTakeoffOrLandingState : public State
 		return STATE_CONTINUE;
 	}
 
-	virtual void onExit( StateExitType status )
+	void onExit( StateExitType status ) override
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -416,12 +416,12 @@ class ChinookCombatDropState : public State
 
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer )
+	void crc( Xfer *xfer ) override
 	{
 		// empty
 	}
 
-	virtual void xfer( Xfer *xfer )
+	void xfer( Xfer *xfer ) override
 	{
 		// version
 		const XferVersion currentVersion = 2;
@@ -468,7 +468,7 @@ class ChinookCombatDropState : public State
 		}
 	}
 
-	virtual void loadPostProcess()
+	void loadPostProcess() override
 	{
 		for (std::vector<RopeInfo>::iterator it = m_ropes.begin(); it != m_ropes.end(); ++it)
 		{
@@ -482,7 +482,7 @@ class ChinookCombatDropState : public State
 	ChinookCombatDropState( StateMachine *machine ): State( machine, "ChinookCombatDropState" ) { }
 
 	// --------------
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* obj = getMachineOwner();
 		Drawable* draw = obj->getDrawable();
@@ -548,7 +548,7 @@ class ChinookCombatDropState : public State
 	}
 
 	// --------------
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -640,7 +640,7 @@ class ChinookCombatDropState : public State
 	}
 
 	// --------------
-	virtual void onExit( StateExitType status )
+	void onExit( StateExitType status ) override
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -698,12 +698,12 @@ class ChinookMoveToBldgState : public AIMoveToState
 	Real m_destZ;
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer )
+	void crc( Xfer *xfer ) override
 	{
 		// empty
 	}
 
-	virtual void xfer( Xfer *xfer )
+	void xfer( Xfer *xfer ) override
 	{
 		// version
 		XferVersion currentVersion = 1;
@@ -715,7 +715,7 @@ class ChinookMoveToBldgState : public AIMoveToState
 		xfer->xferReal(&m_destZ);
 	}
 
-	virtual void loadPostProcess()
+	void loadPostProcess() override
 	{
 		// empty
 	}
@@ -723,7 +723,7 @@ class ChinookMoveToBldgState : public AIMoveToState
 public:
 	ChinookMoveToBldgState( StateMachine *machine ): AIMoveToState( machine ) { }
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -754,7 +754,7 @@ class ChinookMoveToBldgState : public AIMoveToState
 		return AIMoveToState::onEnter();
 	}
 
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		Object* obj = getMachineOwner();
 
@@ -768,7 +768,7 @@ class ChinookMoveToBldgState : public AIMoveToState
 		return status;
 	}
 
-	virtual void onExit( StateExitType status )
+	void onExit( StateExitType status ) override
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -790,12 +790,12 @@ class ChinookRecordCreationState : public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookRecordCreationState, "ChinookRecordCreationState")
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer )
+	void crc( Xfer *xfer ) override
 	{
 		// empty
 	}
 
-	virtual void xfer( Xfer *xfer )
+	void xfer( Xfer *xfer ) override
 	{
 		// version
 		XferVersion currentVersion = 1;
@@ -803,7 +803,7 @@ class ChinookRecordCreationState : public State
 		xfer->xferVersion( &version, currentVersion );
 	}
 
-	virtual void loadPostProcess()
+	void loadPostProcess() override
 	{
 		// empty
 	}
@@ -811,7 +811,7 @@ class ChinookRecordCreationState : public State
 public:
 	ChinookRecordCreationState( StateMachine *machine ): State( machine, "ChinookRecordCreationState" ) { }
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -822,7 +822,7 @@ class ChinookRecordCreationState : public State
 		return STATE_SUCCESS;
 	}
 
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		return STATE_SUCCESS;
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
index fb5da2d4373..4157507f615 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
@@ -86,13 +86,13 @@ class DozerActionPickActionPosState : public State
 public:
 
 	DozerActionPickActionPosState( StateMachine *machine, DozerTask task );
-	virtual StateReturnType update( void );
+	StateReturnType update( void ) override;
 
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess();
+	void crc( Xfer *xfer ) override;
+	void xfer( Xfer *xfer ) override;
+	void loadPostProcess() override;
 
 protected:
 
@@ -243,13 +243,13 @@ class DozerActionMoveToActionPosState : public State
 public:
 
 	DozerActionMoveToActionPosState( StateMachine *machine, DozerTask task ) : State( machine, "DozerActionMoveToActionPosState" ) { m_task = task; }
-	virtual StateReturnType update( void );
+	StateReturnType update( void ) override;
 
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess();
+	void crc( Xfer *xfer ) override;
+	void xfer( Xfer *xfer ) override;
+	void loadPostProcess() override;
 
 protected:
 
@@ -386,15 +386,15 @@ class DozerActionDoActionState : public State
 		m_task = task;
 		m_enterFrame = 0;
 	}
-	virtual StateReturnType update( void );
-	virtual StateReturnType onEnter( void );
-	virtual void onExit( StateExitType status ) { }
+	StateReturnType update( void ) override;
+	StateReturnType onEnter( void ) override;
+	void onExit( StateExitType status ) override { }
 
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess();
+	void crc( Xfer *xfer ) override;
+	void xfer( Xfer *xfer ) override;
+	void loadPostProcess() override;
 
 protected:
 
@@ -797,9 +797,9 @@ class DozerActionStateMachine : public StateMachine
 
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess();
+	void crc( Xfer *xfer ) override;
+	void xfer( Xfer *xfer ) override;
+	void loadPostProcess() override;
 
 protected:
 
@@ -972,15 +972,15 @@ class DozerPrimaryIdleState : public State
 		m_idlePlayerNumber = 0;
 		m_isMarkedAsIdle   = FALSE;
 	}
-	virtual StateReturnType update( void );
-	virtual StateReturnType onEnter( void );
-	virtual void onExit( StateExitType status );
+	StateReturnType update( void ) override;
+	StateReturnType onEnter( void ) override;
+	void onExit( StateExitType status ) override;
 
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess();
+	void crc( Xfer *xfer ) override;
+	void xfer( Xfer *xfer ) override;
+	void loadPostProcess() override;
 
 protected:
 
@@ -1159,16 +1159,16 @@ class DozerActionState : public State
 		Note that we DON'T use CONVERT_SLEEP_TO_CONTINUE; since we're not doing anything else
 		interesting in update, we can sleep when this machine sleeps
 	*/
-	virtual StateReturnType update( void ) { return m_actionMachine->updateStateMachine(); }
+	StateReturnType update( void ) override { return m_actionMachine->updateStateMachine(); }
 
-	virtual StateReturnType onEnter( void );
-	virtual void onExit( StateExitType status );
+	StateReturnType onEnter( void ) override;
+	void onExit( StateExitType status ) override;
 
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess();
+	void crc( Xfer *xfer ) override;
+	void xfer( Xfer *xfer ) override;
+	void loadPostProcess() override;
 
 protected:
 
@@ -1258,14 +1258,14 @@ class DozerPrimaryGoingHomeState : public State
 
 protected:
 	// snapshot interface	 STUBBED no member vars
-	virtual void crc( Xfer *xfer ){};
-	virtual void xfer( Xfer *xfer ){};
-	virtual void loadPostProcess(){};
+	void crc( Xfer *xfer ) override{};
+	void xfer( Xfer *xfer ) override{};
+	void loadPostProcess() override{};
 
 public:
 
 	DozerPrimaryGoingHomeState( StateMachine *machine ) : State( machine, "DozerPrimaryGoingHomeState" ) { }
-	virtual StateReturnType update( void ) { return STATE_FAILURE; }
+	StateReturnType update( void ) override { return STATE_FAILURE; }
 
 };
 EMPTY_DTOR(DozerPrimaryGoingHomeState)
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
index 101640d9cdd..aa324c7fe1b 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
@@ -152,7 +152,7 @@ class PartitionFilterHasParkingPlace : public PartitionFilter
 #if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterHasParkingPlace"; }
 #endif
-	virtual Bool allow(Object *objOther)
+	Bool allow(Object *objOther) override
 	{
 		ParkingPlaceBehaviorInterface* pp = getPP(objOther->getID());
 		if (pp != nullptr && pp->reserveSpace(m_id, 0.0f, nullptr))
@@ -200,16 +200,16 @@ class JetAwaitingRunwayState : public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetAwaitingRunwayState, "JetAwaitingRunwayState")
 protected:
 	// snapshot interface STUBBED.
-	virtual void crc( Xfer *xfer ){};
-	virtual void xfer( Xfer *xfer ){XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
-	virtual void loadPostProcess(){};
+	void crc( Xfer *xfer ) override{};
+	void xfer( Xfer *xfer ) override{XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
+	void loadPostProcess() override{};
 private:
 	const Bool m_landing;
 
 public:
 	JetAwaitingRunwayState( StateMachine *machine, Bool landing ) : m_landing(landing), State( machine, "JetAwaitingRunwayState") { }
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -222,7 +222,7 @@ class JetAwaitingRunwayState : public State
 		return STATE_CONTINUE;
 	}
 
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		Object* jet = getMachineOwner();
 		if (jet->isEffectivelyDead())
@@ -287,7 +287,7 @@ class JetAwaitingRunwayState : public State
 		return STATE_CONTINUE;
 	}
 
-	virtual void onExit(StateExitType status)
+	void onExit(StateExitType status) override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -313,9 +313,9 @@ class JetOrHeliCirclingDeadAirfieldState : public State
 protected:
 	// snapshot interface	 STUBBED.
 	// The state will check immediately after a load game, but I think that's ok.  jba.
-	virtual void crc( Xfer *xfer ){};
-	virtual void xfer( Xfer *xfer ){XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
-	virtual void loadPostProcess(){};
+	void crc( Xfer *xfer ) override{};
+	void xfer( Xfer *xfer ) override{XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
+	void loadPostProcess() override{};
 
 private:
 	Int m_checkAirfield;
@@ -331,7 +331,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State
 		State( machine, "JetOrHeliCirclingDeadAirfieldState"),
 		m_checkAirfield(0) { }
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -362,7 +362,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State
 		return STATE_CONTINUE;
 	}
 
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -418,7 +418,7 @@ class JetOrHeliReturningToDeadAirfieldState : public AIInternalMoveToState
 public:
 	JetOrHeliReturningToDeadAirfieldState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturningToDeadAirfieldState") { }
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -479,7 +479,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
 public:
 	JetOrHeliTaxiState( StateMachine *machine, TaxiType m ) : m_taxiMode(m), AIMoveOutOfTheWayState( machine ) { }
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -640,7 +640,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
 		return ret;
 	}
 
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		Object* jet = getMachineOwner();
 		if (jet->isEffectivelyDead())
@@ -671,7 +671,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
 		return AIMoveOutOfTheWayState::update();
 	}
 
-	virtual void onExit( StateExitType status )
+	void onExit( StateExitType status ) override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -712,7 +712,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 public:
 	JetTakeoffOrLandingState( StateMachine *machine, Bool landing ) : m_landing(landing), AIFollowPathState( machine, "JetTakeoffOrLandingState" ) { }
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -805,7 +805,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 		return ret;
 	}
 
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		Object* jet = getMachineOwner();
 		if (jet->isEffectivelyDead())
@@ -882,7 +882,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 		return ret;
 	}
 
-	virtual void onExit( StateExitType status )
+	void onExit( StateExitType status ) override
 	{
 		AIFollowPathState::onExit(status);
 
@@ -940,12 +940,12 @@ class HeliTakeoffOrLandingState : public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(HeliTakeoffOrLandingState, "HeliTakeoffOrLandingState")
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer )
+	void crc( Xfer *xfer ) override
 	{
 		// empty. jba.
 	}
 
-	virtual void xfer( Xfer *xfer )
+	void xfer( Xfer *xfer ) override
 	{
 		// version
 		XferVersion currentVersion = 1;
@@ -959,7 +959,7 @@ class HeliTakeoffOrLandingState : public State
 		xfer->xferCoord3D(&m_parkingLoc);
 		xfer->xferReal(&m_parkingOrientation);
 	}
-	virtual void loadPostProcess()
+	void loadPostProcess() override
 	{
 		// empty. jba.
 	}
@@ -977,7 +977,7 @@ class HeliTakeoffOrLandingState : public State
 			m_parkingLoc.zero();
 		}
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1043,7 +1043,7 @@ class HeliTakeoffOrLandingState : public State
 		return STATE_CONTINUE;
 	}
 
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		Object* jet = getMachineOwner();
 		if (jet->isEffectivelyDead())
@@ -1105,7 +1105,7 @@ class HeliTakeoffOrLandingState : public State
 		return STATE_CONTINUE;
 	}
 
-	virtual void onExit( StateExitType status )
+	void onExit( StateExitType status ) override
 	{
 		// just in case.
 		Object* jet = getMachineOwner();
@@ -1152,14 +1152,14 @@ class JetOrHeliParkOrientState : public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliParkOrientState, "JetOrHeliParkOrientState")
 protected:
 	// snapshot interface STUBBED.
-	virtual void crc( Xfer *xfer ){};
-	virtual void xfer( Xfer *xfer ){XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
-	virtual void loadPostProcess(){};
+	void crc( Xfer *xfer ) override{};
+	void xfer( Xfer *xfer ) override{XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
+	void loadPostProcess() override{};
 
 public:
 	JetOrHeliParkOrientState( StateMachine *machine ) : State( machine, "JetOrHeliParkOrientState") { }
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1178,7 +1178,7 @@ class JetOrHeliParkOrientState : public State
 		return STATE_CONTINUE;
 	}
 
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		Object* jet = getMachineOwner();
 		if (jet->isEffectivelyDead())
@@ -1218,7 +1218,7 @@ class JetOrHeliParkOrientState : public State
 		return STATE_CONTINUE;
 	}
 
-	virtual void onExit( StateExitType status )
+	void onExit( StateExitType status ) override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1238,12 +1238,12 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetPauseBeforeTakeoffState, "JetPauseBeforeTakeoffState")
 protected:
 	// snapshot interface
-	virtual void crc( Xfer *xfer )
+	void crc( Xfer *xfer ) override
 	{
 		// empty. jba.
 	}
 
-	virtual void xfer( Xfer *xfer )
+	void xfer( Xfer *xfer ) override
 	{
 		// version
 #if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
@@ -1277,7 +1277,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 		xfer->xferObjectID(&m_waitedForTaxiID);
 	}
 
-	virtual void loadPostProcess()
+	void loadPostProcess() override
 	{
 		// empty. jba.
 	}
@@ -1369,7 +1369,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 		// nothing
 	}
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1401,7 +1401,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 	}
 
 #if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1528,7 +1528,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 	}
 #endif
 
-	virtual void onExit(StateExitType status)
+	void onExit(StateExitType status) override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1551,12 +1551,12 @@ class JetOrHeliReloadAmmoState : public State
 protected:
 
 	// snapshot interface
-	virtual void crc( Xfer *xfer )
+	void crc( Xfer *xfer ) override
 	{
 		// empty. jba.
 	}
 
-	virtual void xfer( Xfer *xfer )
+	void xfer( Xfer *xfer ) override
 	{
 		// version
 		XferVersion currentVersion = 1;
@@ -1567,7 +1567,7 @@ class JetOrHeliReloadAmmoState : public State
 		xfer->xferUnsignedInt(&m_reloadTime);
 		xfer->xferUnsignedInt(&m_reloadDoneFrame);
 	}
-	virtual void loadPostProcess()
+	void loadPostProcess() override
 	{
 		// empty. jba.
 	}
@@ -1575,7 +1575,7 @@ class JetOrHeliReloadAmmoState : public State
 public:
 	JetOrHeliReloadAmmoState( StateMachine *machine ) : State( machine, "JetOrHeliReloadAmmoState") { }
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1612,7 +1612,7 @@ class JetOrHeliReloadAmmoState : public State
 		return STATE_CONTINUE;
 	}
 
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		Object* jet = getMachineOwner();
 		UnsignedInt now = TheGameLogic->getFrame();
@@ -1638,7 +1638,7 @@ class JetOrHeliReloadAmmoState : public State
 		return STATE_CONTINUE;
 	}
 
-	virtual void onExit(StateExitType status)
+	void onExit(StateExitType status) override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1660,7 +1660,7 @@ class JetOrHeliReturnForLandingState : public AIInternalMoveToState
 public:
 	JetOrHeliReturnForLandingState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturnForLandingState") { }
 
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp
index 700a1ea8cc9..3da1f3d2a4c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp
@@ -906,7 +906,7 @@ class PartitionFilterIsValidCarriage : public PartitionFilter
 	virtual const char* debugGetName() { return "PartitionFilterIsValidCarriage"; }
 #endif
 
-	virtual Bool allow(Object *objOther)
+	Bool allow(Object *objOther) override
 	{
 
 		// must exist!
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
index ce7a8cc5af3..8f2fe0efca3 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
@@ -293,13 +293,13 @@ class SupplyTruckBusyState :  public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckBusyState, "SupplyTruckBusyState")
 protected:
 	// snapshot interface STUBBED.
-	virtual void crc( Xfer *xfer ){};
-	virtual void xfer( Xfer *xfer ){};
-	virtual void loadPostProcess(){};
+	void crc( Xfer *xfer ) override{};
+	void xfer( Xfer *xfer ) override{};
+	void loadPostProcess() override{};
 
 public:
 	SupplyTruckBusyState( StateMachine *machine ) : State( machine, "SupplyTruckBusyState" ) { }
-	virtual StateReturnType onEnter()
+	StateReturnType onEnter() override
 	{
 		if( getMachineOwner() && getMachineOwner()->getAI() )
 		{
@@ -317,11 +317,11 @@ TheInGameUI->DEBUG_addFloatingText("entering busy state", getMachineOwner()->get
 #endif
 		return STATE_CONTINUE;
 	}
-	virtual StateReturnType update()
+	StateReturnType update() override
 	{
 		return STATE_CONTINUE;
 	}
-	virtual void onExit(StateExitType status)
+	void onExit(StateExitType status) override
 	{
 #ifdef DEBUG_SUPPLY_STATE
 TheInGameUI->DEBUG_addFloatingText("exiting busy state", getMachineOwner()->getPosition(), GameMakeColor(255, 0, 0, 255));
@@ -337,18 +337,18 @@ class SupplyTruckIdleState :  public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckIdleState, "SupplyTruckIdleState")
 protected:
 	// snapshot interface STUBBED.
-	virtual void crc( Xfer *xfer ){};
-	virtual void xfer( Xfer *xfer ){};
-	virtual void loadPostProcess(){};
+	void crc( Xfer *xfer ) override{};
+	void xfer( Xfer *xfer ) override{};
+	void loadPostProcess() override{};
 
 public:
 	SupplyTruckIdleState( StateMachine *machine ) : State( machine, "SupplyTruckIdleState" ) { }
-	virtual StateReturnType onEnter();
-	virtual StateReturnType update()
+	StateReturnType onEnter() override;
+	StateReturnType update() override
 	{
 		return STATE_CONTINUE;
 	}
-	virtual void onExit(StateExitType status)
+	void onExit(StateExitType status) override
 	{
 #ifdef DEBUG_SUPPLY_STATE
 TheInGameUI->DEBUG_addFloatingText("exiting idle state", getMachineOwner()->getPosition(), GameMakeColor(255, 0, 0, 255));
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
index 5a7af64055a..4f47d67dc13 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
@@ -1154,14 +1154,14 @@ class ActAsDozerState :  public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ActAsDozerState, "ActAsDozerState")
 protected:
 	// snapshot interface STUBBED.
-	virtual void crc( Xfer *xfer ){};
-	virtual void xfer( Xfer *xfer ){};
-	virtual void loadPostProcess(){};
+	void crc( Xfer *xfer ) override{};
+	void xfer( Xfer *xfer ) override{};
+	void loadPostProcess() override{};
 
 public:
 	ActAsDozerState( StateMachine *machine ) :State( machine, "ActAsDozerState" ){}
-	virtual StateReturnType onEnter();
-	virtual StateReturnType update();
+	StateReturnType onEnter() override;
+	StateReturnType update() override;
 	virtual StateReturnType onExit();
 };
 EMPTY_DTOR(ActAsDozerState)
@@ -1173,14 +1173,14 @@ class ActAsSupplyTruckState :  public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ActAsSupplyTruckState, "ActAsSupplyTruckState")
 protected:
 	// snapshot interface STUBBED.
-	virtual void crc( Xfer *xfer ){};
-	virtual void xfer( Xfer *xfer ){};
-	virtual void loadPostProcess(){};
+	void crc( Xfer *xfer ) override{};
+	void xfer( Xfer *xfer ) override{};
+	void loadPostProcess() override{};
 
 public:
 	ActAsSupplyTruckState( StateMachine *machine ) :State( machine, "ActAsSupplyTruckState" ){}
-	virtual StateReturnType onEnter();
-	virtual StateReturnType update();
+	StateReturnType onEnter() override;
+	StateReturnType update() override;
 	virtual StateReturnType onExit();
 };
 EMPTY_DTOR(ActAsSupplyTruckState)
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp
index 86c81b0755e..e4892e82996 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp
@@ -50,7 +50,7 @@ class PartitionFilterFlammable : public PartitionFilter
 
 	PartitionFilterFlammable(){ }
 
-	virtual Bool allow(Object *objOther);
+	Bool allow(Object *objOther) override;
 #if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterFlammable"; }
 #endif
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp
index e5bfbcf3dc3..41e7b4b9b95 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp
@@ -78,7 +78,7 @@ class PartitionFilterHordeMember : public PartitionFilter
 	virtual const char* debugGetName() { return "PartitionFilterHordeMember"; }
 #endif
 
-	virtual Bool allow(Object *objOther)
+	Bool allow(Object *objOther) override
 	{
 		// must be exact same type as us (well, maybe)
 		if (m_data->m_exactMatch && m_obj->getTemplate() != objOther->getTemplate())
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp
index 9d117b02808..7c343000bb5 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp
@@ -322,7 +322,7 @@ class PartitionFilterLiveMapEnemies : public PartitionFilter
 public:
 	PartitionFilterLiveMapEnemies(const Object *obj) : m_obj(obj) { }
 
-	virtual Bool allow(Object *objOther)
+	Bool allow(Object *objOther) override
 	{
 		// this is way fast (bit test) so do it first.
 		if (objOther->isEffectivelyDead())
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp
index bfb7b2b4975..1e0a5c5c3ef 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp
@@ -115,7 +115,7 @@ class PartitionFilterStealthedOrStealthGarrisoned : public PartitionFilter
 public:
 	PartitionFilterStealthedOrStealthGarrisoned() { }
 
-	virtual Bool allow(Object *objOther);
+	Bool allow(Object *objOther) override;
 
 #if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterStealthedOrStealthGarrisoned"; }
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp
index 2ef887bdff0..2493db5f416 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp
@@ -74,7 +74,7 @@ class PartitionFilterTensileFormationMember : public PartitionFilter
 #if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterTensileFormationMember"; }
 #endif
-	virtual Bool allow( Object *objOther )
+	Bool allow( Object *objOther ) override
 	{
 		return ( getTFU( objOther ) != nullptr );
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp
index ae5a84d361e..21a218c3d00 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp
@@ -77,21 +77,21 @@ class VictoryConditions : public VictoryConditionsInterface
 public:
 	VictoryConditions();
 
-	void init( void );
-	void reset( void );
-	void update( void );
+	void init( void ) override;
+	void reset( void ) override;
+	void update( void ) override;
 
-	Bool hasAchievedVictory(Player *player);					///< has a specific player and his allies won?
-	Bool hasBeenDefeated(Player *player);							///< has a specific player and his allies lost?
-	Bool hasSinglePlayerBeenDefeated(Player *player);	///< has a specific player lost?
+	Bool hasAchievedVictory(Player *player) override;					///< has a specific player and his allies won?
+	Bool hasBeenDefeated(Player *player) override;							///< has a specific player and his allies lost?
+	Bool hasSinglePlayerBeenDefeated(Player *player) override;	///< has a specific player lost?
 
-	void cachePlayerPtrs( void );											///< players have been created - cache the ones of interest
+	void cachePlayerPtrs( void ) override;											///< players have been created - cache the ones of interest
 
-	Bool isLocalAlliedVictory( void );								///< convenience function
-	Bool isLocalAlliedDefeat( void );									///< convenience function
-	Bool isLocalDefeat( void );												///< convenience function
-	Bool amIObserver( void ) { return m_isObserver;} 	///< Am I an observer?( need this for scripts )
-	virtual UnsignedInt getEndFrame( void ) { return m_endFrame; }	///< on which frame was the game effectively over?
+	Bool isLocalAlliedVictory( void ) override;								///< convenience function
+	Bool isLocalAlliedDefeat( void ) override;									///< convenience function
+	Bool isLocalDefeat( void ) override;												///< convenience function
+	Bool amIObserver( void ) override { return m_isObserver;} 	///< Am I an observer?( need this for scripts )
+	UnsignedInt getEndFrame( void ) override { return m_endFrame; }	///< on which frame was the game effectively over?
 private:
 	Player*				m_players[MAX_PLAYER_COUNT];
 	Int						m_localSlotNum;
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp
index 251ab342011..185c6cb9b7e 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp
@@ -137,9 +137,9 @@ static NullPrototypeClass _NullPrototype;
 class RObjIterator : public RenderObjIterator
 {
 public:
-	virtual bool					Is_Done(void);
-	virtual const char *			Current_Item_Name(void);
-	virtual int						Current_Item_Class_ID(void);
+	bool					Is_Done(void) override;
+	const char *			Current_Item_Name(void) override;
+	int						Current_Item_Class_ID(void) override;
 protected:
 	friend class WW3DAssetManager;
 };
@@ -154,10 +154,10 @@ class HAnimIterator : public AssetIterator
 public:
 	HAnimIterator(void) : Iterator( WW3DAssetManager::Get_Instance()->HAnimManager ) { };
 
-	virtual void			First(void) { Iterator.First(); }
-	virtual void			Next(void)	{ Iterator.Next(); }
-	virtual bool			Is_Done(void) { return Iterator.Is_Done(); }
-	virtual const char *	Current_Item_Name(void) { return Iterator.Get_Current_Anim()->Get_Name(); }
+	void			First(void) override { Iterator.First(); }
+	void			Next(void) override	{ Iterator.Next(); }
+	bool			Is_Done(void) override { return Iterator.Is_Done(); }
+	const char *	Current_Item_Name(void) override { return Iterator.Get_Current_Anim()->Get_Name(); }
 
 protected:
 	HAnimManagerIterator	Iterator;
@@ -167,8 +167,8 @@ class HAnimIterator : public AssetIterator
 class HTreeIterator : public AssetIterator
 {
 public:
-	virtual bool					Is_Done(void);
-	virtual const char *			Current_Item_Name(void);
+	bool					Is_Done(void) override;
+	const char *			Current_Item_Name(void) override;
 protected:
 	friend class WW3DAssetManager;
 };
@@ -177,10 +177,10 @@ class Font3DDataIterator : public AssetIterator
 {
 public:
 
-	virtual void					First(void) { Node = WW3DAssetManager::Get_Instance()->Font3DDatas.Head(); }
-	virtual void					Next(void)	{ Node = Node->Next(); }
-	virtual bool					Is_Done(void) { return Node==nullptr; }
-	virtual const char *			Current_Item_Name(void) { return Node->Data()->Name; }
+	void					First(void) override { Node = WW3DAssetManager::Get_Instance()->Font3DDatas.Head(); }
+	void					Next(void) override	{ Node = Node->Next(); }
+	bool					Is_Done(void) override { return Node==nullptr; }
+	const char *			Current_Item_Name(void) override { return Node->Data()->Name; }
 
 protected:
 
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp
index 009289e0ea2..84687d94ae3 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp
@@ -1430,9 +1430,9 @@ void DazzleRenderObjClass::Special_Render(SpecialRenderInfoClass & rinfo)
 
 class DazzlePersistFactoryClass : public PersistFactoryClass
 {
-	virtual uint32				Chunk_ID(void) const;
-	virtual PersistClass *	Load(ChunkLoadClass & cload) const;
-	virtual void				Save(ChunkSaveClass & csave,PersistClass * obj)	const;
+	uint32				Chunk_ID(void) const override;
+	PersistClass *	Load(ChunkLoadClass & cload) const override;
+	void				Save(ChunkSaveClass & csave,PersistClass * obj)	const override;
 
 	enum
 	{

From 9a6766083d9d9a89a0a0558f91dfbee7e2600964 Mon Sep 17 00:00:00 2001
From: bobtista <bobtista@gmail.com>
Date: Tue, 13 Jan 2026 11:50:12 -0500
Subject: [PATCH 2/8] feat: add OVERRIDE and FINAL macros for VC6 compatibility

---
 Dependencies/Utility/Utility/CppMacros.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Dependencies/Utility/Utility/CppMacros.h b/Dependencies/Utility/Utility/CppMacros.h
index d8f1bdddded..22456c1d45c 100644
--- a/Dependencies/Utility/Utility/CppMacros.h
+++ b/Dependencies/Utility/Utility/CppMacros.h
@@ -27,12 +27,16 @@
 
 #if __cplusplus >= 201103L
 #define CPP_11(code) code
+#define OVERRIDE override
+#define FINAL final
 #else
 #define CPP_11(code)
 #define static_assert(expr, msg)
 #define constexpr
 #define noexcept
 #define nullptr 0
+#define OVERRIDE
+#define FINAL
 #endif
 
 #if __cplusplus >= 201703L

From 15e1437d900d4e97bc4377a9b94eb8ddf3e6a421 Mon Sep 17 00:00:00 2001
From: bobtista <bobtista@gmail.com>
Date: Tue, 13 Jan 2026 12:00:09 -0500
Subject: [PATCH 3/8] refactor: use OVERRIDE macro instead of override keyword

---
 .../Source/GameNetwork/GameSpy/GSConfig.cpp   | 42 ++++-----
 .../W3DDevice/GameClient/W3DShaderManager.cpp | 84 +++++++++---------
 .../W3DDevice/GameClient/W3DTerrainVisual.cpp |  4 +-
 .../W3DDevice/GameClient/W3DTreeBuffer.cpp    |  2 +-
 .../W3DDevice/GameClient/WorldHeightMap.cpp   |  2 +-
 .../GameEngine/Source/GameClient/FXList.cpp   | 24 ++---
 .../GUI/GUICallbacks/Menus/DownloadMenu.cpp   | 10 +--
 .../GameEngine/Source/GameClient/GameText.cpp | 24 ++---
 .../GameEngine/Source/GameLogic/AI/AI.cpp     |  4 +-
 .../Source/GameLogic/AI/AIStates.cpp          | 12 +--
 .../GameLogic/Object/ObjectCreationList.cpp   | 16 ++--
 .../Update/AIUpdate/ChinookAIUpdate.cpp       | 56 ++++++------
 .../Object/Update/AIUpdate/DozerAIUpdate.cpp  | 66 +++++++-------
 .../Object/Update/AIUpdate/JetAIUpdate.cpp    | 86 +++++++++---------
 .../Update/AIUpdate/RailroadGuideAIUpdate.cpp |  2 +-
 .../Update/AIUpdate/SupplyTruckAIUpdate.cpp   | 26 +++---
 .../Object/Update/AIUpdate/WorkerAIUpdate.cpp | 22 ++---
 .../Object/Update/FireSpreadUpdate.cpp        |  2 +-
 .../GameLogic/Object/Update/HordeUpdate.cpp   |  2 +-
 .../Object/Update/StealthDetectorUpdate.cpp   |  2 +-
 .../Object/Update/TensileFormationUpdate.cpp  |  2 +-
 .../ScriptEngine/VictoryConditions.cpp        | 24 ++---
 .../GameEngine/Source/GameClient/FXList.cpp   | 24 ++---
 .../GUI/GUICallbacks/Menus/DownloadMenu.cpp   | 10 +--
 .../GameEngine/Source/GameClient/GameText.cpp | 24 ++---
 .../GameEngine/Source/GameLogic/AI/AI.cpp     |  4 +-
 .../Source/GameLogic/AI/AIStates.cpp          | 12 +--
 .../GameLogic/Object/ObjectCreationList.cpp   | 16 ++--
 .../Update/AIUpdate/ChinookAIUpdate.cpp       | 66 +++++++-------
 .../Object/Update/AIUpdate/DozerAIUpdate.cpp  | 66 +++++++-------
 .../Object/Update/AIUpdate/JetAIUpdate.cpp    | 88 +++++++++----------
 .../Update/AIUpdate/RailroadGuideAIUpdate.cpp |  2 +-
 .../Update/AIUpdate/SupplyTruckAIUpdate.cpp   | 26 +++---
 .../Object/Update/AIUpdate/WorkerAIUpdate.cpp | 22 ++---
 .../Object/Update/FireSpreadUpdate.cpp        |  2 +-
 .../GameLogic/Object/Update/HordeUpdate.cpp   |  2 +-
 .../Object/Update/SpectreGunshipUpdate.cpp    |  2 +-
 .../Object/Update/StealthDetectorUpdate.cpp   |  2 +-
 .../Object/Update/TensileFormationUpdate.cpp  |  2 +-
 .../ScriptEngine/VictoryConditions.cpp        | 24 ++---
 .../Source/WWVegas/WW3D2/assetmgr.cpp         | 26 +++---
 .../Libraries/Source/WWVegas/WW3D2/dazzle.cpp |  6 +-
 42 files changed, 470 insertions(+), 470 deletions(-)

diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp
index 750477e0018..6b019c10067 100644
--- a/Core/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp
+++ b/Core/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp
@@ -45,40 +45,40 @@ class GameSpyConfig : public GameSpyConfigInterface
 {
 public:
 	GameSpyConfig( AsciiString config );
-	~GameSpyConfig() override {}
+	~GameSpyConfig() OVERRIDE {}
 
 	// Pings
-	std::list<AsciiString> getPingServers(void) override	{ return m_pingServers; }
-	Int getNumPingRepetitions(void) override							{ return m_pingReps; }
-	Int getPingTimeoutInMs(void) override								{ return m_pingTimeout; }
-	Int getPingCutoffGood( void ) override				{	return m_pingCutoffGood; }
-	Int getPingCutoffBad( void ) override				{ return m_pingCutoffBad;	}
+	std::list<AsciiString> getPingServers(void) OVERRIDE	{ return m_pingServers; }
+	Int getNumPingRepetitions(void) OVERRIDE							{ return m_pingReps; }
+	Int getPingTimeoutInMs(void) OVERRIDE								{ return m_pingTimeout; }
+	Int getPingCutoffGood( void ) OVERRIDE				{	return m_pingCutoffGood; }
+	Int getPingCutoffBad( void ) OVERRIDE				{ return m_pingCutoffBad;	}
 
 	// QM
-	std::list<AsciiString> getQMMaps(void) override			{ return m_qmMaps; }
-	Int getQMBotID(void) override												{ return m_qmBotID; }
-	Int getQMChannel(void) override											{ return m_qmChannel; }
-	void setQMChannel(Int channel) override							{ m_qmChannel = channel; }
+	std::list<AsciiString> getQMMaps(void) OVERRIDE			{ return m_qmMaps; }
+	Int getQMBotID(void) OVERRIDE												{ return m_qmBotID; }
+	Int getQMChannel(void) OVERRIDE											{ return m_qmChannel; }
+	void setQMChannel(Int channel) OVERRIDE							{ m_qmChannel = channel; }
 
 	// Player Info
-	Int getPointsForRank(Int rank) override;
-	Bool isPlayerVIP(Int id) override;
+	Int getPointsForRank(Int rank) OVERRIDE;
+	Bool isPlayerVIP(Int id) OVERRIDE;
 
-	Bool getManglerLocation(Int index, AsciiString& host, UnsignedShort& port) override;
+	Bool getManglerLocation(Int index, AsciiString& host, UnsignedShort& port) OVERRIDE;
 
 	// Ladder / Any other external parsing
-	AsciiString getLeftoverConfig(void) override					{ return m_leftoverConfig; }
+	AsciiString getLeftoverConfig(void) OVERRIDE					{ return m_leftoverConfig; }
 
 	// NAT Timeouts
-	Int getTimeBetweenRetries() override { return m_natRetryInterval; }
-	Int getMaxManglerRetries() override { return m_natMaxManglerRetries; }
-	time_t getRetryInterval() override { return m_natManglerRetryInterval; }
-	time_t getKeepaliveInterval() override { return m_natKeepaliveInterval; }
-	time_t getPortTimeout() override { return m_natPortTimeout; }
-	time_t getRoundTimeout() override { return m_natRoundTimeout; }
+	Int getTimeBetweenRetries() OVERRIDE { return m_natRetryInterval; }
+	Int getMaxManglerRetries() OVERRIDE { return m_natMaxManglerRetries; }
+	time_t getRetryInterval() OVERRIDE { return m_natManglerRetryInterval; }
+	time_t getKeepaliveInterval() OVERRIDE { return m_natKeepaliveInterval; }
+	time_t getPortTimeout() OVERRIDE { return m_natPortTimeout; }
+	time_t getRoundTimeout() OVERRIDE { return m_natRoundTimeout; }
 
 	// Custom match
-	Bool restrictGamesToLobby() override { return m_restrictGamesToLobby; }
+	Bool restrictGamesToLobby() OVERRIDE { return m_restrictGamesToLobby; }
 
 protected:
 	std::list<AsciiString> m_pingServers;
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp
index 96d3ec2709e..3b6fdcbd52e 100644
--- a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp
@@ -120,13 +120,13 @@ IDirect3DSurface8 *W3DShaderManager::m_oldDepthSurface=nullptr;	///<previous dep
 class ScreenDefaultFilter : public W3DFilterInterface
 {
 public:
-	Int init(void) override;			///<perform any one time initialization and validation
-	Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode) override; ///< Set up at start of render.  Only applies to screen filter shaders.
-	Bool postRender(FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender) override; ///< Called after render.  Only applies to screen filter shaders.
-	Bool setup(FilterModes mode) override{return true;} ///< Called when the filter is started, one time before the first prerender.
+	Int init(void) OVERRIDE;			///<perform any one time initialization and validation
+	Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode) OVERRIDE; ///< Set up at start of render.  Only applies to screen filter shaders.
+	Bool postRender(FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender) OVERRIDE; ///< Called after render.  Only applies to screen filter shaders.
+	Bool setup(FilterModes mode) OVERRIDE{return true;} ///< Called when the filter is started, one time before the first prerender.
 protected:
-	Int set(FilterModes mode) override;		///<setup shader for the specified rendering pass.
-	void reset(void) override;		///<do any custom resetting necessary to bring W3D in sync.
+	Int set(FilterModes mode) OVERRIDE;		///<setup shader for the specified rendering pass.
+	void reset(void) OVERRIDE;		///<do any custom resetting necessary to bring W3D in sync.
 };
 
 ScreenDefaultFilter screenDefaultFilter;
@@ -1177,9 +1177,9 @@ Int ScreenMotionBlurFilter::shutdown(void)
 ///Shroud layer rendering shader
 class ShroudTextureShader : public W3DShaderInterface
 {
-	Int set(Int pass) override;		///<setup shader for the specified rendering pass.
-	Int init(void) override;			///<perform any one time initialization and validation
-	void reset(void) override;		///<do any custom resetting necessary to bring W3D in sync.
+	Int set(Int pass) OVERRIDE;		///<setup shader for the specified rendering pass.
+	Int init(void) OVERRIDE;			///<perform any one time initialization and validation
+	void reset(void) OVERRIDE;		///<do any custom resetting necessary to bring W3D in sync.
 	Int m_stageOfSet;
 } shroudTextureShader;
 
@@ -1277,9 +1277,9 @@ void ShroudTextureShader::reset(void)
 ///Shroud layer rendering shader
 class FlatShroudTextureShader : public W3DShaderInterface
 {
-	Int set(Int pass) override;		///<setup shader for the specified rendering pass.
-	Int init(void) override;			///<perform any one time initialization and validation
-	void reset(void) override;		///<do any custom resetting necessary to bring W3D in sync.
+	Int set(Int pass) OVERRIDE;		///<setup shader for the specified rendering pass.
+	Int init(void) OVERRIDE;			///<perform any one time initialization and validation
+	void reset(void) OVERRIDE;		///<do any custom resetting necessary to bring W3D in sync.
 	Int m_stageOfSet;
 } flatShroudTextureShader;
 
@@ -1370,9 +1370,9 @@ void FlatShroudTextureShader::reset(void)
 ///Mask layer rendering shader
 class MaskTextureShader : public W3DShaderInterface
 {
-	Int set(Int pass) override;		///<setup shader for the specified rendering pass.
-	Int init(void) override;			///<perform any one time initialization and validation
-	void reset(void) override;		///<do any custom resetting necessary to bring W3D in sync.
+	Int set(Int pass) OVERRIDE;		///<setup shader for the specified rendering pass.
+	Int init(void) OVERRIDE;			///<perform any one time initialization and validation
+	void reset(void) OVERRIDE;		///<do any custom resetting necessary to bring W3D in sync.
 } maskTextureShader;
 
 ///List of different shroud shader implementations in order of preference
@@ -1486,9 +1486,9 @@ class TerrainShader2Stage : public W3DShaderInterface
 	float m_xOffset;
 	float m_yOffset;
 
-	Int set(Int pass) override;		///<setup shader for the specified rendering pass.
-	Int init(void) override;			///<perform any one time initialization and validation
-	void reset(void) override;		///<do any custom resetting necessary to bring W3D in sync.
+	Int set(Int pass) OVERRIDE;		///<setup shader for the specified rendering pass.
+	Int init(void) OVERRIDE;			///<perform any one time initialization and validation
+	void reset(void) OVERRIDE;		///<do any custom resetting necessary to bring W3D in sync.
 
 	void updateCloud();
 	void updateNoise1 (D3DXMATRIX *destMatrix,D3DXMATRIX *curViewInverse, Bool doUpdate=true);	///<generate the uv coordinates for Noise1 (i.e clouds)
@@ -1499,9 +1499,9 @@ class TerrainShader2Stage : public W3DShaderInterface
 class FlatTerrainShader2Stage : public W3DShaderInterface
 {
 public:
-	Int set(Int pass) override;		///<setup shader for the specified rendering pass.
-	Int init(void) override;			///<perform any one time initialization and validation
-	void reset(void) override;		///<do any custom resetting necessary to bring W3D in sync.
+	Int set(Int pass) OVERRIDE;		///<setup shader for the specified rendering pass.
+	Int init(void) OVERRIDE;			///<perform any one time initialization and validation
+	void reset(void) OVERRIDE;		///<do any custom resetting necessary to bring W3D in sync.
 } flatTerrainShader2Stage;
 
 ///regular terrain shader that should work on all multi-texture video cards (slowest version)
@@ -1512,18 +1512,18 @@ class FlatTerrainShaderPixelShader : public W3DShaderInterface
 	DWORD					m_dwBaseNoise1PixelShader;	///<handle to terrain/single noise D3D pixel shader
 	DWORD					m_dwBaseNoise2PixelShader;	///<handle to terrain/double noise D3D pixel shader
 	DWORD					m_dwBase0PixelShader;	///<handle to terrain only pixel shader
-	Int set(Int pass) override;		///<setup shader for the specified rendering pass.
-	Int init(void) override;			///<perform any one time initialization and validation
-	void reset(void) override;		///<do any custom resetting necessary to bring W3D in sync.
-	Int shutdown(void) override;			///<release resources used by shader
+	Int set(Int pass) OVERRIDE;		///<setup shader for the specified rendering pass.
+	Int init(void) OVERRIDE;			///<perform any one time initialization and validation
+	void reset(void) OVERRIDE;		///<do any custom resetting necessary to bring W3D in sync.
+	Int shutdown(void) OVERRIDE;			///<release resources used by shader
 } flatTerrainShaderPixelShader;
 
 ///8 stage terrain shader which only works on certain Nvidia cards.
 class TerrainShader8Stage : public W3DShaderInterface
 {
-	Int set(Int pass) override;		///<setup shader for the specified rendering pass.
-	void reset(void) override;		///<do any custom resetting necessary to bring W3D in sync.
-	Int init(void) override;			///<perform any one time initialization and validation
+	Int set(Int pass) OVERRIDE;		///<setup shader for the specified rendering pass.
+	void reset(void) OVERRIDE;		///<do any custom resetting necessary to bring W3D in sync.
+	Int init(void) OVERRIDE;			///<perform any one time initialization and validation
 } terrainShader8Stage;
 
 //Offsets into constant register pool used by vertex shader
@@ -1536,10 +1536,10 @@ class TerrainShaderPixelShader : public W3DShaderInterface
 	DWORD					m_dwBaseNoise1PixelShader;	///<handle to terrain/single noise D3D pixel shader
 	DWORD					m_dwBaseNoise2PixelShader;	///<handle to terrain/double noise D3D pixel shader
 
-	Int set(Int pass) override;		///<setup shader for the specified rendering pass.
-	void reset(void) override;		///<do any custom resetting necessary to bring W3D in sync.
-	Int init(void) override;			///<perform any one time initialization and validation
-	Int shutdown(void) override;			///<release resources used by shader
+	Int set(Int pass) OVERRIDE;		///<setup shader for the specified rendering pass.
+	void reset(void) OVERRIDE;		///<do any custom resetting necessary to bring W3D in sync.
+	Int init(void) OVERRIDE;			///<perform any one time initialization and validation
+	Int shutdown(void) OVERRIDE;			///<release resources used by shader
 } terrainShaderPixelShader;
 
 ///List of different terrain shader implementations in order of preference
@@ -2133,9 +2133,9 @@ void TerrainShaderPixelShader::reset(void)
 ///Cloud layer rendering shader - used for objects similar to terrain which only need the cloud layer.
 class CloudTextureShader : public W3DShaderInterface
 {
-	Int set(Int stage) override;		///<setup shader for the specified rendering pass.
-	Int init(void) override;			///<perform any one time initialization and validation
-	void reset(void) override;		///<do any custom resetting necessary to bring W3D in sync.
+	Int set(Int stage) OVERRIDE;		///<setup shader for the specified rendering pass.
+	Int init(void) OVERRIDE;			///<perform any one time initialization and validation
+	void reset(void) OVERRIDE;		///<do any custom resetting necessary to bring W3D in sync.
 	Int m_stageOfSet;
 } cloudTextureShader;
 
@@ -2208,18 +2208,18 @@ class RoadShaderPixelShader : public W3DShaderInterface
 {
 	DWORD					m_dwBaseNoise2PixelShader;	///<handle to road/double noise D3D pixel shader
 
-	Int set(Int pass) override;		///<setup shader for the specified rendering pass.
-	void reset(void) override;		///<do any custom resetting necessary to bring W3D in sync.
-	Int init(void) override;			///<perform any one time initialization and validation
-	Int shutdown(void) override;			///<release resources used by shader
+	Int set(Int pass) OVERRIDE;		///<setup shader for the specified rendering pass.
+	void reset(void) OVERRIDE;		///<do any custom resetting necessary to bring W3D in sync.
+	Int init(void) OVERRIDE;			///<perform any one time initialization and validation
+	Int shutdown(void) OVERRIDE;			///<release resources used by shader
 } roadShaderPixelShader;
 
 class RoadShader2Stage : public W3DShaderInterface
 {	friend class RoadShaderPixelShader;	//pixel shader version uses some of the same features.
 
-	Int set(Int pass) override;		///<setup shader for the specified rendering pass.
-	Int init(void) override;			///<perform any one time initialization and validation
-	void reset(void) override;
+	Int set(Int pass) OVERRIDE;		///<setup shader for the specified rendering pass.
+	Int init(void) OVERRIDE;			///<perform any one time initialization and validation
+	void reset(void) OVERRIDE;
 } roadShader2Stage;
 
 ///List of different terrain shader implementations in order of preference
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
index d67c42f1c71..d215546f1de 100644
--- a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
@@ -69,7 +69,7 @@
 class TestSeismicFilter : public SeismicSimulationFilterBase
 {
 
-  SeismicSimStatusCode filterCallback( WorldHeightMapInterfaceClass *heightMap, const SeismicSimulationNode *node ) override
+  SeismicSimStatusCode filterCallback( WorldHeightMapInterfaceClass *heightMap, const SeismicSimulationNode *node ) OVERRIDE
   {
 
 
@@ -140,7 +140,7 @@ class TestSeismicFilter : public SeismicSimulationFilterBase
       return SEISMIC_STATUS_ZERO_ENERGY;
   }
 
-  Real applyGravityCallback( Real velocityIn ) override
+  Real applyGravityCallback( Real velocityIn ) OVERRIDE
   {
     Real velocityOut = velocityIn;
     velocityOut -= 1.5f;
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
index 3c6724deae9..5b9927df005 100644
--- a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
@@ -421,7 +421,7 @@ class GDIFileStream2 : public InputStream
 public:
 	GDIFileStream2():m_file(nullptr) {};
 	GDIFileStream2(File* pFile):m_file(pFile) {};
-	Int read(void *pData, Int numBytes) override {
+	Int read(void *pData, Int numBytes) OVERRIDE {
 		return(m_file?m_file->read(pData, numBytes):0);
 	};
 };
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp
index c51e928956d..d8fa8ee9768 100644
--- a/Core/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp
@@ -73,7 +73,7 @@ class GDIFileStream : public InputStream
 	File* m_file;
 public:
 	GDIFileStream(File* pFile):m_file(pFile) {};
-	Int read(void *pData, Int numBytes) override {
+	Int read(void *pData, Int numBytes) OVERRIDE {
 			return(m_file->read(pData, numBytes));
 	};
 };
diff --git a/Generals/Code/GameEngine/Source/GameClient/FXList.cpp b/Generals/Code/GameEngine/Source/GameClient/FXList.cpp
index 324af0ef91d..34b65a9cdf6 100644
--- a/Generals/Code/GameEngine/Source/GameClient/FXList.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/FXList.cpp
@@ -95,7 +95,7 @@ class SoundFXNugget : public FXNugget
 
 public:
 
-	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override
+	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const OVERRIDE
 	{
 		AudioEventRTS sound(m_soundName);
 
@@ -107,7 +107,7 @@ class SoundFXNugget : public FXNugget
 		TheAudio->addAudioEvent(&sound);
 	}
 
-	void doFXObj(const Object* primary, const Object* secondary = nullptr) const override
+	void doFXObj(const Object* primary, const Object* secondary = nullptr) const OVERRIDE
 	{
 		AudioEventRTS sound(m_soundName);
 		if (primary)
@@ -165,7 +165,7 @@ class TracerFXNugget : public FXNugget
 		m_probability = 1.0f;
 	}
 
-	void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real primarySpeed, const Coord3D *secondary, const Real /*overrideRadius*/ ) const override
+	void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real primarySpeed, const Coord3D *secondary, const Real /*overrideRadius*/ ) const OVERRIDE
 	{
 		if (m_probability <= GameClientRandomValueReal(0, 1))
 			return;
@@ -263,7 +263,7 @@ class RayEffectFXNugget : public FXNugget
 		m_secondaryOffset.x = m_secondaryOffset.y = m_secondaryOffset.z = 0;
 	}
 
-	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * secondary, const Real /*overrideRadius*/ ) const override
+	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * secondary, const Real /*overrideRadius*/ ) const OVERRIDE
 	{
 		const ThingTemplate* tmpl = TheThingFactory->findTemplate(m_templateName);
 		DEBUG_ASSERTCRASH(tmpl, ("RayEffect %s not found",m_templateName.str()));
@@ -320,7 +320,7 @@ class LightPulseFXNugget : public FXNugget
 		m_color.red = m_color.green = m_color.blue = 0;
 	}
 
-	void doFXObj(const Object* primary, const Object* /*secondary*/) const override
+	void doFXObj(const Object* primary, const Object* /*secondary*/) const OVERRIDE
 	{
 		if (primary)
 		{
@@ -337,7 +337,7 @@ class LightPulseFXNugget : public FXNugget
 		}
 	}
 
-	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override
+	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const OVERRIDE
 	{
 		if (primary)
 		{
@@ -385,7 +385,7 @@ class ViewShakeFXNugget : public FXNugget
 	{
 	}
 
-	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override
+	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const OVERRIDE
 	{
 		if (primary)
 		{
@@ -445,7 +445,7 @@ class TerrainScorchFXNugget : public FXNugget
 	{
 	}
 
-	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override
+	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const OVERRIDE
 	{
 		if (primary)
 		{
@@ -523,7 +523,7 @@ class ParticleSystemFXNugget : public FXNugget
 		m_rotateX = m_rotateY = m_rotateZ = 0;
 	}
 
-	void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real overrideRadius ) const override
+	void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real overrideRadius ) const OVERRIDE
 	{
 		if (primary)
 		{
@@ -535,7 +535,7 @@ class ParticleSystemFXNugget : public FXNugget
 		}
 	}
 
-	void doFXObj(const Object* primary, const Object* secondary) const override
+	void doFXObj(const Object* primary, const Object* secondary) const OVERRIDE
 	{
 		if (primary)
 		{
@@ -694,12 +694,12 @@ class FXListAtBonePosFXNugget : public FXNugget
     m_orientToBone = true;
 	}
 
-	void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override
+	void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const OVERRIDE
 	{
 		DEBUG_CRASH(("You must use the object form for this effect"));
 	}
 
-	void doFXObj(const Object* primary, const Object* /*secondary*/) const override
+	void doFXObj(const Object* primary, const Object* /*secondary*/) const OVERRIDE
 	{
 		if (primary)
 		{
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
index 92878f9bd3f..f8b71b36a8b 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
@@ -122,11 +122,11 @@ class DownloadManagerMunkee : public DownloadManager
 {
 public:
 	DownloadManagerMunkee() {m_shouldQuitOnSuccess = true; m_shouldQuitOnSuccess = false;}
-	HRESULT OnError( Int error ) override;
-	HRESULT OnEnd() override;
-	HRESULT OnProgressUpdate( Int bytesread, Int totalsize, Int timetaken, Int timeleft ) override;
-	HRESULT OnStatusUpdate( Int status ) override;
-	HRESULT downloadFile( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume ) override;
+	HRESULT OnError( Int error ) OVERRIDE;
+	HRESULT OnEnd() OVERRIDE;
+	HRESULT OnProgressUpdate( Int bytesread, Int totalsize, Int timetaken, Int timeleft ) OVERRIDE;
+	HRESULT OnStatusUpdate( Int status ) OVERRIDE;
+	HRESULT downloadFile( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume ) OVERRIDE;
 
 private:
 	Bool m_shouldQuitOnSuccess;
diff --git a/Generals/Code/GameEngine/Source/GameClient/GameText.cpp b/Generals/Code/GameEngine/Source/GameClient/GameText.cpp
index 93680f5e397..16335216976 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GameText.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GameText.cpp
@@ -138,23 +138,23 @@ class GameTextManager : public GameTextInterface
 	public:
 
 		GameTextManager();
-		~GameTextManager() override;
+		~GameTextManager() OVERRIDE;
 
-		void					init( void ) override;						///< Initializes the text system
+		void					init( void ) OVERRIDE;						///< Initializes the text system
 		virtual void					deinit( void );					///< Shuts down the text system
-		void					update( void ) override {};			///< update text manager
-		void					reset( void ) override;					///< Resets the text system
+		void					update( void ) OVERRIDE {};			///< update text manager
+		void					reset( void ) OVERRIDE;					///< Resets the text system
 
-		UnicodeString fetch( const Char *label, Bool *exists = nullptr ) override;		///< Returns the associated labeled unicode text
-		UnicodeString fetch( AsciiString label, Bool *exists = nullptr ) override;		///< Returns the associated labeled unicode text
-		UnicodeString fetchFormat( const Char *label, ... ) override;
-		UnicodeString fetchOrSubstitute( const Char *label, const WideChar *substituteText ) override;
-		UnicodeString fetchOrSubstituteFormat( const Char *label, const WideChar *substituteFormat, ... ) override;
-		UnicodeString fetchOrSubstituteFormatVA( const Char *label, const WideChar *substituteFormat, va_list args ) override;
+		UnicodeString fetch( const Char *label, Bool *exists = nullptr ) OVERRIDE;		///< Returns the associated labeled unicode text
+		UnicodeString fetch( AsciiString label, Bool *exists = nullptr ) OVERRIDE;		///< Returns the associated labeled unicode text
+		UnicodeString fetchFormat( const Char *label, ... ) OVERRIDE;
+		UnicodeString fetchOrSubstitute( const Char *label, const WideChar *substituteText ) OVERRIDE;
+		UnicodeString fetchOrSubstituteFormat( const Char *label, const WideChar *substituteFormat, ... ) OVERRIDE;
+		UnicodeString fetchOrSubstituteFormatVA( const Char *label, const WideChar *substituteFormat, va_list args ) OVERRIDE;
 
-		AsciiStringVec& getStringsWithLabelPrefix(AsciiString label) override;
+		AsciiStringVec& getStringsWithLabelPrefix(AsciiString label) OVERRIDE;
 
-		void					initMapStringFile( const AsciiString& filename ) override;
+		void					initMapStringFile( const AsciiString& filename ) OVERRIDE;
 
 	protected:
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp
index cc5c5a8d138..fb01f8b453b 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp
@@ -513,7 +513,7 @@ class PartitionFilterLiveMapEnemies : public PartitionFilter
 public:
 	PartitionFilterLiveMapEnemies(const Object *obj) : m_obj(obj) { }
 
-	Bool allow(Object *objOther) override
+	Bool allow(Object *objOther) OVERRIDE
 	{
 		// this is way fast (bit test) so do it first.
 		if (objOther->isEffectivelyDead())
@@ -543,7 +543,7 @@ class PartitionFilterWithinAttackRange : public PartitionFilter
 public:
 	PartitionFilterWithinAttackRange(const Object* obj) : m_obj(obj) { }
 
-	Bool allow(Object* objOther) override
+	Bool allow(Object* objOther) OVERRIDE
 	{
 		for (Int i = 0; i < WEAPONSLOT_COUNT;	i++ )
 		{
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
index 58e6383372b..9c3b4cb2f2d 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
@@ -1906,9 +1906,9 @@ class AIAttackMoveStateMachine : public StateMachine
 
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override;
-	void xfer( Xfer *xfer ) override;
-	void loadPostProcess() override;
+	void crc( Xfer *xfer ) OVERRIDE;
+	void xfer( Xfer *xfer ) OVERRIDE;
+	void loadPostProcess() OVERRIDE;
 };
 
 // ------------------------------------------------------------------------------------------------
@@ -5535,9 +5535,9 @@ class AIAttackThenIdleStateMachine : public StateMachine
 	AIAttackThenIdleStateMachine( Object *owner, AsciiString name );
 protected:
 	// snapshot interface .
-	void crc( Xfer *xfer ) override;
-	void xfer( Xfer *xfer ) override;
-	void loadPostProcess() override;
+	void crc( Xfer *xfer ) OVERRIDE;
+	void xfer( Xfer *xfer ) OVERRIDE;
+	void loadPostProcess() OVERRIDE;
 };
 
 // ------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
index 19e788423e9..e3e66160be2 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
@@ -123,7 +123,7 @@ class FireWeaponNugget : public ObjectCreationNugget
 	{
 	}
 
-	Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const override
+	Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const OVERRIDE
 	{
 		if (!primaryObj || !primary || !secondary)
 		{
@@ -170,7 +170,7 @@ class AttackNugget : public ObjectCreationNugget
 	{
 	}
 
-	Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const override
+	Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const OVERRIDE
 	{
 		if (!primaryObj || !primary || !secondary)
 		{
@@ -252,12 +252,12 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 		m_transportName.clear();
 	}
 
-	Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, UnsignedInt lifetimeFrames = 0 ) const override
+	Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, UnsignedInt lifetimeFrames = 0 ) const OVERRIDE
 	{
 		return create( primaryObj, primary, secondary, true, lifetimeFrames );
 	}
 
-	Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Bool createOwner, UnsignedInt lifetimeFrames = 0 ) const override
+	Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Bool createOwner, UnsignedInt lifetimeFrames = 0 ) const OVERRIDE
 	{
 		if (!primaryObj || !primary || !secondary)
 		{
@@ -610,7 +610,7 @@ class ApplyRandomForceNugget : public ObjectCreationNugget
 	{
 	}
 
-	Object* create( const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const override
+	Object* create( const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const OVERRIDE
 	{
 		if (primary)
 		{
@@ -641,7 +641,7 @@ class ApplyRandomForceNugget : public ObjectCreationNugget
 		return nullptr;
 	}
 
-	Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const override
+	Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const OVERRIDE
 	{
 		DEBUG_CRASH(("You must call this effect with an object, not a location"));
 		return nullptr;
@@ -765,7 +765,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 		m_offset.zero();
 	}
 
-	Object* create(const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const override
+	Object* create(const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const OVERRIDE
 	{
 		if (primary)
 		{
@@ -781,7 +781,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 		return nullptr;
 	}
 
-	Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const override
+	Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const OVERRIDE
 	{
 		if (primary)
 		{
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
index 26bd4c7abf1..8b7c91db75f 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
@@ -110,13 +110,13 @@ class ChinookEvacuateState : public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookEvacuateState, "ChinookEvacuateState")
 protected:
 	// snapshot interface	STUBBED - no member vars to save. jba.
-	void crc( Xfer *xfer ) override{};
-	void xfer( Xfer *xfer ) override{};
-	void loadPostProcess() override{};
+	void crc( Xfer *xfer ) OVERRIDE{};
+	void xfer( Xfer *xfer ) OVERRIDE{};
+	void loadPostProcess() OVERRIDE{};
 public:
 	ChinookEvacuateState( StateMachine *machine ) : State( machine, "ChinookEvacuateState" ) { }
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* obj = getMachineOwner();
 		if( obj->getContain() )
@@ -127,7 +127,7 @@ class ChinookEvacuateState : public State
 		return STATE_SUCCESS;
 	}
 
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		return STATE_SUCCESS;
 	}
@@ -141,13 +141,13 @@ class ChinookHeadOffMapState :  public State
 	//I'm outta here
 protected:
 	// snapshot interface	STUBBED - no member vars to save. jba.
-	void crc( Xfer *xfer ) override{};
-	void xfer( Xfer *xfer ) override{};
-	void loadPostProcess() override{};
+	void crc( Xfer *xfer ) OVERRIDE{};
+	void xfer( Xfer *xfer ) OVERRIDE{};
+	void loadPostProcess() OVERRIDE{};
 public:
 	ChinookHeadOffMapState( StateMachine *machine ) : State( machine, "ChinookHeadOffMapState" ) {}
 
-	StateReturnType onEnter() override // Give move order out of town
+	StateReturnType onEnter() OVERRIDE // Give move order out of town
 	{
 		Object *owner = getMachineOwner();
 		AIUpdateInterface *ai = owner->getAIUpdateInterface();
@@ -170,7 +170,7 @@ class ChinookHeadOffMapState :  public State
 		return STATE_CONTINUE;
 	}
 
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		Object *owner = getMachineOwner();
 
@@ -197,12 +197,12 @@ class ChinookTakeoffOrLandingState : public State
 
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override
+	void crc( Xfer *xfer ) OVERRIDE
 	{
 		// empty
 	}
 
-	void xfer( Xfer *xfer ) override
+	void xfer( Xfer *xfer ) OVERRIDE
 	{
 		// version
 		XferVersion currentVersion = 1;
@@ -213,7 +213,7 @@ class ChinookTakeoffOrLandingState : public State
 		xfer->xferBool(&m_landing);
 	}
 
-	void loadPostProcess() override
+	void loadPostProcess() OVERRIDE
 	{
 		// empty
 	}
@@ -224,7 +224,7 @@ class ChinookTakeoffOrLandingState : public State
 		m_destLoc.zero();
 	}
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -281,7 +281,7 @@ class ChinookTakeoffOrLandingState : public State
 		return STATE_CONTINUE;
 	}
 
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		Object* obj = getMachineOwner();
 		if (obj->isEffectivelyDead())
@@ -299,7 +299,7 @@ class ChinookTakeoffOrLandingState : public State
 		return STATE_CONTINUE;
 	}
 
-	void onExit( StateExitType status ) override
+	void onExit( StateExitType status ) OVERRIDE
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -415,12 +415,12 @@ class ChinookCombatDropState : public State
 
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override
+	void crc( Xfer *xfer ) OVERRIDE
 	{
 		// empty
 	}
 
-	void xfer( Xfer *xfer ) override
+	void xfer( Xfer *xfer ) OVERRIDE
 	{
 		// version
 		const XferVersion currentVersion = 2;
@@ -467,7 +467,7 @@ class ChinookCombatDropState : public State
 		}
 	}
 
-	void loadPostProcess() override
+	void loadPostProcess() OVERRIDE
 	{
 		for (std::vector<RopeInfo>::iterator it = m_ropes.begin(); it != m_ropes.end(); ++it)
 		{
@@ -481,7 +481,7 @@ class ChinookCombatDropState : public State
 	ChinookCombatDropState( StateMachine *machine ): State( machine, "ChinookCombatDropState" ) { }
 
 	// --------------
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* obj = getMachineOwner();
 		Drawable* draw = obj->getDrawable();
@@ -547,7 +547,7 @@ class ChinookCombatDropState : public State
 	}
 
 	// --------------
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -639,7 +639,7 @@ class ChinookCombatDropState : public State
 	}
 
 	// --------------
-	void onExit( StateExitType status ) override
+	void onExit( StateExitType status ) OVERRIDE
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -697,12 +697,12 @@ class ChinookMoveToBldgState : public AIMoveToState
 	Real m_destZ;
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override
+	void crc( Xfer *xfer ) OVERRIDE
 	{
 		// empty
 	}
 
-	void xfer( Xfer *xfer ) override
+	void xfer( Xfer *xfer ) OVERRIDE
 	{
 		// version
 		XferVersion currentVersion = 1;
@@ -714,7 +714,7 @@ class ChinookMoveToBldgState : public AIMoveToState
 		xfer->xferReal(&m_destZ);
 	}
 
-	void loadPostProcess() override
+	void loadPostProcess() OVERRIDE
 	{
 		// empty
 	}
@@ -722,7 +722,7 @@ class ChinookMoveToBldgState : public AIMoveToState
 public:
 	ChinookMoveToBldgState( StateMachine *machine ): AIMoveToState( machine ) { }
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -753,7 +753,7 @@ class ChinookMoveToBldgState : public AIMoveToState
 		return AIMoveToState::onEnter();
 	}
 
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		Object* obj = getMachineOwner();
 
@@ -767,7 +767,7 @@ class ChinookMoveToBldgState : public AIMoveToState
 		return status;
 	}
 
-	void onExit( StateExitType status ) override
+	void onExit( StateExitType status ) OVERRIDE
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
index 0c1f27bf541..75433ee0b00 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
@@ -86,13 +86,13 @@ class DozerActionPickActionPosState : public State
 public:
 
 	DozerActionPickActionPosState( StateMachine *machine, DozerTask task );
-	StateReturnType update( void ) override;
+	StateReturnType update( void ) OVERRIDE;
 
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override;
-	void xfer( Xfer *xfer ) override;
-	void loadPostProcess() override;
+	void crc( Xfer *xfer ) OVERRIDE;
+	void xfer( Xfer *xfer ) OVERRIDE;
+	void loadPostProcess() OVERRIDE;
 
 protected:
 
@@ -243,13 +243,13 @@ class DozerActionMoveToActionPosState : public State
 public:
 
 	DozerActionMoveToActionPosState( StateMachine *machine, DozerTask task ) : State( machine, "DozerActionMoveToActionPosState" ) { m_task = task; }
-	StateReturnType update( void ) override;
+	StateReturnType update( void ) OVERRIDE;
 
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override;
-	void xfer( Xfer *xfer ) override;
-	void loadPostProcess() override;
+	void crc( Xfer *xfer ) OVERRIDE;
+	void xfer( Xfer *xfer ) OVERRIDE;
+	void loadPostProcess() OVERRIDE;
 
 protected:
 
@@ -386,15 +386,15 @@ class DozerActionDoActionState : public State
 		m_task = task;
 		m_enterFrame = 0;
 	}
-	StateReturnType update( void ) override;
-	StateReturnType onEnter( void ) override;
-	void onExit( StateExitType status ) override { }
+	StateReturnType update( void ) OVERRIDE;
+	StateReturnType onEnter( void ) OVERRIDE;
+	void onExit( StateExitType status ) OVERRIDE { }
 
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override;
-	void xfer( Xfer *xfer ) override;
-	void loadPostProcess() override;
+	void crc( Xfer *xfer ) OVERRIDE;
+	void xfer( Xfer *xfer ) OVERRIDE;
+	void loadPostProcess() OVERRIDE;
 
 protected:
 
@@ -792,9 +792,9 @@ class DozerActionStateMachine : public StateMachine
 
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override;
-	void xfer( Xfer *xfer ) override;
-	void loadPostProcess() override;
+	void crc( Xfer *xfer ) OVERRIDE;
+	void xfer( Xfer *xfer ) OVERRIDE;
+	void loadPostProcess() OVERRIDE;
 
 protected:
 
@@ -967,15 +967,15 @@ class DozerPrimaryIdleState : public State
 		m_idlePlayerNumber = 0;
 		m_isMarkedAsIdle   = FALSE;
 	}
-	StateReturnType update( void ) override;
-	StateReturnType onEnter( void ) override;
-	void onExit( StateExitType status ) override;
+	StateReturnType update( void ) OVERRIDE;
+	StateReturnType onEnter( void ) OVERRIDE;
+	void onExit( StateExitType status ) OVERRIDE;
 
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override;
-	void xfer( Xfer *xfer ) override;
-	void loadPostProcess() override;
+	void crc( Xfer *xfer ) OVERRIDE;
+	void xfer( Xfer *xfer ) OVERRIDE;
+	void loadPostProcess() OVERRIDE;
 
 protected:
 
@@ -1154,16 +1154,16 @@ class DozerActionState : public State
 		Note that we DON'T use CONVERT_SLEEP_TO_CONTINUE; since we're not doing anything else
 		interesting in update, we can sleep when this machine sleeps
 	*/
-	StateReturnType update( void ) override { return m_actionMachine->updateStateMachine(); }
+	StateReturnType update( void ) OVERRIDE { return m_actionMachine->updateStateMachine(); }
 
-	StateReturnType onEnter( void ) override;
-	void onExit( StateExitType status ) override;
+	StateReturnType onEnter( void ) OVERRIDE;
+	void onExit( StateExitType status ) OVERRIDE;
 
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override;
-	void xfer( Xfer *xfer ) override;
-	void loadPostProcess() override;
+	void crc( Xfer *xfer ) OVERRIDE;
+	void xfer( Xfer *xfer ) OVERRIDE;
+	void loadPostProcess() OVERRIDE;
 
 protected:
 
@@ -1253,14 +1253,14 @@ class DozerPrimaryGoingHomeState : public State
 
 protected:
 	// snapshot interface	 STUBBED no member vars
-	void crc( Xfer *xfer ) override{};
-	void xfer( Xfer *xfer ) override{};
-	void loadPostProcess() override{};
+	void crc( Xfer *xfer ) OVERRIDE{};
+	void xfer( Xfer *xfer ) OVERRIDE{};
+	void loadPostProcess() OVERRIDE{};
 
 public:
 
 	DozerPrimaryGoingHomeState( StateMachine *machine ) : State( machine, "DozerPrimaryGoingHomeState" ) { }
-	StateReturnType update( void ) override { return STATE_FAILURE; }
+	StateReturnType update( void ) OVERRIDE { return STATE_FAILURE; }
 
 };
 EMPTY_DTOR(DozerPrimaryGoingHomeState)
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
index 463d6bca28d..93d1f471ba2 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
@@ -134,7 +134,7 @@ class PartitionFilterHasParkingPlace : public PartitionFilter
 #if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterHasParkingPlace"; }
 #endif
-	Bool allow(Object *objOther) override
+	Bool allow(Object *objOther) OVERRIDE
 	{
 		ParkingPlaceBehaviorInterface* pp = getPP(objOther->getID());
 		if (pp != nullptr && pp->reserveSpace(m_id, 0.0f, nullptr))
@@ -182,16 +182,16 @@ class JetAwaitingRunwayState : public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetAwaitingRunwayState, "JetAwaitingRunwayState")
 protected:
 	// snapshot interface STUBBED.
-	void crc( Xfer *xfer ) override{};
-	void xfer( Xfer *xfer ) override{XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
-	void loadPostProcess() override{};
+	void crc( Xfer *xfer ) OVERRIDE{};
+	void xfer( Xfer *xfer ) OVERRIDE{XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
+	void loadPostProcess() OVERRIDE{};
 private:
 	const Bool m_landing;
 
 public:
 	JetAwaitingRunwayState( StateMachine *machine, Bool landing ) : m_landing(landing), State( machine, "JetAwaitingRunwayState") { }
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -204,7 +204,7 @@ class JetAwaitingRunwayState : public State
 		return STATE_CONTINUE;
 	}
 
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		if (jet->isEffectivelyDead())
@@ -238,7 +238,7 @@ class JetAwaitingRunwayState : public State
 		return STATE_CONTINUE;
 	}
 
-	void onExit(StateExitType status) override
+	void onExit(StateExitType status) OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -264,9 +264,9 @@ class JetOrHeliCirclingDeadAirfieldState : public State
 protected:
 	// snapshot interface	 STUBBED.
 	// The state will check immediately after a load game, but I think that's ok.  jba.
-	void crc( Xfer *xfer ) override{};
-	void xfer( Xfer *xfer ) override{XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
-	void loadPostProcess() override{};
+	void crc( Xfer *xfer ) OVERRIDE{};
+	void xfer( Xfer *xfer ) OVERRIDE{XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
+	void loadPostProcess() OVERRIDE{};
 
 private:
 	Int m_checkAirfield;
@@ -282,7 +282,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State
 		State( machine, "JetOrHeliCirclingDeadAirfieldState"),
 		m_checkAirfield(0) { }
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -313,7 +313,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State
 		return STATE_CONTINUE;
 	}
 
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -369,7 +369,7 @@ class JetOrHeliReturningToDeadAirfieldState : public AIInternalMoveToState
 public:
 	JetOrHeliReturningToDeadAirfieldState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturningToDeadAirfieldState") { }
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -430,7 +430,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
 public:
 	JetOrHeliTaxiState( StateMachine *machine, TaxiType m ) : m_taxiMode(m), AIMoveOutOfTheWayState( machine ) { }
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -509,7 +509,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
 		return ret;
 	}
 
-	void onExit( StateExitType status ) override
+	void onExit( StateExitType status ) OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -550,7 +550,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 public:
 	JetTakeoffOrLandingState( StateMachine *machine, Bool landing ) : m_landing(landing), AIFollowPathState( machine, "JetTakeoffOrLandingState" ) { }
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -633,7 +633,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 		return ret;
 	}
 
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		if (jet->isEffectivelyDead())
@@ -695,7 +695,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 		return ret;
 	}
 
-	void onExit( StateExitType status ) override
+	void onExit( StateExitType status ) OVERRIDE
 	{
 		AIFollowPathState::onExit(status);
 
@@ -753,12 +753,12 @@ class HeliTakeoffOrLandingState : public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(HeliTakeoffOrLandingState, "HeliTakeoffOrLandingState")
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override
+	void crc( Xfer *xfer ) OVERRIDE
 	{
 		// empty. jba.
 	}
 
-	void xfer( Xfer *xfer ) override
+	void xfer( Xfer *xfer ) OVERRIDE
 	{
 		// version
 		XferVersion currentVersion = 1;
@@ -772,7 +772,7 @@ class HeliTakeoffOrLandingState : public State
 		xfer->xferCoord3D(&m_parkingLoc);
 		xfer->xferReal(&m_parkingOrientation);
 	}
-	void loadPostProcess() override
+	void loadPostProcess() OVERRIDE
 	{
 		// empty. jba.
 	}
@@ -790,7 +790,7 @@ class HeliTakeoffOrLandingState : public State
 			m_parkingLoc.zero();
 		}
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -856,7 +856,7 @@ class HeliTakeoffOrLandingState : public State
 		return STATE_CONTINUE;
 	}
 
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		if (jet->isEffectivelyDead())
@@ -918,7 +918,7 @@ class HeliTakeoffOrLandingState : public State
 		return STATE_CONTINUE;
 	}
 
-	void onExit( StateExitType status ) override
+	void onExit( StateExitType status ) OVERRIDE
 	{
 		// just in case.
 		Object* jet = getMachineOwner();
@@ -965,14 +965,14 @@ class JetOrHeliParkOrientState : public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliParkOrientState, "JetOrHeliParkOrientState")
 protected:
 	// snapshot interface STUBBED.
-	void crc( Xfer *xfer ) override{};
-	void xfer( Xfer *xfer ) override{XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
-	void loadPostProcess() override{};
+	void crc( Xfer *xfer ) OVERRIDE{};
+	void xfer( Xfer *xfer ) OVERRIDE{XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
+	void loadPostProcess() OVERRIDE{};
 
 public:
 	JetOrHeliParkOrientState( StateMachine *machine ) : State( machine, "JetOrHeliParkOrientState") { }
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -991,7 +991,7 @@ class JetOrHeliParkOrientState : public State
 		return STATE_CONTINUE;
 	}
 
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		if (jet->isEffectivelyDead())
@@ -1026,7 +1026,7 @@ class JetOrHeliParkOrientState : public State
 		return STATE_CONTINUE;
 	}
 
-	void onExit( StateExitType status ) override
+	void onExit( StateExitType status ) OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1046,12 +1046,12 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetPauseBeforeTakeoffState, "JetPauseBeforeTakeoffState")
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override
+	void crc( Xfer *xfer ) OVERRIDE
 	{
 		// empty. jba.
 	}
 
-	void xfer( Xfer *xfer ) override
+	void xfer( Xfer *xfer ) OVERRIDE
 	{
 		// version
 #if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
@@ -1085,7 +1085,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 		xfer->xferObjectID(&m_waitedForTaxiID);
 	}
 
-	void loadPostProcess() override
+	void loadPostProcess() OVERRIDE
 	{
 		// empty. jba.
 	}
@@ -1177,7 +1177,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 		// nothing
 	}
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1209,7 +1209,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 	}
 
 #if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1336,7 +1336,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 	}
 #endif
 
-	void onExit(StateExitType status) override
+	void onExit(StateExitType status) OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1359,12 +1359,12 @@ class JetOrHeliReloadAmmoState : public State
 protected:
 
 	// snapshot interface
-	void crc( Xfer *xfer ) override
+	void crc( Xfer *xfer ) OVERRIDE
 	{
 		// empty. jba.
 	}
 
-	void xfer( Xfer *xfer ) override
+	void xfer( Xfer *xfer ) OVERRIDE
 	{
 		// version
 		XferVersion currentVersion = 1;
@@ -1375,7 +1375,7 @@ class JetOrHeliReloadAmmoState : public State
 		xfer->xferUnsignedInt(&m_reloadTime);
 		xfer->xferUnsignedInt(&m_reloadDoneFrame);
 	}
-	void loadPostProcess() override
+	void loadPostProcess() OVERRIDE
 	{
 		// empty. jba.
 	}
@@ -1383,7 +1383,7 @@ class JetOrHeliReloadAmmoState : public State
 public:
 	JetOrHeliReloadAmmoState( StateMachine *machine ) : State( machine, "JetOrHeliReloadAmmoState") { }
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1420,7 +1420,7 @@ class JetOrHeliReloadAmmoState : public State
 		return STATE_CONTINUE;
 	}
 
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		UnsignedInt now = TheGameLogic->getFrame();
@@ -1446,7 +1446,7 @@ class JetOrHeliReloadAmmoState : public State
 		return STATE_CONTINUE;
 	}
 
-	void onExit(StateExitType status) override
+	void onExit(StateExitType status) OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1468,7 +1468,7 @@ class JetOrHeliReturnForLandingState : public AIInternalMoveToState
 public:
 	JetOrHeliReturnForLandingState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturnForLandingState") { }
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp
index 6be654c08fd..161719612e8 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp
@@ -866,7 +866,7 @@ class PartitionFilterIsValidCarriage : public PartitionFilter
 	virtual const char* debugGetName() { return "PartitionFilterIsValidCarriage"; }
 #endif
 
-	Bool allow(Object *objOther) override
+	Bool allow(Object *objOther) OVERRIDE
 	{
 
 		// must exist!
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
index 29b8d7bf564..949760002de 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
@@ -198,7 +198,7 @@ void SupplyTruckAIUpdate::privateDock( Object *dock, CommandSourceType cmdSource
 {
 	AIUpdateInterface::privateDock( dock, cmdSource );
 
-	// If this is a command from a player, I will remember this as my favorite dock to override
+	// If this is a command from a player, I will remember this as my favorite dock to OVERRIDE
 	// ResourceManager searches.
 	if ((cmdSource == CMD_FROM_PLAYER) && dock)
 	{
@@ -287,13 +287,13 @@ class SupplyTruckBusyState :  public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckBusyState, "SupplyTruckBusyState")
 protected:
 	// snapshot interface STUBBED.
-	void crc( Xfer *xfer ) override{};
-	void xfer( Xfer *xfer ) override{};
-	void loadPostProcess() override{};
+	void crc( Xfer *xfer ) OVERRIDE{};
+	void xfer( Xfer *xfer ) OVERRIDE{};
+	void loadPostProcess() OVERRIDE{};
 
 public:
 	SupplyTruckBusyState( StateMachine *machine ) : State( machine, "SupplyTruckBusyState" ) { }
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		if( getMachineOwner() && getMachineOwner()->getAI() )
 		{
@@ -311,11 +311,11 @@ TheInGameUI->DEBUG_addFloatingText("entering busy state", getMachineOwner()->get
 #endif
 		return STATE_CONTINUE;
 	}
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		return STATE_CONTINUE;
 	}
-	void onExit(StateExitType status) override
+	void onExit(StateExitType status) OVERRIDE
 	{
 #ifdef DEBUG_SUPPLY_STATE
 TheInGameUI->DEBUG_addFloatingText("exiting busy state", getMachineOwner()->getPosition(), GameMakeColor(255, 0, 0, 255));
@@ -331,18 +331,18 @@ class SupplyTruckIdleState :  public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckIdleState, "SupplyTruckIdleState")
 protected:
 	// snapshot interface STUBBED.
-	void crc( Xfer *xfer ) override{};
-	void xfer( Xfer *xfer ) override{};
-	void loadPostProcess() override{};
+	void crc( Xfer *xfer ) OVERRIDE{};
+	void xfer( Xfer *xfer ) OVERRIDE{};
+	void loadPostProcess() OVERRIDE{};
 
 public:
 	SupplyTruckIdleState( StateMachine *machine ) : State( machine, "SupplyTruckIdleState" ) { }
-	StateReturnType onEnter() override;
-	StateReturnType update() override
+	StateReturnType onEnter() OVERRIDE;
+	StateReturnType update() OVERRIDE
 	{
 		return STATE_CONTINUE;
 	}
-	void onExit(StateExitType status) override
+	void onExit(StateExitType status) OVERRIDE
 	{
 #ifdef DEBUG_SUPPLY_STATE
 TheInGameUI->DEBUG_addFloatingText("exiting idle state", getMachineOwner()->getPosition(), GameMakeColor(255, 0, 0, 255));
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
index ea11e35f459..64ea530adfc 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
@@ -545,7 +545,7 @@ void WorkerAIUpdate::privateDock( Object *dock, CommandSourceType cmdSource )
 {
 	AIUpdateInterface::privateDock( dock, cmdSource );
 
-	// If this is a command from a player, I will remember this as my favorite dock to override
+	// If this is a command from a player, I will remember this as my favorite dock to OVERRIDE
 	// ResourceManager searches.
 	if ((cmdSource == CMD_FROM_PLAYER) && dock)
 	{
@@ -1154,14 +1154,14 @@ class ActAsDozerState :  public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ActAsDozerState, "ActAsDozerState")
 protected:
 	// snapshot interface STUBBED.
-	void crc( Xfer *xfer ) override{};
-	void xfer( Xfer *xfer ) override{};
-	void loadPostProcess() override{};
+	void crc( Xfer *xfer ) OVERRIDE{};
+	void xfer( Xfer *xfer ) OVERRIDE{};
+	void loadPostProcess() OVERRIDE{};
 
 public:
 	ActAsDozerState( StateMachine *machine ) :State( machine, "ActAsDozerState" ){}
-	StateReturnType onEnter() override;
-	StateReturnType update() override;
+	StateReturnType onEnter() OVERRIDE;
+	StateReturnType update() OVERRIDE;
 	virtual StateReturnType onExit();
 };
 EMPTY_DTOR(ActAsDozerState)
@@ -1173,14 +1173,14 @@ class ActAsSupplyTruckState :  public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ActAsSupplyTruckState, "ActAsSupplyTruckState")
 protected:
 	// snapshot interface STUBBED.
-	void crc( Xfer *xfer ) override{};
-	void xfer( Xfer *xfer ) override{};
-	void loadPostProcess() override{};
+	void crc( Xfer *xfer ) OVERRIDE{};
+	void xfer( Xfer *xfer ) OVERRIDE{};
+	void loadPostProcess() OVERRIDE{};
 
 public:
 	ActAsSupplyTruckState( StateMachine *machine ) :State( machine, "ActAsSupplyTruckState" ){}
-	StateReturnType onEnter() override;
-	StateReturnType update() override;
+	StateReturnType onEnter() OVERRIDE;
+	StateReturnType update() OVERRIDE;
 	virtual StateReturnType onExit();
 };
 EMPTY_DTOR(ActAsSupplyTruckState)
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp
index 6a57363053a..733eda0fc36 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp
@@ -50,7 +50,7 @@ class PartitionFilterFlammable : public PartitionFilter
 
 	PartitionFilterFlammable(){ }
 
-	Bool allow(Object *objOther) override;
+	Bool allow(Object *objOther) OVERRIDE;
 #if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterFlammable"; }
 #endif
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp
index 0a4b9cbd23a..12549821fa7 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp
@@ -78,7 +78,7 @@ class PartitionFilterHordeMember : public PartitionFilter
 	virtual const char* debugGetName() { return "PartitionFilterHordeMember"; }
 #endif
 
-	Bool allow(Object *objOther) override
+	Bool allow(Object *objOther) OVERRIDE
 	{
 		// must be exact same type as us (well, maybe)
 		if (m_data->m_exactMatch && m_obj->getTemplate() != objOther->getTemplate())
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp
index 4e557bbf8d7..c3c36190bac 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp
@@ -114,7 +114,7 @@ class PartitionFilterStealthedOrStealthGarrisoned : public PartitionFilter
 public:
 	PartitionFilterStealthedOrStealthGarrisoned() { }
 
-	Bool allow(Object *objOther) override;
+	Bool allow(Object *objOther) OVERRIDE;
 
 #if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterStealthedOrStealthGarrisoned"; }
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp
index fcd2ca251cd..5b396d96a48 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp
@@ -74,7 +74,7 @@ class PartitionFilterTensileFormationMember : public PartitionFilter
 #if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterTensileFormationMember"; }
 #endif
-	Bool allow( Object *objOther ) override
+	Bool allow( Object *objOther ) OVERRIDE
 	{
 		return ( getTFU( objOther ) != nullptr );
 	}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp
index 027c589c9d6..970aa14c5f1 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp
@@ -76,21 +76,21 @@ class VictoryConditions : public VictoryConditionsInterface
 public:
 	VictoryConditions();
 
-	void init( void ) override;
-	void reset( void ) override;
-	void update( void ) override;
+	void init( void ) OVERRIDE;
+	void reset( void ) OVERRIDE;
+	void update( void ) OVERRIDE;
 
-	Bool hasAchievedVictory(Player *player) override;					///< has a specific player and his allies won?
-	Bool hasBeenDefeated(Player *player) override;							///< has a specific player and his allies lost?
-	Bool hasSinglePlayerBeenDefeated(Player *player) override;	///< has a specific player lost?
+	Bool hasAchievedVictory(Player *player) OVERRIDE;					///< has a specific player and his allies won?
+	Bool hasBeenDefeated(Player *player) OVERRIDE;							///< has a specific player and his allies lost?
+	Bool hasSinglePlayerBeenDefeated(Player *player) OVERRIDE;	///< has a specific player lost?
 
-	void cachePlayerPtrs( void ) override;											///< players have been created - cache the ones of interest
+	void cachePlayerPtrs( void ) OVERRIDE;											///< players have been created - cache the ones of interest
 
-	Bool isLocalAlliedVictory( void ) override;								///< convenience function
-	Bool isLocalAlliedDefeat( void ) override;									///< convenience function
-	Bool isLocalDefeat( void ) override;												///< convenience function
-	Bool amIObserver( void ) override { return m_isObserver;} 	///< Am I an observer?( need this for scripts )
-	UnsignedInt getEndFrame( void ) override { return m_endFrame; }	///< on which frame was the game effectively over?
+	Bool isLocalAlliedVictory( void ) OVERRIDE;								///< convenience function
+	Bool isLocalAlliedDefeat( void ) OVERRIDE;									///< convenience function
+	Bool isLocalDefeat( void ) OVERRIDE;												///< convenience function
+	Bool amIObserver( void ) OVERRIDE { return m_isObserver;} 	///< Am I an observer?( need this for scripts )
+	UnsignedInt getEndFrame( void ) OVERRIDE { return m_endFrame; }	///< on which frame was the game effectively over?
 private:
 	Player*				m_players[MAX_PLAYER_COUNT];
 	Int						m_localSlotNum;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/FXList.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/FXList.cpp
index a7b2ceda3ca..498bd9e90bc 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/FXList.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/FXList.cpp
@@ -95,7 +95,7 @@ class SoundFXNugget : public FXNugget
 
 public:
 
-	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override
+	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const OVERRIDE
 	{
 		AudioEventRTS sound(m_soundName);
 
@@ -107,7 +107,7 @@ class SoundFXNugget : public FXNugget
 		TheAudio->addAudioEvent(&sound);
 	}
 
-	void doFXObj(const Object* primary, const Object* secondary = nullptr) const override
+	void doFXObj(const Object* primary, const Object* secondary = nullptr) const OVERRIDE
 	{
 		AudioEventRTS sound(m_soundName);
 		if (primary)
@@ -165,7 +165,7 @@ class TracerFXNugget : public FXNugget
 		m_probability = 1.0f;
 	}
 
-	void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real primarySpeed, const Coord3D *secondary, const Real /*overrideRadius*/ ) const override
+	void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real primarySpeed, const Coord3D *secondary, const Real /*overrideRadius*/ ) const OVERRIDE
 	{
 		if (m_probability <= GameClientRandomValueReal(0, 1))
 			return;
@@ -263,7 +263,7 @@ class RayEffectFXNugget : public FXNugget
 		m_secondaryOffset.x = m_secondaryOffset.y = m_secondaryOffset.z = 0;
 	}
 
-	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * secondary, const Real /*overrideRadius*/ ) const override
+	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * secondary, const Real /*overrideRadius*/ ) const OVERRIDE
 	{
 		const ThingTemplate* tmpl = TheThingFactory->findTemplate(m_templateName);
 		DEBUG_ASSERTCRASH(tmpl, ("RayEffect %s not found",m_templateName.str()));
@@ -320,7 +320,7 @@ class LightPulseFXNugget : public FXNugget
 		m_color.red = m_color.green = m_color.blue = 0;
 	}
 
-	void doFXObj(const Object* primary, const Object* /*secondary*/) const override
+	void doFXObj(const Object* primary, const Object* /*secondary*/) const OVERRIDE
 	{
 		if (primary)
 		{
@@ -337,7 +337,7 @@ class LightPulseFXNugget : public FXNugget
 		}
 	}
 
-	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override
+	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const OVERRIDE
 	{
 		if (primary)
 		{
@@ -385,7 +385,7 @@ class ViewShakeFXNugget : public FXNugget
 	{
 	}
 
-	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override
+	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const OVERRIDE
 	{
 		if (primary)
 		{
@@ -445,7 +445,7 @@ class TerrainScorchFXNugget : public FXNugget
 	{
 	}
 
-	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override
+	void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const OVERRIDE
 	{
 		if (primary)
 		{
@@ -523,7 +523,7 @@ class ParticleSystemFXNugget : public FXNugget
 		m_rotateX = m_rotateY = m_rotateZ = 0;
 	}
 
-	void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real overrideRadius ) const override
+	void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real overrideRadius ) const OVERRIDE
 	{
 		if (primary)
 		{
@@ -535,7 +535,7 @@ class ParticleSystemFXNugget : public FXNugget
 		}
 	}
 
-	void doFXObj(const Object* primary, const Object* secondary) const override
+	void doFXObj(const Object* primary, const Object* secondary) const OVERRIDE
 	{
 		if (primary)
 		{
@@ -694,12 +694,12 @@ class FXListAtBonePosFXNugget : public FXNugget
     m_orientToBone = true;
 	}
 
-	void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override
+	void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const OVERRIDE
 	{
 		DEBUG_CRASH(("You must use the object form for this effect"));
 	}
 
-	void doFXObj(const Object* primary, const Object* /*secondary*/) const override
+	void doFXObj(const Object* primary, const Object* /*secondary*/) const OVERRIDE
 	{
 		if (primary)
 		{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
index a445ce9b500..b22a1d9ffe7 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
@@ -122,11 +122,11 @@ class DownloadManagerMunkee : public DownloadManager
 {
 public:
 	DownloadManagerMunkee() {m_shouldQuitOnSuccess = true; m_shouldQuitOnSuccess = false;}
-	HRESULT OnError( Int error ) override;
-	HRESULT OnEnd() override;
-	HRESULT OnProgressUpdate( Int bytesread, Int totalsize, Int timetaken, Int timeleft ) override;
-	HRESULT OnStatusUpdate( Int status ) override;
-	HRESULT downloadFile( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume ) override;
+	HRESULT OnError( Int error ) OVERRIDE;
+	HRESULT OnEnd() OVERRIDE;
+	HRESULT OnProgressUpdate( Int bytesread, Int totalsize, Int timetaken, Int timeleft ) OVERRIDE;
+	HRESULT OnStatusUpdate( Int status ) OVERRIDE;
+	HRESULT downloadFile( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume ) OVERRIDE;
 
 private:
 	Bool m_shouldQuitOnSuccess;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp
index 936d8f87258..1955245d629 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp
@@ -138,23 +138,23 @@ class GameTextManager : public GameTextInterface
 	public:
 
 		GameTextManager();
-		~GameTextManager() override;
+		~GameTextManager() OVERRIDE;
 
-		void					init( void ) override;						///< Initializes the text system
+		void					init( void ) OVERRIDE;						///< Initializes the text system
 		virtual void					deinit( void );					///< Shuts down the text system
-		void					update( void ) override {};			///< update text manager
-		void					reset( void ) override;					///< Resets the text system
+		void					update( void ) OVERRIDE {};			///< update text manager
+		void					reset( void ) OVERRIDE;					///< Resets the text system
 
-		UnicodeString fetch( const Char *label, Bool *exists = nullptr ) override;		///< Returns the associated labeled unicode text
-		UnicodeString fetch( AsciiString label, Bool *exists = nullptr ) override;		///< Returns the associated labeled unicode text
-		UnicodeString fetchFormat( const Char *label, ... ) override;
-		UnicodeString fetchOrSubstitute( const Char *label, const WideChar *substituteText ) override;
-		UnicodeString fetchOrSubstituteFormat( const Char *label, const WideChar *substituteFormat, ... ) override;
-		UnicodeString fetchOrSubstituteFormatVA( const Char *label, const WideChar *substituteFormat, va_list args ) override;
+		UnicodeString fetch( const Char *label, Bool *exists = nullptr ) OVERRIDE;		///< Returns the associated labeled unicode text
+		UnicodeString fetch( AsciiString label, Bool *exists = nullptr ) OVERRIDE;		///< Returns the associated labeled unicode text
+		UnicodeString fetchFormat( const Char *label, ... ) OVERRIDE;
+		UnicodeString fetchOrSubstitute( const Char *label, const WideChar *substituteText ) OVERRIDE;
+		UnicodeString fetchOrSubstituteFormat( const Char *label, const WideChar *substituteFormat, ... ) OVERRIDE;
+		UnicodeString fetchOrSubstituteFormatVA( const Char *label, const WideChar *substituteFormat, va_list args ) OVERRIDE;
 
-		AsciiStringVec& getStringsWithLabelPrefix(AsciiString label) override;
+		AsciiStringVec& getStringsWithLabelPrefix(AsciiString label) OVERRIDE;
 
-		void					initMapStringFile( const AsciiString& filename ) override;
+		void					initMapStringFile( const AsciiString& filename ) OVERRIDE;
 
 	protected:
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp
index 6716ce4f26a..52fab9abc83 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp
@@ -516,7 +516,7 @@ class PartitionFilterLiveMapEnemies : public PartitionFilter
 public:
 	PartitionFilterLiveMapEnemies(const Object *obj) : m_obj(obj) { }
 
-	Bool allow(Object *objOther) override
+	Bool allow(Object *objOther) OVERRIDE
 	{
 		// this is way fast (bit test) so do it first.
 		if (objOther->isEffectivelyDead())
@@ -546,7 +546,7 @@ class PartitionFilterWithinAttackRange : public PartitionFilter
 public:
 	PartitionFilterWithinAttackRange(const Object* obj) : m_obj(obj) { }
 
-	Bool allow(Object* objOther) override
+	Bool allow(Object* objOther) OVERRIDE
 	{
 		for (Int i = 0; i < WEAPONSLOT_COUNT;	i++ )
 		{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
index 7064d9e587a..cddc60512ea 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
@@ -1950,9 +1950,9 @@ class AIAttackMoveStateMachine : public StateMachine
 
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override;
-	void xfer( Xfer *xfer ) override;
-	void loadPostProcess() override;
+	void crc( Xfer *xfer ) OVERRIDE;
+	void xfer( Xfer *xfer ) OVERRIDE;
+	void loadPostProcess() OVERRIDE;
 };
 
 // ------------------------------------------------------------------------------------------------
@@ -5747,9 +5747,9 @@ class AIAttackThenIdleStateMachine : public StateMachine
 	AIAttackThenIdleStateMachine( Object *owner, AsciiString name );
 protected:
 	// snapshot interface .
-	void crc( Xfer *xfer ) override;
-	void xfer( Xfer *xfer ) override;
-	void loadPostProcess() override;
+	void crc( Xfer *xfer ) OVERRIDE;
+	void xfer( Xfer *xfer ) OVERRIDE;
+	void loadPostProcess() OVERRIDE;
 };
 
 // ------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
index 2507bd24707..b7dcc9af948 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
@@ -132,7 +132,7 @@ class FireWeaponNugget : public ObjectCreationNugget
 	{
 	}
 
-	Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const override
+	Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const OVERRIDE
 	{
 		if (!primaryObj || !primary || !secondary)
 		{
@@ -179,7 +179,7 @@ class AttackNugget : public ObjectCreationNugget
 	{
 	}
 
-	Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const override
+	Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const OVERRIDE
 	{
 		if (!primaryObj || !primary || !secondary)
 		{
@@ -261,12 +261,12 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 		m_transportName.clear();
 	}
 
-	Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const override
+	Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const OVERRIDE
 	{
 		return create( primaryObj, primary, secondary, true, lifetimeFrames );
 	}
 
-	Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Bool createOwner, UnsignedInt lifetimeFrames = 0 ) const override
+	Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Bool createOwner, UnsignedInt lifetimeFrames = 0 ) const OVERRIDE
 	{
 		if (!primaryObj || !primary || !secondary)
 		{
@@ -619,7 +619,7 @@ class ApplyRandomForceNugget : public ObjectCreationNugget
 	{
 	}
 
-	Object* create( const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const override
+	Object* create( const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const OVERRIDE
 	{
 		if (primary)
 		{
@@ -650,7 +650,7 @@ class ApplyRandomForceNugget : public ObjectCreationNugget
 		return nullptr;
 	}
 
-	Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const override
+	Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const OVERRIDE
 	{
 		DEBUG_CRASH(("You must call this effect with an object, not a location"));
 		return nullptr;
@@ -775,7 +775,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 		m_offset.zero();
 	}
 
-	Object* create(const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const override
+	Object* create(const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const OVERRIDE
 	{
 		if (primary)
 		{
@@ -791,7 +791,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 		return nullptr;
 	}
 
-	Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const override
+	Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const OVERRIDE
 	{
 		if (primary)
 		{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
index 88671bfe422..8b125dc940a 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
@@ -114,13 +114,13 @@ class ChinookEvacuateState : public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookEvacuateState, "ChinookEvacuateState")
 protected:
 	// snapshot interface	STUBBED - no member vars to save. jba.
-	void crc( Xfer *xfer ) override{};
-	void xfer( Xfer *xfer ) override{};
-	void loadPostProcess() override{};
+	void crc( Xfer *xfer ) OVERRIDE{};
+	void xfer( Xfer *xfer ) OVERRIDE{};
+	void loadPostProcess() OVERRIDE{};
 public:
 	ChinookEvacuateState( StateMachine *machine ) : State( machine, "ChinookEvacuateState" ) { }
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* obj = getMachineOwner();
 		if( obj->getContain() )
@@ -131,7 +131,7 @@ class ChinookEvacuateState : public State
 		return STATE_SUCCESS;
 	}
 
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		return STATE_SUCCESS;
 	}
@@ -145,13 +145,13 @@ class ChinookHeadOffMapState :  public State
 	//I'm outta here
 protected:
 	// snapshot interface	STUBBED - no member vars to save. jba.
-	void crc( Xfer *xfer ) override{};
-	void xfer( Xfer *xfer ) override{};
-	void loadPostProcess() override{};
+	void crc( Xfer *xfer ) OVERRIDE{};
+	void xfer( Xfer *xfer ) OVERRIDE{};
+	void loadPostProcess() OVERRIDE{};
 public:
 	ChinookHeadOffMapState( StateMachine *machine ) : State( machine, "ChinookHeadOffMapState" ) {}
 
-	StateReturnType onEnter() override // Give move order out of town
+	StateReturnType onEnter() OVERRIDE // Give move order out of town
 	{
 		Object *owner = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)owner->getAIUpdateInterface();
@@ -163,7 +163,7 @@ class ChinookHeadOffMapState :  public State
 		return STATE_CONTINUE;
 	}
 
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		Object *owner = getMachineOwner();
 
@@ -196,12 +196,12 @@ class ChinookTakeoffOrLandingState : public State
 
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override
+	void crc( Xfer *xfer ) OVERRIDE
 	{
 		// empty
 	}
 
-	void xfer( Xfer *xfer ) override
+	void xfer( Xfer *xfer ) OVERRIDE
 	{
 		// version
 		XferVersion currentVersion = 1;
@@ -212,7 +212,7 @@ class ChinookTakeoffOrLandingState : public State
 		xfer->xferBool(&m_landing);
 	}
 
-	void loadPostProcess() override
+	void loadPostProcess() OVERRIDE
 	{
 		// empty
 	}
@@ -223,7 +223,7 @@ class ChinookTakeoffOrLandingState : public State
 		m_destLoc.zero();
 	}
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -280,7 +280,7 @@ class ChinookTakeoffOrLandingState : public State
 		return STATE_CONTINUE;
 	}
 
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		Object* obj = getMachineOwner();
 		if (obj->isEffectivelyDead())
@@ -298,7 +298,7 @@ class ChinookTakeoffOrLandingState : public State
 		return STATE_CONTINUE;
 	}
 
-	void onExit( StateExitType status ) override
+	void onExit( StateExitType status ) OVERRIDE
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -416,12 +416,12 @@ class ChinookCombatDropState : public State
 
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override
+	void crc( Xfer *xfer ) OVERRIDE
 	{
 		// empty
 	}
 
-	void xfer( Xfer *xfer ) override
+	void xfer( Xfer *xfer ) OVERRIDE
 	{
 		// version
 		const XferVersion currentVersion = 2;
@@ -468,7 +468,7 @@ class ChinookCombatDropState : public State
 		}
 	}
 
-	void loadPostProcess() override
+	void loadPostProcess() OVERRIDE
 	{
 		for (std::vector<RopeInfo>::iterator it = m_ropes.begin(); it != m_ropes.end(); ++it)
 		{
@@ -482,7 +482,7 @@ class ChinookCombatDropState : public State
 	ChinookCombatDropState( StateMachine *machine ): State( machine, "ChinookCombatDropState" ) { }
 
 	// --------------
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* obj = getMachineOwner();
 		Drawable* draw = obj->getDrawable();
@@ -548,7 +548,7 @@ class ChinookCombatDropState : public State
 	}
 
 	// --------------
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -640,7 +640,7 @@ class ChinookCombatDropState : public State
 	}
 
 	// --------------
-	void onExit( StateExitType status ) override
+	void onExit( StateExitType status ) OVERRIDE
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -698,12 +698,12 @@ class ChinookMoveToBldgState : public AIMoveToState
 	Real m_destZ;
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override
+	void crc( Xfer *xfer ) OVERRIDE
 	{
 		// empty
 	}
 
-	void xfer( Xfer *xfer ) override
+	void xfer( Xfer *xfer ) OVERRIDE
 	{
 		// version
 		XferVersion currentVersion = 1;
@@ -715,7 +715,7 @@ class ChinookMoveToBldgState : public AIMoveToState
 		xfer->xferReal(&m_destZ);
 	}
 
-	void loadPostProcess() override
+	void loadPostProcess() OVERRIDE
 	{
 		// empty
 	}
@@ -723,7 +723,7 @@ class ChinookMoveToBldgState : public AIMoveToState
 public:
 	ChinookMoveToBldgState( StateMachine *machine ): AIMoveToState( machine ) { }
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -754,7 +754,7 @@ class ChinookMoveToBldgState : public AIMoveToState
 		return AIMoveToState::onEnter();
 	}
 
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		Object* obj = getMachineOwner();
 
@@ -768,7 +768,7 @@ class ChinookMoveToBldgState : public AIMoveToState
 		return status;
 	}
 
-	void onExit( StateExitType status ) override
+	void onExit( StateExitType status ) OVERRIDE
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -790,12 +790,12 @@ class ChinookRecordCreationState : public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookRecordCreationState, "ChinookRecordCreationState")
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override
+	void crc( Xfer *xfer ) OVERRIDE
 	{
 		// empty
 	}
 
-	void xfer( Xfer *xfer ) override
+	void xfer( Xfer *xfer ) OVERRIDE
 	{
 		// version
 		XferVersion currentVersion = 1;
@@ -803,7 +803,7 @@ class ChinookRecordCreationState : public State
 		xfer->xferVersion( &version, currentVersion );
 	}
 
-	void loadPostProcess() override
+	void loadPostProcess() OVERRIDE
 	{
 		// empty
 	}
@@ -811,7 +811,7 @@ class ChinookRecordCreationState : public State
 public:
 	ChinookRecordCreationState( StateMachine *machine ): State( machine, "ChinookRecordCreationState" ) { }
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
@@ -822,7 +822,7 @@ class ChinookRecordCreationState : public State
 		return STATE_SUCCESS;
 	}
 
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		return STATE_SUCCESS;
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
index 4157507f615..5c469e7d9f8 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
@@ -86,13 +86,13 @@ class DozerActionPickActionPosState : public State
 public:
 
 	DozerActionPickActionPosState( StateMachine *machine, DozerTask task );
-	StateReturnType update( void ) override;
+	StateReturnType update( void ) OVERRIDE;
 
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override;
-	void xfer( Xfer *xfer ) override;
-	void loadPostProcess() override;
+	void crc( Xfer *xfer ) OVERRIDE;
+	void xfer( Xfer *xfer ) OVERRIDE;
+	void loadPostProcess() OVERRIDE;
 
 protected:
 
@@ -243,13 +243,13 @@ class DozerActionMoveToActionPosState : public State
 public:
 
 	DozerActionMoveToActionPosState( StateMachine *machine, DozerTask task ) : State( machine, "DozerActionMoveToActionPosState" ) { m_task = task; }
-	StateReturnType update( void ) override;
+	StateReturnType update( void ) OVERRIDE;
 
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override;
-	void xfer( Xfer *xfer ) override;
-	void loadPostProcess() override;
+	void crc( Xfer *xfer ) OVERRIDE;
+	void xfer( Xfer *xfer ) OVERRIDE;
+	void loadPostProcess() OVERRIDE;
 
 protected:
 
@@ -386,15 +386,15 @@ class DozerActionDoActionState : public State
 		m_task = task;
 		m_enterFrame = 0;
 	}
-	StateReturnType update( void ) override;
-	StateReturnType onEnter( void ) override;
-	void onExit( StateExitType status ) override { }
+	StateReturnType update( void ) OVERRIDE;
+	StateReturnType onEnter( void ) OVERRIDE;
+	void onExit( StateExitType status ) OVERRIDE { }
 
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override;
-	void xfer( Xfer *xfer ) override;
-	void loadPostProcess() override;
+	void crc( Xfer *xfer ) OVERRIDE;
+	void xfer( Xfer *xfer ) OVERRIDE;
+	void loadPostProcess() OVERRIDE;
 
 protected:
 
@@ -797,9 +797,9 @@ class DozerActionStateMachine : public StateMachine
 
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override;
-	void xfer( Xfer *xfer ) override;
-	void loadPostProcess() override;
+	void crc( Xfer *xfer ) OVERRIDE;
+	void xfer( Xfer *xfer ) OVERRIDE;
+	void loadPostProcess() OVERRIDE;
 
 protected:
 
@@ -972,15 +972,15 @@ class DozerPrimaryIdleState : public State
 		m_idlePlayerNumber = 0;
 		m_isMarkedAsIdle   = FALSE;
 	}
-	StateReturnType update( void ) override;
-	StateReturnType onEnter( void ) override;
-	void onExit( StateExitType status ) override;
+	StateReturnType update( void ) OVERRIDE;
+	StateReturnType onEnter( void ) OVERRIDE;
+	void onExit( StateExitType status ) OVERRIDE;
 
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override;
-	void xfer( Xfer *xfer ) override;
-	void loadPostProcess() override;
+	void crc( Xfer *xfer ) OVERRIDE;
+	void xfer( Xfer *xfer ) OVERRIDE;
+	void loadPostProcess() OVERRIDE;
 
 protected:
 
@@ -1159,16 +1159,16 @@ class DozerActionState : public State
 		Note that we DON'T use CONVERT_SLEEP_TO_CONTINUE; since we're not doing anything else
 		interesting in update, we can sleep when this machine sleeps
 	*/
-	StateReturnType update( void ) override { return m_actionMachine->updateStateMachine(); }
+	StateReturnType update( void ) OVERRIDE { return m_actionMachine->updateStateMachine(); }
 
-	StateReturnType onEnter( void ) override;
-	void onExit( StateExitType status ) override;
+	StateReturnType onEnter( void ) OVERRIDE;
+	void onExit( StateExitType status ) OVERRIDE;
 
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override;
-	void xfer( Xfer *xfer ) override;
-	void loadPostProcess() override;
+	void crc( Xfer *xfer ) OVERRIDE;
+	void xfer( Xfer *xfer ) OVERRIDE;
+	void loadPostProcess() OVERRIDE;
 
 protected:
 
@@ -1258,14 +1258,14 @@ class DozerPrimaryGoingHomeState : public State
 
 protected:
 	// snapshot interface	 STUBBED no member vars
-	void crc( Xfer *xfer ) override{};
-	void xfer( Xfer *xfer ) override{};
-	void loadPostProcess() override{};
+	void crc( Xfer *xfer ) OVERRIDE{};
+	void xfer( Xfer *xfer ) OVERRIDE{};
+	void loadPostProcess() OVERRIDE{};
 
 public:
 
 	DozerPrimaryGoingHomeState( StateMachine *machine ) : State( machine, "DozerPrimaryGoingHomeState" ) { }
-	StateReturnType update( void ) override { return STATE_FAILURE; }
+	StateReturnType update( void ) OVERRIDE { return STATE_FAILURE; }
 
 };
 EMPTY_DTOR(DozerPrimaryGoingHomeState)
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
index aa324c7fe1b..f88567fc1ee 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
@@ -152,7 +152,7 @@ class PartitionFilterHasParkingPlace : public PartitionFilter
 #if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterHasParkingPlace"; }
 #endif
-	Bool allow(Object *objOther) override
+	Bool allow(Object *objOther) OVERRIDE
 	{
 		ParkingPlaceBehaviorInterface* pp = getPP(objOther->getID());
 		if (pp != nullptr && pp->reserveSpace(m_id, 0.0f, nullptr))
@@ -200,16 +200,16 @@ class JetAwaitingRunwayState : public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetAwaitingRunwayState, "JetAwaitingRunwayState")
 protected:
 	// snapshot interface STUBBED.
-	void crc( Xfer *xfer ) override{};
-	void xfer( Xfer *xfer ) override{XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
-	void loadPostProcess() override{};
+	void crc( Xfer *xfer ) OVERRIDE{};
+	void xfer( Xfer *xfer ) OVERRIDE{XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
+	void loadPostProcess() OVERRIDE{};
 private:
 	const Bool m_landing;
 
 public:
 	JetAwaitingRunwayState( StateMachine *machine, Bool landing ) : m_landing(landing), State( machine, "JetAwaitingRunwayState") { }
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -222,7 +222,7 @@ class JetAwaitingRunwayState : public State
 		return STATE_CONTINUE;
 	}
 
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		if (jet->isEffectivelyDead())
@@ -287,7 +287,7 @@ class JetAwaitingRunwayState : public State
 		return STATE_CONTINUE;
 	}
 
-	void onExit(StateExitType status) override
+	void onExit(StateExitType status) OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -313,9 +313,9 @@ class JetOrHeliCirclingDeadAirfieldState : public State
 protected:
 	// snapshot interface	 STUBBED.
 	// The state will check immediately after a load game, but I think that's ok.  jba.
-	void crc( Xfer *xfer ) override{};
-	void xfer( Xfer *xfer ) override{XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
-	void loadPostProcess() override{};
+	void crc( Xfer *xfer ) OVERRIDE{};
+	void xfer( Xfer *xfer ) OVERRIDE{XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
+	void loadPostProcess() OVERRIDE{};
 
 private:
 	Int m_checkAirfield;
@@ -331,7 +331,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State
 		State( machine, "JetOrHeliCirclingDeadAirfieldState"),
 		m_checkAirfield(0) { }
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -362,7 +362,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State
 		return STATE_CONTINUE;
 	}
 
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -418,7 +418,7 @@ class JetOrHeliReturningToDeadAirfieldState : public AIInternalMoveToState
 public:
 	JetOrHeliReturningToDeadAirfieldState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturningToDeadAirfieldState") { }
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -479,7 +479,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
 public:
 	JetOrHeliTaxiState( StateMachine *machine, TaxiType m ) : m_taxiMode(m), AIMoveOutOfTheWayState( machine ) { }
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -640,7 +640,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
 		return ret;
 	}
 
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		if (jet->isEffectivelyDead())
@@ -671,7 +671,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
 		return AIMoveOutOfTheWayState::update();
 	}
 
-	void onExit( StateExitType status ) override
+	void onExit( StateExitType status ) OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -712,7 +712,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 public:
 	JetTakeoffOrLandingState( StateMachine *machine, Bool landing ) : m_landing(landing), AIFollowPathState( machine, "JetTakeoffOrLandingState" ) { }
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -805,7 +805,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 		return ret;
 	}
 
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		if (jet->isEffectivelyDead())
@@ -882,7 +882,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 		return ret;
 	}
 
-	void onExit( StateExitType status ) override
+	void onExit( StateExitType status ) OVERRIDE
 	{
 		AIFollowPathState::onExit(status);
 
@@ -940,12 +940,12 @@ class HeliTakeoffOrLandingState : public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(HeliTakeoffOrLandingState, "HeliTakeoffOrLandingState")
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override
+	void crc( Xfer *xfer ) OVERRIDE
 	{
 		// empty. jba.
 	}
 
-	void xfer( Xfer *xfer ) override
+	void xfer( Xfer *xfer ) OVERRIDE
 	{
 		// version
 		XferVersion currentVersion = 1;
@@ -959,7 +959,7 @@ class HeliTakeoffOrLandingState : public State
 		xfer->xferCoord3D(&m_parkingLoc);
 		xfer->xferReal(&m_parkingOrientation);
 	}
-	void loadPostProcess() override
+	void loadPostProcess() OVERRIDE
 	{
 		// empty. jba.
 	}
@@ -977,7 +977,7 @@ class HeliTakeoffOrLandingState : public State
 			m_parkingLoc.zero();
 		}
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1043,7 +1043,7 @@ class HeliTakeoffOrLandingState : public State
 		return STATE_CONTINUE;
 	}
 
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		if (jet->isEffectivelyDead())
@@ -1105,7 +1105,7 @@ class HeliTakeoffOrLandingState : public State
 		return STATE_CONTINUE;
 	}
 
-	void onExit( StateExitType status ) override
+	void onExit( StateExitType status ) OVERRIDE
 	{
 		// just in case.
 		Object* jet = getMachineOwner();
@@ -1152,14 +1152,14 @@ class JetOrHeliParkOrientState : public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliParkOrientState, "JetOrHeliParkOrientState")
 protected:
 	// snapshot interface STUBBED.
-	void crc( Xfer *xfer ) override{};
-	void xfer( Xfer *xfer ) override{XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
-	void loadPostProcess() override{};
+	void crc( Xfer *xfer ) OVERRIDE{};
+	void xfer( Xfer *xfer ) OVERRIDE{XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
+	void loadPostProcess() OVERRIDE{};
 
 public:
 	JetOrHeliParkOrientState( StateMachine *machine ) : State( machine, "JetOrHeliParkOrientState") { }
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1178,7 +1178,7 @@ class JetOrHeliParkOrientState : public State
 		return STATE_CONTINUE;
 	}
 
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		if (jet->isEffectivelyDead())
@@ -1218,7 +1218,7 @@ class JetOrHeliParkOrientState : public State
 		return STATE_CONTINUE;
 	}
 
-	void onExit( StateExitType status ) override
+	void onExit( StateExitType status ) OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1238,12 +1238,12 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetPauseBeforeTakeoffState, "JetPauseBeforeTakeoffState")
 protected:
 	// snapshot interface
-	void crc( Xfer *xfer ) override
+	void crc( Xfer *xfer ) OVERRIDE
 	{
 		// empty. jba.
 	}
 
-	void xfer( Xfer *xfer ) override
+	void xfer( Xfer *xfer ) OVERRIDE
 	{
 		// version
 #if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
@@ -1277,7 +1277,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 		xfer->xferObjectID(&m_waitedForTaxiID);
 	}
 
-	void loadPostProcess() override
+	void loadPostProcess() OVERRIDE
 	{
 		// empty. jba.
 	}
@@ -1369,7 +1369,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 		// nothing
 	}
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1401,7 +1401,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 	}
 
 #if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1528,7 +1528,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 	}
 #endif
 
-	void onExit(StateExitType status) override
+	void onExit(StateExitType status) OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1551,12 +1551,12 @@ class JetOrHeliReloadAmmoState : public State
 protected:
 
 	// snapshot interface
-	void crc( Xfer *xfer ) override
+	void crc( Xfer *xfer ) OVERRIDE
 	{
 		// empty. jba.
 	}
 
-	void xfer( Xfer *xfer ) override
+	void xfer( Xfer *xfer ) OVERRIDE
 	{
 		// version
 		XferVersion currentVersion = 1;
@@ -1567,7 +1567,7 @@ class JetOrHeliReloadAmmoState : public State
 		xfer->xferUnsignedInt(&m_reloadTime);
 		xfer->xferUnsignedInt(&m_reloadDoneFrame);
 	}
-	void loadPostProcess() override
+	void loadPostProcess() OVERRIDE
 	{
 		// empty. jba.
 	}
@@ -1575,7 +1575,7 @@ class JetOrHeliReloadAmmoState : public State
 public:
 	JetOrHeliReloadAmmoState( StateMachine *machine ) : State( machine, "JetOrHeliReloadAmmoState") { }
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1612,7 +1612,7 @@ class JetOrHeliReloadAmmoState : public State
 		return STATE_CONTINUE;
 	}
 
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		UnsignedInt now = TheGameLogic->getFrame();
@@ -1638,7 +1638,7 @@ class JetOrHeliReloadAmmoState : public State
 		return STATE_CONTINUE;
 	}
 
-	void onExit(StateExitType status) override
+	void onExit(StateExitType status) OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
@@ -1660,7 +1660,7 @@ class JetOrHeliReturnForLandingState : public AIInternalMoveToState
 public:
 	JetOrHeliReturnForLandingState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturnForLandingState") { }
 
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		Object* jet = getMachineOwner();
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp
index 3da1f3d2a4c..38ef44fda76 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp
@@ -906,7 +906,7 @@ class PartitionFilterIsValidCarriage : public PartitionFilter
 	virtual const char* debugGetName() { return "PartitionFilterIsValidCarriage"; }
 #endif
 
-	Bool allow(Object *objOther) override
+	Bool allow(Object *objOther) OVERRIDE
 	{
 
 		// must exist!
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
index 8f2fe0efca3..e58918e51b8 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
@@ -204,7 +204,7 @@ void SupplyTruckAIUpdate::privateDock( Object *dock, CommandSourceType cmdSource
 {
 	AIUpdateInterface::privateDock( dock, cmdSource );
 
-	// If this is a command from a player, I will remember this as my favorite dock to override
+	// If this is a command from a player, I will remember this as my favorite dock to OVERRIDE
 	// ResourceManager searches.
 	if ((cmdSource == CMD_FROM_PLAYER) && dock)
 	{
@@ -293,13 +293,13 @@ class SupplyTruckBusyState :  public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckBusyState, "SupplyTruckBusyState")
 protected:
 	// snapshot interface STUBBED.
-	void crc( Xfer *xfer ) override{};
-	void xfer( Xfer *xfer ) override{};
-	void loadPostProcess() override{};
+	void crc( Xfer *xfer ) OVERRIDE{};
+	void xfer( Xfer *xfer ) OVERRIDE{};
+	void loadPostProcess() OVERRIDE{};
 
 public:
 	SupplyTruckBusyState( StateMachine *machine ) : State( machine, "SupplyTruckBusyState" ) { }
-	StateReturnType onEnter() override
+	StateReturnType onEnter() OVERRIDE
 	{
 		if( getMachineOwner() && getMachineOwner()->getAI() )
 		{
@@ -317,11 +317,11 @@ TheInGameUI->DEBUG_addFloatingText("entering busy state", getMachineOwner()->get
 #endif
 		return STATE_CONTINUE;
 	}
-	StateReturnType update() override
+	StateReturnType update() OVERRIDE
 	{
 		return STATE_CONTINUE;
 	}
-	void onExit(StateExitType status) override
+	void onExit(StateExitType status) OVERRIDE
 	{
 #ifdef DEBUG_SUPPLY_STATE
 TheInGameUI->DEBUG_addFloatingText("exiting busy state", getMachineOwner()->getPosition(), GameMakeColor(255, 0, 0, 255));
@@ -337,18 +337,18 @@ class SupplyTruckIdleState :  public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckIdleState, "SupplyTruckIdleState")
 protected:
 	// snapshot interface STUBBED.
-	void crc( Xfer *xfer ) override{};
-	void xfer( Xfer *xfer ) override{};
-	void loadPostProcess() override{};
+	void crc( Xfer *xfer ) OVERRIDE{};
+	void xfer( Xfer *xfer ) OVERRIDE{};
+	void loadPostProcess() OVERRIDE{};
 
 public:
 	SupplyTruckIdleState( StateMachine *machine ) : State( machine, "SupplyTruckIdleState" ) { }
-	StateReturnType onEnter() override;
-	StateReturnType update() override
+	StateReturnType onEnter() OVERRIDE;
+	StateReturnType update() OVERRIDE
 	{
 		return STATE_CONTINUE;
 	}
-	void onExit(StateExitType status) override
+	void onExit(StateExitType status) OVERRIDE
 	{
 #ifdef DEBUG_SUPPLY_STATE
 TheInGameUI->DEBUG_addFloatingText("exiting idle state", getMachineOwner()->getPosition(), GameMakeColor(255, 0, 0, 255));
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
index 4f47d67dc13..e17e8b69c8e 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
@@ -545,7 +545,7 @@ void WorkerAIUpdate::privateDock( Object *dock, CommandSourceType cmdSource )
 {
 	AIUpdateInterface::privateDock( dock, cmdSource );
 
-	// If this is a command from a player, I will remember this as my favorite dock to override
+	// If this is a command from a player, I will remember this as my favorite dock to OVERRIDE
 	// ResourceManager searches.
 	if ((cmdSource == CMD_FROM_PLAYER) && dock)
 	{
@@ -1154,14 +1154,14 @@ class ActAsDozerState :  public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ActAsDozerState, "ActAsDozerState")
 protected:
 	// snapshot interface STUBBED.
-	void crc( Xfer *xfer ) override{};
-	void xfer( Xfer *xfer ) override{};
-	void loadPostProcess() override{};
+	void crc( Xfer *xfer ) OVERRIDE{};
+	void xfer( Xfer *xfer ) OVERRIDE{};
+	void loadPostProcess() OVERRIDE{};
 
 public:
 	ActAsDozerState( StateMachine *machine ) :State( machine, "ActAsDozerState" ){}
-	StateReturnType onEnter() override;
-	StateReturnType update() override;
+	StateReturnType onEnter() OVERRIDE;
+	StateReturnType update() OVERRIDE;
 	virtual StateReturnType onExit();
 };
 EMPTY_DTOR(ActAsDozerState)
@@ -1173,14 +1173,14 @@ class ActAsSupplyTruckState :  public State
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ActAsSupplyTruckState, "ActAsSupplyTruckState")
 protected:
 	// snapshot interface STUBBED.
-	void crc( Xfer *xfer ) override{};
-	void xfer( Xfer *xfer ) override{};
-	void loadPostProcess() override{};
+	void crc( Xfer *xfer ) OVERRIDE{};
+	void xfer( Xfer *xfer ) OVERRIDE{};
+	void loadPostProcess() OVERRIDE{};
 
 public:
 	ActAsSupplyTruckState( StateMachine *machine ) :State( machine, "ActAsSupplyTruckState" ){}
-	StateReturnType onEnter() override;
-	StateReturnType update() override;
+	StateReturnType onEnter() OVERRIDE;
+	StateReturnType update() OVERRIDE;
 	virtual StateReturnType onExit();
 };
 EMPTY_DTOR(ActAsSupplyTruckState)
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp
index e4892e82996..ea7b77471e7 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp
@@ -50,7 +50,7 @@ class PartitionFilterFlammable : public PartitionFilter
 
 	PartitionFilterFlammable(){ }
 
-	Bool allow(Object *objOther) override;
+	Bool allow(Object *objOther) OVERRIDE;
 #if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterFlammable"; }
 #endif
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp
index 41e7b4b9b95..de5c73a1701 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp
@@ -78,7 +78,7 @@ class PartitionFilterHordeMember : public PartitionFilter
 	virtual const char* debugGetName() { return "PartitionFilterHordeMember"; }
 #endif
 
-	Bool allow(Object *objOther) override
+	Bool allow(Object *objOther) OVERRIDE
 	{
 		// must be exact same type as us (well, maybe)
 		if (m_data->m_exactMatch && m_obj->getTemplate() != objOther->getTemplate())
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp
index 7c343000bb5..51082b27a67 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp
@@ -322,7 +322,7 @@ class PartitionFilterLiveMapEnemies : public PartitionFilter
 public:
 	PartitionFilterLiveMapEnemies(const Object *obj) : m_obj(obj) { }
 
-	Bool allow(Object *objOther) override
+	Bool allow(Object *objOther) OVERRIDE
 	{
 		// this is way fast (bit test) so do it first.
 		if (objOther->isEffectivelyDead())
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp
index 1e0a5c5c3ef..4bbc2709193 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp
@@ -115,7 +115,7 @@ class PartitionFilterStealthedOrStealthGarrisoned : public PartitionFilter
 public:
 	PartitionFilterStealthedOrStealthGarrisoned() { }
 
-	Bool allow(Object *objOther) override;
+	Bool allow(Object *objOther) OVERRIDE;
 
 #if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterStealthedOrStealthGarrisoned"; }
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp
index 2493db5f416..ae83ad97c21 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp
@@ -74,7 +74,7 @@ class PartitionFilterTensileFormationMember : public PartitionFilter
 #if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterTensileFormationMember"; }
 #endif
-	Bool allow( Object *objOther ) override
+	Bool allow( Object *objOther ) OVERRIDE
 	{
 		return ( getTFU( objOther ) != nullptr );
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp
index 21a218c3d00..65d603991c6 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp
@@ -77,21 +77,21 @@ class VictoryConditions : public VictoryConditionsInterface
 public:
 	VictoryConditions();
 
-	void init( void ) override;
-	void reset( void ) override;
-	void update( void ) override;
+	void init( void ) OVERRIDE;
+	void reset( void ) OVERRIDE;
+	void update( void ) OVERRIDE;
 
-	Bool hasAchievedVictory(Player *player) override;					///< has a specific player and his allies won?
-	Bool hasBeenDefeated(Player *player) override;							///< has a specific player and his allies lost?
-	Bool hasSinglePlayerBeenDefeated(Player *player) override;	///< has a specific player lost?
+	Bool hasAchievedVictory(Player *player) OVERRIDE;					///< has a specific player and his allies won?
+	Bool hasBeenDefeated(Player *player) OVERRIDE;							///< has a specific player and his allies lost?
+	Bool hasSinglePlayerBeenDefeated(Player *player) OVERRIDE;	///< has a specific player lost?
 
-	void cachePlayerPtrs( void ) override;											///< players have been created - cache the ones of interest
+	void cachePlayerPtrs( void ) OVERRIDE;											///< players have been created - cache the ones of interest
 
-	Bool isLocalAlliedVictory( void ) override;								///< convenience function
-	Bool isLocalAlliedDefeat( void ) override;									///< convenience function
-	Bool isLocalDefeat( void ) override;												///< convenience function
-	Bool amIObserver( void ) override { return m_isObserver;} 	///< Am I an observer?( need this for scripts )
-	UnsignedInt getEndFrame( void ) override { return m_endFrame; }	///< on which frame was the game effectively over?
+	Bool isLocalAlliedVictory( void ) OVERRIDE;								///< convenience function
+	Bool isLocalAlliedDefeat( void ) OVERRIDE;									///< convenience function
+	Bool isLocalDefeat( void ) OVERRIDE;												///< convenience function
+	Bool amIObserver( void ) OVERRIDE { return m_isObserver;} 	///< Am I an observer?( need this for scripts )
+	UnsignedInt getEndFrame( void ) OVERRIDE { return m_endFrame; }	///< on which frame was the game effectively over?
 private:
 	Player*				m_players[MAX_PLAYER_COUNT];
 	Int						m_localSlotNum;
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp
index 185c6cb9b7e..053d7838ecf 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp
@@ -137,9 +137,9 @@ static NullPrototypeClass _NullPrototype;
 class RObjIterator : public RenderObjIterator
 {
 public:
-	bool					Is_Done(void) override;
-	const char *			Current_Item_Name(void) override;
-	int						Current_Item_Class_ID(void) override;
+	bool					Is_Done(void) OVERRIDE;
+	const char *			Current_Item_Name(void) OVERRIDE;
+	int						Current_Item_Class_ID(void) OVERRIDE;
 protected:
 	friend class WW3DAssetManager;
 };
@@ -154,10 +154,10 @@ class HAnimIterator : public AssetIterator
 public:
 	HAnimIterator(void) : Iterator( WW3DAssetManager::Get_Instance()->HAnimManager ) { };
 
-	void			First(void) override { Iterator.First(); }
-	void			Next(void) override	{ Iterator.Next(); }
-	bool			Is_Done(void) override { return Iterator.Is_Done(); }
-	const char *	Current_Item_Name(void) override { return Iterator.Get_Current_Anim()->Get_Name(); }
+	void			First(void) OVERRIDE { Iterator.First(); }
+	void			Next(void) OVERRIDE	{ Iterator.Next(); }
+	bool			Is_Done(void) OVERRIDE { return Iterator.Is_Done(); }
+	const char *	Current_Item_Name(void) OVERRIDE { return Iterator.Get_Current_Anim()->Get_Name(); }
 
 protected:
 	HAnimManagerIterator	Iterator;
@@ -167,8 +167,8 @@ class HAnimIterator : public AssetIterator
 class HTreeIterator : public AssetIterator
 {
 public:
-	bool					Is_Done(void) override;
-	const char *			Current_Item_Name(void) override;
+	bool					Is_Done(void) OVERRIDE;
+	const char *			Current_Item_Name(void) OVERRIDE;
 protected:
 	friend class WW3DAssetManager;
 };
@@ -177,10 +177,10 @@ class Font3DDataIterator : public AssetIterator
 {
 public:
 
-	void					First(void) override { Node = WW3DAssetManager::Get_Instance()->Font3DDatas.Head(); }
-	void					Next(void) override	{ Node = Node->Next(); }
-	bool					Is_Done(void) override { return Node==nullptr; }
-	const char *			Current_Item_Name(void) override { return Node->Data()->Name; }
+	void					First(void) OVERRIDE { Node = WW3DAssetManager::Get_Instance()->Font3DDatas.Head(); }
+	void					Next(void) OVERRIDE	{ Node = Node->Next(); }
+	bool					Is_Done(void) OVERRIDE { return Node==nullptr; }
+	const char *			Current_Item_Name(void) OVERRIDE { return Node->Data()->Name; }
 
 protected:
 
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp
index 84687d94ae3..421c2a0a1a8 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp
@@ -1430,9 +1430,9 @@ void DazzleRenderObjClass::Special_Render(SpecialRenderInfoClass & rinfo)
 
 class DazzlePersistFactoryClass : public PersistFactoryClass
 {
-	uint32				Chunk_ID(void) const override;
-	PersistClass *	Load(ChunkLoadClass & cload) const override;
-	void				Save(ChunkSaveClass & csave,PersistClass * obj)	const override;
+	uint32				Chunk_ID(void) const OVERRIDE;
+	PersistClass *	Load(ChunkLoadClass & cload) const OVERRIDE;
+	void				Save(ChunkSaveClass & csave,PersistClass * obj)	const OVERRIDE;
 
 	enum
 	{

From c38d68b91ffd24bab9ecc8c92ccb9f038350007a Mon Sep 17 00:00:00 2001
From: bobtista <bobtista@gmail.com>
Date: Tue, 13 Jan 2026 12:45:58 -0500
Subject: [PATCH 4/8] fix(GeneralsMD): rename AnimStateType enum values to
 avoid FINAL macro conflict

---
 .../GameClient/Module/W3DDebrisDraw.h         | 10 ++++----
 .../Drawable/Draw/W3DDebrisDraw.cpp           | 24 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h
index 4c79a246775..587e7887521 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h
@@ -74,11 +74,11 @@ class W3DDebrisDraw : public DrawModule, public DebrisDrawInterface
 
 	enum AnimStateType
 	{
-		INITIAL,
-		FLYING,
-		FINAL,
+		ANIM_INITIAL,
+		ANIM_FLYING,
+		ANIM_FINAL,
 
-		STATECOUNT
+		ANIM_STATECOUNT
 	};
 
 	AsciiString								m_modelName;
@@ -87,7 +87,7 @@ class W3DDebrisDraw : public DrawModule, public DebrisDrawInterface
 	AsciiString								m_animFlying;
 	AsciiString								m_animFinal;
 	RenderObjClass*						m_renderObject;										///< W3D Render object for this drawable
-	HAnimClass*								m_anims[STATECOUNT];
+	HAnimClass*								m_anims[ANIM_STATECOUNT];
 	const FXList*							m_fxFinal;
 	Int												m_state;
 	Int												m_frames;
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
index bf641e4407b..d188dde3d7d 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
@@ -53,10 +53,10 @@
 W3DDebrisDraw::W3DDebrisDraw(Thing *thing, const ModuleData* moduleData) : DrawModule(thing, moduleData)
 {
   m_renderObject = nullptr;
-	for (int i = 0; i < STATECOUNT; ++i)
+	for (int i = 0; i < ANIM_ANIM_STATECOUNT; ++i)
 		m_anims[i] = nullptr;
 	m_fxFinal = nullptr;
-	m_state = INITIAL;
+	m_state = ANIM_INITIAL;
 	m_frames = 0;
 	m_shadow = nullptr;
 	m_finalStop = false;
@@ -78,7 +78,7 @@ W3DDebrisDraw::~W3DDebrisDraw(void)
   	REF_PTR_RELEASE(m_renderObject);
  		m_renderObject = nullptr;
 	}
-	for (int i = 0; i < STATECOUNT; ++i)
+	for (int i = 0; i < ANIM_STATECOUNT; ++i)
 	{
 		REF_PTR_RELEASE(m_anims[i]);
 		m_anims[i] = nullptr;
@@ -153,14 +153,14 @@ void W3DDebrisDraw::setModelName(AsciiString name, Color color, ShadowType t)
 void W3DDebrisDraw::setAnimNames(AsciiString initial, AsciiString flying, AsciiString final, const FXList* finalFX)
 {
 	int i;
-	for (i = 0; i < STATECOUNT; ++i)
+	for (i = 0; i < ANIM_STATECOUNT; ++i)
 	{
 		REF_PTR_RELEASE(m_anims[i]);
 		m_anims[i] = nullptr;
 	}
 
-	m_anims[INITIAL] = initial.isEmpty() ? nullptr : W3DDisplay::m_assetManager->Get_HAnim(initial.str());
-	m_anims[FLYING] = flying.isEmpty() ? nullptr : W3DDisplay::m_assetManager->Get_HAnim(flying.str());
+	m_anims[ANIM_INITIAL] = initial.isEmpty() ? nullptr : W3DDisplay::m_assetManager->Get_HAnim(initial.str());
+	m_anims[ANIM_FLYING] = flying.isEmpty() ? nullptr : W3DDisplay::m_assetManager->Get_HAnim(flying.str());
 	if (stricmp(final.str(), "STOP") == 0)
 	{
 		m_finalStop = true;
@@ -170,7 +170,7 @@ void W3DDebrisDraw::setAnimNames(AsciiString initial, AsciiString flying, AsciiS
 	{
 		m_finalStop = false;
 	}
-	m_anims[FINAL] = final.isEmpty() ? nullptr : W3DDisplay::m_assetManager->Get_HAnim(final.str());
+	m_anims[ANIM_FINAL] = final.isEmpty() ? nullptr : W3DDisplay::m_assetManager->Get_HAnim(final.str());
 	m_state = 0;
 	m_frames = 0;
 	m_fxFinal = finalFX;
@@ -227,7 +227,7 @@ void W3DDebrisDraw::doDrawModule(const Matrix3D* transformMtx)
 		}
 		m_renderObject->Set_Transform(*transformMtx);
 
-		static const RenderObjClass::AnimMode TheAnimModes[STATECOUNT] =
+		static const RenderObjClass::AnimMode TheAnimModes[ANIM_STATECOUNT] =
 		{
 			RenderObjClass::ANIM_MODE_ONCE,
 			RenderObjClass::ANIM_MODE_LOOP,
@@ -237,11 +237,11 @@ void W3DDebrisDraw::doDrawModule(const Matrix3D* transformMtx)
 		Int oldState = m_state;
 		Object* obj = getDrawable()->getObject();
 		const Int MIN_FINAL_FRAMES = 3;
-		if (m_state != FINAL && obj != nullptr && !obj->isAboveTerrain() && m_frames > MIN_FINAL_FRAMES)
+		if (m_state != ANIM_FINAL && obj != nullptr && !obj->isAboveTerrain() && m_frames > MIN_FINAL_FRAMES)
 		{
-			m_state = FINAL;
+			m_state = ANIM_FINAL;
 		}
-		else if (m_state < FINAL && (isAnimationComplete(m_renderObject)))
+		else if (m_state < ANIM_FINAL && (isAnimationComplete(m_renderObject)))
 		{
 			++m_state;
 		}
@@ -249,7 +249,7 @@ void W3DDebrisDraw::doDrawModule(const Matrix3D* transformMtx)
 		if (hanim != nullptr && (hanim != m_renderObject->Peek_Animation() || oldState != m_state))
 		{
 			RenderObjClass::AnimMode m = TheAnimModes[m_state];
-			if (m_state == FINAL)
+			if (m_state == ANIM_FINAL)
 			{
 				FXList::doFXPos(m_fxFinal, getDrawable()->getPosition(), getDrawable()->getTransformMatrix(), 0, nullptr, 0.0f);
 				if (m_finalStop)

From 5f4f2fafcecc01328bced7bad73bd567a4fb87e6 Mon Sep 17 00:00:00 2001
From: bobtista <bobtista@gmail.com>
Date: Tue, 13 Jan 2026 12:46:18 -0500
Subject: [PATCH 5/8] fix(Generals): rename AnimStateType enum values to avoid
 FINAL macro conflict

---
 .../GameClient/Module/W3DDebrisDraw.h         | 10 ++++----
 .../Drawable/Draw/W3DDebrisDraw.cpp           | 24 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h
index db06b6189e2..9f3a1b8d862 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h
@@ -74,11 +74,11 @@ class W3DDebrisDraw : public DrawModule, public DebrisDrawInterface
 
 	enum AnimStateType
 	{
-		INITIAL,
-		FLYING,
-		FINAL,
+		ANIM_INITIAL,
+		ANIM_FLYING,
+		ANIM_FINAL,
 
-		STATECOUNT
+		ANIM_STATECOUNT
 	};
 
 	AsciiString								m_modelName;
@@ -87,7 +87,7 @@ class W3DDebrisDraw : public DrawModule, public DebrisDrawInterface
 	AsciiString								m_animFlying;
 	AsciiString								m_animFinal;
 	RenderObjClass*						m_renderObject;										///< W3D Render object for this drawable
-	HAnimClass*								m_anims[STATECOUNT];
+	HAnimClass*								m_anims[ANIM_STATECOUNT];
 	const FXList*							m_fxFinal;
 	Int												m_state;
 	Int												m_frames;
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
index f7b57d4fa4c..4c8a741cb82 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
@@ -53,10 +53,10 @@
 W3DDebrisDraw::W3DDebrisDraw(Thing *thing, const ModuleData* moduleData) : DrawModule(thing, moduleData)
 {
   m_renderObject = nullptr;
-	for (int i = 0; i < STATECOUNT; ++i)
+	for (int i = 0; i < ANIM_ANIM_STATECOUNT; ++i)
 		m_anims[i] = nullptr;
 	m_fxFinal = nullptr;
-	m_state = INITIAL;
+	m_state = ANIM_INITIAL;
 	m_frames = 0;
 	m_shadow = nullptr;
 	m_finalStop = false;
@@ -78,7 +78,7 @@ W3DDebrisDraw::~W3DDebrisDraw(void)
   	REF_PTR_RELEASE(m_renderObject);
  		m_renderObject = nullptr;
 	}
-	for (int i = 0; i < STATECOUNT; ++i)
+	for (int i = 0; i < ANIM_STATECOUNT; ++i)
 	{
 		REF_PTR_RELEASE(m_anims[i]);
 		m_anims[i] = nullptr;
@@ -153,14 +153,14 @@ void W3DDebrisDraw::setModelName(AsciiString name, Color color, ShadowType t)
 void W3DDebrisDraw::setAnimNames(AsciiString initial, AsciiString flying, AsciiString final, const FXList* finalFX)
 {
 	int i;
-	for (i = 0; i < STATECOUNT; ++i)
+	for (i = 0; i < ANIM_STATECOUNT; ++i)
 	{
 		REF_PTR_RELEASE(m_anims[i]);
 		m_anims[i] = nullptr;
 	}
 
-	m_anims[INITIAL] = initial.isEmpty() ? nullptr : W3DDisplay::m_assetManager->Get_HAnim(initial.str());
-	m_anims[FLYING] = flying.isEmpty() ? nullptr : W3DDisplay::m_assetManager->Get_HAnim(flying.str());
+	m_anims[ANIM_INITIAL] = initial.isEmpty() ? nullptr : W3DDisplay::m_assetManager->Get_HAnim(initial.str());
+	m_anims[ANIM_FLYING] = flying.isEmpty() ? nullptr : W3DDisplay::m_assetManager->Get_HAnim(flying.str());
 	if (stricmp(final.str(), "STOP") == 0)
 	{
 		m_finalStop = true;
@@ -170,7 +170,7 @@ void W3DDebrisDraw::setAnimNames(AsciiString initial, AsciiString flying, AsciiS
 	{
 		m_finalStop = false;
 	}
-	m_anims[FINAL] = final.isEmpty() ? nullptr : W3DDisplay::m_assetManager->Get_HAnim(final.str());
+	m_anims[ANIM_FINAL] = final.isEmpty() ? nullptr : W3DDisplay::m_assetManager->Get_HAnim(final.str());
 	m_state = 0;
 	m_frames = 0;
 	m_fxFinal = finalFX;
@@ -227,7 +227,7 @@ void W3DDebrisDraw::doDrawModule(const Matrix3D* transformMtx)
 		}
 		m_renderObject->Set_Transform(*transformMtx);
 
-		static const RenderObjClass::AnimMode TheAnimModes[STATECOUNT] =
+		static const RenderObjClass::AnimMode TheAnimModes[ANIM_STATECOUNT] =
 		{
 			RenderObjClass::ANIM_MODE_ONCE,
 			RenderObjClass::ANIM_MODE_LOOP,
@@ -237,11 +237,11 @@ void W3DDebrisDraw::doDrawModule(const Matrix3D* transformMtx)
 		Int oldState = m_state;
 		Object* obj = getDrawable()->getObject();
 		const Int MIN_FINAL_FRAMES = 3;
-		if (m_state != FINAL && obj != nullptr && !obj->isAboveTerrain() && m_frames > MIN_FINAL_FRAMES)
+		if (m_state != ANIM_FINAL && obj != nullptr && !obj->isAboveTerrain() && m_frames > MIN_FINAL_FRAMES)
 		{
-			m_state = FINAL;
+			m_state = ANIM_FINAL;
 		}
-		else if (m_state < FINAL && (isAnimationComplete(m_renderObject)))
+		else if (m_state < ANIM_FINAL && (isAnimationComplete(m_renderObject)))
 		{
 			++m_state;
 		}
@@ -249,7 +249,7 @@ void W3DDebrisDraw::doDrawModule(const Matrix3D* transformMtx)
 		if (hanim != nullptr && (hanim != m_renderObject->Peek_Animation() || oldState != m_state))
 		{
 			RenderObjClass::AnimMode m = TheAnimModes[m_state];
-			if (m_state == FINAL)
+			if (m_state == ANIM_FINAL)
 			{
 				FXList::doFXPos(m_fxFinal, getDrawable()->getPosition(), getDrawable()->getTransformMatrix(), 0, nullptr, 0.0f);
 				if (m_finalStop)

From 108ee5ca9e29c648b65b27366b039faaef1a7ba0 Mon Sep 17 00:00:00 2001
From: bobtista <bobtista@gmail.com>
Date: Tue, 13 Jan 2026 13:07:13 -0500
Subject: [PATCH 6/8] refactor(Core): rename OVERRIDE template class to
 OverridePtr to avoid macro conflict

---
 Core/GameEngine/Include/GameClient/Snow.h   | 2 +-
 Core/GameEngine/Include/GameClient/Water.h  | 2 +-
 Core/GameEngine/Source/GameClient/Snow.cpp  | 2 +-
 Core/GameEngine/Source/GameClient/Water.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Core/GameEngine/Include/GameClient/Snow.h b/Core/GameEngine/Include/GameClient/Snow.h
index 08679b14f07..a620d100501 100644
--- a/Core/GameEngine/Include/GameClient/Snow.h
+++ b/Core/GameEngine/Include/GameClient/Snow.h
@@ -76,7 +76,7 @@ class WeatherSetting : public Overridable
 
 EMPTY_DTOR(WeatherSetting)
 
-extern OVERRIDE<WeatherSetting> TheWeatherSetting;
+extern OverridePtr<WeatherSetting> TheWeatherSetting;
 
 class SnowManager : public SubsystemInterface
 {
diff --git a/Core/GameEngine/Include/GameClient/Water.h b/Core/GameEngine/Include/GameClient/Water.h
index f938df6d8c0..de8c0a45599 100644
--- a/Core/GameEngine/Include/GameClient/Water.h
+++ b/Core/GameEngine/Include/GameClient/Water.h
@@ -121,4 +121,4 @@ EMPTY_DTOR(WaterTransparencySetting)
 // EXTERNAL ///////////////////////////////////////////////////////////////////////////////////////
 extern WaterSetting WaterSettings[ TIME_OF_DAY_COUNT ];
 
-extern OVERRIDE<WaterTransparencySetting> TheWaterTransparency;
+extern OverridePtr<WaterTransparencySetting> TheWaterTransparency;
diff --git a/Core/GameEngine/Source/GameClient/Snow.cpp b/Core/GameEngine/Source/GameClient/Snow.cpp
index 737ac561334..491a57722fa 100644
--- a/Core/GameEngine/Source/GameClient/Snow.cpp
+++ b/Core/GameEngine/Source/GameClient/Snow.cpp
@@ -100,7 +100,7 @@ SnowManager::~SnowManager()
 	TheWeatherSetting=nullptr;
 }
 
-OVERRIDE<WeatherSetting> TheWeatherSetting = nullptr;
+OverridePtr<WeatherSetting> TheWeatherSetting = nullptr;
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 const FieldParse WeatherSetting::m_weatherSettingFieldParseTable[] =
diff --git a/Core/GameEngine/Source/GameClient/Water.cpp b/Core/GameEngine/Source/GameClient/Water.cpp
index 3382f11ce04..957e87adafe 100644
--- a/Core/GameEngine/Source/GameClient/Water.cpp
+++ b/Core/GameEngine/Source/GameClient/Water.cpp
@@ -35,7 +35,7 @@
 
 // GLOBALS ////////////////////////////////////////////////////////////////////////////////////////
 WaterSetting WaterSettings[ TIME_OF_DAY_COUNT ];
-OVERRIDE<WaterTransparencySetting> TheWaterTransparency = nullptr;
+OverridePtr<WaterTransparencySetting> TheWaterTransparency = nullptr;
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 const FieldParse WaterSetting::m_waterSettingFieldParseTable[] =

From 9ae23d8368d421c108b4746c853e35d33922a259 Mon Sep 17 00:00:00 2001
From: bobtista <bobtista@gmail.com>
Date: Tue, 13 Jan 2026 13:07:33 -0500
Subject: [PATCH 7/8] refactor(GeneralsMD): rename OVERRIDE template class to
 OverridePtr to avoid macro conflict

---
 .../GameEngine/Include/Common/Overridable.h   |  2 +-
 .../Code/GameEngine/Include/Common/Override.h | 42 +++++++++----------
 .../Code/GameEngine/Include/Common/Thing.h    |  2 +-
 .../Include/GameClient/ControlBar.h           |  2 +-
 .../Include/GameLogic/CrateSystem.h           |  2 +-
 .../GameEngine/Include/GameLogic/Locomotor.h  |  2 +-
 .../GameEngine/Source/Common/INI/INIWater.cpp |  2 +-
 7 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Overridable.h b/GeneralsMD/Code/GameEngine/Include/Common/Overridable.h
index 2f3f8727b3e..2d5d7bc3fdf 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Overridable.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Overridable.h
@@ -31,7 +31,7 @@
 #include "Common/GameMemory.h"
 
 /*
-	In order for something to live in an OVERRIDE<> object, it must be derived from Overridable
+	In order for something to live in an OverridePtr<> object, it must be derived from Overridable
 	(publicly).
 
 	This is useful for things like templates, where we want to override the template and make sure
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Override.h b/GeneralsMD/Code/GameEngine/Include/Common/Override.h
index eebd8bbb389..9e87c37eddb 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Override.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Override.h
@@ -31,31 +31,31 @@
 #include "Common/Overridable.h"
 
 /*
-	An OVERRIDE is a replacement for a pointer of its contained type, ie, rather than containing
-	a LocomotorTemplate*, you would contain an OVERRIDE<LocomotorTemplate>.
+	An OverridePtr is a replacement for a pointer of its contained type, ie, rather than containing
+	a LocomotorTemplate*, you would contain an OverridePtr<LocomotorTemplate>.
 
-	OVERRIDE pretends in all ways (dereference via *, -> and casting to type*) to be a type*, so
+	OverridePtr pretends in all ways (dereference via *, -> and casting to type*) to be a type*, so
 	there should be very little code that needs to be rewritten to work with these.
 
 	In order to make something overridable, these are the steps:
 		1) Make the desired class derive from Overridable.
-		2) Make the container class contain an instance of OVERRIDE<Type>
+		2) Make the container class contain an instance of OverridePtr<Type>
 		3) Make the newOverride function (wherever an override is new'd) request the overridables lastOverride,
 			to ensure that no leaks are created.
 
 		See LocomotorTemplate for an example.
 */
 
-template <class T> class OVERRIDE
+template <class T> class OverridePtr
 {
 	public:
-		// Provide useful constructors to go from a T* to an OVERRIDE<T>
-		OVERRIDE(const T *overridable = nullptr);
+		// Provide useful constructors to go from a T* to an OverridePtr<T>
+		OverridePtr(const T *overridable = nullptr);
 		// Copy constructor
-		OVERRIDE(OVERRIDE<T> &overridable);
-		// Operator= for copying from another OVERRIDE and T*
-		__inline OVERRIDE &operator=( const OVERRIDE<T>& override );
-		__inline OVERRIDE &operator=( const T* overridable );
+		OverridePtr(OverridePtr<T> &overridable);
+		// Operator= for copying from another OverridePtr and T*
+		__inline OverridePtr &operator=( const OverridePtr<T>& other );
+		__inline OverridePtr &operator=( const T* overridable );
 
 		// these are the methods which we can use to access data in a pointer. (Dereference*, ->, and cast
 		// to T*). They are all overloaded to recurse to the lowest override and use that.
@@ -67,36 +67,36 @@ template <class T> class OVERRIDE
 		__inline const T *getNonOverloadedPointer( void ) const;
 
 	private:
-		// Because OVERRIDE is meant to live on the object and not in the store, it currently contains
+		// Because OverridePtr is meant to live on the object and not in the store, it currently contains
 		// a constant pointer. We could change this if it seems weird.
 		const T *m_overridable;
 };
 
 //-------------------------------------------------------------------------------------------------
 template <class T>
-OVERRIDE<T>::OVERRIDE(const T *overridable)
+OverridePtr<T>::OverridePtr(const T *overridable)
 {
 	m_overridable = overridable;
 }
 
 //-------------------------------------------------------------------------------------------------
 template <class T>
-OVERRIDE<T>::OVERRIDE(OVERRIDE<T> &overridable)
+OverridePtr<T>::OverridePtr(OverridePtr<T> &overridable)
 {
 	m_overridable = overridable.m_overridable;
 }
 
 //-------------------------------------------------------------------------------------------------
 template <class T>
-OVERRIDE<T> &OVERRIDE<T>::operator=( const OVERRIDE<T>& override )
+OverridePtr<T> &OverridePtr<T>::operator=( const OverridePtr<T>& other )
 {
-	m_overridable = override.m_overridable;
+	m_overridable = other.m_overridable;
 	return *this;
 }
 
 //-------------------------------------------------------------------------------------------------
 template <class T>
-OVERRIDE<T> &OVERRIDE<T>::operator=(const T* overridable)
+OverridePtr<T> &OverridePtr<T>::operator=(const T* overridable)
 {
 	m_overridable = overridable;
 	return *this;
@@ -104,7 +104,7 @@ OVERRIDE<T> &OVERRIDE<T>::operator=(const T* overridable)
 
 //-------------------------------------------------------------------------------------------------
 template <class T>
-const T *OVERRIDE<T>::operator->() const
+const T *OverridePtr<T>::operator->() const
 {
 	if (!m_overridable)
 		return nullptr;
@@ -113,7 +113,7 @@ const T *OVERRIDE<T>::operator->() const
 
 //-------------------------------------------------------------------------------------------------
 template <class T>
-const T *OVERRIDE<T>::operator*() const
+const T *OverridePtr<T>::operator*() const
 {
 	if (!m_overridable)
 		return nullptr;
@@ -122,14 +122,14 @@ const T *OVERRIDE<T>::operator*() const
 
 //-------------------------------------------------------------------------------------------------
 template <class T>
-const T *OVERRIDE<T>::getNonOverloadedPointer( void ) const
+const T *OverridePtr<T>::getNonOverloadedPointer( void ) const
 {
 	return (T*) m_overridable;
 }
 
 //-------------------------------------------------------------------------------------------------
 template <class T>
-OVERRIDE<T>::operator const T*( ) const
+OverridePtr<T>::operator const T*( ) const
 {
 	return operator*();
 }
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Thing.h b/GeneralsMD/Code/GameEngine/Include/Common/Thing.h
index 134276ae68f..f042236d0e8 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Thing.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Thing.h
@@ -160,7 +160,7 @@ class Thing : public MemoryPoolObject
 	// note that it is declared 'const' -- the assumption being that
 	// since ThingTemplates are shared between many, many Things, the Thing
 	// should never be able to change it.
-	OVERRIDE<ThingTemplate> m_template;	///< reference back to template database
+	OverridePtr<ThingTemplate> m_template;	///< reference back to template database
 #if defined(RTS_DEBUG)
 	AsciiString m_templateName;
 #endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h
index b4beb084eed..59e296a9edd 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h
@@ -330,7 +330,7 @@ class CommandButton : public Overridable
 
 	GUICommandType getCommandType() const { return m_command; }
 	UnsignedInt getOptions() const { return m_options; }
-	OVERRIDE<ThingTemplate> getThingTemplate() const { return m_thingTemplate; }
+	OverridePtr<ThingTemplate> getThingTemplate() const { return m_thingTemplate; }
 	const UpgradeTemplate* getUpgradeTemplate() const { return m_upgradeTemplate; }
 	const SpecialPowerTemplate* getSpecialPowerTemplate() const { return m_specialPower; }
 	RadiusCursorType getRadiusCursorType() const { return m_radiusCursor; }
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h
index b40d4d2d7d5..321b969e802 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h
@@ -78,7 +78,7 @@ class CrateTemplate : public Overridable
 
 };
 
-typedef OVERRIDE<CrateTemplate> CrateTemplateOverride;
+typedef OverridePtr<CrateTemplate> CrateTemplateOverride;
 
 
 /**
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h
index adb0faf5840..d35b4352623 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h
@@ -220,7 +220,7 @@ class LocomotorTemplate : public Overridable
 	Real											m_elevatorCorrectionRate;
 };
 
-typedef OVERRIDE<LocomotorTemplate> LocomotorTemplateOverride;
+typedef OverridePtr<LocomotorTemplate> LocomotorTemplateOverride;
 
 // ---------------------------------------------------------
 class Locomotor : public MemoryPoolObject, public Snapshot
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIWater.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIWater.cpp
index 3ec7eddfcb4..0d530a3b8f5 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIWater.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIWater.cpp
@@ -118,7 +118,7 @@ void INI::parseWaterTransparencyDefinition( INI *ini )
 		// texture.
 
 		const WaterTransparencySetting* wtOriginal = TheWaterTransparency.getNonOverloadedPointer();
-		OVERRIDE<WaterTransparencySetting> wtOverride = TheWaterTransparency;
+		OverridePtr<WaterTransparencySetting> wtOverride = TheWaterTransparency;
 
 		if (wtOriginal == wtOverride)
 			return;

From 999978feba6216492955d0386e3be99b242ef9c0 Mon Sep 17 00:00:00 2001
From: bobtista <bobtista@gmail.com>
Date: Tue, 13 Jan 2026 13:07:47 -0500
Subject: [PATCH 8/8] refactor(Generals): rename OVERRIDE template class to
 OverridePtr to avoid macro conflict

---
 .../GameEngine/Include/Common/Overridable.h   |  2 +-
 .../Code/GameEngine/Include/Common/Override.h | 42 +++++++++----------
 .../Code/GameEngine/Include/Common/Thing.h    |  2 +-
 .../Include/GameClient/ControlBar.h           |  2 +-
 .../Include/GameLogic/CrateSystem.h           |  2 +-
 .../GameEngine/Include/GameLogic/Locomotor.h  |  2 +-
 .../GameEngine/Source/Common/INI/INIWater.cpp |  2 +-
 .../Drawable/Draw/W3DDebrisDraw.cpp           |  2 +-
 .../Drawable/Draw/W3DDebrisDraw.cpp           |  2 +-
 9 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/Generals/Code/GameEngine/Include/Common/Overridable.h b/Generals/Code/GameEngine/Include/Common/Overridable.h
index 98add739199..8270313f6cd 100644
--- a/Generals/Code/GameEngine/Include/Common/Overridable.h
+++ b/Generals/Code/GameEngine/Include/Common/Overridable.h
@@ -31,7 +31,7 @@
 #include "Common/GameMemory.h"
 
 /*
-	In order for something to live in an OVERRIDE<> object, it must be derived from Overridable
+	In order for something to live in an OverridePtr<> object, it must be derived from Overridable
 	(publicly).
 
 	This is useful for things like templates, where we want to override the template and make sure
diff --git a/Generals/Code/GameEngine/Include/Common/Override.h b/Generals/Code/GameEngine/Include/Common/Override.h
index 90c9f3cc92d..bef1b3e5258 100644
--- a/Generals/Code/GameEngine/Include/Common/Override.h
+++ b/Generals/Code/GameEngine/Include/Common/Override.h
@@ -31,31 +31,31 @@
 #include "Common/Overridable.h"
 
 /*
-	An OVERRIDE is a replacement for a pointer of its contained type, ie, rather than containing
-	a LocomotorTemplate*, you would contain an OVERRIDE<LocomotorTemplate>.
+	An OverridePtr is a replacement for a pointer of its contained type, ie, rather than containing
+	a LocomotorTemplate*, you would contain an OverridePtr<LocomotorTemplate>.
 
-	OVERRIDE pretends in all ways (dereference via *, -> and casting to type*) to be a type*, so
+	OverridePtr pretends in all ways (dereference via *, -> and casting to type*) to be a type*, so
 	there should be very little code that needs to be rewritten to work with these.
 
 	In order to make something overridable, these are the steps:
 		1) Make the desired class derive from Overridable.
-		2) Make the container class contain an instance of OVERRIDE<Type>
+		2) Make the container class contain an instance of OverridePtr<Type>
 		3) Make the newOverride function (wherever an override is new'd) request the overridables lastOverride,
 			to ensure that no leaks are created.
 
 		See LocomotorTemplate for an example.
 */
 
-template <class T> class OVERRIDE
+template <class T> class OverridePtr
 {
 	public:
-		// Provide useful constructors to go from a T* to an OVERRIDE<T>
-		OVERRIDE(const T *overridable = nullptr);
+		// Provide useful constructors to go from a T* to an OverridePtr<T>
+		OverridePtr(const T *overridable = nullptr);
 		// Copy constructor
-		OVERRIDE(OVERRIDE<T> &overridable);
-		// Operator= for copying from another OVERRIDE and T*
-		__inline OVERRIDE &operator=( const OVERRIDE<T>& override );
-		__inline OVERRIDE &operator=( const T* overridable );
+		OverridePtr(OverridePtr<T> &overridable);
+		// Operator= for copying from another OverridePtr and T*
+		__inline OverridePtr &operator=( const OverridePtr<T>& other );
+		__inline OverridePtr &operator=( const T* overridable );
 
 		// these are the methods which we can use to access data in a pointer. (Dereference*, ->, and cast
 		// to T*). They are all overloaded to recurse to the lowest override and use that.
@@ -67,36 +67,36 @@ template <class T> class OVERRIDE
 		__inline const T *getNonOverloadedPointer( void ) const;
 
 	private:
-		// Because OVERRIDE is meant to live on the object and not in the store, it currently contains
+		// Because OverridePtr is meant to live on the object and not in the store, it currently contains
 		// a constant pointer. We could change this if it seems weird.
 		const T *m_overridable;
 };
 
 //-------------------------------------------------------------------------------------------------
 template <class T>
-OVERRIDE<T>::OVERRIDE(const T *overridable)
+OverridePtr<T>::OverridePtr(const T *overridable)
 {
 	m_overridable = overridable;
 }
 
 //-------------------------------------------------------------------------------------------------
 template <class T>
-OVERRIDE<T>::OVERRIDE(OVERRIDE<T> &overridable)
+OverridePtr<T>::OverridePtr(OverridePtr<T> &overridable)
 {
 	m_overridable = overridable.m_overridable;
 }
 
 //-------------------------------------------------------------------------------------------------
 template <class T>
-OVERRIDE<T> &OVERRIDE<T>::operator=( const OVERRIDE<T>& override )
+OverridePtr<T> &OverridePtr<T>::operator=( const OverridePtr<T>& other )
 {
-	m_overridable = override.m_overridable;
+	m_overridable = other.m_overridable;
 	return *this;
 }
 
 //-------------------------------------------------------------------------------------------------
 template <class T>
-OVERRIDE<T> &OVERRIDE<T>::operator=(const T* overridable)
+OverridePtr<T> &OverridePtr<T>::operator=(const T* overridable)
 {
 	m_overridable = overridable;
 	return *this;
@@ -104,7 +104,7 @@ OVERRIDE<T> &OVERRIDE<T>::operator=(const T* overridable)
 
 //-------------------------------------------------------------------------------------------------
 template <class T>
-const T *OVERRIDE<T>::operator->() const
+const T *OverridePtr<T>::operator->() const
 {
 	if (!m_overridable)
 		return nullptr;
@@ -113,7 +113,7 @@ const T *OVERRIDE<T>::operator->() const
 
 //-------------------------------------------------------------------------------------------------
 template <class T>
-const T *OVERRIDE<T>::operator*() const
+const T *OverridePtr<T>::operator*() const
 {
 	if (!m_overridable)
 		return nullptr;
@@ -122,14 +122,14 @@ const T *OVERRIDE<T>::operator*() const
 
 //-------------------------------------------------------------------------------------------------
 template <class T>
-const T *OVERRIDE<T>::getNonOverloadedPointer( void ) const
+const T *OverridePtr<T>::getNonOverloadedPointer( void ) const
 {
 	return (T*) m_overridable;
 }
 
 //-------------------------------------------------------------------------------------------------
 template <class T>
-OVERRIDE<T>::operator const T*( ) const
+OverridePtr<T>::operator const T*( ) const
 {
 	return operator*();
 }
diff --git a/Generals/Code/GameEngine/Include/Common/Thing.h b/Generals/Code/GameEngine/Include/Common/Thing.h
index 905ad0b7897..a506bc30685 100644
--- a/Generals/Code/GameEngine/Include/Common/Thing.h
+++ b/Generals/Code/GameEngine/Include/Common/Thing.h
@@ -160,7 +160,7 @@ class Thing : public MemoryPoolObject
 	// note that it is declared 'const' -- the assumption being that
 	// since ThingTemplates are shared between many, many Things, the Thing
 	// should never be able to change it.
-	OVERRIDE<ThingTemplate> m_template;	///< reference back to template database
+	OverridePtr<ThingTemplate> m_template;	///< reference back to template database
 #if defined(RTS_DEBUG)
 	AsciiString m_templateName;
 #endif
diff --git a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h
index 58fc87f96d9..21fa7299381 100644
--- a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h
+++ b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h
@@ -316,7 +316,7 @@ class CommandButton : public Overridable
 
 	GUICommandType getCommandType() const { return m_command; }
 	UnsignedInt getOptions() const { return m_options; }
-	OVERRIDE<ThingTemplate> getThingTemplate() const { return m_thingTemplate; }
+	OverridePtr<ThingTemplate> getThingTemplate() const { return m_thingTemplate; }
 	const UpgradeTemplate* getUpgradeTemplate() const { return m_upgradeTemplate; }
 	const SpecialPowerTemplate* getSpecialPowerTemplate() const { return m_specialPower; }
 	RadiusCursorType getRadiusCursorType() const { return m_radiusCursor; }
diff --git a/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h b/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h
index c7c4745e31c..54b92ab62a6 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h
@@ -78,7 +78,7 @@ class CrateTemplate : public Overridable
 
 };
 
-typedef OVERRIDE<CrateTemplate> CrateTemplateOverride;
+typedef OverridePtr<CrateTemplate> CrateTemplateOverride;
 
 
 /**
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h b/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h
index 9b324985bdb..dfcbe8cbbf0 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h
@@ -211,7 +211,7 @@ class LocomotorTemplate : public Overridable
 	Real											m_wanderAboutPointRadius;
 };
 
-typedef OVERRIDE<LocomotorTemplate> LocomotorTemplateOverride;
+typedef OverridePtr<LocomotorTemplate> LocomotorTemplateOverride;
 
 // ---------------------------------------------------------
 class Locomotor : public MemoryPoolObject, public Snapshot
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIWater.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIWater.cpp
index d6bdec167f1..cd9671cbf15 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INIWater.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INIWater.cpp
@@ -118,7 +118,7 @@ void INI::parseWaterTransparencyDefinition( INI *ini )
 		// texture.
 
 		const WaterTransparencySetting* wtOriginal = TheWaterTransparency.getNonOverloadedPointer();
-		OVERRIDE<WaterTransparencySetting> wtOverride = TheWaterTransparency;
+		OverridePtr<WaterTransparencySetting> wtOverride = TheWaterTransparency;
 
 		if (wtOriginal == wtOverride)
 			return;
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
index 4c8a741cb82..3097dcc9b05 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
@@ -53,7 +53,7 @@
 W3DDebrisDraw::W3DDebrisDraw(Thing *thing, const ModuleData* moduleData) : DrawModule(thing, moduleData)
 {
   m_renderObject = nullptr;
-	for (int i = 0; i < ANIM_ANIM_STATECOUNT; ++i)
+	for (int i = 0; i < ANIM_STATECOUNT; ++i)
 		m_anims[i] = nullptr;
 	m_fxFinal = nullptr;
 	m_state = ANIM_INITIAL;
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
index d188dde3d7d..68f00cba72b 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
@@ -53,7 +53,7 @@
 W3DDebrisDraw::W3DDebrisDraw(Thing *thing, const ModuleData* moduleData) : DrawModule(thing, moduleData)
 {
   m_renderObject = nullptr;
-	for (int i = 0; i < ANIM_ANIM_STATECOUNT; ++i)
+	for (int i = 0; i < ANIM_STATECOUNT; ++i)
 		m_anims[i] = nullptr;
 	m_fxFinal = nullptr;
 	m_state = ANIM_INITIAL;