diff --git a/Core/GameEngine/Include/Common/ArchiveFileSystem.h b/Core/GameEngine/Include/Common/ArchiveFileSystem.h
index 88c3e80170b..af2321d4e25 100644
--- a/Core/GameEngine/Include/Common/ArchiveFileSystem.h
+++ b/Core/GameEngine/Include/Common/ArchiveFileSystem.h
@@ -126,10 +126,7 @@ class ArchiveFileSystem : public SubsystemInterface
 	ArchiveFileSystem();
 	virtual ~ArchiveFileSystem() override;
 
-	virtual void init() = 0;
-	virtual void update() = 0;
-	virtual void reset() = 0;
-	virtual void postProcessLoad() = 0;
+	virtual void postProcessLoad() override = 0;
 
 	// ArchiveFile operations
 	virtual ArchiveFile*	openArchiveFile( const Char *filename ) = 0;		///< Create new or return existing Archive file from file name
diff --git a/Core/GameEngine/Include/Common/GameMemory.h b/Core/GameEngine/Include/Common/GameMemory.h
index 0e901b9d4af..53c0e59619d 100644
--- a/Core/GameEngine/Include/Common/GameMemory.h
+++ b/Core/GameEngine/Include/Common/GameMemory.h
@@ -619,7 +619,7 @@ private: \
 // ----------------------------------------------------------------------------
 #define MEMORY_POOL_GLUE_WITHOUT_GCMP(ARGCLASS) \
 protected: \
-	virtual ~ARGCLASS(); \
+	virtual ~ARGCLASS() override; \
 public: \
 	enum ARGCLASS##MagicEnum { ARGCLASS##_GLUE_NOT_IMPLEMENTED = 0 }; \
 public: \
@@ -665,7 +665,7 @@ protected: \
 		ARGCLASS::getClassMemoryPool()->freeBlock(p); \
 	} \
 private: \
-	virtual MemoryPool *getObjectMemoryPool() \
+	virtual MemoryPool *getObjectMemoryPool() override \
 	{ \
 		return ARGCLASS::getClassMemoryPool(); \
 	} \
@@ -690,7 +690,7 @@ private: \
 // this is the version for an Abstract Base Class, which will never be instantiated...
 #define MEMORY_POOL_GLUE_ABC(ARGCLASS) \
 protected: \
-	virtual ~ARGCLASS(); \
+	virtual ~ARGCLASS() override; \
 public: \
 	enum ARGCLASS##MagicEnum { ARGCLASS##_GLUE_NOT_IMPLEMENTED = 0 }; \
 protected: \
@@ -719,7 +719,7 @@ protected: \
 		DEBUG_CRASH(("this should be impossible to call (abstract base class)")); \
 	} \
 private: \
-	virtual MemoryPool *getObjectMemoryPool() \
+	virtual MemoryPool *getObjectMemoryPool() override \
 	{ \
 		throw ERROR_BUG; \
 		return 0; \
diff --git a/Core/GameEngine/Include/Common/LocalFileSystem.h b/Core/GameEngine/Include/Common/LocalFileSystem.h
index 837e8992287..c20887c3f50 100644
--- a/Core/GameEngine/Include/Common/LocalFileSystem.h
+++ b/Core/GameEngine/Include/Common/LocalFileSystem.h
@@ -36,10 +36,6 @@ class LocalFileSystem : public SubsystemInterface
 public:
 	virtual ~LocalFileSystem() override {}
 
-	virtual void init() = 0;
-	virtual void reset() = 0;
-	virtual void update() = 0;
-
 	virtual File * openFile(const Char *filename, Int access = File::NONE, size_t bufferSize = File::BUFFERSIZE) = 0;
 	virtual Bool doesFileExist(const Char *filename) const = 0;
 	virtual void getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const = 0; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep).  Possibly search subdirectories.
diff --git a/Core/GameEngine/Include/GameClient/LoadScreen.h b/Core/GameEngine/Include/GameClient/LoadScreen.h
index b6afb7a101e..cee1eee9766 100644
--- a/Core/GameEngine/Include/GameClient/LoadScreen.h
+++ b/Core/GameEngine/Include/GameClient/LoadScreen.h
@@ -82,7 +82,7 @@ class SinglePlayerLoadScreen : public LoadScreen
 
 	virtual void init( GameInfo *game ) override;		///< Init the loadscreen
 	virtual void reset() override;		///< Reset the system
-	virtual void update()
+	virtual void update() override
 	{
 		DEBUG_CRASH(("Call update(Int) instead.  This update isn't supported"));
 	};
@@ -132,7 +132,7 @@ class ChallengeLoadScreen : public LoadScreen
 
 	virtual void init( GameInfo *game ) override;		///< Init the loadscreen
 	virtual void reset() override;		///< Reset the system
-	virtual void update()
+	virtual void update() override
 	{
 		DEBUG_CRASH(("Call update(Int) instead.  This update isn't supported"));
 	};
@@ -204,7 +204,7 @@ class ShellGameLoadScreen : public LoadScreen
 
 	virtual void init( GameInfo *game ) override;		///< Init the loadscreen
 	virtual void reset() override;		///< Reset the system
-	virtual void update()
+	virtual void update() override
 	{
 		DEBUG_CRASH(("Call update(Int) instead.  This update isn't supported"));
 	};
@@ -232,7 +232,7 @@ class MultiPlayerLoadScreen : public LoadScreen
 
 	virtual void init( GameInfo *game ) override;		///< Init the loadscreen
 	virtual void reset() override;		///< Reset the system
-	virtual void update()
+	virtual void update() override
 	{
 		DEBUG_CRASH(("Call update(Int) instead.  This update isn't supported"));
 	};
@@ -263,7 +263,7 @@ class GameSpyLoadScreen : public LoadScreen
 
 	virtual void init( GameInfo *game ) override;		///< Init the loadscreen
 	virtual void reset() override;		///< Reset the system
-	virtual void update()
+	virtual void update() override
 	{
 		DEBUG_CRASH(("Call update(Int) instead.  This update isn't supported"));
 	};
@@ -301,7 +301,7 @@ class MapTransferLoadScreen : public LoadScreen
 
 	virtual void init( GameInfo *game ) override;		///< Init the loadscreen
 	virtual void reset() override;							///< Reset the system
-	virtual void update()
+	virtual void update() override
 	{
 		DEBUG_CRASH(("Call update(Int) instead.  This update isn't supported"));
 	};
diff --git a/Core/GameEngine/Include/GameClient/VideoPlayer.h b/Core/GameEngine/Include/GameClient/VideoPlayer.h
index 877bc98fabb..98a7d4c8d67 100644
--- a/Core/GameEngine/Include/GameClient/VideoPlayer.h
+++ b/Core/GameEngine/Include/GameClient/VideoPlayer.h
@@ -222,11 +222,6 @@ class VideoPlayerInterface : public SubsystemInterface
 {
 
 	public:
-
-		virtual void	init() = 0;														///< Initialize video playback
-		virtual void	reset() = 0;													///< Reset video playback
-		virtual void	update() = 0;													///< Services all video tasks. Should be called frequently
-
 		virtual void	deinit() = 0;													///< Close down player
 
 		virtual ~VideoPlayerInterface() override {};
diff --git a/Core/GameEngine/Include/GameNetwork/LANAPI.h b/Core/GameEngine/Include/GameNetwork/LANAPI.h
index c459ea52549..a0365be185a 100644
--- a/Core/GameEngine/Include/GameNetwork/LANAPI.h
+++ b/Core/GameEngine/Include/GameNetwork/LANAPI.h
@@ -60,10 +60,6 @@ class LANAPIInterface : public SubsystemInterface
 
 	virtual ~LANAPIInterface() override { };
 
-	virtual void init() = 0;															///< Initialize or re-initialize the instance
-	virtual void reset() = 0;															///< reset the logic system
-	virtual void update() = 0;														///< update the world
-
 	virtual void setIsActive(Bool isActive ) = 0;								///< Tell TheLAN whether or not the app is active.
 
 	// Possible types of chat messages
diff --git a/Core/GameEngine/Include/GameNetwork/LANGameInfo.h b/Core/GameEngine/Include/GameNetwork/LANGameInfo.h
index b600b4bbc2e..2d0cdbd202a 100644
--- a/Core/GameEngine/Include/GameNetwork/LANGameInfo.h
+++ b/Core/GameEngine/Include/GameNetwork/LANGameInfo.h
@@ -99,7 +99,7 @@ class LANGameInfo : public GameInfo
 
 	// Convenience functions that interface with the LANPlayer held in the slot list
 	virtual void resetAccepted() override;														///< Reset the accepted flag on all players
-	Bool amIHost();																///< Convenience function - is the local player the game host?
+	virtual Bool amIHost() const override;																///< Convenience function - is the local player the game host?
 
 	/// Get the IP of selected player or return 0
 	UnsignedInt getIP( int who )
diff --git a/Core/GameEngine/Include/GameNetwork/NetworkInterface.h b/Core/GameEngine/Include/GameNetwork/NetworkInterface.h
index 330abc971e2..c8333fd6d90 100644
--- a/Core/GameEngine/Include/GameNetwork/NetworkInterface.h
+++ b/Core/GameEngine/Include/GameNetwork/NetworkInterface.h
@@ -56,11 +56,6 @@ class NetworkInterface : public SubsystemInterface
 
 	static NetworkInterface * createNetwork();
 
-	//---------------------------------------------------------------------------------------
-	// SubsystemInterface functions
-	virtual void init() = 0;																		///< Initialize the network
-	virtual void reset() = 0;																		///< Re-initialize the network
-	virtual void update() = 0;																	///< Updates the network
 	virtual void liteupdate() = 0;															///< does a lightweight update for passing messages around.
 
 	virtual void setLocalAddress(UnsignedInt ip, UnsignedInt port) = 0;	///< Tell the network what local ip and port to bind to.
diff --git a/Core/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h b/Core/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h
index 31bb29b0c04..8e09086e5d0 100644
--- a/Core/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h
+++ b/Core/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h
@@ -110,9 +110,9 @@ class WebBrowser :
 	// IUnknown methods
 	//---------------------------------------------------------------------------
 	protected:
-		HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) IUNKNOWN_NOEXCEPT;
-		ULONG STDMETHODCALLTYPE AddRef() IUNKNOWN_NOEXCEPT;
-		ULONG STDMETHODCALLTYPE Release() IUNKNOWN_NOEXCEPT;
+		HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) IUNKNOWN_NOEXCEPT override;
+		ULONG STDMETHODCALLTYPE AddRef() IUNKNOWN_NOEXCEPT override;
+		ULONG STDMETHODCALLTYPE Release() IUNKNOWN_NOEXCEPT override;
 
 	//---------------------------------------------------------------------------
 	// IBrowserDispatch methods
