Merge pull request #1234 from marauder2k9-torque/virtuals-override

Virtuals override

Engine/lib/.clang-tidy

@@ -0,0 +1,5 @@
+---
+Checks:            '-*'
+WarningsAsErrors:  ''
+HeaderFilterRegex: '.*'
+FormatStyle:       'file'

Engine/source/T3D/Scene.h

@@ -52,16 +52,16 @@ public:
 
    static bool _editPostEffects(void* object, const char* index, const char* data);
 
-   virtual bool onAdd();
+   bool onAdd() override;
-   virtual void onRemove();
+   void onRemove() override;
-   virtual void onPostAdd();
+   void onPostAdd() override;
 
-   virtual void interpolateTick(F32 delta);
+   void interpolateTick(F32 delta) override;
-   virtual void processTick();
+   void processTick() override;
-   virtual void advanceTime(F32 timeDelta);
+   void advanceTime(F32 timeDelta) override;
 
-   virtual void addObject(SimObject* object);
+   void addObject(SimObject* object) override;
-   virtual void removeObject(SimObject* object);
+   void removeObject(SimObject* object) override;
 
    void addDynamicObject(SceneObject* object);
    void removeDynamicObject(SceneObject* object);
@@ -76,8 +76,8 @@ public:
 
    //
    //Networking
-   U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream);
+   U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override;
-   void unpackUpdate(NetConnection *conn, BitStream *stream);
+   void unpackUpdate(NetConnection *conn, BitStream *stream) override;
 
    //
    Vector<SceneObject*> getObjectsByClass(String className, bool checkSubscenes);

Engine/source/T3D/accumulationVolume.h

@@ -59,7 +59,7 @@ class AccumulationVolume : public ScenePolyhedralSpace
       mutable Vector< SceneObject* > mVolumeQueryList;
 
       // SceneSpace.
-      virtual void _renderObject( ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat );
+      void _renderObject( ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat ) override;
 
       DECLARE_IMAGEASSET(AccumulationVolume, Texture, onTextureChanged, GFXStaticTextureSRGBProfile);
       DECLARE_ASSET_NET_SETGET(AccumulationVolume, Texture, -1);
@@ -76,9 +76,9 @@ class AccumulationVolume : public ScenePolyhedralSpace
       DECLARE_DESCRIPTION( "Allows objects in an area to have accumulation effect applied." );
       DECLARE_CATEGORY("Volume");
 
-      virtual bool onAdd();
+      bool onAdd() override;
-      virtual void onRemove();
+      void onRemove() override;
-      void inspectPostApply();
+      void inspectPostApply() override;
       void setTexture( const String& name );
 
       // Static Functions.
@@ -93,12 +93,12 @@ class AccumulationVolume : public ScenePolyhedralSpace
       static void updateObject(SceneObject* object);
 
       // Network
-      U32 packUpdate( NetConnection *, U32 mask, BitStream *stream );
+      U32 packUpdate( NetConnection *, U32 mask, BitStream *stream ) override;
-      void unpackUpdate( NetConnection *, BitStream *stream );
+      void unpackUpdate( NetConnection *, BitStream *stream ) override;
 
       // SceneObject.
-      virtual void buildSilhouette( const SceneCameraState& cameraState, Vector< Point3F >& outPoints );
+      void buildSilhouette( const SceneCameraState& cameraState, Vector< Point3F >& outPoints ) override;
-      virtual void setTransform( const MatrixF& mat );
+      void setTransform( const MatrixF& mat ) override;
 };
 
 #endif // !_AccumulationVolume_H_

Engine/source/T3D/aiClient.h

@@ -82,7 +82,7 @@ class AIClient : public AIConnection {
 		AIClient();
       ~AIClient();
 
-		U32 getMoveList( Move **movePtr,U32 *numMoves );
+		U32 getMoveList( Move **movePtr,U32 *numMoves ) override;
 
 		// ---Targeting and aiming sets/gets
 		void setTargetObject( ShapeBase *targetObject );

Engine/source/T3D/aiPlayer.h

@@ -157,11 +157,11 @@ public:
 
    static void initPersistFields();
 
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
 
-   virtual bool getAIMove( Move *move );
+   bool getAIMove( Move *move ) override;
-   virtual void updateMove(const Move *move);
+   void updateMove(const Move *move) override;
    /// Clear out the current path.
    void clearPath();
    /// Stop searching for cover.
@@ -176,7 +176,7 @@ public:
    void setAimLocation( const Point3F &location );
    Point3F getAimLocation() const { return mAimLocation; }
    void clearAim();
-   void getMuzzleVector(U32 imageSlot,VectorF* vec);
+   void getMuzzleVector(U32 imageSlot,VectorF* vec) override;
    bool checkInLos(GameBase* target = NULL, bool _useMuzzle = false, bool _checkEnabled = false);
    bool checkInFoV(GameBase* target = NULL, F32 camFov = 45.0f, bool _checkEnabled = false);
    F32 getTargetDistance(GameBase* target, bool _checkEnabled);

Engine/source/T3D/assets/CppAsset.h

@@ -55,7 +55,7 @@ public:
 
    /// Engine.
    static void initPersistFields();
-   virtual void copyTo(SimObject* object);
+   void copyTo(SimObject* object) override;
 
    /// Declare Console Object.
    DECLARE_CONOBJECT(CppAsset);
@@ -67,8 +67,8 @@ public:
    inline StringTableEntry getHeaderFile(void) const { return mHeaderFile; };
 
 protected:
-	virtual void            initializeAsset(void);
+	void            initializeAsset(void) override;
-	virtual void            onAssetRefresh(void);
+	void            onAssetRefresh(void) override;
 
    static bool setCppFile(void *obj, const char *index, const char *data) { static_cast<CppAsset*>(obj)->setCppFile(data); return false; }
    static const char* getCppFile(void* obj, const char* data) { return static_cast<CppAsset*>(obj)->getCppFile(); }

Engine/source/T3D/assets/CubemapAsset.h

@@ -61,12 +61,12 @@ public:
 
    /// Engine.
    static void initPersistFields();
-   virtual void copyTo(SimObject* object);
+   void copyTo(SimObject* object) override;
 
    /// Declare Console Object.
    DECLARE_CONOBJECT(CubemapAsset);
 
-   StringTableEntry getComponentName() { return mComponentName; }
+   StringTableEntry getComponentName() override { return mComponentName; }
    StringTableEntry getComponentClass() { return mComponentClass; }
    StringTableEntry getFriendlyName() { return mFriendlyName; }
    StringTableEntry getComponentType() { return mComponentType; }
@@ -84,8 +84,8 @@ public:
    inline StringTableEntry getScriptFile(void) const { return mScriptFile; };
 
 protected:
-   virtual void            initializeAsset(void);
+   void            initializeAsset(void) override;
-   virtual void            onAssetRefresh(void);
+   void            onAssetRefresh(void) override;
 
    static bool setScriptFile(void *obj, const char *index, const char *data) { static_cast<CubemapAsset*>(obj)->setScriptFile(data); return false; }
    static const char* getScriptFile(void* obj, const char* data) { return static_cast<CubemapAsset*>(obj)->getScriptFile(); }
@@ -106,8 +106,8 @@ public:
    DECLARE_CONOBJECT(GuiInspectorTypeCubemapAssetPtr);
    static void consoleInit();
 
-   virtual GuiControl* constructEditControl();
+   GuiControl* constructEditControl() override;
-   virtual bool updateRects();
+   bool updateRects() override;
 };
 #endif
 #endif // _ASSET_BASE_H_

Engine/source/T3D/assets/ExampleAsset.h

@@ -49,14 +49,14 @@ public:
 
    /// Engine.
    static void initPersistFields();
-   virtual void copyTo(SimObject* object);
+   void copyTo(SimObject* object) override;
 
    /// Declare Console Object.
    DECLARE_CONOBJECT(ExampleAsset);
 
 protected:
-   virtual void            initializeAsset(void) {}
+   void            initializeAsset(void) override {}
-   virtual void            onAssetRefresh(void) {}
+   void            onAssetRefresh(void) override {}
 };
 
 DefineConsoleType(TypeExampleAssetPtr, ExampleAsset)

Engine/source/T3D/assets/GUIAsset.h

@@ -58,7 +58,7 @@ public:
 
    /// Engine.
    static void initPersistFields();
-   virtual void copyTo(SimObject* object);
+   void copyTo(SimObject* object) override;
 
    static StringTableEntry getAssetIdByGUIName(StringTableEntry guiName);
 
@@ -74,8 +74,8 @@ public:
    inline StringTableEntry getScriptPath(void) const { return mScriptPath; };
 
 protected:
-   virtual void            initializeAsset(void);
+   void            initializeAsset(void) override;
-   virtual void            onAssetRefresh(void);
+   void            onAssetRefresh(void) override;
 
    static bool setGUIFile(void *obj, const char *index, const char *data) { static_cast<GUIAsset*>(obj)->setGUIFile(data); return false; }
    static const char* getGUIFile(void* obj, const char* data) { return static_cast<GUIAsset*>(obj)->getGUIFile(); }
@@ -99,8 +99,8 @@ public:
    DECLARE_CONOBJECT(GuiInspectorTypeGUIAssetPtr);
    static void consoleInit();
 
-   virtual GuiControl* constructEditControl();
+   GuiControl* constructEditControl() override;
-   virtual bool updateRects();
+   bool updateRects() override;
 };
 #endif
 #endif // _ASSET_BASE_H_

Engine/source/T3D/assets/GameObjectAsset.h

@@ -59,7 +59,7 @@ public:
 
    /// Engine.
    static void initPersistFields();
-   virtual void copyTo(SimObject* object);
+   void copyTo(SimObject* object) override;
 
    const char* create();
 
@@ -72,8 +72,8 @@ public:
    inline StringTableEntry getTAMLFile(void) const { return mTAMLFile; };
 
 protected:
-   virtual void            initializeAsset(void);
+   void            initializeAsset(void) override;
-   virtual void            onAssetRefresh(void);
+   void            onAssetRefresh(void) override;
 
    static bool setScriptFile(void *obj, const char *index, const char *data) { static_cast<GameObjectAsset*>(obj)->setScriptFile(data); return false; }
    static const char* getScriptFile(void* obj, const char* data) { return static_cast<GameObjectAsset*>(obj)->getScriptFile(); }
@@ -100,8 +100,8 @@ public:
    DECLARE_CONOBJECT(GuiInspectorTypeGameObjectAssetPtr);
    static void consoleInit();
 
-   virtual GuiControl* constructEditControl();
+   GuiControl* constructEditControl() override;
-   virtual bool updateRects();
+   bool updateRects() override;
 };
 #endif
 #endif // _ASSET_BASE_H_

Engine/source/T3D/assets/ImageAsset.cpp

@@ -131,7 +131,7 @@ const String ImageAsset::mErrCodeStrings[] =
    "UnKnown"
 };
 //-----------------------------------------------------------------------------
-ImageAsset::ImageAsset() : AssetBase(), mUseMips(true), mIsHDRImage(false), mIsValidImage(false), mImageType(Albedo)
+ImageAsset::ImageAsset() : AssetBase(), mIsValidImage(false), mUseMips(true), mIsHDRImage(false), mImageType(Albedo)
 {
    mImageFileName = StringTable->EmptyString();
    mImagePath = StringTable->EmptyString();

Engine/source/T3D/assets/ImageAsset.h

@@ -119,7 +119,7 @@ public:
 
    /// Engine.
    static void initPersistFields();
-   virtual void copyTo(SimObject* object);
+   void copyTo(SimObject* object) override;
 
    /// Declare Console Object.
    DECLARE_CONOBJECT(ImageAsset);
@@ -154,8 +154,8 @@ public:
    U32 load();
 
 protected:
-   virtual void            initializeAsset(void);
+   void            initializeAsset(void) override;
-   virtual void            onAssetRefresh(void);
+   void            onAssetRefresh(void) override;
 
    static bool setImageFileName(void* obj, StringTableEntry index, StringTableEntry data) { static_cast<ImageAsset*>(obj)->setImageFileName(data); return false; }
    static StringTableEntry getImageFileName(void* obj, StringTableEntry data) { return static_cast<ImageAsset*>(obj)->getImageFileName(); }

Engine/source/T3D/assets/ImageAssetInspectors.h

@@ -21,11 +21,11 @@ public:
    DECLARE_CONOBJECT(GuiInspectorTypeImageAssetPtr);
    static void consoleInit();
 
-   virtual GuiControl* constructEditControl();
+   GuiControl* constructEditControl() override;
-   virtual bool updateRects();
+   bool updateRects() override;
    bool renderTooltip(const Point2I& hoverPos, const Point2I& cursorPos, const char* tipText = NULL);
 
-   virtual void updateValue();
+   void updateValue() override;
 
    void updatePreviewImage();
    void setPreviewImage(StringTableEntry assetId);

Engine/source/T3D/assets/LevelAsset.h

@@ -77,7 +77,7 @@ public:
 
    /// Engine.
    static void initPersistFields();
-   virtual void copyTo(SimObject* object);
+   void copyTo(SimObject* object) override;
 
    /// Declare Console Object.
    DECLARE_CONOBJECT(LevelAsset);
@@ -133,8 +133,8 @@ protected:
    static const char* getNavmeshFile(void* obj, const char* data) { return static_cast<LevelAsset*>(obj)->getNavmeshFile(); }
 
 
-   virtual void            initializeAsset(void);
+   void            initializeAsset(void) override;
-   virtual void            onAssetRefresh(void);
+   void            onAssetRefresh(void) override;
    void                    loadAsset();
 };
 

Engine/source/T3D/assets/MaterialAsset.h

@@ -102,7 +102,7 @@ public:
 
    /// Engine.
    static void initPersistFields();
-   virtual void copyTo(SimObject* object);
+   void copyTo(SimObject* object) override;
 
    U32 load();
 
@@ -130,8 +130,8 @@ public:
    DECLARE_CONOBJECT(MaterialAsset);
 
 protected:
-   virtual void initializeAsset();
+   void initializeAsset() override;
-   virtual void onAssetRefresh(void);
+   void onAssetRefresh(void) override;
 
    static bool setScriptFile(void *obj, const char *index, const char *data)
    {
@@ -160,10 +160,10 @@ public:
    DECLARE_CONOBJECT(GuiInspectorTypeMaterialAssetPtr);
    static void consoleInit();
 
-   virtual GuiControl* constructEditControl();
+   GuiControl* constructEditControl() override;
-   virtual bool updateRects();
+   bool updateRects() override;
 
-   virtual void updateValue();
+   void updateValue() override;
 
    void updatePreviewImage();
    void setPreviewImage(StringTableEntry assetId);

Engine/source/T3D/assets/ParticleAsset.h

@@ -55,14 +55,14 @@ public:
 
    /// Engine.
    static void initPersistFields();
-   virtual void copyTo(SimObject* object);
+   void copyTo(SimObject* object) override;
 
    /// Declare Console Object.
    DECLARE_CONOBJECT(ParticleAsset);
 
 protected:
-   virtual void            initializeAsset(void) {}
+   void            initializeAsset(void) override {}
-   virtual void            onAssetRefresh(void) {}
+   void            onAssetRefresh(void) override {}
 };
 
 DefineConsoleType(TypeParticleAssetPtr, ParticleAsset)
@@ -81,8 +81,8 @@ public:
    DECLARE_CONOBJECT(GuiInspectorTypeParticleAssetPtr);
    static void consoleInit();
 
-   virtual GuiControl* constructEditControl();
+   GuiControl* constructEditControl() override;
-   virtual bool updateRects();
+   bool updateRects() override;
 };
 #endif
 #endif // _ASSET_BASE_H_

Engine/source/T3D/assets/PostEffectAsset.h

@@ -60,7 +60,7 @@ public:
 
    /// Engine.
    static void initPersistFields();
-   virtual void copyTo(SimObject* object);
+   void copyTo(SimObject* object) override;
 
    void                    setScriptFile(const char* pScriptFile);
    inline StringTableEntry getScriptFile(void) const { return mScriptFile; };
@@ -78,8 +78,8 @@ public:
    DECLARE_CONOBJECT(PostEffectAsset);
 
 protected:
-   virtual void initializeAsset();
+   void initializeAsset() override;
-   virtual void onAssetRefresh(void);
+   void onAssetRefresh(void) override;
 
    static bool setScriptFile(void *obj, const char *index, const char *data) { static_cast<PostEffectAsset*>(obj)->setScriptFile(data); return false; }
    static const char* getScriptFile(void* obj, const char* data) { return static_cast<PostEffectAsset*>(obj)->getScriptFile(); }

Engine/source/T3D/assets/ScriptAsset.h

@@ -60,7 +60,7 @@ public:
 
    /// Engine.
    static void initPersistFields();
-   virtual void copyTo(SimObject* object);
+   void copyTo(SimObject* object) override;
 
    /// Declare Console Object.
    DECLARE_CONOBJECT(ScriptAsset);
@@ -77,9 +77,9 @@ public:
    DECLARE_CALLBACK(void, onUnloadAsset, ());
 
 protected:
-   virtual void            initializeAsset(void);
+   void            initializeAsset(void) override;
-   virtual void            onAssetRefresh(void);
+   void            onAssetRefresh(void) override;
-   virtual void            unloadAsset(void);
+   void            unloadAsset(void) override;
 
    static bool setScriptFile(void *obj, const char *index, const char *data) { static_cast<ScriptAsset*>(obj)->setScriptFile(data); return false; }
    static const char* getScriptFile(void* obj, const char* data) { return static_cast<ScriptAsset*>(obj)->getScriptFile(); }

Engine/source/T3D/assets/ShapeAnimationAsset.h

@@ -98,7 +98,7 @@ public:
 
    /// Engine.
    static void initPersistFields();
-   virtual void copyTo(SimObject* object);
+   void copyTo(SimObject* object) override;
 
    void                    setAnimationFile(const char* pAnimationFile);
    inline StringTableEntry getAnimationFile(void) const { return mFileName; };
@@ -109,8 +109,8 @@ public:
    DECLARE_CONOBJECT(ShapeAnimationAsset);
 
 protected:
-   virtual void            initializeAsset(void);
+   void            initializeAsset(void) override;
-   virtual void            onAssetRefresh(void);
+   void            onAssetRefresh(void) override;
 
    static bool setAnimationFile(void *obj, const char *index, const char *data) { static_cast<ShapeAnimationAsset*>(obj)->setAnimationFile(data); return false; }
    static const char* getAnimationFile(void* obj, const char* data) { return static_cast<ShapeAnimationAsset*>(obj)->getAnimationFile(); }

Engine/source/T3D/assets/ShapeAsset.h

@@ -123,11 +123,11 @@ public:
 
    /// Engine.
    static void initPersistFields();
-   virtual void copyTo(SimObject* object);
+   void copyTo(SimObject* object) override;
 
    virtual void setDataField(StringTableEntry slotName, StringTableEntry array, StringTableEntry value);
 
-   virtual void initializeAsset();
+   void initializeAsset() override;
 
    /// Declare Console Object.
    DECLARE_CONOBJECT(ShapeAsset);
@@ -195,7 +195,7 @@ public:
 #endif
 
 protected:
-   virtual void            onAssetRefresh(void);
+   void            onAssetRefresh(void) override;
 
    static bool setShapeFile(void* obj, StringTableEntry index, StringTableEntry data) { static_cast<ShapeAsset*>(obj)->setShapeFile(data); return false; }
    static const char* getShapeFile(void* obj, const char* data) { return static_cast<ShapeAsset*>(obj)->getShapeFile(); }
@@ -229,10 +229,10 @@ public:
    DECLARE_CONOBJECT(GuiInspectorTypeShapeAssetPtr);
    static void consoleInit();
 
-   virtual GuiControl* constructEditControl();
+   GuiControl* constructEditControl() override;
-   virtual bool updateRects();
+   bool updateRects() override;
 
-   virtual void updateValue();
+   void updateValue() override;
 
    void updatePreviewImage();
    void setPreviewImage(StringTableEntry assetId);

Engine/source/T3D/assets/SoundAsset.h

