Skip to content

Commit 37bcbc7

Browse files
bobtistabobtista
committed
refactor(Core): Add override keyword to virtual function overrides in GameEngineDevice
1 parent a75b5a4 commit 37bcbc7

53 files changed

Lines changed: 608 additions & 608 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Core/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -142,70 +142,70 @@ class MilesAudioManager : public AudioManager
142142
#endif
143143

144144
// from AudioDevice
145-
virtual void init();
146-
virtual void postProcessLoad();
147-
virtual void reset();
148-
virtual void update();
145+
virtual void init() override;
146+
virtual void postProcessLoad() override;
147+
virtual void reset() override;
148+
virtual void update() override;
149149

150150
MilesAudioManager();
151-
virtual ~MilesAudioManager();
151+
virtual ~MilesAudioManager() override;
152152

153153

154-
virtual void nextMusicTrack();
155-
virtual void prevMusicTrack();
156-
virtual Bool isMusicPlaying() const;
157-
virtual Bool hasMusicTrackCompleted( const AsciiString& trackName, Int numberOfTimes ) const;
158-
virtual AsciiString getMusicTrackName() const;
154+
virtual void nextMusicTrack() override;
155+
virtual void prevMusicTrack() override;
156+
virtual Bool isMusicPlaying() const override;
157+
virtual Bool hasMusicTrackCompleted( const AsciiString& trackName, Int numberOfTimes ) const override;
158+
virtual AsciiString getMusicTrackName() const override;
159159

160-
virtual void openDevice();
161-
virtual void closeDevice();
162-
virtual void *getDevice() { return m_digitalHandle; }
160+
virtual void openDevice() override;
161+
virtual void closeDevice() override;
162+
virtual void *getDevice() override { return m_digitalHandle; }
163163

164-
virtual void stopAudio( AudioAffect which );
165-
virtual void pauseAudio( AudioAffect which );
166-
virtual void resumeAudio( AudioAffect which );
167-
virtual void pauseAmbient( Bool shouldPause );
164+
virtual void stopAudio( AudioAffect which ) override;
165+
virtual void pauseAudio( AudioAffect which ) override;
166+
virtual void resumeAudio( AudioAffect which ) override;
167+
virtual void pauseAmbient( Bool shouldPause ) override;
168168

169-
virtual void killAudioEventImmediately( AudioHandle audioEvent );
169+
virtual void killAudioEventImmediately( AudioHandle audioEvent ) override;
170170

171171
///< Return whether the current audio is playing or not.
172172
///< NOTE NOTE NOTE !!DO NOT USE THIS IN FOR GAMELOGIC PURPOSES!! NOTE NOTE NOTE
173-
virtual Bool isCurrentlyPlaying( AudioHandle handle );
173+
virtual Bool isCurrentlyPlaying( AudioHandle handle ) override;
174174

175-
virtual void notifyOfAudioCompletion( UnsignedInt audioCompleted, UnsignedInt flags );
175+
virtual void notifyOfAudioCompletion( UnsignedInt audioCompleted, UnsignedInt flags ) override;
176176
virtual PlayingAudio *findPlayingAudioFrom( UnsignedInt audioCompleted, UnsignedInt flags );
177177

178-
virtual UnsignedInt getProviderCount() const;
179-
virtual AsciiString getProviderName( UnsignedInt providerNum ) const;
180-
virtual UnsignedInt getProviderIndex( AsciiString providerName ) const;
181-
virtual void selectProvider( UnsignedInt providerNdx );
182-
virtual void unselectProvider();
183-
virtual UnsignedInt getSelectedProvider() const;
184-
virtual void setSpeakerType( UnsignedInt speakerType );
185-
virtual UnsignedInt getSpeakerType();
178+
virtual UnsignedInt getProviderCount() const override;
179+
virtual AsciiString getProviderName( UnsignedInt providerNum ) const override;
180+
virtual UnsignedInt getProviderIndex( AsciiString providerName ) const override;
181+
virtual void selectProvider( UnsignedInt providerNdx ) override;
182+
virtual void unselectProvider() override;
183+
virtual UnsignedInt getSelectedProvider() const override;
184+
virtual void setSpeakerType( UnsignedInt speakerType ) override;
185+
virtual UnsignedInt getSpeakerType() override;
186186