diff --git a/Core/GameEngine/Source/Common/System/LocalFileSystem.cpp b/Core/GameEngine/Source/Common/System/LocalFileSystem.cpp
index 81373dc558f..0d45847ce78 100644
--- a/Core/GameEngine/Source/Common/System/LocalFileSystem.cpp
+++ b/Core/GameEngine/Source/Common/System/LocalFileSystem.cpp
@@ -92,12 +92,3 @@ LocalFileSystem *TheLocalFileSystem = nullptr;
 //----------------------------------------------------------------------------
 //         Public Functions
 //----------------------------------------------------------------------------
-
-void LocalFileSystem::init() {
-}
-
-void LocalFileSystem::reset() {
-}
-
-void LocalFileSystem::update() {
-}
diff --git a/Core/GameEngine/Source/GameNetwork/LANGameInfo.cpp b/Core/GameEngine/Source/GameNetwork/LANGameInfo.cpp
index 300d56a1e09..4bb80647e94 100644
--- a/Core/GameEngine/Source/GameNetwork/LANGameInfo.cpp
+++ b/Core/GameEngine/Source/GameNetwork/LANGameInfo.cpp
@@ -161,13 +161,13 @@ Int LANGameInfo::getSlotNum( UnicodeString userName )
 	return -1;
 }
 
-Bool LANGameInfo::amIHost()
+Bool LANGameInfo::amIHost() const
 {
 	DEBUG_ASSERTCRASH(m_inGame, ("Looking for game slot while not in game"));
 	if (!m_inGame)
 		return false;
 
-	return getLANSlot(0)->isLocalPlayer();
+	return getConstLANSlot(0)->isLocalPlayer();
 }
 
 void LANGameInfo::setMap( AsciiString mapName )
diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h
index 743fbec7771..0d836e56fa4 100644
--- a/Core/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h
@@ -105,7 +105,7 @@ class BaseHeightMapRenderObjClass : public RenderObjClass, public DX8_CleanupHoo
 	/////////////////////////////////////////////////////////////////////////////
 	virtual RenderObjClass *	Clone() const override;
 	virtual int						Class_ID() const override;
-	virtual void					Render(RenderInfoClass & rinfo) = 0;
+	virtual void					Render(RenderInfoClass & rinfo) override = 0;
 	virtual bool					Cast_Ray(RayCollisionTestClass & raytest) override; // This CANNOT be Bool, as it will not inherit properly if you make Bool == Int
 	virtual void					Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override;
 	virtual void					Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const override;
diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h
index 90961a1e362..e2f590b67fa 100644
--- a/Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h
@@ -357,7 +357,7 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
 	virtual void allocateShadows() override; ///< create shadow resources if not already present. Used by Options screen.
 
 #if defined(RTS_DEBUG)
-	virtual void getRenderCost(RenderCost & rc) const;  ///< estimates the render cost of this draw module
+	virtual void getRenderCost(RenderCost & rc) const override;  ///< estimates the render cost of this draw module
 	void getRenderCostRecursive(RenderCost & rc,RenderObjClass * robj) const;
 #endif
 
@@ -408,7 +408,7 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
 	virtual void setPauseAnimation(Bool pauseAnim) override;
 
 	//Kris: Manually set a drawable's current animation to specific frame.
-	virtual void setAnimationFrame( int frame );
+	virtual void setAnimationFrame( int frame ) override;
 
 	virtual void updateSubObjects() override;
 	virtual void showSubObject( const AsciiString& name, Bool show ) override;
diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h
index b8fa83fb0ed..05b521b5c40 100644
--- a/Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h
@@ -64,7 +64,7 @@ class W3DTreeDrawModuleData : public ModuleData
 	virtual ~W3DTreeDrawModuleData() override;
 	static void buildFieldParse(MultiIniFieldParse& p);
 	// ugh, hack
-	virtual const W3DTreeDrawModuleData* getAsW3DTreeDrawModuleData() const { return this; }
+	virtual const W3DTreeDrawModuleData* getAsW3DTreeDrawModuleData() const override { return this; }
 };
 
 //-------------------------------------------------------------------------------------------------
diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h
index d750911d75d..f721e0e401c 100644
--- a/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h
@@ -168,8 +168,8 @@ class W3DView : public View, public SubsystemInterface
 
 	virtual void forceRedraw() override;
 
-	virtual Bool isDoingScriptedCamera();
-	virtual void stopDoingScriptedCamera();
+	virtual Bool isDoingScriptedCamera() override;
+	virtual void stopDoingScriptedCamera() override;
 
 	virtual void setAngle( Real radians ) override;									///< Rotate the view around the vertical axis to the given angle (yaw)
 	virtual void setPitch( Real radians ) override;									///< Rotate the view around the horizontal axis to the given angle (pitch)
@@ -188,9 +188,9 @@ class W3DView : public View, public SubsystemInterface
  	virtual void rotateCamera(Real rotations, Int frames, Real easeIn, Real easeOut) override;					///< Rotate camera about current viewpoint.
 	virtual void rotateCameraTowardObject(ObjectID id, Int milliseconds, Int holdMilliseconds, Real easeIn, Real easeOut) override;	///< Rotate camera to face an object, and hold on it
 	virtual void rotateCameraTowardPosition(const Coord3D *pLoc, Int milliseconds, Real easeIn, Real easeOut, Bool reverseRotation) override;	///< Rotate camera to face a location.
-	virtual void cameraModFreezeTime(){ m_freezeTimeForCameraMovement = true;}					///< Freezes time during the next camera movement.
+	virtual void cameraModFreezeTime() override { m_freezeTimeForCameraMovement = true;}					///< Freezes time during the next camera movement.
 	virtual void cameraModFreezeAngle() override;												///< Freezes time during the next camera movement.
-	virtual Bool isTimeFrozen(){ return m_freezeTimeForCameraMovement;}					///< Freezes time during the next camera movement.
+	virtual Bool isTimeFrozen() override { return m_freezeTimeForCameraMovement;}					///< Freezes time during the next camera movement.
 	virtual void cameraModFinalZoom(Real finalZoom, Real easeIn, Real easeOut) override;	///< Final zoom for current camera movement.
 	virtual void cameraModRollingAverage(Int framesToAverage) override;			///< Number of frames to average movement for current camera movement.
 	virtual void cameraModFinalTimeMultiplier(Int finalMultiplier) override; ///< Final time multiplier for current camera movement.
@@ -314,7 +314,7 @@ class W3DView : public View, public SubsystemInterface
 	void clipCameraIntoAreaConstraints();
 	Bool isWithinCameraAreaConstraints() const;
 	Bool isWithinCameraHeightConstraints() const;
-	virtual void setUserControlled(Bool value);
+	virtual void setUserControlled(Bool value) override;
 	Bool hasScriptedState(ScriptedState state) const;
 	void addScriptedState(ScriptedState state);
 	void removeScriptedState(ScriptedState state);
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texture.h b/Core/Libraries/Source/WWVegas/WW3D2/texture.h
index 3c810c79f88..8a36a550130 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/texture.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/texture.h
@@ -261,7 +261,7 @@ class TextureBaseClass : public RefCountClass
 ** modes.
 **
 *************************************************************************/