@@ -147,7 +147,7 @@ public:
 
    /// Engine.
    static void initPersistFields();
-   virtual void copyTo(SimObject* object);
+   void copyTo(SimObject* object) override;
 
    //SFXResource* getSound() { return mSoundResource; }
    Resource<SFXResource> getSoundResource(const U32 slotId = 0) { load(); return mSFXProfile[slotId].getResource(); }
@@ -172,9 +172,9 @@ public:
    static U32 getAssetByFileName(StringTableEntry fileName, AssetPtr<SoundAsset>* matAsset);
 
 protected:
-   virtual void            initializeAsset(void);
+   void            initializeAsset(void) override;
    void _onResourceChanged(const Torque::Path & path);
-   virtual void            onAssetRefresh(void);
+   void            onAssetRefresh(void) override;
 };
 
 DefineConsoleType(TypeSoundAssetPtr, SoundAsset)

Engine/source/T3D/assets/SoundAssetInspectors.h

@@ -17,8 +17,8 @@ public:
    DECLARE_CONOBJECT(GuiInspectorTypeSoundAssetPtr);
    static void consoleInit();
 
-   virtual GuiControl* constructEditControl();
+   GuiControl* constructEditControl() override;
-   virtual bool updateRects();
+   bool updateRects() override;
 };
 
 class GuiInspectorTypeSoundAssetId : public GuiInspectorTypeSoundAssetPtr

Engine/source/T3D/assets/TerrainAsset.h

@@ -72,7 +72,7 @@ public:
 
    /// Engine.
    static void initPersistFields();
-   virtual void copyTo(SimObject* object);
+   void copyTo(SimObject* object) override;
 
    virtual void setDataField(StringTableEntry slotName, const char* array, const char* value);
 
@@ -92,8 +92,8 @@ public:
    DECLARE_CONOBJECT(TerrainAsset);
 
 protected:
-   virtual void initializeAsset();
+   void initializeAsset() override;
-   virtual void onAssetRefresh(void);
+   void onAssetRefresh(void) override;
 
    static bool setTerrainFileName(void *obj, const char *index, const char *data) { static_cast<TerrainAsset*>(obj)->setTerrainFileName(data); return false; }
    static const char* getTerrainFileName(void* obj, const char* data) { return static_cast<TerrainAsset*>(obj)->getTerrainFileName(); }
@@ -115,8 +115,8 @@ public:
    DECLARE_CONOBJECT(GuiInspectorTypeTerrainAssetPtr);
    static void consoleInit();
 
-   virtual GuiControl* constructEditControl();
+   GuiControl* constructEditControl() override;
-   virtual bool updateRects();
+   bool updateRects() override;
 };
 
 class GuiInspectorTypeTerrainAssetId : public GuiInspectorTypeTerrainAssetPtr

Engine/source/T3D/assets/TerrainMaterialAsset.h

@@ -87,7 +87,7 @@ public:
 
    /// Engine.
    static void initPersistFields();
-   virtual void copyTo(SimObject* object);
+   void copyTo(SimObject* object) override;
 
    U32 load();
 
@@ -117,8 +117,8 @@ public:
    DECLARE_CONOBJECT(TerrainMaterialAsset);
 
 protected:
-   virtual void initializeAsset();
+   void initializeAsset() override;
-   virtual void onAssetRefresh(void);
+   void onAssetRefresh(void) override;
 
    static bool setScriptFile(void *obj, const char *index, const char *data) 
    { 
@@ -144,8 +144,8 @@ public:
    DECLARE_CONOBJECT(GuiInspectorTypeTerrainMaterialAssetPtr);
    static void consoleInit();
 
-   virtual GuiControl* constructEditControl();
+   GuiControl* constructEditControl() override;
-   virtual bool updateRects();
+   bool updateRects() override;
 };
 class GuiInspectorTypeTerrainMaterialAssetId : public GuiInspectorTypeTerrainMaterialAssetPtr
 {

Engine/source/T3D/assets/assetImporter.h

@@ -432,8 +432,8 @@ public:
    AssetImportConfig();
    virtual ~AssetImportConfig();
 
-   virtual bool onAdd();
+   bool onAdd() override;
-   virtual void onRemove();
+   void onRemove() override;
 
    /// Engine.
    static void initPersistFields();
@@ -571,8 +571,8 @@ public:
    AssetImportObject();
    virtual ~AssetImportObject();
 
-   virtual bool onAdd();
+   bool onAdd() override;
-   virtual void onRemove();
+   void onRemove() override;
 
    /// Engine.
    static void initPersistFields();
@@ -663,8 +663,8 @@ public:
    AssetImporter();
    virtual ~AssetImporter();
 
-   virtual bool onAdd();
+   bool onAdd() override;
-   virtual void onRemove();
+   void onRemove() override;
 
    /// Engine.
    static void initPersistFields();

Engine/source/T3D/assets/stateMachineAsset.h

@@ -55,7 +55,7 @@ public:
 
    /// Engine.
    static void initPersistFields();
-   virtual void copyTo(SimObject* object);
+   void copyTo(SimObject* object) override;
 
    /// Declare Console Object.
    DECLARE_CONOBJECT(StateMachineAsset);
@@ -66,8 +66,8 @@ public:
    inline StringTableEntry getStateMachinePath(void) const { return mStateMachinePath; };
 
 protected:
-   virtual void            initializeAsset(void);
+   void            initializeAsset(void) override;
-   virtual void            onAssetRefresh(void);
+   void            onAssetRefresh(void) override;
 
    static bool setStateMachineFile(void *obj, const char *index, const char *data) { static_cast<StateMachineAsset*>(obj)->setStateMachineFile(data); return false; }
    static const char* getStateMachineFile(void* obj, const char* data) { return static_cast<StateMachineAsset*>(obj)->getStateMachineFile(); }
@@ -88,8 +88,8 @@ public:
    DECLARE_CONOBJECT(GuiInspectorTypeStateMachineAssetPtr);
    static void consoleInit();
 
-   virtual GuiControl* constructEditControl();
+   GuiControl* constructEditControl() override;
-   virtual bool updateRects();
+   bool updateRects() override;
 };
 #endif
 #endif

Engine/source/T3D/camera.h

@@ -49,8 +49,8 @@ class CameraData: public ShapeBaseData
       DECLARE_DESCRIPTION( "A datablock that describes a camera." );
 
       static void initPersistFields();
-      virtual void packData(BitStream* stream);
+      void packData(BitStream* stream) override;
-      virtual void unpackData(BitStream* stream);
+      void unpackData(BitStream* stream) override;
 };
 
 
@@ -161,14 +161,14 @@ class Camera: public ShapeBase
       static bool _setNewtonField( void *object, const char *index, const char *data );
 
       // ShapeBase.
-      virtual F32 getCameraFov();
+      F32 getCameraFov() override;
-      virtual void setCameraFov( F32 fov );
+      void setCameraFov( F32 fov ) override;
-      virtual F32 getDefaultCameraFov();
+      F32 getDefaultCameraFov() override;
-      virtual bool isValidCameraFov( F32 fov );
+      bool isValidCameraFov( F32 fov ) override;
-      virtual F32 getDamageFlash() const;
+      F32 getDamageFlash() const override;
-      virtual F32 getWhiteOut() const;
+      F32 getWhiteOut() const override;
-      virtual void setTransform( const MatrixF& mat );
+      void setTransform( const MatrixF& mat ) override;
-      virtual void setRenderTransform( const MatrixF& mat );
+      void setRenderTransform( const MatrixF& mat ) override;
 
    public:
 
@@ -188,7 +188,7 @@ class Camera: public ShapeBase
       void setOrbitMode( GameBase *obj, const Point3F& pos, const Point3F& rot, const Point3F& offset,
                          F32 minDist, F32 maxDist, F32 curDist, bool ownClientObject, bool locked = false );
       void setTrackObject( GameBase *obj, const Point3F& offset);
-      void onDeleteNotify( SimObject* obj );
+      void onDeleteNotify( SimObject* obj ) override;
 
       GameBase* getOrbitObject()      { return(mOrbitObject); }
       bool isObservingClientObject()   { return(mObservingClientObject); }
@@ -197,8 +197,8 @@ class Camera: public ShapeBase
       /// @{
 
       void setNewtonFlyMode();
-      VectorF getVelocity() const { return mVelocity; }
+      VectorF getVelocity() const override { return mVelocity; }
-      void setVelocity( const VectorF& vel );
+      void setVelocity( const VectorF& vel ) override;
       VectorF getAngularVelocity() const { return mAngularVelocity; }
       void setAngularVelocity( const VectorF& vel );
       bool isRotationDamped() {return mNewtonRotation;}
@@ -232,27 +232,27 @@ class Camera: public ShapeBase
       static void initPersistFields();
       static void consoleInit();
 
-      virtual void onEditorEnable();
+      void onEditorEnable() override;
-      virtual void onEditorDisable();
+      void onEditorDisable() override;
 
-      virtual bool onAdd();
+      bool onAdd() override;
-      virtual void onRemove();
+      void onRemove() override;
-      virtual bool onNewDataBlock( GameBaseData *dptr, bool reload );
+      bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
-      virtual void processTick( const Move* move );
+      void processTick( const Move* move ) override;
-      virtual void interpolateTick( F32 delta);
+      void interpolateTick( F32 delta) override;
-      virtual void getCameraTransform( F32* pos,MatrixF* mat );
+      void getCameraTransform( F32* pos,MatrixF* mat ) override;
-      virtual void getEyeCameraTransform( IDisplayDevice *display, U32 eyeId, MatrixF *outMat );
+      void getEyeCameraTransform( IDisplayDevice *display, U32 eyeId, MatrixF *outMat ) override;
 
-      virtual void writePacketData( GameConnection* conn, BitStream* stream );
+      void writePacketData( GameConnection* conn, BitStream* stream ) override;
-      virtual void readPacketData( GameConnection* conn, BitStream* stream );
+      void readPacketData( GameConnection* conn, BitStream* stream ) override;
-      virtual U32  packUpdate( NetConnection* conn, U32 mask, BitStream* stream );
+      U32  packUpdate( NetConnection* conn, U32 mask, BitStream* stream ) override;
-      virtual void unpackUpdate( NetConnection* conn, BitStream* stream );
+      void unpackUpdate( NetConnection* conn, BitStream* stream ) override;
 
       DECLARE_CONOBJECT( Camera );
       DECLARE_CATEGORY("Actor \t Controllable");
       DECLARE_DESCRIPTION( "Represents a position, direction and field of view to render a scene from." );
       static F32 getMovementSpeed() { return smMovementSpeed; }
-      bool isCamera() const { return true; }
+      bool isCamera() const override { return true; }
 
       //Not yet implemented
       GFXTexHandle getCameraRenderTarget() { return GFXTexHandle(); }

Engine/source/T3D/convexShape.h

@@ -60,9 +60,9 @@ public:
 		pShape     = cv.pShape;		
 	}
 
-	Point3F support(const VectorF& vec) const;
+	Point3F support(const VectorF& vec) const override;
-	void getFeatures(const MatrixF& mat,const VectorF& n, ConvexFeature* cf);
+	void getFeatures(const MatrixF& mat,const VectorF& n, ConvexFeature* cf) override;
-	void getPolyList(AbstractPolyList* list);
+	void getPolyList(AbstractPolyList* list) override;
 };
 
 
@@ -200,25 +200,25 @@ public:
    static void initPersistFields();
 
    // SimObject 
-   virtual void inspectPostApply();
+   void inspectPostApply() override;
-   virtual bool onAdd();
+   bool onAdd() override;
-   virtual void onRemove();
+   void onRemove() override;
-   virtual void writeFields(Stream &stream, U32 tabStop);
+   void writeFields(Stream &stream, U32 tabStop) override;
-   virtual bool writeField( StringTableEntry fieldname, const char *value );
+   bool writeField( StringTableEntry fieldname, const char *value ) override;
 
    // NetObject
-   virtual U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream );
+   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override;
-   virtual void unpackUpdate( NetConnection *conn, BitStream *stream );
+   void unpackUpdate( NetConnection *conn, BitStream *stream ) override;
 
    // SceneObject
-   virtual void onScaleChanged();
+   void onScaleChanged() override;
-   virtual void setTransform( const MatrixF &mat );   
+   void setTransform( const MatrixF &mat ) override;   
-   virtual void prepRenderImage( SceneRenderState *state );
+   void prepRenderImage( SceneRenderState *state ) override;
-   virtual void buildConvex( const Box3F &box, Convex *convex );
+   void buildConvex( const Box3F &box, Convex *convex ) override;
-   virtual bool buildPolyList( PolyListContext context, AbstractPolyList *polyList, const Box3F &box, const SphereF &sphere );
+   bool buildPolyList( PolyListContext context, AbstractPolyList *polyList, const Box3F &box, const SphereF &sphere ) override;
-   virtual bool buildExportPolyList(ColladaUtils::ExportData* exportData, const Box3F &box, const SphereF &);
+   bool buildExportPolyList(ColladaUtils::ExportData* exportData, const Box3F &box, const SphereF &) override;
-   virtual bool castRay( const Point3F &start, const Point3F &end, RayInfo *info );
+   bool castRay( const Point3F &start, const Point3F &end, RayInfo *info ) override;
-   virtual bool collideBox( const Point3F &start, const Point3F &end, RayInfo *info );
+   bool collideBox( const Point3F &start, const Point3F &end, RayInfo *info ) override;
 
 
    void updateBounds( bool recenter );

Engine/source/T3D/debris.h

@@ -96,11 +96,11 @@ struct DebrisData : public GameBaseData
 
    DebrisData();
 
-   bool        onAdd();
+   bool        onAdd() override;
-   bool        preload( bool server, String &errorStr );
+   bool        preload( bool server, String &errorStr ) override;
    static void initPersistFields();
-   void        packData(BitStream* stream);
+   void        packData(BitStream* stream) override;
-   void        unpackData(BitStream* stream);
+   void        unpackData(BitStream* stream) override;
 
    DECLARE_CONOBJECT(DebrisData);
 
@@ -108,8 +108,8 @@ public:
    /*C*/        DebrisData(const DebrisData&, bool = false);
    /*D*/        ~DebrisData();
    DebrisData*  cloneAndPerformSubstitutions(const SimObject*, S32 index=0);
-   virtual void onPerformSubstitutions();
+   void onPerformSubstitutions() override;
-   virtual bool allowSubstitutions() const { return true; }
+   bool allowSubstitutions() const override { return true; }
 
    void onShapeChanged() {}
 };
@@ -152,14 +152,14 @@ private:
    void  rotate( F32 dt );
 
 protected:
-   virtual void   processTick(const Move* move);
+   void   processTick(const Move* move) override;
-   virtual void   advanceTime( F32 dt );
+   void   advanceTime( F32 dt ) override;
-   void prepRenderImage(SceneRenderState *state);
+   void prepRenderImage(SceneRenderState *state) override;
    void prepBatchRender(SceneRenderState *state);
 
 
-   bool           onAdd();
+   bool           onAdd() override;
-   void           onRemove();
+   void           onRemove() override;
    void           updateEmitters( Point3F &pos, Point3F &vel, U32 ms );
 
 public:
@@ -169,13 +169,13 @@ public:
 
    static void    initPersistFields();
 
-   bool   onNewDataBlock( GameBaseData *dptr, bool reload );
+   bool   onNewDataBlock( GameBaseData *dptr, bool reload ) override;
 
    void  init( const Point3F &position, const Point3F &velocity );
    void  setLifetime( F32 lifetime ){ mLifetime = lifetime; }
    void  setPartInstance( TSPartInstance *part ){ mPart = part; }
    void  setSize( F32 size );
-   void  setVelocity( const Point3F &vel ){ mVelocity = vel; }
+   void  setVelocity( const Point3F &vel ) override{ mVelocity = vel; }
    void  setRotAngles( const Point3F &angles ){ mRotAngles = angles; }
 
    DECLARE_CONOBJECT(Debris);

Engine/source/T3D/decal/decalData.h

@@ -103,14 +103,14 @@ class DecalData : public SimDataBlock
 
       DECLARE_CONOBJECT(DecalData);
       static void initPersistFields();
-      virtual void onStaticModified( const char *slotName, const char *newValue = NULL );
+      void onStaticModified( const char *slotName, const char *newValue = NULL ) override;
       
-      virtual bool onAdd();
+      bool onAdd() override;
-      virtual void onRemove();
+      void onRemove() override;
 
-      virtual bool preload( bool server, String &errorStr );
+      bool preload( bool server, String &errorStr ) override;
-      virtual void packData( BitStream* );
+      void packData( BitStream* ) override;
-      virtual void unpackData( BitStream* );      
+      void unpackData( BitStream* ) override;      
       
       Material* getMaterialDefinition();
       BaseMatInstance* getMaterialInstance();
@@ -118,7 +118,7 @@ class DecalData : public SimDataBlock
       static SimSet* getSet();
       static DecalData* findDatablock( String lookupName );
 
-      virtual void inspectPostApply();
+      void inspectPostApply() override;
       void reloadRects();
 
    protected:

Engine/source/T3D/decal/decalManager.h

@@ -157,7 +157,7 @@ class DecalManager : public SceneObject
       U32 _generateConvexHull( const Vector<Point3F> &points, Vector<Point3F> *outPoints );
 
       // Rendering
-      void prepRenderImage( SceneRenderState *state );
+      void prepRenderImage( SceneRenderState *state ) override;
       
       void _generateWindingOrder( const Point3F &cornerPoint, Vector<Point3F> *sortPoints );
 
@@ -180,8 +180,8 @@ class DecalManager : public SceneObject
       bool _createDataFile();
 
       // SceneObject.
-      virtual bool onSceneAdd();
+      bool onSceneAdd() override;
-      virtual void onSceneRemove();   public:
+      void onSceneRemove() override;   public:
 
    public:
 

Engine/source/T3D/examples/renderMeshExample.h

@@ -99,21 +99,21 @@ public:
 
    // Allows the object to update its editable settings
    // from the server object to the client
-   virtual void inspectPostApply();
+   void inspectPostApply() override;
 
    // Handle when we are added to the scene and removed from the scene
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
 
    // Override this so that we can dirty the network flag when it is called
-   void setTransform( const MatrixF &mat );
+   void setTransform( const MatrixF &mat ) override;
 
    // This function handles sending the relevant data from the server
    // object to the client object
-   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream );
+   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override;
    // This function handles receiving relevant data from the server
    // object and applying it to the client object
-   void unpackUpdate( NetConnection *conn, BitStream *stream );
+   void unpackUpdate( NetConnection *conn, BitStream *stream ) override;
 
    //--------------------------------------------------------------------------
    // Object Rendering
@@ -130,7 +130,7 @@ public:
    void updateMaterial();
 
    // This is the function that allows this object to submit itself for rendering
-   void prepRenderImage( SceneRenderState *state );
+   void prepRenderImage( SceneRenderState *state ) override;
 };
 
 #endif // _RENDERMESHEXAMPLE_H_

Engine/source/T3D/examples/renderObjectExample.h

@@ -97,18 +97,18 @@ public:
    static void initPersistFields();
 
    // Handle when we are added to the scene and removed from the scene
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
 
    // Override this so that we can dirty the network flag when it is called
-   void setTransform( const MatrixF &mat );
+   void setTransform( const MatrixF &mat ) override;
 
    // This function handles sending the relevant data from the server
    // object to the client object
-   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream );
+   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override;
    // This function handles receiving relevant data from the server
    // object and applying it to the client object
-   void unpackUpdate( NetConnection *conn, BitStream *stream );
+   void unpackUpdate( NetConnection *conn, BitStream *stream ) override;
 
    //--------------------------------------------------------------------------
    // Object Rendering
@@ -124,7 +124,7 @@ public:
    void createGeometry();
 
    // This is the function that allows this object to submit itself for rendering
-   void prepRenderImage( SceneRenderState *state );
+   void prepRenderImage( SceneRenderState *state ) override;
 
    // This is the function that actually gets called to do the rendering
    // Note that there is no longer a predefined name for this function.

Engine/source/T3D/examples/renderShapeExample.h

