Skip to content

refactor: Add override keyword to virtual function overrides in GameEngineDevice #2393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bobtista wants to merge 6 commits into
base: main
Choose a base branch
from
Open

refactor: Add override keyword to virtual function overrides in GameEngineDevice #2393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
340227b
refactor(GeneralsMD): Add override keyword to virtual function overri…
bobtista Mar 3, 2026
a75b5a4
refactor(Generals): Add override keyword to virtual function override…
bobtista Mar 3, 2026
37bcbc7
refactor(Core): Add override keyword to virtual function overrides in…
bobtista Mar 3, 2026
2cab078
bugfix: Remove override from pure virtual declarations in GameEngineD…
bobtista Mar 11, 2026
75e5e21
bugfix: Add missing virtual keyword to override method declarations i…
bobtista Mar 11, 2026
47bfd7e
Fix spacing in override declarations
bobtista Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 50 additions & 50 deletions Core/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,70 +142,70 @@ class MilesAudioManager : public AudioManager
#endif

// from AudioDevice
virtual void init();
virtual void postProcessLoad();
virtual void reset();
virtual void update();
virtual void init() override;
virtual void postProcessLoad() override;
virtual void reset() override;
virtual void update() override;

MilesAudioManager();
virtual ~MilesAudioManager();
virtual ~MilesAudioManager() override;


virtual void nextMusicTrack();
virtual void prevMusicTrack();
virtual Bool isMusicPlaying() const;
virtual Bool hasMusicTrackCompleted( const AsciiString& trackName, Int numberOfTimes ) const;
virtual AsciiString getMusicTrackName() const;
virtual void nextMusicTrack() override;
virtual void prevMusicTrack() override;
virtual Bool isMusicPlaying() const override;
virtual Bool hasMusicTrackCompleted( const AsciiString& trackName, Int numberOfTimes ) const override;
virtual AsciiString getMusicTrackName() const override;

virtual void openDevice();
virtual void closeDevice();
virtual void *getDevice() { return m_digitalHandle; }
virtual void openDevice() override;
virtual void closeDevice() override;
virtual void *getDevice() override { return m_digitalHandle; }

virtual void stopAudio( AudioAffect which );
virtual void pauseAudio( AudioAffect which );
virtual void resumeAudio( AudioAffect which );
virtual void pauseAmbient( Bool shouldPause );
virtual void stopAudio( AudioAffect which ) override;
virtual void pauseAudio( AudioAffect which ) override;
virtual void resumeAudio( AudioAffect which ) override;
virtual void pauseAmbient( Bool shouldPause ) override;

virtual void killAudioEventImmediately( AudioHandle audioEvent );
virtual void killAudioEventImmediately( AudioHandle audioEvent ) override;

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

virtual void notifyOfAudioCompletion( UnsignedInt audioCompleted, UnsignedInt flags );
virtual void notifyOfAudioCompletion( UnsignedInt audioCompleted, UnsignedInt flags ) override;
virtual PlayingAudio *findPlayingAudioFrom( UnsignedInt audioCompleted, UnsignedInt flags );

virtual UnsignedInt getProviderCount() const;
virtual AsciiString getProviderName( UnsignedInt providerNum ) const;
virtual UnsignedInt getProviderIndex( AsciiString providerName ) const;
virtual void selectProvider( UnsignedInt providerNdx );
virtual void unselectProvider();
virtual UnsignedInt getSelectedProvider() const;
virtual void setSpeakerType( UnsignedInt speakerType );
virtual UnsignedInt getSpeakerType();
virtual UnsignedInt getProviderCount() const override;
virtual AsciiString getProviderName( UnsignedInt providerNum ) const override;
virtual UnsignedInt getProviderIndex( AsciiString providerName ) const override;
virtual void selectProvider( UnsignedInt providerNdx ) override;
virtual void unselectProvider() override;
virtual UnsignedInt getSelectedProvider() const override;
virtual void setSpeakerType( UnsignedInt speakerType ) override;
virtual UnsignedInt getSpeakerType() override;

