Skip to content

Commit 0e25b0d

Browse files
committed
Added missing override keywords (third pass).
1 parent 4d41dbb commit 0e25b0d

5 files changed

Lines changed: 10 additions & 7 deletions

File tree

Core/GameEngine/Source/GameNetwork/Network.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ class Network : public NetworkInterface
150150

151151
#if defined(RTS_DEBUG)
152152
// Disconnect screen testing
153-
virtual void toggleNetworkOn();
153+
virtual void toggleNetworkOn() override;
154154
#endif
155155

156156
// Exposing some info contained in the Connection Manager

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
408408
virtual void setPauseAnimation(Bool pauseAnim) override;
409409

410410
//Kris: Manually set a drawable's current animation to specific frame.
411-
virtual void setAnimationFrame( int frame );
411+
virtual void setAnimationFrame( int frame ) override;
412412

413413
virtual void updateSubObjects() override;
414414
virtual void showSubObject( const AsciiString& name, Bool show ) override;

Core/Tools/W3DView/ViewerScene.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class ViewerSceneClass : public SimpleSceneClass
5858
ViewerSceneClass ()
5959
: m_AllowLODSwitching (false) { }
6060

61-
virtual ~ViewerSceneClass () { }
61+
virtual ~ViewerSceneClass () override { }
6262

6363

6464
///////////////////////////////////////////////////////////////////
@@ -69,9 +69,9 @@ class ViewerSceneClass : public SimpleSceneClass
6969
//
7070
// Overrides from SimpleSceneClass
7171
//
72-
virtual void Visibility_Check (CameraClass *pcamera);
73-
virtual void Add_Render_Object(RenderObjClass * obj);
74-
virtual void Customized_Render(RenderInfoClass & rinfo);
72+
virtual void Visibility_Check (CameraClass *pcamera) override;
73+
virtual void Add_Render_Object(RenderObjClass * obj) override;
74+
virtual void Customized_Render(RenderInfoClass & rinfo) override;
7575

7676
//
7777
// Inline accessors

Generals/Code/GameEngine/Include/Common/DrawModule.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,9 @@ class ObjectDrawInterface
204204
virtual void setAnimationCompletionTime(UnsignedInt numFrames) = 0;
205205
virtual Bool updateBonesForClientParticleSystems() = 0;///< this will reposition particle systems on the fly ML
206206

207+
//Kris: Manually set a drawable's current animation to specific frame.
208+
virtual void setAnimationFrame(int frame) = 0;
209+
207210
/**
208211
This call is used to pause or resume an animation.
209212
*/

GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ class SimpleSceneClass : public SceneClass
220220
SimpleSceneClass();
221221
virtual ~SimpleSceneClass() override;
222222

223-
virtual int Get_Scene_ID() { return SCENE_ID_SIMPLE; }
223+
virtual int Get_Scene_ID() const override { return SCENE_ID_SIMPLE; }
224224

225225
virtual void Add_Render_Object(RenderObjClass * obj) override;
226226
virtual void Remove_Render_Object(RenderObjClass * obj) override;

0 commit comments

Comments
 (0)