@@ -88,21 +88,21 @@ public:
 
    // Allows the object to update its editable settings
    // from the server object to the client
-   virtual void inspectPostApply();
+   void inspectPostApply() override;
 
    // Handle when we are added to the scene and removed from the scene
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
 
    // Override this so that we can dirty the network flag when it is called
-   void setTransform( const MatrixF &mat );
+   void setTransform( const MatrixF &mat ) override;
 
    // This function handles sending the relevant data from the server
    // object to the client object
-   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream );
+   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override;
    // This function handles receiving relevant data from the server
    // object and applying it to the client object
-   void unpackUpdate( NetConnection *conn, BitStream *stream );
+   void unpackUpdate( NetConnection *conn, BitStream *stream ) override;
 
    //--------------------------------------------------------------------------
    // Object Rendering
@@ -116,7 +116,7 @@ public:
    void createShape();
 
    // This is the function that allows this object to submit itself for rendering
-   void prepRenderImage( SceneRenderState *state );
+   void prepRenderImage( SceneRenderState *state ) override;
 };
 
 #endif // _RENDERSHAPEEXAMPLE_H_

Engine/source/T3D/fps/guiClockHud.cpp

@@ -55,7 +55,7 @@ public:
    void setReverseTime(F32 reverseTime);
    F32  getTime();
 
-   void onRender( Point2I, const RectI &);
+   void onRender( Point2I, const RectI &) override;
    static void initPersistFields();
    DECLARE_CONOBJECT( GuiClockHud );
    DECLARE_CATEGORY( "Gui Game" );

Engine/source/T3D/fps/guiCrossHairHud.cpp

@@ -53,7 +53,7 @@ protected:
 public:
    GuiCrossHairHud();
 
-   void onRender( Point2I, const RectI &);
+   void onRender( Point2I, const RectI &) override;
    static void initPersistFields();
    DECLARE_CONOBJECT( GuiCrossHairHud );
    DECLARE_CATEGORY( "Gui Game" );

Engine/source/T3D/fps/guiHealthBarHud.cpp

@@ -57,7 +57,7 @@ class GuiHealthBarHud : public GuiControl
 public:
    GuiHealthBarHud();
 
-   void onRender( Point2I, const RectI &);
+   void onRender( Point2I, const RectI &) override;
    static void initPersistFields();
    DECLARE_CONOBJECT( GuiHealthBarHud );
    DECLARE_CATEGORY( "Gui Game" );

Engine/source/T3D/fps/guiHealthTextHud.cpp

@@ -55,7 +55,7 @@ class GuiHealthTextHud : public GuiControl
 public:  
    GuiHealthTextHud();  
   
-   void onRender(Point2I, const RectI &);  
+   void onRender(Point2I, const RectI &) override;  
    static void initPersistFields();  
    DECLARE_CONOBJECT(GuiHealthTextHud);  
    DECLARE_CATEGORY("Gui Game");  

Engine/source/T3D/fps/guiShapeNameHud.cpp

@@ -69,7 +69,7 @@ public:
    GuiShapeNameHud();
 
    // GuiControl
-   virtual void onRender(Point2I offset, const RectI &updateRect);
+   void onRender(Point2I offset, const RectI &updateRect) override;
 
    static void initPersistFields();
    DECLARE_CONOBJECT( GuiShapeNameHud );

Engine/source/T3D/fx/cameraFXMgr.h

@@ -80,9 +80,9 @@ public:
    void setFalloff( F32 falloff ){ mFalloff = falloff; }
    void setFrequency( VectorF &freq ){ mFreq = freq; }
    void setAmplitude( VectorF &amp ){ mStartAmp = amp; }
-   bool isExpired();
+   bool isExpired() override;
 
-   virtual void update( F32 dt );
+   void update( F32 dt ) override;
 };
 
 

Engine/source/T3D/fx/explosion.h

@@ -132,16 +132,16 @@ class ExplosionData : public GameBaseData {
 
    ExplosionData();
    DECLARE_CONOBJECT(ExplosionData);
-   bool onAdd();
+   bool onAdd() override;
-   bool preload(bool server, String &errorStr);
+   bool preload(bool server, String &errorStr) override;
    static void  initPersistFields();
-   virtual void packData(BitStream* stream);
+   void packData(BitStream* stream) override;
-   virtual void unpackData(BitStream* stream);
+   void unpackData(BitStream* stream) override;
 public:
    /*C*/          ExplosionData(const ExplosionData&, bool = false);
    /*D*/          ~ExplosionData();
    ExplosionData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0);
-   virtual bool   allowSubstitutions() const { return true; }
+   bool   allowSubstitutions() const override { return true; }
 
    void onShapeChanged() {}
 };
@@ -175,12 +175,12 @@ class Explosion : public GameBase, public ISceneLight
    U32      mCollideType;
 
   protected:
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
    bool explode();
 
-   void processTick(const Move *move);
+   void processTick(const Move *move) override;
-   void advanceTime(F32 dt);
+   void advanceTime(F32 dt) override;
    void updateEmitters( F32 dt );
    void launchDebris( Point3F &axis );
    void spawnSubExplosions();
@@ -188,7 +188,7 @@ class Explosion : public GameBase, public ISceneLight
 
    // Rendering
   protected:
-   void prepRenderImage( SceneRenderState *state );
+   void prepRenderImage( SceneRenderState *state ) override;
    void prepBatchRender(SceneRenderState *state);
    void prepModelView(SceneRenderState*);
 
@@ -198,10 +198,10 @@ class Explosion : public GameBase, public ISceneLight
    void setInitialState(const Point3F& point, const Point3F& normal, const F32 fade = 1.0);
 
    // ISceneLight
-   virtual void submitLights( LightManager *lm, bool staticLighting );
+   void submitLights( LightManager *lm, bool staticLighting ) override;
-   virtual LightInfo* getLight() { return mLight; }
+   LightInfo* getLight() override { return mLight; }
 
-   bool onNewDataBlock( GameBaseData *dptr, bool reload );
+   bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
    void setCollideType( U32 cType ){ mCollideType = cType; }
 
    DECLARE_CONOBJECT(Explosion);

Engine/source/T3D/fx/fxFoliageReplicator.h

@@ -246,16 +246,16 @@ public:
    void HideReplication(void);
 
    // SceneObject
-   virtual void prepRenderImage( SceneRenderState *state );
+   void prepRenderImage( SceneRenderState *state ) override;
 
    // SimObject
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
-   void inspectPostApply();
+   void inspectPostApply() override;
 
    // NetObject
-   U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream);
+   U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override;
-   void unpackUpdate(NetConnection *conn, BitStream *stream);
+   void unpackUpdate(NetConnection *conn, BitStream *stream) override;
 
    // Editor
    void onGhostAlwaysDone();

Engine/source/T3D/fx/fxShapeReplicator.h

@@ -56,7 +56,7 @@ public:
    ~fxShapeReplicatedStatic() {};
    void touchNetFlags(const U32 m, bool setflag = true) { if (setflag) mNetFlags.set(m); else mNetFlags.clear(m); };
    TSShape* getShape(void) { return mShapeInstance->getShape(); };
-   void setTransform(const MatrixF & mat) { Parent::setTransform(mat); setRenderTransform(mat); };
+   void setTransform(const MatrixF & mat) override { Parent::setTransform(mat); setRenderTransform(mat); };
 
    DECLARE_CONOBJECT(fxShapeReplicatedStatic);
    DECLARE_CATEGORY("UNLISTED");
@@ -102,16 +102,16 @@ public:
    void renderPlacementArea(const F32 ElapsedTime);
 
    // SceneObject
-   virtual void prepRenderImage( SceneRenderState *state );
+   void prepRenderImage( SceneRenderState *state ) override;
 
    // SimObject
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
-   void inspectPostApply();
+   void inspectPostApply() override;
 
    // NetObject
-   U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream);
+   U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override;
-   void unpackUpdate(NetConnection *conn, BitStream *stream);
+   void unpackUpdate(NetConnection *conn, BitStream *stream) override;
 
    // Editor
    void onGhostAlwaysDone();

Engine/source/T3D/fx/groundCover.h

@@ -93,11 +93,11 @@ public:
 
    GroundCoverShaderConstHandles();
 
-   virtual void init( GFXShader *shader );
+   void init( GFXShader *shader ) override;
 
-   virtual void setConsts( SceneRenderState *state, 
+   void setConsts( SceneRenderState *state, 
                            const SceneData &sgData,
-                           GFXShaderConstBuffer *buffer );
+                           GFXShaderConstBuffer *buffer ) override;
 
    GroundCover *mGroundCover;
 
@@ -128,16 +128,16 @@ public:
    static void consoleInit();
    static void initPersistFields();
 
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
-   void inspectPostApply();
+   void inspectPostApply() override;
 
    // Network
-   U32 packUpdate( NetConnection *, U32 mask, BitStream *stream );
+   U32 packUpdate( NetConnection *, U32 mask, BitStream *stream ) override;
-   void unpackUpdate( NetConnection *, BitStream *stream );
+   void unpackUpdate( NetConnection *, BitStream *stream ) override;
 
    // Rendering
-   void prepRenderImage( SceneRenderState *state );
+   void prepRenderImage( SceneRenderState *state ) override;
    
    // Editor
    void onTerrainUpdated( U32 flags, TerrainBlock *tblock, const Point2I& min, const Point2I& max );

Engine/source/T3D/fx/lightning.cpp

@@ -131,10 +131,10 @@ class LightningStrikeEvent : public NetEvent
    LightningStrikeEvent();
    ~LightningStrikeEvent();
 
-   void pack(NetConnection*, BitStream*);
+   void pack(NetConnection*, BitStream*) override;
-   void write(NetConnection*, BitStream*){}
+   void write(NetConnection*, BitStream*) override{}
-   void unpack(NetConnection*, BitStream*);
+   void unpack(NetConnection*, BitStream*) override;
-   void process(NetConnection*);
+   void process(NetConnection*) override;
 
    DECLARE_CONOBJECT(LightningStrikeEvent);
 };

Engine/source/T3D/fx/lightning.h

@@ -80,15 +80,15 @@ class LightningData : public GameBaseData
    U32           mNumStrikeTextures;
 
   protected:
-   bool onAdd();
+   bool onAdd() override;
 
   public:
    LightningData();
    ~LightningData();
 
-   void packData(BitStream*);
+   void packData(BitStream*) override;
-   void unpackData(BitStream*);
+   void unpackData(BitStream*) override;
-   bool preload(bool server, String &errorStr);
+   bool preload(bool server, String &errorStr) override;
 
    DECLARE_CONOBJECT(LightningData);
    static void initPersistFields();
@@ -162,9 +162,9 @@ class Lightning : public GameBase
    typedef GameBase Parent;
 
   protected:
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
-   bool onNewDataBlock( GameBaseData *dptr, bool reload );
+   bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
 
    DECLARE_CALLBACK( void, applyDamage, ( const Point3F& hitPosition, const Point3F& hitNormal, SceneObject* hitObject ));
 
@@ -206,13 +206,13 @@ class Lightning : public GameBase
   protected:
 
    // Rendering
-   void prepRenderImage(SceneRenderState *state);
+   void prepRenderImage(SceneRenderState *state) override;
    void renderObject(ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance* );
 
    // Time management
-   void processTick(const Move *move);
+   void processTick(const Move *move) override;
-   void interpolateTick(F32 delta);
+   void interpolateTick(F32 delta) override;
-   void advanceTime(F32 dt);
+   void advanceTime(F32 dt) override;
 
    // Strike management
    void scheduleThunder(Strike*);
@@ -242,8 +242,8 @@ class Lightning : public GameBase
    DECLARE_CATEGORY("Environment \t Weather");
    static void initPersistFields();
 
-   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream);
+   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream) override;
-   void unpackUpdate(NetConnection *conn,           BitStream *stream);
+   void unpackUpdate(NetConnection *conn,           BitStream *stream) override;
 };
 
 #endif // _H_LIGHTNING

Engine/source/T3D/fx/particle.h

@@ -101,18 +101,18 @@ public:
    // move this procedure to Particle
    void initializeParticle(Particle*, const Point3F&);
 
-   void packData(BitStream* stream);
+   void packData(BitStream* stream) override;
-   void unpackData(BitStream* stream);
+   void unpackData(BitStream* stream) override;
-   bool onAdd();
+   bool onAdd() override;
-   bool preload(bool server, String &errorStr);
+   bool preload(bool server, String &errorStr) override;
    DECLARE_CONOBJECT(ParticleData);
    static void  initPersistFields();
 
    bool reload(char errorBuffer[256]);
   public:
    /*C*/  ParticleData(const ParticleData&, bool = false);
-   virtual void onPerformSubstitutions();
+   void onPerformSubstitutions() override;
-   virtual bool allowSubstitutions() const { return true; }
+   bool allowSubstitutions() const override { return true; }
   protected:
    F32   spinBias;
    bool  randomizeSpinDir;
@@ -160,4 +160,4 @@ struct Particle
 };
 
 
-#endif // _PARTICLE_H_
+#endif // _PARTICLE_H_

Engine/source/T3D/fx/particleEmitter.h

@@ -69,10 +69,10 @@ class ParticleEmitterData : public GameBaseData
    ParticleEmitterData();
    DECLARE_CONOBJECT(ParticleEmitterData);
    static void initPersistFields();
-   void packData(BitStream* stream);
+   void packData(BitStream* stream) override;
-   void unpackData(BitStream* stream);
+   void unpackData(BitStream* stream) override;
-   bool preload(bool server, String &errorStr);
+   bool preload(bool server, String &errorStr) override;
-   bool onAdd();
+   bool onAdd() override;
    void allocPrimBuffer( S32 overrideSize = -1 );
 
   public:
@@ -147,7 +147,7 @@ public:
    /*C*/ ParticleEmitterData(const ParticleEmitterData&, bool = false);
    /*D*/ ~ParticleEmitterData();
    virtual ParticleEmitterData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0);
-   virtual bool allowSubstitutions() const { return true; }
+   bool allowSubstitutions() const override { return true; }
 };
 
 //*****************************************************************************
@@ -184,7 +184,7 @@ class ParticleEmitter : public GameBase
    void setColors( LinearColorF *colorList );
 
    ParticleEmitterData *getDataBlock(){ return mDataBlock; }
-   bool onNewDataBlock( GameBaseData *dptr, bool reload );
+   bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
 
    /// By default, a particle renderer will wait for it's owner to delete it.  When this
    /// is turned on, it will delete itself as soon as it's particle count drops to zero.
@@ -259,15 +259,15 @@ class ParticleEmitter : public GameBase
 
    /// @}
   protected:
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
 
-   void processTick(const Move *move);
+   void processTick(const Move *move) override;
-   void advanceTime(F32 dt);
+   void advanceTime(F32 dt) override;
 
    // Rendering
   protected:
-   void prepRenderImage( SceneRenderState *state );
+   void prepRenderImage( SceneRenderState *state ) override;
    void copyToVB( const Point3F &camPos, const LinearColorF &ambientColor );
 
    // PEngine interface

Engine/source/T3D/fx/particleEmitterNode.h

@@ -38,7 +38,7 @@ class ParticleEmitterNodeData : public GameBaseData
    typedef GameBaseData Parent;
 
   protected:
-   bool onAdd();
+   bool onAdd() override;
 
    //-------------------------------------- Console set variables
   public:
@@ -51,9 +51,9 @@ class ParticleEmitterNodeData : public GameBaseData
    ParticleEmitterNodeData();
    ~ParticleEmitterNodeData();
 
-   void packData(BitStream*);
+   void packData(BitStream*) override;
-   void unpackData(BitStream*);
+   void unpackData(BitStream*) override;
-   bool preload(bool server, String &errorStr);
+   bool preload(bool server, String &errorStr) override;
 
    DECLARE_CONOBJECT(ParticleEmitterNodeData);
    static void initPersistFields();
@@ -78,10 +78,10 @@ class ParticleEmitterNode : public GameBase
    ParticleEmitterNodeData* mDataBlock;
 
   protected:
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
-   bool onNewDataBlock( GameBaseData *dptr, bool reload );
+   bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
-   void inspectPostApply();
+   void inspectPostApply() override;
 
    ParticleEmitterData* mEmitterDatablock;
    S32                  mEmitterDatablockId;
@@ -99,15 +99,15 @@ class ParticleEmitterNode : public GameBase
    
    // Time/Move Management
   public:
-   void processTick(const Move* move);
+   void processTick(const Move* move) override;
-   void advanceTime(F32 dt);
+   void advanceTime(F32 dt) override;
 
    DECLARE_CONOBJECT(ParticleEmitterNode);
    DECLARE_CATEGORY("Environment \t FX");
    static void initPersistFields();
 
-   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream* stream);
+   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream* stream) override;
-   void unpackUpdate(NetConnection *conn,           BitStream* stream);
+   void unpackUpdate(NetConnection *conn,           BitStream* stream) override;
 
    inline bool getActive( void )        { return mActive;                             };
    inline void setActive( bool active ) { mActive = active; setMaskBits( StateMask ); };

Engine/source/T3D/fx/precipitation.h

@@ -64,10 +64,10 @@ class PrecipitationData : public GameBaseData
    
       PrecipitationData();
       DECLARE_CONOBJECT(PrecipitationData);
-      bool preload( bool server, String& errorStr );
+      bool preload( bool server, String& errorStr ) override;
       static void  initPersistFields();
-      virtual void packData(BitStream* stream);
+      void packData(BitStream* stream) override;
-      virtual void unpackData(BitStream* stream);
+      void unpackData(BitStream* stream) override;
 
       void onDropChanged() {}
       void onSplashChanged() {}
@@ -233,8 +233,8 @@ class Precipitation : public GameBase
    } mTurbulenceData;
 
    //other functions...
-   void processTick(const Move*);
+   void processTick(const Move*) override;
-   void interpolateTick(F32 delta);
+   void interpolateTick(F32 delta) override;
 
    VectorF getWindVelocity();
    void fillDropList();                       ///< Adds/removes drops from the list to have the right # of drops
@@ -253,20 +253,20 @@ class Precipitation : public GameBase
    GFXPrimitiveBufferHandle mRainIB;
    GFXVertexBufferHandle<GFXVertexPCT> mRainVB;
 
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
 
    // Rendering
-   void prepRenderImage( SceneRenderState* state );
+   void prepRenderImage( SceneRenderState* state ) override;
    void renderObject(ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance* );
 
-   void setTransform(const MatrixF &mat);
+   void setTransform(const MatrixF &mat) override;
 
   public:
 
    Precipitation();
    ~Precipitation();
-   void inspectPostApply();
+   void inspectPostApply() override;
 
    enum
    {
@@ -278,13 +278,13 @@ class Precipitation : public GameBase
       NextFreeMask   = Parent::NextFreeMask << 5
    };
 
-   bool onNewDataBlock( GameBaseData *dptr, bool reload );
+   bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
    DECLARE_CONOBJECT(Precipitation);
    DECLARE_CATEGORY("Environment \t Weather");
    static void initPersistFields();
    
-   U32  packUpdate(NetConnection*, U32 mask, BitStream* stream);
+   U32  packUpdate(NetConnection*, U32 mask, BitStream* stream) override;
-   void unpackUpdate(NetConnection*, BitStream* stream);
+   void unpackUpdate(NetConnection*, BitStream* stream) override;
 
    void setPercentage(F32 pct);
    void modifyStorm(F32 pct, U32 ms);

Engine/source/T3D/fx/ribbon.h

@@ -44,7 +44,7 @@ class RibbonData : public GameBaseData
    typedef GameBaseData Parent;
 
 protected:
-   bool onAdd();
+   bool onAdd() override;
 
 public:
 
@@ -70,9 +70,9 @@ public:
 
    RibbonData();
 
-   void packData(BitStream*);
+   void packData(BitStream*) override;
-   void unpackData(BitStream*);
+   void unpackData(BitStream*) override;
-   bool preload(bool server, String &errorBuffer);
+   bool preload(bool server, String &errorBuffer) override;
 
    static void initPersistFields();
    DECLARE_CONOBJECT(RibbonData);