187-
virtual void *getHandleForBink();
188-
virtual void releaseHandleForBink();
187+
virtual void *getHandleForBink() override;
188+
virtual void releaseHandleForBink() override;
189189

190-
virtual void friend_forcePlayAudioEventRTS(const AudioEventRTS* eventToPlay);
190+
virtual void friend_forcePlayAudioEventRTS(const AudioEventRTS* eventToPlay) override;
191191

192-
virtual UnsignedInt getNum2DSamples() const;
193-
virtual UnsignedInt getNum3DSamples() const;
194-
virtual UnsignedInt getNumStreams() const;
192+
virtual UnsignedInt getNum2DSamples() const override;
193+
virtual UnsignedInt getNum3DSamples() const override;
194+
virtual UnsignedInt getNumStreams() const override;
195195

196-
virtual Bool doesViolateLimit( AudioEventRTS *event ) const;
197-
virtual Bool isPlayingLowerPriority( AudioEventRTS *event ) const;
198-
virtual Bool isPlayingAlready( AudioEventRTS *event ) const;
199-
virtual Bool isObjectPlayingVoice( UnsignedInt objID ) const;
196+
virtual Bool doesViolateLimit( AudioEventRTS *event ) const override;
197+
virtual Bool isPlayingLowerPriority( AudioEventRTS *event ) const override;
198+
virtual Bool isPlayingAlready( AudioEventRTS *event ) const override;
199+
virtual Bool isObjectPlayingVoice( UnsignedInt objID ) const override;
200200
Bool killLowestPrioritySoundImmediately( AudioEventRTS *event );
201201
AudioEventRTS* findLowestPrioritySound( AudioEventRTS *event );
202202

203-
virtual void adjustVolumeOfPlayingAudio(AsciiString eventName, Real newVolume);
203+
virtual void adjustVolumeOfPlayingAudio(AsciiString eventName, Real newVolume) override;
204204

205-
virtual void removePlayingAudio( AsciiString eventName );
206-
virtual void removeAllDisabledAudio();
205+
virtual void removePlayingAudio( AsciiString eventName ) override;
206+
virtual void removeAllDisabledAudio() override;
207207

208-
virtual void processRequestList();
208+
virtual void processRequestList() override;
209209
virtual void processPlayingList();
210210
virtual void processFadingList();
211211
virtual void processStoppedList();
@@ -214,23 +214,23 @@ class MilesAudioManager : public AudioManager
214214
void adjustRequest( AudioRequest *req );
215215
Bool checkForSample( AudioRequest *req );
216216

217-
virtual void setHardwareAccelerated(Bool accel);
218-
virtual void setSpeakerSurround(Bool surround);
217+
virtual void setHardwareAccelerated(Bool accel) override;
218+
virtual void setSpeakerSurround(Bool surround) override;
219219

220-
virtual void setPreferredProvider(AsciiString provider) { m_pref3DProvider = provider; }
221-
virtual void setPreferredSpeaker(AsciiString speakerType) { m_prefSpeaker = speakerType; }
220+
virtual void setPreferredProvider(AsciiString provider) override { m_pref3DProvider = provider; }
221+
virtual void setPreferredSpeaker(AsciiString speakerType) override { m_prefSpeaker = speakerType; }
222222

223-
virtual Real getFileLengthMS( AsciiString strToLoad ) const;
223+
virtual Real getFileLengthMS( AsciiString strToLoad ) const override;
224224

225-
virtual void closeAnySamplesUsingFile( const void *fileToClose );
225+
virtual void closeAnySamplesUsingFile( const void *fileToClose ) override;
226226

227227

228-
virtual Bool has3DSensitiveStreamsPlaying() const;
228+
virtual Bool has3DSensitiveStreamsPlaying() const override;
229229

230230

231231
protected:
232232
// 3-D functions
233-
virtual void setDeviceListenerPosition();
233+
virtual void setDeviceListenerPosition() override;
234234
const Coord3D *getCurrentPositionFromEvent( AudioEventRTS *event );
235235
Bool isOnScreen( const Coord3D *pos ) const;
236236
Real getEffectiveVolume(AudioEventRTS *event) const;