-class TextureClass : public TextureBaseClass
+class TextureClass : public W3DMPO, public TextureBaseClass
 {
 	W3DMPO_GLUE(TextureClass)
 //	friend DX8Wrapper;
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/FilteredSound.h b/Core/Libraries/Source/WWVegas/WWAudio/FilteredSound.h
index 8ca3cc33c30..9bf3eb283a4 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/FilteredSound.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/FilteredSound.h
@@ -65,7 +65,7 @@ class FilteredSoundClass : public SoundPseudo3DClass
 		//////////////////////////////////////////////////////////////////////
 		//	Identification methods
 		//////////////////////////////////////////////////////////////////////
-		virtual SOUND_CLASSID	Get_Class_ID () { return CLASSID_FILTERED; }
+		virtual SOUND_CLASSID	Get_Class_ID () const override { return CLASSID_FILTERED; }
 
 		//////////////////////////////////////////////////////////////////////
 		//	Conversion methods
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h b/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h
index 0435d164daf..d8b53c5cc5b 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h
@@ -145,7 +145,7 @@ class Sound3DClass : public AudibleSoundClass
 		//	This is the distance where the sound can not be heard any longer.  (its vol is 0)
 		//
 		virtual void			Set_DropOff_Radius (float radius = 1) override;
-		virtual float			Get_DropOff_Radius ()  {return(m_DropOffRadius);}
+		virtual float			Get_DropOff_Radius () const override {return(m_DropOffRadius);}
 
 		// From PersistClass
 		virtual const PersistFactoryClass &	Get_Factory () const override;
diff --git a/Core/Libraries/Source/WWVegas/WWLib/always.h b/Core/Libraries/Source/WWVegas/WWLib/always.h
index 946f5dab695..c048ebdc385 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/always.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/always.h
@@ -144,7 +144,7 @@ private: \
 		return The##ARGCLASS##Pool; \
 	} \
 protected: \
-	virtual void glueEnforcer() const { } \
+	virtual void glueEnforcer() const override { } \
 public: \
 	inline void* operator new(size_t s) { return allocateFromW3DMemPool(getClassMemoryPool(), s); } \
 	inline void operator delete(void *p) { freeFromW3DMemPool(getClassMemoryPool(), p); } \
diff --git a/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.cpp b/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.cpp
index 1e248481bca..69f9fc3b437 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.cpp
@@ -218,9 +218,9 @@ bool CardinalSpline3DClass::Load(ChunkLoadClass &cload)
 /*
 ** CardinalSpline1DClass Implementation
 */
-int CardinalSpline1DClass::Add_Key(float point,float t)
+int CardinalSpline1DClass::Add_Key(float point,float t,unsigned int extra)
 {
-	int index = HermiteSpline1DClass::Add_Key(point,t);
+	int index = HermiteSpline1DClass::Add_Key(point,t,extra);
 	float tightness = 0.5f;
 	Tightness.Insert(index,tightness);
 	return index;
diff --git a/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h b/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h
index 3139354af87..432f579d9fd 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h
@@ -74,7 +74,7 @@ class CardinalSpline1DClass : public HermiteSpline1DClass
 {
 public:
 
-	virtual int			Add_Key(float point,float t);
+	virtual int			Add_Key(float point,float t,unsigned int extra=0) override;
 	virtual void		Remove_Key(int i) override;
 	virtual void		Clear_Keys() override;
 
diff --git a/Core/Tools/ParticleEditor/CColorAlphaDialog.h b/Core/Tools/ParticleEditor/CColorAlphaDialog.h
index b9d91788f33..6d8cb361f8b 100644
--- a/Core/Tools/ParticleEditor/CColorAlphaDialog.h
+++ b/Core/Tools/ParticleEditor/CColorAlphaDialog.h
@@ -40,7 +40,7 @@ class CColorAlphaDialog : public CDialog
 
 
 	protected:
-		virtual BOOL OnInitDialog();
+		virtual BOOL OnInitDialog() override;
 
 		afx_msg void OnColor1();
 		afx_msg void OnColor2();
diff --git a/Core/Tools/ParticleEditor/EmissionTypePanels.h b/Core/Tools/ParticleEditor/EmissionTypePanels.h
index 4fbd6295797..0870e0e0f84 100644
--- a/Core/Tools/ParticleEditor/EmissionTypePanels.h
+++ b/Core/Tools/ParticleEditor/EmissionTypePanels.h
@@ -48,14 +48,14 @@ class EmissionPanelPoint : public ISwapablePanel
 {
 	public:
 		enum {IDD = IDD_PSEd_EmissionPanelPoint};
-		virtual DWORD GetIDD() { return IDD; }
+		virtual DWORD GetIDD() override { return IDD; }
 		EmissionPanelPoint(UINT nIDTemplate = EmissionPanelPoint::IDD, CWnd* pParentWnd = nullptr);
 
-		void InitPanel();
+		virtual void InitPanel() override;
 
 		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );
+		virtual void performUpdate( IN Bool toUI ) override;
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -66,14 +66,14 @@ class EmissionPanelLine : public ISwapablePanel
 {
 	public:
 		enum {IDD = IDD_PSEd_EmissionPanelLine};
-		virtual DWORD GetIDD() { return IDD; }
+		virtual DWORD GetIDD() override { return IDD; }
 		EmissionPanelLine(UINT nIDTemplate = EmissionPanelLine::IDD, CWnd* pParentWnd = nullptr);
 
-		void InitPanel();
+		virtual void InitPanel() override;
 
 		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );
+		virtual void performUpdate( IN Bool toUI ) override;
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -84,14 +84,14 @@ class EmissionPanelBox : public ISwapablePanel
 {
 	public:
 		enum {IDD = IDD_PSEd_EmissionPanelBox};
-		virtual DWORD GetIDD() { return IDD; }
+		virtual DWORD GetIDD() override { return IDD; }
 		EmissionPanelBox(UINT nIDTemplate = EmissionPanelBox::IDD, CWnd* pParentWnd = nullptr);
 
-		void InitPanel();
+		virtual void InitPanel() override;
 
 		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );
+		virtual void performUpdate( IN Bool toUI ) override;
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -102,14 +102,14 @@ class EmissionPanelSphere : public ISwapablePanel
 {
 	public:
 		enum {IDD = IDD_PSEd_EmissionPanelSphere};
-		virtual DWORD GetIDD() { return IDD; }
+		virtual DWORD GetIDD() override { return IDD; }
 		EmissionPanelSphere(UINT nIDTemplate = EmissionPanelSphere::IDD, CWnd* pParentWnd = nullptr);
 
-		void InitPanel();
+		virtual void InitPanel() override;
 
 		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );
+		virtual void performUpdate( IN Bool toUI ) override;
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -120,14 +120,14 @@ class EmissionPanelCylinder : public ISwapablePanel
 {
 	public:
 		enum {IDD = IDD_PSEd_EmissionPanelCylinder};
-		virtual DWORD GetIDD() { return IDD; }
+		virtual DWORD GetIDD() override { return IDD; }
 		EmissionPanelCylinder(UINT nIDTemplate = EmissionPanelCylinder::IDD, CWnd* pParentWnd = nullptr);
 
-		void InitPanel();
+		virtual void InitPanel() override;
 
 		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );
+		virtual void performUpdate( IN Bool toUI ) override;
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
diff --git a/Core/Tools/ParticleEditor/ParticleTypePanels.h b/Core/Tools/ParticleEditor/ParticleTypePanels.h
index 0e1acec90b6..d7623c5c9cb 100644
--- a/Core/Tools/ParticleEditor/ParticleTypePanels.h
+++ b/Core/Tools/ParticleEditor/ParticleTypePanels.h
@@ -47,14 +47,14 @@ class ParticlePanelParticle : public ISwapablePanel
 {
 	public:
 		enum {IDD = IDD_PSEd_ParticlePanelParticle};
-		virtual DWORD GetIDD() { return IDD; }
+		virtual DWORD GetIDD() override { return IDD; }
 		ParticlePanelParticle(UINT nIDTemplate = ParticlePanelParticle::IDD, CWnd* pParentWnd = nullptr);
 
-		void InitPanel();
+		virtual void InitPanel() override;
 
 		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );
+		virtual void performUpdate( IN Bool toUI ) override;
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -65,15 +65,15 @@ class ParticlePanelDrawable : public ISwapablePanel
 {
 	public:
 		enum {IDD = IDD_PSEd_ParticlePanelDrawable};
-		virtual DWORD GetIDD() { return IDD; }
+		virtual DWORD GetIDD() override { return IDD; }
 		ParticlePanelDrawable(UINT nIDTemplate = ParticlePanelDrawable::IDD, CWnd* pParentWnd = nullptr);
 
-		void InitPanel();
+		virtual void InitPanel() override;
 		void clearAllThingTemplates();
 
 		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );
+		virtual void performUpdate( IN Bool toUI ) override;
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -84,14 +84,14 @@ class ParticlePanelStreak : public ParticlePanelParticle
 {
 	public:
 		enum {IDD = IDD_PSEd_ParticlePanelStreak};
-		virtual DWORD GetIDD() { return IDD; }
+		virtual DWORD GetIDD() override { return IDD; }
 		ParticlePanelStreak(UINT nIDTemplate = ParticlePanelStreak::IDD, CWnd* pParentWnd = nullptr);
 
-		void InitPanel();
+		virtual void InitPanel() override;
 
 		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );
+		virtual void performUpdate( IN Bool toUI ) override;
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
diff --git a/Core/Tools/ParticleEditor/VelocityTypePanels.h b/Core/Tools/ParticleEditor/VelocityTypePanels.h
index 0643c3d3d65..86ae01c13ae 100644
--- a/Core/Tools/ParticleEditor/VelocityTypePanels.h
+++ b/Core/Tools/ParticleEditor/VelocityTypePanels.h
@@ -48,14 +48,14 @@ class VelocityPanelOrtho : public ISwapablePanel
 {
 	public:
 		enum {IDD = IDD_PSEd_VelocityPanelOrtho};
-		virtual DWORD GetIDD() { return IDD; }
+		virtual DWORD GetIDD() override { return IDD; }
 		VelocityPanelOrtho(UINT nIDTemplate = VelocityPanelOrtho::IDD, CWnd* pParentWnd = nullptr);
 
-		void InitPanel();
+		virtual void InitPanel() override;
 
 		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );
+		virtual void performUpdate( IN Bool toUI ) override;
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -66,14 +66,14 @@ class VelocityPanelSphere : public ISwapablePanel
 {
 	public:
 		enum {IDD = IDD_PSEd_VelocityPanelSphere};
-		virtual DWORD GetIDD() { return IDD; }
+		virtual DWORD GetIDD() override { return IDD; }
 		VelocityPanelSphere(UINT nIDTemplate = VelocityPanelSphere::IDD, CWnd* pParentWnd = nullptr);
 
-		void InitPanel();
+		virtual void InitPanel() override;
 
 		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );
+		virtual void performUpdate( IN Bool toUI ) override;
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -84,14 +84,14 @@ class VelocityPanelHemisphere : public ISwapablePanel
 {
 	public:
 		enum {IDD = IDD_PSEd_VelocityPanelHemisphere};
-		virtual DWORD GetIDD() { return IDD; }
+		virtual DWORD GetIDD() override { return IDD; }
 		VelocityPanelHemisphere(UINT nIDTemplate = VelocityPanelHemisphere::IDD, CWnd* pParentWnd = nullptr);
 
-		void InitPanel();
+		virtual void InitPanel() override;
 
 		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );
+		void performUpdate( IN Bool toUI ) override;
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -102,14 +102,14 @@ class VelocityPanelCylinder : public ISwapablePanel
 {
 	public:
 		enum {IDD = IDD_PSEd_VelocityPanelCylinder};
-		virtual DWORD GetIDD() { return IDD; }
+		virtual DWORD GetIDD() override { return IDD; }
 		VelocityPanelCylinder(UINT nIDTemplate = VelocityPanelCylinder::IDD, CWnd* pParentWnd = nullptr);
 
-		void InitPanel();
+		virtual void InitPanel() override;
 
 		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );
+		virtual void performUpdate( IN Bool toUI ) override;
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -120,14 +120,14 @@ class VelocityPanelOutward : public ISwapablePanel
 {
 	public:
 		enum {IDD = IDD_PSEd_VelocityPanelOutward};
-		virtual DWORD GetIDD() { return IDD; }
+		virtual DWORD GetIDD() override { return IDD; }
 		VelocityPanelOutward(UINT nIDTemplate = VelocityPanelOutward::IDD, CWnd* pParentWnd = nullptr);
 
-		void InitPanel();
+		virtual void InitPanel() override;
 
 		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );
+		virtual void performUpdate( IN Bool toUI ) override;
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
diff --git a/Core/Tools/W3DView/AddToLineupDialog.h b/Core/Tools/W3DView/AddToLineupDialog.h
index 37c17c1f2db..116cc59e8ca 100644
--- a/Core/Tools/W3DView/AddToLineupDialog.h
+++ b/Core/Tools/W3DView/AddToLineupDialog.h
@@ -43,7 +43,7 @@ class CAddToLineupDialog : public CDialog
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CAddToLineupDialog)
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
 // Implementation
@@ -53,8 +53,8 @@ class CAddToLineupDialog : public CDialog
 
 	// Generated message map functions
 	//{{AFX_MSG(CAddToLineupDialog)
-	virtual BOOL OnInitDialog();
-	virtual void OnOK();
+	virtual BOOL OnInitDialog() override;
+	virtual void OnOK() override;
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 };
diff --git a/Core/Tools/W3DView/AggregateNameDialog.h b/Core/Tools/W3DView/AggregateNameDialog.h
index a01707f5281..17ab3ce93d0 100644
--- a/Core/Tools/W3DView/AggregateNameDialog.h
+++ b/Core/Tools/W3DView/AggregateNameDialog.h
@@ -42,7 +42,7 @@ class AggregateNameDialogClass : public CDialog
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(AggregateNameDialogClass)
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
 // Implementation