@@ -104,13 +104,13 @@ class Ribbon : public GameBase
 
 protected:
 
-   bool onAdd();
+   bool onAdd() override;
-   void processTick(const Move*);
+   void processTick(const Move*) override;
-   void advanceTime(F32);
+   void advanceTime(F32) override;
-   void interpolateTick(F32 delta);
+   void interpolateTick(F32 delta) override;
 
    // Rendering
-   void prepRenderImage(SceneRenderState *state);
+   void prepRenderImage(SceneRenderState *state) override;
    void setShaderParams();
 
    ///Checks to see if ribbon is too long
@@ -126,8 +126,8 @@ public:
    DECLARE_CONOBJECT(Ribbon);
    DECLARE_CATEGORY("UNLISTED");
    static void initPersistFields();
-   bool onNewDataBlock(GameBaseData*,bool);
+   bool onNewDataBlock(GameBaseData*,bool) override;
-   void onRemove();
+   void onRemove() override;
 
    /// Used to add another segment to the ribbon.
    void addSegmentPoint(Point3F &point, MatrixF &mat);

Engine/source/T3D/fx/ribbonNode.h

@@ -63,10 +63,10 @@ class RibbonNode : public GameBase
    RibbonNodeData* mDataBlock;
 
 protected:
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
-   bool onNewDataBlock( GameBaseData *dptr, bool reload );
+   bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
-   void inspectPostApply();
+   void inspectPostApply() override;
 
    RibbonData* mRibbonDatablock;
    S32 mRibbonDatablockId;
@@ -83,15 +83,15 @@ public:
 
    // Time/Move Management
 
-   void processTick(const Move* move);
+   void processTick(const Move* move) override;
-   void advanceTime(F32 dt);
+   void advanceTime(F32 dt) override;
 
    DECLARE_CONOBJECT(RibbonNode);
    DECLARE_CATEGORY("Environment \t FX");
    static void initPersistFields();
 
-   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream* stream);
+   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream* stream) override;
-   void unpackUpdate(NetConnection *conn,           BitStream* stream);
+   void unpackUpdate(NetConnection *conn,           BitStream* stream) override;
 
    inline bool getActive( void )        { return mActive;                             };
    inline void setActive( bool active ) { mActive = active; setMaskBits( StateMask ); };

Engine/source/T3D/fx/splash.h

@@ -130,11 +130,11 @@ public:
 
    SplashData();
    DECLARE_CONOBJECT(SplashData);
-   bool onAdd();
+   bool onAdd() override;
-   bool preload(bool server, String &errorStr);
+   bool preload(bool server, String &errorStr) override;
    static void  initPersistFields();
-   virtual void packData(BitStream* stream);
+   void packData(BitStream* stream) override;
-   virtual void unpackData(BitStream* stream);
+   void unpackData(BitStream* stream) override;
 };
 
 //--------------------------------------------------------------------------
@@ -172,10 +172,10 @@ protected:
    S32         mDelayMS;
 
 protected:
-   bool        onAdd();
+   bool        onAdd() override;
-   void        onRemove();
+   void        onRemove() override;
-   void        processTick(const Move *move);
+   void        processTick(const Move *move) override;
-   void        advanceTime(F32 dt);
+   void        advanceTime(F32 dt) override;
    void        updateEmitters( F32 dt );
    void        updateWave( F32 dt );
    void        updateColor();
@@ -190,10 +190,10 @@ public:
    ~Splash();
    void setInitialState(const Point3F& point, const Point3F& normal, const F32 fade = 1.0);
 
-   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream* stream);
+   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream* stream) override;
-   void unpackUpdate(NetConnection *conn,           BitStream* stream);
+   void unpackUpdate(NetConnection *conn,           BitStream* stream) override;
 
-   bool onNewDataBlock( GameBaseData *dptr, bool reload );
+   bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
    DECLARE_CONOBJECT(Splash);
    DECLARE_CATEGORY("UNLISTED");
 };

Engine/source/T3D/gameBase/extended/extendedMove.h

@@ -29,11 +29,11 @@ struct ExtendedMove : public Move
 
    ExtendedMove();
 
-   virtual void pack(BitStream *stream, const Move * move = NULL);
+   void pack(BitStream *stream, const Move * move = NULL) override;
-   virtual void unpack(BitStream *stream, const Move * move = NULL);
+   void unpack(BitStream *stream, const Move * move = NULL) override;
 
-   virtual void clamp();
+   void clamp() override;
-   virtual void unclamp();
+   void unclamp() override;
 };
 
 extern const ExtendedMove NullExtendedMove;

Engine/source/T3D/gameBase/gameBase.h

@@ -99,17 +99,17 @@ public:
    Signal<void(void)> mReloadSignal;
 
    // Triggers the reload signal.
-   void inspectPostApply();
+   void inspectPostApply() override;
 
-   bool onAdd();   
+   bool onAdd() override;   
 
    // The derived class should provide the following:
    DECLARE_CONOBJECT(GameBaseData);
    DECLARE_CATEGORY("Datablock");
    GameBaseData();
    static void initPersistFields();
-   bool preload(bool server, String &errorStr);
+   bool preload(bool server, String &errorStr) override;
-   void unpackData(BitStream* stream);
+   void unpackData(BitStream* stream) override;
 
    /// @name Callbacks
    /// @{
@@ -256,9 +256,9 @@ public:
    /// @name Inherited Functionality.
    /// @{
 
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
-   void inspectPostApply();
+   void inspectPostApply() override;
    static void initPersistFields();
    static void consoleInit();
 
@@ -308,7 +308,7 @@ public:
    /// @}
 
    // ProcessObject override
-   void processTick( const Move *move ); 
+   void processTick( const Move *move ) override; 
 
    /// @name GameBase NetFlags & Hifi-Net Interface   
    /// @{
@@ -359,10 +359,10 @@ public:
    /// @name Network
    /// @see NetObject, NetConnection
    /// @{
-   void interpolateTick(F32 dt);
+   void interpolateTick(F32 dt) override;
-   F32  getUpdatePriority( CameraScopeQuery *focusObject, U32 updateMask, S32 updateSkips );
+   F32  getUpdatePriority( CameraScopeQuery *focusObject, U32 updateMask, S32 updateSkips ) override;
-   U32  packUpdate  ( NetConnection *conn, U32 mask, BitStream *stream );
+   U32  packUpdate  ( NetConnection *conn, U32 mask, BitStream *stream ) override;
-   void unpackUpdate( NetConnection *conn,           BitStream *stream );
+   void unpackUpdate( NetConnection *conn,           BitStream *stream ) override;
 
    /// Write state information necessary to perform client side prediction of an object.
    ///
@@ -387,7 +387,7 @@ public:
    ///
    /// @see writePacketData
    /// @param   conn   Game connection
-   virtual U32 getPacketDataChecksum( GameConnection *conn );
+   U32 getPacketDataChecksum( GameConnection *conn ) override;
    ///@}
 
 
@@ -396,8 +396,8 @@ public:
 
 public:
 
-   virtual void onMount( SceneObject *obj, S32 node );   
+   void onMount( SceneObject *obj, S32 node ) override;   
-   virtual void onUnmount( SceneObject *obj,S32 node ); 
+   void onUnmount( SceneObject *obj,S32 node ) override; 
 
    /// @}
 
@@ -405,7 +405,7 @@ public:
    /// @{
 
    /// Returns the client controlling this object
-   GameConnection *getControllingClient() { return mControllingClient; }
+   GameConnection *getControllingClient() override { return mControllingClient; }
    const GameConnection *getControllingClient() const { return mControllingClient; }
 
    /// Returns the MoveList of the client controlling this object.
@@ -466,7 +466,7 @@ private:
    ///   
    void _onDatablockModified();
 protected:
-   void    onScopeIdChange() { setMaskBits(ScopeIdMask); }
+   void    onScopeIdChange() override { setMaskBits(ScopeIdMask); }
 };
 
 

Engine/source/T3D/gameBase/gameConnection.h

@@ -149,24 +149,24 @@ public:
    /// @name Event Handling
    /// @{
 
-   virtual void onTimedOut();
+   void onTimedOut() override;
-   virtual void onConnectTimedOut();
+   void onConnectTimedOut() override;
-   virtual void onDisconnect(const char *reason);
+   void onDisconnect(const char *reason) override;
-   virtual void onConnectionRejected(const char *reason);
+   void onConnectionRejected(const char *reason) override;
-   virtual void onConnectionEstablished(bool isInitiator);
+   void onConnectionEstablished(bool isInitiator) override;
-   virtual void handleStartupError(const char *errorString);
+   void handleStartupError(const char *errorString) override;
    /// @}
 
    /// @name Packet I/O
    /// @{
 
-   virtual void writeConnectRequest(BitStream *stream);
+   void writeConnectRequest(BitStream *stream) override;
-   virtual bool readConnectRequest(BitStream *stream, const char **errorString);
+   bool readConnectRequest(BitStream *stream, const char **errorString) override;
-   virtual void writeConnectAccept(BitStream *stream);
+   void writeConnectAccept(BitStream *stream) override;
-   virtual bool readConnectAccept(BitStream *stream, const char **errorString);
+   bool readConnectAccept(BitStream *stream, const char **errorString) override;
    /// @}
 
-   bool canRemoteCreate();
+   bool canRemoteCreate() override;
 
    void setVisibleGhostDistance(F32 dist);
    F32 getVisibleGhostDistance();
@@ -188,7 +188,7 @@ protected:
       S32 cameraFov;
       GamePacketNotify();
    };
-   PacketNotify *allocNotify();
+   PacketNotify *allocNotify() override;
 
    bool mControlForceMismatch;
 
@@ -223,28 +223,28 @@ protected:
    /// @name Packet I/O
    /// @{
 
-   void readPacket      (BitStream *bstream);
+   void readPacket      (BitStream *bstream) override;
-   void writePacket     (BitStream *bstream, PacketNotify *note);
+   void writePacket     (BitStream *bstream, PacketNotify *note) override;
-   void packetReceived  (PacketNotify *note);
+   void packetReceived  (PacketNotify *note) override;
-   void packetDropped   (PacketNotify *note);
+   void packetDropped   (PacketNotify *note) override;
-   void connectionError (const char *errorString);
+   void connectionError (const char *errorString) override;
 
-   void writeDemoStartBlock   (ResizeBitStream *stream);
+   void writeDemoStartBlock   (ResizeBitStream *stream) override;
-   bool readDemoStartBlock    (BitStream *stream);
+   bool readDemoStartBlock    (BitStream *stream) override;
-   void handleRecordedBlock   (U32 type, U32 size, void *data);
+   void handleRecordedBlock   (U32 type, U32 size, void *data) override;
    /// @}
-   void ghostWriteExtra(NetObject *,BitStream *);
+   void ghostWriteExtra(NetObject *,BitStream *) override;
-   void ghostReadExtra(NetObject *,BitStream *, bool newGhost);
+   void ghostReadExtra(NetObject *,BitStream *, bool newGhost) override;
-   void ghostPreRead(NetObject *, bool newGhost);
+   void ghostPreRead(NetObject *, bool newGhost) override;
    
-   virtual void onEndGhosting();
+   void onEndGhosting() override;
 
 public:
 
    DECLARE_CONOBJECT(GameConnection);
-   void handleConnectionMessage(U32 message, U32 sequence, U32 ghostCount);
+   void handleConnectionMessage(U32 message, U32 sequence, U32 ghostCount) override;
    void preloadDataBlock(SimDataBlock *block);
-   void fileDownloadSegmentComplete();
+   void fileDownloadSegmentComplete() override;
    void preloadNextDataBlock(bool hadNew);
    
    static void consoleInit();
@@ -253,8 +253,8 @@ public:
    GameConnection();
    ~GameConnection();
 
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
 
    static GameConnection *getConnectionToServer() 
    { 
@@ -362,8 +362,8 @@ public:
    bool isFirstPerson() const  { return mCameraPos == 0; }
    bool isAIControlled() { return mAIControlled; }
 
-   void doneScopingScene();
+   void doneScopingScene() override;
-   void demoPlaybackComplete();
+   void demoPlaybackComplete() override;
 
    void setMissionCRC(U32 crc)           { mMissionCRC = crc; }
    U32  getMissionCRC()           { return(mMissionCRC); }
@@ -399,7 +399,7 @@ private:
    bool          mChangedSelectedObj;
    U32           mPreSelectTimestamp;
 protected:
-   virtual void  onDeleteNotify(SimObject*);
+   void  onDeleteNotify(SimObject*) override;
 public:   
    void          setRolloverObj(SceneObject*);   
    SceneObject*  getRolloverObj() { return  mRolloverObj; }   

Engine/source/T3D/gameBase/gameConnectionEvents.h

@@ -45,7 +45,7 @@
 
 class QuitEvent : public SimEvent
 {
-   void process(SimObject *object)
+   void process(SimObject *object) override
    {
       Platform::postQuitMessage(0);
    }
@@ -91,11 +91,11 @@ class SimDataBlockEvent : public NetEvent
       SimDataBlockEvent(SimDataBlock* obj = NULL, U32 index = 0, U32 total = 0, U32 missionSequence = 0);
       ~SimDataBlockEvent();
       
-      void pack(NetConnection *, BitStream *bstream);
+      void pack(NetConnection *, BitStream *bstream) override;
-      void write(NetConnection *, BitStream *bstream);
+      void write(NetConnection *, BitStream *bstream) override;
-      void unpack(NetConnection *cptr, BitStream *bstream);
+      void unpack(NetConnection *cptr, BitStream *bstream) override;
-      void process(NetConnection*);
+      void process(NetConnection*) override;
-      void notifyDelivered(NetConnection *, bool);
+      void notifyDelivered(NetConnection *, bool) override;
       
       #ifdef TORQUE_DEBUG_NET
       const char *getDebugName();
@@ -115,10 +115,10 @@ public:
    typedef NetEvent Parent;
    
    SimSoundAssetEvent(StringTableEntry assetId = StringTable->EmptyString(), const MatrixF* mat = NULL);
-   void pack(NetConnection*, BitStream* bstream);
+   void pack(NetConnection*, BitStream* bstream) override;
-   void write(NetConnection*, BitStream* bstream);
+   void write(NetConnection*, BitStream* bstream) override;
-   void unpack(NetConnection*, BitStream* bstream);
+   void unpack(NetConnection*, BitStream* bstream) override;
-   void process(NetConnection*);
+   void process(NetConnection*) override;
    DECLARE_CONOBJECT(SimSoundAssetEvent);
 };
 
@@ -130,10 +130,10 @@ class Sim2DAudioEvent: public NetEvent
   public:
    typedef NetEvent Parent;
    Sim2DAudioEvent(SFXProfile *profile=NULL);
-   void pack(NetConnection *, BitStream *bstream);
+   void pack(NetConnection *, BitStream *bstream) override;
-   void write(NetConnection *, BitStream *bstream);
+   void write(NetConnection *, BitStream *bstream) override;
-   void unpack(NetConnection *, BitStream *bstream);
+   void unpack(NetConnection *, BitStream *bstream) override;
-   void process(NetConnection *);
+   void process(NetConnection *) override;
    DECLARE_CONOBJECT(Sim2DAudioEvent);
 };
 
@@ -146,10 +146,10 @@ class Sim3DAudioEvent: public NetEvent
   public:
    typedef NetEvent Parent;
    Sim3DAudioEvent(SFXProfile *profile=NULL,const MatrixF* mat=NULL);
-   void pack(NetConnection *, BitStream *bstream);
+   void pack(NetConnection *, BitStream *bstream) override;
-   void write(NetConnection *, BitStream *bstream);
+   void write(NetConnection *, BitStream *bstream) override;
-   void unpack(NetConnection *, BitStream *bstream);
+   void unpack(NetConnection *, BitStream *bstream) override;
-   void process(NetConnection *);
+   void process(NetConnection *) override;
    DECLARE_CONOBJECT(Sim3DAudioEvent);
 };
 
@@ -166,13 +166,13 @@ class SetMissionCRCEvent : public NetEvent
       typedef NetEvent Parent;
       SetMissionCRCEvent(U32 crc = 0xffffffff)
          { mCrc = crc; }
-      void pack(NetConnection *, BitStream * bstream)
+      void pack(NetConnection *, BitStream * bstream) override
          { bstream->write(mCrc); }
-      void write(NetConnection * con, BitStream * bstream)
+      void write(NetConnection * con, BitStream * bstream) override
          { pack(con, bstream); }
-      void unpack(NetConnection *, BitStream * bstream)
+      void unpack(NetConnection *, BitStream * bstream) override
          { bstream->read(&mCrc); }
-      void process(NetConnection * con)
+      void process(NetConnection * con) override
          { static_cast<GameConnection*>(con)->setMissionCRC(mCrc); }
 
       DECLARE_CONOBJECT(SetMissionCRCEvent);

Engine/source/T3D/gameBase/gameProcess.h

@@ -45,7 +45,7 @@ public:
    ClientProcessList();
    
    // ProcessList
-   void addObject( ProcessObject *pobj );  
+   void addObject( ProcessObject *pobj ) override;  
    
    /// Called after a correction packet is received from the server.
    /// If the control object was corrected it will now play back any moves
@@ -57,7 +57,7 @@ public:
 protected:   
    
    // ProcessList
-   void onPreTickObject( ProcessObject *pobj );
+   void onPreTickObject( ProcessObject *pobj ) override;
 
    /// Returns true if backlogged.
    bool doBacklogged( SimTime timeDelta );
@@ -77,15 +77,15 @@ public:
    ServerProcessList();
    
    // ProcessList
-   void addObject( ProcessObject *pobj );
+   void addObject( ProcessObject *pobj ) override;
 
    static ServerProcessList* get() { return smServerProcessList; }
 
 protected:
 
    // ProcessList
-   void onPreTickObject( ProcessObject *pobj );
+   void onPreTickObject( ProcessObject *pobj ) override;
-   void advanceObjects();
+   void advanceObjects() override;
 
 protected:
 

Engine/source/T3D/gameBase/std/stdGameProcess.h

@@ -42,19 +42,19 @@ class StdClientProcessList : public ClientProcessList
 protected:
    
    // ProcessList
-   void onTickObject(ProcessObject *);
+   void onTickObject(ProcessObject *) override;
-   void advanceObjects();
+   void advanceObjects() override;
-   void onAdvanceObjects();
+   void onAdvanceObjects() override;
    
 public:
 
    StdClientProcessList();  
 
    // ProcessList
-   bool advanceTime( SimTime timeDelta );
+   bool advanceTime( SimTime timeDelta ) override;
    
    // ClientProcessList
-   void clientCatchup( GameConnection *conn );
+   void clientCatchup( GameConnection *conn ) override;
    
    static void init();
    static void shutdown();
@@ -67,9 +67,9 @@ class StdServerProcessList : public ServerProcessList
 protected:
 
    // ProcessList
-   void onPreTickObject( ProcessObject *pobj );
+   void onPreTickObject( ProcessObject *pobj ) override;
-   void onTickObject( ProcessObject *pobj );
+   void onTickObject( ProcessObject *pobj ) override;
-   void advanceObjects();
+   void advanceObjects() override;
 
 public:
 

Engine/source/T3D/gameBase/std/stdMoveList.h

@@ -35,17 +35,17 @@ public:
 
    StdMoveList();
 
-   void clientWriteMovePacket(BitStream *);
+   void clientWriteMovePacket(BitStream *) override;
-   void clientReadMovePacket(BitStream *);
+   void clientReadMovePacket(BitStream *) override;
 
-   void serverWriteMovePacket(BitStream *);
+   void serverWriteMovePacket(BitStream *) override;
-   void serverReadMovePacket(BitStream *);
+   void serverReadMovePacket(BitStream *) override;
 
-   U32 getMoves(Move**,U32* numMoves);
+   U32 getMoves(Move**,U32* numMoves) override;
-   void clearMoves(U32 count);
+   void clearMoves(U32 count) override;
 
-   void advanceMove();
+   void advanceMove() override;
-   void onAdvanceObjects() {}
+   void onAdvanceObjects() override {}
 
 protected:
 