‎Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ class StdBIGFile : public ArchiveFile
3636
{
3737
public:
3838
StdBIGFile(AsciiString name, AsciiString path);
39-
virtual ~StdBIGFile();
40-
41-
virtual Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const; ///< fill in the fileInfo struct with info about the requested file.
42-
virtual File* openFile( const Char *filename, Int access = 0 );///< Open the specified file within the BIG file
43-
virtual void closeAllFiles(); ///< Close all file opened in this BIG file
44-
virtual AsciiString getName(); ///< Returns the name of the BIG file
45-
virtual AsciiString getPath(); ///< Returns full path and name of BIG file
46-
virtual void setSearchPriority( Int new_priority ); ///< Set this BIG file's search priority
47-
virtual void close(); ///< Close this BIG file
39+
virtual ~StdBIGFile() override;
40+
41+
virtual Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const override; ///< fill in the fileInfo struct with info about the requested file.
42+
virtual File* openFile( const Char *filename, Int access = 0 ) override;///< Open the specified file within the BIG file
43+
virtual void closeAllFiles() override; ///< Close all file opened in this BIG file
44+
virtual AsciiString getName() override; ///< Returns the name of the BIG file
45+
virtual AsciiString getPath() override; ///< Returns full path and name of BIG file
46+
virtual void setSearchPriority( Int new_priority ) override; ///< Set this BIG file's search priority
47+
virtual void close() override; ///< Close this BIG file
4848

4949
protected:
5050

‎Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,22 @@ class StdBIGFileSystem : public ArchiveFileSystem
3434
{
3535
public:
3636
StdBIGFileSystem();
37-
virtual ~StdBIGFileSystem();
37+
virtual ~StdBIGFileSystem() override;
3838

39-
virtual void init();
40-
virtual void update();
41-
virtual void reset();
42-
virtual void postProcessLoad();
39+
virtual void init() override;
40+
virtual void update() override;
41+
virtual void reset() override;
42+
virtual void postProcessLoad() override;
4343

4444
// ArchiveFile operations
45-
virtual void closeAllArchiveFiles(); ///< Close all Archivefiles currently open
45+
virtual void closeAllArchiveFiles() override; ///< Close all Archivefiles currently open
4646

4747
// File operations
48-
virtual ArchiveFile * openArchiveFile(const Char *filename);
49-
virtual void closeArchiveFile(const Char *filename);
50-
virtual void closeAllFiles(); ///< Close all files associated with ArchiveFiles
48+
virtual ArchiveFile * openArchiveFile(const Char *filename) override;
49+
virtual void closeArchiveFile(const Char *filename) override;
50+
virtual void closeAllFiles() override; ///< Close all files associated with ArchiveFiles
5151

52-
virtual Bool loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite = FALSE);
52+
virtual Bool loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite = FALSE) override;
5353
protected:
5454

5555
};

‎Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,20 @@ class StdLocalFileSystem : public LocalFileSystem
3434
{
3535
public:
3636
StdLocalFileSystem();
37-
virtual ~StdLocalFileSystem();
37+
virtual ~StdLocalFileSystem() override;
3838

39-
virtual void init();
40-
virtual void reset();
41-
virtual void update();
39+
virtual void init() override;
40+
virtual void reset() override;
41+
virtual void update() override;
4242

43-
virtual File * openFile(const Char *filename, Int access = File::NONE, size_t bufferSize = File::BUFFERSIZE); ///< open the given file.
44-
virtual Bool doesFileExist(const Char *filename) const; ///< does the given file exist?
43+
virtual File * openFile(const Char *filename, Int access = File::NONE, size_t bufferSize = File::BUFFERSIZE) override; ///< open the given file.
44+
virtual Bool doesFileExist(const Char *filename) const override; ///< does the given file exist?
4545

46-
virtual void getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep). Possibly search subdirectories.
47-
virtual Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const;
46+
virtual void getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const override; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep). Possibly search subdirectories.
47+
virtual Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const override;
4848

49-
virtual Bool createDirectory(AsciiString directory);
50-
virtual AsciiString normalizePath(const AsciiString& filePath) const;
49+
virtual Bool createDirectory(AsciiString directory) override;
50+
virtual AsciiString normalizePath(const AsciiString& filePath) const override;
5151