virtual void *getHandleForBink();
virtual void releaseHandleForBink();
virtual void *getHandleForBink() override;
virtual void releaseHandleForBink() override;

virtual void friend_forcePlayAudioEventRTS(const AudioEventRTS* eventToPlay);
virtual void friend_forcePlayAudioEventRTS(const AudioEventRTS* eventToPlay) override;

virtual UnsignedInt getNum2DSamples() const;
virtual UnsignedInt getNum3DSamples() const;
virtual UnsignedInt getNumStreams() const;
virtual UnsignedInt getNum2DSamples() const override;
virtual UnsignedInt getNum3DSamples() const override;
virtual UnsignedInt getNumStreams() const override;

virtual Bool doesViolateLimit( AudioEventRTS *event ) const;
virtual Bool isPlayingLowerPriority( AudioEventRTS *event ) const;
virtual Bool isPlayingAlready( AudioEventRTS *event ) const;
virtual Bool isObjectPlayingVoice( UnsignedInt objID ) const;
virtual Bool doesViolateLimit( AudioEventRTS *event ) const override;
virtual Bool isPlayingLowerPriority( AudioEventRTS *event ) const override;
virtual Bool isPlayingAlready( AudioEventRTS *event ) const override;
virtual Bool isObjectPlayingVoice( UnsignedInt objID ) const override;
Bool killLowestPrioritySoundImmediately( AudioEventRTS *event );
AudioEventRTS* findLowestPrioritySound( AudioEventRTS *event );

virtual void adjustVolumeOfPlayingAudio(AsciiString eventName, Real newVolume);
virtual void adjustVolumeOfPlayingAudio(AsciiString eventName, Real newVolume) override;

virtual void removePlayingAudio( AsciiString eventName );
virtual void removeAllDisabledAudio();
virtual void removePlayingAudio( AsciiString eventName ) override;
virtual void removeAllDisabledAudio() override;

virtual void processRequestList();
virtual void processRequestList() override;
virtual void processPlayingList();
virtual void processFadingList();
virtual void processStoppedList();
Expand All @@ -214,23 +214,23 @@ class MilesAudioManager : public AudioManager
void adjustRequest( AudioRequest *req );
Bool checkForSample( AudioRequest *req );

virtual void setHardwareAccelerated(Bool accel);
virtual void setSpeakerSurround(Bool surround);
virtual void setHardwareAccelerated(Bool accel) override;
virtual void setSpeakerSurround(Bool surround) override;

virtual void setPreferredProvider(AsciiString provider) { m_pref3DProvider = provider; }
virtual void setPreferredSpeaker(AsciiString speakerType) { m_prefSpeaker = speakerType; }
virtual void setPreferredProvider(AsciiString provider) override { m_pref3DProvider = provider; }
virtual void setPreferredSpeaker(AsciiString speakerType) override { m_prefSpeaker = speakerType; }

virtual Real getFileLengthMS( AsciiString strToLoad ) const;
virtual Real getFileLengthMS( AsciiString strToLoad ) const override;

virtual void closeAnySamplesUsingFile( const void *fileToClose );
virtual void closeAnySamplesUsingFile( const void *fileToClose ) override;


virtual Bool has3DSensitiveStreamsPlaying() const;
virtual Bool has3DSensitiveStreamsPlaying() const override;