Engine/source/T3D/gameTSCtrl.h

@@ -47,22 +47,22 @@ public:
    DECLARE_CONOBJECT(GameTSCtrl);
    DECLARE_DESCRIPTION( "A control that renders a 3D view from the current control object." );
 
-   bool processCameraQuery(CameraQuery *query);
+   bool processCameraQuery(CameraQuery *query) override;
-   void renderWorld(const RectI &updateRect);
+   void renderWorld(const RectI &updateRect) override;
 
    // GuiControl
-   virtual void onMouseDown(const GuiEvent &evt);
+   void onMouseDown(const GuiEvent &evt) override;
-   virtual void onRightMouseDown(const GuiEvent &evt);
+   void onRightMouseDown(const GuiEvent &evt) override;
-   virtual void onMiddleMouseDown(const GuiEvent &evt);
+   void onMiddleMouseDown(const GuiEvent &evt) override;
 
-   virtual void onMouseUp(const GuiEvent &evt);
+   void onMouseUp(const GuiEvent &evt) override;
-   virtual void onRightMouseUp(const GuiEvent &evt);
+   void onRightMouseUp(const GuiEvent &evt) override;
-   virtual void onMiddleMouseUp(const GuiEvent &evt);
+   void onMiddleMouseUp(const GuiEvent &evt) override;
 
-   void onMouseMove(const GuiEvent &evt);
+   void onMouseMove(const GuiEvent &evt) override;
-   void onRender(Point2I offset, const RectI &updateRect);
+   void onRender(Point2I offset, const RectI &updateRect) override;
 
-   virtual bool onAdd();
+   bool onAdd() override;
 };
 
 #endif

Engine/source/T3D/groundPlane.h

@@ -65,21 +65,21 @@ public:
    GroundPlane();
    virtual ~GroundPlane();
 
-   virtual bool      onAdd();
+   bool      onAdd() override;
-   virtual void      onRemove();
+   void      onRemove() override;
-   virtual U32       packUpdate( NetConnection* connection, U32 mask, BitStream* stream );
+   U32       packUpdate( NetConnection* connection, U32 mask, BitStream* stream ) override;
-   virtual void      unpackUpdate( NetConnection* connection, BitStream* stream );
+   void      unpackUpdate( NetConnection* connection, BitStream* stream ) override;
-   virtual void      prepRenderImage( SceneRenderState* state );
+   void      prepRenderImage( SceneRenderState* state ) override;
-   virtual bool      castRay( const Point3F& start, const Point3F& end, RayInfo* info );
+   bool      castRay( const Point3F& start, const Point3F& end, RayInfo* info ) override;
-   virtual void      buildConvex( const Box3F& box, Convex* convex );
+   void      buildConvex( const Box3F& box, Convex* convex ) override;
-   virtual bool      buildPolyList( PolyListContext context, AbstractPolyList* polyList, const Box3F& box, const SphereF& sphere );
+   bool      buildPolyList( PolyListContext context, AbstractPolyList* polyList, const Box3F& box, const SphereF& sphere ) override;
-   virtual void      inspectPostApply();
+   void      inspectPostApply() override;
-   virtual void      setTransform( const MatrixF &mat );
+   void      setTransform( const MatrixF &mat ) override;
-   virtual void      setScale( const Point3F& scale );
+   void      setScale( const Point3F& scale ) override;
 
    static void       initPersistFields();
 
-   virtual void getUtilizedAssets(Vector<StringTableEntry>* usedAssetsList);
+   void getUtilizedAssets(Vector<StringTableEntry>* usedAssetsList) override;
 
 protected:
 

Engine/source/T3D/guiMaterialPreview.h

@@ -77,21 +77,21 @@ protected:
    LightInfo*  mFakeSun;
 
 public:
-   bool onWake();
+   bool onWake() override;
 
-   void onMouseEnter(const GuiEvent &event);
+   void onMouseEnter(const GuiEvent &event) override;
-   void onMouseLeave(const GuiEvent &event);
+   void onMouseLeave(const GuiEvent &event) override;
-   void onMouseDown(const GuiEvent &event);
+   void onMouseDown(const GuiEvent &event) override;
-   void onMouseUp(const GuiEvent &event);
+   void onMouseUp(const GuiEvent &event) override;
-   void onMouseDragged(const GuiEvent &event);
+   void onMouseDragged(const GuiEvent &event) override;
-   void onRightMouseDown(const GuiEvent &event);
+   void onRightMouseDown(const GuiEvent &event) override;
-   void onRightMouseUp(const GuiEvent &event);
+   void onRightMouseUp(const GuiEvent &event) override;
-   void onRightMouseDragged(const GuiEvent &event);
+   void onRightMouseDragged(const GuiEvent &event) override;
-   bool onMouseWheelUp(const GuiEvent &event);
+   bool onMouseWheelUp(const GuiEvent &event) override;
-   bool onMouseWheelDown(const GuiEvent &event);
+   bool onMouseWheelDown(const GuiEvent &event) override;
-   void onMiddleMouseUp(const GuiEvent &event);
+   void onMiddleMouseUp(const GuiEvent &event) override;
-   void onMiddleMouseDown(const GuiEvent &event);
+   void onMiddleMouseDown(const GuiEvent &event) override;
-   void onMiddleMouseDragged(const GuiEvent &event);
+   void onMiddleMouseDragged(const GuiEvent &event) override;
    
    // For Camera Panning.
    void setTranslate(S32 modifier, F32 xstep, F32 ystep);
@@ -110,8 +110,8 @@ public:
    void resetViewport();
    void setOrbitDistance(F32 distance);
 
-   bool processCameraQuery(CameraQuery *query);
+   bool processCameraQuery(CameraQuery *query) override;
-   void renderWorld(const RectI &updateRect);
+   void renderWorld(const RectI &updateRect) override;
 
    DECLARE_CONOBJECT(GuiMaterialPreview);
    DECLARE_CATEGORY( "Gui Editor" );

Engine/source/T3D/guiNoMouseCtrl.cpp

@@ -29,7 +29,7 @@ class GuiNoMouseCtrl : public GuiControl
    public:
 
       // GuiControl
-      bool pointInControl(const Point2I &)   { return(false); }
+      bool pointInControl(const Point2I &) override   { return(false); }
       DECLARE_CONOBJECT(GuiNoMouseCtrl);
       DECLARE_CATEGORY( "Gui Other" );
 };

Engine/source/T3D/guiObjectView.cpp

@@ -99,9 +99,9 @@ GuiObjectView::GuiObjectView()
       mCameraRotation( 0.0f, 0.0f, 0.0f ),
       mOrbitDist( 5.0f ),
       mCameraSpeed( 0.01f ),
+      mMountedModelInstance( NULL ),
       mMountNode( -1 ),
       mMountNodeName( "mount0" ),
-      mMountedModelInstance( NULL ),
       mAnimationSeq( -1 ),
       mRunThread( NULL ),
       mLastRenderTime( 0 ),

Engine/source/T3D/guiObjectView.h

@@ -175,7 +175,7 @@ class GuiObjectView : public GuiTSCtrl
       void _initMount();
       
       ///
-      void onStaticModified( StringTableEntry slotName, const char* newValue );
+      void onStaticModified( StringTableEntry slotName, const char* newValue ) override;
 
    public:
    
@@ -267,19 +267,19 @@ class GuiObjectView : public GuiTSCtrl
       /// @}
       
       // GuiTsCtrl.
-      bool onWake();
+      bool onWake() override;
 
-      void onMouseEnter( const GuiEvent& event );
+      void onMouseEnter( const GuiEvent& event ) override;
-      void onMouseLeave( const GuiEvent& event );
+      void onMouseLeave( const GuiEvent& event ) override;
-      void onMouseDown( const GuiEvent& event );
+      void onMouseDown( const GuiEvent& event ) override;
-      void onMouseUp( const GuiEvent& event );
+      void onMouseUp( const GuiEvent& event ) override;
-      void onMouseDragged( const GuiEvent& event );
+      void onMouseDragged( const GuiEvent& event ) override;
-      void onRightMouseDown( const GuiEvent& event );
+      void onRightMouseDown( const GuiEvent& event ) override;
-      void onRightMouseUp( const GuiEvent& event );
+      void onRightMouseUp( const GuiEvent& event ) override;
-      void onRightMouseDragged( const GuiEvent& event );
+      void onRightMouseDragged( const GuiEvent& event ) override;
 
-      bool processCameraQuery( CameraQuery* query );
+      bool processCameraQuery( CameraQuery* query ) override;
-      void renderWorld( const RectI& updateRect );
+      void renderWorld( const RectI& updateRect ) override;
       
       static void initPersistFields();
 

Engine/source/T3D/item.h

@@ -60,8 +60,8 @@ struct ItemData: public ShapeBaseData {
    ItemData();
    DECLARE_CONOBJECT(ItemData);
    static void initPersistFields();
-   virtual void packData(BitStream* stream);
+   void packData(BitStream* stream) override;
-   virtual void unpackData(BitStream* stream);
+   void unpackData(BitStream* stream) override;
 };
 
 
@@ -145,17 +145,17 @@ class Item: public ShapeBase
    void updateVelocity(const F32 dt);
    void updatePos(const U32 mask, const F32 dt);
    void updateWorkingCollisionSet(const U32 mask, const F32 dt);
-   bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF &sphere);
+   bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF &sphere) override;
-   void buildConvex(const Box3F& box, Convex* convex);
+   void buildConvex(const Box3F& box, Convex* convex) override;
-   void onDeleteNotify(SimObject*);
+   void onDeleteNotify(SimObject*) override;
 
    static bool _setStatic(void *object, const char *index, const char *data);
    static bool _setRotate(void *object, const char *index, const char *data);
 
   protected:
    void _updatePhysics();
-   void prepRenderImage(SceneRenderState *state);
+   void prepRenderImage(SceneRenderState *state) override;
-   void advanceTime(F32 dt);
+   void advanceTime(F32 dt) override;
 
   public:
    DECLARE_CONOBJECT(Item);
@@ -167,25 +167,25 @@ class Item: public ShapeBase
    static void initPersistFields();
    static void consoleInit();
 
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
-   bool onNewDataBlock( GameBaseData *dptr, bool reload );
+   bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
 
    bool isStatic()   { return mStatic; }
    bool isAtRest()   { return mAtRest; }
    bool isRotating() { return mRotate; }
-   Point3F getVelocity() const;
+   Point3F getVelocity() const override;
-   void setVelocity(const VectorF& vel);
+   void setVelocity(const VectorF& vel) override;
-   void applyImpulse(const Point3F& pos,const VectorF& vec);
+   void applyImpulse(const Point3F& pos,const VectorF& vec) override;
    void setCollisionTimeout(ShapeBase* obj);
    ShapeBase* getCollisionObject()   { return mCollisionObject; };
 
-   void processTick(const Move *move);
+   void processTick(const Move *move) override;
-   void interpolateTick(F32 delta);
+   void interpolateTick(F32 delta) override;
-   virtual void setTransform(const MatrixF &mat);
+   void setTransform(const MatrixF &mat) override;
 
-   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream);
+   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream) override;
-   void unpackUpdate(NetConnection *conn,           BitStream *stream);
+   void unpackUpdate(NetConnection *conn,           BitStream *stream) override;
 };
 
 typedef Item::LightType ItemLightType;

Engine/source/T3D/levelInfo.h

@@ -128,9 +128,9 @@ class LevelInfo : public NetObject
       /// @name SimObject Inheritance
       /// @{
 
-      virtual bool onAdd();
+      bool onAdd() override;
-      virtual void onRemove();
+      void onRemove() override;
-      virtual void inspectPostApply();
+      void inspectPostApply() override;
 
       static void initPersistFields();
 
@@ -144,8 +144,8 @@ class LevelInfo : public NetObject
          UpdateMask = BIT(0)
       };
 
-      virtual U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream );
+      U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override;
-      virtual void unpackUpdate( NetConnection *conn, BitStream *stream );
+      void unpackUpdate( NetConnection *conn, BitStream *stream ) override;
       static bool _setLevelAccuTexture(void *object, const char *index, const char *data);
       void setLevelAccuTexture(StringTableEntry name);
       /// @}

Engine/source/T3D/lightAnimData.h

@@ -98,12 +98,12 @@ public:
 
    // SimObject
    static void initPersistFields();
-   virtual void inspectPostApply();
+   void inspectPostApply() override;
 
    // SimDataBlock
-   virtual bool preload( bool server, String &errorStr );
+   bool preload( bool server, String &errorStr ) override;
-   virtual void packData( BitStream *stream );
+   void packData( BitStream *stream ) override;
-   virtual void unpackData( BitStream *stream );
+   void unpackData( BitStream *stream ) override;
 
    /// Animates parameters on the passed Light's LightInfo object.
    virtual void animate( LightInfo *light, LightAnimState *state );

Engine/source/T3D/lightBase.h

@@ -95,8 +95,8 @@ protected:
    };
 
    // SimObject.
-   virtual void _onSelected();
+   void _onSelected() override;
-   virtual void _onUnselected();
+   void _onUnselected() override;
 
 public:
 
@@ -104,31 +104,31 @@ public:
    virtual ~LightBase();
 
    // SimObject
-   virtual bool onAdd();
+   bool onAdd() override;
-   virtual void onRemove();
+   void onRemove() override;
 
    // ConsoleObject
-   void inspectPostApply();
+   void inspectPostApply() override;
    static void initPersistFields();
    DECLARE_CONOBJECT(LightBase);
    DECLARE_CATEGORY("UNLISTED");
 
    // NetObject
-   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream );
+   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override;
-   void unpackUpdate( NetConnection *conn, BitStream *stream );  
+   void unpackUpdate( NetConnection *conn, BitStream *stream ) override;  
 
    // ISceneLight
-   virtual void submitLights( LightManager *lm, bool staticLighting );
+   void submitLights( LightManager *lm, bool staticLighting ) override;
-   virtual LightInfo* getLight() { return mLight; }
+   LightInfo* getLight() override { return mLight; }
 
    // SceneObject
-   virtual void setTransform( const MatrixF &mat );
+   void setTransform( const MatrixF &mat ) override;
-   virtual void prepRenderImage( SceneRenderState *state );
+   void prepRenderImage( SceneRenderState *state ) override;
 
    // ITickable
-   virtual void interpolateTick( F32 delta );
+   void interpolateTick( F32 delta ) override;
-   virtual void processTick();
+   void processTick() override;
-   virtual void advanceTime( F32 timeDelta );
+   void advanceTime( F32 timeDelta ) override;
 
    /// Toggles the light on and off.
    void setLightEnabled( bool enabled );

Engine/source/T3D/lightDescription.h

@@ -82,14 +82,14 @@ public:
    DECLARE_CONOBJECT( LightDescription );
 
    static void initPersistFields();
-   virtual void inspectPostApply();
+   void inspectPostApply() override;
    
-   bool onAdd();
+   bool onAdd() override;
 
    // SimDataBlock
-   virtual bool preload( bool server, String &errorStr );
+   bool preload( bool server, String &errorStr ) override;
-   virtual void packData( BitStream *stream );
+   void packData( BitStream *stream ) override;
-   virtual void unpackData( BitStream *stream );
+   void unpackData( BitStream *stream ) override;
    
    //void animateLight( LightState *state );
    void submitLight( LightState *state, const MatrixF &xfm, LightManager *lm, SimObject *object );

Engine/source/T3D/lightFlareData.h

@@ -87,12 +87,12 @@ public:
    DECLARE_CONOBJECT( LightFlareData );
 
    static void initPersistFields();
-   virtual void inspectPostApply();
+   void inspectPostApply() override;
 
    // SimDataBlock
-   virtual bool preload( bool server, String &errorStr );
+   bool preload( bool server, String &errorStr ) override;
-   virtual void packData( BitStream *stream );
+   void packData( BitStream *stream ) override;
-   virtual void unpackData( BitStream *stream );
+   void unpackData( BitStream *stream ) override;
 
    /// Submits render instances for corona and flare effects.
    void prepRender( SceneRenderState *state, LightFlareState *flareState );

Engine/source/T3D/lighting/boxEnvironmentProbe.h

@@ -82,18 +82,18 @@ public:
 
    // Allows the object to update its editable settings
    // from the server object to the client
-   virtual void inspectPostApply();
+   void inspectPostApply() override;
 
    // Handle when we are added to the scene and removed from the scene
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
 
    // This function handles sending the relevant data from the server
    // object to the client object
-   U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream);
+   U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override;
    // This function handles receiving relevant data from the server
    // object and applying it to the client object
-   void unpackUpdate(NetConnection *conn, BitStream *stream);
+   void unpackUpdate(NetConnection *conn, BitStream *stream) override;
 
    //--------------------------------------------------------------------------
    // Object Rendering
@@ -103,7 +103,7 @@ public:
    // minimizing texture, state, and shader switching by grouping objects that
    // use the same Materials.
    //--------------------------------------------------------------------------
-   virtual void updateProbeParams();
+   void updateProbeParams() override;
 
    // This is the function that allows this object to submit itself for rendering
    //void prepRenderImage(SceneRenderState *state);

Engine/source/T3D/lighting/reflectionProbe.h

@@ -287,7 +287,7 @@ public:
 
    // Allows the object to update its editable settings
    // from the server object to the client
-   virtual void inspectPostApply();
+   void inspectPostApply() override;
 
    static bool _setEnabled(void *object, const char *index, const char *data);
    static bool _doBake(void *object, const char *index, const char *data);
@@ -296,29 +296,29 @@ public:
    static bool _setReflectionMode(void *object, const char *index, const char *data);
 
    // Handle when we are added to the scene and removed from the scene
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
 
    /// <summary>
    /// This is called when the object is deleted. It allows us to do special-case cleanup actions
    /// In probes' case, it's used to delete baked cubemap files
    /// </summary>
-   virtual void handleDeleteAction();
+   void handleDeleteAction() override;
 
    // Override this so that we can dirty the network flag when it is called
-   virtual void setTransform(const MatrixF &mat);
+   void setTransform(const MatrixF &mat) override;
-   virtual const MatrixF& getTransform() const;
+   const MatrixF& getTransform() const override;
-   virtual void setScale(const VectorF &scale);
+   void setScale(const VectorF &scale) override;
-   virtual const VectorF& getScale() const;
+   const VectorF& getScale() const override;
 
-   virtual bool writeField(StringTableEntry fieldname, const char *value);
+   bool writeField(StringTableEntry fieldname, const char *value) override;
 
    // This function handles sending the relevant data from the server
    // object to the client object
-   U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream);
+   U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override;
    // This function handles receiving relevant data from the server
    // object and applying it to the client object
-   void unpackUpdate(NetConnection *conn, BitStream *stream);
+   void unpackUpdate(NetConnection *conn, BitStream *stream) override;
 
    //--------------------------------------------------------------------------
    // Object Rendering
@@ -353,7 +353,7 @@ public:
    void processStaticCubemap();
 
    // This is the function that allows this object to submit itself for rendering
-   void prepRenderImage(SceneRenderState *state);
+   void prepRenderImage(SceneRenderState *state) override;
 
    void _onRenderViz(ObjectRenderInst *ri,
       SceneRenderState *state,

Engine/source/T3D/lighting/skylight.h

@@ -81,18 +81,18 @@ public:
 
    // Allows the object to update its editable settings
    // from the server object to the client
-   virtual void inspectPostApply();
+   void inspectPostApply() override;
 
    // Handle when we are added to the scene and removed from the scene
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
 
    // This function handles sending the relevant data from the server
    // object to the client object
-   U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream);
+   U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override;
    // This function handles receiving relevant data from the server
    // object and applying it to the client object
-   void unpackUpdate(NetConnection *conn, BitStream *stream);
+   void unpackUpdate(NetConnection *conn, BitStream *stream) override;
 
    //--------------------------------------------------------------------------
    // Object Rendering
@@ -102,10 +102,10 @@ public:
    // minimizing texture, state, and shader switching by grouping objects that
    // use the same Materials.
    //--------------------------------------------------------------------------