5252
protected:
5353
};

‎Core/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -72,21 +72,21 @@ class BinkVideoStream : public VideoStream
7272
Char *m_memFile; ///< Pointer to memory resident file
7373

7474
BinkVideoStream(); ///< only BinkVideoPlayer can create these
75-
virtual ~BinkVideoStream();
75+
virtual ~BinkVideoStream() override;
7676

7777
public:
7878

79-
virtual void update(); ///< Update bink stream
79+
virtual void update() override; ///< Update bink stream
8080

81-
virtual Bool isFrameReady(); ///< Is the frame ready to be displayed
82-
virtual void frameDecompress(); ///< Render current frame in to buffer
83-
virtual void frameRender( VideoBuffer *buffer ); ///< Render current frame in to buffer
84-
virtual void frameNext(); ///< Advance to next frame
85-
virtual Int frameIndex(); ///< Returns zero based index of current frame
86-
virtual Int frameCount(); ///< Returns the total number of frames in the stream
87-
virtual void frameGoto( Int index ); ///< Go to the spcified frame index
88-
virtual Int height(); ///< Return the height of the video
89-
virtual Int width(); ///< Return the width of the video
81+
virtual Bool isFrameReady() override; ///< Is the frame ready to be displayed
82+
virtual void frameDecompress() override; ///< Render current frame in to buffer
83+
virtual void frameRender( VideoBuffer *buffer ) override; ///< Render current frame in to buffer
84+
virtual void frameNext() override; ///< Advance to next frame
85+
virtual Int frameIndex() override; ///< Returns zero based index of current frame
86+
virtual Int frameCount() override; ///< Returns the total number of frames in the stream
87+
virtual void frameGoto( Int index ) override; ///< Go to the spcified frame index
88+
virtual Int height() override; ///< Return the height of the video
89+
virtual Int width() override; ///< Return the width of the video
9090

9191

9292
};
@@ -109,24 +109,24 @@ class BinkVideoPlayer : public VideoPlayer
109109
public:
110110

111111
// subsytem requirements
112-
virtual void init(); ///< Initialize video playback code
113-
virtual void reset(); ///< Reset video playback
114-
virtual void update(); ///< Services all audio tasks. Should be called frequently
112+
virtual void init() override; ///< Initialize video playback code
113+
virtual void reset() override; ///< Reset video playback
114+
virtual void update() override; ///< Services all audio tasks. Should be called frequently
115115

116-
virtual void deinit(); ///< Close down player
116+
virtual void deinit() override; ///< Close down player
117117

118118

119119
BinkVideoPlayer();
120-
~BinkVideoPlayer();
120+
virtual ~BinkVideoPlayer() override;
121121

122122
// service
123-
virtual void loseFocus(); ///< Should be called when application loses focus
124-
virtual void regainFocus(); ///< Should be called when application regains focus
123+
virtual void loseFocus() override; ///< Should be called when application loses focus
124+
virtual void regainFocus() override; ///< Should be called when application regains focus
125125

126-
virtual VideoStreamInterface* open( AsciiString movieTitle ); ///< Open video file for playback
127-
virtual VideoStreamInterface* load( AsciiString movieTitle ); ///< Load video file in to memory for playback
126+
virtual VideoStreamInterface* open( AsciiString movieTitle ) override; ///< Open video file for playback
127+
virtual VideoStreamInterface* load( AsciiString movieTitle ) override; ///< Load video file in to memory for playback
128128

129-
virtual void notifyVideoPlayerOfNewProvider( Bool nowHasValid );
129+
virtual void notifyVideoPlayerOfNewProvider( Bool nowHasValid ) override;
130130
virtual void initializeBinkWithMiles();
131131
};
132132

‎Core/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,27 +51,27 @@ class W3DRadar : public Radar
5151
public:
5252

5353
W3DRadar();
54-
~W3DRadar();
54+
~W3DRadar() override;
5555

56-
virtual void xfer( Xfer *xfer );
56+
virtual void xfer( Xfer *xfer ) override;
5757

58-
virtual void init(); ///< subsystem init
59-
virtual void update(); ///< subsystem update
60-
virtual void reset(); ///< subsystem reset
58+
virtual void init() override; ///< subsystem init
59+
virtual void update() override; ///< subsystem update
60+
virtual void reset() override; ///< subsystem reset
6161