@@ -50,8 +50,8 @@ class AggregateNameDialogClass : public CDialog
 
 	// Generated message map functions
 	//{{AFX_MSG(AggregateNameDialogClass)
-	virtual void OnOK();
-	virtual BOOL OnInitDialog();
+	virtual void OnOK() override;
+	virtual BOOL OnInitDialog() override;
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
diff --git a/Core/Tools/W3DView/AmbientLightDialog.h b/Core/Tools/W3DView/AmbientLightDialog.h
index 7e6ae32f590..45ecaeadf56 100644
--- a/Core/Tools/W3DView/AmbientLightDialog.h
+++ b/Core/Tools/W3DView/AmbientLightDialog.h
@@ -43,8 +43,8 @@ class CAmbientLightDialog : public CDialog
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CAmbientLightDialog)
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
+	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
@@ -52,9 +52,9 @@ class CAmbientLightDialog : public CDialog
 
 	// Generated message map functions
 	//{{AFX_MSG(CAmbientLightDialog)
-	virtual BOOL OnInitDialog();
+	virtual BOOL OnInitDialog() override;
 	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
-	virtual void OnCancel();
+	virtual void OnCancel() override;
 	afx_msg void OnGrayscaleCheck();
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
diff --git a/Core/Tools/W3DView/AnimMixingPage.h b/Core/Tools/W3DView/AnimMixingPage.h
index 3f385e17cff..0a917858dc8 100644
--- a/Core/Tools/W3DView/AnimMixingPage.h
+++ b/Core/Tools/W3DView/AnimMixingPage.h
@@ -46,10 +46,10 @@ class CAnimMixingPage : public CPropertyPage
 	// ClassWizard generate virtual function overrides
 	//{{AFX_VIRTUAL(CAnimMixingPage)
 	public:
-	virtual void OnOK();
-	virtual BOOL OnKillActive();
+	virtual void OnOK() override;
+	virtual BOOL OnKillActive() override;
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
 // Implementation
@@ -61,7 +61,7 @@ class CAnimMixingPage : public CPropertyPage
 
 	// Generated message map functions
 	//{{AFX_MSG(CAnimMixingPage)
-	virtual BOOL OnInitDialog();
+	virtual BOOL OnInitDialog() override;
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
diff --git a/Core/Tools/W3DView/AnimReportPage.h b/Core/Tools/W3DView/AnimReportPage.h
index 6292fa1f73a..591aa82e269 100644
--- a/Core/Tools/W3DView/AnimReportPage.h
+++ b/Core/Tools/W3DView/AnimReportPage.h
@@ -47,9 +47,9 @@ class CAnimReportPage : public CPropertyPage
 	// ClassWizard generate virtual function overrides
 	//{{AFX_VIRTUAL(CAnimReportPage)
 	public:
-	virtual BOOL OnSetActive();
+	virtual BOOL OnSetActive() override;
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
 // Implementation
@@ -62,7 +62,7 @@ class CAnimReportPage : public CPropertyPage
 
 	// Generated message map functions
 	//{{AFX_MSG(CAnimReportPage)
-	virtual BOOL OnInitDialog();
+	virtual BOOL OnInitDialog() override;
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
diff --git a/Core/Tools/W3DView/AnimatedSoundOptionsDialog.h b/Core/Tools/W3DView/AnimatedSoundOptionsDialog.h
index fad4c447e14..53322030790 100644
--- a/Core/Tools/W3DView/AnimatedSoundOptionsDialog.h
+++ b/Core/Tools/W3DView/AnimatedSoundOptionsDialog.h
@@ -41,7 +41,7 @@ class AnimatedSoundOptionsDialogClass : public CDialog
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(AnimatedSoundOptionsDialogClass)
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
 // Implementation
@@ -51,8 +51,8 @@ class AnimatedSoundOptionsDialogClass : public CDialog
 	//{{AFX_MSG(AnimatedSoundOptionsDialogClass)
 	afx_msg void OnSoundDefinitionLibraryBrowseButton();
 	afx_msg void OnSoundIniBrowseButton();