-   virtual void updateProbeParams();
+   void updateProbeParams() override;
 
    // This is the function that allows this object to submit itself for rendering
-   void prepRenderImage(SceneRenderState *state);
+   void prepRenderImage(SceneRenderState *state) override;
 
    void setPreviewMatParameters(SceneRenderState* renderState, BaseMatInstance* mat);
    static SimObjectPtr<Skylight> smSkylightProbe;

Engine/source/T3D/lighting/sphereEnvironmentProbe.h

@@ -77,18 +77,18 @@ public:
 
    // Allows the object to update its editable settings
    // from the server object to the client
-   virtual void inspectPostApply();
+   void inspectPostApply() override;
 
    // Handle when we are added to the scene and removed from the scene
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
 
    // This function handles sending the relevant data from the server
    // object to the client object
-   U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream);
+   U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override;
    // This function handles receiving relevant data from the server
    // object and applying it to the client object
-   void unpackUpdate(NetConnection *conn, BitStream *stream);
+   void unpackUpdate(NetConnection *conn, BitStream *stream) override;
 
    //--------------------------------------------------------------------------
    // Object Rendering
@@ -98,7 +98,7 @@ public:
    // minimizing texture, state, and shader switching by grouping objects that
    // use the same Materials.
    //--------------------------------------------------------------------------
-   virtual void updateProbeParams();
+   void updateProbeParams() override;
    void setPreviewMatParameters(SceneRenderState* renderState, BaseMatInstance* mat);
 };
 

Engine/source/T3D/missionArea.h

@@ -54,10 +54,10 @@ class MissionArea : public NetObject
 
    /// @name SimObject Inheritance
    /// @{
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
 
-   void inspectPostApply();
+   void inspectPostApply() override;
 
    static void initPersistFields();
    /// @}
@@ -68,8 +68,8 @@ class MissionArea : public NetObject
       UpdateMask     = BIT(0)
    };
 
-   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream);
+   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream) override;
-   void unpackUpdate(NetConnection *conn,           BitStream *stream);
+   void unpackUpdate(NetConnection *conn,           BitStream *stream) override;
    /// @}
 
    DECLARE_CONOBJECT(MissionArea);

Engine/source/T3D/missionMarker.h

@@ -67,22 +67,22 @@ class MissionMarker : public ShapeBase
       MissionMarker();
 
       // GameBase
-      bool onNewDataBlock( GameBaseData *dptr, bool reload );
+      bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
 
       // SceneObject
-      void setTransform(const MatrixF &mat);
+      void setTransform(const MatrixF &mat) override;
 
       // SimObject
-      bool onAdd();
+      bool onAdd() override;
-      void onRemove();
+      void onRemove() override;
-      void onEditorEnable();
+      void onEditorEnable() override;
-      void onEditorDisable();
+      void onEditorDisable() override;
 
-      void inspectPostApply();
+      void inspectPostApply() override;
 
       // NetObject
-      U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream);
+      U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream) override;
-      void unpackUpdate(NetConnection *conn,           BitStream *stream);
+      void unpackUpdate(NetConnection *conn,           BitStream *stream) override;
 
       DECLARE_CONOBJECT(MissionMarker);
       DECLARE_CATEGORY("Markers");
@@ -110,15 +110,15 @@ class WayPoint : public MissionMarker
       WayPoint();
 
       // ShapeBase: only ever added to scene if in the editor
-      void setHidden(bool hidden);
+      void setHidden(bool hidden) override;
 
       // SimObject
-      bool onAdd();
+      bool onAdd() override;
-      void inspectPostApply();
+      void inspectPostApply() override;
 
       // NetObject
-      U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream);
+      U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override;
-      void unpackUpdate(NetConnection *conn, BitStream *stream);
+      void unpackUpdate(NetConnection *conn, BitStream *stream) override;
 
       // field data
       StringTableEntry              mName;
@@ -141,8 +141,8 @@ class SpawnSphere : public MissionMarker
       SpawnSphere();
 
       // SimObject
-      bool onAdd();
+      bool onAdd() override;
-      void inspectPostApply();
+      void inspectPostApply() override;
 
       // NetObject
       enum SpawnSphereMasks
@@ -151,12 +151,12 @@ class SpawnSphere : public MissionMarker
          NextFreeMask     = Parent::NextFreeMask << 1
       };
 
-      U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream);
+      U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream) override;
-      void unpackUpdate(NetConnection *conn,           BitStream *stream);
+      void unpackUpdate(NetConnection *conn,           BitStream *stream) override;
 
       // ProcessObject
-      void advanceTime( F32 timeDelta );
+      void advanceTime( F32 timeDelta ) override;
-      void processTick( const Move *move );
+      void processTick( const Move *move ) override;
 
       // Spawn info
       String   mSpawnClass;
@@ -202,15 +202,15 @@ class CameraBookmark : public MissionMarker
       CameraBookmark();
 
       // SimObject
-      virtual bool onAdd();
+      bool onAdd() override;
-      virtual void onRemove();
+      void onRemove() override;
-      virtual void onGroupAdd();
+      void onGroupAdd() override;
-      virtual void onGroupRemove();
+      void onGroupRemove() override;
-      void inspectPostApply();
+      void inspectPostApply() override;
 
       // NetObject
-      U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream);
+      U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override;
-      void unpackUpdate(NetConnection *conn, BitStream *stream);
+      void unpackUpdate(NetConnection *conn, BitStream *stream) override;
 
       // field data
       StringTableEntry              mName;

Engine/source/T3D/notesObject.h

@@ -78,24 +78,24 @@ public:
    // Set up any fields that we want to be editable (like position)
    static void initPersistFields();
 
-   void inspectPostApply();
+   void inspectPostApply() override;
 
    // Handle when we are added to the scene and removed from the scene
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
 
    // Override this so that we can dirty the network flag when it is called
-   void setTransform(const MatrixF& mat);
+   void setTransform(const MatrixF& mat) override;
 
    // This function handles sending the relevant data from the server
    // object to the client object
-   U32 packUpdate(NetConnection* conn, U32 mask, BitStream* stream);
+   U32 packUpdate(NetConnection* conn, U32 mask, BitStream* stream) override;
    // This function handles receiving relevant data from the server
    // object and applying it to the client object
-   void unpackUpdate(NetConnection* conn, BitStream* stream);
+   void unpackUpdate(NetConnection* conn, BitStream* stream) override;
 
    // This is the function that allows this object to submit itself for rendering
-   void prepRenderImage(SceneRenderState* state);
+   void prepRenderImage(SceneRenderState* state) override;
 
    void _render(ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat);
 

Engine/source/T3D/occlusionVolume.h

@@ -55,7 +55,7 @@ class OcclusionVolume : public ScenePolyhedralSpace
       SilhouetteExtractorType mSilhouetteExtractor;
       
       // SceneSpace.
-      virtual void _renderObject( ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat );
+      void _renderObject( ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat ) override;
 
    public:
 
@@ -66,13 +66,13 @@ class OcclusionVolume : public ScenePolyhedralSpace
       DECLARE_DESCRIPTION( "A visibility blocking volume." );
       DECLARE_CATEGORY("Volume");
 
-      virtual bool onAdd();
+      bool onAdd() override;
 
       static void consoleInit();
 
       // SceneObject.
-      virtual void buildSilhouette( const SceneCameraState& cameraState, Vector< Point3F >& outPoints );
+      void buildSilhouette( const SceneCameraState& cameraState, Vector< Point3F >& outPoints ) override;
-      virtual void setTransform( const MatrixF& mat );
+      void setTransform( const MatrixF& mat ) override;
 };
 
 #endif // !_OCCLUSIONVOLUME_H_

Engine/source/T3D/pathCamera.h

@@ -40,8 +40,8 @@ struct PathCameraData: public ShapeBaseData {
    DECLARE_CONOBJECT(PathCameraData);
    static void consoleInit();
    static void initPersistFields();
-   virtual void packData(BitStream* stream);
+   void packData(BitStream* stream) override;
-   virtual void unpackData(BitStream* stream);
+   void unpackData(BitStream* stream) override;
 };
 
 
@@ -101,20 +101,20 @@ public:
    static void initPersistFields();
    static void consoleInit();
 
-   void onEditorEnable();
+   void onEditorEnable() override;
-   void onEditorDisable();
+   void onEditorDisable() override;
 
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
-   bool onNewDataBlock( GameBaseData *dptr, bool reload );
+   bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
    void onNode(S32 node);
 
-   void processTick(const Move*);
+   void processTick(const Move*) override;
-   void interpolateTick(F32 dt);
+   void interpolateTick(F32 dt) override;
-   void getCameraTransform(F32* pos,MatrixF* mat);
+   void getCameraTransform(F32* pos,MatrixF* mat) override;
 
-   U32  packUpdate(NetConnection *, U32 mask, BitStream *stream);
+   U32  packUpdate(NetConnection *, U32 mask, BitStream *stream) override;
-   void unpackUpdate(NetConnection *, BitStream *stream);
+   void unpackUpdate(NetConnection *, BitStream *stream) override;
 
    void reset(F32 speed = 1);
    void pushFront(CameraSpline::Knot *knot);

Engine/source/T3D/pathShape.h

@@ -26,10 +26,10 @@ struct PathShapeData: public StaticShapeData {
    static void consoleInit();
 
    DECLARE_CONOBJECT(PathShapeData);
-   bool preload(bool server, String &errorStr);
+   bool preload(bool server, String &errorStr) override;
    static void initPersistFields();
-   virtual void packData(BitStream* stream);
+   void packData(BitStream* stream) override;
-   virtual void unpackData(BitStream* stream);
+   void unpackData(BitStream* stream) override;
 };
 
 
@@ -88,16 +88,16 @@ public:
 
    static void initPersistFields();
    static void consoleInit();
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
-   bool onNewDataBlock(GameBaseData* dptr, bool reload);
+   bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
    void onNode(S32 node);
 
-   void processTick(const Move*);
+   void processTick(const Move*) override;
-   void interpolateTick(F32 dt);
+   void interpolateTick(F32 dt) override;
 
-   U32  packUpdate(NetConnection *, U32 mask, BitStream *stream);
+   U32  packUpdate(NetConnection *, U32 mask, BitStream *stream) override;
-   void unpackUpdate(NetConnection *, BitStream *stream);
+   void unpackUpdate(NetConnection *, BitStream *stream) override;
 
    void reset(F32 speed = 1);
    void pushFront(CameraSpline::Knot *knot);

Engine/source/T3D/physicalZone.h

@@ -69,7 +69,7 @@ class PhysicalZone : public SceneObject
    bool mActive;
 
    Convex* mConvexList;
-   void buildConvex(const Box3F& box, Convex* convex);
+   void buildConvex(const Box3F& box, Convex* convex) override;
 
   public:
    PhysicalZone();
@@ -80,17 +80,17 @@ class PhysicalZone : public SceneObject
    DECLARE_CATEGORY("Volume");
    static void consoleInit();
    static void initPersistFields();
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
-   void inspectPostApply();
+   void inspectPostApply() override;
 
    // NetObject
-   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream);
+   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream) override;
-   void unpackUpdate(NetConnection *conn,           BitStream *stream);
+   void unpackUpdate(NetConnection *conn,           BitStream *stream) override;
 
    // SceneObject
-   void setTransform(const MatrixF &mat);
+   void setTransform(const MatrixF &mat) override;
-   void prepRenderImage( SceneRenderState* state );
+   void prepRenderImage( SceneRenderState* state ) override;
 
    inline F32 getVelocityMod() const      { return mVelocityMod; }
    inline F32 getGravityMod()  const      { return mGravityMod;  }
@@ -122,7 +122,7 @@ protected:
 public:
    enum ForceType { VECTOR, SPHERICAL, CYLINDRICAL };
    enum { FORCE_TYPE_BITS = 2 };
-   virtual void onStaticModified(const char* slotName, const char*newValue = NULL);
+   void onStaticModified(const char* slotName, const char*newValue = NULL) override;
    bool   isExcludedObject(SceneObject*) const;
    void   registerExcludedObject(SceneObject*);
    void   unregisterExcludedObject(SceneObject*);

Engine/source/T3D/physics/physicsDebris.h

@@ -91,11 +91,11 @@ public:
 
    PhysicsDebrisData();
 
-   bool        onAdd();
+   bool        onAdd() override;
-   bool        preload( bool server, String &errorStr );
+   bool        preload( bool server, String &errorStr ) override;
    static void initPersistFields();
-   void        packData( BitStream *stream );
+   void        packData( BitStream *stream ) override;
-   void        unpackData( BitStream *stream );
+   void        unpackData( BitStream *stream ) override;
 
    void onShapeChanged() {}
 
@@ -132,23 +132,23 @@ public:
    DECLARE_CATEGORY("UNLISTED");
    static void initPersistFields();
 
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove(); 
+   void onRemove() override; 
 
-   void applyImpulse( const Point3F &pos, const VectorF &vec );
+   void applyImpulse( const Point3F &pos, const VectorF &vec ) override;
-   void applyRadialImpulse( const Point3F &origin, F32 radius, F32 magnitude );
+   void applyRadialImpulse( const Point3F &origin, F32 radius, F32 magnitude ) override;
 
 protected:
 
    /// The global object lifetime scalar.
    static F32 smLifetimeScale;
 
-   void processTick( const Move *move );
+   void processTick( const Move *move ) override;
-   void advanceTime( F32 dt );
+   void advanceTime( F32 dt ) override;
-   void interpolateTick( F32 delta );
+   void interpolateTick( F32 delta ) override;
-   bool onNewDataBlock( GameBaseData *dptr, bool reload );
+   bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
 
-   void prepRenderImage( SceneRenderState *state );
+   void prepRenderImage( SceneRenderState *state ) override;
    void prepBatchRender( SceneRenderState *state );
 
    void _deleteFragments();

Engine/source/T3D/physics/physicsEvents.h

@@ -59,10 +59,10 @@ public:
    RadialImpulseEvent( const Point3F &pos, F32 radius, F32 magnitude );
    ~RadialImpulseEvent();   
 
-   virtual void pack( NetConnection* /*ps*/, BitStream *bstream );   
+   void pack( NetConnection* /*ps*/, BitStream *bstream ) override;   
-   virtual void write( NetConnection*, BitStream *bstream );   
+   void write( NetConnection*, BitStream *bstream ) override;   
-   virtual void unpack( NetConnection *ps, BitStream *bstream );   
+   void unpack( NetConnection *ps, BitStream *bstream ) override;   
-   virtual void process(NetConnection *);
+   void process(NetConnection *) override;
    
    static void impulse( SceneContainer *con, const Point3F &position, F32 radius, F32 magnitude );
 

Engine/source/T3D/physics/physicsForce.h

@@ -51,15 +51,15 @@ public:
    DECLARE_CATEGORY("UNLISTED");
    // SimObject
    static void initPersistFields();
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();   
+   void onRemove() override;   
    
    // SceneObject
-   void onMount( SceneObject *obj, S32 node );
+   void onMount( SceneObject *obj, S32 node ) override;
-   void onUnmount( SceneObject *obj, S32 node );
+   void onUnmount( SceneObject *obj, S32 node ) override;
 
    // ProcessObject
-   void processTick( const Move *move );
+   void processTick( const Move *move ) override;
 
    ///
    void attach( const Point3F &start, const Point3F &direction, F32 maxDist );

Engine/source/T3D/physics/physicsShape.h

@@ -64,13 +64,13 @@ public:
 
    DECLARE_CONOBJECT(PhysicsShapeData);
    static void initPersistFields();   
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
    
    // GameBaseData
-   void packData(BitStream* stream);
+   void packData(BitStream* stream) override;
-   void unpackData(BitStream* stream);   
+   void unpackData(BitStream* stream) override;   
-   bool preload(bool server, String &errorBuffer );
+   bool preload(bool server, String &errorBuffer ) override;
 
 public:
 
@@ -237,28 +237,28 @@ public:
    // SimObject
    static void consoleInit();
    static void initPersistFields();
-   void inspectPostApply();
+   void inspectPostApply() override;
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();   
+   void onRemove() override;   
    
    // SceneObject
-   void prepRenderImage( SceneRenderState *state );
+   void prepRenderImage( SceneRenderState *state ) override;
-   void setTransform( const MatrixF &mat );
+   void setTransform( const MatrixF &mat ) override;
-   F32 getMass() const;
+   F32 getMass() const override;
-   Point3F getVelocity() const { return mState.linVelocity; }
+   Point3F getVelocity() const override { return mState.linVelocity; }
-   void applyImpulse( const Point3F &pos, const VectorF &vec );
+   void applyImpulse( const Point3F &pos, const VectorF &vec ) override;
-   void applyRadialImpulse( const Point3F &origin, F32 radius, F32 magnitude );
+   void applyRadialImpulse( const Point3F &origin, F32 radius, F32 magnitude ) override;
    void applyTorque( const Point3F &torque );
    void applyForce( const Point3F &force );
-   void setScale(const VectorF & scale);
+   void setScale(const VectorF & scale) override;
 
    // GameBase
-   bool onNewDataBlock( GameBaseData *dptr, bool reload );
+   bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
-   void interpolateTick( F32 delta );
+   void interpolateTick( F32 delta ) override;
-   void processTick( const Move *move );
+   void processTick( const Move *move ) override;
-   void advanceTime( F32 timeDelta );
+   void advanceTime( F32 timeDelta ) override;
-   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream );
+   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override;
-   void unpackUpdate( NetConnection *conn, BitStream *stream );
+   void unpackUpdate( NetConnection *conn, BitStream *stream ) override;
 
    bool isDestroyed() const { return mDestroyed; }
    void destroy();

Engine/source/T3D/player.h