protected:
// 3-D functions
virtual void setDeviceListenerPosition();
virtual void setDeviceListenerPosition() override;
const Coord3D *getCurrentPositionFromEvent( AudioEventRTS *event );
Bool isOnScreen( const Coord3D *pos ) const;
Real getEffectiveVolume(AudioEventRTS *event) const;
Expand Down
18 changes: 9 additions & 9 deletions Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ class StdBIGFile : public ArchiveFile
{
public:
StdBIGFile(AsciiString name, AsciiString path);
virtual ~StdBIGFile();

virtual Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const; ///< fill in the fileInfo struct with info about the requested file.
virtual File* openFile( const Char *filename, Int access = 0 );///< Open the specified file within the BIG file
virtual void closeAllFiles(); ///< Close all file opened in this BIG file
virtual AsciiString getName(); ///< Returns the name of the BIG file
virtual AsciiString getPath(); ///< Returns full path and name of BIG file
virtual void setSearchPriority( Int new_priority ); ///< Set this BIG file's search priority
virtual void close(); ///< Close this BIG file
virtual ~StdBIGFile() override;

virtual Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const override; ///< fill in the fileInfo struct with info about the requested file.
virtual File* openFile( const Char *filename, Int access = 0 ) override;///< Open the specified file within the BIG file
virtual void closeAllFiles() override; ///< Close all file opened in this BIG file
virtual AsciiString getName() override; ///< Returns the name of the BIG file
virtual AsciiString getPath() override; ///< Returns full path and name of BIG file
virtual void setSearchPriority( Int new_priority ) override; ///< Set this BIG file's search priority
virtual void close() override; ///< Close this BIG file

protected:

Expand Down
20 changes: 10 additions & 10 deletions Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,22 @@ class StdBIGFileSystem : public ArchiveFileSystem
{
public:
StdBIGFileSystem();
virtual ~StdBIGFileSystem();
virtual ~StdBIGFileSystem() override;

virtual void init();
virtual void update();
virtual void reset();
virtual void postProcessLoad();
virtual void init() override;
virtual void update() override;
virtual void reset() override;
virtual void postProcessLoad() override;

// ArchiveFile operations
virtual void closeAllArchiveFiles(); ///< Close all Archivefiles currently open
virtual void closeAllArchiveFiles() override; ///< Close all Archivefiles currently open

// File operations
virtual ArchiveFile * openArchiveFile(const Char *filename);
virtual void closeArchiveFile(const Char *filename);
virtual void closeAllFiles(); ///< Close all files associated with ArchiveFiles
virtual ArchiveFile * openArchiveFile(const Char *filename) override;
virtual void closeArchiveFile(const Char *filename) override;
virtual void closeAllFiles() override; ///< Close all files associated with ArchiveFiles

virtual Bool loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite = FALSE);
virtual Bool loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite = FALSE) override;
protected:

};
20 changes: 10 additions & 10 deletions Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,20 @@ class StdLocalFileSystem : public LocalFileSystem
{
public:
StdLocalFileSystem();
virtual ~StdLocalFileSystem();
virtual ~StdLocalFileSystem() override;

virtual void init();
virtual void reset();
virtual void update();
virtual void init() override;
virtual void reset() override;
virtual void update() override;

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

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.
virtual Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const;
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.
virtual Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const override;

virtual Bool createDirectory(AsciiString directory);
virtual AsciiString normalizePath(const AsciiString& filePath) const;
virtual Bool createDirectory(AsciiString directory) override;
virtual AsciiString normalizePath(const AsciiString& filePath) const override;

protected:
};
42 changes: 21 additions & 21 deletions Core/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,21 +72,21 @@ class BinkVideoStream : public VideoStream
Char *m_memFile; ///< Pointer to memory resident file

BinkVideoStream(); ///< only BinkVideoPlayer can create these
virtual ~BinkVideoStream();
virtual ~BinkVideoStream() override;

public:

virtual void update(); ///< Update bink stream
virtual void update() override; ///< Update bink stream