-	virtual void OnOK();
-	virtual BOOL OnInitDialog();
+	virtual void OnOK() override;
+	virtual BOOL OnInitDialog() override;
 	afx_msg void OnSoundPathBrowseButton();
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
diff --git a/Core/Tools/W3DView/AnimationPropPage.h b/Core/Tools/W3DView/AnimationPropPage.h
index 0e035b0593d..cd10d5cd399 100644
--- a/Core/Tools/W3DView/AnimationPropPage.h
+++ b/Core/Tools/W3DView/AnimationPropPage.h
@@ -45,14 +45,14 @@ class CAnimationPropPage : public CPropertyPage
 	// ClassWizard generate virtual function overrides
 	//{{AFX_VIRTUAL(CAnimationPropPage)
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
 // Implementation
 protected:
 	// Generated message map functions
 	//{{AFX_MSG(CAnimationPropPage)
-	virtual BOOL OnInitDialog();
+	virtual BOOL OnInitDialog() override;
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
diff --git a/Core/Tools/W3DView/AnimationSpeed.h b/Core/Tools/W3DView/AnimationSpeed.h
index e0626c745ea..f7bc4f1e320 100644
--- a/Core/Tools/W3DView/AnimationSpeed.h
+++ b/Core/Tools/W3DView/AnimationSpeed.h
@@ -41,7 +41,7 @@ class CAnimationSpeed : public CDialog
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CAnimationSpeed)
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
 // Implementation
@@ -49,7 +49,7 @@ class CAnimationSpeed : public CDialog
 
 	// Generated message map functions
 	//{{AFX_MSG(CAnimationSpeed)
-	virtual BOOL OnInitDialog();
+	virtual BOOL OnInitDialog() override;
 	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
 	afx_msg void OnDestroy();
 	afx_msg void OnBlend();
diff --git a/Core/Tools/W3DView/BackgroundBMPDialog.h b/Core/Tools/W3DView/BackgroundBMPDialog.h
index 569995bb45f..514cb4d54b9 100644
--- a/Core/Tools/W3DView/BackgroundBMPDialog.h
+++ b/Core/Tools/W3DView/BackgroundBMPDialog.h
@@ -41,7 +41,7 @@ class CBackgroundBMPDialog : public CDialog
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CBackgroundBMPDialog)
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
 // Implementation
@@ -49,8 +49,8 @@ class CBackgroundBMPDialog : public CDialog
 
 	// Generated message map functions
 	//{{AFX_MSG(CBackgroundBMPDialog)
-	virtual BOOL OnInitDialog();
-	virtual void OnOK();
+	virtual BOOL OnInitDialog() override;
+	virtual void OnOK() override;
 	afx_msg void OnBrowse();
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
diff --git a/Core/Tools/W3DView/BackgroundColorDialog.h b/Core/Tools/W3DView/BackgroundColorDialog.h
index 4b6a1f31a97..b1e8b1184f7 100644
--- a/Core/Tools/W3DView/BackgroundColorDialog.h
+++ b/Core/Tools/W3DView/BackgroundColorDialog.h
@@ -43,8 +43,8 @@ class CBackgroundColorDialog : public CDialog
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CBackgroundColorDialog)
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
+	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
@@ -52,10 +52,10 @@ class CBackgroundColorDialog : public CDialog
 
 	// Generated message map functions
 	//{{AFX_MSG(CBackgroundColorDialog)
-	virtual BOOL OnInitDialog();
+	virtual BOOL OnInitDialog() override;
 	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
 	afx_msg void OnGrayscaleCheck();
-	virtual void OnCancel();
+	virtual void OnCancel() override;
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
diff --git a/Core/Tools/W3DView/BackgroundObjectDialog.h b/Core/Tools/W3DView/BackgroundObjectDialog.h
index 2b8963d7fe9..d6cdab1509a 100644
--- a/Core/Tools/W3DView/BackgroundObjectDialog.h
+++ b/Core/Tools/W3DView/BackgroundObjectDialog.h
@@ -41,7 +41,7 @@ class CBackgroundObjectDialog : public CDialog
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CBackgroundObjectDialog)
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
 // Implementation
@@ -49,8 +49,8 @@ class CBackgroundObjectDialog : public CDialog
 
 	// Generated message map functions
 	//{{AFX_MSG(CBackgroundObjectDialog)
-	virtual BOOL OnInitDialog();
-	virtual void OnOK();
+	virtual BOOL OnInitDialog() override;
+	virtual void OnOK() override;
 	afx_msg void OnItemChangedHierarchyList(NMHDR* pNMHDR, LRESULT* pResult);
 	afx_msg void OnClear();
 	//}}AFX_MSG
diff --git a/Core/Tools/W3DView/BoneMgrDialog.h b/Core/Tools/W3DView/BoneMgrDialog.h
index 973dec337b6..5cc0d9458c4 100644
--- a/Core/Tools/W3DView/BoneMgrDialog.h
+++ b/Core/Tools/W3DView/BoneMgrDialog.h
@@ -51,7 +51,7 @@ class BoneMgrDialogClass : public CDialog
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(BoneMgrDialogClass)
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
 // Implementation
@@ -59,12 +59,12 @@ class BoneMgrDialogClass : public CDialog
 
 	// Generated message map functions
 	//{{AFX_MSG(BoneMgrDialogClass)
-	virtual BOOL OnInitDialog();
+	virtual BOOL OnInitDialog() override;
 	afx_msg void OnSelchangedBoneTree(NMHDR* pNMHDR, LRESULT* pResult);
 	afx_msg void OnSelchangeObjectCombo();
 	afx_msg void OnDestroy();
-	virtual void OnOK();
-	virtual void OnCancel();
+	virtual void OnOK() override;
+	virtual void OnCancel() override;
 	afx_msg void OnAttachButton();
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
diff --git a/Core/Tools/W3DView/CameraDistanceDialog.h b/Core/Tools/W3DView/CameraDistanceDialog.h
index 9fb2f377479..67c0f5a6f61 100644
--- a/Core/Tools/W3DView/CameraDistanceDialog.h
+++ b/Core/Tools/W3DView/CameraDistanceDialog.h
@@ -42,8 +42,8 @@ class CameraDistanceDialogClass : public CDialog
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CameraDistanceDialogClass)
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
+	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
@@ -51,8 +51,8 @@ class CameraDistanceDialogClass : public CDialog
 
 	// Generated message map functions
 	//{{AFX_MSG(CameraDistanceDialogClass)
-	virtual BOOL OnInitDialog();
-	virtual void OnOK();
+	virtual BOOL OnInitDialog() override;
+	virtual void OnOK() override;
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 };
diff --git a/Core/Tools/W3DView/CameraSettingsDialog.h b/Core/Tools/W3DView/CameraSettingsDialog.h
index ba447859f3d..b8a69e52eab 100644
--- a/Core/Tools/W3DView/CameraSettingsDialog.h
+++ b/Core/Tools/W3DView/CameraSettingsDialog.h
@@ -45,9 +45,9 @@ class CameraSettingsDialogClass : public CDialog
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CameraSettingsDialogClass)
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
+	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override;
+	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
@@ -55,8 +55,8 @@ class CameraSettingsDialogClass : public CDialog
 
 	// Generated message map functions
 	//{{AFX_MSG(CameraSettingsDialogClass)
-	virtual BOOL OnInitDialog();
-	virtual void OnOK();
+	virtual BOOL OnInitDialog() override;
+	virtual void OnOK() override;
 	afx_msg void OnFovCheck();
 	afx_msg void OnClipPlaneCheck();
 	afx_msg void OnReset();
diff --git a/Core/Tools/W3DView/ColorBar.h b/Core/Tools/W3DView/ColorBar.h
index 67eac6915db..a66c9a0af46 100644
--- a/Core/Tools/W3DView/ColorBar.h
+++ b/Core/Tools/W3DView/ColorBar.h
@@ -103,7 +103,7 @@ class ColorBarClass : public CWnd
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(ColorBarClass)
 	public:
-	virtual BOOL Create(LPCTSTR lpszClassName, LPCTSTR lpszWindowName, DWORD dwStyle, const RECT& rect, CWnd* pParentWnd, UINT nID, CCreateContext* pContext = nullptr);
+	virtual BOOL Create(LPCTSTR lpszClassName, LPCTSTR lpszWindowName, DWORD dwStyle, const RECT& rect, CWnd* pParentWnd, UINT nID, CCreateContext* pContext = nullptr) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
diff --git a/Core/Tools/W3DView/ColorPicker.h b/Core/Tools/W3DView/ColorPicker.h
index e8fa7256812..fa6d833158c 100644
--- a/Core/Tools/W3DView/ColorPicker.h
+++ b/Core/Tools/W3DView/ColorPicker.h
@@ -77,7 +77,7 @@ class ColorPickerClass : public CWnd
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(ColorPickerClass)
 	public:
-	virtual BOOL Create(LPCTSTR lpszClassName, LPCTSTR lpszWindowName, DWORD dwStyle, const RECT& rect, CWnd* pParentWnd, UINT nID, CCreateContext* pContext = nullptr);
+	virtual BOOL Create(LPCTSTR lpszClassName, LPCTSTR lpszWindowName, DWORD dwStyle, const RECT& rect, CWnd* pParentWnd, UINT nID, CCreateContext* pContext = nullptr) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
diff --git a/Core/Tools/W3DView/ColorPickerDialogClass.h b/Core/Tools/W3DView/ColorPickerDialogClass.h
index fd5a1156950..a8da11ec6b0 100644
--- a/Core/Tools/W3DView/ColorPickerDialogClass.h
+++ b/Core/Tools/W3DView/ColorPickerDialogClass.h
@@ -54,11 +54,11 @@ class ColorPickerDialogClass : public CDialog
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(ColorPickerDialogClass)
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
-	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
-	virtual void PostNcDestroy();
+	virtual void DoDataExchange(CDataExchange* pDX)  override;    // DDX/DDV support
+	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override;
+	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam) override;
+	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
+	virtual void PostNcDestroy() override;
 	//}}AFX_VIRTUAL
 
 // Implementation
@@ -66,7 +66,7 @@ class ColorPickerDialogClass : public CDialog
 
 	// Generated message map functions
 	//{{AFX_MSG(ColorPickerDialogClass)
-	virtual BOOL OnInitDialog();
+	virtual BOOL OnInitDialog() override;
 	afx_msg void OnReset();
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
diff --git a/Core/Tools/W3DView/ColorSelectionDialog.h b/Core/Tools/W3DView/ColorSelectionDialog.h
index d6d4a2972cf..ecc86dfe697 100644
--- a/Core/Tools/W3DView/ColorSelectionDialog.h
+++ b/Core/Tools/W3DView/ColorSelectionDialog.h
@@ -52,7 +52,7 @@ class ColorSelectionDialogClass : public CDialog
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(ColorSelectionDialogClass)
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
 // Implementation
@@ -60,8 +60,8 @@ class ColorSelectionDialogClass : public CDialog
 
 	// Generated message map functions
 	//{{AFX_MSG(ColorSelectionDialogClass)
-	virtual BOOL OnInitDialog();
-	virtual void OnOK();
+	virtual BOOL OnInitDialog() override;
+	virtual void OnOK() override;
 	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
 	afx_msg void OnPaint();
 	afx_msg void OnGrayscaleCheck();
diff --git a/Core/Tools/W3DView/DataTreeView.h b/Core/Tools/W3DView/DataTreeView.h
index 17a315c5af6..9528406d324 100644
--- a/Core/Tools/W3DView/DataTreeView.h
+++ b/Core/Tools/W3DView/DataTreeView.h
@@ -50,18 +50,18 @@ class CDataTreeView : public CTreeView
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CDataTreeView)
 	public:
-	virtual void OnInitialUpdate();
+	virtual void OnInitialUpdate() override;
 	protected:
-	virtual void OnDraw(CDC* pDC);      // overridden to draw this view
-	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
+	virtual void OnDraw(CDC* pDC) override;      // overridden to draw this view
+	virtual BOOL PreCreateWindow(CREATESTRUCT& cs) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
 protected:
-	virtual ~CDataTreeView();
+	virtual ~CDataTreeView() override;
 #ifdef RTS_DEBUG
-	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
+	virtual void AssertValid() const override;
+	virtual void Dump(CDumpContext& dc) const override;
 #endif
 
 	// Generated message map functions
diff --git a/Core/Tools/W3DView/DeviceSelectionDialog.h b/Core/Tools/W3DView/DeviceSelectionDialog.h
index 0b8dd1c6e95..81a2493b678 100644
--- a/Core/Tools/W3DView/DeviceSelectionDialog.h
+++ b/Core/Tools/W3DView/DeviceSelectionDialog.h
@@ -41,9 +41,9 @@ class CDeviceSelectionDialog : public CDialog
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CDeviceSelectionDialog)
 	public:
-	virtual int DoModal();
+	virtual int DoModal() override;
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
 // Implementation
@@ -51,9 +51,9 @@ class CDeviceSelectionDialog : public CDialog
 
 	// Generated message map functions
 	//{{AFX_MSG(CDeviceSelectionDialog)
-	virtual BOOL OnInitDialog();
+	virtual BOOL OnInitDialog() override;
 	afx_msg void OnSelchangeRenderDeviceCombo();
-	virtual void OnOK();
+	virtual void OnOK() override;
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
diff --git a/Core/Tools/W3DView/DialogToolbar.h b/Core/Tools/W3DView/DialogToolbar.h
index fa464eadf14..c614a35d13a 100644
--- a/Core/Tools/W3DView/DialogToolbar.h
+++ b/Core/Tools/W3DView/DialogToolbar.h
@@ -68,8 +68,8 @@ class DialogToolbarClass : public CToolBar
 // Implementation
 protected:
 #ifdef RTS_DEBUG
-	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
+	virtual void AssertValid() const override;
+	virtual void Dump(CDumpContext& dc) const override;
 #endif
 
 	// Generated message map functions
diff --git a/Core/Tools/W3DView/EditLODDialog.h b/Core/Tools/W3DView/EditLODDialog.h
index 67e00330a22..e7dd98fb138 100644
--- a/Core/Tools/W3DView/EditLODDialog.h
+++ b/Core/Tools/W3DView/EditLODDialog.h
@@ -43,7 +43,7 @@ class CEditLODDialog : public CDialog
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CEditLODDialog)
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
 // Implementation
@@ -51,9 +51,9 @@ class CEditLODDialog : public CDialog
 
 	// Generated message map functions
 	//{{AFX_MSG(CEditLODDialog)
-	virtual BOOL OnInitDialog();
-	virtual void OnOK();
-	virtual void OnCancel();
+	virtual BOOL OnInitDialog() override;
+	virtual void OnOK() override;
+	virtual void OnCancel() override;
 	afx_msg void OnDeltaposSwitchUpSpin(NMHDR* pNMHDR, LRESULT* pResult);
 	afx_msg void OnDeltaposSwitchDnSpin(NMHDR* pNMHDR, LRESULT* pResult);
 	afx_msg void OnItemChangedHierarchyList(NMHDR* pNMHDR, LRESULT* pResult);
diff --git a/Core/Tools/W3DView/EmitterColorPropPage.h b/Core/Tools/W3DView/EmitterColorPropPage.h
index 8e6178808f1..3f4a95b4739 100644
--- a/Core/Tools/W3DView/EmitterColorPropPage.h
+++ b/Core/Tools/W3DView/EmitterColorPropPage.h
@@ -55,19 +55,19 @@ class EmitterColorPropPageClass : public CPropertyPage
 	// ClassWizard generate virtual function overrides
 	//{{AFX_VIRTUAL(EmitterColorPropPageClass)
 	public:
-	virtual BOOL OnApply();
-	virtual void OnCancel();
+	virtual BOOL OnApply() override;
+	virtual void OnCancel() override;
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
+	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override;
+	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
 protected:
 	// Generated message map functions
 	//{{AFX_MSG(EmitterColorPropPageClass)
-	virtual BOOL OnInitDialog();
+	virtual BOOL OnInitDialog() override;
 	afx_msg void OnDestroy();
 	afx_msg void OnDeltaposRedRandomSpin(NMHDR* pNMHDR, LRESULT* pResult);
 	//}}AFX_MSG
diff --git a/Core/Tools/W3DView/EmitterFramePropPage.h b/Core/Tools/W3DView/EmitterFramePropPage.h
index 6c76c34ee2a..8cb0bb60b7c 100644
--- a/Core/Tools/W3DView/EmitterFramePropPage.h
+++ b/Core/Tools/W3DView/EmitterFramePropPage.h
@@ -50,18 +50,18 @@ class EmitterFramePropPageClass : public CPropertyPage
 	// ClassWizard generate virtual function overrides
 	//{{AFX_VIRTUAL(EmitterFramePropPageClass)
 	public:
-	virtual BOOL OnApply();
+	virtual BOOL OnApply() override;
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
+	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override;
+	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
 protected:
 	// Generated message map functions
 	//{{AFX_MSG(EmitterFramePropPageClass)
-	virtual BOOL OnInitDialog();
+	virtual BOOL OnInitDialog() override;
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
diff --git a/Core/Tools/W3DView/EmitterGeneralPropPage.h b/Core/Tools/W3DView/EmitterGeneralPropPage.h
index d428683a3e8..1da75ac1447 100644
--- a/Core/Tools/W3DView/EmitterGeneralPropPage.h
+++ b/Core/Tools/W3DView/EmitterGeneralPropPage.h
@@ -53,18 +53,18 @@ class EmitterGeneralPropPageClass : public CPropertyPage
 	// ClassWizard generate virtual function overrides
 	//{{AFX_VIRTUAL(EmitterGeneralPropPageClass)
 	public:
-	virtual BOOL OnApply();
+	virtual BOOL OnApply() override;
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
+	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override;
+	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
 protected:
 	// Generated message map functions
 	//{{AFX_MSG(EmitterGeneralPropPageClass)
-	virtual BOOL OnInitDialog();
+	virtual BOOL OnInitDialog() override;
 	afx_msg void OnBrowseButton();
 	afx_msg void OnChangeFilenameEdit();
 	afx_msg void OnChangeNameEdit();