@@ -357,14 +357,14 @@ struct PlayerData: public ShapeBaseData {
    //
    DECLARE_CONOBJECT(PlayerData);
    PlayerData();
-   bool preload(bool server, String &errorStr);
+   bool preload(bool server, String &errorStr) override;
    void getGroundInfo(TSShapeInstance*,TSThread*,ActionAnimation*);
    bool isTableSequence(S32 seq);
    bool isJumpAction(U32 action);
 
    static void initPersistFields();
-   virtual void packData(BitStream* stream);
+   void packData(BitStream* stream) override;
-   virtual void unpackData(BitStream* stream);
+   void unpackData(BitStream* stream) override;
 
    /// @name Callbacks
    /// @{
@@ -599,7 +599,7 @@ protected:
 #endif
 
   protected:
-   virtual void reSkin();
+   void reSkin() override;
 
    void setState(ActionState state, U32 ticks=0);
    void updateState();
@@ -640,8 +640,8 @@ protected:
 
    /// @name Mounted objects
    /// @{
-   virtual void onUnmount( SceneObject *obj, S32 node );
+   void onUnmount( SceneObject *obj, S32 node ) override;
-   virtual void unmount();
+   void unmount() override;
    /// @}
 
    void setPosition(const Point3F& pos,const Point3F& viewRot);
@@ -653,19 +653,19 @@ protected:
    S32 findPrefixSequence(String* prefixPaths, const String& baseSeq);
    S32 convertActionToImagePrefix(U32 action);
 
-   virtual void onImage(U32 imageSlot, bool unmount);
+   void onImage(U32 imageSlot, bool unmount) override;
-   virtual void onImageRecoil(U32 imageSlot,ShapeBaseImageData::StateData::RecoilState);
+   void onImageRecoil(U32 imageSlot,ShapeBaseImageData::StateData::RecoilState) override;
-   virtual void onImageStateAnimation(U32 imageSlot, const char* seqName, bool direction, bool scaleToState, F32 stateTimeOutValue);
+   void onImageStateAnimation(U32 imageSlot, const char* seqName, bool direction, bool scaleToState, F32 stateTimeOutValue) override;
-   virtual const char* getImageAnimPrefix(U32 imageSlot, S32 imageShapeIndex);
+   const char* getImageAnimPrefix(U32 imageSlot, S32 imageShapeIndex) override;
-   virtual void onImageAnimThreadChange(U32 imageSlot, S32 imageShapeIndex, ShapeBaseImageData::StateData* lastState, const char* anim, F32 pos, F32 timeScale, bool reset=false);
+   void onImageAnimThreadChange(U32 imageSlot, S32 imageShapeIndex, ShapeBaseImageData::StateData* lastState, const char* anim, F32 pos, F32 timeScale, bool reset=false) override;
-   virtual void onImageAnimThreadUpdate(U32 imageSlot, S32 imageShapeIndex, F32 dt);
+   void onImageAnimThreadUpdate(U32 imageSlot, S32 imageShapeIndex, F32 dt) override;
 
-   virtual void updateDamageLevel();
+   void updateDamageLevel() override;
-   virtual void updateDamageState();
+   void updateDamageState() override;
    /// Set which client is controlling this player
-   void setControllingClient(GameConnection* client);
+   void setControllingClient(GameConnection* client) override;
 
-   void calcClassRenderData();
+   void calcClassRenderData() override;
    
    /// Play sound for foot contact.
    ///
@@ -707,23 +707,23 @@ public:
    /// @name Transforms
    /// @{
 
-   void setTransform(const MatrixF &mat);
+   void setTransform(const MatrixF &mat) override;
-   void getEyeTransform(MatrixF* mat);
+   void getEyeTransform(MatrixF* mat) override;
-   void getEyeBaseTransform(MatrixF* mat, bool includeBank);
+   void getEyeBaseTransform(MatrixF* mat, bool includeBank) override;
-   void getRenderEyeTransform(MatrixF* mat);
+   void getRenderEyeTransform(MatrixF* mat) override;
-   void getRenderEyeBaseTransform(MatrixF* mat, bool includeBank);
+   void getRenderEyeBaseTransform(MatrixF* mat, bool includeBank) override;
-   void getCameraParameters(F32 *min, F32 *max, Point3F *offset, MatrixF *rot);
+   void getCameraParameters(F32 *min, F32 *max, Point3F *offset, MatrixF *rot) override;
-   void getMuzzleTransform(U32 imageSlot,MatrixF* mat);
+   void getMuzzleTransform(U32 imageSlot,MatrixF* mat) override;
-   void getRenderMuzzleTransform(U32 imageSlot,MatrixF* mat);   
+   void getRenderMuzzleTransform(U32 imageSlot,MatrixF* mat) override;   
 
-   virtual void getMuzzleVector(U32 imageSlot,VectorF* vec);
+   void getMuzzleVector(U32 imageSlot,VectorF* vec) override;
    /// @}
 
    F32 getSpeed() const;
-   Point3F getVelocity() const;
+   Point3F getVelocity() const override;
-   void setVelocity(const VectorF& vel);
+   void setVelocity(const VectorF& vel) override;
    /// Apply an impulse at the given point, with magnitude/direction of vec
-   void applyImpulse(const Point3F& pos,const VectorF& vec);
+   void applyImpulse(const Point3F& pos,const VectorF& vec) override;
    /// Get the rotation of the player
    const Point3F& getRotation() { return mRot; }
    /// Get the rotation of the head of the player
@@ -749,19 +749,19 @@ public:
    void getMuzzlePointAI( U32 imageSlot, Point3F *point );
    F32 getMaxForwardVelocity() const { return (mDataBlock != NULL ? mDataBlock->maxForwardSpeed : 0); }
 
-   virtual bool    isDisplacable() const;
+   bool    isDisplacable() const override;
-   virtual Point3F getMomentum() const;
+   Point3F getMomentum() const override;
-   virtual void    setMomentum(const Point3F &momentum);
+   void    setMomentum(const Point3F &momentum) override;
-   virtual bool    displaceObject(const Point3F& displaceVector);
+   bool    displaceObject(const Point3F& displaceVector) override;
    virtual bool    getAIMove(Move*);
 
    bool checkDismountPosition(const MatrixF& oldPos, const MatrixF& newPos);  ///< Is it safe to dismount here?
 
    //
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
-   bool onNewDataBlock( GameBaseData *dptr, bool reload );
+   bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
-   void onScaleChanged();
+   void onScaleChanged() override;
    Box3F mScaledBox;
 
    // Animation
@@ -771,28 +771,28 @@ public:
    bool setArmThread(const char* sequence);
 
    // Object control
-   void setControlObject(ShapeBase *obj);
+   void setControlObject(ShapeBase *obj) override;
-   ShapeBase* getControlObject();
+   ShapeBase* getControlObject() override;
    
    //
    void updateWorkingCollisionSet();
-   virtual void processTick(const Move *move);
+   void processTick(const Move *move) override;
-   void interpolateTick(F32 delta);
+   void interpolateTick(F32 delta) override;
-   void advanceTime(F32 dt);
+   void advanceTime(F32 dt) override;
-   bool castRay(const Point3F &start, const Point3F &end, RayInfo* info);
+   bool castRay(const Point3F &start, const Point3F &end, RayInfo* info) override;
-   bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF &sphere);
+   bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF &sphere) override;
-   void buildConvex(const Box3F& box, Convex* convex);
+   void buildConvex(const Box3F& box, Convex* convex) override;
    bool isControlObject();
 
-   void onCameraScopeQuery(NetConnection *cr, CameraScopeQuery *);
+   void onCameraScopeQuery(NetConnection *cr, CameraScopeQuery *) override;
-   void writePacketData(GameConnection *conn, BitStream *stream);
+   void writePacketData(GameConnection *conn, BitStream *stream) override;
-   void readPacketData (GameConnection *conn, BitStream *stream);
+   void readPacketData (GameConnection *conn, BitStream *stream) override;
-   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream);
+   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream) override;
-   void unpackUpdate(NetConnection *conn,           BitStream *stream);
+   void unpackUpdate(NetConnection *conn,           BitStream *stream) override;
 
-   virtual void prepRenderImage( SceneRenderState* state );
+   void prepRenderImage( SceneRenderState* state ) override;
    virtual void renderConvex( ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *overrideMat );   
-   virtual void renderMountedImage( U32 imageSlot, TSRenderState &rstate, SceneRenderState *state );
+   void renderMountedImage( U32 imageSlot, TSRenderState &rstate, SceneRenderState *state ) override;
 private:
    static void  afx_consoleInit();
    void         afx_init();
@@ -802,15 +802,15 @@ private:
    static bool  sCorpsesHiddenFromRayCast;
    
 public:
-   virtual void restoreAnimation(U32 tag);
+   void restoreAnimation(U32 tag) override;
-   virtual U32 getAnimationID(const char* name);
+   U32 getAnimationID(const char* name) override;
-   virtual U32 playAnimationByID(U32 anim_id, F32 pos, F32 rate, F32 trans, bool hold, bool wait, bool is_death_anim);
+   U32 playAnimationByID(U32 anim_id, F32 pos, F32 rate, F32 trans, bool hold, bool wait, bool is_death_anim) override;
-   virtual F32 getAnimationDurationByID(U32 anim_id);
+   F32 getAnimationDurationByID(U32 anim_id) override;
-   virtual bool isBlendAnimation(const char* name);
+   bool isBlendAnimation(const char* name) override;
-   virtual const char* getLastClipName(U32 clip_tag);
+   const char* getLastClipName(U32 clip_tag) override;
-   virtual void unlockAnimation(U32 tag, bool force=false);
+   void unlockAnimation(U32 tag, bool force=false) override;
-   virtual U32 lockAnimation();
+   U32 lockAnimation() override;
-   virtual bool isAnimationLocked() const { return ((anim_clip_flags & BLOCK_USER_CONTROL) != 0); }
+   bool isAnimationLocked() const override { return ((anim_clip_flags & BLOCK_USER_CONTROL) != 0); }
    
 protected:
    bool         overrideLookAnimation;

Engine/source/T3D/pointLight.h

@@ -37,8 +37,8 @@ protected:
    F32 mRadius;
  
    // LightBase
-   void _conformLights();
+   void _conformLights() override;
-   void _renderViz( SceneRenderState *state );
+   void _renderViz( SceneRenderState *state ) override;
 
 public:
 
@@ -51,11 +51,11 @@ public:
    static void initPersistFields();
 
    // SceneObject
-   virtual void setScale( const VectorF &scale );
+   void setScale( const VectorF &scale ) override;
 
    // NetObject
-   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream );
+   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override;
-   void unpackUpdate( NetConnection *conn, BitStream *stream );  
+   void unpackUpdate( NetConnection *conn, BitStream *stream ) override;  
 };
 
 #endif // _POINTLIGHT_H_

Engine/source/T3D/portal.h

@@ -132,9 +132,9 @@ class Portal : public Zone
       bool _generateCullingVolume( SceneTraversalState* state, SceneCullingVolume& outVolume ) const;
 
       // SceneSpace.
-      virtual void _renderObject( ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat );
+      void _renderObject( ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat ) override;
-      virtual ColorI _getDefaultEditorSolidColor() const { return ColorI( 0, 255, 0, 45 ); }
+      ColorI _getDefaultEditorSolidColor() const override { return ColorI( 0, 255, 0, 45 ); }
-      virtual ColorI _getDefaultEditorWireframeColor() const
+      ColorI _getDefaultEditorWireframeColor() const override
       {
          switch( mClassification )
          {
@@ -145,11 +145,11 @@ class Portal : public Zone
       }
 
       // SceneObject.
-      virtual void onSceneRemove();
+      void onSceneRemove() override;
 
       // SceneZoneSpace.
-      virtual void _traverseConnectedZoneSpaces( SceneTraversalState* state );
+      void _traverseConnectedZoneSpaces( SceneTraversalState* state ) override;
-      virtual void _disconnectAllZoneSpaces();
+      void _disconnectAllZoneSpaces() override;
 
    public:
 
@@ -190,20 +190,20 @@ class Portal : public Zone
       static void initPersistFields();
       static void consoleInit();
 
-      virtual bool writeField( StringTableEntry fieldName, const char* value );
+      bool writeField( StringTableEntry fieldName, const char* value ) override;
-      virtual String describeSelf() const;
+      String describeSelf() const override;
 
       // NetObject.
-      virtual U32 packUpdate( NetConnection* conn, U32 mask, BitStream* stream );
+      U32 packUpdate( NetConnection* conn, U32 mask, BitStream* stream ) override;
-      virtual void unpackUpdate( NetConnection* conn, BitStream* stream );
+      void unpackUpdate( NetConnection* conn, BitStream* stream ) override;
 
       // SceneObject.
-      virtual void setTransform( const MatrixF &mat );
+      void setTransform( const MatrixF &mat ) override;
 
       // SceneZoneSpace.
-      virtual void traverseZones( SceneTraversalState* state, U32 startZoneId );
+      void traverseZones( SceneTraversalState* state, U32 startZoneId ) override;
-      virtual void connectZoneSpace( SceneZoneSpace* zoneSpace );
+      void connectZoneSpace( SceneZoneSpace* zoneSpace ) override;
-      virtual void disconnectZoneSpace( SceneZoneSpace* zoneSpace );
+      void disconnectZoneSpace( SceneZoneSpace* zoneSpace ) override;
 
    private:
 

Engine/source/T3D/prefab.h

@@ -65,19 +65,19 @@ public:
    StringTableEntry getTypeHint() const override;
    
    // SimObject
-   virtual bool onAdd();
+   bool onAdd() override;
-   virtual void onRemove();
+   void onRemove() override;
-   virtual void onEditorEnable();
+   void onEditorEnable() override;
-   virtual void onEditorDisable();
+   void onEditorDisable() override;
-   virtual void inspectPostApply();
+   void inspectPostApply() override;
 
    // NetObject
-   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream );
+   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override;
-   void unpackUpdate( NetConnection *conn, BitStream *stream );
+   void unpackUpdate( NetConnection *conn, BitStream *stream ) override;
 
    // SceneObject
-   virtual void setTransform( const MatrixF &mat );
+   void setTransform( const MatrixF &mat ) override;
-   virtual void setScale(const VectorF & scale);
+   void setScale(const VectorF & scale) override;
 
    // Prefab
 
@@ -100,11 +100,11 @@ public:
    /// which is added to the Scene and returned to the caller.
    SimGroup* explode();
 
-   bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF& sphere);
+   bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF& sphere) override;
 
-   bool buildExportPolyList(ColladaUtils::ExportData* exportData, const Box3F &box, const SphereF &);
+   bool buildExportPolyList(ColladaUtils::ExportData* exportData, const Box3F &box, const SphereF &) override;
 
-   virtual void getUtilizedAssets(Vector<StringTableEntry>* usedAssetsList);
+   void getUtilizedAssets(Vector<StringTableEntry>* usedAssetsList) override;
 
    S32 getChildGroup() {
       if (mChildGroup.isValid())
@@ -169,8 +169,8 @@ public:
    ExplodePrefabUndoAction( Prefab *prefab );   
 
    // UndoAction
-   virtual void undo();
+   void undo() override;
-   virtual void redo();
+   void redo() override;
 
 protected:
 

Engine/source/T3D/projectile.h

@@ -68,7 +68,7 @@ class ProjectileData : public GameBaseData
    typedef GameBaseData Parent;
 
 protected:
-   bool onAdd();
+   bool onAdd() override;
 
 public:
    DECLARE_SHAPEASSET(ProjectileData, ProjectileShape, onShapeChanged);
@@ -134,9 +134,9 @@ public:
 
    ProjectileData();
 
-   void packData(BitStream*);
+   void packData(BitStream*) override;
-   void unpackData(BitStream*);
+   void unpackData(BitStream*) override;
-   bool preload(bool server, String &errorStr);
+   bool preload(bool server, String &errorStr) override;
 
    static bool setLifetime( void *object, const char *index, const char *data );
    static bool setArmingDelay( void *object, const char *index, const char *data );
@@ -152,7 +152,7 @@ public:
    DECLARE_CALLBACK( void, onCollision, ( Projectile* proj, SceneObject* col, F32 fade, Point3F pos, Point3F normal ) );
 public:
    ProjectileData(const ProjectileData&, bool = false);
-   virtual bool allowSubstitutions() const { return true; }
+   bool allowSubstitutions() const override { return true; }
 
    void onShapeChanged() {}
 };
@@ -190,26 +190,26 @@ public:
    DECLARE_CATEGORY("UNLISTED");
 
    // SimObject
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
    static void initPersistFields();
 
    // NetObject
-   F32 getUpdatePriority(CameraScopeQuery *focusObject, U32 updateMask, S32 updateSkips);
+   F32 getUpdatePriority(CameraScopeQuery *focusObject, U32 updateMask, S32 updateSkips) override;
-   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream);
+   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream) override;
-   void unpackUpdate(NetConnection *conn,           BitStream *stream);
+   void unpackUpdate(NetConnection *conn,           BitStream *stream) override;
 
    // SceneObject
-   Point3F getVelocity() const { return mCurrVelocity; }
+   Point3F getVelocity() const override { return mCurrVelocity; }
-   void processTick( const Move *move );   
+   void processTick( const Move *move ) override;   
-   void advanceTime( F32 dt );
+   void advanceTime( F32 dt ) override;
-   void interpolateTick( F32 delta );   
+   void interpolateTick( F32 delta ) override;   
 
    // GameBase
-   bool onNewDataBlock( GameBaseData *dptr, bool reload );      
+   bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;      
 
    // Rendering
-   void prepRenderImage( SceneRenderState *state );
+   void prepRenderImage( SceneRenderState *state ) override;
    void prepBatchRender( SceneRenderState *state );   
 
    /// Updates velocity and position, and performs collision testing.
@@ -269,8 +269,8 @@ protected:
    TSThread*        mMaintainThread;
 
    // ISceneLight
-   virtual void submitLights( LightManager *lm, bool staticLighting );
+   void submitLights( LightManager *lm, bool staticLighting ) override;
-   virtual LightInfo* getLight() { return mLight; }
+   LightInfo* getLight() override { return mLight; }
    
    LightInfo *mLight;
    LightState mLightState;   

Engine/source/T3D/proximityMine.h

@@ -62,9 +62,9 @@ public:
    ProximityMineData();
    DECLARE_CONOBJECT( ProximityMineData );
    static void initPersistFields();
-   bool preload( bool server, String& errorStr );
+   bool preload( bool server, String& errorStr ) override;
-   virtual void packData( BitStream* stream );
+   void packData( BitStream* stream ) override;
-   virtual void unpackData( BitStream* stream );
+   void unpackData( BitStream* stream ) override;
 };
 
 //----------------------------------------------------------------------------
@@ -99,7 +99,7 @@ protected:
 
    void setDeployedPos( const Point3F& pos, const Point3F& normal );
 
-   void prepRenderImage( SceneRenderState* state );
+   void prepRenderImage( SceneRenderState* state ) override;
    void renderObject( ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat );
 
 public:
@@ -110,18 +110,18 @@ public:
 
    static void consoleInit();
 
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
-   bool onNewDataBlock( GameBaseData* dptr, bool reload );
+   bool onNewDataBlock( GameBaseData* dptr, bool reload ) override;
 
-   virtual void setTransform( const MatrixF& mat );
+   void setTransform( const MatrixF& mat ) override;
-   void processTick( const Move* move );
+   void processTick( const Move* move ) override;
    void explode();
 
-   void advanceTime( F32 dt );
+   void advanceTime( F32 dt ) override;
 
-   U32  packUpdate  ( NetConnection* conn, U32 mask, BitStream* stream );
+   U32  packUpdate  ( NetConnection* conn, U32 mask, BitStream* stream ) override;
-   void unpackUpdate( NetConnection* conn, BitStream* stream );
+   void unpackUpdate( NetConnection* conn, BitStream* stream ) override;
 };
 
 #endif // _PROXIMITYMINE_H_

Engine/source/T3D/rigidShape.h

@@ -46,7 +46,7 @@ class RigidShapeData : public ShapeBaseData
    typedef ShapeBaseData Parent;
 
   protected:
-   bool onAdd();
+   bool onAdd() override;
 
    //-------------------------------------- Console set variables
   public:
@@ -134,9 +134,9 @@ class RigidShapeData : public ShapeBaseData
    ~RigidShapeData();
 
    static void initPersistFields();
-   void packData(BitStream*);
+   void packData(BitStream*) override;
-   void unpackData(BitStream*);
+   void unpackData(BitStream*) override;
-   bool preload(bool server, String &errorStr);
+   bool preload(bool server, String &errorStr) override;
 
    DECLARE_CONOBJECT(RigidShapeData);
 
@@ -213,7 +213,7 @@ class RigidShape: public ShapeBase
    S32           mWorkingQueryBoxCountDown;
 
    //
-   bool onNewDataBlock( GameBaseData *dptr, bool reload );
+   bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
    void updatePos(F32 dt);
    bool updateCollision(F32 dt);
    bool resolveCollision(Rigid& ns,CollisionList& cList, F32 dt);
@@ -223,13 +223,13 @@ class RigidShape: public ShapeBase
 
    void setPosition(const Point3F& pos,const QuatF& rot);
    void setRenderPosition(const Point3F& pos,const QuatF& rot);
-   void setTransform(const MatrixF& mat);
+   void setTransform(const MatrixF& mat) override;
 
 //   virtual bool collideBody(const MatrixF& mat,Collision* info) = 0;
    void updateMove(const Move* move);
 
-   void writePacketData(GameConnection * conn, BitStream *stream);
+   void writePacketData(GameConnection * conn, BitStream *stream) override;
-   void readPacketData (GameConnection * conn, BitStream *stream);
+   void readPacketData (GameConnection * conn, BitStream *stream) override;
 
    void updateLiftoffDust( F32 dt );
 
@@ -254,28 +254,28 @@ public:
 
    static void consoleInit();
    static void initPersistFields();
-   void processTick(const Move *move);
+   void processTick(const Move *move) override;
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
    void _createPhysics();
 
    /// Interpolates between move ticks @see processTick
    /// @param   dt   Change in time between the last call and this call to the function
-   void interpolateTick(F32 dt);
+   void interpolateTick(F32 dt) override;
-   void advanceTime(F32 dt);
+   void advanceTime(F32 dt) override;
 
    /// Disables collisions for this shape
-   void disableCollision();
+   void disableCollision() override;
    
    /// Enables collisions for this shape