62-
virtual void newMap( TerrainLogic *terrain ); ///< reset radar for new map
62+
virtual void newMap( TerrainLogic *terrain ) override; ///< reset radar for new map
6363

64-
virtual void draw( Int pixelX, Int pixelY, Int width, Int height ); ///< draw the radar
64+
virtual void draw( Int pixelX, Int pixelY, Int width, Int height ) override; ///< draw the radar
6565

66-
virtual void clearShroud();
67-
virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting); ///< set the shroud level at shroud cell x,y
68-
virtual void beginSetShroudLevel(); ///< call this once before multiple calls to setShroudLevel for better performance
69-
virtual void endSetShroudLevel(); ///< call this once after beginSetShroudLevel and setShroudLevel
66+
virtual void clearShroud() override;
67+
virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting) override; ///< set the shroud level at shroud cell x,y
68+
virtual void beginSetShroudLevel() override; ///< call this once before multiple calls to setShroudLevel for better performance
69+
virtual void endSetShroudLevel() override; ///< call this once after beginSetShroudLevel and setShroudLevel
7070

71-
virtual void refreshTerrain( TerrainLogic *terrain );
72-
virtual void refreshObjects();
71+
virtual void refreshTerrain( TerrainLogic *terrain ) override;
72+
virtual void refreshObjects() override;
7373

74-
virtual void notifyViewChanged(); ///< signals that the camera view has changed
74+
virtual void notifyViewChanged() override; ///< signals that the camera view has changed
7575

7676
protected:
7777

‎Core/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -93,26 +93,26 @@ class BaseHeightMapRenderObjClass : public RenderObjClass, public DX8_CleanupHoo
9393
public:
9494

9595
BaseHeightMapRenderObjClass();
96-
virtual ~BaseHeightMapRenderObjClass();
96+
virtual ~BaseHeightMapRenderObjClass() override;
9797

9898
// DX8_CleanupHook methods
99-
virtual void ReleaseResources(); ///< Release all dx8 resources so the device can be reset.
100-
virtual void ReAcquireResources(); ///< Reacquire all resources after device reset.
99+
virtual void ReleaseResources() override; ///< Release all dx8 resources so the device can be reset.
100+
virtual void ReAcquireResources() override; ///< Reacquire all resources after device reset.
101101

102102

103103
/////////////////////////////////////////////////////////////////////////////
104104
// Render Object Interface (W3D methods)
105105
/////////////////////////////////////////////////////////////////////////////
106-
virtual RenderObjClass * Clone() const;
107-
virtual int Class_ID() const;
108-
virtual void Render(RenderInfoClass & rinfo) = 0;
109-
virtual bool Cast_Ray(RayCollisionTestClass & raytest); // This CANNOT be Bool, as it will not inherit properly if you make Bool == Int
110-
virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const;
111-
virtual void Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const;
106+
virtual RenderObjClass * Clone() const override;
107+
virtual int Class_ID() const override;
108+
virtual void Render(RenderInfoClass & rinfo) override = 0;
109+
virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; // This CANNOT be Bool, as it will not inherit properly if you make Bool == Int
110+
virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override;
111+
virtual void Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const override;
112112

113113

114-
virtual void On_Frame_Update();
115-
virtual void Notify_Added(SceneClass * scene);
114+
virtual void On_Frame_Update() override;
115+
virtual void Notify_Added(SceneClass * scene) override;
116116

117117
// Other VIRTUAL methods. [3/20/2003]
118118

@@ -229,9 +229,9 @@ class BaseHeightMapRenderObjClass : public RenderObjClass, public DX8_CleanupHoo
229229

230230
protected:
231231
// snapshot methods
232-
virtual void crc( Xfer *xfer );
233-
virtual void xfer( Xfer *xfer );
234-
virtual void loadPostProcess();
232+
virtual void crc( Xfer *xfer ) override;
233+
virtual void xfer( Xfer *xfer ) override;
234+
virtual void loadPostProcess() override;
235235

236236
protected:
237237
Int m_x; ///< dimensions of heightmap

0 commit comments

Comments
 (0)