diff --git a/Core/Tools/W3DView/EmitterLineGroupPropPage.h b/Core/Tools/W3DView/EmitterLineGroupPropPage.h
index 62a12f62d40..6d9e44f6235 100644
--- a/Core/Tools/W3DView/EmitterLineGroupPropPage.h
+++ b/Core/Tools/W3DView/EmitterLineGroupPropPage.h
@@ -52,16 +52,16 @@ class EmitterLineGroupPropPageClass : public CPropertyPage
 	// ClassWizard generate virtual function overrides
 	//{{AFX_VIRTUAL(EmitterLineGroupPropPageClass)
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
-	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
+	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
+	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
 protected:
 	// Generated message map functions
 	//{{AFX_MSG(EmitterLineGroupPropPageClass)
-	virtual BOOL OnInitDialog();
+	virtual BOOL OnInitDialog() override;
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
diff --git a/Core/Tools/W3DView/EmitterLinePropPage.h b/Core/Tools/W3DView/EmitterLinePropPage.h
index 6b3907d0a27..8e6566b1c0e 100644
--- a/Core/Tools/W3DView/EmitterLinePropPage.h
+++ b/Core/Tools/W3DView/EmitterLinePropPage.h
@@ -55,18 +55,18 @@ class EmitterLinePropPageClass : public CPropertyPage
 	// ClassWizard generate virtual function overrides
 	//{{AFX_VIRTUAL(EmitterLinePropPageClass)
 	public:
-	virtual BOOL OnApply();
+	virtual BOOL OnApply() override;
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
-	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
+	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
+	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
 protected:
 	// Generated message map functions
 	//{{AFX_MSG(EmitterLinePropPageClass)
-	virtual BOOL OnInitDialog();
+	virtual BOOL OnInitDialog() override;
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
diff --git a/Core/Tools/W3DView/EmitterParticlePropPage.h b/Core/Tools/W3DView/EmitterParticlePropPage.h
index bd263861c75..bf635210846 100644
--- a/Core/Tools/W3DView/EmitterParticlePropPage.h
+++ b/Core/Tools/W3DView/EmitterParticlePropPage.h
@@ -54,19 +54,19 @@ class EmitterParticlePropPageClass : public CPropertyPage
 	// ClassWizard generate virtual function overrides
 	//{{AFX_VIRTUAL(EmitterParticlePropPageClass)
 	public:
-	virtual BOOL OnApply();
+	virtual BOOL OnApply() override;
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
-	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
+	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam) override;
+	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override;
+	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
 protected:
 	// Generated message map functions
 	//{{AFX_MSG(EmitterParticlePropPageClass)
-	virtual BOOL OnInitDialog();
+	virtual BOOL OnInitDialog() override;
 	afx_msg void OnSpecifyCreationVolume();
 	afx_msg void OnMaxParticlesCheck();
 	//}}AFX_MSG
diff --git a/Core/Tools/W3DView/EmitterPhysicsPropPage.h b/Core/Tools/W3DView/EmitterPhysicsPropPage.h
index 23db23dcd65..af1c6945779 100644
--- a/Core/Tools/W3DView/EmitterPhysicsPropPage.h
+++ b/Core/Tools/W3DView/EmitterPhysicsPropPage.h
@@ -58,18 +58,18 @@ class EmitterPhysicsPropPageClass : public CPropertyPage
 	// ClassWizard generate virtual function overrides
 	//{{AFX_VIRTUAL(EmitterPhysicsPropPageClass)
 	public:
-	virtual BOOL OnApply();
+	virtual BOOL OnApply() override;
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
+	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override;
+	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
 protected:
 	// Generated message map functions
 	//{{AFX_MSG(EmitterPhysicsPropPageClass)
-	virtual BOOL OnInitDialog();
+	virtual BOOL OnInitDialog() override;
 	afx_msg void OnSpecifyVelocityRandom();
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
diff --git a/Core/Tools/W3DView/EmitterRotationPropPage.h b/Core/Tools/W3DView/EmitterRotationPropPage.h
index e7b9a3fb5cb..1ac654ee7f7 100644
--- a/Core/Tools/W3DView/EmitterRotationPropPage.h
+++ b/Core/Tools/W3DView/EmitterRotationPropPage.h
@@ -52,16 +52,16 @@ class EmitterRotationPropPageClass : public CPropertyPage
 	// ClassWizard generate virtual function overrides
 	//{{AFX_VIRTUAL(EmitterRotationPropPageClass)
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
+	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override;
+	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
 protected:
 	// Generated message map functions
 	//{{AFX_MSG(EmitterRotationPropPageClass)
-	virtual BOOL OnInitDialog();
+	virtual BOOL OnInitDialog() override;
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
diff --git a/Core/Tools/W3DView/EmitterSizePropPage.h b/Core/Tools/W3DView/EmitterSizePropPage.h
index 75de00909a6..75733ab3477 100644
--- a/Core/Tools/W3DView/EmitterSizePropPage.h
+++ b/Core/Tools/W3DView/EmitterSizePropPage.h
@@ -52,18 +52,18 @@ class EmitterSizePropPageClass : public CPropertyPage
 	// ClassWizard generate virtual function overrides
 	//{{AFX_VIRTUAL(EmitterSizePropPageClass)
 	public:
-	virtual BOOL OnApply();
+	virtual BOOL OnApply() override;
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
+	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override;
+	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
 protected:
 	// Generated message map functions
 	//{{AFX_MSG(EmitterSizePropPageClass)
-	virtual BOOL OnInitDialog();
+	virtual BOOL OnInitDialog() override;
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
diff --git a/Core/Tools/W3DView/EmitterUserPropPage.h b/Core/Tools/W3DView/EmitterUserPropPage.h
index 36438918153..accdb6e5324 100644
--- a/Core/Tools/W3DView/EmitterUserPropPage.h
+++ b/Core/Tools/W3DView/EmitterUserPropPage.h
@@ -49,16 +49,16 @@ class EmitterUserPropPageClass : public CPropertyPage
 	// ClassWizard generate virtual function overrides
 	//{{AFX_VIRTUAL(EmitterUserPropPageClass)
 	public:
-	virtual BOOL OnApply();
+	virtual BOOL OnApply() override;
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
 // Implementation
 protected:
 	// Generated message map functions
 	//{{AFX_MSG(EmitterUserPropPageClass)
-	virtual BOOL OnInitDialog();
+	virtual BOOL OnInitDialog() override;
 	afx_msg void OnChangeProgrammerSettingsEdit();
 	afx_msg void OnSelchangeTypeCombo();
 	//}}AFX_MSG
diff --git a/Core/Tools/W3DView/GraphicView.h b/Core/Tools/W3DView/GraphicView.h
index c89f77dd430..b63fcd0649c 100644
--- a/Core/Tools/W3DView/GraphicView.h
+++ b/Core/Tools/W3DView/GraphicView.h
@@ -58,18 +58,18 @@ class CGraphicView : public CView
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CGraphicView)
 	public:
-	virtual void OnInitialUpdate();
+	virtual void OnInitialUpdate() override;
 	protected:
-	virtual void OnDraw(CDC* pDC);      // overridden to draw this view
-	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
+	virtual void OnDraw(CDC* pDC) override;      // overridden to draw this view
+	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
 protected:
 	virtual ~CGraphicView();
 #ifdef RTS_DEBUG
-	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
+	virtual void AssertValid() const override;
+	virtual void Dump(CDumpContext& dc) const override;
 #endif
 
 	// Generated message map functions
diff --git a/Core/Tools/W3DView/MainFrm.h b/Core/Tools/W3DView/MainFrm.h
index e96dfae1e11..14d17a6b317 100644
--- a/Core/Tools/W3DView/MainFrm.h
+++ b/Core/Tools/W3DView/MainFrm.h
@@ -51,20 +51,20 @@ class CMainFrame : public CFrameWnd
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CMainFrame)
 	public:
-	virtual BOOL OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext* pContext);
-	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
-	virtual BOOL OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo);
+	virtual BOOL OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext* pContext) override;
+	virtual BOOL PreCreateWindow(CREATESTRUCT& cs) override;
+	virtual BOOL OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo) override;
 	protected:
-	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
+	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam) override;
+	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
 public:
-	virtual ~CMainFrame();
+	virtual ~CMainFrame() override;
 #ifdef RTS_DEBUG
-	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
+	virtual void AssertValid() const override;
+	virtual void Dump(CDumpContext& dc) const override;
 #endif
 
 protected:  // control bar embedded members
diff --git a/Core/Tools/W3DView/OpacitySettingsDialog.h b/Core/Tools/W3DView/OpacitySettingsDialog.h
index 556a708f96c..eea9897187a 100644
--- a/Core/Tools/W3DView/OpacitySettingsDialog.h
+++ b/Core/Tools/W3DView/OpacitySettingsDialog.h
@@ -44,7 +44,7 @@ class OpacitySettingsDialogClass : public CDialog
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(OpacitySettingsDialogClass)
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
 // Implementation
@@ -52,8 +52,8 @@ class OpacitySettingsDialogClass : public CDialog
 
 	// Generated message map functions
 	//{{AFX_MSG(OpacitySettingsDialogClass)