-   void enableCollision();
+   void enableCollision() override;
 
    /// Returns the velocity of the shape
-   Point3F getVelocity() const;
+   Point3F getVelocity() const override;
 
-   void setEnergyLevel(F32 energy);
+   void setEnergyLevel(F32 energy) override;
    
-   void prepBatchRender(  SceneRenderState *state, S32 mountedImageIndex );
+   void prepBatchRender(  SceneRenderState *state, S32 mountedImageIndex ) override;
 
    // xgalaxy cool hacks
    void reset();
@@ -293,18 +293,18 @@ public:
    /// Applies an impulse force 
    /// @param   r   Point on the object to apply impulse to, r is relative to Center of Mass
    /// @param   impulse   Impulse vector to apply.
-   void applyImpulse(const Point3F &r, const Point3F &impulse);
+   void applyImpulse(const Point3F &r, const Point3F &impulse) override;
 
    /// Forces the client to jump to the RigidShape's transform rather
    /// then warp to it.
    void forceClientTransform();
 
-   void getCameraParameters(F32 *min, F32* max, Point3F* offset, MatrixF* rot);
+   void getCameraParameters(F32 *min, F32* max, Point3F* offset, MatrixF* rot) override;
-   void getCameraTransform(F32* pos, MatrixF* mat);
+   void getCameraTransform(F32* pos, MatrixF* mat) override;
    ///@}
 
-   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream);
+   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream) override;
-   void unpackUpdate(NetConnection *conn,           BitStream *stream);
+   void unpackUpdate(NetConnection *conn,           BitStream *stream) override;
 
    DECLARE_CONOBJECT(RigidShape);
    DECLARE_CATEGORY("Object \t Destructable");

Engine/source/T3D/sfx/sfx3DWorld.h

@@ -95,7 +95,7 @@ class SFX3DWorld : public SceneTracker
       FreeListChunker< SFX3DObject > mChunker;
       
       // SceneTracker.
-      virtual bool _isTrackableObject( SceneObject* object ) const;
+      bool _isTrackableObject( SceneObject* object ) const override;
    
    public:
    
@@ -119,9 +119,9 @@ class SFX3DWorld : public SceneTracker
       void debugDump();
       
       // SceneTracker.
-      virtual void registerObject( SceneObject* object );
+      void registerObject( SceneObject* object ) override;
-      virtual void unregisterObject( SceneObject* object );
+      void unregisterObject( SceneObject* object ) override;
-      virtual void updateObject( SceneObjectLink* object );
+      void updateObject( SceneObjectLink* object ) override;
 };
 
 

Engine/source/T3D/sfx/sfxEmitter.h

@@ -53,8 +53,8 @@ public:
    DECLARE_CONOBJECT(GuiInspectorTypeSoundControls);
    static void consoleInit();
 
-   virtual GuiControl* constructEditControl();
+   GuiControl* constructEditControl() override;
-   virtual bool updateRects();
+   bool updateRects() override;
 };
 //RDTODO: make 3D sound emitters yield their source when being culled
 
@@ -244,16 +244,16 @@ class SFXEmitter : public SceneObject
       void stop();
 
       // SimObject
-      bool onAdd();
+      bool onAdd() override;
-      void onRemove();
+      void onRemove() override;
-      void onStaticModified( const char *slotName, const char *newValue = NULL );
+      void onStaticModified( const char *slotName, const char *newValue = NULL ) override;
-      U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream );
+      U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override;
-      void unpackUpdate( NetConnection *conn, BitStream *stream );
+      void unpackUpdate( NetConnection *conn, BitStream *stream ) override;
-      void setTransform( const MatrixF &mat );
+      void setTransform( const MatrixF &mat ) override;
-      void setScale( const VectorF &scale );
+      void setScale( const VectorF &scale ) override;
-      bool containsPoint( const Point3F& point ) { return false; }
+      bool containsPoint( const Point3F& point ) override { return false; }
-      void prepRenderImage( SceneRenderState* state );
+      void prepRenderImage( SceneRenderState* state ) override;
-      void inspectPostApply();
+      void inspectPostApply() override;
 
       static void initPersistFields();
       static void consoleInit();

Engine/source/T3D/sfx/sfxSpace.h

@@ -50,7 +50,7 @@ class SFXSpace : public SceneAmbientSoundObject< ScenePolyhedralObject< SceneSpa
    protected:
 
       // SceneSpace.
-      virtual ColorI _getDefaultEditorSolidColor() const { return ColorI( 244, 135, 18, 45 ); }
+      ColorI _getDefaultEditorSolidColor() const override { return ColorI( 244, 135, 18, 45 ); }
 
    public:
 

Engine/source/T3D/shapeBase.h

@@ -117,7 +117,7 @@ class ShapeBaseConvex : public Convex
    Box3F       box;
 
   public:
-   ShapeBaseConvex() :pShapeBase(NULL), transform(NULL), hullId(0), nodeTransform(0) { mType = ShapeBaseConvexType; }
+   ShapeBaseConvex() :pShapeBase(NULL), nodeTransform(0), transform(NULL), hullId(0) { mType = ShapeBaseConvexType; }
    ShapeBaseConvex(const ShapeBaseConvex& cv) {
       mObject    = cv.mObject;
       pShapeBase = cv.pShapeBase;
@@ -128,12 +128,12 @@ class ShapeBaseConvex : public Convex
    }
 
    void findNodeTransform();
-   const MatrixF& getTransform() const;
+   const MatrixF& getTransform() const override;
-   Box3F getBoundingBox() const;
+   Box3F getBoundingBox() const override;
-   Box3F getBoundingBox(const MatrixF& mat, const Point3F& scale) const;
+   Box3F getBoundingBox(const MatrixF& mat, const Point3F& scale) const override;
-   Point3F      support(const VectorF& v) const;
+   Point3F      support(const VectorF& v) const override;
-   void         getFeatures(const MatrixF& mat,const VectorF& n, ConvexFeature* cf);
+   void         getFeatures(const MatrixF& mat,const VectorF& n, ConvexFeature* cf) override;
-   void         getPolyList(AbstractPolyList* list);
+   void         getPolyList(AbstractPolyList* list) override;
 };
 
 //--------------------------------------------------------------------------
@@ -494,14 +494,14 @@ struct ShapeBaseImageData: public GameBaseData {
    DECLARE_CONOBJECT(ShapeBaseImageData);
    ShapeBaseImageData();
    ~ShapeBaseImageData();
-   bool onAdd();
+   bool onAdd() override;
-   bool preload(bool server, String &errorStr);
+   bool preload(bool server, String &errorStr) override;
    S32 lookupState(const char* name);  ///< Get a state by name.
    static void initPersistFields();
-   virtual void packData(BitStream* stream);
+   void packData(BitStream* stream) override;
-   virtual void unpackData(BitStream* stream);
+   void unpackData(BitStream* stream) override;
    
-   void inspectPostApply();
+   void inspectPostApply() override;
 
    void handleStateSoundTrack(const U32& stateId);
 
@@ -644,7 +644,7 @@ public:
 
    /// @}
 
-   virtual bool preload(bool server, String &errorStr);
+   bool preload(bool server, String &errorStr) override;
    void computeAccelerator(U32 i);
    S32  findMountPoint(U32 n);
 
@@ -655,8 +655,8 @@ public:
    ShapeBaseData();
    ~ShapeBaseData();
    static void initPersistFields();
-   virtual void packData(BitStream* stream);
+   void packData(BitStream* stream) override;
-   virtual void unpackData(BitStream* stream);
+   void unpackData(BitStream* stream) override;
    /// @}
 
    /// @name Callbacks
@@ -969,7 +969,7 @@ protected:
    void queueCollision( SceneObject *object, const VectorF &vec);
 
    /// @see SceneObject
-   virtual void onCollision( SceneObject *object, const VectorF &vec );
+   void onCollision( SceneObject *object, const VectorF &vec ) override;
 
    /// @}
  protected:
@@ -1126,7 +1126,7 @@ protected:
 
    /// @name Events
    /// @{
-   virtual void onDeleteNotify(SimObject*);
+   void onDeleteNotify(SimObject*) override;
    virtual void onImage(U32 imageSlot, bool unmount);
    virtual void onImageRecoil(U32 imageSlot,ShapeBaseImageData::StateData::RecoilState);
    virtual void onImageStateAnimation(U32 imageSlot, const char* seqName, bool direction, bool scaleToState, F32 stateTimeOutValue);
@@ -1197,11 +1197,11 @@ public:
    /// @name Initialization
    /// @{
 
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
-   void onSceneRemove();
+   void onSceneRemove() override;
    static void consoleInit();
-   bool onNewDataBlock( GameBaseData *dptr, bool reload );
+   bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
 
    /// @}
 
@@ -1407,10 +1407,10 @@ public:
 
    /// @name Mounted objects
    /// @{   
-   virtual void onMount( SceneObject *obj, S32 node );   
+   void onMount( SceneObject *obj, S32 node ) override;   
-   virtual void onUnmount( SceneObject *obj,S32 node );   
+   void onUnmount( SceneObject *obj,S32 node ) override;   
-   virtual void getMountTransform( S32 index, const MatrixF &xfm, MatrixF *outMat );
+   void getMountTransform( S32 index, const MatrixF &xfm, MatrixF *outMat ) override;
-   virtual void getRenderMountTransform( F32 delta, S32 index, const MatrixF &xfm, MatrixF *outMat );
+   void getRenderMountTransform( F32 delta, S32 index, const MatrixF &xfm, MatrixF *outMat ) override;
    /// @}
 
    /// Returns where the AI should be to repair this object
@@ -1613,11 +1613,11 @@ public:
    /// @todo Find out what pos does
    /// @param   pos   TODO: Find out what this does
    /// @param   mat   Camera transform (out)
-   virtual void getCameraTransform(F32* pos,MatrixF* mat);
+   void getCameraTransform(F32* pos,MatrixF* mat) override;
 
    /// Gets the view transform for a particular eye, taking into account the current absolute 
    /// orient and position values of the display device.
-   virtual void getEyeCameraTransform( IDisplayDevice *display, U32 eyeId, MatrixF *outMat );
+   void getEyeCameraTransform( IDisplayDevice *display, U32 eyeId, MatrixF *outMat ) override;
 
    /// Gets the index of a node inside a mounted image given the name
    /// @param   imageSlot   Image slot
@@ -1703,7 +1703,7 @@ public:
    /// @{
 
    /// Returns the level of screenflash that should be used
-   virtual F32  getDamageFlash() const;
+   F32  getDamageFlash() const override;
 
    /// Sets the flash level
    /// @param   amt   Level of flash
@@ -1711,7 +1711,7 @@ public:
 
    /// White out is the flash-grenade blindness effect
    /// This returns the level of flash to create
-   virtual F32  getWhiteOut() const;
+   F32  getWhiteOut() const override;
 
    /// Set the level of flash blindness
    virtual void setWhiteOut(const F32);
@@ -1722,12 +1722,12 @@ public:
 
    /// Sets the velocity of this object
    /// @param   vel   Velocity vector
-   virtual void setVelocity(const VectorF& vel);
+   void setVelocity(const VectorF& vel) override;
 
    /// Applies an impulse force to this object
    /// @param   pos   Position where impulse came from in world space
    /// @param   vec   Velocity vector (Impulse force F = m * v)
-   virtual void applyImpulse(const Point3F& pos,const VectorF& vec);
+   void applyImpulse(const Point3F& pos,const VectorF& vec) override;
 
    /// @}
 
@@ -1735,17 +1735,17 @@ public:
    /// @{
 
    /// Returns the object controlling this object
-   ShapeBase* getControllingObject()   { return mControllingObject; }
+   ShapeBase* getControllingObject() override   { return mControllingObject; }
 
    /// Sets the controlling object
    /// @param   obj   New controlling object
    virtual void setControllingObject(ShapeBase* obj);
    
    ///
-   virtual void setControllingClient( GameConnection* connection );
+   void setControllingClient( GameConnection* connection ) override;
 
    /// Returns the object this is controlling
-   virtual ShapeBase* getControlObject();
+   ShapeBase* getControlObject() override;
 
    /// sets the object this is controlling
    /// @param   obj   New controlled object
@@ -1758,35 +1758,35 @@ public:
    bool isFirstPerson() const;
 
    /// Returns true if the camera uses this objects eye point (defined by modeler)
-   bool useObjsEyePoint() const;
+   bool useObjsEyePoint() const override;
 
    /// Returns true if this object can only be used as a first person camera
-   bool onlyFirstPerson() const;
+   bool onlyFirstPerson() const override;
 
    /// Returns the vertical field of view in degrees for 
    /// this object if used as a camera.
-   virtual F32 getCameraFov() { return mCameraFov; }
+   F32 getCameraFov() override { return mCameraFov; }
 
    /// Returns the default vertical field of view in degrees
    /// if this object is used as a camera.
-   virtual F32 getDefaultCameraFov() { return mDataBlock->cameraDefaultFov; }
+   F32 getDefaultCameraFov() override { return mDataBlock->cameraDefaultFov; }
 
    /// Sets the vertical field of view in degrees for this 
    /// object if used as a camera.
    /// @param   yfov  The vertical FOV in degrees to test.
-   virtual void setCameraFov(F32 fov);
+   void setCameraFov(F32 fov) override;
 
    /// Returns true if the vertical FOV in degrees is within 
    /// allowable parameters of the datablock.
    /// @param   yfov  The vertical FOV in degrees to test.
    /// @see ShapeBaseData::cameraMinFov
    /// @see ShapeBaseData::cameraMaxFov
-   virtual bool isValidCameraFov(F32 fov);
+   bool isValidCameraFov(F32 fov) override;
    /// @}
 
 
-   void processTick(const Move *move);
+   void processTick(const Move *move) override;
-   void advanceTime(F32 dt);
+   void advanceTime(F32 dt) override;
 
    /// @name Rendering
    /// @{
@@ -1795,7 +1795,7 @@ public:
    TSShape const* getShape();
 
    /// @see SceneObject
-   virtual void prepRenderImage( SceneRenderState* state );
+   void prepRenderImage( SceneRenderState* state ) override;
 
    /// Used from ShapeBase::_prepRenderImage() to submit render 
    /// instances for the main shape or its mounted elements.
@@ -1809,12 +1809,12 @@ public:
    /// @}
 
    /// Control object scoping
-   void onCameraScopeQuery(NetConnection *cr, CameraScopeQuery *camInfo);
+   void onCameraScopeQuery(NetConnection *cr, CameraScopeQuery *camInfo) override;
 
-   bool castRay(const Point3F &start, const Point3F &end, RayInfo* info);
+   bool castRay(const Point3F &start, const Point3F &end, RayInfo* info) override;
-   bool castRayRendered(const Point3F &start, const Point3F &end, RayInfo* info);
+   bool castRayRendered(const Point3F &start, const Point3F &end, RayInfo* info) override;
-   bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF& sphere);
+   bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF& sphere) override;
-   void buildConvex(const Box3F& box, Convex* convex);
+   void buildConvex(const Box3F& box, Convex* convex) override;
 
    /// @name Rendering
    /// @{
@@ -1829,7 +1829,7 @@ public:
    /// it is removed entirely from collisions, it is not ghosted and is
    /// essentially "non existant" as far as simulation is concerned.
    /// @param   hidden   True if object is to be hidden
-   virtual void setHidden(bool hidden);
+   void setHidden(bool hidden) override;
 
    /// Returns true if this object can be damaged
    bool isInvincible();
@@ -1846,8 +1846,8 @@ public:
    //void registerLights(LightManager * lightManager, bool lightingScene);
 
    // ISceneLight
-   virtual void submitLights( LightManager *lm, bool staticLighting );
+   void submitLights( LightManager *lm, bool staticLighting ) override;
-   virtual LightInfo* getLight() { return NULL; }
+   LightInfo* getLight() override { return NULL; }
 
    /// @}
 
@@ -1861,20 +1861,20 @@ public:
    /// Returns the height of the liquid on this object
    F32 getLiquidHeight()  { return mLiquidHeight; }
 
-   virtual WaterObject* getCurrentWaterObject();
+   WaterObject* getCurrentWaterObject() override;
 
    void setCurrentWaterObject( WaterObject *obj );
-   void setTransform(const MatrixF & mat);
+   void setTransform(const MatrixF & mat) override;
-   virtual F32 getMass() const { return mMass; }
+   F32 getMass() const override { return mMass; }
 
    /// @name Network
    /// @{
 
-   F32 getUpdatePriority(CameraScopeQuery *focusObject, U32 updateMask, S32 updateSkips);
+   F32 getUpdatePriority(CameraScopeQuery *focusObject, U32 updateMask, S32 updateSkips) override;
-   U32  packUpdate(NetConnection *conn, U32 mask, BitStream *stream);
+   U32  packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override;
-   void unpackUpdate(NetConnection *conn, BitStream *stream);
+   void unpackUpdate(NetConnection *conn, BitStream *stream) override;
-   void writePacketData(GameConnection *conn, BitStream *stream);
+   void writePacketData(GameConnection *conn, BitStream *stream) override;
-   void readPacketData(GameConnection *conn, BitStream *stream);
+   void readPacketData(GameConnection *conn, BitStream *stream) override;
 
    /// @}
 
@@ -1933,7 +1933,7 @@ public:
    virtual U32 lockAnimation() { return 0; }
    virtual bool isAnimationLocked() const { return false; }
 
-   virtual void setSelectionFlags(U8 flags);
+   void setSelectionFlags(U8 flags) override;
 };
 
 

Engine/source/T3D/spotLight.h

@@ -41,8 +41,8 @@ protected:
    F32 mOuterConeAngle;
 
    // LightBase
-   void _conformLights();
+   void _conformLights() override;
-   void _renderViz( SceneRenderState *state );
+   void _renderViz( SceneRenderState *state ) override;
 
 public:
 
@@ -55,11 +55,11 @@ public:
    static void initPersistFields();
 
    // SceneObject
-   virtual void setScale( const VectorF &scale );
+   void setScale( const VectorF &scale ) override;
 
    // NetObject
-   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream );
+   U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override;
-   void unpackUpdate( NetConnection *conn, BitStream *stream );  
+   void unpackUpdate( NetConnection *conn, BitStream *stream ) override;  
 };
 
 #endif // _SPOTLIGHT_H_

Engine/source/T3D/staticShape.h

@@ -48,11 +48,11 @@ struct StaticShapeData: public ShapeBaseData {
    //
    DECLARE_CONOBJECT(StaticShapeData);
    static void initPersistFields();
-   virtual void packData(BitStream* stream);
+   void packData(BitStream* stream) override;
-   virtual void unpackData(BitStream* stream);
+   void unpackData(BitStream* stream) override;
 public:
    StaticShapeData(const StaticShapeData&, bool = false);
-   virtual bool   allowSubstitutions() const { return true; }
+   bool   allowSubstitutions() const override { return true; }
 };
 
 
@@ -65,7 +65,7 @@ class StaticShape: public ShapeBase
    StaticShapeData*  mDataBlock;
    bool              mPowered;
 
-   void onUnmount(SceneObject* obj,S32 node);
+   void onUnmount(SceneObject* obj,S32 node) override;
 
 protected:
    enum MaskBits {
@@ -80,16 +80,16 @@ public:
    StaticShape();
    ~StaticShape();
 
-   bool onAdd();
+   bool onAdd() override;
-   void onRemove();
+   void onRemove() override;
-   bool onNewDataBlock(GameBaseData *dptr, bool reload);
+   bool onNewDataBlock(GameBaseData *dptr, bool reload) override;
 
-   void processTick(const Move *move);
+   void processTick(const Move *move) override;
-   void interpolateTick(F32 delta);
+   void interpolateTick(F32 delta) override;
-   void setTransform(const MatrixF &mat);
+   void setTransform(const MatrixF &mat) override;
 
-   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream);
+   U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream) override;
-   void unpackUpdate(NetConnection *conn,           BitStream *stream);
+   void unpackUpdate(NetConnection *conn,           BitStream *stream) override;
 
    // power
    void setPowered(bool power)      {mPowered = power;}