virtual Bool isFrameReady(); ///< Is the frame ready to be displayed
virtual void frameDecompress(); ///< Render current frame in to buffer
virtual void frameRender( VideoBuffer *buffer ); ///< Render current frame in to buffer
virtual void frameNext(); ///< Advance to next frame
virtual Int frameIndex(); ///< Returns zero based index of current frame
virtual Int frameCount(); ///< Returns the total number of frames in the stream
virtual void frameGoto( Int index ); ///< Go to the spcified frame index
virtual Int height(); ///< Return the height of the video
virtual Int width(); ///< Return the width of the video
virtual Bool isFrameReady() override; ///< Is the frame ready to be displayed
virtual void frameDecompress() override; ///< Render current frame in to buffer
virtual void frameRender( VideoBuffer *buffer ) override; ///< Render current frame in to buffer
virtual void frameNext() override; ///< Advance to next frame
virtual Int frameIndex() override; ///< Returns zero based index of current frame
virtual Int frameCount() override; ///< Returns the total number of frames in the stream
virtual void frameGoto( Int index ) override; ///< Go to the spcified frame index
virtual Int height() override; ///< Return the height of the video
virtual Int width() override; ///< Return the width of the video


};
Expand All @@ -109,24 +109,24 @@ class BinkVideoPlayer : public VideoPlayer
public:

// subsytem requirements
virtual void init(); ///< Initialize video playback code
virtual void reset(); ///< Reset video playback
virtual void update(); ///< Services all audio tasks. Should be called frequently
virtual void init() override; ///< Initialize video playback code
virtual void reset() override; ///< Reset video playback
virtual void update() override; ///< Services all audio tasks. Should be called frequently

virtual void deinit(); ///< Close down player
virtual void deinit() override; ///< Close down player


BinkVideoPlayer();
~BinkVideoPlayer();
virtual ~BinkVideoPlayer() override;

// service
virtual void loseFocus(); ///< Should be called when application loses focus
virtual void regainFocus(); ///< Should be called when application regains focus
virtual void loseFocus() override; ///< Should be called when application loses focus
virtual void regainFocus() override; ///< Should be called when application regains focus

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

virtual void notifyVideoPlayerOfNewProvider( Bool nowHasValid );
virtual void notifyVideoPlayerOfNewProvider( Bool nowHasValid ) override;
virtual void initializeBinkWithMiles();
};

Expand Down
28 changes: 14 additions & 14 deletions Core/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,27 +51,27 @@ class W3DRadar : public Radar
public:

W3DRadar();
~W3DRadar();
virtual ~W3DRadar() override;

virtual void xfer( Xfer *xfer );
virtual void xfer( Xfer *xfer ) override;

virtual void init(); ///< subsystem init
virtual void update(); ///< subsystem update
virtual void reset(); ///< subsystem reset
virtual void init() override; ///< subsystem init
virtual void update() override; ///< subsystem update
virtual void reset() override; ///< subsystem reset

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

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

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

virtual void refreshTerrain( TerrainLogic *terrain );
virtual void refreshObjects();
virtual void refreshTerrain( TerrainLogic *terrain ) override;
virtual void refreshObjects() override;

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

protected:

Expand Down
26 changes: 13 additions & 13 deletions Core/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,26 +93,26 @@ class BaseHeightMapRenderObjClass : public RenderObjClass, public DX8_CleanupHoo
public:

BaseHeightMapRenderObjClass();
virtual ~BaseHeightMapRenderObjClass();
virtual ~BaseHeightMapRenderObjClass() override;

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


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


virtual void On_Frame_Update();
virtual void Notify_Added(SceneClass * scene);
virtual void On_Frame_Update() override;
virtual void Notify_Added(SceneClass * scene) override;

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

Expand Down Expand Up @@ -229,9 +229,9 @@ class BaseHeightMapRenderObjClass : public RenderObjClass, public DX8_CleanupHoo

protected:
// snapshot methods
virtual void crc( Xfer *xfer );
virtual void xfer( Xfer *xfer );
virtual void loadPostProcess();
virtual void crc( Xfer *xfer ) override;
virtual void xfer( Xfer *xfer ) override;
virtual void loadPostProcess() override;

protected:
Int m_x; ///< dimensions of heightmap
Expand Down
Loading
Loading