-	virtual BOOL OnInitDialog();
-	virtual void OnOK();
+	virtual BOOL OnInitDialog() override;
+	virtual void OnOK() override;
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
diff --git a/Core/Tools/W3DView/ParticleFrameKeyDialog.h b/Core/Tools/W3DView/ParticleFrameKeyDialog.h
index b73bed90b76..168441c2cdc 100644
--- a/Core/Tools/W3DView/ParticleFrameKeyDialog.h
+++ b/Core/Tools/W3DView/ParticleFrameKeyDialog.h
@@ -41,8 +41,8 @@ class ParticleFrameKeyDialogClass : public CDialog
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(ParticleFrameKeyDialogClass)
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
+	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
@@ -50,8 +50,8 @@ class ParticleFrameKeyDialogClass : public CDialog
 
 	// Generated message map functions
 	//{{AFX_MSG(ParticleFrameKeyDialogClass)
-	virtual BOOL OnInitDialog();
-	virtual void OnOK();
+	virtual BOOL OnInitDialog() override;
+	virtual void OnOK() override;
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
diff --git a/Core/Tools/W3DView/RestrictedFileDialog.h b/Core/Tools/W3DView/RestrictedFileDialog.h
index 949055d76bc..07c20fe87e4 100644
--- a/Core/Tools/W3DView/RestrictedFileDialog.h
+++ b/Core/Tools/W3DView/RestrictedFileDialog.h
@@ -42,9 +42,9 @@ class RestrictedFileDialogClass : public CFileDialog
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
-	virtual void			OnFileNameChange ();
-	virtual BOOL			OnFileNameOK ();
-	virtual void			OnInitDone ();
+	virtual void			OnFileNameChange () override;
+	virtual BOOL			OnFileNameOK () override;
+	virtual void			OnInitDone () override;
 
 	private:
 		CString				m_ExpectedFilename;
diff --git a/Core/Tools/W3DView/SoundEditDialog.h b/Core/Tools/W3DView/SoundEditDialog.h
index c91f66d403d..eb62ea3496f 100644
--- a/Core/Tools/W3DView/SoundEditDialog.h
+++ b/Core/Tools/W3DView/SoundEditDialog.h
@@ -63,8 +63,8 @@ class SoundEditDialogClass : public CDialog
 // Implementation
 protected:
 #ifdef RTS_DEBUG
-	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
+	virtual void AssertValid() const override;
+	virtual void Dump(CDumpContext& dc) const override;
 #endif
 
 	// Generated message map functions
diff --git a/Core/Tools/W3DView/Toolbar.h b/Core/Tools/W3DView/Toolbar.h
index ad0ce864d21..fbab2af7cb9 100644
--- a/Core/Tools/W3DView/Toolbar.h
+++ b/Core/Tools/W3DView/Toolbar.h
@@ -54,7 +54,7 @@ class CFancyToolbar : public CControlBar
 	//{{AFX_VIRTUAL(CFancyToolbar)
 	public:
 	virtual void OnDraw(CDC* pDC);  // overridden to draw this view
-	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
+	virtual BOOL PreCreateWindow(CREATESTRUCT& cs) override;
 	protected:
 	//}}AFX_VIRTUAL
 
@@ -93,13 +93,13 @@ class CFancyToolbar : public CControlBar
         //
         //  Required methods
         //
-        CSize CalcFixedLayout (BOOL, BOOL)
+        virtual CSize CalcFixedLayout (BOOL, BOOL) override
             { return CSize (m_iButtons*BUTTON_WIDTH + BORDER_LEFT + BORDER_RIGHT, BUTTON_HEIGHT + BORDER_TOP + BORDER_BOTTOM); }
 
-        CSize CalcDynamicLayout( int nLength, DWORD dwMode )
+        virtual CSize CalcDynamicLayout( int nLength, DWORD dwMode ) override
             { return CSize (m_iButtons*BUTTON_WIDTH + BORDER_LEFT + BORDER_RIGHT, BUTTON_HEIGHT + BORDER_TOP + BORDER_BOTTOM); }
 
-        void OnUpdateCmdUI (class CFrameWnd*, int) {}
+        virtual void OnUpdateCmdUI (class CFrameWnd*, int) override {}
 
         //
         //  Creation routines
diff --git a/Core/Tools/W3DView/ViewerAssetMgr.h b/Core/Tools/W3DView/ViewerAssetMgr.h
index e2aae9c9675..e8e3235fc44 100644
--- a/Core/Tools/W3DView/ViewerAssetMgr.h
+++ b/Core/Tools/W3DView/ViewerAssetMgr.h
@@ -52,7 +52,7 @@ class ViewerAssetMgrClass : public WW3DAssetManager
 	//	Public constructors/destructors
 	///////////////////////////////////////////////////
 	ViewerAssetMgrClass () {}
-	virtual ~ViewerAssetMgrClass () {}
+	virtual ~ViewerAssetMgrClass () override {}
 
 	///////////////////////////////////////////////////
 	//	Public methods
@@ -61,7 +61,7 @@ class ViewerAssetMgrClass : public WW3DAssetManager
 	//
 	// Base class overrides
 	//
-	virtual bool						Load_3D_Assets (FileClass &w3dfile);
+	virtual bool						Load_3D_Assets (FileClass &w3dfile) override;
 	virtual TextureClass *			Get_Texture(const char * filename, MipCountType mip_level_count=MIP_LEVELS_ALL);
 
 	//
diff --git a/Core/Tools/W3DView/W3DView.h b/Core/Tools/W3DView/W3DView.h
index e7e3f1bde3c..62c0ce049b2 100644
--- a/Core/Tools/W3DView/W3DView.h
+++ b/Core/Tools/W3DView/W3DView.h
@@ -41,8 +41,8 @@ class CW3DViewApp : public CWinApp
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CW3DViewApp)
 	public:
-	virtual BOOL InitInstance();
-	virtual int ExitInstance();
+	virtual BOOL InitInstance() override;
+	virtual int ExitInstance() override;
 	//}}AFX_VIRTUAL
 
 // Implementation
diff --git a/Core/Tools/W3DView/W3DViewDoc.h b/Core/Tools/W3DView/W3DViewDoc.h
index 815ddd53d90..e58bc3d5700 100644
--- a/Core/Tools/W3DView/W3DViewDoc.h
+++ b/Core/Tools/W3DView/W3DViewDoc.h
@@ -81,17 +81,17 @@ class CW3DViewDoc : public CDocument
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CW3DViewDoc)
 	public:
-	virtual BOOL OnNewDocument();
-	virtual void Serialize(CArchive& ar);
-	virtual BOOL OnOpenDocument(LPCTSTR lpszPathName);
+	virtual BOOL OnNewDocument() override;
+	virtual void Serialize(CArchive& ar) override;
+	virtual BOOL OnOpenDocument(LPCTSTR lpszPathName) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
 public:
 	virtual ~CW3DViewDoc();
 #ifdef RTS_DEBUG
-	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
+	virtual void AssertValid() const override;
+	virtual void Dump(CDumpContext& dc) const override;
 #endif
 
 protected:
diff --git a/Core/Tools/W3DView/W3DViewView.h b/Core/Tools/W3DView/W3DViewView.h
index 024b2af2af4..c69d133494d 100644
--- a/Core/Tools/W3DView/W3DViewView.h
+++ b/Core/Tools/W3DView/W3DViewView.h
@@ -48,8 +48,8 @@ class CW3DViewView : public CView
 public:
 	virtual ~CW3DViewView();
 #ifdef RTS_DEBUG
-	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
+	virtual void AssertValid() const override;
+	virtual void Dump(CDumpContext& dc) const override;
 #endif
 
 protected:
diff --git a/Generals/Code/GameEngine/Include/Common/DrawModule.h b/Generals/Code/GameEngine/Include/Common/DrawModule.h
index 6646b80d55c..1867db65564 100644
--- a/Generals/Code/GameEngine/Include/Common/DrawModule.h
+++ b/Generals/Code/GameEngine/Include/Common/DrawModule.h
@@ -204,6 +204,9 @@ class ObjectDrawInterface
 	virtual void setAnimationCompletionTime(UnsignedInt numFrames) = 0;
 	virtual Bool updateBonesForClientParticleSystems() = 0;///< this will reposition particle systems on the fly ML
 
+	//Kris: Manually set a drawable's current animation to specific frame.
+	virtual void setAnimationFrame(int frame) = 0;
+
 	/**
 	  This call is used to pause or resume an animation.
 	*/
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h
index 47a54cdc993..18d87280da6 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h
@@ -220,7 +220,7 @@ class SimpleSceneClass : public SceneClass
 	SimpleSceneClass();
 	virtual ~SimpleSceneClass() override;
 
-	virtual int	Get_Scene_ID()	{	return SCENE_ID_SIMPLE;	}
+	virtual int	Get_Scene_ID() const override	{	return SCENE_ID_SIMPLE;	}
 
 	virtual void Add_Render_Object(RenderObjClass * obj) override;
 	virtual void Remove_Render_Object(RenderObjClass * obj) override;