diff --git a/Core/GameEngine/Include/Common/ArchiveFileSystem.h b/Core/GameEngine/Include/Common/ArchiveFileSystem.h index 192f15d505f..c7deffea1e2 100644 --- a/Core/GameEngine/Include/Common/ArchiveFileSystem.h +++ b/Core/GameEngine/Include/Common/ArchiveFileSystem.h @@ -124,12 +124,12 @@ class ArchiveFileSystem : public SubsystemInterface { public: ArchiveFileSystem(); - virtual ~ArchiveFileSystem(); + virtual ~ArchiveFileSystem() override; - virtual void init() = 0; - virtual void update() = 0; - virtual void reset() = 0; - virtual void postProcessLoad() = 0; + virtual void init() override = 0; + virtual void update() override = 0; + virtual void reset() override = 0; + virtual void postProcessLoad() override = 0; // ArchiveFile operations virtual ArchiveFile* openArchiveFile( const Char *filename ) = 0; ///< Create new or return existing Archive file from file name diff --git a/Core/GameEngine/Include/Common/DynamicAudioEventInfo.h b/Core/GameEngine/Include/Common/DynamicAudioEventInfo.h index 145f895cc64..038ba2bbfff 100644 --- a/Core/GameEngine/Include/Common/DynamicAudioEventInfo.h +++ b/Core/GameEngine/Include/Common/DynamicAudioEventInfo.h @@ -51,9 +51,9 @@ class DynamicAudioEventInfo : public AudioEventInfo explicit DynamicAudioEventInfo( const AudioEventInfo & baseInfo ); // DynamicAudioEventInfo interfacing function overrides - virtual Bool isLevelSpecific() const; - virtual DynamicAudioEventInfo * getDynamicAudioEventInfo(); - virtual const DynamicAudioEventInfo * getDynamicAudioEventInfo() const; + virtual Bool isLevelSpecific() const override; + virtual DynamicAudioEventInfo * getDynamicAudioEventInfo() override; + virtual const DynamicAudioEventInfo * getDynamicAudioEventInfo() const override; // Change various fields from their default (INI) values void overrideAudioName( const AsciiString & newName ); diff --git a/Core/GameEngine/Include/Common/FileSystem.h b/Core/GameEngine/Include/Common/FileSystem.h index 0449b8d6a74..02a932f1313 100644 --- a/Core/GameEngine/Include/Common/FileSystem.h +++ b/Core/GameEngine/Include/Common/FileSystem.h @@ -142,11 +142,11 @@ class FileSystem : public SubsystemInterface public: FileSystem(); - virtual ~FileSystem(); + virtual ~FileSystem() override; - void init(); - void reset(); - void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; File* openFile( const Char *filename, Int access = File::NONE, size_t bufferSize = File::BUFFERSIZE, FileInstance instance = 0 ); ///< opens a File interface to the specified file Bool doesFileExist(const Char *filename, FileInstance instance = 0) const; ///< returns TRUE if the file exists. filename should have no directory. diff --git a/Core/GameEngine/Include/Common/GameAudio.h b/Core/GameEngine/Include/Common/GameAudio.h index 63d5375b60f..de7d754c4b2 100644 --- a/Core/GameEngine/Include/Common/GameAudio.h +++ b/Core/GameEngine/Include/Common/GameAudio.h @@ -143,16 +143,16 @@ class AudioManager : public SubsystemInterface static const char *const MuteAudioReasonNames[]; AudioManager(); - virtual ~AudioManager(); + virtual ~AudioManager() override; #if defined(RTS_DEBUG) virtual void audioDebugDisplay(DebugDisplayInterface *dd, void *userData, FILE *fp = nullptr ) = 0; #endif // From SubsystemInterface - 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; // device dependent stop, pause and resume virtual void stopAudio( AudioAffect which ) = 0; @@ -390,47 +390,47 @@ class AudioManagerDummy : public AudioManager #if defined(RTS_DEBUG) virtual void audioDebugDisplay(DebugDisplayInterface* dd, void* userData, FILE* fp) {} #endif - virtual void stopAudio(AudioAffect which) {} - virtual void pauseAudio(AudioAffect which) {} - virtual void resumeAudio(AudioAffect which) {} - virtual void pauseAmbient(Bool shouldPause) {} - virtual void killAudioEventImmediately(AudioHandle audioEvent) {} - virtual void nextMusicTrack() {} - virtual void prevMusicTrack() {} - virtual Bool isMusicPlaying() const { return false; } - virtual Bool hasMusicTrackCompleted(const AsciiString& trackName, Int numberOfTimes) const { return false; } - virtual AsciiString getMusicTrackName() const { return ""; } - virtual void openDevice() {} - virtual void closeDevice() {} - virtual void* getDevice() { return nullptr; } - virtual void notifyOfAudioCompletion(UnsignedInt audioCompleted, UnsignedInt flags) {} - virtual UnsignedInt getProviderCount() const { return 0; }; - virtual AsciiString getProviderName(UnsignedInt providerNum) const { return ""; } - virtual UnsignedInt getProviderIndex(AsciiString providerName) const { return 0; } - virtual void selectProvider(UnsignedInt providerNdx) {} - virtual void unselectProvider() {} - virtual UnsignedInt getSelectedProvider() const { return 0; } - virtual void setSpeakerType(UnsignedInt speakerType) {} - virtual UnsignedInt getSpeakerType() { return 0; } - virtual UnsignedInt getNum2DSamples() const { return 0; } - virtual UnsignedInt getNum3DSamples() const { return 0; } - virtual UnsignedInt getNumStreams() const { return 0; } - virtual Bool doesViolateLimit(AudioEventRTS* event) const { return false; } - virtual Bool isPlayingLowerPriority(AudioEventRTS* event) const { return false; } - virtual Bool isPlayingAlready(AudioEventRTS* event) const { return false; } - virtual Bool isObjectPlayingVoice(UnsignedInt objID) const { return false; } - virtual void adjustVolumeOfPlayingAudio(AsciiString eventName, Real newVolume) {} - virtual void removePlayingAudio(AsciiString eventName) {} - virtual void removeAllDisabledAudio() {} - virtual Bool has3DSensitiveStreamsPlaying() const { return false; } - virtual void* getHandleForBink() { return nullptr; } - virtual void releaseHandleForBink() {} - virtual void friend_forcePlayAudioEventRTS(const AudioEventRTS* eventToPlay) {} - virtual void setPreferredProvider(AsciiString providerNdx) {} - virtual void setPreferredSpeaker(AsciiString speakerType) {} - virtual Real getFileLengthMS(AsciiString strToLoad) const { return -1; } - virtual void closeAnySamplesUsingFile(const void* fileToClose) {} - virtual void setDeviceListenerPosition() {} + 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) override {} + virtual void nextMusicTrack() override {} + virtual void prevMusicTrack() override {} + virtual Bool isMusicPlaying() const override { return false; } + virtual Bool hasMusicTrackCompleted(const AsciiString& trackName, Int numberOfTimes) const override { return false; } + virtual AsciiString getMusicTrackName() const override { return ""; } + virtual void openDevice() override {} + virtual void closeDevice() override {} + virtual void* getDevice() override { return nullptr; } + virtual void notifyOfAudioCompletion(UnsignedInt audioCompleted, UnsignedInt flags) override {} + virtual UnsignedInt getProviderCount() const override { return 0; }; + virtual AsciiString getProviderName(UnsignedInt providerNum) const override { return ""; } + virtual UnsignedInt getProviderIndex(AsciiString providerName) const override { return 0; } + virtual void selectProvider(UnsignedInt providerNdx) override {} + virtual void unselectProvider() override {} + virtual UnsignedInt getSelectedProvider() const override { return 0; } + virtual void setSpeakerType(UnsignedInt speakerType) override {} + virtual UnsignedInt getSpeakerType() override { return 0; } + virtual UnsignedInt getNum2DSamples() const override { return 0; } + virtual UnsignedInt getNum3DSamples() const override { return 0; } + virtual UnsignedInt getNumStreams() const override { return 0; } + virtual Bool doesViolateLimit(AudioEventRTS* event) const override { return false; } + virtual Bool isPlayingLowerPriority(AudioEventRTS* event) const override { return false; } + virtual Bool isPlayingAlready(AudioEventRTS* event) const override { return false; } + virtual Bool isObjectPlayingVoice(UnsignedInt objID) const override { return false; } + virtual void adjustVolumeOfPlayingAudio(AsciiString eventName, Real newVolume) override {} + virtual void removePlayingAudio(AsciiString eventName) override {} + virtual void removeAllDisabledAudio() override {} + virtual Bool has3DSensitiveStreamsPlaying() const override { return false; } + virtual void* getHandleForBink() override { return nullptr; } + virtual void releaseHandleForBink() override {} + virtual void friend_forcePlayAudioEventRTS(const AudioEventRTS* eventToPlay) override {} + virtual void setPreferredProvider(AsciiString providerNdx) override {} + virtual void setPreferredSpeaker(AsciiString speakerType) override {} + virtual Real getFileLengthMS(AsciiString strToLoad) const override { return -1; } + virtual void closeAnySamplesUsingFile(const void* fileToClose) override {} + virtual void setDeviceListenerPosition() override {} }; diff --git a/Core/GameEngine/Include/Common/GameSounds.h b/Core/GameEngine/Include/Common/GameSounds.h index f61b53d513a..83c846957ac 100644 --- a/Core/GameEngine/Include/Common/GameSounds.h +++ b/Core/GameEngine/Include/Common/GameSounds.h @@ -52,12 +52,12 @@ class SoundManager : public SubsystemInterface { public: SoundManager(); - virtual ~SoundManager(); + virtual ~SoundManager() override; - virtual void init(); ///< Initializes the sounds system - virtual void postProcessLoad(); - virtual void update(); ///< Services sounds tasks. Called by AudioInterface - virtual void reset(); ///< Reset the sounds system + virtual void init() override; ///< Initializes the sounds system + virtual void postProcessLoad() override; + virtual void update() override; ///< Services sounds tasks. Called by AudioInterface + virtual void reset() override; ///< Reset the sounds system virtual void loseFocus(); ///< Called when application loses focus virtual void regainFocus(); ///< Called when application regains focus diff --git a/Core/GameEngine/Include/Common/LocalFile.h b/Core/GameEngine/Include/Common/LocalFile.h index 7d699bd5d31..8f98ab50c9c 100644 --- a/Core/GameEngine/Include/Common/LocalFile.h +++ b/Core/GameEngine/Include/Common/LocalFile.h @@ -91,22 +91,22 @@ class LocalFile : public File //virtual ~LocalFile(); - virtual Bool open( const Char *filename, Int access = NONE, size_t bufferSize = BUFFERSIZE ); ///< Open a file for access - virtual void close(); ///< Close the file - virtual Int read( void *buffer, Int bytes ); ///< Read the specified number of bytes in to buffer: See File::read - virtual Int readChar(); ///< Read a character from the file - virtual Int readWideChar(); ///< Read a wide character from the file - virtual Int write( const void *buffer, Int bytes ); ///< Write the specified number of bytes from the buffer: See File::write - virtual Int writeFormat( const Char* format, ... ); ///< Write an unterminated formatted string to the file - virtual Int writeFormat( const WideChar* format, ... ); ///< Write an unterminated formatted string to the file - virtual Int writeChar( const Char* character ); ///< Write a character to the file - virtual Int writeChar( const WideChar* character ); ///< Write a wide character to the file - virtual Int seek( Int new_pos, seekMode mode = CURRENT ); ///< Set file position: See File::seek - virtual Bool flush(); ///< flush data to disk - virtual void nextLine(Char *buf = nullptr, Int bufSize = 0); ///< moves file position to after the next new-line - virtual Bool scanInt(Int &newInt); ///< return what gets read in as an integer at the current file position. - virtual Bool scanReal(Real &newReal); ///< return what gets read in as a float at the current file position. - virtual Bool scanString(AsciiString &newString); ///< return what gets read in as a string at the current file position. + virtual Bool open( const Char *filename, Int access = NONE, size_t bufferSize = BUFFERSIZE ) override; ///< Open a file for access + virtual void close() override; ///< Close the file + virtual Int read( void *buffer, Int bytes ) override; ///< Read the specified number of bytes in to buffer: See File::read + virtual Int readChar() override; ///< Read a character from the file + virtual Int readWideChar() override; ///< Read a wide character from the file + virtual Int write( const void *buffer, Int bytes ) override; ///< Write the specified number of bytes from the buffer: See File::write + virtual Int writeFormat( const Char* format, ... ) override; ///< Write an unterminated formatted string to the file + virtual Int writeFormat( const WideChar* format, ... ) override; ///< Write an unterminated formatted string to the file + virtual Int writeChar( const Char* character ) override; ///< Write a character to the file + virtual Int writeChar( const WideChar* character ) override; ///< Write a wide character to the file + virtual Int seek( Int new_pos, seekMode mode = CURRENT ) override; ///< Set file position: See File::seek + virtual Bool flush() override; ///< flush data to disk + virtual void nextLine(Char *buf = nullptr, Int bufSize = 0) override; ///< moves file position to after the next new-line + virtual Bool scanInt(Int &newInt) override; ///< return what gets read in as an integer at the current file position. + virtual Bool scanReal(Real &newReal) override; ///< return what gets read in as a float at the current file position. + virtual Bool scanString(AsciiString &newString) override; ///< return what gets read in as a string at the current file position. /** Allocate a buffer large enough to hold entire file, read the entire file into the buffer, then close the file. @@ -114,8 +114,8 @@ class LocalFile : public File for freeing is (via delete[]). This is a Good Thing to use because it minimizes memory copies for BIG files. */ - virtual char* readEntireAndClose(); - virtual File* convertToRAMFile(); + virtual char* readEntireAndClose() override; + virtual File* convertToRAMFile() override; protected: diff --git a/Core/GameEngine/Include/Common/LocalFileSystem.h b/Core/GameEngine/Include/Common/LocalFileSystem.h index 08f00af5d27..28c23383314 100644 --- a/Core/GameEngine/Include/Common/LocalFileSystem.h +++ b/Core/GameEngine/Include/Common/LocalFileSystem.h @@ -34,11 +34,11 @@ class LocalFileSystem : public SubsystemInterface { public: - virtual ~LocalFileSystem() {} + virtual ~LocalFileSystem() override {} - virtual void init() = 0; - virtual void reset() = 0; - virtual void update() = 0; + virtual void init() override = 0; + virtual void reset() override = 0; + virtual void update() override = 0; virtual File * openFile(const Char *filename, Int access = File::NONE, size_t bufferSize = File::BUFFERSIZE) = 0; virtual Bool doesFileExist(const Char *filename) const = 0; diff --git a/Core/GameEngine/Include/Common/OptionPreferences.h b/Core/GameEngine/Include/Common/OptionPreferences.h index ea500e97ca7..2bacaa07105 100644 --- a/Core/GameEngine/Include/Common/OptionPreferences.h +++ b/Core/GameEngine/Include/Common/OptionPreferences.h @@ -42,7 +42,7 @@ class OptionPreferences : public UserPreferences { public: OptionPreferences(); - virtual ~OptionPreferences(); + virtual ~OptionPreferences() override; Bool loadFromIniFile(); diff --git a/Core/GameEngine/Include/Common/RAMFile.h b/Core/GameEngine/Include/Common/RAMFile.h index 6d9f09b5c3b..b1f639f161e 100644 --- a/Core/GameEngine/Include/Common/RAMFile.h +++ b/Core/GameEngine/Include/Common/RAMFile.h @@ -82,23 +82,23 @@ class RAMFile : public File //virtual ~RAMFile(); - virtual Bool open( const Char *filename, Int access = NONE, size_t bufferSize = 0 ); ///< Open a file for access - virtual void close(); ///< Close the file - virtual Int read( void *buffer, Int bytes ); ///< Read the specified number of bytes in to buffer: See File::read - virtual Int readChar(); ///< Read a character from the file - virtual Int readWideChar(); ///< Read a wide character from the file - virtual Int write( const void *buffer, Int bytes ); ///< Write the specified number of bytes from the buffer: See File::write - virtual Int writeFormat( const Char* format, ... ); ///< Write the formatted string to the file - virtual Int writeFormat( const WideChar* format, ... ); ///< Write the formatted string to the file - virtual Int writeChar( const Char* character ); ///< Write a character to the file - virtual Int writeChar( const WideChar* character ); ///< Write a wide character to the file - virtual Int seek( Int new_pos, seekMode mode = CURRENT ); ///< Set file position: See File::seek - virtual Bool flush(); ///< flush data to disk - virtual void nextLine(Char *buf = nullptr, Int bufSize = 0); ///< moves current position to after the next new-line - - virtual Bool scanInt(Int &newInt); ///< return what gets read as an integer from the current memory position. - virtual Bool scanReal(Real &newReal); ///< return what gets read as a float from the current memory position. - virtual Bool scanString(AsciiString &newString); ///< return what gets read as a string from the current memory position. + virtual Bool open( const Char *filename, Int access = NONE, size_t bufferSize = 0 ) override; ///< Open a file for access + virtual void close() override; ///< Close the file + virtual Int read( void *buffer, Int bytes ) override; ///< Read the specified number of bytes in to buffer: See File::read + virtual Int readChar() override; ///< Read a character from the file + virtual Int readWideChar() override; ///< Read a wide character from the file + virtual Int write( const void *buffer, Int bytes ) override; ///< Write the specified number of bytes from the buffer: See File::write + virtual Int writeFormat( const Char* format, ... ) override; ///< Write the formatted string to the file + virtual Int writeFormat( const WideChar* format, ... ) override; ///< Write the formatted string to the file + virtual Int writeChar( const Char* character ) override; ///< Write a character to the file + virtual Int writeChar( const WideChar* character ) override; ///< Write a wide character to the file + virtual Int seek( Int new_pos, seekMode mode = CURRENT ) override; ///< Set file position: See File::seek + virtual Bool flush() override; ///< flush data to disk + virtual void nextLine(Char *buf = nullptr, Int bufSize = 0) override; ///< moves current position to after the next new-line + + virtual Bool scanInt(Int &newInt) override; ///< return what gets read as an integer from the current memory position. + virtual Bool scanReal(Real &newReal) override; ///< return what gets read as a float from the current memory position. + virtual Bool scanString(AsciiString &newString) override; ///< return what gets read as a string from the current memory position. virtual Bool open( File *file ); ///< Open file for fast RAM access virtual Bool openFromArchive(File *archiveFile, const AsciiString& filename, Int offset, Int size); ///< copy file data from the given file at the given offset for the given size. @@ -111,8 +111,8 @@ class RAMFile : public File for freeing is (via delete[]). This is a Good Thing to use because it minimizes memory copies for BIG files. */ - virtual char* readEntireAndClose(); - virtual File* convertToRAMFile(); + virtual char* readEntireAndClose() override; + virtual File* convertToRAMFile() override; protected: diff --git a/Core/GameEngine/Include/Common/Radar.h b/Core/GameEngine/Include/Common/Radar.h index e3df74eb8a2..5e170c261fc 100644 --- a/Core/GameEngine/Include/Common/Radar.h +++ b/Core/GameEngine/Include/Common/Radar.h @@ -110,9 +110,9 @@ class RadarObject : public MemoryPoolObject, 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; Object *m_object; ///< the object RadarObject *m_next; ///< next radar object @@ -157,11 +157,11 @@ class Radar : public Snapshot, public: Radar(); - virtual ~Radar(); + virtual ~Radar() override; - virtual void init() { } ///< subsystem initialization - virtual void reset(); ///< subsystem reset - virtual void update(); ///< subsystem per frame update + virtual void init() override { } ///< subsystem initialization + virtual void reset() override; ///< subsystem reset + virtual void update() override; ///< subsystem per frame update // is the game window parameter the radar window Bool isRadarWindow( GameWindow *window ) { return (m_radarWindow == window) && (m_radarWindow != nullptr); } @@ -228,9 +228,9 @@ class Radar : public Snapshot, 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; /// internal method for creating a radar event with specific colors void internalCreateEvent( const Coord3D *world, RadarEventType type, Real secondsToLive, @@ -304,7 +304,7 @@ extern Radar *TheRadar; ///< the radar singleton extern class RadarDummy : public Radar { public: - virtual void draw(Int pixelX, Int pixelY, Int width, Int height) { } - virtual void clearShroud() { } - virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting) { } + virtual void draw(Int pixelX, Int pixelY, Int width, Int height) override { } + virtual void clearShroud() override { } + virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting) override { } }; diff --git a/Core/GameEngine/Include/Common/StreamingArchiveFile.h b/Core/GameEngine/Include/Common/StreamingArchiveFile.h index ff3df18de6f..72e3057afef 100644 --- a/Core/GameEngine/Include/Common/StreamingArchiveFile.h +++ b/Core/GameEngine/Include/Common/StreamingArchiveFile.h @@ -83,24 +83,24 @@ class StreamingArchiveFile : public RAMFile //virtual ~StreamingArchiveFile(); - virtual Bool open( const Char *filename, Int access = NONE, size_t bufferSize = BUFFERSIZE ); ///< Open a file for access - virtual void close(); ///< Close the file - virtual Int read( void *buffer, Int bytes ); ///< Read the specified number of bytes in to buffer: See File::read - virtual Int write( const void *buffer, Int bytes ); ///< Write the specified number of bytes from the buffer: See File::write - virtual Int seek( Int new_pos, seekMode mode = CURRENT ); ///< Set file position: See File::seek + virtual Bool open( const Char *filename, Int access = NONE, size_t bufferSize = BUFFERSIZE ) override; ///< Open a file for access + virtual void close() override; ///< Close the file + virtual Int read( void *buffer, Int bytes ) override; ///< Read the specified number of bytes in to buffer: See File::read + virtual Int write( const void *buffer, Int bytes ) override; ///< Write the specified number of bytes from the buffer: See File::write + virtual Int seek( Int new_pos, seekMode mode = CURRENT ) override; ///< Set file position: See File::seek // Ini's should not be parsed with streaming files, that's just dumb. - virtual void nextLine(Char *buf = nullptr, Int bufSize = 0) { DEBUG_CRASH(("Should not call nextLine on a streaming file.")); } - virtual Bool scanInt(Int &newInt) { DEBUG_CRASH(("Should not call scanInt on a streaming file.")); return FALSE; } - virtual Bool scanReal(Real &newReal) { DEBUG_CRASH(("Should not call scanReal on a streaming file.")); return FALSE; } - virtual Bool scanString(AsciiString &newString) { DEBUG_CRASH(("Should not call scanString on a streaming file.")); return FALSE; } + virtual void nextLine(Char *buf = nullptr, Int bufSize = 0) override { DEBUG_CRASH(("Should not call nextLine on a streaming file.")); } + virtual Bool scanInt(Int &newInt) override { DEBUG_CRASH(("Should not call scanInt on a streaming file.")); return FALSE; } + virtual Bool scanReal(Real &newReal) override { DEBUG_CRASH(("Should not call scanReal on a streaming file.")); return FALSE; } + virtual Bool scanString(AsciiString &newString) override { DEBUG_CRASH(("Should not call scanString on a streaming file.")); return FALSE; } - virtual Bool open( File *file ); ///< Open file for fast RAM access - virtual Bool openFromArchive(File *archiveFile, const AsciiString& filename, Int offset, Int size); ///< copy file data from the given file at the given offset for the given size. - virtual Bool copyDataToFile(File *localFile) { DEBUG_CRASH(("Are you sure you meant to copyDataToFile on a streaming file?")); return FALSE; } + virtual Bool open( File *file ) override; ///< Open file for fast RAM access + virtual Bool openFromArchive(File *archiveFile, const AsciiString& filename, Int offset, Int size) override; ///< copy file data from the given file at the given offset for the given size. + virtual Bool copyDataToFile(File *localFile) override { DEBUG_CRASH(("Are you sure you meant to copyDataToFile on a streaming file?")); return FALSE; } - virtual char* readEntireAndClose() { DEBUG_CRASH(("Are you sure you meant to readEntireAndClose on a streaming file?")); return nullptr; } - virtual File* convertToRAMFile() { DEBUG_CRASH(("Are you sure you meant to readEntireAndClose on a streaming file?")); return this; } + virtual char* readEntireAndClose() override { DEBUG_CRASH(("Are you sure you meant to readEntireAndClose on a streaming file?")); return nullptr; } + virtual File* convertToRAMFile() override { DEBUG_CRASH(("Are you sure you meant to readEntireAndClose on a streaming file?")); return this; } }; diff --git a/Core/GameEngine/Include/Common/UserPreferences.h b/Core/GameEngine/Include/Common/UserPreferences.h index d1821164171..541303f6866 100644 --- a/Core/GameEngine/Include/Common/UserPreferences.h +++ b/Core/GameEngine/Include/Common/UserPreferences.h @@ -77,7 +77,7 @@ class LANPreferences : public UserPreferences { public: LANPreferences(); - virtual ~LANPreferences(); + virtual ~LANPreferences() override; Bool loadFromIniFile(); diff --git a/Core/GameEngine/Include/Common/XferCRC.h b/Core/GameEngine/Include/Common/XferCRC.h index b1617260770..8a728048c78 100644 --- a/Core/GameEngine/Include/Common/XferCRC.h +++ b/Core/GameEngine/Include/Common/XferCRC.h @@ -43,23 +43,23 @@ class XferCRC : public Xfer public: XferCRC(); - virtual ~XferCRC(); + virtual ~XferCRC() override; // Xfer methods - virtual void open( AsciiString identifier ); ///< start a CRC session with this xfer instance - virtual void close(); ///< stop CRC session - virtual Int beginBlock(); ///< start block event - virtual void endBlock(); ///< end block event - virtual void skip( Int dataSize ); ///< skip xfer event + virtual void open( AsciiString identifier ) override; ///< start a CRC session with this xfer instance + virtual void close() override; ///< stop CRC session + virtual Int beginBlock() override; ///< start block event + virtual void endBlock() override; ///< end block event + virtual void skip( Int dataSize ) override; ///< skip xfer event - virtual void xferSnapshot( Snapshot *snapshot ); ///< entry point for xfering a snapshot + virtual void xferSnapshot( Snapshot *snapshot ) override; ///< entry point for xfering a snapshot // Xfer CRC methods virtual UnsignedInt getCRC(); ///< get computed CRC in network byte order protected: - virtual void xferImplementation( void *data, Int dataSize ); + virtual void xferImplementation( void *data, Int dataSize ) override; inline void addCRC( UnsignedInt val ); ///< CRC a 4-byte block diff --git a/Core/GameEngine/Include/Common/XferDeepCRC.h b/Core/GameEngine/Include/Common/XferDeepCRC.h index fc8a8ce9f6f..729e37bf1c8 100644 --- a/Core/GameEngine/Include/Common/XferDeepCRC.h +++ b/Core/GameEngine/Include/Common/XferDeepCRC.h @@ -44,20 +44,20 @@ class XferDeepCRC : public XferCRC public: XferDeepCRC(); - virtual ~XferDeepCRC(); + virtual ~XferDeepCRC() override; // Xfer methods - virtual void open( AsciiString identifier ); ///< start a CRC session with this xfer instance - virtual void close(); ///< stop CRC session + virtual void open( AsciiString identifier ) override; ///< start a CRC session with this xfer instance + virtual void close() override; ///< stop CRC session // xfer methods - virtual void xferMarkerLabel( AsciiString asciiStringData ); ///< xfer ascii string (need our own) - virtual void xferAsciiString( AsciiString *asciiStringData ); ///< xfer ascii string (need our own) - virtual void xferUnicodeString( UnicodeString *unicodeStringData ); ///< xfer unicode string (need our own); + virtual void xferMarkerLabel( AsciiString asciiStringData ) override; ///< xfer ascii string (need our own) + virtual void xferAsciiString( AsciiString *asciiStringData ) override; ///< xfer ascii string (need our own) + virtual void xferUnicodeString( UnicodeString *unicodeStringData ) override; ///< xfer unicode string (need our own); protected: - virtual void xferImplementation( void *data, Int dataSize ); + virtual void xferImplementation( void *data, Int dataSize ) override; FILE * m_fileFP; ///< pointer to file }; diff --git a/Core/GameEngine/Include/Common/XferLoad.h b/Core/GameEngine/Include/Common/XferLoad.h index 06cbc0bc946..0a5505a388f 100644 --- a/Core/GameEngine/Include/Common/XferLoad.h +++ b/Core/GameEngine/Include/Common/XferLoad.h @@ -43,23 +43,23 @@ class XferLoad : public Xfer public: XferLoad(); - virtual ~XferLoad(); + virtual ~XferLoad() override; - virtual void open( AsciiString identifier ); ///< open file for writing - virtual void close(); ///< close file - virtual Int beginBlock(); ///< read placeholder block size - virtual void endBlock(); ///< reading an end block is a no-op - virtual void skip( Int dataSize ); ///< skip forward dataSize bytes in file + virtual void open( AsciiString identifier ) override; ///< open file for writing + virtual void close() override; ///< close file + virtual Int beginBlock() override; ///< read placeholder block size + virtual void endBlock() override; ///< reading an end block is a no-op + virtual void skip( Int dataSize ) override; ///< skip forward dataSize bytes in file - virtual void xferSnapshot( Snapshot *snapshot ); ///< entry point for xfering a snapshot + virtual void xferSnapshot( Snapshot *snapshot ) override; ///< entry point for xfering a snapshot // xfer methods - virtual void xferAsciiString( AsciiString *asciiStringData ); ///< xfer ascii string (need our own) - virtual void xferUnicodeString( UnicodeString *unicodeStringData ); ///< xfer unicode string (need our own); + virtual void xferAsciiString( AsciiString *asciiStringData ) override; ///< xfer ascii string (need our own) + virtual void xferUnicodeString( UnicodeString *unicodeStringData ) override; ///< xfer unicode string (need our own); protected: - virtual void xferImplementation( void *data, Int dataSize ); ///< the xfer implementation + virtual void xferImplementation( void *data, Int dataSize ) override; ///< the xfer implementation FILE * m_fileFP; ///< pointer to file diff --git a/Core/GameEngine/Include/Common/XferSave.h b/Core/GameEngine/Include/Common/XferSave.h index 53d538e3398..9cf6593bdd6 100644 --- a/Core/GameEngine/Include/Common/XferSave.h +++ b/Core/GameEngine/Include/Common/XferSave.h @@ -47,24 +47,24 @@ class XferSave : public Xfer public: XferSave(); - virtual ~XferSave(); + virtual ~XferSave() override; // Xfer methods - virtual void open( AsciiString identifier ); ///< open file for writing - virtual void close(); ///< close file - virtual Int beginBlock(); ///< write placeholder block size - virtual void endBlock(); ///< backup to last begin block and write size - virtual void skip( Int dataSize ); ///< skipping during a write is a no-op + virtual void open( AsciiString identifier ) override; ///< open file for writing + virtual void close() override; ///< close file + virtual Int beginBlock() override; ///< write placeholder block size + virtual void endBlock() override; ///< backup to last begin block and write size + virtual void skip( Int dataSize ) override; ///< skipping during a write is a no-op - virtual void xferSnapshot( Snapshot *snapshot ); ///< entry point for xfering a snapshot + virtual void xferSnapshot( Snapshot *snapshot ) override; ///< entry point for xfering a snapshot // xfer methods - virtual void xferAsciiString( AsciiString *asciiStringData ); ///< xfer ascii string (need our own) - virtual void xferUnicodeString( UnicodeString *unicodeStringData ); ///< xfer unicode string (need our own); + virtual void xferAsciiString( AsciiString *asciiStringData ) override; ///< xfer ascii string (need our own) + virtual void xferUnicodeString( UnicodeString *unicodeStringData ) override; ///< xfer unicode string (need our own); protected: - virtual void xferImplementation( void *data, Int dataSize ); ///< the xfer implementation + virtual void xferImplementation( void *data, Int dataSize ) override; ///< the xfer implementation FILE * m_fileFP; ///< pointer to file XferBlockData *m_blockStack; ///< stack of block data diff --git a/Core/GameEngine/Include/GameClient/Credits.h b/Core/GameEngine/Include/GameClient/Credits.h index 95dcbd11447..86e6f8bb4c5 100644 --- a/Core/GameEngine/Include/GameClient/Credits.h +++ b/Core/GameEngine/Include/GameClient/Credits.h @@ -111,13 +111,13 @@ class CreditsManager: public SubsystemInterface { public: CreditsManager(); - ~CreditsManager(); + ~CreditsManager() override; - void init(); + void init() override; void load(); - void reset(); - void update(); - void draw(); + void reset() override; + void update() override; + void draw() override; const FieldParse *getFieldParse() const { return m_creditsFieldParseTable; } ///< returns the parsing fields static const FieldParse m_creditsFieldParseTable[]; ///< the parse table diff --git a/Core/GameEngine/Include/GameClient/DisplayStringManager.h b/Core/GameEngine/Include/GameClient/DisplayStringManager.h index 0f56014bc2a..bca43f0214f 100644 --- a/Core/GameEngine/Include/GameClient/DisplayStringManager.h +++ b/Core/GameEngine/Include/GameClient/DisplayStringManager.h @@ -41,11 +41,11 @@ class DisplayStringManager : public SubsystemInterface public: DisplayStringManager(); - virtual ~DisplayStringManager(); + virtual ~DisplayStringManager() override; - virtual void init() {} ///< initialize the factory - virtual void reset() {} ///< reset system - virtual void update() {}; ///< update anything we need to in our strings + virtual void init() override {} ///< initialize the factory + virtual void reset() override {} ///< reset system + virtual void update() override {}; ///< update anything we need to in our strings virtual DisplayString *newDisplayString() = 0; ///< allocate new display string virtual void freeDisplayString( DisplayString *string ) = 0; ///< free string diff --git a/Core/GameEngine/Include/GameClient/FXList.h b/Core/GameEngine/Include/GameClient/FXList.h index 3aba2a0b458..2d08f0335ec 100644 --- a/Core/GameEngine/Include/GameClient/FXList.h +++ b/Core/GameEngine/Include/GameClient/FXList.h @@ -192,11 +192,11 @@ class FXListStore : public SubsystemInterface public: FXListStore(); - ~FXListStore(); + virtual ~FXListStore() override; - void init() { } - void reset() { } - void update() { } + virtual void init() override { } + virtual void reset() override { } + virtual void update() override { } /** return the FXList with the given namekey. diff --git a/Core/GameEngine/Include/GameClient/GameFont.h b/Core/GameEngine/Include/GameClient/GameFont.h index 281dd3e023b..3b67bd19bb6 100644 --- a/Core/GameEngine/Include/GameClient/GameFont.h +++ b/Core/GameEngine/Include/GameClient/GameFont.h @@ -62,11 +62,11 @@ class FontLibrary : public SubsystemInterface public: FontLibrary(); - virtual ~FontLibrary(); + virtual ~FontLibrary() override; - virtual void init(); - virtual void reset(); - virtual void update() { } + virtual void init() override; + virtual void reset() override; + virtual void update() override { } GameFont *getFont( AsciiString name, Int pointSize, Bool bold ); ///< get a font pointer diff --git a/Core/GameEngine/Include/GameClient/GameText.h b/Core/GameEngine/Include/GameClient/GameText.h index 51b1e4566ab..e7f6be21017 100644 --- a/Core/GameEngine/Include/GameClient/GameText.h +++ b/Core/GameEngine/Include/GameClient/GameText.h @@ -70,7 +70,7 @@ class GameTextInterface : public SubsystemInterface public: - virtual ~GameTextInterface() {}; + virtual ~GameTextInterface() override {}; virtual UnicodeString fetch( const Char *label, Bool *exists = nullptr ) = 0; ///< Returns the associated labeled unicode text virtual UnicodeString fetch( AsciiString label, Bool *exists = nullptr ) = 0; ///< Returns the associated labeled unicode text ; TheSuperHackers @todo Remove diff --git a/Core/GameEngine/Include/GameClient/GameWindow.h b/Core/GameEngine/Include/GameClient/GameWindow.h index d9d6fd0c1d7..e96c94c96a0 100644 --- a/Core/GameEngine/Include/GameClient/GameWindow.h +++ b/Core/GameEngine/Include/GameClient/GameWindow.h @@ -438,8 +438,8 @@ class GameWindowDummy : public GameWindow { MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(GameWindowDummy, "GameWindowDummy") public: - virtual void winDrawBorder() {} - virtual void* winGetUserData() { return nullptr; } + virtual void winDrawBorder() override {} + virtual void* winGetUserData() override { return nullptr; } }; // ModalWindow ---------------------------------------------------------------- diff --git a/Core/GameEngine/Include/GameClient/GameWindowTransitions.h b/Core/GameEngine/Include/GameClient/GameWindowTransitions.h index 4691ffa9e27..6f1f28b1aca 100644 --- a/Core/GameEngine/Include/GameClient/GameWindowTransitions.h +++ b/Core/GameEngine/Include/GameClient/GameWindowTransitions.h @@ -139,14 +139,14 @@ class TextOnFrameTransition : public Transition { public: TextOnFrameTransition (); - virtual ~TextOnFrameTransition(); + virtual ~TextOnFrameTransition() override; - virtual void init( GameWindow *win ); - virtual void update( Int frame ); - virtual void reverse(); - virtual void draw(); + virtual void init( GameWindow *win ) override; + virtual void update( Int frame ) override; + virtual void reverse() override; + virtual void draw() override; - virtual void skip(); + virtual void skip() override; protected: enum{ @@ -161,14 +161,14 @@ class ReverseSoundTransition : public Transition { public: ReverseSoundTransition (); - virtual ~ReverseSoundTransition(); + virtual ~ReverseSoundTransition() override; - virtual void init( GameWindow *win ); - virtual void update( Int frame ); - virtual void reverse(); - virtual void draw(); + virtual void init( GameWindow *win ) override; + virtual void update( Int frame ) override; + virtual void reverse() override; + virtual void draw() override; - virtual void skip(); + virtual void skip() override; protected: enum{ @@ -184,14 +184,14 @@ class FullFadeTransition : public Transition { public: FullFadeTransition (); - virtual ~FullFadeTransition(); + virtual ~FullFadeTransition() override; - virtual void init( GameWindow *win ); - virtual void update( Int frame ); - virtual void reverse(); - virtual void draw(); + virtual void init( GameWindow *win ) override; + virtual void update( Int frame ) override; + virtual void reverse() override; + virtual void draw() override; - virtual void skip(); + virtual void skip() override; protected: enum{ @@ -209,14 +209,14 @@ class ControlBarArrowTransition : public Transition { public: ControlBarArrowTransition (); - virtual ~ControlBarArrowTransition(); + virtual ~ControlBarArrowTransition() override; - virtual void init( GameWindow *win ); - virtual void update( Int frame ); - virtual void reverse(); - virtual void draw(); + virtual void init( GameWindow *win ) override; + virtual void update( Int frame ) override; + virtual void reverse() override; + virtual void draw() override; - virtual void skip(); + virtual void skip() override; protected: enum{ @@ -238,14 +238,14 @@ class ScreenFadeTransition : public Transition { public: ScreenFadeTransition (); - virtual ~ScreenFadeTransition(); + virtual ~ScreenFadeTransition() override; - virtual void init( GameWindow *win ); - virtual void update( Int frame ); - virtual void reverse(); - virtual void draw(); + virtual void init( GameWindow *win ) override; + virtual void update( Int frame ) override; + virtual void reverse() override; + virtual void draw() override; - virtual void skip(); + virtual void skip() override; protected: enum{ @@ -263,14 +263,14 @@ class CountUpTransition : public Transition { public: CountUpTransition (); - virtual ~CountUpTransition(); + virtual ~CountUpTransition() override; - virtual void init( GameWindow *win ); - virtual void update( Int frame ); - virtual void reverse(); - virtual void draw(); + virtual void init( GameWindow *win ) override; + virtual void update( Int frame ) override; + virtual void reverse() override; + virtual void draw() override; - virtual void skip(); + virtual void skip() override; protected: enum{ @@ -297,14 +297,14 @@ class TextTypeTransition : public Transition { public: TextTypeTransition (); - virtual ~TextTypeTransition(); + virtual ~TextTypeTransition() override; - virtual void init( GameWindow *win ); - virtual void update( Int frame ); - virtual void reverse(); - virtual void draw(); + virtual void init( GameWindow *win ) override; + virtual void update( Int frame ) override; + virtual void reverse() override; + virtual void draw() override; - virtual void skip(); + virtual void skip() override; protected: enum{ @@ -324,14 +324,14 @@ class MainMenuScaleUpTransition : public Transition { public: MainMenuScaleUpTransition (); - virtual ~MainMenuScaleUpTransition(); + virtual ~MainMenuScaleUpTransition() override; - virtual void init( GameWindow *win ); - virtual void update( Int frame ); - virtual void reverse(); - virtual void draw(); + virtual void init( GameWindow *win ) override; + virtual void update( Int frame ) override; + virtual void reverse() override; + virtual void draw() override; - virtual void skip(); + virtual void skip() override; protected: enum{ @@ -354,14 +354,14 @@ class MainMenuMediumScaleUpTransition : public Transition { public: MainMenuMediumScaleUpTransition (); - virtual ~MainMenuMediumScaleUpTransition(); + virtual ~MainMenuMediumScaleUpTransition() override; - virtual void init( GameWindow *win ); - virtual void update( Int frame ); - virtual void reverse(); - virtual void draw(); + virtual void init( GameWindow *win ) override; + virtual void update( Int frame ) override; + virtual void reverse() override; + virtual void draw() override; - virtual void skip(); + virtual void skip() override; protected: enum{ @@ -382,14 +382,14 @@ class MainMenuSmallScaleDownTransition : public Transition { public: MainMenuSmallScaleDownTransition (); - virtual ~MainMenuSmallScaleDownTransition(); + virtual ~MainMenuSmallScaleDownTransition() override; - virtual void init( GameWindow *win ); - virtual void update( Int frame ); - virtual void reverse(); - virtual void draw(); + virtual void init( GameWindow *win ) override; + virtual void update( Int frame ) override; + virtual void reverse() override; + virtual void draw() override; - virtual void skip(); + virtual void skip() override; protected: enum{ @@ -415,14 +415,14 @@ class ScaleUpTransition : public Transition { public: ScaleUpTransition (); - virtual ~ScaleUpTransition(); + virtual ~ScaleUpTransition() override; - virtual void init( GameWindow *win ); - virtual void update( Int frame ); - virtual void reverse(); - virtual void draw(); + virtual void init( GameWindow *win ) override; + virtual void update( Int frame ) override; + virtual void reverse() override; + virtual void draw() override; - virtual void skip(); + virtual void skip() override; protected: enum{ @@ -460,14 +460,14 @@ class ScoreScaleUpTransition : public Transition { public: ScoreScaleUpTransition (); - virtual ~ScoreScaleUpTransition(); + virtual ~ScoreScaleUpTransition() override; - virtual void init( GameWindow *win ); - virtual void update( Int frame ); - virtual void reverse(); - virtual void draw(); + virtual void init( GameWindow *win ) override; + virtual void update( Int frame ) override; + virtual void reverse() override; + virtual void draw() override; - virtual void skip(); + virtual void skip() override; protected: enum{ @@ -494,14 +494,14 @@ class FadeTransition : public Transition { public: FadeTransition (); - virtual ~FadeTransition(); + virtual ~FadeTransition() override; - virtual void init( GameWindow *win ); - virtual void update( Int frame ); - virtual void reverse(); - virtual void draw(); + virtual void init( GameWindow *win ) override; + virtual void update( Int frame ) override; + virtual void reverse() override; + virtual void draw() override; - virtual void skip(); + virtual void skip() override; protected: enum{ @@ -529,14 +529,14 @@ class FlashTransition : public Transition { public: FlashTransition (); - virtual ~FlashTransition(); + virtual ~FlashTransition() override; - virtual void init( GameWindow *win ); - virtual void update( Int frame ); - virtual void reverse(); - virtual void draw(); + virtual void init( GameWindow *win ) override; + virtual void update( Int frame ) override; + virtual void reverse() override; + virtual void draw() override; - virtual void skip(); + virtual void skip() override; protected: enum{ @@ -560,14 +560,14 @@ class ButtonFlashTransition : public Transition { public: ButtonFlashTransition (); - virtual ~ButtonFlashTransition(); + virtual ~ButtonFlashTransition() override; - virtual void init( GameWindow *win ); - virtual void update( Int frame ); - virtual void reverse(); - virtual void draw(); + virtual void init( GameWindow *win ) override; + virtual void update( Int frame ) override; + virtual void reverse() override; + virtual void draw() override; - virtual void skip(); + virtual void skip() override; protected: enum{ @@ -656,13 +656,13 @@ class GameWindowTransitionsHandler: public SubsystemInterface { public: GameWindowTransitionsHandler(); - ~GameWindowTransitionsHandler(); + ~GameWindowTransitionsHandler() override; - void init(); + void init() override; void load(); - void reset(); - void update(); - void draw(); + void reset() override; + void update() override; + void draw() override; Bool isFinished(); const FieldParse *getFieldParse() const { return m_gameWindowTransitionsFieldParseTable; } ///< returns the parsing fields static const FieldParse m_gameWindowTransitionsFieldParseTable[]; ///< the parse table diff --git a/Core/GameEngine/Include/GameClient/GlobalLanguage.h b/Core/GameEngine/Include/GameClient/GlobalLanguage.h index cbb44d5f0c1..b256c6d6259 100644 --- a/Core/GameEngine/Include/GameClient/GlobalLanguage.h +++ b/Core/GameEngine/Include/GameClient/GlobalLanguage.h @@ -82,11 +82,11 @@ class GlobalLanguage : public SubsystemInterface public: GlobalLanguage(); - virtual ~GlobalLanguage(); + virtual ~GlobalLanguage() override; - void init(); - void reset(); - void update() {} + virtual void init() override; + virtual void reset() override; + virtual void update() override {} Real getResolutionFontSizeAdjustment() const; Int adjustFontSize(Int theFontSize); // Adjusts font size for resolution. jba. diff --git a/Core/GameEngine/Include/GameClient/IMEManager.h b/Core/GameEngine/Include/GameClient/IMEManager.h index 860b0f45b5d..91543cff654 100644 --- a/Core/GameEngine/Include/GameClient/IMEManager.h +++ b/Core/GameEngine/Include/GameClient/IMEManager.h @@ -72,7 +72,7 @@ class IMEManagerInterface : public SubsystemInterface public: - virtual ~IMEManagerInterface() {}; + virtual ~IMEManagerInterface() override {}; virtual void attach( GameWindow *window ) = 0; ///< attach IME to specified window virtual void detach() = 0; ///< detach IME from current window diff --git a/Core/GameEngine/Include/GameClient/Keyboard.h b/Core/GameEngine/Include/GameClient/Keyboard.h index 730dee3477b..8c21aae40b0 100644 --- a/Core/GameEngine/Include/GameClient/Keyboard.h +++ b/Core/GameEngine/Include/GameClient/Keyboard.h @@ -95,13 +95,13 @@ class Keyboard : public SubsystemInterface public: Keyboard(); - virtual ~Keyboard(); + virtual ~Keyboard() override; // you may extend the functionality of these for your device - virtual void init(); /**< initialize the keyboard, only extend this + virtual void init() override; /**< initialize the keyboard, only extend this functionality, do not replace */ - virtual void reset(); ///< Reset keyboard system - virtual void update(); /**< gather current state of all keys, extend + virtual void reset() override; ///< Reset keyboard system + virtual void update() override; /**< gather current state of all keys, extend this functionality, do not replace */ virtual Bool getCapsState() = 0; ///< get state of caps lock key, return TRUE if down diff --git a/Core/GameEngine/Include/GameClient/LanguageFilter.h b/Core/GameEngine/Include/GameClient/LanguageFilter.h index ed65bc68ddf..cf83d64ce03 100644 --- a/Core/GameEngine/Include/GameClient/LanguageFilter.h +++ b/Core/GameEngine/Include/GameClient/LanguageFilter.h @@ -65,11 +65,11 @@ static const char BadWordFileName[] = "langdata.dat"; class LanguageFilter : public SubsystemInterface { public: LanguageFilter(); - ~LanguageFilter(); + virtual ~LanguageFilter() override; - void init(); - void reset(); - void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; void filterLine(UnicodeString &line); protected: diff --git a/Core/GameEngine/Include/GameClient/LoadScreen.h b/Core/GameEngine/Include/GameClient/LoadScreen.h index e60ed4c29ec..b6afb7a101e 100644 --- a/Core/GameEngine/Include/GameClient/LoadScreen.h +++ b/Core/GameEngine/Include/GameClient/LoadScreen.h @@ -78,21 +78,21 @@ class SinglePlayerLoadScreen : public LoadScreen { public: SinglePlayerLoadScreen(); - virtual ~SinglePlayerLoadScreen(); + virtual ~SinglePlayerLoadScreen() override; - virtual void init( GameInfo *game ); ///< Init the loadscreen - virtual void reset(); ///< Reset the system + virtual void init( GameInfo *game ) override; ///< Init the loadscreen + virtual void reset() override; ///< Reset the system virtual void update() { DEBUG_CRASH(("Call update(Int) instead. This update isn't supported")); }; - virtual void update(Int percent); ///< Update the state of the progress bar - virtual void processProgress(Int playerId, Int percentage) + virtual void update(Int percent) override; ///< Update the state of the progress bar + virtual void processProgress(Int playerId, Int percentage) override { DEBUG_CRASH(("We Got to a single player load screen throw the Network...")); } - virtual void setProgressRange( Int min, Int max ); + virtual void setProgressRange( Int min, Int max ) override; private: GameWindow *m_progressBar; ///< Pointer to the Progress Bar on the window @@ -128,21 +128,21 @@ class ChallengeLoadScreen : public LoadScreen { public: ChallengeLoadScreen(); - virtual ~ChallengeLoadScreen(); + virtual ~ChallengeLoadScreen() override; - virtual void init( GameInfo *game ); ///< Init the loadscreen - virtual void reset(); ///< Reset the system + virtual void init( GameInfo *game ) override; ///< Init the loadscreen + virtual void reset() override; ///< Reset the system virtual void update() { DEBUG_CRASH(("Call update(Int) instead. This update isn't supported")); }; - virtual void update(Int percent); ///< Update the state of the progress bar - virtual void processProgress(Int playerId, Int percentage) + virtual void update(Int percent) override; ///< Update the state of the progress bar + virtual void processProgress(Int playerId, Int percentage) override { DEBUG_CRASH(("We Got to a single player load screen throw the Network...")); } - virtual void setProgressRange( Int min, Int max ); + virtual void setProgressRange( Int min, Int max ) override; private: GameWindow *m_progressBar; ///< Pointer to the Progress Bar on the window @@ -200,20 +200,20 @@ class ShellGameLoadScreen : public LoadScreen { public: ShellGameLoadScreen(); - virtual ~ShellGameLoadScreen(); + virtual ~ShellGameLoadScreen() override; - virtual void init( GameInfo *game ); ///< Init the loadscreen - virtual void reset(); ///< Reset the system + virtual void init( GameInfo *game ) override; ///< Init the loadscreen + virtual void reset() override; ///< Reset the system virtual void update() { DEBUG_CRASH(("Call update(Int) instead. This update isn't supported")); }; - virtual void update(Int percent); ///< Update the state of the progress bar - virtual void processProgress(Int playerId, Int percentage) + virtual void update(Int percent) override; ///< Update the state of the progress bar + virtual void processProgress(Int playerId, Int percentage) override { DEBUG_CRASH(("We Got to a single player load screen throw the Network...")); } - virtual void setProgressRange( Int min, Int max ) { } + virtual void setProgressRange( Int min, Int max ) override { } private: GameWindow *m_progressBar ; ///< Pointer to the Progress Bar on the window @@ -228,17 +228,17 @@ class MultiPlayerLoadScreen : public LoadScreen { public: MultiPlayerLoadScreen(); - virtual ~MultiPlayerLoadScreen(); + virtual ~MultiPlayerLoadScreen() override; - virtual void init( GameInfo *game ); ///< Init the loadscreen - virtual void reset(); ///< Reset the system + virtual void init( GameInfo *game ) override; ///< Init the loadscreen + virtual void reset() override; ///< Reset the system virtual void update() { DEBUG_CRASH(("Call update(Int) instead. This update isn't supported")); }; - virtual void update(Int percent); ///< Update the state of the progress bar - void processProgress(Int playerId, Int percentage); - virtual void setProgressRange( Int min, Int max ) { } + virtual void update(Int percent) override; ///< Update the state of the progress bar + virtual void processProgress(Int playerId, Int percentage) override; + virtual void setProgressRange( Int min, Int max ) override { } private: GameWindow *m_progressBars[MAX_SLOTS]; ///< pointer array to all the progress bars on the window GameWindow *m_playerNames[MAX_SLOTS]; ///< pointer array to all the static text player names on the window @@ -259,17 +259,17 @@ class GameSpyLoadScreen : public LoadScreen { public: GameSpyLoadScreen(); - virtual ~GameSpyLoadScreen(); + virtual ~GameSpyLoadScreen() override; - virtual void init( GameInfo *game ); ///< Init the loadscreen - virtual void reset(); ///< Reset the system + virtual void init( GameInfo *game ) override; ///< Init the loadscreen + virtual void reset() override; ///< Reset the system virtual void update() { DEBUG_CRASH(("Call update(Int) instead. This update isn't supported")); }; - virtual void update(Int percent); ///< Update the state of the progress bar - void processProgress(Int playerId, Int percentage); - virtual void setProgressRange( Int min, Int max ) { } + virtual void update(Int percent) override; ///< Update the state of the progress bar + virtual void processProgress(Int playerId, Int percentage) override; + virtual void setProgressRange( Int min, Int max ) override { } private: GameWindow *m_progressBars[MAX_SLOTS]; ///< pointer array to all the progress bars on the window GameWindow *m_playerNames[MAX_SLOTS]; ///< pointer array to all the static text player names on the window @@ -297,21 +297,21 @@ class MapTransferLoadScreen : public LoadScreen { public: MapTransferLoadScreen(); - virtual ~MapTransferLoadScreen(); + virtual ~MapTransferLoadScreen() override; - virtual void init( GameInfo *game ); ///< Init the loadscreen - virtual void reset(); ///< Reset the system + virtual void init( GameInfo *game ) override; ///< Init the loadscreen + virtual void reset() override; ///< Reset the system virtual void update() { DEBUG_CRASH(("Call update(Int) instead. This update isn't supported")); }; - virtual void update(Int percent); ///< Update the state of the progress bar - virtual void processProgress(Int playerId, Int percentage) + virtual void update(Int percent) override; ///< Update the state of the progress bar + virtual void processProgress(Int playerId, Int percentage) override { DEBUG_CRASH(("Call processProgress(Int, Int, AsciiString) instead.")); } void processProgress(Int playerId, Int percentage, AsciiString stateStr); - virtual void setProgressRange( Int min, Int max ) { } + virtual void setProgressRange( Int min, Int max ) override { } void processTimeout(Int secondsLeft); void setCurrentFilename(AsciiString filename); private: diff --git a/Core/GameEngine/Include/GameClient/Mouse.h b/Core/GameEngine/Include/GameClient/Mouse.h index 1675093467c..849a933f37f 100644 --- a/Core/GameEngine/Include/GameClient/Mouse.h +++ b/Core/GameEngine/Include/GameClient/Mouse.h @@ -268,20 +268,20 @@ class Mouse : public SubsystemInterface public: Mouse(); - virtual ~Mouse(); + virtual ~Mouse() override; // you may need to extend these for your device virtual void parseIni(); ///< parse ini settings associated with mouse (do this before init()). - virtual void init(); ///< init mouse, extend this functionality, do not replace - virtual void reset(); ///< Reset the system - virtual void update(); ///< update the state of the mouse position and buttons + virtual void init() override; ///< init mouse, extend this functionality, do not replace + virtual void reset() override; ///< Reset the system + virtual void update() override; ///< update the state of the mouse position and buttons virtual void initCursorResources()=0; ///< needed so Win32 cursors can load resources before D3D device created. virtual void createStreamMessages(); /**< given state of device, create messages and put them on the stream for the raw state. */ - virtual void draw(); ///< draw the mouse + virtual void draw() override; ///< draw the mouse virtual void setPosition( Int x, Int y ); ///< set the mouse position virtual void setCursor( MouseCursor cursor ) = 0; ///< set mouse cursor @@ -424,14 +424,14 @@ class Mouse : public SubsystemInterface // Mouse that does nothing. Used for Headless Mode. class MouseDummy : public Mouse { - virtual void parseIni() {} - virtual void update() {} - virtual void initCursorResources() {} - virtual void createStreamMessages() {} - virtual void setCursor(MouseCursor cursor) {} - virtual void capture() {} - virtual void releaseCapture() {} - virtual UnsignedByte getMouseEvent(MouseIO *result, Bool flush) { return MOUSE_NONE; } + virtual void parseIni() override {} + virtual void update() override {} + virtual void initCursorResources() override {} + virtual void createStreamMessages() override {} + virtual void setCursor(MouseCursor cursor) override {} + virtual void capture() override {} + virtual void releaseCapture() override {} + virtual UnsignedByte getMouseEvent(MouseIO *result, Bool flush) override { return MOUSE_NONE; } }; diff --git a/Core/GameEngine/Include/GameClient/ParticleSys.h b/Core/GameEngine/Include/GameClient/ParticleSys.h index 47804908fba..12b5124000f 100644 --- a/Core/GameEngine/Include/GameClient/ParticleSys.h +++ b/Core/GameEngine/Include/GameClient/ParticleSys.h @@ -157,9 +157,9 @@ class ParticleInfo : public Snapshot 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; }; @@ -206,9 +206,9 @@ class Particle : public MemoryPoolObject, 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; void computeAlphaRate(); ///< compute alpha rate to get to next key void computeColorRate(); ///< compute color change to get to next key @@ -264,9 +264,9 @@ class ParticleSystemInfo : public Snapshot ParticleSystemInfo(); ///< to set defaults. // 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; Bool m_isOneShot; ///< if true, destroy system after one burst has occurred @@ -662,9 +662,9 @@ class ParticleSystem : public MemoryPoolObject, 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; virtual Particle *createParticle( const ParticleInfo *data, ParticlePriorityType priority, @@ -747,11 +747,11 @@ class ParticleSystemManager : public SubsystemInterface, typedef std::hash_map, rts::equal_to > TemplateMap; ParticleSystemManager(); - virtual ~ParticleSystemManager(); + virtual ~ParticleSystemManager() override; - virtual void init(); ///< initialize the manager - virtual void reset(); ///< reset the manager and all particle systems - virtual void update(); ///< update all particle systems + virtual void init() override; ///< initialize the manager + virtual void reset() override; ///< reset the manager and all particle systems + virtual void update() override; ///< update all particle systems virtual Int getOnScreenParticleCount() = 0; ///< returns the number of particles on screen virtual void setOnScreenParticleCount(int count); @@ -812,9 +812,9 @@ class ParticleSystemManager : public SubsystemInterface, 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; Particle *m_allParticlesHead[ NUM_PARTICLE_PRIORITIES ]; Particle *m_allParticlesTail[ NUM_PARTICLE_PRIORITIES ]; diff --git a/Core/GameEngine/Include/GameClient/ProcessAnimateWindow.h b/Core/GameEngine/Include/GameClient/ProcessAnimateWindow.h index e262396324e..42ebcbcd245 100644 --- a/Core/GameEngine/Include/GameClient/ProcessAnimateWindow.h +++ b/Core/GameEngine/Include/GameClient/ProcessAnimateWindow.h @@ -91,12 +91,12 @@ class ProcessAnimateWindowSlideFromRight : public ProcessAnimateWindow public: ProcessAnimateWindowSlideFromRight(); - virtual ~ProcessAnimateWindowSlideFromRight(); + virtual ~ProcessAnimateWindowSlideFromRight() override; - virtual void initAnimateWindow( wnd::AnimateWindow *animWin ); - virtual void initReverseAnimateWindow( wnd::AnimateWindow *animWin, UnsignedInt maxDelay = 0 ); - virtual Bool updateAnimateWindow( wnd::AnimateWindow *animWin ); - virtual Bool reverseAnimateWindow( wnd::AnimateWindow *animWin ); + virtual void initAnimateWindow( wnd::AnimateWindow *animWin ) override; + virtual void initReverseAnimateWindow( wnd::AnimateWindow *animWin, UnsignedInt maxDelay = 0 ) override; + virtual Bool updateAnimateWindow( wnd::AnimateWindow *animWin ) override; + virtual Bool reverseAnimateWindow( wnd::AnimateWindow *animWin ) override; private: Coord2D m_maxVel; // top speed windows travel in x and y Int m_slowDownThreshold; // when windows get this close to their resting @@ -114,12 +114,12 @@ class ProcessAnimateWindowSlideFromLeft : public ProcessAnimateWindow public: ProcessAnimateWindowSlideFromLeft(); - virtual ~ProcessAnimateWindowSlideFromLeft(); + virtual ~ProcessAnimateWindowSlideFromLeft() override; - virtual void initAnimateWindow( wnd::AnimateWindow *animWin ); - virtual void initReverseAnimateWindow( wnd::AnimateWindow *animWin, UnsignedInt maxDelay = 0 ); - virtual Bool updateAnimateWindow( wnd::AnimateWindow *animWin ); - virtual Bool reverseAnimateWindow( wnd::AnimateWindow *animWin ); + virtual void initAnimateWindow( wnd::AnimateWindow *animWin ) override; + virtual void initReverseAnimateWindow( wnd::AnimateWindow *animWin, UnsignedInt maxDelay = 0 ) override; + virtual Bool updateAnimateWindow( wnd::AnimateWindow *animWin ) override; + virtual Bool reverseAnimateWindow( wnd::AnimateWindow *animWin ) override; private: Coord2D m_maxVel; // top speed windows travel in x and y Int m_slowDownThreshold; // when windows get this close to their resting @@ -137,12 +137,12 @@ class ProcessAnimateWindowSlideFromTop : public ProcessAnimateWindow public: ProcessAnimateWindowSlideFromTop(); - virtual ~ProcessAnimateWindowSlideFromTop(); + virtual ~ProcessAnimateWindowSlideFromTop() override; - virtual void initAnimateWindow( wnd::AnimateWindow *animWin ); - virtual void initReverseAnimateWindow( wnd::AnimateWindow *animWin, UnsignedInt maxDelay = 0 ); - virtual Bool updateAnimateWindow( wnd::AnimateWindow *animWin ); - virtual Bool reverseAnimateWindow( wnd::AnimateWindow *animWin ); + virtual void initAnimateWindow( wnd::AnimateWindow *animWin ) override; + virtual void initReverseAnimateWindow( wnd::AnimateWindow *animWin, UnsignedInt maxDelay = 0 ) override; + virtual Bool updateAnimateWindow( wnd::AnimateWindow *animWin ) override; + virtual Bool reverseAnimateWindow( wnd::AnimateWindow *animWin ) override; private: Coord2D m_maxVel; // top speed windows travel in x and y Int m_slowDownThreshold; // when windows get this close to their resting @@ -158,12 +158,12 @@ class ProcessAnimateWindowSlideFromTopFast : public ProcessAnimateWindow public: ProcessAnimateWindowSlideFromTopFast(); - virtual ~ProcessAnimateWindowSlideFromTopFast(); + virtual ~ProcessAnimateWindowSlideFromTopFast() override; - virtual void initAnimateWindow( wnd::AnimateWindow *animWin ); - virtual void initReverseAnimateWindow( wnd::AnimateWindow *animWin, UnsignedInt maxDelay = 0 ); - virtual Bool updateAnimateWindow( wnd::AnimateWindow *animWin ); - virtual Bool reverseAnimateWindow( wnd::AnimateWindow *animWin ); + virtual void initAnimateWindow( wnd::AnimateWindow *animWin ) override; + virtual void initReverseAnimateWindow( wnd::AnimateWindow *animWin, UnsignedInt maxDelay = 0 ) override; + virtual Bool updateAnimateWindow( wnd::AnimateWindow *animWin ) override; + virtual Bool reverseAnimateWindow( wnd::AnimateWindow *animWin ) override; private: Coord2D m_maxVel; // top speed windows travel in x and y Int m_slowDownThreshold; // when windows get this close to their resting @@ -181,12 +181,12 @@ class ProcessAnimateWindowSlideFromBottom : public ProcessAnimateWindow public: ProcessAnimateWindowSlideFromBottom(); - virtual ~ProcessAnimateWindowSlideFromBottom(); + virtual ~ProcessAnimateWindowSlideFromBottom() override; - virtual void initAnimateWindow( wnd::AnimateWindow *animWin ); - virtual void initReverseAnimateWindow( wnd::AnimateWindow *animWin, UnsignedInt maxDelay = 0 ); - virtual Bool updateAnimateWindow( wnd::AnimateWindow *animWin ); - virtual Bool reverseAnimateWindow( wnd::AnimateWindow *animWin ); + virtual void initAnimateWindow( wnd::AnimateWindow *animWin ) override; + virtual void initReverseAnimateWindow( wnd::AnimateWindow *animWin, UnsignedInt maxDelay = 0 ) override; + virtual Bool updateAnimateWindow( wnd::AnimateWindow *animWin ) override; + virtual Bool reverseAnimateWindow( wnd::AnimateWindow *animWin ) override; private: Coord2D m_maxVel; // top speed windows travel in x and y Int m_slowDownThreshold; // when windows get this close to their resting @@ -203,12 +203,12 @@ class ProcessAnimateWindowSpiral : public ProcessAnimateWindow public: ProcessAnimateWindowSpiral(); - virtual ~ProcessAnimateWindowSpiral(); + virtual ~ProcessAnimateWindowSpiral() override; - virtual void initAnimateWindow( wnd::AnimateWindow *animWin ); - virtual void initReverseAnimateWindow( wnd::AnimateWindow *animWin, UnsignedInt maxDelay = 0 ); - virtual Bool updateAnimateWindow( wnd::AnimateWindow *animWin ); - virtual Bool reverseAnimateWindow( wnd::AnimateWindow *animWin ); + virtual void initAnimateWindow( wnd::AnimateWindow *animWin ) override; + virtual void initReverseAnimateWindow( wnd::AnimateWindow *animWin, UnsignedInt maxDelay = 0 ) override; + virtual Bool updateAnimateWindow( wnd::AnimateWindow *animWin ) override; + virtual Bool reverseAnimateWindow( wnd::AnimateWindow *animWin ) override; private: Real m_deltaTheta; Int m_maxR; @@ -221,13 +221,13 @@ class ProcessAnimateWindowSlideFromBottomTimed : public ProcessAnimateWindow public: ProcessAnimateWindowSlideFromBottomTimed(); - virtual ~ProcessAnimateWindowSlideFromBottomTimed(); + virtual ~ProcessAnimateWindowSlideFromBottomTimed() override; - virtual void initAnimateWindow( wnd::AnimateWindow *animWin ); - virtual void initReverseAnimateWindow( wnd::AnimateWindow *animWin, UnsignedInt maxDelay = 0 ); - virtual Bool updateAnimateWindow( wnd::AnimateWindow *animWin ); - virtual Bool reverseAnimateWindow( wnd::AnimateWindow *animWin ); - virtual void setMaxDuration(UnsignedInt maxDuration) { m_maxDuration = maxDuration; } + virtual void initAnimateWindow( wnd::AnimateWindow *animWin ) override; + virtual void initReverseAnimateWindow( wnd::AnimateWindow *animWin, UnsignedInt maxDelay = 0 ) override; + virtual Bool updateAnimateWindow( wnd::AnimateWindow *animWin ) override; + virtual Bool reverseAnimateWindow( wnd::AnimateWindow *animWin ) override; + virtual void setMaxDuration(UnsignedInt maxDuration) override { m_maxDuration = maxDuration; } private: UnsignedInt m_maxDuration; @@ -239,12 +239,12 @@ class ProcessAnimateWindowSlideFromRightFast : public ProcessAnimateWindow public: ProcessAnimateWindowSlideFromRightFast(); - virtual ~ProcessAnimateWindowSlideFromRightFast(); + virtual ~ProcessAnimateWindowSlideFromRightFast() override; - virtual void initAnimateWindow( wnd::AnimateWindow *animWin ); - virtual void initReverseAnimateWindow( wnd::AnimateWindow *animWin, UnsignedInt maxDelay = 0 ); - virtual Bool updateAnimateWindow( wnd::AnimateWindow *animWin ); - virtual Bool reverseAnimateWindow( wnd::AnimateWindow *animWin ); + virtual void initAnimateWindow( wnd::AnimateWindow *animWin ) override; + virtual void initReverseAnimateWindow( wnd::AnimateWindow *animWin, UnsignedInt maxDelay = 0 ) override; + virtual Bool updateAnimateWindow( wnd::AnimateWindow *animWin ) override; + virtual Bool reverseAnimateWindow( wnd::AnimateWindow *animWin ) override; private: Coord2D m_maxVel; // top speed windows travel in x and y Int m_slowDownThreshold; // when windows get this close to their resting diff --git a/Core/GameEngine/Include/GameClient/Smudge.h b/Core/GameEngine/Include/GameClient/Smudge.h index b20eb86d8f2..f9443ca41b1 100644 --- a/Core/GameEngine/Include/GameClient/Smudge.h +++ b/Core/GameEngine/Include/GameClient/Smudge.h @@ -51,7 +51,7 @@ struct SmudgeSet : public DLNodeClass friend class SmudgeManager; SmudgeSet(); - virtual ~SmudgeSet(); + virtual ~SmudgeSet() override; void reset(); Smudge *addSmudgeToSet(); diff --git a/Core/GameEngine/Include/GameClient/Snow.h b/Core/GameEngine/Include/GameClient/Snow.h index ac1195acf39..bfafaa25a9a 100644 --- a/Core/GameEngine/Include/GameClient/Snow.h +++ b/Core/GameEngine/Include/GameClient/Snow.h @@ -87,10 +87,10 @@ class SnowManager : public SubsystemInterface }; SnowManager(); - ~SnowManager(); + ~SnowManager() override; - virtual void init(); - virtual void reset(); + virtual void init() override; + virtual void reset() override; virtual void updateIniSettings (); void setVisible(Bool showWeather); ///addAudioEvent(&sound); } - virtual void doFXObj(const Object* primary, const Object* secondary = nullptr) const + virtual void doFXObj(const Object* primary, const Object* secondary = nullptr) const override { AudioEventRTS sound(m_soundName); if (primary) @@ -165,7 +165,7 @@ class TracerFXNugget : public FXNugget m_probability = 1.0f; } - virtual void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real primarySpeed, const Coord3D *secondary, const Real /*overrideRadius*/ ) const + virtual void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real primarySpeed, const Coord3D *secondary, const Real /*overrideRadius*/ ) const override { if (m_probability <= GameClientRandomValueReal(0, 1)) return; @@ -263,7 +263,7 @@ class RayEffectFXNugget : public FXNugget m_secondaryOffset.x = m_secondaryOffset.y = m_secondaryOffset.z = 0; } - virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * secondary, const Real /*overrideRadius*/ ) const + virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * secondary, const Real /*overrideRadius*/ ) const override { const ThingTemplate* tmpl = TheThingFactory->findTemplate(m_templateName); DEBUG_ASSERTCRASH(tmpl, ("RayEffect %s not found",m_templateName.str())); @@ -320,7 +320,7 @@ class LightPulseFXNugget : public FXNugget m_color.red = m_color.green = m_color.blue = 0; } - virtual void doFXObj(const Object* primary, const Object* /*secondary*/) const + virtual void doFXObj(const Object* primary, const Object* /*secondary*/) const override { if (primary) { @@ -337,7 +337,7 @@ class LightPulseFXNugget : public FXNugget } } - virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const + virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override { if (primary) { @@ -385,7 +385,7 @@ class ViewShakeFXNugget : public FXNugget { } - virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const + virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override { if (primary) { @@ -445,7 +445,7 @@ class TerrainScorchFXNugget : public FXNugget { } - virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const + virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override { if (primary) { @@ -523,7 +523,7 @@ class ParticleSystemFXNugget : public FXNugget m_rotateX = m_rotateY = m_rotateZ = 0; } - virtual void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real overrideRadius ) const + virtual void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real overrideRadius ) const override { if (primary) { @@ -535,7 +535,7 @@ class ParticleSystemFXNugget : public FXNugget } } - virtual void doFXObj(const Object* primary, const Object* secondary) const + virtual void doFXObj(const Object* primary, const Object* secondary) const override { if (primary) { @@ -694,12 +694,12 @@ class FXListAtBonePosFXNugget : public FXNugget m_orientToBone = true; } - virtual void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const + virtual void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override { DEBUG_CRASH(("You must use the object form for this effect")); } - virtual void doFXObj(const Object* primary, const Object* /*secondary*/) const + virtual void doFXObj(const Object* primary, const Object* /*secondary*/) const override { if (primary) { diff --git a/Core/GameEngine/Source/GameClient/GameText.cpp b/Core/GameEngine/Source/GameClient/GameText.cpp index 1c52d370f9d..ca4afba1d0e 100644 --- a/Core/GameEngine/Source/GameClient/GameText.cpp +++ b/Core/GameEngine/Source/GameClient/GameText.cpp @@ -138,23 +138,23 @@ class GameTextManager : public GameTextInterface public: GameTextManager(); - virtual ~GameTextManager(); + virtual ~GameTextManager() override; - virtual void init(); ///< Initializes the text system + virtual void init() override; ///< Initializes the text system virtual void deinit(); ///< Shuts down the text system - virtual void update() {}; ///< update text manager - virtual void reset(); ///< Resets the text system + virtual void update() override {}; ///< update text manager + virtual void reset() override; ///< Resets the text system - virtual UnicodeString fetch( const Char *label, Bool *exists = nullptr ); ///< Returns the associated labeled unicode text - virtual UnicodeString fetch( AsciiString label, Bool *exists = nullptr ); ///< Returns the associated labeled unicode text - virtual UnicodeString fetchFormat( const Char *label, ... ); - virtual UnicodeString fetchOrSubstitute( const Char *label, const WideChar *substituteText ); - virtual UnicodeString fetchOrSubstituteFormat( const Char *label, const WideChar *substituteFormat, ... ); - virtual UnicodeString fetchOrSubstituteFormatVA( const Char *label, const WideChar *substituteFormat, va_list args ); + virtual UnicodeString fetch( const Char *label, Bool *exists = nullptr ) override; ///< Returns the associated labeled unicode text + virtual UnicodeString fetch( AsciiString label, Bool *exists = nullptr ) override; ///< Returns the associated labeled unicode text + virtual UnicodeString fetchFormat( const Char *label, ... ) override; + virtual UnicodeString fetchOrSubstitute( const Char *label, const WideChar *substituteText ) override; + virtual UnicodeString fetchOrSubstituteFormat( const Char *label, const WideChar *substituteFormat, ... ) override; + virtual UnicodeString fetchOrSubstituteFormatVA( const Char *label, const WideChar *substituteFormat, va_list args ) override; - virtual AsciiStringVec& getStringsWithLabelPrefix(AsciiString label); + virtual AsciiStringVec& getStringsWithLabelPrefix(AsciiString label) override; - virtual void initMapStringFile( const AsciiString& filename ); + virtual void initMapStringFile( const AsciiString& filename ) override; protected: diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp index 1c80b9e752c..12060bdfdf3 100644 --- a/Core/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp @@ -45,40 +45,40 @@ class GameSpyConfig : public GameSpyConfigInterface { public: GameSpyConfig( AsciiString config ); - ~GameSpyConfig() {} + virtual ~GameSpyConfig() override {} // Pings - std::list getPingServers() { return m_pingServers; } - Int getNumPingRepetitions() { return m_pingReps; } - Int getPingTimeoutInMs() { return m_pingTimeout; } - virtual Int getPingCutoffGood() { return m_pingCutoffGood; } - virtual Int getPingCutoffBad() { return m_pingCutoffBad; } + std::list getPingServers() override { return m_pingServers; } + Int getNumPingRepetitions() override { return m_pingReps; } + Int getPingTimeoutInMs() override { return m_pingTimeout; } + virtual Int getPingCutoffGood() override { return m_pingCutoffGood; } + virtual Int getPingCutoffBad() override { return m_pingCutoffBad; } // QM - std::list getQMMaps() { return m_qmMaps; } - Int getQMBotID() { return m_qmBotID; } - Int getQMChannel() { return m_qmChannel; } - void setQMChannel(Int channel) { m_qmChannel = channel; } + std::list getQMMaps() override { return m_qmMaps; } + Int getQMBotID() override { return m_qmBotID; } + Int getQMChannel() override { return m_qmChannel; } + void setQMChannel(Int channel) override { m_qmChannel = channel; } // Player Info - Int getPointsForRank(Int rank); - virtual Bool isPlayerVIP(Int id); + virtual Int getPointsForRank(Int rank) override; + virtual Bool isPlayerVIP(Int id) override; - virtual Bool getManglerLocation(Int index, AsciiString& host, UnsignedShort& port); + virtual Bool getManglerLocation(Int index, AsciiString& host, UnsignedShort& port) override; // Ladder / Any other external parsing - AsciiString getLeftoverConfig() { return m_leftoverConfig; } + AsciiString getLeftoverConfig() override { return m_leftoverConfig; } // NAT Timeouts - virtual Int getTimeBetweenRetries() { return m_natRetryInterval; } - virtual Int getMaxManglerRetries() { return m_natMaxManglerRetries; } - virtual time_t getRetryInterval() { return m_natManglerRetryInterval; } - virtual time_t getKeepaliveInterval() { return m_natKeepaliveInterval; } - virtual time_t getPortTimeout() { return m_natPortTimeout; } - virtual time_t getRoundTimeout() { return m_natRoundTimeout; } + virtual Int getTimeBetweenRetries() override { return m_natRetryInterval; } + virtual Int getMaxManglerRetries() override { return m_natMaxManglerRetries; } + virtual time_t getRetryInterval() override { return m_natManglerRetryInterval; } + virtual time_t getKeepaliveInterval() override { return m_natKeepaliveInterval; } + virtual time_t getPortTimeout() override { return m_natPortTimeout; } + virtual time_t getRoundTimeout() override { return m_natRoundTimeout; } // Custom match - virtual Bool restrictGamesToLobby() { return m_restrictGamesToLobby; } + virtual Bool restrictGamesToLobby() override { return m_restrictGamesToLobby; } protected: std::list m_pingServers; diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp index 6841d099e8b..89acc6858e8 100644 --- a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp @@ -49,21 +49,21 @@ class BuddyThreadClass; class GameSpyBuddyMessageQueue : public GameSpyBuddyMessageQueueInterface { public: - virtual ~GameSpyBuddyMessageQueue(); + virtual ~GameSpyBuddyMessageQueue() override; GameSpyBuddyMessageQueue(); - virtual void startThread(); - virtual void endThread(); - virtual Bool isThreadRunning(); - virtual Bool isConnected(); - virtual Bool isConnecting(); + virtual void startThread() override; + virtual void endThread() override; + virtual Bool isThreadRunning() override; + virtual Bool isConnected() override; + virtual Bool isConnecting() override; - virtual void addRequest( const BuddyRequest& req ); - virtual Bool getRequest( BuddyRequest& req ); + virtual void addRequest( const BuddyRequest& req ) override; + virtual Bool getRequest( BuddyRequest& req ) override; - virtual void addResponse( const BuddyResponse& resp ); - virtual Bool getResponse( BuddyResponse& resp ); + virtual void addResponse( const BuddyResponse& resp ) override; + virtual Bool getResponse( BuddyResponse& resp ) override; - virtual GPProfile getLocalProfileID(); + virtual GPProfile getLocalProfileID() override; BuddyThreadClass* getThread(); @@ -91,7 +91,7 @@ class BuddyThreadClass : public ThreadClass public: BuddyThreadClass() : ThreadClass() { m_isNewAccount = m_isdeleting = m_isConnecting = m_isConnected = false; m_profileID = 0; m_lastErrorCode = 0; } - void Thread_Function(); + virtual void Thread_Function() override; void errorCallback( GPConnection *con, GPErrorArg *arg ); void messageCallback( GPConnection *con, GPRecvBuddyMessageArg *arg ); diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp index a74057ce6cc..2d071bafc68 100644 --- a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp @@ -47,24 +47,24 @@ class GameResultsThreadClass; class GameResultsQueue : public GameResultsInterface { public: - virtual ~GameResultsQueue(); + virtual ~GameResultsQueue() override; GameResultsQueue(); - virtual void init() {} - virtual void reset() {} - virtual void update() {} + virtual void init() override {} + virtual void reset() override {} + virtual void update() override {} - virtual void startThreads(); - virtual void endThreads(); - virtual Bool areThreadsRunning(); + virtual void startThreads() override; + virtual void endThreads() override; + virtual Bool areThreadsRunning() override; - virtual void addRequest( const GameResultsRequest& req ); - virtual Bool getRequest( GameResultsRequest& resp ); + virtual void addRequest( const GameResultsRequest& req ) override; + virtual Bool getRequest( GameResultsRequest& resp ) override; - virtual void addResponse( const GameResultsResponse& resp ); - virtual Bool getResponse( GameResultsResponse& resp ); + virtual void addResponse( const GameResultsResponse& resp ) override; + virtual Bool getResponse( GameResultsResponse& resp ) override; - virtual Bool areGameResultsBeingSent(); + virtual Bool areGameResultsBeingSent() override; private: MutexClass m_requestMutex; @@ -92,7 +92,7 @@ class GameResultsThreadClass : public ThreadClass public: GameResultsThreadClass() : ThreadClass() {} - void Thread_Function(); + virtual void Thread_Function() override; private: Int sendGameResults( UnsignedInt IP, UnsignedShort port, const std::string& results ); diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp index 62c6ef2bfcb..251c0ae5925 100644 --- a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp @@ -134,21 +134,21 @@ class PeerThreadClass; class GameSpyPeerMessageQueue : public GameSpyPeerMessageQueueInterface { public: - virtual ~GameSpyPeerMessageQueue(); + virtual ~GameSpyPeerMessageQueue() override; GameSpyPeerMessageQueue(); - virtual void startThread(); - virtual void endThread(); - virtual Bool isThreadRunning(); - virtual Bool isConnected(); - virtual Bool isConnecting(); + virtual void startThread() override; + virtual void endThread() override; + virtual Bool isThreadRunning() override; + virtual Bool isConnected() override; + virtual Bool isConnecting() override; - virtual void addRequest( const PeerRequest& req ); - virtual Bool getRequest( PeerRequest& req ); + virtual void addRequest( const PeerRequest& req ) override; + virtual Bool getRequest( PeerRequest& req ) override; - virtual void addResponse( const PeerResponse& resp ); - virtual Bool getResponse( PeerResponse& resp ); + virtual void addResponse( const PeerResponse& resp ) override; + virtual Bool getResponse( PeerResponse& resp ) override; - virtual SerialAuthResult getSerialAuthResult() { return m_serialAuth; } + virtual SerialAuthResult getSerialAuthResult() override { return m_serialAuth; } void setSerialAuthResult( SerialAuthResult result ) { m_serialAuth = result; } PeerThreadClass* getThread(); @@ -206,7 +206,7 @@ class PeerThreadClass : public ThreadClass } } - void Thread_Function(); + virtual void Thread_Function() override; void markAsDisconnected() { m_isConnecting = m_isConnected = false; } diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp index 1499a0895e1..2c2fdd85c11 100644 --- a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp @@ -368,20 +368,20 @@ class PSThreadClass; class GameSpyPSMessageQueue : public GameSpyPSMessageQueueInterface { public: - virtual ~GameSpyPSMessageQueue(); + virtual ~GameSpyPSMessageQueue() override; GameSpyPSMessageQueue(); - virtual void startThread(); - virtual void endThread(); - virtual Bool isThreadRunning(); + virtual void startThread() override; + virtual void endThread() override; + virtual Bool isThreadRunning() override; - virtual void addRequest( const PSRequest& req ); - virtual Bool getRequest( PSRequest& req ); + virtual void addRequest( const PSRequest& req ) override; + virtual Bool getRequest( PSRequest& req ) override; - virtual void addResponse( const PSResponse& resp ); - virtual Bool getResponse( PSResponse& resp ); + virtual void addResponse( const PSResponse& resp ) override; + virtual Bool getResponse( PSResponse& resp ) override; - virtual void trackPlayerStats( PSPlayerStats stats ); - virtual PSPlayerStats findPlayerStatsByID( Int id ); + virtual void trackPlayerStats( PSPlayerStats stats ) override; + virtual PSPlayerStats findPlayerStatsByID( Int id ) override; PSThreadClass* getThread(); @@ -431,7 +431,7 @@ class PSThreadClass : public ThreadClass m_opCount = 0; } - void Thread_Function(); + virtual void Thread_Function() override; void persAuthCallback( Bool val ) { m_loginOK = val; m_doneTryingToLogin = true; } void decrOpCount() { --m_opCount; } diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PingThread.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PingThread.cpp index 8a43802e064..e13e44dee26 100644 --- a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PingThread.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PingThread.cpp @@ -47,23 +47,23 @@ class PingThreadClass; class Pinger : public PingerInterface { public: - virtual ~Pinger(); + virtual ~Pinger() override; Pinger(); - virtual void startThreads(); - virtual void endThreads(); - virtual Bool areThreadsRunning(); + virtual void startThreads() override; + virtual void endThreads() override; + virtual Bool areThreadsRunning() override; - virtual void addRequest( const PingRequest& req ); - virtual Bool getRequest( PingRequest& resp ); + virtual void addRequest( const PingRequest& req ) override; + virtual Bool getRequest( PingRequest& resp ) override; - virtual void addResponse( const PingResponse& resp ); - virtual Bool getResponse( PingResponse& resp ); + virtual void addResponse( const PingResponse& resp ) override; + virtual Bool getResponse( PingResponse& resp ) override; - virtual Bool arePingsInProgress(); - virtual Int getPing( AsciiString hostname ); + virtual Bool arePingsInProgress() override; + virtual Int getPing( AsciiString hostname ) override; - virtual void clearPingMap(); - virtual AsciiString getPingString( Int timeout ); + virtual void clearPingMap() override; + virtual AsciiString getPingString( Int timeout ) override; private: MutexClass m_requestMutex; @@ -94,7 +94,7 @@ class PingThreadClass : public ThreadClass public: PingThreadClass() : ThreadClass() {} - void Thread_Function(); + virtual void Thread_Function() override; private: Int doPing( UnsignedInt IP, Int timeout ); diff --git a/Core/GameEngine/Source/GameNetwork/Network.cpp b/Core/GameEngine/Source/GameNetwork/Network.cpp index d11f947a685..4833f800ded 100644 --- a/Core/GameEngine/Source/GameNetwork/Network.cpp +++ b/Core/GameEngine/Source/GameNetwork/Network.cpp @@ -104,49 +104,49 @@ class Network : public NetworkInterface //--------------------------------------------------------------------------------------- // Setup / Teardown functions Network(); - ~Network(); - void init(); ///< Initialize or re-initialize the instance - void reset(); ///< Reinitialize the network - void update(); ///< Process command list - void liteupdate(); ///< Do a lightweight update to send packets and pass messages. + ~Network() override; + void init() override; ///< Initialize or re-initialize the instance + void reset() override; ///< Reinitialize the network + void update() override; ///< Process command list + void liteupdate() override; ///< Do a lightweight update to send packets and pass messages. Bool deinit(); ///< Shutdown connections, release memory - void setLocalAddress(UnsignedInt ip, UnsignedInt port); - UnsignedInt getRunAhead() { return m_runAhead; } - UnsignedInt getFrameRate() { return m_frameRate; } - UnsignedInt getPacketArrivalCushion(); ///< Returns the smallest packet arrival cushion since this was last called. - Bool isFrameDataReady(); - virtual Bool isStalling(); - void parseUserList( const GameInfo *game ); - void startGame(); ///< Sets the network game frame counter to -1 + void setLocalAddress(UnsignedInt ip, UnsignedInt port) override; + UnsignedInt getRunAhead() override { return m_runAhead; } + UnsignedInt getFrameRate() override { return m_frameRate; } + UnsignedInt getPacketArrivalCushion() override; ///< Returns the smallest packet arrival cushion since this was last called. + Bool isFrameDataReady() override; + virtual Bool isStalling() override; + void parseUserList( const GameInfo *game ) override; + void startGame() override; ///< Sets the network game frame counter to -1 - void sendChat(UnicodeString text, Int playerMask); - void sendDisconnectChat(UnicodeString text); + virtual void sendChat(UnicodeString text, Int playerMask) override; + virtual void sendDisconnectChat(UnicodeString text) override; - void sendFile(AsciiString path, UnsignedByte playerMask, UnsignedShort commandID); - UnsignedShort sendFileAnnounce(AsciiString path, UnsignedByte playerMask); - Int getFileTransferProgress(Int playerID, AsciiString path); - Bool areAllQueuesEmpty(); + void sendFile(AsciiString path, UnsignedByte playerMask, UnsignedShort commandID) override; + UnsignedShort sendFileAnnounce(AsciiString path, UnsignedByte playerMask) override; + Int getFileTransferProgress(Int playerID, AsciiString path) override; + Bool areAllQueuesEmpty() override; - void quitGame(); - virtual void selfDestructPlayer(Int index); + virtual void quitGame() override; + virtual void selfDestructPlayer(Int index) override; - void voteForPlayerDisconnect(Int slot); - virtual Bool isPacketRouter(); + void voteForPlayerDisconnect(Int slot) override; + virtual Bool isPacketRouter() override; // Bandwidth metrics - Real getIncomingBytesPerSecond(); - Real getIncomingPacketsPerSecond(); - Real getOutgoingBytesPerSecond(); - Real getOutgoingPacketsPerSecond(); - Real getUnknownBytesPerSecond(); - Real getUnknownPacketsPerSecond(); + Real getIncomingBytesPerSecond() override; + Real getIncomingPacketsPerSecond() override; + Real getOutgoingBytesPerSecond() override; + Real getOutgoingPacketsPerSecond() override; + Real getUnknownBytesPerSecond() override; + Real getUnknownPacketsPerSecond() override; // Multiplayer Load Progress Functions - void updateLoadProgress( Int percent ); - void loadProgressComplete(); - void sendTimeOutGameStart(); + void updateLoadProgress( Int percent ) override; + void loadProgressComplete() override; + void sendTimeOutGameStart() override; #if defined(RTS_DEBUG) // Disconnect screen testing @@ -154,29 +154,29 @@ class Network : public NetworkInterface #endif // Exposing some info contained in the Connection Manager - UnsignedInt getLocalPlayerID(); - UnicodeString getPlayerName(Int playerNum); - Int getNumPlayers(); + UnsignedInt getLocalPlayerID() override; + UnicodeString getPlayerName(Int playerNum) override; + Int getNumPlayers() override; - Int getAverageFPS() { return m_conMgr->getAverageFPS(); } - Int getSlotAverageFPS(Int slot); + virtual Int getAverageFPS() override { return m_conMgr->getAverageFPS(); } + virtual Int getSlotAverageFPS(Int slot) override; - void attachTransport(Transport *transport); - void initTransport(); + virtual void attachTransport(Transport *transport) override; + virtual void initTransport() override; - void setSawCRCMismatch(); - Bool sawCRCMismatch() { return m_sawCRCMismatch; } - Bool isPlayerConnected( Int playerID ); + void setSawCRCMismatch() override; + Bool sawCRCMismatch() override { return m_sawCRCMismatch; } + Bool isPlayerConnected( Int playerID ) override; - void notifyOthersOfCurrentFrame(); ///< Tells all the other players what frame we are on. - void notifyOthersOfNewFrame(UnsignedInt frame); ///< Tells all the other players that we are on a new frame. + virtual void notifyOthersOfCurrentFrame() override; ///< Tells all the other players what frame we are on. + virtual void notifyOthersOfNewFrame(UnsignedInt frame) override; ///< Tells all the other players that we are on a new frame. - Int getExecutionFrame(); ///< Returns the next valid frame for simultaneous command execution. + virtual Int getExecutionFrame() override; ///< Returns the next valid frame for simultaneous command execution. // For disconnect blame assignment - UnsignedInt getPingFrame(); - Int getPingsSent(); - Int getPingsReceived(); + virtual UnsignedInt getPingFrame() override; + virtual Int getPingsSent() override; + virtual Int getPingsReceived() override; protected: void GetCommandsFromCommandList(); ///< Remove commands from TheCommandList and put them on the Network command list. diff --git a/Core/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h b/Core/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h index 49aed779a21..58f10bad314 100644 --- a/Core/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h +++ b/Core/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h @@ -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(); @@ -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; diff --git a/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h index a87ceb19ea6..36538853352 100644 --- a/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h +++ b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h @@ -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: diff --git a/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h index e248e4dee48..b8cb316ab7c 100644 --- a/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h +++ b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h @@ -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: }; diff --git a/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h b/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h index d2a32c2a84b..af3504ad0aa 100644 --- a/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h +++ b/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h @@ -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: }; diff --git a/Core/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h b/Core/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h index 1db36eada80..38047636245 100644 --- a/Core/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h +++ b/Core/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h @@ -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 }; @@ -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(); }; diff --git a/Core/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h b/Core/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h index 3ce04d94cb2..a3380019cca 100644 --- a/Core/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h +++ b/Core/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h @@ -51,27 +51,27 @@ class W3DRadar : public Radar public: W3DRadar(); - ~W3DRadar(); + ~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: diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h index ec874699cde..0d836e56fa4 100644 --- a/Core/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h +++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h @@ -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 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 RenderObjClass * Clone() const override; + virtual int Class_ID() const override; + virtual void Render(RenderInfoClass & rinfo) override = 0; + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; // This CANNOT be Bool, as it will not inherit properly if you make Bool == Int + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const override; - 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] @@ -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 diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/CameraShakeSystem.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/CameraShakeSystem.h index c2d3768c424..edae45aee1f 100644 --- a/Core/GameEngineDevice/Include/W3DDevice/GameClient/CameraShakeSystem.h +++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/CameraShakeSystem.h @@ -80,7 +80,7 @@ class CameraShakeSystemClass { public: CameraShakerClass(const Vector3 & position,float radius,float duration,float power); - ~CameraShakerClass(); + ~CameraShakerClass() override; void Timestep(float dt) { ElapsedTime += dt; } bool Is_Expired() { return (ElapsedTime >= Duration); } diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h index aa8e5e9da6e..3f1f7c923ee 100644 --- a/Core/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h +++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h @@ -50,29 +50,29 @@ class FlatHeightMapRenderObjClass : public BaseHeightMapRenderObjClass public: FlatHeightMapRenderObjClass(); - virtual ~FlatHeightMapRenderObjClass(); + virtual ~FlatHeightMapRenderObjClass() 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 void Render(RenderInfoClass & rinfo); - virtual void On_Frame_Update(); + virtual void Render(RenderInfoClass & rinfo) override; + virtual void On_Frame_Update() override; ///allocate resources needed to render heightmap - virtual int initHeightData(Int width, Int height, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator,Bool updateExtraPassTiles=TRUE); - virtual Int freeMapResources(); ///< free resources used to render heightmap - virtual void updateCenter(CameraClass *camera, RefRenderObjListIterator *pLightsIterator); - virtual void adjustTerrainLOD(Int adj); - virtual void reset(); - virtual void oversizeTerrain(Int tilesToOversize); - virtual void staticLightingChanged(); - virtual void doPartialUpdate(const IRegion2D &partialRange, WorldHeightMap *htMap, RefRenderObjListIterator *pLightsIterator); - virtual int updateBlock(Int x0, Int y0, Int x1, Int y1, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator){return 0;}; + virtual int initHeightData(Int width, Int height, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator,Bool updateExtraPassTiles=TRUE) override; + virtual Int freeMapResources() override; ///< free resources used to render heightmap + virtual void updateCenter(CameraClass *camera, RefRenderObjListIterator *pLightsIterator) override; + virtual void adjustTerrainLOD(Int adj) override; + virtual void reset() override; + virtual void oversizeTerrain(Int tilesToOversize) override; + virtual void staticLightingChanged() override; + virtual void doPartialUpdate(const IRegion2D &partialRange, WorldHeightMap *htMap, RefRenderObjListIterator *pLightsIterator) override; + virtual int updateBlock(Int x0, Int y0, Int x1, Int y1, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator) override {return 0;}; protected: W3DTerrainBackground *m_tiles; diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h index ec4648bf17e..951e2665d1b 100644 --- a/Core/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h +++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h @@ -57,32 +57,32 @@ class HeightMapRenderObjClass : public BaseHeightMapRenderObjClass public: HeightMapRenderObjClass(); - virtual ~HeightMapRenderObjClass(); + virtual ~HeightMapRenderObjClass() 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 void Render(RenderInfoClass & rinfo); - virtual void On_Frame_Update(); + virtual void Render(RenderInfoClass & rinfo) override; + virtual void On_Frame_Update() override; ///allocate resources needed to render heightmap - virtual int initHeightData(Int width, Int height, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator, Bool updateExtraPassTiles=TRUE); - virtual Int freeMapResources(); ///< free resources used to render heightmap - virtual void updateCenter(CameraClass *camera, RefRenderObjListIterator *pLightsIterator); + virtual int initHeightData(Int width, Int height, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator, Bool updateExtraPassTiles=TRUE) override; + virtual Int freeMapResources() override; ///< free resources used to render heightmap + virtual void updateCenter(CameraClass *camera, RefRenderObjListIterator *pLightsIterator) override; - virtual void staticLightingChanged(); - virtual void adjustTerrainLOD(Int adj); - virtual void reset(); - virtual void doPartialUpdate(const IRegion2D &partialRange, WorldHeightMap *htMap, RefRenderObjListIterator *pLightsIterator); + virtual void staticLightingChanged() override; + virtual void adjustTerrainLOD(Int adj) override; + virtual void reset() override; + virtual void doPartialUpdate(const IRegion2D &partialRange, WorldHeightMap *htMap, RefRenderObjListIterator *pLightsIterator) override; - virtual void oversizeTerrain(Int tilesToOversize); + virtual void oversizeTerrain(Int tilesToOversize) override; - virtual int updateBlock(Int x0, Int y0, Int x1, Int y1, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator); + virtual int updateBlock(Int x0, Int y0, Int x1, Int y1, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator) override; protected: Int *m_extraBlendTilePositions; ///x; m_guardBandBias.y = gb->y; } + virtual void setGuardBandBias( const Coord2D *gb ) override { m_guardBandBias.x = gb->x; m_guardBandBias.y = gb->y; } private: diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h index 1549d461cb8..831083e8864 100644 --- a/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h +++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h @@ -73,14 +73,14 @@ class WaterRenderObjClass : public Snapshot, }; WaterRenderObjClass(); - ~WaterRenderObjClass(); + ~WaterRenderObjClass() override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface (W3D methods) ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const; - virtual void Render(RenderInfoClass & rinfo); + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override; + virtual void Render(RenderInfoClass & rinfo) override; /// @todo: Add methods for collision detection with water surface // virtual Bool Cast_Ray(RayCollisionTestClass & raytest); // virtual Bool Cast_AABox(AABoxCollisionTestClass & boxtest); @@ -88,11 +88,11 @@ class WaterRenderObjClass : public Snapshot, // virtual Bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); // virtual Bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const override; // Get and set static sort level - virtual int Get_Sort_Level() const { return m_sortLevel; } - virtual void Set_Sort_Level(int level) { m_sortLevel = level;} + virtual int Get_Sort_Level() const override { return m_sortLevel; } + virtual void Set_Sort_Level(int level) override { m_sortLevel = level;} ///allocate W3D resources needed to render water void renderWater(); ///m_width) m_drawWidthX = m_width;} void setDrawHeight(Int height) {m_drawHeightY = height; if (m_drawHeightY>m_height) m_drawHeightY = m_height;} - virtual Int getBorderSize() {return m_borderSize;} + virtual Int getBorderSize() override {return m_borderSize;} Int getBorderSizeInline() const { return m_borderSize; } /// Get height with the offset that HeightMapRenderObjClass uses built in. UnsignedByte getDisplayHeight(Int x, Int y) { return m_data[x+m_drawOriginX+m_width*(y+m_drawOriginY)];} @@ -296,10 +296,10 @@ class WorldHeightMap : public RefCountClass, Bool getSeismicUpdateFlag(Int xIndex, Int yIndex) const; void setSeismicUpdateFlag(Int xIndex, Int yIndex, Bool value); void clearSeismicUpdateFlags() ; - virtual Real getSeismicZVelocity(Int xIndex, Int yIndex) const; - virtual void setSeismicZVelocity(Int xIndex, Int yIndex, Real value); + virtual Real getSeismicZVelocity(Int xIndex, Int yIndex) const override; + virtual void setSeismicZVelocity(Int xIndex, Int yIndex, Real value) override; void fillSeismicZVelocities( Real value ); - virtual Real getBilinearSampleSeismicZVelocity( Int x, Int y); + virtual Real getBilinearSampleSeismicZVelocity( Int x, Int y) override; diff --git a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h b/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h index 5892dc9dbf6..093aadbcf4c 100644 --- a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h +++ b/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h @@ -36,15 +36,15 @@ class Win32BIGFile : public ArchiveFile { public: Win32BIGFile(AsciiString name, AsciiString path); - virtual ~Win32BIGFile(); - - 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 ~Win32BIGFile() 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: diff --git a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h b/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h index 6f0047c5130..6819ba90577 100644 --- a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h +++ b/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h @@ -34,22 +34,22 @@ class Win32BIGFileSystem : public ArchiveFileSystem { public: Win32BIGFileSystem(); - virtual ~Win32BIGFileSystem(); + virtual ~Win32BIGFileSystem() 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: }; diff --git a/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h b/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h index 7adf424986b..32319364d75 100644 --- a/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h +++ b/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h @@ -34,20 +34,20 @@ class Win32LocalFileSystem : public LocalFileSystem { public: Win32LocalFileSystem(); - virtual ~Win32LocalFileSystem(); + virtual ~Win32LocalFileSystem() 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: }; diff --git a/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h b/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h index a1bdbb4d16e..58f340e5d5b 100644 --- a/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h +++ b/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h @@ -70,18 +70,18 @@ class DirectInputKeyboard : public Keyboard public: DirectInputKeyboard(); - virtual ~DirectInputKeyboard(); + virtual ~DirectInputKeyboard() override; // extend methods from the base class - virtual void init(); ///< initialize the keyboard, extending init functionality - virtual void reset(); ///< Reset the keyboard system - virtual void update(); ///< update call, extending update functionality - virtual Bool getCapsState(); ///< get state of caps lock key, return TRUE if down + virtual void init() override; ///< initialize the keyboard, extending init functionality + virtual void reset() override; ///< Reset the keyboard system + virtual void update() override; ///< update call, extending update functionality + virtual Bool getCapsState() override; ///< get state of caps lock key, return TRUE if down protected: // extended methods from the base class - virtual void getKey( KeyboardIO *key ); ///< get a single key event + virtual void getKey( KeyboardIO *key ) override; ///< get a single key event //----------------------------------------------------------------------------------------------- diff --git a/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h b/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h index dd48226acf2..c17e6b68cd3 100644 --- a/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h +++ b/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h @@ -62,25 +62,25 @@ class DirectInputMouse : public Mouse public: DirectInputMouse(); - virtual ~DirectInputMouse(); + virtual ~DirectInputMouse() override; // extended methods from base class - virtual void init(); ///< initialize the direct input mouse, extending functionality - virtual void reset(); ///< reset system - virtual void update(); ///< update the mouse data, extending functionality - virtual void setPosition( Int x, Int y ); ///< set position for mouse + virtual void init() override; ///< initialize the direct input mouse, extending functionality + virtual void reset() override; ///< reset system + virtual void update() override; ///< update the mouse data, extending functionality + virtual void setPosition( Int x, Int y ) override; ///< set position for mouse - virtual void setMouseLimits(); ///< update the limit extents the mouse can move in + virtual void setMouseLimits() override; ///< update the limit extents the mouse can move in - virtual void setCursor( MouseCursor cursor ); ///< set mouse cursor + virtual void setCursor( MouseCursor cursor ) override; ///< set mouse cursor - virtual void capture(); ///< capture the mouse - virtual void releaseCapture(); ///< release mouse capture + virtual void capture() override; ///< capture the mouse + virtual void releaseCapture() override; ///< release mouse capture protected: /// device implementation to get mouse event - virtual UnsignedByte getMouseEvent( MouseIO *result, Bool flush ); + virtual UnsignedByte getMouseEvent( MouseIO *result, Bool flush ) override; // new internal methods for our direct input implementation void openMouse(); ///< create the direct input mouse diff --git a/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h b/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h index b626b36abb7..1191c1e0bc2 100644 --- a/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h +++ b/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h @@ -63,30 +63,30 @@ class Win32Mouse : public Mouse public: Win32Mouse(); - virtual ~Win32Mouse(); + virtual ~Win32Mouse() override; - virtual void init(); ///< init mouse, extend this functionality, do not replace - virtual void reset(); ///< reset the system - virtual void update(); ///< update - virtual void initCursorResources(); ///< load windows resources needed for 2d cursors. + virtual void init() override; ///< init mouse, extend this functionality, do not replace + virtual void reset() override; ///< reset the system + virtual void update() override; ///< update + virtual void initCursorResources() override; ///< load windows resources needed for 2d cursors. - virtual void setCursor( MouseCursor cursor ); ///< set mouse cursor + virtual void setCursor( MouseCursor cursor ) override; ///< set mouse cursor - virtual void setVisibility(Bool visible); + virtual void setVisibility(Bool visible) override; - virtual void loseFocus(); - virtual void regainFocus(); + virtual void loseFocus() override; + virtual void regainFocus() override; /// add an event from a win32 window procedure void addWin32Event( UINT msg, WPARAM wParam, LPARAM lParam, DWORD time ); protected: - virtual void capture(); ///< capture the mouse - virtual void releaseCapture(); ///< release mouse capture + virtual void capture() override; ///< capture the mouse + virtual void releaseCapture() override; ///< release mouse capture /// get the next event available in the buffer - virtual UnsignedByte getMouseEvent( MouseIO *result, Bool flush ); + virtual UnsignedByte getMouseEvent( MouseIO *result, Bool flush ) override; /// translate a win32 mouse event to our own info void translateEvent( UnsignedInt eventIndex, MouseIO *result ); diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp index 7d5dab7344e..a3427a2cc2f 100644 --- a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp +++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp @@ -63,7 +63,7 @@ static class MouseThreadClass : public ThreadClass public: MouseThreadClass() : ThreadClass() {} - void Thread_Function(); + virtual void Thread_Function() override; } thread; diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp index 87fa12f5c29..b225e08775f 100644 --- a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp +++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp @@ -120,13 +120,13 @@ IDirect3DSurface8 *W3DShaderManager::m_oldDepthSurface=nullptr; ///read(pData, numBytes):0); }; }; diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp index da40bf06f97..3119deae2aa 100644 --- a/Core/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp +++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp @@ -73,7 +73,7 @@ class GDIFileStream : public InputStream File* m_file; public: GDIFileStream(File* pFile):m_file(pFile) {}; - virtual Int read(void *pData, Int numBytes) { + virtual Int read(void *pData, Int numBytes) override { return(m_file->read(pData, numBytes)); }; }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h index 5f2d9bfe0c7..705e15dd644 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h @@ -87,7 +87,7 @@ class AABTreeClass : public W3DMPO, public RefCountClass AABTreeClass(); AABTreeClass(AABTreeBuilderClass * builder); AABTreeClass(const AABTreeClass & that); - ~AABTreeClass(); + ~AABTreeClass() override; void Load_W3D(ChunkLoadClass & cload); diff --git a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h index 80597d728bb..9178700bc41 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h @@ -209,15 +209,15 @@ class AggregatePrototypeClass : public W3DMPO, public PrototypeClass // // Public methods // - virtual const char * Get_Name() const { return m_pDefinition->Get_Name (); } - virtual int Get_Class_ID() const { return m_pDefinition->Class_ID (); } - virtual RenderObjClass * Create () { return m_pDefinition->Create (); } - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override { return m_pDefinition->Get_Name (); } + virtual int Get_Class_ID() const override { return m_pDefinition->Class_ID (); } + virtual RenderObjClass * Create () override { return m_pDefinition->Create (); } + virtual void DeleteSelf() override { delete this; } virtual AggregateDefClass * Get_Definition () const { return m_pDefinition; } virtual void Set_Definition (AggregateDefClass *pdef) { m_pDefinition = pdef; } protected: - virtual ~AggregatePrototypeClass () { delete m_pDefinition; } + virtual ~AggregatePrototypeClass () override { delete m_pDefinition; } private: @@ -237,8 +237,8 @@ class AggregateLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type () { return W3D_CHUNK_AGGREGATE; } - virtual PrototypeClass * Load_W3D (ChunkLoadClass &chunk_load); + virtual int Chunk_Type () override { return W3D_CHUNK_AGGREGATE; } + virtual PrototypeClass * Load_W3D (ChunkLoadClass &chunk_load) override; }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.h b/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.h index 454e7b22d6d..5acbfeb5235 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.h @@ -47,6 +47,6 @@ class Bitmap2DObjClass : public DynamicScreenMeshClass bool center, bool additive, bool colorizable = false, bool ignore_alpha = false); Bitmap2DObjClass( const Bitmap2DObjClass & src) : DynamicScreenMeshClass(src) {} - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_BITMAP2D; } + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_BITMAP2D; } }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp b/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp index 22338a1fdcb..98fdc43e32a 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp @@ -123,15 +123,15 @@ class CollectionPrototypeClass : public W3DMPO, public PrototypeClass public: CollectionPrototypeClass(CollectionDefClass * def) { ColDef = def; WWASSERT(ColDef); } - virtual const char * Get_Name() const { return ColDef->Get_Name(); } - virtual int Get_Class_ID() const { return RenderObjClass::CLASSID_COLLECTION; } - virtual RenderObjClass * Create() { return NEW_REF( CollectionClass, (*ColDef)); } - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override { return ColDef->Get_Name(); } + virtual int Get_Class_ID() const override { return RenderObjClass::CLASSID_COLLECTION; } + virtual RenderObjClass * Create() override { return NEW_REF( CollectionClass, (*ColDef)); } + virtual void DeleteSelf() override { delete this; } CollectionDefClass * ColDef; protected: - virtual ~CollectionPrototypeClass() { delete ColDef; } + virtual ~CollectionPrototypeClass() override { delete ColDef; } }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/collect.h b/Core/Libraries/Source/WWVegas/WW3D2/collect.h index c334a23a07c..1feb7cdd141 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/collect.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/collect.h @@ -60,11 +60,11 @@ class CollectionClass : public CompositeRenderObjClass CollectionClass(const CollectionDefClass & def); CollectionClass(const CollectionClass & src); CollectionClass & operator = (const CollectionClass &); - virtual ~CollectionClass(); - virtual RenderObjClass * Clone() const; + virtual ~CollectionClass() override; + virtual RenderObjClass * Clone() const override; - virtual int Class_ID() const; - virtual int Get_Num_Polys() const; + virtual int Class_ID() const override; + virtual int Get_Num_Polys() const override; ///////////////////////////////////////////////////////////////////////////// // Proxy interface @@ -75,48 +75,48 @@ class CollectionClass : public CompositeRenderObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Rendering ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - "Scene Graph" ///////////////////////////////////////////////////////////////////////////// - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); - virtual int Get_Num_Sub_Objects() const; - virtual RenderObjClass * Get_Sub_Object(int index) const; - virtual int Add_Sub_Object(RenderObjClass * subobj); - virtual int Remove_Sub_Object(RenderObjClass * robj); + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; + virtual int Get_Num_Sub_Objects() const override; + virtual RenderObjClass * Get_Sub_Object(int index) const override; + virtual int Add_Sub_Object(RenderObjClass * subobj) override; + virtual int Remove_Sub_Object(RenderObjClass * robj) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Collision Detection, Ray Tracing ///////////////////////////////////////////////////////////////////////////// - virtual bool Cast_Ray(RayCollisionTestClass & raytest); - virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest); - virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); - virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); - virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; + virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override; + virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override; + virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest) override; + virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Bounding Volumes ///////////////////////////////////////////////////////////////////////////// - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Attributes, Options, Properties, etc ///////////////////////////////////////////////////////////////////////////// virtual int Snap_Point_Count(); - virtual void Get_Snap_Point(int index,Vector3 * set); - virtual void Scale(float scale); - virtual void Scale(float scalex, float scaley, float scalez); - virtual void Update_Obj_Space_Bounding_Volumes(); + virtual void Get_Snap_Point(int index,Vector3 * set) override; + virtual void Scale(float scale) override; + virtual void Scale(float scalex, float scaley, float scalez) override; + virtual void Update_Obj_Space_Bounding_Volumes() override; protected: void Free(); - void Update_Sub_Object_Transforms(); + void Update_Sub_Object_Transforms() override; DynamicVectorClass ProxyList; DynamicVectorClass SubObjects; @@ -135,8 +135,8 @@ class CollectionLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type() { return W3D_CHUNK_COLLECTION; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type() override { return W3D_CHUNK_COLLECTION; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; extern CollectionLoaderClass _CollectionLoader; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/composite.h b/Core/Libraries/Source/WWVegas/WW3D2/composite.h index e53a2fb7290..e5a72d73bbc 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/composite.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/composite.h @@ -52,33 +52,33 @@ class CompositeRenderObjClass : public RenderObjClass CompositeRenderObjClass(); CompositeRenderObjClass(const CompositeRenderObjClass & that); - virtual ~CompositeRenderObjClass(); + virtual ~CompositeRenderObjClass() override; CompositeRenderObjClass & operator = (const CompositeRenderObjClass & that); - virtual void Restart(); + virtual void Restart() override; - virtual const char * Get_Name() const; - virtual void Set_Name(const char * name); - virtual const char * Get_Base_Model_Name () const; - virtual void Set_Base_Model_Name (const char *name); - virtual int Get_Num_Polys() const; - virtual void Notify_Added(SceneClass * scene); - virtual void Notify_Removed(SceneClass * scene); + virtual const char * Get_Name() const override; + virtual void Set_Name(const char * name) override; + virtual const char * Get_Base_Model_Name () const override; + virtual void Set_Base_Model_Name (const char *name) override; + virtual int Get_Num_Polys() const override; + virtual void Notify_Added(SceneClass * scene) override; + virtual void Notify_Removed(SceneClass * scene) override; - virtual bool Cast_Ray(RayCollisionTestClass & raytest); - virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest); - virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); - virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); - virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; + virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override; + virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override; + virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest) override; + virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest) override; - virtual void Create_Decal(DecalGeneratorClass * generator); - virtual void Delete_Decal(uint32 decal_id); + virtual void Create_Decal(DecalGeneratorClass * generator) override; + virtual void Delete_Decal(uint32 decal_id) override; - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const { sphere = ObjSphere; } - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const { box = ObjBox; } - virtual void Update_Obj_Space_Bounding_Volumes(); + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override { sphere = ObjSphere; } + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override { box = ObjBox; } + virtual void Update_Obj_Space_Bounding_Volumes() override; - virtual void Set_User_Data(void *value, bool recursive = false); + virtual void Set_User_Data(void *value, bool recursive = false) override; protected: diff --git a/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h b/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h index f30ec4c503a..7c3e3cae826 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h @@ -173,7 +173,7 @@ class DecalGeneratorClass : public ProjectorClass protected: DecalGeneratorClass(uint32 id,DecalSystemClass * system); - ~DecalGeneratorClass(); + ~DecalGeneratorClass() override; /* ** Logical Decal ID, DecalSystem that this generator is tied to @@ -215,19 +215,19 @@ class MultiFixedPoolDecalSystemClass : public DecalSystemClass MultiFixedPoolDecalSystemClass(uint32 num_pools, const uint32 *pool_sizes); MultiFixedPoolDecalSystemClass(const MultiFixedPoolDecalSystemClass & that); - virtual ~MultiFixedPoolDecalSystemClass(); + virtual ~MultiFixedPoolDecalSystemClass() override; // This clears the slot in addition to locking the generator, thus preventing any decal id // collisions (since any decal previously in that slot will have the same id as the new one). - virtual DecalGeneratorClass * Lock_Decal_Generator(); + virtual DecalGeneratorClass * Lock_Decal_Generator() override; // This will register the decal in the system in the appropriate pool and slot (determined by // the generator's pool and slot ids), removing any decal which may have been there before. - virtual void Unlock_Decal_Generator(DecalGeneratorClass * generator); + virtual void Unlock_Decal_Generator(DecalGeneratorClass * generator) override; // This notifies the system that a mesh which has decals on it was destroyed - therefore we // need to remove the mesh from our list to avoid dangling pointers. - virtual void Decal_Mesh_Destroyed(uint32 id,DecalMeshClass * mesh); + virtual void Decal_Mesh_Destroyed(uint32 id,DecalMeshClass * mesh) override; // Not part of the DecalSystemClass interface - this function removes any decal currently in // the given slot in the given pool. @@ -247,7 +247,7 @@ class MultiFixedPoolDecalSystemClass : public DecalSystemClass ** can set them before calling Lock_Decal_Generator() (which is where this function is called). ** We do it this way to avoid needing to override Lock_Decal_Generator(). */ - virtual uint32 Generate_Decal_Id() { return encode_decal_id(Generator_PoolID, Generator_SlotID); } + virtual uint32 Generate_Decal_Id() override { return encode_decal_id(Generator_PoolID, Generator_SlotID); } uint32 Generator_PoolID; // These should be set before calling Lock_Decal_Generator() uint32 Generator_SlotID; // These should be set before calling Lock_Decal_Generator() diff --git a/Core/Libraries/Source/WWVegas/WW3D2/distlod.h b/Core/Libraries/Source/WWVegas/WW3D2/distlod.h index bdc79198c09..f973fa96e37 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/distlod.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/distlod.h @@ -64,28 +64,28 @@ class DistLODClass : public CompositeRenderObjClass DistLODClass(const DistLODDefClass & desc); DistLODClass(const DistLODClass & that); - virtual ~DistLODClass(); - virtual RenderObjClass * Clone() const { return W3DNEW DistLODClass(*this); } - virtual int Class_ID() const { return CLASSID_DISTLOD; } - virtual int Get_Num_Polys() const; + virtual ~DistLODClass() override; + virtual RenderObjClass * Clone() const override { return W3DNEW DistLODClass(*this); } + virtual int Class_ID() const override { return CLASSID_DISTLOD; } + virtual int Get_Num_Polys() const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Rendering ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - "Scene Graph" // Access each LOD individually through Get_Sub_Object. ///////////////////////////////////////////////////////////////////////////// - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; - virtual int Get_Num_Sub_Objects() const; - virtual RenderObjClass * Get_Sub_Object(int index) const; + virtual int Get_Num_Sub_Objects() const override; + virtual RenderObjClass * Get_Sub_Object(int index) const override; - virtual int Add_Sub_Object_To_Bone(RenderObjClass * subobj,int bone_index); + virtual int Add_Sub_Object_To_Bone(RenderObjClass * subobj,int bone_index) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Hierarchical Animation @@ -94,36 +94,36 @@ class DistLODClass : public CompositeRenderObjClass // animation-compatible) so the bone query functions simply pass to the top // LOD. ///////////////////////////////////////////////////////////////////////////// - virtual void Set_Animation(); - virtual void Set_Animation( HAnimClass * motion, float frame, int anim_mode = ANIM_MODE_MANUAL); - virtual void Set_Animation( HAnimClass * motion0,float frame0,HAnimClass * motion1,float frame1,float percentage); - virtual void Set_Animation( HAnimComboClass * anim_combo); - virtual HAnimClass * Peek_Animation(); - virtual int Get_Num_Bones(); - virtual const char * Get_Bone_Name(int bone_index); - virtual int Get_Bone_Index(const char * bonename); - virtual const Matrix3D & Get_Bone_Transform(const char * bonename); - virtual const Matrix3D & Get_Bone_Transform(int boneindex); - virtual void Capture_Bone(int bindex); - virtual void Release_Bone(int bindex); - virtual bool Is_Bone_Captured(int bindex) const; - virtual void Control_Bone(int bindex,const Matrix3D & tm,bool world_space_translation = false); + virtual void Set_Animation() override; + virtual void Set_Animation( HAnimClass * motion, float frame, int anim_mode = ANIM_MODE_MANUAL) override; + virtual void Set_Animation( HAnimClass * motion0,float frame0,HAnimClass * motion1,float frame1,float percentage) override; + virtual void Set_Animation( HAnimComboClass * anim_combo) override; + virtual HAnimClass * Peek_Animation() override; + virtual int Get_Num_Bones() override; + virtual const char * Get_Bone_Name(int bone_index) override; + virtual int Get_Bone_Index(const char * bonename) override; + virtual const Matrix3D & Get_Bone_Transform(const char * bonename) override; + virtual const Matrix3D & Get_Bone_Transform(int boneindex) override; + virtual void Capture_Bone(int bindex) override; + virtual void Release_Bone(int bindex) override; + virtual bool Is_Bone_Captured(int bindex) const override; + virtual void Control_Bone(int bindex,const Matrix3D & tm,bool world_space_translation = false) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Collision Detection, Ray Tracing // Collision tests are performed on the top-level LOD. ///////////////////////////////////////////////////////////////////////////// - virtual bool Cast_Ray(RayCollisionTestClass & raytest); - virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest); - virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; + virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override; + virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Attributes, Options, Properties, etc ///////////////////////////////////////////////////////////////////////////// - virtual int Get_Num_Snap_Points(); - virtual void Get_Snap_Point(int index,Vector3 * set); - virtual void Scale(float scale); - virtual void Scale(float scalex, float scaley, float scalez); + virtual int Get_Num_Snap_Points() override; + virtual void Get_Snap_Point(int index,Vector3 * set) override; + virtual void Scale(float scale) override; + virtual void Scale(float scalex, float scaley, float scalez) override; ///////////////////////////////////////////////////////////////////////////// // DistLOD Interface @@ -163,8 +163,8 @@ class DistLODLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type () { return W3D_CHUNK_LODMODEL; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type () override { return W3D_CHUNK_LODMODEL; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; /* @@ -220,13 +220,13 @@ class DistLODPrototypeClass : public W3DMPO, public PrototypeClass public: DistLODPrototypeClass( DistLODDefClass *def ) { Definition = def; } - virtual const char * Get_Name() const { return Definition->Get_Name(); } - virtual int Get_Class_ID() const { return RenderObjClass::CLASSID_DISTLOD; } - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override { return Definition->Get_Name(); } + virtual int Get_Class_ID() const override { return RenderObjClass::CLASSID_DISTLOD; } + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { delete this; } protected: - virtual ~DistLODPrototypeClass() { delete Definition; } + virtual ~DistLODPrototypeClass() override { delete Definition; } private: DistLODDefClass * Definition; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dllist.h b/Core/Libraries/Source/WWVegas/WW3D2/dllist.h index 438268dfae9..7b7f5eee52f 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dllist.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dllist.h @@ -90,7 +90,7 @@ class DLNodeClass : public W3DMPO DLListClass* list; public: DLNodeClass() : succ(0), pred(0), list(0) {} - ~DLNodeClass() { Remove(); } + virtual ~DLNodeClass() override { Remove(); } void Insert_Before(DLNodeClass* n) { diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h index 27c1179c249..0d9a7a716ac 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h @@ -76,7 +76,7 @@ class DX8PolygonRendererClass : public MultiListObjectClass bool strip, unsigned pass); DX8PolygonRendererClass(const DX8PolygonRendererClass& src,MeshModelClass* mmc_); - ~DX8PolygonRendererClass(); + virtual ~DX8PolygonRendererClass() override; void Render(/*const Matrix3D & tm,*/int base_vertex_offset); void Render_Sorted(/*const Matrix3D & tm,*/int base_vertex_offset,const SphereClass & bounding_sphere); diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8texman.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8texman.h index 67d5077e1b2..84b8ebd4e25 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8texman.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8texman.h @@ -99,7 +99,7 @@ class DX8TextureTrackerClass : public TextureTrackerClass { } - virtual void Recreate() const + virtual void Recreate() const override { WWASSERT(Texture->Peek_D3D_Base_Texture()==nullptr); Texture->Poke_Texture @@ -136,7 +136,7 @@ class DX8ZTextureTrackerClass : public TextureTrackerClass { } - virtual void Recreate() const + virtual void Recreate() const override { WWASSERT(Texture->Peek_D3D_Base_Texture()==nullptr); Texture->Poke_Texture diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h index 37f77948ae1..3caed331d9e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h @@ -59,12 +59,12 @@ class DynamicMeshModel : public MeshGeometryClass DynamicMeshModel(unsigned int max_polys, unsigned int max_verts); DynamicMeshModel(unsigned int max_polys, unsigned int max_verts, MaterialInfoClass *mat_info); DynamicMeshModel(const DynamicMeshModel &src); - ~DynamicMeshModel(); + ~DynamicMeshModel() override; // Inherited from MeshGeometryClass virtual void Compute_Plane_Equations(); virtual void Compute_Vertex_Normals(); - virtual void Compute_Bounds(Vector3 * verts); + virtual void Compute_Bounds(Vector3 * verts) override; // Reset mesh (with existing max polygon and max vertex counts) void Reset(); @@ -135,31 +135,31 @@ class DynamicMeshClass : public RenderObjClass { DynamicMeshClass( int max_poly, int max_vert); DynamicMeshClass( int max_poly, int max_vert, MaterialInfoClass *mat_info); DynamicMeshClass( const DynamicMeshClass & src); - virtual ~DynamicMeshClass(); + virtual ~DynamicMeshClass() override; // Inherited from RenderObjClass: - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_DYNAMESH; } - virtual void Render(RenderInfoClass & rinfo); + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_DYNAMESH; } + virtual void Render(RenderInfoClass & rinfo) override; virtual MaterialInfoClass *Peek_Material_Info() { return Model->Peek_Material_Info(); } - virtual MaterialInfoClass *Get_Material_Info() { return Model->Get_Material_Info(); } + virtual MaterialInfoClass *Get_Material_Info() override { return Model->Get_Material_Info(); } virtual void Set_Material_Info(MaterialInfoClass *mat_info) { Model->Set_Material_Info(mat_info); } // all render objects should be able to tell you how many polygons were // used in the making of the render object. - virtual int Get_Num_Polys() const { return PolyCount; } + virtual int Get_Num_Polys() const override { return PolyCount; } // return the number of vertices used by this renderobject virtual int Get_Num_Vertices() const { return VertCount; } // Get and set static sort level - virtual int Get_Sort_Level() const { return SortLevel; } - virtual void Set_Sort_Level(int level) { SortLevel = level; if(level != SORT_LEVEL_NONE) Disable_Sort();} + virtual int Get_Sort_Level() const override { return SortLevel; } + virtual void Set_Sort_Level(int level) override { SortLevel = level; if(level != SORT_LEVEL_NONE) Disable_Sort();} // object space bounding volumes - virtual inline void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual inline void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual inline void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual inline void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; // Set the vertex material for the current triangle int Set_Vertex_Material( int idx, int pass = 0); @@ -541,24 +541,24 @@ class DynamicScreenMeshClass : public DynamicMeshClass { // constructor and destructor DynamicScreenMeshClass( int max_poly, int max_vert, float aspect = 1.0f ) : DynamicMeshClass( max_poly, max_vert), Aspect( aspect ) {} DynamicScreenMeshClass( const DynamicScreenMeshClass & src) : DynamicMeshClass(src), Aspect(src.Aspect) {} - virtual ~DynamicScreenMeshClass() {} + virtual ~DynamicScreenMeshClass() override {} // function to clone a dynamic screen mesh class - virtual RenderObjClass * Clone() const { return NEW_REF( DynamicScreenMeshClass, (*this)); } + virtual RenderObjClass * Clone() const override { return NEW_REF( DynamicScreenMeshClass, (*this)); } // class id of this render object - virtual int Class_ID() const { return CLASSID_DYNASCREENMESH; } + virtual int Class_ID() const override { return CLASSID_DYNASCREENMESH; } // Remap locations to match a screen - virtual void Location( float x, float y, float z = 0.0f); + virtual void Location( float x, float y, float z = 0.0f) override; // For moving a vertex after the DynaMesh has already been created. - virtual void Move_Vertex(int index, float x, float y, float z = 0.0f); + virtual void Move_Vertex(int index, float x, float y, float z = 0.0f) override; // Set position - virtual void Set_Position(const Vector3 &v); + virtual void Set_Position(const Vector3 &v) override; - virtual void Reset(); + virtual void Reset() override; virtual void Set_Aspect(float aspect) { Aspect=aspect; }; @@ -570,5 +570,5 @@ class DynamicScreenMeshClass : public DynamicMeshClass { float Aspect; // tells when the triangle needs to be back flipped - virtual bool Flip_Face() { return !DynamicMeshClass::Flip_Face(); } + virtual bool Flip_Face() override { return !DynamicMeshClass::Flip_Face(); } }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/font3d.h b/Core/Libraries/Source/WWVegas/WW3D2/font3d.h index f34f8e4bd05..5d90c75de5f 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/font3d.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/font3d.h @@ -73,7 +73,7 @@ class Font3DDataClass : public RefCountClass { ** and Destructor */ Font3DDataClass( const char *filename ); - ~Font3DDataClass(); + virtual ~Font3DDataClass() override; // the name of the font data (used for name matching and the like.) char *Name; @@ -149,7 +149,7 @@ class Font3DInstanceClass : public RefCountClass { ** and Destructor */ Font3DInstanceClass( const char *filename ); - ~Font3DInstanceClass(); + virtual ~Font3DInstanceClass() override; /* ** access texture material diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hanim.h b/Core/Libraries/Source/WWVegas/WW3D2/hanim.h index 9c288e1a107..2f335c20cc7 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hanim.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/hanim.h @@ -76,12 +76,12 @@ class HAnimClass : public RefCountClass, public HashableClass HAnimClass() : EmbeddedSoundBoneIndex (EMBEDDED_SOUND_BONE_INDEX_NOT_SET) { } - virtual ~HAnimClass() { } + virtual ~HAnimClass() override { } virtual const char * Get_Name() const = 0; virtual const char * Get_HName() const = 0; - virtual const char * Get_Key() { return Get_Name(); } + virtual const char * Get_Key() override { return Get_Name(); } virtual int Get_Num_Frames() = 0; virtual float Get_Frame_Rate() = 0; @@ -135,9 +135,9 @@ class PivotMapClass : public DynamicVectorClass, public RefCountClass class NamedPivotMapClass : public PivotMapClass { public: - ~NamedPivotMapClass(); + ~NamedPivotMapClass() override; - virtual NamedPivotMapClass * As_Named_Pivot_Map() { return this; } + virtual NamedPivotMapClass * As_Named_Pivot_Map() override { return this; } // add a name & weight to the arrays void Add(const char *Name, float Weight); diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h index 23e524ec626..f488aa659d3 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h @@ -75,31 +75,31 @@ class HCompressedAnimClass : public HAnimClass }; HCompressedAnimClass(); - ~HCompressedAnimClass(); + ~HCompressedAnimClass() override; int Load_W3D(ChunkLoadClass & cload); - const char * Get_Name() const { return Name; } - const char * Get_HName() const { return HierarchyName; } - int Get_Num_Frames() { return NumFrames; } - float Get_Frame_Rate() { return FrameRate; } - float Get_Total_Time() { return (float)NumFrames / FrameRate; } + const char * Get_Name() const override { return Name; } + const char * Get_HName() const override { return HierarchyName; } + int Get_Num_Frames() override { return NumFrames; } + float Get_Frame_Rate() override { return FrameRate; } + float Get_Total_Time() override { return (float)NumFrames / FrameRate; } int Get_Flavor() { return Flavor; } - void Get_Translation(Vector3& translation, int pividx,float frame) const; - void Get_Orientation(Quaternion& orientation, int pividx,float frame) const; - void Get_Transform(Matrix3D& transform, int pividx,float frame) const; - bool Get_Visibility(int pividx,float frame); + virtual void Get_Translation(Vector3& translation, int pividx,float frame) const override; + virtual void Get_Orientation(Quaternion& orientation, int pividx,float frame) const override; + virtual void Get_Transform(Matrix3D& transform, int pividx,float frame) const override; + virtual bool Get_Visibility(int pividx,float frame) override; - bool Is_Node_Motion_Present(int pividx); - int Get_Num_Pivots() const { return NumNodes; } + bool Is_Node_Motion_Present(int pividx) override; + int Get_Num_Pivots() const override { return NumNodes; } // Methods that test the presence of a certain motion channel. - bool Has_X_Translation (int pividx); - bool Has_Y_Translation (int pividx); - bool Has_Z_Translation (int pividx); - bool Has_Rotation (int pividx); - bool Has_Visibility (int pividx); + virtual bool Has_X_Translation (int pividx) override; + virtual bool Has_Y_Translation (int pividx) override; + virtual bool Has_Z_Translation (int pividx) override; + virtual bool Has_Rotation (int pividx) override; + virtual bool Has_Visibility (int pividx) override; private: diff --git a/Core/Libraries/Source/WWVegas/WW3D2/htree.h b/Core/Libraries/Source/WWVegas/WW3D2/htree.h index b38bca37b90..962dfca68eb 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/htree.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/htree.h @@ -79,7 +79,7 @@ class HTreeClass : public W3DMPO HTreeClass(); HTreeClass(const HTreeClass & src); - ~HTreeClass(); + ~HTreeClass() override; int Load_W3D(ChunkLoadClass & cload); void Init_Default(); diff --git a/Core/Libraries/Source/WWVegas/WW3D2/layer.h b/Core/Libraries/Source/WWVegas/WW3D2/layer.h index ded4722a7dc..1504172ec79 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/layer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/layer.h @@ -54,7 +54,7 @@ class LayerClass : public LayerNodeClass LayerClass(); LayerClass(SceneClass * s,CameraClass * c,bool clear = false,bool clearz = false,const Vector3 & color = Vector3(0,0,0)); LayerClass(const LayerClass & src); - ~LayerClass(); + ~LayerClass() override; /* diff --git a/Core/Libraries/Source/WWVegas/WW3D2/line3d.h b/Core/Libraries/Source/WWVegas/WW3D2/line3d.h index 68b9e39e883..fc7c9cdb954 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/line3d.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/line3d.h @@ -62,24 +62,24 @@ class Line3DClass : public W3DMPO, public RenderObjClass float r, float g, float b, float opacity = 1.0f); Line3DClass(const Line3DClass & src); Line3DClass & operator = (const Line3DClass & that); - virtual ~Line3DClass(); - virtual RenderObjClass * Clone() const; + virtual ~Line3DClass() override; + virtual RenderObjClass * Clone() const override; // class id of this render object - virtual int Class_ID() const { return CLASSID_LINE3D; } + virtual int Class_ID() const override { return CLASSID_LINE3D; } - virtual void Render(RenderInfoClass & rfinfo); + virtual void Render(RenderInfoClass & rfinfo) override; // scale the 3D line symmetrically about its center. - virtual void Scale(float scale); - virtual void Scale(float scalex, float scaley, float scalez); + virtual void Scale(float scale) override; + virtual void Scale(float scalex, float scaley, float scalez) override; // returns the number of polygons in the render object - virtual int Get_Num_Polys() const; + virtual int Get_Num_Polys() const override; // Get the object space bounding volumes - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; // The following functions are unique to Line3DClass: @@ -96,8 +96,8 @@ class Line3DClass : public W3DMPO, public RenderObjClass void Set_Opacity(float opacity); // For non-opaque lines, allow them to render last. - void Set_Sort_Level(int level) { SortLevel = level; } - int Get_Sort_Level() const { return SortLevel; } + void Set_Sort_Level(int level) override { SortLevel = level; } + int Get_Sort_Level() const override { return SortLevel; } protected: diff --git a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h index c57b97e8d5a..3fa65dde08e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h @@ -70,7 +70,7 @@ class MaterialInfoClass : public W3DMPO, public RefCountClass MaterialInfoClass(); MaterialInfoClass(const MaterialInfoClass & src); - ~MaterialInfoClass(); + ~MaterialInfoClass() override; MaterialInfoClass * Clone() const; void Reset() { Free(); } diff --git a/Core/Libraries/Source/WWVegas/WW3D2/matpass.h b/Core/Libraries/Source/WWVegas/WW3D2/matpass.h index 0a5a21cbaa1..5dba63d9a3e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/matpass.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/matpass.h @@ -65,7 +65,7 @@ class MaterialPassClass : public RefCountClass public: MaterialPassClass(); - ~MaterialPassClass(); + ~MaterialPassClass() override; /// MW: Had to make this virtual so app can perform direct/custom D3D setup. virtual void Install_Materials() const; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h index 82e110a877c..f2a098c19b3 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h @@ -228,6 +228,6 @@ class SegmentGroupClass : public PointGroupClass { public: SegmentGroupClass(); - virtual ~SegmentGroupClass(); + virtual ~SegmentGroupClass() override; }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.h b/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.h index 3ab5126bb09..d5e57566220 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.h @@ -164,7 +164,7 @@ class LERPAnimationChannelClass : public PrimitiveAnimationChannelClass ///////////////////////////////////////////////////////// // Public methods ///////////////////////////////////////////////////////// - virtual T Evaluate (float time); + virtual T Evaluate (float time) override; }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp b/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp index bebe9cba8e4..c279eac95af 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp @@ -92,15 +92,15 @@ class HModelPrototypeClass : public W3DMPO, public PrototypeClass public: HModelPrototypeClass(HModelDefClass * def) { HModelDef = def; assert(HModelDef); } - virtual const char * Get_Name() const { return HModelDef->Get_Name(); } - virtual int Get_Class_ID() const { return RenderObjClass::CLASSID_HLOD; } - virtual RenderObjClass * Create() { return NEW_REF( HLodClass, (*HModelDef) ); } - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override { return HModelDef->Get_Name(); } + virtual int Get_Class_ID() const override { return RenderObjClass::CLASSID_HLOD; } + virtual RenderObjClass * Create() override { return NEW_REF( HLodClass, (*HModelDef) ); } + virtual void DeleteSelf() override { delete this; } HModelDefClass * HModelDef; protected: - virtual ~HModelPrototypeClass() { delete HModelDef; } + virtual ~HModelPrototypeClass() override { delete HModelDef; } }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/proto.h b/Core/Libraries/Source/WWVegas/WW3D2/proto.h index 50768055931..1b5b793e3d9 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/proto.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/proto.h @@ -108,15 +108,15 @@ class PrimitivePrototypeClass : public W3DMPO, public PrototypeClass public: PrimitivePrototypeClass(RenderObjClass * proto); - virtual const char * Get_Name() const; - virtual int Get_Class_ID() const; - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override; + virtual int Get_Class_ID() const override; + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { delete this; } RenderObjClass * Proto; protected: - virtual ~PrimitivePrototypeClass(); + virtual ~PrimitivePrototypeClass() override; }; /* @@ -152,16 +152,16 @@ class MeshLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type() { return W3D_CHUNK_MESH; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type() override { return W3D_CHUNK_MESH; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; class HModelLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type() { return W3D_CHUNK_HMODEL; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type() override { return W3D_CHUNK_HMODEL; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h index 48c707ccf29..ce4c1b64799 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h @@ -76,7 +76,7 @@ class FontCharsClass : public W3DMPO, public RefCountClass public: FontCharsClass(); - ~FontCharsClass(); + ~FontCharsClass() override; // TR: Hack for unicode font support FontCharsClass *AlternateUnicodeFont; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp index fc3c50da447..6df59cb46c8 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp @@ -1194,9 +1194,9 @@ void RenderObjClass::Add_Dependencies_To_List class RenderObjPersistFactoryClass : public PersistFactoryClass { - virtual uint32 Chunk_ID() const; - virtual PersistClass * Load(ChunkLoadClass & cload) const; - virtual void Save(ChunkSaveClass & csave,PersistClass * obj) const; + virtual uint32 Chunk_ID() const override; + virtual PersistClass * Load(ChunkLoadClass & cload) const override; + virtual void Save(ChunkSaveClass & csave,PersistClass * obj) const override; enum { diff --git a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h index 9fc32ca546a..65b6e139810 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h @@ -218,7 +218,7 @@ class RenderObjClass : public RefCountClass , public PersistClass, public MultiL RenderObjClass(); RenderObjClass(const RenderObjClass & src); RenderObjClass & operator = (const RenderObjClass &); - virtual ~RenderObjClass() { if (RenderHook) delete RenderHook; } + virtual ~RenderObjClass() override { if (RenderHook) delete RenderHook; } /////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -485,9 +485,9 @@ class RenderObjClass : public RefCountClass , public PersistClass, public MultiL /////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Persistent object save-load interface /////////////////////////////////////////////////////////////////////////////////////////////////////////////// - virtual const PersistFactoryClass & Get_Factory () const; - virtual bool Save (ChunkSaveClass &csave); - virtual bool Load (ChunkLoadClass &cload); + virtual const PersistFactoryClass & Get_Factory () const override; + virtual bool Save (ChunkSaveClass &csave) override; + virtual bool Load (ChunkLoadClass &cload) override; // Application-specific render hook: RenderHookClass * Get_Render_Hook() { return RenderHook; } diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h index d392a5eee9e..f56c2fe6c06 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h @@ -111,45 +111,45 @@ class RingRenderObjClass : public RenderObjClass RingRenderObjClass(const W3dRingStruct & def); RingRenderObjClass(const RingRenderObjClass & src); RingRenderObjClass & operator = (const RingRenderObjClass &); - ~RingRenderObjClass(); + ~RingRenderObjClass() override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const; - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; - - virtual void Prepare_LOD(CameraClass &camera); - virtual void Increment_LOD(); - virtual void Decrement_LOD(); - virtual float Get_Cost() const; - virtual float Get_Value() const; - virtual float Get_Post_Increment_Value() const; - virtual void Set_LOD_Level(int lod); - virtual int Get_LOD_Level() const; - virtual int Get_LOD_Count() const; - virtual void Set_LOD_Bias(float bias) { LODBias = MAX(bias, 0.0f); } - virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const; - - virtual void Scale(float scale); - virtual void Scale(float scalex, float scaley, float scalez); - - virtual void Set_Hidden(int onoff) { RenderObjClass::Set_Hidden (onoff); Update_On_Visibility (); } - virtual void Set_Visible(int onoff) { RenderObjClass::Set_Visible (onoff); Update_On_Visibility (); } - virtual void Set_Animation_Hidden(int onoff) { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibility (); } - virtual void Set_Force_Visible(int onoff) { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibility (); } + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override; + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; + + virtual void Prepare_LOD(CameraClass &camera) override; + virtual void Increment_LOD() override; + virtual void Decrement_LOD() override; + virtual float Get_Cost() const override; + virtual float Get_Value() const override; + virtual float Get_Post_Increment_Value() const override; + virtual void Set_LOD_Level(int lod) override; + virtual int Get_LOD_Level() const override; + virtual int Get_LOD_Count() const override; + virtual void Set_LOD_Bias(float bias) override { LODBias = MAX(bias, 0.0f); } + virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const override; + + virtual void Scale(float scale) override; + virtual void Scale(float scalex, float scaley, float scalez) override; + + virtual void Set_Hidden(int onoff) override { RenderObjClass::Set_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Visible(int onoff) override { RenderObjClass::Set_Visible (onoff); Update_On_Visibility (); } + virtual void Set_Animation_Hidden(int onoff) override { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Force_Visible(int onoff) override { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibility (); } const AABoxClass & Get_Box(); - virtual int Get_Num_Polys() const; - virtual const char *Get_Name() const; - virtual void Set_Name(const char * name); + virtual int Get_Num_Polys() const override; + virtual const char *Get_Name() const override; + virtual void Set_Name(const char * name) override; unsigned int Get_Flags() {return Flags;} void Set_Flags(unsigned int flags) { Flags = flags; } @@ -317,8 +317,8 @@ inline const AABoxClass & RingRenderObjClass::Get_Box() class RingLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type () { return W3D_CHUNK_RING; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type () override { return W3D_CHUNK_RING; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; /* @@ -332,16 +332,16 @@ class RingPrototypeClass : public W3DMPO, public PrototypeClass RingPrototypeClass (); RingPrototypeClass (RingRenderObjClass *ring); - virtual const char * Get_Name() const; - virtual int Get_Class_ID() const; - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override; + virtual int Get_Class_ID() const override; + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { delete this; } bool Load (ChunkLoadClass &cload); bool Save (ChunkSaveClass &csave); protected: - ~RingPrototypeClass (); + ~RingPrototypeClass () override; private: W3dRingStruct Definition; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/segline.h b/Core/Libraries/Source/WWVegas/WW3D2/segline.h index 44844a9e92f..86ac8b635d1 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/segline.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/segline.h @@ -54,7 +54,7 @@ class SegmentedLineClass : public RenderObjClass SegmentedLineClass(); SegmentedLineClass(const SegmentedLineClass & src); SegmentedLineClass & operator = (const SegmentedLineClass &that); - virtual ~SegmentedLineClass(); + virtual ~SegmentedLineClass() override; void Reset_Line(); @@ -117,33 +117,33 @@ class SegmentedLineClass : public RenderObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Cloning and Identification ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_SEGLINE; } - virtual int Get_Num_Polys() const; + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_SEGLINE; } + virtual int Get_Num_Polys() const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Rendering ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo); + virtual void Render(RenderInfoClass & rinfo) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Bounding Volumes ///////////////////////////////////////////////////////////////////////////// - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Predictive LOD ///////////////////////////////////////////////////////////////////////////// - virtual void Prepare_LOD(CameraClass &camera); - virtual void Increment_LOD(); - virtual void Decrement_LOD(); - virtual float Get_Cost() const; - virtual float Get_Value() const; - virtual float Get_Post_Increment_Value() const; - virtual void Set_LOD_Level(int lod); - virtual int Get_LOD_Level() const; - virtual int Get_LOD_Count() const; + virtual void Prepare_LOD(CameraClass &camera) override; + virtual void Increment_LOD() override; + virtual void Decrement_LOD() override; + virtual float Get_Cost() const override; + virtual float Get_Value() const override; + virtual float Get_Post_Increment_Value() const override; + virtual void Set_LOD_Level(int lod) override; + virtual int Get_LOD_Level() const override; + virtual int Get_LOD_Count() const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Attributes, Options, Properties, etc @@ -153,7 +153,7 @@ class SegmentedLineClass : public RenderObjClass /////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Render Object Interface - Collision Detection /////////////////////////////////////////////////////////////////////////////////////////////////////////////// - virtual bool Cast_Ray(RayCollisionTestClass & raytest); + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; protected: diff --git a/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h b/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h index a9f4850cfb1..f4bca0b3fae 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h @@ -52,6 +52,6 @@ class SnapPointsClass : public DynamicVectorClass, public RefCountClass protected: - ~SnapPointsClass() {} + ~SnapPointsClass() override {} }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h index 1a3fc5d5c3c..b11fb9eca9f 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h @@ -86,7 +86,7 @@ class SoundRenderObjClass : public RenderObjClass /////////////////////////////////////////////////////////// SoundRenderObjClass (); SoundRenderObjClass (const SoundRenderObjClass &src); - virtual ~SoundRenderObjClass (); + virtual ~SoundRenderObjClass () override; /////////////////////////////////////////////////////////// // Public operators @@ -100,20 +100,20 @@ class SoundRenderObjClass : public RenderObjClass // // From RenderObjClass // - RenderObjClass * Clone () const { return W3DNEW SoundRenderObjClass (*this); } - int Class_ID () const { return CLASSID_SOUND; } - const char * Get_Name () const { return Name; } - void Set_Name (const char *name) { Name = name; } - void Render (RenderInfoClass &rinfo) { } - void On_Frame_Update (); - void Set_Hidden (int onoff); - void Set_Visible (int onoff); - void Set_Animation_Hidden (int onoff); - void Set_Force_Visible (int onoff); - void Notify_Added (SceneClass *scene); - void Notify_Removed (SceneClass *scene); - void Set_Transform(const Matrix3D &m); - void Set_Position(const Vector3 &v); + RenderObjClass * Clone () const override { return W3DNEW SoundRenderObjClass (*this); } + int Class_ID () const override { return CLASSID_SOUND; } + const char * Get_Name () const override { return Name; } + void Set_Name (const char *name) override { Name = name; } + void Render (RenderInfoClass &rinfo) override { } + void On_Frame_Update () override; + void Set_Hidden (int onoff) override; + void Set_Visible (int onoff) override; + void Set_Animation_Hidden (int onoff) override; + void Set_Force_Visible (int onoff) override; + void Notify_Added (SceneClass *scene) override; + void Notify_Removed (SceneClass *scene) override; + void Set_Transform(const Matrix3D &m) override; + void Set_Position(const Vector3 &v) override; // // SoundRenderObjClass specific @@ -165,7 +165,7 @@ class SoundRenderObjDefClass : public RefCountClass SoundRenderObjDefClass (); SoundRenderObjDefClass (SoundRenderObjClass &render_obj); SoundRenderObjDefClass (const SoundRenderObjDefClass &src); - virtual ~SoundRenderObjDefClass (); + virtual ~SoundRenderObjDefClass () override; /////////////////////////////////////////////////////////// // Public operators @@ -236,16 +236,16 @@ class SoundRenderObjPrototypeClass : public W3DMPO, public PrototypeClass /////////////////////////////////////////////////////////// // Public methods /////////////////////////////////////////////////////////// - const char * Get_Name() const { return Definition->Get_Name (); } - int Get_Class_ID() const { return RenderObjClass::CLASSID_SOUND; } - RenderObjClass * Create () { return Definition->Create (); } - virtual void DeleteSelf() { delete this; } + const char * Get_Name() const override { return Definition->Get_Name (); } + int Get_Class_ID() const override { return RenderObjClass::CLASSID_SOUND; } + RenderObjClass * Create () override { return Definition->Create (); } + virtual void DeleteSelf() override { delete this; } SoundRenderObjDefClass * Peek_Definition () const { return Definition; } void Set_Definition (SoundRenderObjDefClass *def) { REF_PTR_SET (Definition, def); } protected: - virtual ~SoundRenderObjPrototypeClass () { REF_PTR_RELEASE (Definition); } + virtual ~SoundRenderObjPrototypeClass () override { REF_PTR_RELEASE (Definition); } private: @@ -264,8 +264,8 @@ class SoundRenderObjPrototypeClass : public W3DMPO, public PrototypeClass class SoundRenderObjLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type () { return W3D_CHUNK_SOUNDROBJ; } - virtual PrototypeClass * Load_W3D (ChunkLoadClass &cload); + virtual int Chunk_Type () override { return W3D_CHUNK_SOUNDROBJ; } + virtual PrototypeClass * Load_W3D (ChunkLoadClass &cload) override; }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h index 65710b12a0b..dd1a73782e8 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h @@ -68,7 +68,7 @@ struct AlphaVectorStruct class AlphaVectorChannel : public PrimitiveAnimationChannelClass { public: - AlphaVectorStruct Evaluate (float time) + virtual AlphaVectorStruct Evaluate (float time) override { int key_count = m_Data.Count (); AlphaVectorStruct value = m_Data[key_count - 1].Get_Value (); @@ -238,45 +238,45 @@ class SphereRenderObjClass : public RenderObjClass SphereRenderObjClass(const W3dSphereStruct & def); SphereRenderObjClass(const SphereRenderObjClass & src); SphereRenderObjClass & operator = (const SphereRenderObjClass &); - ~SphereRenderObjClass(); + ~SphereRenderObjClass() override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const; - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const; - - virtual void Prepare_LOD(CameraClass &camera); - virtual void Increment_LOD(); - virtual void Decrement_LOD(); - virtual float Get_Cost() const; - virtual float Get_Value() const; - virtual float Get_Post_Increment_Value() const; - virtual void Set_LOD_Level(int lod); - virtual int Get_LOD_Level() const; - virtual int Get_LOD_Count() const; - virtual void Set_LOD_Bias(float bias) { LODBias = MAX(bias, 0.0f); } - virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const; - - virtual void Scale(float scale); - virtual void Scale(float scalex, float scaley, float scalez); - virtual void Set_Hidden(int onoff) { RenderObjClass::Set_Hidden (onoff); Update_On_Visibility (); } - virtual void Set_Visible(int onoff) { RenderObjClass::Set_Visible (onoff); Update_On_Visibility (); } - virtual void Set_Animation_Hidden(int onoff) { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibility (); } - virtual void Set_Force_Visible(int onoff) { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibility (); } + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override; + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const override; + + virtual void Prepare_LOD(CameraClass &camera) override; + virtual void Increment_LOD() override; + virtual void Decrement_LOD() override; + virtual float Get_Cost() const override; + virtual float Get_Value() const override; + virtual float Get_Post_Increment_Value() const override; + virtual void Set_LOD_Level(int lod) override; + virtual int Get_LOD_Level() const override; + virtual int Get_LOD_Count() const override; + virtual void Set_LOD_Bias(float bias) override { LODBias = MAX(bias, 0.0f); } + virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const override; + + virtual void Scale(float scale) override; + virtual void Scale(float scalex, float scaley, float scalez) override; + virtual void Set_Hidden(int onoff) override { RenderObjClass::Set_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Visible(int onoff) override { RenderObjClass::Set_Visible (onoff); Update_On_Visibility (); } + virtual void Set_Animation_Hidden(int onoff) override { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Force_Visible(int onoff) override { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibility (); } const AABoxClass & Get_Box(); - virtual int Get_Num_Polys() const; - virtual const char * Get_Name() const; - virtual void Set_Name(const char * name); + virtual int Get_Num_Polys() const override; + virtual const char * Get_Name() const override; + virtual void Set_Name(const char * name) override; unsigned int Get_Flags() { return Flags; } void Set_Flags(unsigned int flags) { Flags = flags; } @@ -340,7 +340,7 @@ class SphereRenderObjClass : public RenderObjClass protected: virtual void update_cached_box(); - virtual void Update_Cached_Bounding_Volumes() const; + virtual void Update_Cached_Bounding_Volumes() const override; void Update_On_Visibility(); // Initialization stuff @@ -428,8 +428,8 @@ inline const AABoxClass & SphereRenderObjClass::Get_Box() class SphereLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type () { return W3D_CHUNK_SPHERE; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type () override { return W3D_CHUNK_SPHERE; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; /* @@ -442,16 +442,16 @@ class SpherePrototypeClass : public W3DMPO, public PrototypeClass SpherePrototypeClass (); SpherePrototypeClass (SphereRenderObjClass *sphere); - virtual const char * Get_Name() const; - virtual int Get_Class_ID() const; - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override; + virtual int Get_Class_ID() const override; + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { delete this; } bool Load (ChunkLoadClass &cload); bool Save (ChunkSaveClass &csave); protected: - ~SpherePrototypeClass (); + ~SpherePrototypeClass () override; private: W3dSphereStruct Definition; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h b/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h index 882798ec60b..0095b60a746 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h @@ -64,10 +64,10 @@ class DefaultStaticSortListClass : public StaticSortListClass /////////////////////////////////////////////////////////////////////////////////// // Construction. DefaultStaticSortListClass(); - virtual ~DefaultStaticSortListClass(); + virtual ~DefaultStaticSortListClass() override; - virtual void Add_To_List(RenderObjClass * robj, unsigned int sort_level); - virtual void Render_And_Clear(RenderInfoClass & rinfo); + virtual void Add_To_List(RenderObjClass * robj, unsigned int sort_level) override; + virtual void Render_And_Clear(RenderInfoClass & rinfo) override; unsigned int Get_Min_Sort() const {return MinSort;}; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streak.h b/Core/Libraries/Source/WWVegas/WW3D2/streak.h index 1d5c60153d1..c80432d7314 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/streak.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/streak.h @@ -123,33 +123,33 @@ class StreakLineClass : public RenderObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Cloning and Identification ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_SEGLINE; } - virtual int Get_Num_Polys() const; + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_SEGLINE; } + virtual int Get_Num_Polys() const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Rendering ///////////////////////////////////////////////////////////////////////////// - virtual void Render( RenderInfoClass & rinfo ); + virtual void Render( RenderInfoClass & rinfo ) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Bounding Volumes ///////////////////////////////////////////////////////////////////////////// - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Predictive LOD ///////////////////////////////////////////////////////////////////////////// - virtual void Prepare_LOD(CameraClass &camera); - virtual void Increment_LOD(); - virtual void Decrement_LOD(); - virtual float Get_Cost() const; - virtual float Get_Value() const; - virtual float Get_Post_Increment_Value() const; - virtual void Set_LOD_Level(int lod); - virtual int Get_LOD_Level() const; - virtual int Get_LOD_Count() const; + virtual void Prepare_LOD(CameraClass &camera) override; + virtual void Increment_LOD() override; + virtual void Decrement_LOD() override; + virtual float Get_Cost() const override; + virtual float Get_Value() const override; + virtual float Get_Post_Increment_Value() const override; + virtual void Set_LOD_Level(int lod) override; + virtual int Get_LOD_Level() const override; + virtual int Get_LOD_Count() const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Attributes, Options, Properties, etc @@ -159,7 +159,7 @@ class StreakLineClass : public RenderObjClass /////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Render Object Interface - Collision Detection /////////////////////////////////////////////////////////////////////////////////////////////////////////////// - virtual bool Cast_Ray(RayCollisionTestClass & raytest); + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; void Set_LocsWidthsColors( unsigned int num_points, Vector3 *locs, diff --git a/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h b/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h index 2a0460ad30a..1ce773806e2 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h @@ -74,7 +74,7 @@ class SurfaceClass : public W3DMPO, public RefCountClass // Create the surface from a D3D pointer SurfaceClass(IDirect3DSurface8 *d3d_surface); - ~SurfaceClass(); + ~SurfaceClass() override; // Get surface description void Get_Description(SurfaceDescription &surface_desc); diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texproject.h b/Core/Libraries/Source/WWVegas/WW3D2/texproject.h index 55a1eb05b58..d8a7fa3caeb 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/texproject.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/texproject.h @@ -101,7 +101,7 @@ class TexProjectClass : public ProjectorClass, public CullableClass, public Mult public: TexProjectClass(); - virtual ~TexProjectClass(); + virtual ~TexProjectClass() override; /* ** Material settings @@ -135,8 +135,8 @@ class TexProjectClass : public ProjectorClass, public CullableClass, public Mult ** 2 - call Set_Projection_Perspective -or- Set_Projection_Ortho ** 3 - call Set_Texture. */ - virtual void Set_Perspective_Projection(float hfov,float vfov,float znear,float zfar); - virtual void Set_Ortho_Projection(float xmin,float xmax,float ymin,float ymax,float znear,float zfar); + virtual void Set_Perspective_Projection(float hfov,float vfov,float znear,float zfar) override; + virtual void Set_Ortho_Projection(float xmin,float xmax,float ymin,float ymax,float znear,float zfar) override; void Set_Texture(TextureClass * texture); TextureClass * Get_Texture() const; @@ -181,7 +181,7 @@ class TexProjectClass : public ProjectorClass, public CullableClass, public Mult void Set_Flag(uint32 flag,bool onoff); bool Get_Flag(uint32 flag) const; - virtual void Update_WS_Bounding_Volume(); + virtual void Update_WS_Bounding_Volume() override; void Configure_Camera(CameraClass & camera); enum FlagsType diff --git a/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h b/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h index ff76270f796..d26e691bc70 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h @@ -61,19 +61,19 @@ class TextDrawClass : public DynamicMeshClass ** Constructor and Destructor */ TextDrawClass( int max_chars ); - ~TextDrawClass(); + ~TextDrawClass() override; // Set Coordinate Range void Set_Coordinate_Ranges( const Vector2 & param_ul, const Vector2 & param_lr, const Vector2 & dest_ul, const Vector2 & dest_lr ); // Reset all polys and verts - virtual void Reset(); + virtual void Reset() override; /* ** class id of this render object */ - virtual int Class_ID() const { return CLASSID_TEXTDRAW; } + virtual int Class_ID() const override { return CLASSID_TEXTDRAW; } /* ** diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texture.h b/Core/Libraries/Source/WWVegas/WW3D2/texture.h index a2a9baf0e7a..3c810c79f88 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/texture.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/texture.h @@ -96,7 +96,7 @@ class TextureBaseClass : public RefCountClass bool reducible=true ); - virtual ~TextureBaseClass(); + virtual ~TextureBaseClass() override; virtual TexAssetType Get_Asset_Type() const=0; @@ -315,12 +315,12 @@ class TextureClass : public TextureBaseClass ) : TextureBaseClass(width,height,mip_level_count,pool,rendertarget,allow_reduction), TextureFormat(format), Filter(mip_level_count) { } - virtual TexAssetType Get_Asset_Type() const { return TEX_REGULAR; } + virtual TexAssetType Get_Asset_Type() const override { return TEX_REGULAR; } - virtual void Init(); + virtual void Init() override; // Background texture loader will call this when texture has been loaded - virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false); // If the parameter is true, the texture will be flagged as initialised + virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false) override; // If the parameter is true, the texture will be flagged as initialised // Get the surface of one of the mipmap levels (defaults to highest-resolution one) SurfaceClass *Get_Surface_Level(unsigned int level = 0); @@ -331,11 +331,11 @@ class TextureClass : public TextureBaseClass WW3DFormat Get_Texture_Format() const { return TextureFormat; } - virtual void Apply(unsigned int stage); + virtual void Apply(unsigned int stage) override; - virtual unsigned Get_Texture_Memory_Usage() const; + virtual unsigned Get_Texture_Memory_Usage() const override; - virtual TextureClass* As_TextureClass() { return this; } + virtual TextureClass* As_TextureClass() override { return this; } protected: @@ -360,17 +360,17 @@ class ZTextureClass : public TextureBaseClass WW3DZFormat Get_Texture_Format() const { return DepthStencilTextureFormat; } - virtual TexAssetType Get_Asset_Type() const { return TEX_REGULAR; } + virtual TexAssetType Get_Asset_Type() const override { return TEX_REGULAR; } - virtual void Init() {} + virtual void Init() override {} // Background texture loader will call this when texture has been loaded - virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false); // If the parameter is true, the texture will be flagged as initialised + virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false) override; // If the parameter is true, the texture will be flagged as initialised - virtual void Apply(unsigned int stage); + virtual void Apply(unsigned int stage) override; IDirect3DSurface8 *Get_D3D_Surface_Level(unsigned int level = 0); - virtual unsigned Get_Texture_Memory_Usage() const; + virtual unsigned Get_Texture_Memory_Usage() const override; private: @@ -414,11 +414,11 @@ class CubeTextureClass : public TextureClass CubeTextureClass(IDirect3DBaseTexture8* d3d_texture); - virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false); // If the parameter is true, the texture will be flagged as initialised + virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false) override; // If the parameter is true, the texture will be flagged as initialised - virtual TexAssetType Get_Asset_Type() const { return TEX_CUBEMAP; } + virtual TexAssetType Get_Asset_Type() const override { return TEX_CUBEMAP; } - virtual CubeTextureClass* As_CubeTextureClass() { return this; } + virtual CubeTextureClass* As_CubeTextureClass() override { return this; } }; @@ -460,11 +460,11 @@ class VolumeTextureClass : public TextureClass VolumeTextureClass(IDirect3DBaseTexture8* d3d_texture); - virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false); // If the parameter is true, the texture will be flagged as initialised + virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false) override; // If the parameter is true, the texture will be flagged as initialised - virtual TexAssetType Get_Asset_Type() const { return TEX_VOLUME; } + virtual TexAssetType Get_Asset_Type() const override { return TEX_VOLUME; } - virtual VolumeTextureClass* As_VolumeTextureClass() { return this; } + virtual VolumeTextureClass* As_VolumeTextureClass() override { return this; } protected: diff --git a/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp index a2a83eec2cc..f46cffff6ee 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp @@ -235,7 +235,7 @@ static class LoaderThreadClass : public ThreadClass LoaderThreadClass(const char *thread_name = "Texture loader thread") : ThreadClass(thread_name) {} #endif - void Thread_Function(); + virtual void Thread_Function() override; } _TextureLoadThread; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/textureloader.h b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.h index 19a2e370c56..0fe4b1f17eb 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/textureloader.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.h @@ -272,19 +272,19 @@ class CubeTextureLoadTaskClass : public TextureLoadTaskClass public: CubeTextureLoadTaskClass(); - virtual void Destroy (); - virtual void Init (TextureBaseClass *tc, TaskType type, PriorityType priority); - virtual void Deinit (); + virtual void Destroy () override; + virtual void Init (TextureBaseClass *tc, TaskType type, PriorityType priority) override; + virtual void Deinit () override; protected: - virtual bool Begin_Compressed_Load (); - virtual bool Begin_Uncompressed_Load (); + virtual bool Begin_Compressed_Load () override; + virtual bool Begin_Uncompressed_Load () override; - virtual bool Load_Compressed_Mipmap (); + virtual bool Load_Compressed_Mipmap () override; // virtual bool Load_Uncompressed_Mipmap(); - virtual void Lock_Surfaces (); - virtual void Unlock_Surfaces (); + virtual void Lock_Surfaces () override; + virtual void Unlock_Surfaces () override; private: unsigned char* Get_Locked_CubeMap_Surface_Pointer(unsigned int face, unsigned int level); @@ -301,18 +301,18 @@ class VolumeTextureLoadTaskClass : public TextureLoadTaskClass public: VolumeTextureLoadTaskClass(); - virtual void Destroy (); - virtual void Init (TextureBaseClass *tc, TaskType type, PriorityType priority); + virtual void Destroy () override; + virtual void Init (TextureBaseClass *tc, TaskType type, PriorityType priority) override; protected: - virtual bool Begin_Compressed_Load (); - virtual bool Begin_Uncompressed_Load (); + virtual bool Begin_Compressed_Load () override; + virtual bool Begin_Uncompressed_Load () override; - virtual bool Load_Compressed_Mipmap (); + virtual bool Load_Compressed_Mipmap () override; // virtual bool Load_Uncompressed_Mipmap(); - virtual void Lock_Surfaces (); - virtual void Unlock_Surfaces (); + virtual void Lock_Surfaces () override; + virtual void Unlock_Surfaces () override; private: unsigned char* Get_Locked_Volume_Pointer(unsigned int level); diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h b/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h index 465bcc367eb..cc21d126159 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h @@ -96,7 +96,7 @@ class ThumbnailManagerClass : public DLNodeClass unsigned long DateTime; ThumbnailManagerClass(const char* thumbnail_filename); - ~ThumbnailManagerClass(); + virtual ~ThumbnailManagerClass() override; void Remove_From_Hash(ThumbnailClass* thumb); void Insert_To_Hash(ThumbnailClass* thumb); diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h b/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h index c54c3cf7054..0c0ee7cbd3d 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h @@ -126,7 +126,7 @@ class AudibleSoundClass : public SoundSceneObjClass ////////////////////////////////////////////////////////////////////// AudibleSoundClass (const AudibleSoundClass &src); AudibleSoundClass (); - virtual ~AudibleSoundClass (); + virtual ~AudibleSoundClass () override; ////////////////////////////////////////////////////////////////////// // Public operators @@ -143,12 +143,12 @@ class AudibleSoundClass : public SoundSceneObjClass ////////////////////////////////////////////////////////////////////// // Conversion methods ////////////////////////////////////////////////////////////////////// - virtual AudibleSoundClass * As_AudibleSoundClass() { return this; } + virtual AudibleSoundClass * As_AudibleSoundClass() override { return this; } ////////////////////////////////////////////////////////////////////// // Update methods ////////////////////////////////////////////////////////////////////// - virtual bool On_Frame_Update (unsigned int milliseconds); + virtual bool On_Frame_Update (unsigned int milliseconds) override; ////////////////////////////////////////////////////////////////////// // State control methods @@ -235,24 +235,24 @@ class AudibleSoundClass : public SoundSceneObjClass ////////////////////////////////////////////////////////////////////// // Position/direction methods ////////////////////////////////////////////////////////////////////// - virtual void Set_Position (const Vector3 &position); - virtual Vector3 Get_Position () const { return m_Transform.Get_Translation (); } + virtual void Set_Position (const Vector3 &position) override; + virtual Vector3 Get_Position () const override { return m_Transform.Get_Translation (); } - virtual void Set_Listener_Transform (const Matrix3D &tm) { m_ListenerTransform = tm; } - virtual void Set_Transform (const Matrix3D &transform); - virtual Matrix3D Get_Transform () const { return m_Transform; } + virtual void Set_Listener_Transform (const Matrix3D &tm) override { m_ListenerTransform = tm; } + virtual void Set_Transform (const Matrix3D &transform) override; + virtual Matrix3D Get_Transform () const override { return m_Transform; } ////////////////////////////////////////////////////////////////////// // Culling methods ////////////////////////////////////////////////////////////////////// - virtual void Cull_Sound (bool culled = true); - virtual bool Is_Sound_Culled () const { return m_IsCulled; } + virtual void Cull_Sound (bool culled = true) override; + virtual bool Is_Sound_Culled () const override { return m_IsCulled; } ////////////////////////////////////////////////////////////////////// // Scene integration ////////////////////////////////////////////////////////////////////// - virtual void Add_To_Scene (bool start_playing = true); - virtual void Remove_From_Scene (); + virtual void Add_To_Scene (bool start_playing = true) override; + virtual void Remove_From_Scene () override; ////////////////////////////////////////////////////////////////////// // Attenuation settings @@ -261,8 +261,8 @@ class AudibleSoundClass : public SoundSceneObjClass // // This is the distance where the sound can not be heard any longer. (its vol is 0) // - virtual void Set_DropOff_Radius (float radius = 1); - virtual float Get_DropOff_Radius () const { return m_DropOffRadius; } + virtual void Set_DropOff_Radius (float radius = 1) override; + virtual float Get_DropOff_Radius () const override { return m_DropOffRadius; } ////////////////////////////////////////////////////////////////////// // Update methods @@ -287,9 +287,9 @@ class AudibleSoundClass : public SoundSceneObjClass ////////////////////////////////////////////////////////////////////// // From PersistClass ////////////////////////////////////////////////////////////////////// - const PersistFactoryClass & Get_Factory () const; - bool Save (ChunkSaveClass &csave); - bool Load (ChunkLoadClass &cload); + const PersistFactoryClass & Get_Factory () const override; + bool Save (ChunkSaveClass &csave) override; + bool Load (ChunkLoadClass &cload) override; protected: @@ -388,16 +388,16 @@ class AudibleSoundDefinitionClass : public DefinitionClass // Public constructors/destructors ////////////////////////////////////////////////////////////// AudibleSoundDefinitionClass (); - virtual ~AudibleSoundDefinitionClass () { } + virtual ~AudibleSoundDefinitionClass () override { } // From DefinitionClass - virtual uint32 Get_Class_ID () const; + virtual uint32 Get_Class_ID () const override; // From PersistClass - virtual const PersistFactoryClass & Get_Factory () const; - virtual bool Save (ChunkSaveClass &csave); - virtual bool Load (ChunkLoadClass &cload); - virtual PersistClass * Create () const; + virtual const PersistFactoryClass & Get_Factory () const override; + virtual bool Save (ChunkSaveClass &csave) override; + virtual bool Load (ChunkLoadClass &cload) override; + virtual PersistClass * Create () const override; virtual AudibleSoundClass * Create_Sound (int classid_hint) const; // Initialization diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h b/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h index 64f483bc4ba..0e92f856e35 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h @@ -154,7 +154,7 @@ class AudioCallbackListClass : public SimpleDynVecClass< AUDIO_CALLBACK_STRUCT // If object was created but not Init'd, ThreadID will be -1 and Count == 0 // If object was created and Init'd, ThreadID will not be -1. We expect Count to return to 1 after all Pop's - ~ActiveCategoryStackClass() { WWASSERT((ThreadID == -1 && Count == 0) || (ThreadID != -1 && Count == 1)); } + ~ActiveCategoryStackClass() override { WWASSERT((ThreadID == -1 && Count == 0) || (ThreadID != -1 && Count == 1)); } ActiveCategoryStackClass & operator = (const ActiveCategoryStackClass & that); diff --git a/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.h b/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.h index e4f09a93d66..8b5d6288a8c 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.h +++ b/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.h @@ -43,23 +43,23 @@ class RAMFileClass : public FileClass { public: RAMFileClass(void * buffer, int len); - virtual ~RAMFileClass(); + virtual ~RAMFileClass() override; - virtual char const * File_Name() const {return("UNKNOWN");} - virtual char const * Set_Name(char const * ) {return(File_Name());} - virtual int Create(); - virtual int Delete(); - virtual bool Is_Available(int forced=false); - virtual bool Is_Open() const; - virtual int Open(char const * filename, int access=READ); - virtual int Open(int access=READ); - virtual int Read(void * buffer, int size); - virtual int Seek(int pos, int dir=SEEK_CUR); - virtual int Size(); - virtual int Write(void const * buffer, int size); - virtual void Close(); - virtual unsigned long Get_Date_Time() {return(0);} - virtual bool Set_Date_Time(unsigned long ) {return(true);} + virtual char const * File_Name() const override {return("UNKNOWN");} + virtual char const * Set_Name(char const * ) override {return(File_Name());} + virtual int Create() override; + virtual int Delete() override; + virtual bool Is_Available(int forced=false) override; + virtual bool Is_Open() const override; + virtual int Open(char const * filename, int access=READ) override; + virtual int Open(int access=READ) override; + virtual int Read(void * buffer, int size) override; + virtual int Seek(int pos, int dir=SEEK_CUR) override; + virtual int Size() override; + virtual int Write(void const * buffer, int size) override; + virtual void Close() override; + virtual unsigned long Get_Date_Time() override {return(0);} + virtual bool Set_Date_Time(unsigned long ) override {return(true);} virtual void Error(int , int = false, char const * =nullptr) {} virtual void Bias(int start, int length=-1); diff --git a/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.h b/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.h index ace62f5b077..173f547ef7f 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.h +++ b/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.h @@ -81,26 +81,26 @@ class RawFileClass : public FileClass RawFileClass(); RawFileClass (RawFileClass const & f); RawFileClass & operator = (RawFileClass const & f); - virtual ~RawFileClass(); - - virtual char const * File_Name() const; - virtual char const * Set_Name(char const *filename); - virtual int Create(); - virtual int Delete(); - virtual bool Is_Available(int forced=false); - virtual bool Is_Open() const; - virtual int Open(char const *filename, int rights=READ); - virtual int Open(int rights=READ); - virtual int Read(void *buffer, int size); - virtual int Seek(int pos, int dir=SEEK_CUR); - virtual int Size(); - virtual int Write(void const *buffer, int size); - virtual void Close(); - virtual unsigned long Get_Date_Time(); - virtual bool Set_Date_Time(unsigned long datetime); + virtual ~RawFileClass() override; + + virtual char const * File_Name() const override; + virtual char const * Set_Name(char const *filename) override; + virtual int Create() override; + virtual int Delete() override; + virtual bool Is_Available(int forced=false) override; + virtual bool Is_Open() const override; + virtual int Open(char const *filename, int rights=READ) override; + virtual int Open(int rights=READ) override; + virtual int Read(void *buffer, int size) override; + virtual int Seek(int pos, int dir=SEEK_CUR) override; + virtual int Size() override; + virtual int Write(void const *buffer, int size) override; + virtual void Close() override; + virtual unsigned long Get_Date_Time() override; + virtual bool Set_Date_Time(unsigned long datetime) override; virtual void Error(int error, int canretry = false, char const * filename=nullptr); virtual void Bias(int start, int length=-1); - virtual void * Get_File_Handle() { return Handle; } + virtual void * Get_File_Handle() override { return Handle; } virtual void Attach (void *handle, int rights=READ); virtual void Detach (); diff --git a/Core/Libraries/Source/WWVegas/WWLib/Vector.h b/Core/Libraries/Source/WWVegas/WWLib/Vector.h index 5a3da08fdf2..0843cc54f04 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/Vector.h +++ b/Core/Libraries/Source/WWVegas/WWLib/Vector.h @@ -496,10 +496,10 @@ class DynamicVectorClass : public VectorClass bool operator!= (const DynamicVectorClass &src) { return true; } // Change maximum size of vector. - virtual bool Resize(int newsize, T const * array=nullptr); + virtual bool Resize(int newsize, T const * array=nullptr) override; // Resets and frees the vector array. - virtual void Clear() {ActiveCount = 0;VectorClass::Clear();}; + virtual void Clear() override {ActiveCount = 0;VectorClass::Clear();}; // retains the memory but zeros the active count void Reset_Active() { ActiveCount = 0; } @@ -529,8 +529,8 @@ class DynamicVectorClass : public VectorClass // Fetch current growth step rate. int Growth_Step() {return GrowthStep;}; - virtual int ID(T const * ptr) {return(VectorClass::ID(ptr));}; - virtual int ID(T const & ptr); + virtual int ID(T const * ptr) override {return(VectorClass::ID(ptr));}; + virtual int ID(T const & ptr) override; DynamicVectorClass & operator =(DynamicVectorClass const & rvalue) { VectorClass::operator = (rvalue); diff --git a/Core/Libraries/Source/WWVegas/WWLib/XPIPE.h b/Core/Libraries/Source/WWVegas/WWLib/XPIPE.h index 849d7ed3ae5..28b775e30d2 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/XPIPE.h +++ b/Core/Libraries/Source/WWVegas/WWLib/XPIPE.h @@ -50,7 +50,7 @@ class BufferPipe : public Pipe public: BufferPipe(Buffer const & buffer) : BufferPtr(buffer), Index(0) {} BufferPipe(void * buffer, int length) : BufferPtr(buffer, length), Index(0) {} - virtual int Put(void const * source, int slen); + virtual int Put(void const * source, int slen) override; private: Buffer BufferPtr; @@ -72,10 +72,10 @@ class FilePipe : public Pipe public: FilePipe(FileClass * file) : File(file), HasOpened(false) {} FilePipe(FileClass & file) : File(&file), HasOpened(false) {} - virtual ~FilePipe(); + virtual ~FilePipe() override; - virtual int Put(void const * source, int slen); - virtual int End(); + virtual int Put(void const * source, int slen) override; + virtual int End() override; private: FileClass * File; diff --git a/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.h b/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.h index 33f471265f6..f5f86f51138 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.h +++ b/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.h @@ -50,7 +50,7 @@ class BufferStraw : public Straw public: BufferStraw(Buffer const & buffer) : BufferPtr(buffer), Index(0) {} BufferStraw(void const * buffer, int length) : BufferPtr((void*)buffer, length), Index(0) {} - virtual int Get(void * source, int slen); + virtual int Get(void * source, int slen) override; private: Buffer BufferPtr; @@ -72,8 +72,8 @@ class FileStraw : public Straw public: FileStraw(FileClass * file) : File(file), HasOpened(false) {} FileStraw(FileClass & file) : File(&file), HasOpened(false) {} - virtual ~FileStraw(); - virtual int Get(void * source, int slen); + virtual ~FileStraw() override; + virtual int Get(void * source, int slen) override; private: FileClass * File; diff --git a/Core/Libraries/Source/WWVegas/WWLib/b64pipe.h b/Core/Libraries/Source/WWVegas/WWLib/b64pipe.h index 8299247dcf9..a3826485543 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/b64pipe.h +++ b/Core/Libraries/Source/WWVegas/WWLib/b64pipe.h @@ -52,8 +52,8 @@ class Base64Pipe : public Pipe Base64Pipe(CodeControl control) : Control(control), Counter(0) {} - virtual int Flush(); - virtual int Put(void const * source, int slen); + virtual int Flush() override; + virtual int Put(void const * source, int slen) override; private: diff --git a/Core/Libraries/Source/WWVegas/WWLib/b64straw.h b/Core/Libraries/Source/WWVegas/WWLib/b64straw.h index fe24b323235..584b592afb0 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/b64straw.h +++ b/Core/Libraries/Source/WWVegas/WWLib/b64straw.h @@ -51,7 +51,7 @@ class Base64Straw : public Straw } CodeControl; Base64Straw(CodeControl control) : Control(control), Counter(0) {} - virtual int Get(void * source, int slen); + virtual int Get(void * source, int slen) override; private: diff --git a/Core/Libraries/Source/WWVegas/WWLib/bufffile.h b/Core/Libraries/Source/WWVegas/WWLib/bufffile.h index d981e5f42cd..db1a41ba19d 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/bufffile.h +++ b/Core/Libraries/Source/WWVegas/WWLib/bufffile.h @@ -56,12 +56,12 @@ class BufferedFileClass : public RawFileClass BufferedFileClass(); BufferedFileClass (RawFileClass const & f); BufferedFileClass & operator = (BufferedFileClass const & f); - virtual ~BufferedFileClass(); + virtual ~BufferedFileClass() override; - virtual int Read(void *buffer, int size); - virtual int Seek(int pos, int dir=SEEK_CUR); - virtual int Write(void const *buffer, int size); - virtual void Close(); + virtual int Read(void *buffer, int size) override; + virtual int Seek(int pos, int dir=SEEK_CUR) override; + virtual int Write(void const *buffer, int size) override; + virtual void Close() override; protected: diff --git a/Core/Libraries/Source/WWVegas/WWLib/cstraw.h b/Core/Libraries/Source/WWVegas/WWLib/cstraw.h index fd4f24e66e1..f39ec863d38 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/cstraw.h +++ b/Core/Libraries/Source/WWVegas/WWLib/cstraw.h @@ -50,7 +50,7 @@ class CacheStraw : public Straw public: CacheStraw(Buffer const & buffer) : BufferPtr(buffer), Index(0), Length(0) {} CacheStraw(int length=4096) : BufferPtr(length), Index(0), Length(0) {} - virtual int Get(void * source, int slen); + virtual int Get(void * source, int slen) override; private: Buffer BufferPtr; diff --git a/Core/Libraries/Source/WWVegas/WWLib/ffactory.h b/Core/Libraries/Source/WWVegas/WWLib/ffactory.h index 0c99ebb3e81..c7c65fcd3bf 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/ffactory.h +++ b/Core/Libraries/Source/WWVegas/WWLib/ffactory.h @@ -121,10 +121,10 @@ class SimpleFileFactoryClass : public FileFactoryClass { public: SimpleFileFactoryClass(); - ~SimpleFileFactoryClass() {} + ~SimpleFileFactoryClass() override {} - virtual FileClass * Get_File( char const *filename ); - virtual void Return_File( FileClass *file ); + virtual FileClass * Get_File( char const *filename ) override; + virtual void Return_File( FileClass *file ) override; // sub_directory may be a semicolon separated search path. New files will always // go in the last dir in the path. diff --git a/Core/Libraries/Source/WWVegas/WWLib/inisup.h b/Core/Libraries/Source/WWVegas/WWLib/inisup.h index 80837b24a92..98956a4d613 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/inisup.h +++ b/Core/Libraries/Source/WWVegas/WWLib/inisup.h @@ -53,7 +53,7 @@ */ struct INIEntry : public Node { INIEntry(char * entry = nullptr, char * value = nullptr) : Entry(entry), Value(value) {} - ~INIEntry(); + ~INIEntry() override; // ~INIEntry() {free(Entry);Entry = nullptr;free(Value);Value = nullptr;} // int Index_ID() const {return(CRCEngine()(Entry, strlen(Entry)));}; int Index_ID() const { return CRC::String(Entry);}; @@ -68,7 +68,7 @@ struct INIEntry : public Node { */ struct INISection : public Node { INISection(char * section) : Section(section) {} - ~INISection(); + ~INISection() override; // ~INISection() {free(Section);Section = 0;EntryList.Delete();} INIEntry * Find_Entry(char const * entry) const; // int Index_ID() const {return(CRCEngine()(Section, strlen(Section)));}; diff --git a/Core/Libraries/Source/WWVegas/WWLib/rcfile.h b/Core/Libraries/Source/WWVegas/WWLib/rcfile.h index 15966402427..640a16d29be 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/rcfile.h +++ b/Core/Libraries/Source/WWVegas/WWLib/rcfile.h @@ -53,23 +53,23 @@ class ResourceFileClass : public FileClass public: ResourceFileClass(HMODULE hmodule, char const *filename); - virtual ~ResourceFileClass(); + virtual ~ResourceFileClass() override; - virtual char const * File_Name() const { return ResourceName; } - virtual char const * Set_Name(char const *filename); - virtual int Create() { return false; } - virtual int Delete() { return false; } - virtual bool Is_Available(int /*forced=false*/) { return Is_Open (); } - virtual bool Is_Open() const { return (FileBytes != nullptr); } + virtual char const * File_Name() const override { return ResourceName; } + virtual char const * Set_Name(char const *filename) override; + virtual int Create() override { return false; } + virtual int Delete() override { return false; } + virtual bool Is_Available(int /*forced=false*/) override { return Is_Open (); } + virtual bool Is_Open() const override { return (FileBytes != nullptr); } - virtual int Open(char const * /*fname*/, int /*rights=READ*/) { return Is_Open(); } - virtual int Open(int /*rights=READ*/) { return Is_Open(); } + virtual int Open(char const * /*fname*/, int /*rights=READ*/) override { return Is_Open(); } + virtual int Open(int /*rights=READ*/) override { return Is_Open(); } - virtual int Read(void *buffer, int size); - virtual int Seek(int pos, int dir=SEEK_CUR); - virtual int Size(); - virtual int Write(void const * /*buffer*/, int /*size*/) { return 0; } - virtual void Close() { } + virtual int Read(void *buffer, int size) override; + virtual int Seek(int pos, int dir=SEEK_CUR) override; + virtual int Size() override; + virtual int Write(void const * /*buffer*/, int /*size*/) override { return 0; } + virtual void Close() override { } virtual void Error(int error, int canretry = false, char const * filename=nullptr); virtual void Bias(int start, int length=-1) {} diff --git a/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h b/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h index 15e54ca2348..10a3171b6dd 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h +++ b/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h @@ -51,7 +51,7 @@ class ShareBufferClass : public W3DMPO, public RefCountClass public: ShareBufferClass(int count, const char* msg); ShareBufferClass(const ShareBufferClass & that); - ~ShareBufferClass(); + ~ShareBufferClass() override; // Get the internal pointer to the array // CAUTION! This pointer is not refcounted so only use it in a context diff --git a/Core/Libraries/Source/WWVegas/WWLib/simplevec.h b/Core/Libraries/Source/WWVegas/WWLib/simplevec.h index 9e73cbcf380..1bf6dd01af7 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/simplevec.h +++ b/Core/Libraries/Source/WWVegas/WWLib/simplevec.h @@ -252,7 +252,7 @@ template class SimpleDynVecClass : public SimpleVecClass public: SimpleDynVecClass(int size = 0); - virtual ~SimpleDynVecClass(); + virtual ~SimpleDynVecClass() override; // Array-like access (does not grow) int Count() const { return(ActiveCount); } @@ -260,7 +260,7 @@ template class SimpleDynVecClass : public SimpleVecClass T const & operator[](int index) const { assert(index < ActiveCount); return(Vector[index]); } // Change maximum size of vector - virtual bool Resize(int newsize); + virtual bool Resize(int newsize) override; // Add object to vector (growing as necessary). bool Add(T const & object,int new_size_hint = 0); diff --git a/Core/Libraries/Source/WWVegas/WWLib/textfile.h b/Core/Libraries/Source/WWVegas/WWLib/textfile.h index 6f52d4233b9..bf022ffd5c1 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/textfile.h +++ b/Core/Libraries/Source/WWVegas/WWLib/textfile.h @@ -60,7 +60,7 @@ class TextFileClass : public RawFileClass TextFileClass (); TextFileClass (char const *filename); TextFileClass (const TextFileClass &src); - virtual ~TextFileClass (); + virtual ~TextFileClass () override; ///////////////////////////////////////////////////////////////// // Public operators diff --git a/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.h b/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.h index 08f2028b2ae..4385093a502 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.h +++ b/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.h @@ -58,7 +58,7 @@ class AABTreeCullSystemClass : public CullSystemClass public: AABTreeCullSystemClass(); - virtual ~AABTreeCullSystemClass(); + virtual ~AABTreeCullSystemClass() override; /* ** Re-partition the tree. Two methods can be used to accomplish this. The @@ -82,7 +82,7 @@ class AABTreeCullSystemClass : public CullSystemClass /* ** Re-insert an object into the tree */ - virtual void Update_Culling(CullableClass * obj); + virtual void Update_Culling(CullableClass * obj) override; /* ** Statistics about the AAB-Tree @@ -94,10 +94,10 @@ class AABTreeCullSystemClass : public CullSystemClass /* ** Collect objects which overlap the given primitive */ - virtual void Collect_Objects(const Vector3 & point); - virtual void Collect_Objects(const AABoxClass & box); - virtual void Collect_Objects(const OBBoxClass & box); - virtual void Collect_Objects(const FrustumClass & frustum); + virtual void Collect_Objects(const Vector3 & point) override; + virtual void Collect_Objects(const AABoxClass & box) override; + virtual void Collect_Objects(const OBBoxClass & box) override; + virtual void Collect_Objects(const FrustumClass & frustum) override; virtual void Collect_Objects(const SphereClass & sphere); /* diff --git a/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h b/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h index de50056b0c5..3139354af87 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h +++ b/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h @@ -46,19 +46,19 @@ class CardinalSpline3DClass : public HermiteSpline3DClass { public: - virtual int Add_Key(const Vector3 & point,float t); - virtual void Remove_Key(int i); - virtual void Clear_Keys(); + virtual int Add_Key(const Vector3 & point,float t) override; + virtual void Remove_Key(int i) override; + virtual void Clear_Keys() override; virtual void Set_Tightness(int i,float tightness); virtual float Get_Tightness(int i); - virtual void Update_Tangents(); + virtual void Update_Tangents() override; // save-load support - virtual const PersistFactoryClass & Get_Factory() const; - virtual bool Save(ChunkSaveClass &csave); - virtual bool Load(ChunkLoadClass &cload); + virtual const PersistFactoryClass & Get_Factory() const override; + virtual bool Save(ChunkSaveClass &csave) override; + virtual bool Load(ChunkLoadClass &cload) override; protected: @@ -75,18 +75,18 @@ class CardinalSpline1DClass : public HermiteSpline1DClass public: virtual int Add_Key(float point,float t); - virtual void Remove_Key(int i); - virtual void Clear_Keys(); + virtual void Remove_Key(int i) override; + virtual void Clear_Keys() override; virtual void Set_Tightness(int i,float tightness); virtual float Get_Tightness(int i); - virtual void Update_Tangents(); + virtual void Update_Tangents() override; // save-load support - virtual const PersistFactoryClass & Get_Factory() const; - virtual bool Save(ChunkSaveClass &csave); - virtual bool Load(ChunkLoadClass &cload); + virtual const PersistFactoryClass & Get_Factory() const override; + virtual bool Save(ChunkSaveClass &csave) override; + virtual bool Load(ChunkLoadClass &cload) override; protected: diff --git a/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.h b/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.h index 513cbac2c65..76c4d6288d7 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.h +++ b/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.h @@ -45,12 +45,12 @@ class CatmullRomSpline3DClass : public HermiteSpline3DClass { public: - void Update_Tangents(); + void Update_Tangents() override; // save-load support - virtual const PersistFactoryClass & Get_Factory() const; - virtual bool Save(ChunkSaveClass &csave); - virtual bool Load(ChunkLoadClass &cload); + virtual const PersistFactoryClass & Get_Factory() const override; + virtual bool Save(ChunkSaveClass &csave) override; + virtual bool Load(ChunkLoadClass &cload) override; }; @@ -61,10 +61,10 @@ class CatmullRomSpline3DClass : public HermiteSpline3DClass class CatmullRomSpline1DClass : public HermiteSpline1DClass { public: - void Update_Tangents(); + void Update_Tangents() override; // save-load support - virtual const PersistFactoryClass & Get_Factory() const; - virtual bool Save(ChunkSaveClass &csave); - virtual bool Load(ChunkLoadClass &cload); + virtual const PersistFactoryClass & Get_Factory() const override; + virtual bool Save(ChunkSaveClass &csave) override; + virtual bool Load(ChunkLoadClass &cload) override; }; diff --git a/Core/Libraries/Source/WWVegas/WWMath/cullsys.h b/Core/Libraries/Source/WWVegas/WWMath/cullsys.h index f71bffcff3f..5539f7ed164 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/cullsys.h +++ b/Core/Libraries/Source/WWVegas/WWMath/cullsys.h @@ -76,7 +76,7 @@ class CullableClass : public RefCountClass public: CullableClass(); - virtual ~CullableClass(); + virtual ~CullableClass() override; /* ** Access to the culling box for this object. When you set the cull box, you are diff --git a/Core/Libraries/Source/WWVegas/WWMath/curve.h b/Core/Libraries/Source/WWVegas/WWMath/curve.h index 7bc973e48ab..4e65d52e9b8 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/curve.h +++ b/Core/Libraries/Source/WWVegas/WWMath/curve.h @@ -51,7 +51,7 @@ class Curve3DClass : public PersistClass Curve3DClass(); Curve3DClass(const Curve3DClass & that); - virtual ~Curve3DClass(); + virtual ~Curve3DClass() override; Curve3DClass & operator = (const Curve3DClass & that); virtual void Evaluate(float time,Vector3 * set_val) = 0; @@ -67,8 +67,8 @@ class Curve3DClass : public PersistClass float Get_End_Time(); // persistent object support - virtual bool Save (ChunkSaveClass &csave); - virtual bool Load (ChunkLoadClass &cload); + virtual bool Save (ChunkSaveClass &csave) override; + virtual bool Load (ChunkLoadClass &cload) override; protected: @@ -91,12 +91,12 @@ class Curve3DClass : public PersistClass class LinearCurve3DClass : public Curve3DClass { public: - virtual void Evaluate(float time,Vector3 * set_val); + virtual void Evaluate(float time,Vector3 * set_val) override; // persistent object support - virtual const PersistFactoryClass & Get_Factory() const; - virtual bool Save(ChunkSaveClass &csave); - virtual bool Load(ChunkLoadClass &cload); + virtual const PersistFactoryClass & Get_Factory() const override; + virtual bool Save(ChunkSaveClass &csave) override; + virtual bool Load(ChunkLoadClass &cload) override; }; @@ -109,7 +109,7 @@ class Curve1DClass : public PersistClass Curve1DClass(); Curve1DClass(const Curve1DClass & that); - virtual ~Curve1DClass(); + virtual ~Curve1DClass() override; Curve1DClass & operator = (const Curve1DClass & that); virtual void Evaluate(float time,float * set_val) = 0; @@ -125,8 +125,8 @@ class Curve1DClass : public PersistClass float Get_End_Time(); // persistent object support - virtual bool Save (ChunkSaveClass &csave); - virtual bool Load (ChunkLoadClass &cload); + virtual bool Save (ChunkSaveClass &csave) override; + virtual bool Load (ChunkLoadClass &cload) override; protected: @@ -150,10 +150,10 @@ class Curve1DClass : public PersistClass class LinearCurve1DClass : public Curve1DClass { public: - virtual void Evaluate(float time,float * set_val); + virtual void Evaluate(float time,float * set_val) override; // persistent object support - virtual const PersistFactoryClass & Get_Factory() const; - virtual bool Save(ChunkSaveClass &csave); - virtual bool Load(ChunkLoadClass &cload); + virtual const PersistFactoryClass & Get_Factory() const override; + virtual bool Save(ChunkSaveClass &csave) override; + virtual bool Load(ChunkLoadClass &cload) override; }; diff --git a/Core/Libraries/Source/WWVegas/WWMath/gridcull.h b/Core/Libraries/Source/WWVegas/WWMath/gridcull.h index 8af39a0ae76..b9a31080bd4 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/gridcull.h +++ b/Core/Libraries/Source/WWVegas/WWMath/gridcull.h @@ -85,15 +85,15 @@ class GridCullSystemClass : public CullSystemClass public: GridCullSystemClass(); - ~GridCullSystemClass(); + ~GridCullSystemClass() override; - virtual void Collect_Objects(const Vector3 & point); - virtual void Collect_Objects(const AABoxClass & box); - virtual void Collect_Objects(const OBBoxClass & box); - virtual void Collect_Objects(const FrustumClass & frustum); + virtual void Collect_Objects(const Vector3 & point) override; + virtual void Collect_Objects(const AABoxClass & box) override; + virtual void Collect_Objects(const OBBoxClass & box) override; + virtual void Collect_Objects(const FrustumClass & frustum) override; virtual void Re_Partition(const Vector3 & min,const Vector3 & max,float objdim); - virtual void Update_Culling(CullableClass * obj); + virtual void Update_Culling(CullableClass * obj) override; virtual void Load(ChunkLoadClass & cload); virtual void Save(ChunkSaveClass & csave); @@ -245,7 +245,7 @@ class GridLinkClass : public CullLinkClass, public AutoPoolClass *list); DefIDListParameterClass (const DefIDListParameterClass &src); - virtual ~DefIDListParameterClass () {} + virtual ~DefIDListParameterClass () override {} ////////////////////////////////////////////////////////////////////////////// // Public operators ////////////////////////////////////////////////////////////////////////////// const DefIDListParameterClass & operator= (const DefIDListParameterClass &src); bool operator== (const DefIDListParameterClass &src); - bool operator== (const ParameterClass &src); + virtual bool operator== (const ParameterClass &src) override; ////////////////////////////////////////////////////////////////////////////// // Public methods ////////////////////////////////////////////////////////////////////////////// // Type identification - virtual Type Get_Type () const { return TYPE_DEFINITIONIDLIST; } - virtual bool Is_Type (Type type) const { return (type == TYPE_DEFINITIONIDLIST) || ParameterClass::Is_Type (type); } + virtual Type Get_Type () const override { return TYPE_DEFINITIONIDLIST; } + virtual bool Is_Type (Type type) const override { return (type == TYPE_DEFINITIONIDLIST) || ParameterClass::Is_Type (type); } // Data manipulation virtual void Set_Selected_Class_ID (uint32 *id) { m_SelectedClassID = id; } @@ -953,7 +953,7 @@ class DefIDListParameterClass : public ParameterClass virtual DynamicVectorClass &Get_List () const { return (*m_IDList); } // Copy methods - virtual void Copy_Value (const ParameterClass &src); + virtual void Copy_Value (const ParameterClass &src) override; protected: @@ -980,22 +980,22 @@ class ZoneParameterClass : public ParameterClass ////////////////////////////////////////////////////////////////////////////// ZoneParameterClass (OBBoxClass *box); ZoneParameterClass (const ZoneParameterClass &src); - virtual ~ZoneParameterClass () {} + virtual ~ZoneParameterClass () override {} ////////////////////////////////////////////////////////////////////////////// // Public operators ////////////////////////////////////////////////////////////////////////////// const ZoneParameterClass & operator= (const ZoneParameterClass &src); bool operator== (const ZoneParameterClass &src); - bool operator== (const ParameterClass &src); + virtual bool operator== (const ParameterClass &src) override; ////////////////////////////////////////////////////////////////////////////// // Public methods ////////////////////////////////////////////////////////////////////////////// // Type identification - virtual Type Get_Type () const { return TYPE_ZONE; } - virtual bool Is_Type (Type type) const { return (type == TYPE_ZONE) || ParameterClass::Is_Type (type); } + virtual Type Get_Type () const override { return TYPE_ZONE; } + virtual bool Is_Type (Type type) const override { return (type == TYPE_ZONE) || ParameterClass::Is_Type (type); } // Data manipulation virtual void Set_Zone (const OBBoxClass &box) { (*m_OBBox) = box; Set_Modified (); } @@ -1003,7 +1003,7 @@ class ZoneParameterClass : public ParameterClass // Copy methods - virtual void Copy_Value (const ParameterClass &src); + virtual void Copy_Value (const ParameterClass &src) override; protected: @@ -1028,28 +1028,28 @@ class FilenameListParameterClass : public ParameterClass ////////////////////////////////////////////////////////////////////////////// FilenameListParameterClass (DynamicVectorClass *list); FilenameListParameterClass (const FilenameListParameterClass &src); - virtual ~FilenameListParameterClass () {} + virtual ~FilenameListParameterClass () override {} ////////////////////////////////////////////////////////////////////////////// // Public operators ////////////////////////////////////////////////////////////////////////////// const FilenameListParameterClass & operator= (const FilenameListParameterClass &src); bool operator== (const FilenameListParameterClass &src); - bool operator== (const ParameterClass &src); + virtual bool operator== (const ParameterClass &src) override; ////////////////////////////////////////////////////////////////////////////// // Public methods ////////////////////////////////////////////////////////////////////////////// // Type identification - virtual Type Get_Type () const { return TYPE_FILENAMELIST; } - virtual bool Is_Type (Type type) const { return (type == TYPE_FILENAMELIST) || ParameterClass::Is_Type (type); } + virtual Type Get_Type () const override { return TYPE_FILENAMELIST; } + virtual bool Is_Type (Type type) const override { return (type == TYPE_FILENAMELIST) || ParameterClass::Is_Type (type); } // Data manipulation virtual DynamicVectorClass &Get_List () const { return (*m_FilenameList); } // Copy methods - virtual void Copy_Value (const ParameterClass &src); + virtual void Copy_Value (const ParameterClass &src) override; protected: @@ -1075,29 +1075,29 @@ class ScriptListParameterClass : public ParameterClass ////////////////////////////////////////////////////////////////////////////// ScriptListParameterClass (DynamicVectorClass *name_list, DynamicVectorClass *param_list); ScriptListParameterClass (const ScriptListParameterClass &src); - virtual ~ScriptListParameterClass () {} + virtual ~ScriptListParameterClass () override {} ////////////////////////////////////////////////////////////////////////////// // Public operators ////////////////////////////////////////////////////////////////////////////// const ScriptListParameterClass & operator= (const ScriptListParameterClass &src); bool operator== (const ScriptListParameterClass &src); - bool operator== (const ParameterClass &src); + virtual bool operator== (const ParameterClass &src) override; ////////////////////////////////////////////////////////////////////////////// // Public methods ////////////////////////////////////////////////////////////////////////////// // Type identification - virtual Type Get_Type () const { return TYPE_SCRIPTLIST; } - virtual bool Is_Type (Type type) const { return (type == TYPE_SCRIPTLIST) || ParameterClass::Is_Type (type); } + virtual Type Get_Type () const override { return TYPE_SCRIPTLIST; } + virtual bool Is_Type (Type type) const override { return (type == TYPE_SCRIPTLIST) || ParameterClass::Is_Type (type); } // Data manipulation virtual DynamicVectorClass &Get_Name_List () const { return (*m_NameList); } virtual DynamicVectorClass &Get_Param_List () const { return (*m_ParamList); } // Copy methods - virtual void Copy_Value (const ParameterClass &src); + virtual void Copy_Value (const ParameterClass &src) override; protected: @@ -1128,23 +1128,23 @@ class SeparatorParameterClass : public ParameterClass ////////////////////////////////////////////////////////////////////////////// SeparatorParameterClass () {} SeparatorParameterClass (const SeparatorParameterClass &src); - virtual ~SeparatorParameterClass () {} + virtual ~SeparatorParameterClass () override {} ////////////////////////////////////////////////////////////////////////////// // Public operators ////////////////////////////////////////////////////////////////////////////// const SeparatorParameterClass & operator= (const SeparatorParameterClass &src); bool operator== (const SeparatorParameterClass &src); - bool operator== (const ParameterClass &src); + virtual bool operator== (const ParameterClass &src) override; ////////////////////////////////////////////////////////////////////////////// // Public methods ////////////////////////////////////////////////////////////////////////////// // Type identification - virtual Type Get_Type () const { return TYPE_SEPARATOR; } - virtual bool Is_Type (Type type) const { return (type == TYPE_SEPARATOR) || ParameterClass::Is_Type (type); } + virtual Type Get_Type () const override { return TYPE_SEPARATOR; } + virtual bool Is_Type (Type type) const override { return (type == TYPE_SEPARATOR) || ParameterClass::Is_Type (type); } // Copy methods - virtual void Copy_Value (const ParameterClass &src); + virtual void Copy_Value (const ParameterClass &src) override; }; diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h index be03e5ec0e0..f90b2256472 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h @@ -55,7 +55,7 @@ class ParameterListClass : public DynamicVectorClass ///////////////////////////////////////////////////////////////////// // Public constructurs/destructors ///////////////////////////////////////////////////////////////////// - ~ParameterListClass (); + ~ParameterListClass () override; ///////////////////////////////////////////////////////////////////// // Public methods diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.h index 71e3aa7d16c..4cb2f181a54 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.h @@ -81,9 +81,9 @@ template class SimplePersistFactoryClass : public PersistF { public: - virtual uint32 Chunk_ID() const { return CHUNKID; } - virtual PersistClass * Load(ChunkLoadClass & cload) const; - virtual void Save(ChunkSaveClass & csave,PersistClass * obj) const; + virtual uint32 Chunk_ID() const override { return CHUNKID; } + virtual PersistClass * Load(ChunkLoadClass & cload) const override; + virtual void Save(ChunkSaveClass & csave,PersistClass * obj) const override; /* ** Internal chunk id's diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadsubsystem.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadsubsystem.h index 052e4c07f6c..0a1f2b975a7 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadsubsystem.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadsubsystem.h @@ -63,7 +63,7 @@ class SaveLoadSubSystemClass : public PostLoadableClass public: SaveLoadSubSystemClass (); - virtual ~SaveLoadSubSystemClass (); + virtual ~SaveLoadSubSystemClass () override; virtual uint32 Chunk_ID () const = 0; diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h index ea3aba4e541..e9762bbfa12 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h @@ -41,10 +41,10 @@ class SimpleDefinitionFactoryClass : public DefinitionFactoryClass ////////////////////////////////////////////////////////////// // Public methods ////////////////////////////////////////////////////////////// - virtual DefinitionClass * Create () const; - virtual const char * Get_Name () const; - virtual uint32 Get_Class_ID () const; - virtual bool Is_Displayed () const { return IsDisplayed; } + virtual DefinitionClass * Create () const override; + virtual const char * Get_Name () const override; + virtual uint32 Get_Class_ID () const override; + virtual bool Is_Displayed () const override { return IsDisplayed; } protected: diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h index 91b5a676e59..8c4d3d45e28 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h @@ -63,7 +63,7 @@ class SimpleParameterClass : public ParameterClass ////////////////////////////////////////////////////////////////////////////// // Public operators ////////////////////////////////////////////////////////////////////////////// - bool operator== (const ParameterClass &src); + virtual bool operator== (const ParameterClass &src) override; /////////////////////////////////////////////////////////////////////// // Public methods @@ -72,8 +72,8 @@ class SimpleParameterClass : public ParameterClass void Set_Value (const T &new_value); // From Parameter class - ParameterClass::Type Get_Type () const; - void Copy_Value (const ParameterClass &src); + ParameterClass::Type Get_Type () const override; + void Copy_Value (const ParameterClass &src) override; private: diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.h index 55e22eabef7..b82822259b7 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.h @@ -58,7 +58,7 @@ class TwiddlerClass : public DefinitionClass // Public constructors/destructors ///////////////////////////////////////////////////////////////////// TwiddlerClass (); - virtual ~TwiddlerClass (); + virtual ~TwiddlerClass () override; ///////////////////////////////////////////////////////////////////// // Public methods @@ -67,15 +67,15 @@ class TwiddlerClass : public DefinitionClass // // Type identification // - uint32 Get_Class_ID () const { return CLASSID_TWIDDLERS; } - PersistClass * Create () const; + uint32 Get_Class_ID () const override { return CLASSID_TWIDDLERS; } + PersistClass * Create () const override; // // From PersistClass // - bool Save (ChunkSaveClass &csave); - bool Load (ChunkLoadClass &cload); - const PersistFactoryClass & Get_Factory () const; + bool Save (ChunkSaveClass &csave) override; + bool Load (ChunkLoadClass &cload) override; + const PersistFactoryClass & Get_Factory () const override; // // Twiddler specific diff --git a/Core/Libraries/Source/profile/internal_result.h b/Core/Libraries/Source/profile/internal_result.h index 14256fec651..a058ee4fca3 100644 --- a/Core/Libraries/Source/profile/internal_result.h +++ b/Core/Libraries/Source/profile/internal_result.h @@ -39,8 +39,8 @@ class ProfileResultFileCSV: public ProfileResultInterface public: static ProfileResultInterface *Create(int argn, const char * const *); virtual const char *GetName() const { return "file_csv"; } - virtual void WriteResults(); - virtual void Delete(); + virtual void WriteResults() override; + virtual void Delete() override; }; /** @@ -75,8 +75,8 @@ class ProfileResultFileDOT: public ProfileResultInterface static ProfileResultInterface *Create(int argn, const char * const *); virtual const char *GetName() const { return "file_dot"; } - virtual void WriteResults(); - virtual void Delete(); + virtual void WriteResults() override; + virtual void Delete() override; private: diff --git a/Generals/Code/GameEngine/Include/Common/ActionManager.h b/Generals/Code/GameEngine/Include/Common/ActionManager.h index ceaa291b937..cc7d70717cf 100644 --- a/Generals/Code/GameEngine/Include/Common/ActionManager.h +++ b/Generals/Code/GameEngine/Include/Common/ActionManager.h @@ -61,11 +61,11 @@ class ActionManager : public SubsystemInterface public: ActionManager(); - virtual ~ActionManager(); + virtual ~ActionManager() override; - virtual void init() { }; ///< subsystem interface - virtual void reset() { }; ///< subsystem interface - virtual void update() { }; ///< subsystem interface + virtual void init() override { }; ///< subsystem interface + virtual void reset() override { }; ///< subsystem interface + virtual void update() override { }; ///< subsystem interface //Single unit to unit check Bool canGetRepairedAt( const Object *obj, const Object *repairDest, CommandSourceType commandSource ); diff --git a/Generals/Code/GameEngine/Include/Common/BuildAssistant.h b/Generals/Code/GameEngine/Include/Common/BuildAssistant.h index ba99044a14c..f4085fd6cb2 100644 --- a/Generals/Code/GameEngine/Include/Common/BuildAssistant.h +++ b/Generals/Code/GameEngine/Include/Common/BuildAssistant.h @@ -120,11 +120,11 @@ class BuildAssistant : public SubsystemInterface public: BuildAssistant(); - virtual ~BuildAssistant(); + virtual ~BuildAssistant() override; - virtual void init(); ///< for subsytem - virtual void reset(); ///< for subsytem - virtual void update(); ///< for subsytem + virtual void init() override; ///< for subsytem + virtual void reset() override; ///< for subsytem + virtual void update() override; ///< for subsytem /// iterate the "footprint" area of a structure at the given "sample resolution" void iterateFootprint( const ThingTemplate *build, diff --git a/Generals/Code/GameEngine/Include/Common/CustomMatchPreferences.h b/Generals/Code/GameEngine/Include/Common/CustomMatchPreferences.h index d81a656232d..02150c2b980 100644 --- a/Generals/Code/GameEngine/Include/Common/CustomMatchPreferences.h +++ b/Generals/Code/GameEngine/Include/Common/CustomMatchPreferences.h @@ -42,7 +42,7 @@ class CustomMatchPreferences : public UserPreferences { public: CustomMatchPreferences(); - virtual ~CustomMatchPreferences(); + virtual ~CustomMatchPreferences() override; void setLastLadder(const AsciiString& addr, UnsignedShort port); AsciiString getLastLadderAddr(); diff --git a/Generals/Code/GameEngine/Include/Common/DamageFX.h b/Generals/Code/GameEngine/Include/Common/DamageFX.h index d41752782cf..4a1ed99b8d7 100644 --- a/Generals/Code/GameEngine/Include/Common/DamageFX.h +++ b/Generals/Code/GameEngine/Include/Common/DamageFX.h @@ -138,11 +138,11 @@ class DamageFXStore : public SubsystemInterface public: DamageFXStore(); - ~DamageFXStore(); + virtual ~DamageFXStore() override; - void init(); - void reset(); - void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; /** Find the DamageFX with the given name. If no such DamageFX exists, return null. diff --git a/Generals/Code/GameEngine/Include/Common/Energy.h b/Generals/Code/GameEngine/Include/Common/Energy.h index 598a582b103..82b6b1fbc9a 100644 --- a/Generals/Code/GameEngine/Include/Common/Energy.h +++ b/Generals/Code/GameEngine/Include/Common/Energy.h @@ -102,9 +102,9 @@ class Energy : public Snapshot 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; void addProduction(Int amt); void addConsumption(Int amt); diff --git a/Generals/Code/GameEngine/Include/Common/FunctionLexicon.h b/Generals/Code/GameEngine/Include/Common/FunctionLexicon.h index 1fd632d3019..a5e65d2de1b 100644 --- a/Generals/Code/GameEngine/Include/Common/FunctionLexicon.h +++ b/Generals/Code/GameEngine/Include/Common/FunctionLexicon.h @@ -71,11 +71,11 @@ class FunctionLexicon : public SubsystemInterface public: FunctionLexicon(); - virtual ~FunctionLexicon(); + virtual ~FunctionLexicon() override; - virtual void init(); - virtual void reset(); - virtual void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; /// validate the tables and make sure all entries are unique Bool validate(); diff --git a/Generals/Code/GameEngine/Include/Common/GameEngine.h b/Generals/Code/GameEngine/Include/Common/GameEngine.h index de03622b035..786c6fbcaa7 100644 --- a/Generals/Code/GameEngine/Include/Common/GameEngine.h +++ b/Generals/Code/GameEngine/Include/Common/GameEngine.h @@ -55,11 +55,11 @@ class GameEngine : public SubsystemInterface public: GameEngine(); - virtual ~GameEngine(); + virtual ~GameEngine() override; - virtual void init(); ///< Init engine by creating client and logic - virtual void reset(); ///< reset system to starting state - virtual void update(); ///< per frame update + virtual void init() override; ///< Init engine by creating client and logic + virtual void reset() override; ///< reset system to starting state + virtual void update() override; ///< per frame update virtual void execute(); /**< The "main loop" of the game engine. It will not return until the game exits. */ diff --git a/Generals/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h b/Generals/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h index ac5c5cf83d1..7352f5fd7bf 100644 --- a/Generals/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h +++ b/Generals/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h @@ -42,7 +42,7 @@ class GameSpyMiscPreferences : public UserPreferences { public: GameSpyMiscPreferences(); - virtual ~GameSpyMiscPreferences(); + virtual ~GameSpyMiscPreferences() override; Int getLocale(); void setLocale( Int val ); diff --git a/Generals/Code/GameEngine/Include/Common/GameState.h b/Generals/Code/GameEngine/Include/Common/GameState.h index 1c88df7ae0e..20e8910174f 100644 --- a/Generals/Code/GameEngine/Include/Common/GameState.h +++ b/Generals/Code/GameEngine/Include/Common/GameState.h @@ -148,12 +148,12 @@ class GameState : public SubsystemInterface, public: GameState(); - virtual ~GameState(); + virtual ~GameState() override; // subsystem interface - virtual void init(); - virtual void reset(); - virtual void update() { } + virtual void init() override; + virtual void reset() override; + virtual void update() override { } // save game methods SaveCode saveGame( AsciiString filename, @@ -191,9 +191,9 @@ class GameState : public SubsystemInterface, 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 { } private: diff --git a/Generals/Code/GameEngine/Include/Common/GameStateMap.h b/Generals/Code/GameEngine/Include/Common/GameStateMap.h index 2b7857c79be..f76cd216088 100644 --- a/Generals/Code/GameEngine/Include/Common/GameStateMap.h +++ b/Generals/Code/GameEngine/Include/Common/GameStateMap.h @@ -45,17 +45,17 @@ class GameStateMap : public SubsystemInterface, public: GameStateMap(); - virtual ~GameStateMap(); + virtual ~GameStateMap() override; // subsystem interface methods - virtual void init() { } - virtual void reset() { } - virtual void update() { } + virtual void init() override { } + virtual void reset() override { } + virtual void update() override { } // 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 { } void clearScratchPadMaps(); ///< clear any scratch pad maps from the save directory diff --git a/Generals/Code/GameEngine/Include/Common/Geometry.h b/Generals/Code/GameEngine/Include/Common/Geometry.h index bf6210efd01..88dcd9555d2 100644 --- a/Generals/Code/GameEngine/Include/Common/Geometry.h +++ b/Generals/Code/GameEngine/Include/Common/Geometry.h @@ -97,9 +97,9 @@ class GeometryInfo : public Snapshot 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; public: diff --git a/Generals/Code/GameEngine/Include/Common/GlobalData.h b/Generals/Code/GameEngine/Include/Common/GlobalData.h index 7974dd6486f..f6a765be664 100644 --- a/Generals/Code/GameEngine/Include/Common/GlobalData.h +++ b/Generals/Code/GameEngine/Include/Common/GlobalData.h @@ -80,11 +80,11 @@ class GlobalData : public SubsystemInterface public: GlobalData(); - virtual ~GlobalData(); + virtual ~GlobalData() override; - virtual void init(); - virtual void reset(); - virtual void update() { } + virtual void init() override; + virtual void reset() override; + virtual void update() override { } Bool setTimeOfDay( TimeOfDay tod ); ///< Use this function to set the Time of day; diff --git a/Generals/Code/GameEngine/Include/Common/IgnorePreferences.h b/Generals/Code/GameEngine/Include/Common/IgnorePreferences.h index eb9427ba583..2f5aba7d6e8 100644 --- a/Generals/Code/GameEngine/Include/Common/IgnorePreferences.h +++ b/Generals/Code/GameEngine/Include/Common/IgnorePreferences.h @@ -66,7 +66,7 @@ class IgnorePreferences : public UserPreferences { public: IgnorePreferences(); - virtual ~IgnorePreferences(); + virtual ~IgnorePreferences() override; void setIgnore(const AsciiString& userName, Int profileID, Bool ignore); IgnorePrefMap getIgnores(); diff --git a/Generals/Code/GameEngine/Include/Common/LadderPreferences.h b/Generals/Code/GameEngine/Include/Common/LadderPreferences.h index 37c8de60994..d95e57a4836 100644 --- a/Generals/Code/GameEngine/Include/Common/LadderPreferences.h +++ b/Generals/Code/GameEngine/Include/Common/LadderPreferences.h @@ -62,10 +62,10 @@ class LadderPreferences : public UserPreferences { public: LadderPreferences(); - virtual ~LadderPreferences(); + virtual ~LadderPreferences() override; Bool loadProfile( Int profileID ); - virtual bool write(); + virtual bool write() override; const LadderPrefMap& getRecentLadders(); void addRecentLadder( LadderPref ladder ); diff --git a/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h b/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h index e814a34c8f9..9089411e091 100644 --- a/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h +++ b/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h @@ -70,7 +70,7 @@ class InputStream { variety of sources, such as FILE* or CFile. */ class ChunkInputStream : public InputStream{ public: - virtual Int read(void *pData, Int numBytes) = 0; + virtual Int read(void *pData, Int numBytes) override = 0; virtual UnsignedInt tell() = 0; virtual Bool absoluteSeek(UnsignedInt pos) = 0; virtual Bool eof() = 0; @@ -88,10 +88,10 @@ class CachedFileInputStream : public ChunkInputStream ~CachedFileInputStream(); Bool open(AsciiString path); ///< Returns true if open succeeded. void close(); ///< Explict close. Destructor closes if file is left open. - virtual Int read(void *pData, Int numBytes); - virtual UnsignedInt tell(); - virtual Bool absoluteSeek(UnsignedInt pos); - virtual Bool eof(); + virtual Int read(void *pData, Int numBytes) override; + virtual UnsignedInt tell() override; + virtual Bool absoluteSeek(UnsignedInt pos) override; + virtual Bool eof() override; void rewind(); }; diff --git a/Generals/Code/GameEngine/Include/Common/MessageStream.h b/Generals/Code/GameEngine/Include/Common/MessageStream.h index a8b937ef538..ea027fbf9eb 100644 --- a/Generals/Code/GameEngine/Include/Common/MessageStream.h +++ b/Generals/Code/GameEngine/Include/Common/MessageStream.h @@ -667,11 +667,11 @@ class GameMessageList : public SubsystemInterface public: GameMessageList(); - virtual ~GameMessageList(); + virtual ~GameMessageList() override; - virtual void init() { }; ///< Initialize system - virtual void reset() { }; ///< Reset system - virtual void update() { }; ///< Update system + virtual void init() override { }; ///< Initialize system + virtual void reset() override { }; ///< Reset system + virtual void update() override { }; ///< Update system GameMessage *getFirstMessage() { return m_firstMessage; } ///< Return the first message @@ -714,12 +714,12 @@ class MessageStream : public GameMessageList public: MessageStream(); - virtual ~MessageStream(); + virtual ~MessageStream() override; // Inherited Methods ---------------------------------------------------------------------------- - virtual void init(); - virtual void reset(); - virtual void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; virtual GameMessage *appendMessage( GameMessage::Type type ); ///< Append a message to the end of the stream virtual GameMessage *insertMessage( GameMessage::Type type, GameMessage *messageToInsertAfter ); // Insert message after messageToInsertAfter. @@ -770,11 +770,11 @@ class CommandList : public GameMessageList { public: CommandList(); - virtual ~CommandList(); + virtual ~CommandList() override; - virtual void init(); ///< Init command list - virtual void reset(); ///< Destroy all messages and reset list to empty - virtual void update(); ///< Update hook + virtual void init() override; ///< Init command list + virtual void reset() override; ///< Destroy all messages and reset list to empty + virtual void update() override; ///< Update hook void appendMessageList( GameMessage *list ); ///< Adds messages to the end of the command list diff --git a/Generals/Code/GameEngine/Include/Common/MissionStats.h b/Generals/Code/GameEngine/Include/Common/MissionStats.h index 35e3094a65b..711e2de5104 100644 --- a/Generals/Code/GameEngine/Include/Common/MissionStats.h +++ b/Generals/Code/GameEngine/Include/Common/MissionStats.h @@ -70,9 +70,9 @@ class MissionStats : public Snapshot 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; private: diff --git a/Generals/Code/GameEngine/Include/Common/Module.h b/Generals/Code/GameEngine/Include/Common/Module.h index c00a317d06c..2f76cc32aba 100644 --- a/Generals/Code/GameEngine/Include/Common/Module.h +++ b/Generals/Code/GameEngine/Include/Common/Module.h @@ -117,9 +117,9 @@ class ModuleData : public Snapshot } public: - 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 {} private: NameKeyType m_moduleTagNameKey; ///< module tag key, unique among all modules for an object instance @@ -213,9 +213,9 @@ class Module : public MemoryPoolObject, const ModuleData* getModuleData() const { return m_moduleData; } - 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; private: const ModuleData* m_moduleData; @@ -251,9 +251,9 @@ class ObjectModule : public Module Object *getObject() { return m_object; } const Object *getObject() const { return m_object; } - 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; private: @@ -294,9 +294,9 @@ class DrawableModule : public Module Drawable *getDrawable() { return m_drawable; } const Drawable *getDrawable() const { return m_drawable; } - 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; private: diff --git a/Generals/Code/GameEngine/Include/Common/ModuleFactory.h b/Generals/Code/GameEngine/Include/Common/ModuleFactory.h index 2b7a11ea603..4a16d318cda 100644 --- a/Generals/Code/GameEngine/Include/Common/ModuleFactory.h +++ b/Generals/Code/GameEngine/Include/Common/ModuleFactory.h @@ -68,11 +68,11 @@ class ModuleFactory : public SubsystemInterface, public Snapshot public: ModuleFactory(); - virtual ~ModuleFactory(); + virtual ~ModuleFactory() override; - virtual void init(); - virtual void reset() { } ///< We don't reset during the lifetime of the app - virtual void update() { } ///< As of now, we don't have a need for an update + virtual void init() override; + virtual void reset() override { } ///< We don't reset during the lifetime of the app + virtual void update() override { } ///< As of now, we don't have a need for an update Module *newModule( Thing *thing, const AsciiString& name, const ModuleData* data, ModuleType type ); ///< allocate a new module @@ -81,9 +81,9 @@ class ModuleFactory : public SubsystemInterface, public Snapshot Int findModuleInterfaceMask(const AsciiString& name, ModuleType type); - 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: diff --git a/Generals/Code/GameEngine/Include/Common/Money.h b/Generals/Code/GameEngine/Include/Common/Money.h index 691252a5c99..e6cc314e59f 100644 --- a/Generals/Code/GameEngine/Include/Common/Money.h +++ b/Generals/Code/GameEngine/Include/Common/Money.h @@ -99,9 +99,9 @@ class Money : public Snapshot void triggerAudioEvent(const AudioEventRTS& audioEvent); // 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; private: diff --git a/Generals/Code/GameEngine/Include/Common/MultiplayerSettings.h b/Generals/Code/GameEngine/Include/Common/MultiplayerSettings.h index ea03462ceb9..80a45400fed 100644 --- a/Generals/Code/GameEngine/Include/Common/MultiplayerSettings.h +++ b/Generals/Code/GameEngine/Include/Common/MultiplayerSettings.h @@ -80,9 +80,9 @@ class MultiplayerSettings : public SubsystemInterface MultiplayerSettings(); - virtual void init() { } - virtual void update() { } - virtual void reset() { } + virtual void init() override { } + virtual void update() override { } + virtual void reset() override { } //----------------------------------------------------------------------------------------------- static const FieldParse m_multiplayerSettingsFieldParseTable[]; ///< the parse table for INI definition diff --git a/Generals/Code/GameEngine/Include/Common/NameKeyGenerator.h b/Generals/Code/GameEngine/Include/Common/NameKeyGenerator.h index 5a5ed8a3693..bc1b617c66c 100644 --- a/Generals/Code/GameEngine/Include/Common/NameKeyGenerator.h +++ b/Generals/Code/GameEngine/Include/Common/NameKeyGenerator.h @@ -83,11 +83,11 @@ class NameKeyGenerator : public SubsystemInterface public: NameKeyGenerator(); - virtual ~NameKeyGenerator(); + virtual ~NameKeyGenerator() override; - virtual void init(); - virtual void reset(); - virtual void update() { } + virtual void init() override; + virtual void reset() override; + virtual void update() override { } /// Given a string, convert into a unique integer key. NameKeyType nameToKey(const AsciiString& name); diff --git a/Generals/Code/GameEngine/Include/Common/Player.h b/Generals/Code/GameEngine/Include/Common/Player.h index cf37308e704..849d5bff92e 100644 --- a/Generals/Code/GameEngine/Include/Common/Player.h +++ b/Generals/Code/GameEngine/Include/Common/Player.h @@ -165,9 +165,9 @@ class PlayerRelationMap : public MemoryPoolObject, protected: - 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; }; @@ -695,9 +695,9 @@ class Player : public Snapshot 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; void deleteUpgradeList(); ///< delete all our upgrades diff --git a/Generals/Code/GameEngine/Include/Common/PlayerList.h b/Generals/Code/GameEngine/Include/Common/PlayerList.h index c446486d8f7..f2c2b3622f7 100644 --- a/Generals/Code/GameEngine/Include/Common/PlayerList.h +++ b/Generals/Code/GameEngine/Include/Common/PlayerList.h @@ -77,12 +77,12 @@ class PlayerList : public SubsystemInterface, public: PlayerList(); - ~PlayerList(); + virtual ~PlayerList() override; // subsystem methods - virtual void init(); - virtual void reset(); - virtual void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; virtual void newGame(); // called during GameLogic::startNewGame() virtual void newMap(); // Called after a new map is loaded. @@ -153,9 +153,9 @@ class PlayerList : public SubsystemInterface, 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; private: diff --git a/Generals/Code/GameEngine/Include/Common/PlayerTemplate.h b/Generals/Code/GameEngine/Include/Common/PlayerTemplate.h index 981335e1dcb..2f69328a42e 100644 --- a/Generals/Code/GameEngine/Include/Common/PlayerTemplate.h +++ b/Generals/Code/GameEngine/Include/Common/PlayerTemplate.h @@ -190,11 +190,11 @@ class PlayerTemplateStore : public SubsystemInterface public: PlayerTemplateStore(); - ~PlayerTemplateStore(); + virtual ~PlayerTemplateStore() override; - virtual void init(); - virtual void reset(); - virtual void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; static void parsePlayerTemplateDefinition( INI* ini ); diff --git a/Generals/Code/GameEngine/Include/Common/QuickmatchPreferences.h b/Generals/Code/GameEngine/Include/Common/QuickmatchPreferences.h index 7bb587523c7..802c5a8fc37 100644 --- a/Generals/Code/GameEngine/Include/Common/QuickmatchPreferences.h +++ b/Generals/Code/GameEngine/Include/Common/QuickmatchPreferences.h @@ -42,7 +42,7 @@ class QuickMatchPreferences : public UserPreferences { public: QuickMatchPreferences(); - virtual ~QuickMatchPreferences(); + virtual ~QuickMatchPreferences() override; void setMapSelected(const AsciiString& mapName, Bool selected); Bool isMapSelected(const AsciiString& mapName); diff --git a/Generals/Code/GameEngine/Include/Common/Recorder.h b/Generals/Code/GameEngine/Include/Common/Recorder.h index a7833e9eef8..47a1a3429e0 100644 --- a/Generals/Code/GameEngine/Include/Common/Recorder.h +++ b/Generals/Code/GameEngine/Include/Common/Recorder.h @@ -61,11 +61,11 @@ class RecorderClass : public SubsystemInterface { public: RecorderClass(); ///< Constructor. - virtual ~RecorderClass(); ///< Destructor. + virtual ~RecorderClass() override; ///< Destructor. - void init(); ///< Initialize TheRecorder. - void reset(); ///< Reset the state of TheRecorder. - void update(); ///< General purpose update function. + virtual void init() override; ///< Initialize TheRecorder. + virtual void reset() override; ///< Reset the state of TheRecorder. + virtual void update() override; ///< General purpose update function. // Methods dealing with recording. void updateRecord(); ///< The update function for recording. diff --git a/Generals/Code/GameEngine/Include/Common/ResourceGatheringManager.h b/Generals/Code/GameEngine/Include/Common/ResourceGatheringManager.h index 7ffceb98389..5fb0aeba684 100644 --- a/Generals/Code/GameEngine/Include/Common/ResourceGatheringManager.h +++ b/Generals/Code/GameEngine/Include/Common/ResourceGatheringManager.h @@ -56,9 +56,9 @@ class ResourceGatheringManager : public MemoryPoolObject, 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; private: /// @todo Make sure the allocator for std::list<> is a good one. Otherwise override it. diff --git a/Generals/Code/GameEngine/Include/Common/Science.h b/Generals/Code/GameEngine/Include/Common/Science.h index f5565c6d5c6..ac1f6014f97 100644 --- a/Generals/Code/GameEngine/Include/Common/Science.h +++ b/Generals/Code/GameEngine/Include/Common/Science.h @@ -78,11 +78,11 @@ class ScienceStore : public SubsystemInterface friend class ScienceInfo; public: - virtual ~ScienceStore(); + virtual ~ScienceStore() override; - void init(); - void reset(); - void update() { } + virtual void init() override; + virtual void reset() override; + virtual void update() override { } Bool isValidScience(ScienceType st) const; diff --git a/Generals/Code/GameEngine/Include/Common/ScoreKeeper.h b/Generals/Code/GameEngine/Include/Common/ScoreKeeper.h index 8c0f4bbac84..3f01a0f511c 100644 --- a/Generals/Code/GameEngine/Include/Common/ScoreKeeper.h +++ b/Generals/Code/GameEngine/Include/Common/ScoreKeeper.h @@ -99,9 +99,9 @@ class ScoreKeeper : public Snapshot 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; private: diff --git a/Generals/Code/GameEngine/Include/Common/SkirmishBattleHonors.h b/Generals/Code/GameEngine/Include/Common/SkirmishBattleHonors.h index 9c8967db9c2..43190b8dd00 100644 --- a/Generals/Code/GameEngine/Include/Common/SkirmishBattleHonors.h +++ b/Generals/Code/GameEngine/Include/Common/SkirmishBattleHonors.h @@ -47,7 +47,7 @@ class SkirmishBattleHonors : public UserPreferences { public: SkirmishBattleHonors(); - virtual ~SkirmishBattleHonors(); + virtual ~SkirmishBattleHonors() override; Bool loadFromIniFile(); diff --git a/Generals/Code/GameEngine/Include/Common/SkirmishPreferences.h b/Generals/Code/GameEngine/Include/Common/SkirmishPreferences.h index 75d7a1f567d..f6f0526c356 100644 --- a/Generals/Code/GameEngine/Include/Common/SkirmishPreferences.h +++ b/Generals/Code/GameEngine/Include/Common/SkirmishPreferences.h @@ -42,11 +42,11 @@ class SkirmishPreferences : public UserPreferences { public: SkirmishPreferences(); - virtual ~SkirmishPreferences(); + virtual ~SkirmishPreferences() override; Bool loadFromIniFile(); - virtual Bool write(); + virtual Bool write() override; AsciiString getSlotList(); void setSlotList(); UnicodeString getUserName(); // convenience function diff --git a/Generals/Code/GameEngine/Include/Common/SpecialPower.h b/Generals/Code/GameEngine/Include/Common/SpecialPower.h index a460734e2a6..68423082bc5 100644 --- a/Generals/Code/GameEngine/Include/Common/SpecialPower.h +++ b/Generals/Code/GameEngine/Include/Common/SpecialPower.h @@ -154,11 +154,11 @@ class SpecialPowerStore : public SubsystemInterface public: SpecialPowerStore(); - ~SpecialPowerStore(); + ~SpecialPowerStore() override; - virtual void init() { }; - virtual void update() { }; - virtual void reset(); + virtual void init() override { }; + virtual void update() override { }; + virtual void reset() override; const SpecialPowerTemplate *findSpecialPowerTemplate( AsciiString name ) { return findSpecialPowerTemplatePrivate(name); } const SpecialPowerTemplate *findSpecialPowerTemplateByID( UnsignedInt id ); diff --git a/Generals/Code/GameEngine/Include/Common/StateMachine.h b/Generals/Code/GameEngine/Include/Common/StateMachine.h index f211be85bee..ba14683436c 100644 --- a/Generals/Code/GameEngine/Include/Common/StateMachine.h +++ b/Generals/Code/GameEngine/Include/Common/StateMachine.h @@ -185,9 +185,9 @@ class State : public MemoryPoolObject, public Snapshot // Essentially all the member data gets set up on creation and shouldn't change. // So none of it needs to be saved, and it nicely forces all user states to // remember to implement crc, xfer & loadPostProcess. jba - virtual void crc( Xfer *xfer )=0; - virtual void xfer( Xfer *xfer )=0; - virtual void loadPostProcess()=0; + virtual void crc( Xfer *xfer ) override =0; + virtual void xfer( Xfer *xfer ) override =0; + virtual void loadPostProcess() override =0; private: @@ -334,9 +334,9 @@ class StateMachine : public MemoryPoolObject, public Snapshot protected: // snapshot interface - 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: @@ -402,13 +402,13 @@ class SuccessState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SuccessState, "SuccessState") public: SuccessState( StateMachine *machine ) : State( machine, "SuccessState") { } - virtual StateReturnType onEnter() { return STATE_SUCCESS; } - virtual StateReturnType update() { return STATE_SUCCESS; } + virtual StateReturnType onEnter() override { return STATE_SUCCESS; } + virtual StateReturnType update() override { return STATE_SUCCESS; } protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; }; EMPTY_DTOR(SuccessState) @@ -422,13 +422,13 @@ class FailureState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FailureState, "FailureState") public: FailureState( StateMachine *machine ) : State( machine, "FailureState") { } - virtual StateReturnType onEnter() { return STATE_FAILURE; } - virtual StateReturnType update() { return STATE_FAILURE; } + virtual StateReturnType onEnter() override { return STATE_FAILURE; } + virtual StateReturnType update() override { return STATE_FAILURE; } protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; }; EMPTY_DTOR(FailureState) @@ -442,13 +442,13 @@ class ContinueState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ContinueState, "ContinueState") public: ContinueState( StateMachine *machine ) : State( machine, "ContinueState" ) { } - virtual StateReturnType onEnter() { return STATE_CONTINUE; } - virtual StateReturnType update() { return STATE_CONTINUE; } + virtual StateReturnType onEnter() override { return STATE_CONTINUE; } + virtual StateReturnType update() override { return STATE_CONTINUE; } protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; }; EMPTY_DTOR(ContinueState) @@ -462,13 +462,13 @@ class SleepState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SleepState, "SleepState") public: SleepState( StateMachine *machine ) : State( machine, "SleepState" ) { } - virtual StateReturnType onEnter() { return STATE_SLEEP_FOREVER; } - virtual StateReturnType update() { return STATE_SLEEP_FOREVER; } + virtual StateReturnType onEnter() override { return STATE_SLEEP_FOREVER; } + virtual StateReturnType update() override { return STATE_SLEEP_FOREVER; } protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; }; EMPTY_DTOR(SleepState) diff --git a/Generals/Code/GameEngine/Include/Common/Team.h b/Generals/Code/GameEngine/Include/Common/Team.h index e74d8d702ed..655979d48d8 100644 --- a/Generals/Code/GameEngine/Include/Common/Team.h +++ b/Generals/Code/GameEngine/Include/Common/Team.h @@ -60,9 +60,9 @@ class TeamRelationMap : public MemoryPoolObject, protected: - 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; }; @@ -168,9 +168,9 @@ class TeamTemplateInfo : public Snapshot 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; }; @@ -233,9 +233,9 @@ class Team : public MemoryPoolObject, 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; public: @@ -635,9 +635,9 @@ class TeamPrototype : public MemoryPoolObject, 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; private: @@ -680,12 +680,12 @@ class TeamFactory : public SubsystemInterface, public: TeamFactory(); - ~TeamFactory(); + virtual ~TeamFactory() override; // subsystem methods - virtual void init(); - virtual void reset(); - virtual void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; void clear(); void initFromSides(SidesList *sides); @@ -727,9 +727,9 @@ class TeamFactory : public SubsystemInterface, 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; private: diff --git a/Generals/Code/GameEngine/Include/Common/TerrainTypes.h b/Generals/Code/GameEngine/Include/Common/TerrainTypes.h index 75f1935ef00..4e98f1ac7a4 100644 --- a/Generals/Code/GameEngine/Include/Common/TerrainTypes.h +++ b/Generals/Code/GameEngine/Include/Common/TerrainTypes.h @@ -213,11 +213,11 @@ class TerrainTypeCollection : public SubsystemInterface public: TerrainTypeCollection(); - ~TerrainTypeCollection(); + ~TerrainTypeCollection() override; - void init() { } - void reset() { } - void update() { } + virtual void init() override { } + virtual void reset() override { } + virtual void update() override { } TerrainType *findTerrain( AsciiString name ); ///< find terrain by name TerrainType *newTerrain( AsciiString name ); ///< allocate a new terrain diff --git a/Generals/Code/GameEngine/Include/Common/ThingFactory.h b/Generals/Code/GameEngine/Include/Common/ThingFactory.h index 523ff918846..b65e08460ad 100644 --- a/Generals/Code/GameEngine/Include/Common/ThingFactory.h +++ b/Generals/Code/GameEngine/Include/Common/ThingFactory.h @@ -54,13 +54,13 @@ class ThingFactory : public SubsystemInterface public: ThingFactory(); - virtual ~ThingFactory(); + virtual ~ThingFactory() override; // From the subsystem interface ================================================================= - 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; //=============================================================================================== /// create a new template with name 'name' and add to template list diff --git a/Generals/Code/GameEngine/Include/Common/TunnelTracker.h b/Generals/Code/GameEngine/Include/Common/TunnelTracker.h index c710223f9a9..926a4dfbf5d 100644 --- a/Generals/Code/GameEngine/Include/Common/TunnelTracker.h +++ b/Generals/Code/GameEngine/Include/Common/TunnelTracker.h @@ -75,9 +75,9 @@ class TunnelTracker : public MemoryPoolObject, protected: - 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; private: void updateFullHealTime(); diff --git a/Generals/Code/GameEngine/Include/Common/Upgrade.h b/Generals/Code/GameEngine/Include/Common/Upgrade.h index 85194b6daab..747c7fddeed 100644 --- a/Generals/Code/GameEngine/Include/Common/Upgrade.h +++ b/Generals/Code/GameEngine/Include/Common/Upgrade.h @@ -130,9 +130,9 @@ class Upgrade : public MemoryPoolObject, 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; const UpgradeTemplate *m_template; ///< template this upgrade instance is based on UpgradeStatusType m_status; ///< status of upgrade @@ -228,11 +228,11 @@ class UpgradeCenter : public SubsystemInterface public: UpgradeCenter(); - virtual ~UpgradeCenter(); + virtual ~UpgradeCenter() override; - void init(); ///< subsystem interface - void reset(); ///< subsystem interface - void update() { } ///< subsystem interface + void init() override; ///< subsystem interface + void reset() override; ///< subsystem interface + void update() override { } ///< subsystem interface UpgradeTemplate *firstUpgradeTemplate(); ///< return the first upgrade template const UpgradeTemplate *findUpgradeByKey( NameKeyType key ) const; ///< find upgrade by name key diff --git a/Generals/Code/GameEngine/Include/GameClient/Anim2D.h b/Generals/Code/GameEngine/Include/GameClient/Anim2D.h index b6663a3c638..fc19631f91f 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Anim2D.h +++ b/Generals/Code/GameEngine/Include/GameClient/Anim2D.h @@ -167,9 +167,9 @@ friend class Anim2DCollection; 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 { } void tryNextFrame(); ///< we've just drawn ... try to update our frame if necessary @@ -196,11 +196,11 @@ class Anim2DCollection : public SubsystemInterface public: Anim2DCollection(); - virtual ~Anim2DCollection(); + virtual ~Anim2DCollection() override; - virtual void init(); ///< initialize system - virtual void reset() { }; ///< reset system - virtual void update(); ///< update system + virtual void init() override; ///< initialize system + virtual void reset() override { }; ///< reset system + virtual void update() override; ///< update system Anim2DTemplate *findTemplate( const AsciiString& name ); ///< find animation template Anim2DTemplate *newTemplate( const AsciiString& name ); ///< allocate a new template to be loaded diff --git a/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h b/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h index ebf6885a0ca..1d5f1ac6db3 100644 --- a/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h +++ b/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h @@ -163,12 +163,12 @@ class AnimateWindowManager : public SubsystemInterface { public: AnimateWindowManager(); - ~AnimateWindowManager(); + ~AnimateWindowManager() override; // Inhertited from subsystem ==================================================================== - virtual void init(); - virtual void reset(); - virtual void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; //=============================================================================================== void registerGameWindow(GameWindow *win, AnimTypes animType, Bool needsToFinish, UnsignedInt ms = 0, UnsignedInt delayMs = 0); // Registers a new window to animate. diff --git a/Generals/Code/GameEngine/Include/GameClient/CampaignManager.h b/Generals/Code/GameEngine/Include/GameClient/CampaignManager.h index 893e045e01f..f9072f6bb71 100644 --- a/Generals/Code/GameEngine/Include/GameClient/CampaignManager.h +++ b/Generals/Code/GameEngine/Include/GameClient/CampaignManager.h @@ -115,9 +115,9 @@ class CampaignManager : public Snapshot ~CampaignManager(); // 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 { } void init(); Campaign *getCurrentCampaign(); ///< Returns a point to the current Campaign diff --git a/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h b/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h index 41e256dfc98..fec363bbc59 100644 --- a/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h +++ b/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h @@ -37,7 +37,7 @@ class CommandTranslator : public GameMessageTranslator public: CommandTranslator(); - ~CommandTranslator(); + virtual ~CommandTranslator() override; enum CommandEvaluateType { DO_COMMAND, DO_HINT, EVALUATE_ONLY }; @@ -65,7 +65,7 @@ class CommandTranslator : public GameMessageTranslator GameMessage::Type issueFireWeaponCommand( const CommandButton *command, CommandEvaluateType commandType, Drawable *target, const Coord3D *pos ); GameMessage::Type issueCombatDropCommand( const CommandButton *command, CommandEvaluateType commandType, Drawable *target, const Coord3D *pos ); - virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); + virtual GameMessageDisposition translateGameMessage(const GameMessage *msg) override; }; diff --git a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h index c5a2d7c5e16..89f0a46ddaa 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h +++ b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h @@ -632,11 +632,11 @@ class ControlBar : public SubsystemInterface public: ControlBar(); - virtual ~ControlBar(); + virtual ~ControlBar() override; - virtual void init(); ///< from subsystem interface - virtual void reset(); ///< from subsystem interface - virtual void update(); ///< from subsystem interface + virtual void init() override; ///< from subsystem interface + virtual void reset() override; ///< from subsystem interface + virtual void update() override; ///< from subsystem interface /// mark the UI as dirty so the context of everything is re-evaluated void markUIDirty(); diff --git a/Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h b/Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h index 44ab0e7d20d..f9137491d8f 100644 --- a/Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h +++ b/Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h @@ -110,18 +110,18 @@ class DebugDisplay : public DebugDisplayInterface public: DebugDisplay(); - virtual ~DebugDisplay() {}; - - virtual void printf( const Char *format, ...); ///< Print formatted text at current cursor position - virtual void setCursorPos( Int x, Int y ); ///< Set new cursor position - virtual Int getCursorXPos(); ///< Get current X position of cursor - virtual Int getCursorYPos(); ///< Get current Y position of cursor - virtual Int getWidth(); ///< Get character width of display - virtual Int getHeight(); ///< Get character height of display - virtual void setTextColor( Color color ); ///< set text color - virtual void setRightMargin( Int rightPos ); ///< set right margin position - virtual void setLeftMargin( Int leftPos ); ///< set left margin position - virtual void reset(); ///< Reset back to default settings + virtual ~DebugDisplay() override {}; + + virtual void printf( const Char *format, ...) override; ///< Print formatted text at current cursor position + virtual void setCursorPos( Int x, Int y ) override; ///< Set new cursor position + virtual Int getCursorXPos() override; ///< Get current X position of cursor + virtual Int getCursorYPos() override; ///< Get current Y position of cursor + virtual Int getWidth() override; ///< Get character width of display + virtual Int getHeight() override; ///< Get character height of display + virtual void setTextColor( Color color ) override; ///< set text color + virtual void setRightMargin( Int rightPos ) override; ///< set right margin position + virtual void setLeftMargin( Int leftPos ) override; ///< set left margin position + virtual void reset() override; ///< Reset back to default settings protected: diff --git a/Generals/Code/GameEngine/Include/GameClient/Display.h b/Generals/Code/GameEngine/Include/GameClient/Display.h index 4443069ea84..dab09f09c1a 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Display.h +++ b/Generals/Code/GameEngine/Include/GameClient/Display.h @@ -64,11 +64,11 @@ class Display : public SubsystemInterface typedef void (DebugDisplayCallback)( DebugDisplayInterface *debugDisplay, void *userData, FILE *fp ); Display(); - virtual ~Display(); + virtual ~Display() override; - virtual void init() { }; ///< Initialize - virtual void reset(); ///< Reset system - virtual void update(); ///< Update system + virtual void init() override { }; ///< Initialize + virtual void reset() override; ///< Reset system + virtual void update() override; ///< Update system //--------------------------------------------------------------------------------------- // Display attribute methods @@ -114,7 +114,7 @@ class Display : public SubsystemInterface virtual void enableClipping( Bool onoff ) = 0; virtual void step() {}; ///< Do one fixed time step - virtual void draw(); ///< Redraw the entire display + virtual void draw() override; ///< Redraw the entire display virtual void setTimeOfDay( TimeOfDay tod ) = 0; ///< Set the time of day for this display virtual void createLightPulse( const Coord3D *pos, const RGBColor *color, Real innerRadius,Real attenuationWidth, UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime//, Bool donut = FALSE diff --git a/Generals/Code/GameEngine/Include/GameClient/Drawable.h b/Generals/Code/GameEngine/Include/GameClient/Drawable.h index 68c76fe2f3f..356ec40f968 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Drawable.h +++ b/Generals/Code/GameEngine/Include/GameClient/Drawable.h @@ -178,9 +178,9 @@ class TintEnvelope : public MemoryPoolObject, public Snapshot 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; private: @@ -562,15 +562,15 @@ class Drawable : public Thing, 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; void xferDrawableModules( Xfer *xfer ); void startAmbientSound(BodyDamageType dt, TimeOfDay tod); - Drawable *asDrawableMeth() { return this; } - const Drawable *asDrawableMeth() const { return this; } + virtual Drawable *asDrawableMeth() override { return this; } + virtual const Drawable *asDrawableMeth() const override { return this; } Module** getModuleList(ModuleType i) { @@ -608,7 +608,7 @@ class Drawable : public Thing, void validatePos() const; #endif - virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle); + virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle) override; void updateHiddenStatus(); void replaceModelConditionStateInDrawable(); diff --git a/Generals/Code/GameEngine/Include/GameClient/Eva.h b/Generals/Code/GameEngine/Include/GameClient/Eva.h index 52513a6bc10..4d4d90ac612 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Eva.h +++ b/Generals/Code/GameEngine/Include/GameClient/Eva.h @@ -141,12 +141,12 @@ class Eva : public SubsystemInterface public: Eva(); - virtual ~Eva(); + virtual ~Eva() override; public: // From SubsystemInterface - virtual void init(); - virtual void reset(); - virtual void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; static EvaMessage nameToMessage(const AsciiString& name); static AsciiString messageToName(EvaMessage message); diff --git a/Generals/Code/GameEngine/Include/GameClient/GUICommandTranslator.h b/Generals/Code/GameEngine/Include/GameClient/GUICommandTranslator.h index 206b221d81b..bc07c81faa5 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GUICommandTranslator.h +++ b/Generals/Code/GameEngine/Include/GameClient/GUICommandTranslator.h @@ -42,7 +42,7 @@ class GUICommandTranslator : public GameMessageTranslator public: GUICommandTranslator(); - ~GUICommandTranslator(); + ~GUICommandTranslator() override; - virtual GameMessageDisposition translateGameMessage( const GameMessage *msg ); + virtual GameMessageDisposition translateGameMessage( const GameMessage *msg ) override; }; diff --git a/Generals/Code/GameEngine/Include/GameClient/GameClient.h b/Generals/Code/GameEngine/Include/GameClient/GameClient.h index dd9bb98ce1a..e3806e6ccdd 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameClient.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameClient.h @@ -65,8 +65,8 @@ typedef DrawablePtrHash::iterator DrawablePtrHashIt; class GameClientMessageDispatcher : public GameMessageTranslator { public: - virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); - virtual ~GameClientMessageDispatcher() { } + virtual GameMessageDisposition translateGameMessage(const GameMessage *msg) override; + virtual ~GameClientMessageDispatcher() override { } }; @@ -82,12 +82,12 @@ class GameClient : public SubsystemInterface, public: GameClient(); - virtual ~GameClient(); + virtual ~GameClient() override; // subsystem methods - virtual void init(); ///< Initialize resources - virtual void update(); ///< Updates the GUI, display, audio, etc - virtual void reset(); ///< reset system + virtual void init() override; ///< Initialize resources + virtual void update() override; ///< Updates the GUI, display, audio, etc + virtual void reset() override; ///< reset system virtual void setFrame( UnsignedInt frame ) { m_frame = frame; } ///< Set the GameClient's internal frame number virtual void registerDrawable( Drawable *draw ); ///< Given a drawable, register it with the GameClient and give it a unique ID @@ -153,9 +153,9 @@ class GameClient : public SubsystemInterface, 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; // @todo Should there be a separate GameClient frame counter? UnsignedInt m_frame; ///< Simulation frame number from server diff --git a/Generals/Code/GameEngine/Include/GameClient/GameWindowManager.h b/Generals/Code/GameEngine/Include/GameClient/GameWindowManager.h index 07aabf2ec3c..a3a4f53a4a6 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameWindowManager.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameWindowManager.h @@ -77,12 +77,12 @@ friend class GameWindow; public: GameWindowManager(); - virtual ~GameWindowManager(); + virtual ~GameWindowManager() override; //----------------------------------------------------------------------------------------------- - virtual void init(); ///< initialize function - virtual void reset(); ///< reset the system - virtual void update(); ///< update method, called once per frame + virtual void init() override; ///< initialize function + virtual void reset() override; ///< reset the system + virtual void update() override; ///< update method, called once per frame virtual GameWindow *allocateNewWindow() = 0; ///< new game window @@ -384,31 +384,31 @@ extern WindowMsgHandledType PassMessagesToParentSystem( GameWindow *window, class GameWindowManagerDummy : public GameWindowManager { public: - virtual GameWindow *winGetWindowFromId(GameWindow *window, Int id); - virtual GameWindow *winCreateFromScript(AsciiString filenameString, WindowLayoutInfo *info); - - virtual GameWindow *allocateNewWindow() { return newInstance(GameWindowDummy); } - - virtual GameWinDrawFunc getPushButtonImageDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getPushButtonDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getCheckBoxImageDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getCheckBoxDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getRadioButtonImageDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getRadioButtonDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getTabControlImageDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getTabControlDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getListBoxImageDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getListBoxDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getComboBoxImageDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getComboBoxDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getHorizontalSliderImageDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getHorizontalSliderDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getVerticalSliderImageDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getVerticalSliderDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getProgressBarImageDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getProgressBarDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getStaticTextImageDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getStaticTextDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getTextEntryImageDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getTextEntryDrawFunc() { return nullptr; } + virtual GameWindow *winGetWindowFromId(GameWindow *window, Int id) override; + virtual GameWindow *winCreateFromScript(AsciiString filenameString, WindowLayoutInfo *info) override; + + virtual GameWindow *allocateNewWindow() override { return newInstance(GameWindowDummy); } + + virtual GameWinDrawFunc getPushButtonImageDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getPushButtonDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getCheckBoxImageDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getCheckBoxDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getRadioButtonImageDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getRadioButtonDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getTabControlImageDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getTabControlDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getListBoxImageDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getListBoxDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getComboBoxImageDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getComboBoxDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getHorizontalSliderImageDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getHorizontalSliderDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getVerticalSliderImageDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getVerticalSliderDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getProgressBarImageDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getProgressBarDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getStaticTextImageDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getStaticTextDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getTextEntryImageDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getTextEntryDrawFunc() override { return nullptr; } }; diff --git a/Generals/Code/GameEngine/Include/GameClient/HintSpy.h b/Generals/Code/GameEngine/Include/GameClient/HintSpy.h index 06ae41156f7..32cf775deda 100644 --- a/Generals/Code/GameEngine/Include/GameClient/HintSpy.h +++ b/Generals/Code/GameEngine/Include/GameClient/HintSpy.h @@ -33,6 +33,6 @@ class HintSpyTranslator : public GameMessageTranslator { public: - virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); - virtual ~HintSpyTranslator() { } + virtual GameMessageDisposition translateGameMessage(const GameMessage *msg) override; + virtual ~HintSpyTranslator() override { } }; diff --git a/Generals/Code/GameEngine/Include/GameClient/HotKey.h b/Generals/Code/GameEngine/Include/GameClient/HotKey.h index 07085cf443c..1236f0aa119 100644 --- a/Generals/Code/GameEngine/Include/GameClient/HotKey.h +++ b/Generals/Code/GameEngine/Include/GameClient/HotKey.h @@ -66,8 +66,8 @@ class GameWindow; class HotKeyTranslator : public GameMessageTranslator { public: - virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); - virtual ~HotKeyTranslator() { } + virtual GameMessageDisposition translateGameMessage(const GameMessage *msg) override; + virtual ~HotKeyTranslator() override { } }; //----------------------------------------------------------------------------- @@ -85,11 +85,11 @@ class HotKeyManager : public SubsystemInterface { public: HotKeyManager(); - ~HotKeyManager(); + ~HotKeyManager() override; // Inherited from subsystem interface ----------------------------------------------------------- - virtual void init(); ///< Initialize the Hotkey system - virtual void update() {} ///< A No-op for us - virtual void reset(); ///< Reset + virtual void init() override; ///< Initialize the Hotkey system + virtual void update() override {} ///< A No-op for us + virtual void reset() override; ///< Reset //----------------------------------------------------------------------------------------------- void addHotKey( GameWindow *win, const AsciiString& key); diff --git a/Generals/Code/GameEngine/Include/GameClient/Image.h b/Generals/Code/GameEngine/Include/GameClient/Image.h index ae4eeb16e56..1436c02d66e 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Image.h +++ b/Generals/Code/GameEngine/Include/GameClient/Image.h @@ -121,11 +121,11 @@ class ImageCollection : public SubsystemInterface public: ImageCollection(); - virtual ~ImageCollection(); + virtual ~ImageCollection() override; - virtual void init() { }; ///< initialize system - virtual void reset() { }; ///< reset system - virtual void update() { }; ///< update system + virtual void init() override { }; ///< initialize system + virtual void reset() override { }; ///< reset system + virtual void update() override { }; ///< update system void load( Int textureSize ); ///< load images diff --git a/Generals/Code/GameEngine/Include/GameClient/InGameUI.h b/Generals/Code/GameEngine/Include/GameClient/InGameUI.h index a64ba0c95e9..3ed67baf544 100644 --- a/Generals/Code/GameEngine/Include/GameClient/InGameUI.h +++ b/Generals/Code/GameEngine/Include/GameClient/InGameUI.h @@ -347,12 +347,12 @@ friend class Drawable; // for selection/deselection transactions }; InGameUI(); - virtual ~InGameUI(); + virtual ~InGameUI() override; // Inherited from subsystem interface ----------------------------------------------------------- - virtual void init(); ///< Initialize the in-game user interface - virtual void update(); ///< Update the UI by calling preDraw(), draw(), and postDraw() - virtual void reset(); ///< Reset + virtual void init() override; ///< Initialize the in-game user interface + virtual void update() override; ///< Update the UI by calling preDraw(), draw(), and postDraw() + virtual void reset() override; ///< Reset //----------------------------------------------------------------------------------------------- // interface for the popup messages @@ -455,7 +455,7 @@ friend class Drawable; // for selection/deselection transactions virtual void disregardDrawable( Drawable *draw ); ///< Drawable is being destroyed, clean up any UI elements associated with it virtual void preDraw(); ///< Logic which needs to occur before the UI renders - virtual void draw() = 0; ///< Render the in-game user interface + virtual void draw() override = 0; ///< Render the in-game user interface virtual void postDraw(); ///< Logic which needs to occur after the UI renders virtual void postWindowDraw(); ///< Logic which needs to occur after the WindowManager has repainted the menus @@ -600,9 +600,9 @@ friend class Drawable; // for selection/deselection transactions 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: diff --git a/Generals/Code/GameEngine/Include/GameClient/LookAtXlat.h b/Generals/Code/GameEngine/Include/GameClient/LookAtXlat.h index ee420b9dc02..493d55ba53f 100644 --- a/Generals/Code/GameEngine/Include/GameClient/LookAtXlat.h +++ b/Generals/Code/GameEngine/Include/GameClient/LookAtXlat.h @@ -46,9 +46,9 @@ class LookAtTranslator : public GameMessageTranslator { public: LookAtTranslator(); - ~LookAtTranslator(); + virtual ~LookAtTranslator() override; - virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); + virtual GameMessageDisposition translateGameMessage(const GameMessage *msg) override; virtual const ICoord2D* getRMBScrollAnchor(); // get m_anchor ICoord2D if we're RMB scrolling Bool hasMouseMovedRecently(); void setCurrentPos( const ICoord2D& pos ); diff --git a/Generals/Code/GameEngine/Include/GameClient/MetaEvent.h b/Generals/Code/GameEngine/Include/GameClient/MetaEvent.h index d6bc143d607..bc2d201ba24 100644 --- a/Generals/Code/GameEngine/Include/GameClient/MetaEvent.h +++ b/Generals/Code/GameEngine/Include/GameClient/MetaEvent.h @@ -364,8 +364,8 @@ class MetaEventTranslator : public GameMessageTranslator public: MetaEventTranslator(); - ~MetaEventTranslator(); - virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); + virtual ~MetaEventTranslator() override; + virtual GameMessageDisposition translateGameMessage(const GameMessage *msg) override; }; //----------------------------------------------------------------------------- @@ -383,11 +383,11 @@ class MetaMap : public SubsystemInterface public: MetaMap(); - ~MetaMap(); + virtual ~MetaMap() override; - void init() { } - void reset() { } - void update() { } + virtual void init() override { } + virtual void reset() override { } + virtual void update() override { } static void parseMetaMap(INI* ini); diff --git a/Generals/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h b/Generals/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h index fcaefeb4e03..ca57ee41459 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h +++ b/Generals/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h @@ -47,7 +47,7 @@ class AnimatedParticleSysBoneClientUpdate : public ClientUpdateModule // virtual destructor prototype provided by memory pool declaration /// the client update callback - virtual void clientUpdate(); + virtual void clientUpdate() override; protected: diff --git a/Generals/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h b/Generals/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h index f2d61405edd..a13aaf84e83 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h +++ b/Generals/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h @@ -44,7 +44,7 @@ class BeaconClientUpdateModuleData : public ClientUpdateModuleData UnsignedInt m_radarPulseDuration; BeaconClientUpdateModuleData(); - ~BeaconClientUpdateModuleData(); + virtual ~BeaconClientUpdateModuleData() override; static void buildFieldParse(MultiIniFieldParse& p); }; @@ -63,7 +63,7 @@ class BeaconClientUpdate : public ClientUpdateModule // virtual destructor prototype provided by memory pool declaration /// the client update callback - virtual void clientUpdate(); + virtual void clientUpdate() override; void hideBeacon(); protected: diff --git a/Generals/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h b/Generals/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h index f44ccc3ae8f..efd621b826a 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h +++ b/Generals/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h @@ -50,7 +50,7 @@ class SwayClientUpdate : public ClientUpdateModule // virtual destructor prototype provided by memory pool declaration /// the client update callback - virtual void clientUpdate(); + virtual void clientUpdate() override; void stopSway() { m_swaying = false; } diff --git a/Generals/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h b/Generals/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h index 3d367d3c95d..409c3fa8a45 100644 --- a/Generals/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h +++ b/Generals/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h @@ -37,6 +37,6 @@ class PlaceEventTranslator : public GameMessageTranslator public: PlaceEventTranslator(); - ~PlaceEventTranslator(); - virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); + virtual ~PlaceEventTranslator() override; + virtual GameMessageDisposition translateGameMessage(const GameMessage *msg) override; }; diff --git a/Generals/Code/GameEngine/Include/GameClient/RayEffect.h b/Generals/Code/GameEngine/Include/GameClient/RayEffect.h index 21928152e1e..1f9db5c634d 100644 --- a/Generals/Code/GameEngine/Include/GameClient/RayEffect.h +++ b/Generals/Code/GameEngine/Include/GameClient/RayEffect.h @@ -57,11 +57,11 @@ class RayEffectSystem : public SubsystemInterface public: RayEffectSystem(); - ~RayEffectSystem(); + ~RayEffectSystem() override; - virtual void init(); - virtual void reset(); - virtual void update() { } + virtual void init() override; + virtual void reset() override; + virtual void update() override { } /// add a ray effect entry for this drawable void addRayEffect( const Drawable *draw, const Coord3D *startLoc, const Coord3D *endLoc ); diff --git a/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h b/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h index 978ccfb1b6c..a5be5e6f7b1 100644 --- a/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h +++ b/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h @@ -60,8 +60,8 @@ class SelectionTranslator : public GameMessageTranslator public: SelectionTranslator(); - ~SelectionTranslator(); - virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); + virtual ~SelectionTranslator() override; + virtual GameMessageDisposition translateGameMessage(const GameMessage *msg) override; //added for fix to the drag selection when entering control bar //changes the mode of drag selecting to it's opposite void setDragSelecting(Bool dragSelect); diff --git a/Generals/Code/GameEngine/Include/GameClient/Shell.h b/Generals/Code/GameEngine/Include/GameClient/Shell.h index a190ac43724..46805a3d858 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Shell.h +++ b/Generals/Code/GameEngine/Include/GameClient/Shell.h @@ -114,12 +114,12 @@ class Shell : public SubsystemInterface public: Shell(); - ~Shell(); + ~Shell() override; // Inhertited from subsystem ==================================================================== - virtual void init(); - virtual void reset(); - virtual void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; //=============================================================================================== void recreateWindowLayouts(); diff --git a/Generals/Code/GameEngine/Include/GameClient/WindowXlat.h b/Generals/Code/GameEngine/Include/GameClient/WindowXlat.h index d04f20d0ba5..52d384c532f 100644 --- a/Generals/Code/GameEngine/Include/GameClient/WindowXlat.h +++ b/Generals/Code/GameEngine/Include/GameClient/WindowXlat.h @@ -36,6 +36,6 @@ class WindowTranslator : public GameMessageTranslator // nothing public: WindowTranslator(); - ~WindowTranslator(); - virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); + virtual ~WindowTranslator() override; + virtual GameMessageDisposition translateGameMessage(const GameMessage *msg) override; }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/AI.h b/Generals/Code/GameEngine/Include/GameLogic/AI.h index 271e44e6bfd..9ee8a31e6c2 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AI.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AI.h @@ -147,9 +147,9 @@ class TAiData : public Snapshot void addFactionBuildList(AISideBuildList *buildList); // --------------- inherited from Snapshot interface -------------- - void crc( Xfer *xfer ); - void xfer( Xfer *xfer ); - void loadPostProcess(); + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; Real m_structureSeconds; // Try to build a structure every N seconds. Real m_teamSeconds; // Try to build a team every N seconds. @@ -241,11 +241,11 @@ class AI : public SubsystemInterface, public Snapshot { public: AI(); - ~AI(); + ~AI() override; - virtual void init(); ///< initialize AI to default values - virtual void reset(); ///< reset the AI system to prepare for a new map - virtual void update(); ///< do one frame of AI computation + virtual void init() override; ///< initialize AI to default values + virtual void reset() override; ///< reset the AI system to prepare for a new map + virtual void update() override; ///< do one frame of AI computation Pathfinder *pathfinder() { return m_pathfinder; } ///< public access to the pathfind system enum @@ -265,9 +265,9 @@ class AI : public SubsystemInterface, public Snapshot Object *findClosestAlly( const Object *me, Real range, UnsignedInt qualifiers); // --------------- inherited from Snapshot interface -------------- - void crc( Xfer *xfer ); - void xfer( Xfer *xfer ); - void loadPostProcess(); + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; // AI Groups ----------------------------------------------------------------------------------------------- AIGroupPtr createGroup(); ///< instantiate a new AI Group @@ -854,9 +854,9 @@ class AIGroup : public MemoryPoolObject, public Snapshot public: // --------------- inherited from Snapshot interface -------------- - void crc( Xfer *xfer ); - void xfer( Xfer *xfer ); - void loadPostProcess(); + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; #if !RETAIL_COMPATIBLE_AIGROUP void Add_Ref() const { m_refCount.Add_Ref(); } diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIDock.h b/Generals/Code/GameEngine/Include/GameLogic/AIDock.h index 01df242bc62..bf7b057ba6e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIDock.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIDock.h @@ -62,15 +62,15 @@ class AIDockMachine : public StateMachine AIDockMachine( Object *owner ); static Bool ableToAdvance( State *thisState, void* userData ); // Condition for scooting forward in line while waiting - virtual void halt(); ///< Stops the state machine & disables it in preparation for deleting it. + virtual void halt() override; ///< Stops the state machine & disables it in preparation for deleting it. Int m_approachPosition; ///< The Approach Position I am holding, to make scoot forward checks quicker. protected: // snapshot interface - 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; }; @@ -82,14 +82,14 @@ class AIDockApproachState : public AIInternalMoveToState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockApproachState, "AIDockApproachState") public: AIDockApproachState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockApproachState" ) { } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: // snapshot interface STUBBED. - 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{}; }; EMPTY_DTOR(AIDockApproachState) @@ -99,16 +99,16 @@ class AIDockWaitForClearanceState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockWaitForClearanceState, "AIDockWaitForClearanceState") public: AIDockWaitForClearanceState( StateMachine *machine ) : State( machine, "AIDockWaitForClearanceState" ), m_enterFrame(0) { } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: UnsignedInt m_enterFrame; protected: // snapshot interface STUBBED. - 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{}; }; EMPTY_DTOR(AIDockWaitForClearanceState) @@ -118,9 +118,9 @@ class AIDockAdvancePositionState : public AIInternalMoveToState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockAdvancePositionState, "AIDockAdvancePositionState") public: AIDockAdvancePositionState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockApproachState" ) { } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; }; EMPTY_DTOR(AIDockAdvancePositionState) @@ -130,9 +130,9 @@ class AIDockMoveToEntryState : public AIInternalMoveToState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToEntryState, "AIDockMoveToEntryState") public: AIDockMoveToEntryState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockMoveToEntryState" ) { } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; }; EMPTY_DTOR(AIDockMoveToEntryState) @@ -142,9 +142,9 @@ class AIDockMoveToDockState : public AIInternalMoveToState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToDockState, "AIDockMoveToDockState") public: AIDockMoveToDockState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockMoveToDockState" ) { } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; }; EMPTY_DTOR(AIDockMoveToDockState) @@ -154,9 +154,9 @@ class AIDockMoveToRallyState : public AIInternalMoveToState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToRallyState, "AIDockMoveToRallyState") public: AIDockMoveToRallyState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockMoveToRallyState" ) { } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; }; EMPTY_DTOR(AIDockMoveToRallyState) @@ -166,9 +166,9 @@ class AIDockProcessDockState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockProcessDockState, "AIDockProcessDockState") public: AIDockProcessDockState( StateMachine *machine ); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; void setNextDockActionFrame();//This puts a delay between callings of Action to tweak the speed of docking. UnsignedInt m_nextDockActionFrame;// In the unlikely event of saving a game in the middle of docking, you may @@ -177,9 +177,9 @@ class AIDockProcessDockState : public State protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; private: ObjectID m_droneID; ///< If I have a drone, the drone will get repaired too. @@ -193,9 +193,9 @@ class AIDockMoveToExitState : public AIInternalMoveToState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToExitState, "AIDockMoveToExitState") public: AIDockMoveToExitState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockMoveToExitState" ) { } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; }; EMPTY_DTOR(AIDockMoveToExitState) diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h b/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h index 44e2f10e38c..6d373317e67 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h @@ -81,7 +81,7 @@ class ExitConditions : public AttackExitConditionsInterface m_center.zero(); } - virtual Bool shouldExit(const StateMachine* machine) const; + virtual Bool shouldExit(const StateMachine* machine) const override; }; @@ -101,9 +101,9 @@ class AIGuardMachine : public StateMachine protected: // snapshot interface - 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; public: /** @@ -140,14 +140,14 @@ class AIGuardInnerState : public State { m_attackState = nullptr; } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: AIGuardMachine* getGuardMachine() { return (AIGuardMachine*)getMachine(); } @@ -161,14 +161,14 @@ class AIGuardIdleState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardIdleState, "AIGuardIdleState") public: AIGuardIdleState( StateMachine *machine ) : State( machine, "AIGuardIdleState" ) { } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: AIGuardMachine* getGuardMachine() { return (AIGuardMachine*)getMachine(); } @@ -186,14 +186,14 @@ class AIGuardOuterState : public State { m_attackState = nullptr; } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: AIGuardMachine* getGuardMachine() { return (AIGuardMachine*)getMachine(); } @@ -212,14 +212,14 @@ class AIGuardReturnState : public AIInternalMoveToState { m_nextReturnScanTime = 0; } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: UnsignedInt m_nextReturnScanTime; }; @@ -232,9 +232,9 @@ class AIGuardPickUpCrateState : public AIPickUpCrateState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardPickUpCrateState, "AIGuardPickUpCrateState") public: AIGuardPickUpCrateState( StateMachine *machine ); - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; }; EMPTY_DTOR(AIGuardPickUpCrateState) @@ -244,14 +244,14 @@ class AIGuardAttackAggressorState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardAttackAggressorState, "AIGuardAttackAggressorState") public: AIGuardAttackAggressorState( StateMachine *machine ); - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: AIGuardMachine* getGuardMachine() { return (AIGuardMachine*)getMachine(); } ExitConditions m_exitConditions; diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h b/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h index c4d578c0a1b..81350b7c446 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h @@ -68,9 +68,9 @@ class WorkOrder : public MemoryPoolObject, 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; }; @@ -99,9 +99,9 @@ class TeamInQueue : public MemoryPoolObject, 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; public: @@ -209,9 +209,9 @@ class AIPlayer : public MemoryPoolObject, 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; virtual void doBaseBuilding(); virtual void checkReadyTeams(); diff --git a/Generals/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h b/Generals/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h index d8229caca97..a10ecf008f9 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h @@ -45,56 +45,56 @@ class AISkirmishPlayer : public AIPlayer public: // AISkirmish specific methods. AISkirmishPlayer( Player *p ); ///< constructor - virtual void computeSuperweaponTarget(const SpecialPowerTemplate *power, Coord3D *pos, Int playerNdx, Real weaponRadius); ///< Calculates best pos for weapon given radius. + virtual void computeSuperweaponTarget(const SpecialPowerTemplate *power, Coord3D *pos, Int playerNdx, Real weaponRadius) override; ///< Calculates best pos for weapon given radius. public: // AIPlayer interface methods. - virtual void update(); ///< simulates the behavior of a player + virtual void update() override; ///< simulates the behavior of a player - virtual void newMap(); ///< New map loaded call. + virtual void newMap() override; ///< New map loaded call. /// Invoked when a unit I am training comes into existence - virtual void onUnitProduced( Object *factory, Object *unit ); + virtual void onUnitProduced( Object *factory, Object *unit ) override; - virtual void buildSpecificAITeam(TeamPrototype *teamProto, Bool priorityBuild); ///< Builds this team immediately. + virtual void buildSpecificAITeam(TeamPrototype *teamProto, Bool priorityBuild) override; ///< Builds this team immediately. - virtual void buildSpecificAIBuilding(const AsciiString &thingName); ///< Builds this building as soon as possible. + virtual void buildSpecificAIBuilding(const AsciiString &thingName) override; ///< Builds this building as soon as possible. - virtual void buildAIBaseDefense(Bool flank); ///< Builds base defense on front or flank of base. + virtual void buildAIBaseDefense(Bool flank) override; ///< Builds base defense on front or flank of base. - virtual void buildAIBaseDefenseStructure(const AsciiString &thingName, Bool flank); ///< Builds base defense on front or flank of base. + virtual void buildAIBaseDefenseStructure(const AsciiString &thingName, Bool flank) override; ///< Builds base defense on front or flank of base. - virtual void recruitSpecificAITeam(TeamPrototype *teamProto, Real recruitRadius); ///< Builds this team immediately. + virtual void recruitSpecificAITeam(TeamPrototype *teamProto, Real recruitRadius) override; ///< Builds this team immediately. - virtual Bool isSkirmishAI() {return true;} + virtual Bool isSkirmishAI() override {return true;} - virtual Bool checkBridges(Object *unit, Waypoint *way); + virtual Bool checkBridges(Object *unit, Waypoint *way) override; - virtual Player *getAiEnemy(); ///< Solo AI attacks based on scripting. Only skirmish auto-acquires an enemy at this point. jba. + virtual Player *getAiEnemy() override; ///< Solo AI attacks based on scripting. Only skirmish auto-acquires an enemy at this point. jba. 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; - virtual void doBaseBuilding(); - virtual void checkReadyTeams(); - virtual void checkQueuedTeams(); - virtual void doTeamBuilding(); - virtual Object *findDozer(const Coord3D *pos); - virtual void queueDozer(); + virtual void doBaseBuilding() override; + virtual void checkReadyTeams() override; + virtual void checkQueuedTeams() override; + virtual void doTeamBuilding() override; + virtual Object *findDozer(const Coord3D *pos) override; + virtual void queueDozer() override; protected: - virtual Bool selectTeamToBuild(); ///< determine the next team to build - virtual Bool selectTeamToReinforce( Int minPriority ); ///< determine the next team to reinforce - virtual Bool startTraining( WorkOrder *order, Bool busyOK, AsciiString teamName); ///< find a production building that can handle the order, and start building + virtual Bool selectTeamToBuild() override; ///< determine the next team to build + virtual Bool selectTeamToReinforce( Int minPriority ) override; ///< determine the next team to reinforce + virtual Bool startTraining( WorkOrder *order, Bool busyOK, AsciiString teamName) override; ///< find a production building that can handle the order, and start building - virtual Bool isAGoodIdeaToBuildTeam( TeamPrototype *proto ); ///< return true if team should be built - virtual void processBaseBuilding(); ///< do base-building behaviors - virtual void processTeamBuilding(); ///< do team-building behaviors + virtual Bool isAGoodIdeaToBuildTeam( TeamPrototype *proto ) override; ///< return true if team should be built + virtual void processBaseBuilding() override; ///< do base-building behaviors + virtual void processTeamBuilding() override; ///< do team-building behaviors protected: void adjustBuildList(BuildListInfo *list); diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIStateMachine.h b/Generals/Code/GameEngine/Include/GameLogic/AIStateMachine.h index 53964d8f2d2..3ec01c6c186 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIStateMachine.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIStateMachine.h @@ -133,9 +133,9 @@ class AIStateMachine : public StateMachine */ AIStateMachine( Object *owner, AsciiString name ); - virtual void clear(); - virtual StateReturnType resetToDefaultState(); - virtual StateReturnType setState( StateID newStateID ); + virtual void clear() override; + virtual StateReturnType resetToDefaultState() override; + virtual StateReturnType setState( StateID newStateID ) override; /// @todo Rethink state parameter passing. Continuing in this fashion will have a pile of params in the machine (MSB) void setGoalPath( std::vector* path ); @@ -158,16 +158,16 @@ class AIStateMachine : public StateMachine StateID getTemporaryState() const {return m_temporaryState?m_temporaryState->getID():INVALID_STATE_ID;} public: // overrides. - virtual StateReturnType updateStateMachine(); ///< run one step of the machine + virtual StateReturnType updateStateMachine() override; ///< run one step of the machine #ifdef STATE_MACHINE_DEBUG virtual AsciiString getCurrentStateName() const ; #endif protected: // snapshot interface - 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; private: std::vector m_goalPath; ///< defines a simple path to follow @@ -199,9 +199,9 @@ enum StateType CPP_11(: Int) protected: // snapshot interface - 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; }; //----------------------------------------------------------------------------------------------------------- @@ -222,16 +222,16 @@ class AIIdleState : public State LOOK_FOR_TARGETS, DO_NOT_LOOK_FOR_TARGETS }; - virtual Bool isIdle() const { return true; } + virtual Bool isIdle() const override { return true; } AIIdleState( StateMachine *machine, AIIdleTargetingType shouldLookForTargets); - virtual StateReturnType onEnter(); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; protected: // snapshot interface - 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; }; EMPTY_DTOR(AIIdleState) @@ -255,9 +255,9 @@ class AIInternalMoveToState : public State m_goalLayer = LAYER_INVALID; } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: @@ -280,9 +280,9 @@ class AIInternalMoveToState : public State protected: // snapshot interface - 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; private: enum { MIN_REPATH_TIME = 10 }; ///< minimum # of frames must elapse before re-pathing @@ -315,15 +315,15 @@ class AIRappelState : public State Bool m_targetIsBldg; protected: // snapshot interface - 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; public: AIRappelState( StateMachine *machine ); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; }; EMPTY_DTOR(AIRappelState) @@ -336,15 +336,15 @@ class AIBusyState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIBusyState, "AIBusyState") public: AIBusyState( StateMachine *machine ) : State( machine, "AIBusyState" ) { } - virtual StateReturnType onEnter() { return STATE_CONTINUE; } - virtual void onExit( StateExitType status ) { } - virtual StateReturnType update() { return STATE_CONTINUE; } - virtual Bool isBusy() const { return true; } + virtual StateReturnType onEnter() override { return STATE_CONTINUE; } + virtual void onExit( StateExitType status ) override { } + virtual StateReturnType update() override { return STATE_CONTINUE; } + virtual Bool isBusy() const override { return true; } protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; }; EMPTY_DTOR(AIBusyState) @@ -360,9 +360,9 @@ class AIMoveToState : public AIInternalMoveToState Bool m_isMoveTo; public: AIMoveToState( StateMachine *machine ); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; }; EMPTY_DTOR(AIMoveToState) @@ -375,11 +375,11 @@ class AIMoveOutOfTheWayState : public AIInternalMoveToState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveOutOfTheWayState, "AIMoveOutOfTheWayState") public: AIMoveOutOfTheWayState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIMoveOutOfTheWayState" ) { } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: - virtual Bool computePath(); ///< compute the path + virtual Bool computePath() override; ///< compute the path }; EMPTY_DTOR(AIMoveOutOfTheWayState) @@ -402,17 +402,17 @@ class AIMoveAndTightenState : public AIInternalMoveToState m_checkForPath = false; m_okToRepathTimes = 0; } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; protected: - virtual Bool computePath(); ///< compute the path + virtual Bool computePath() override; ///< compute the path Int m_okToRepathTimes; Bool m_checkForPath; protected: // snapshot interface - 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; }; EMPTY_DTOR(AIMoveAndTightenState) @@ -425,11 +425,11 @@ class AIMoveAwayFromRepulsorsState : public AIMoveAndTightenState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveAwayFromRepulsorsState, "AIMoveAwayFromRepulsorsState") public: AIMoveAwayFromRepulsorsState( StateMachine *machine ) : AIMoveAndTightenState( machine, "AIMoveAwayFromRepulsors" ) { } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: - virtual Bool computePath(); ///< compute the path + virtual Bool computePath() override; ///< compute the path }; EMPTY_DTOR(AIMoveAwayFromRepulsorsState) @@ -452,17 +452,17 @@ class AIAttackApproachTargetState : public AIInternalMoveToState // we're setting m_isInitialApproach to true in the constructor because we want the first pass // through this state to allow a unit to attack incidental targets (if it is turreted) } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: - virtual Bool computePath(); ///< compute the path + virtual Bool computePath() override; ///< compute the path protected: // snapshot interface - 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; private: @@ -500,17 +500,17 @@ class AIAttackPursueTargetState : public AIInternalMoveToState // we're setting m_isInitialApproach to true in the constructor because we want the first pass // through this state to allow a unit to attack incidental targets (if it is turreted) } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: - virtual Bool computePath(); ///< compute the path + virtual Bool computePath() override; ///< compute the path protected: // snapshot interface - 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; private: @@ -542,19 +542,19 @@ class AIPickUpCrateState : public AIInternalMoveToState // we're setting m_isInitialApproach to true in the constructor because we want the first pass // through this state to allow a unit to attack incidental targets (if it is turreted) } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: - virtual Bool computePath(); ///< compute the path + virtual Bool computePath() override; ///< compute the path private: Int m_delayCounter; protected: // snapshot interface - 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; }; EMPTY_DTOR(AIPickUpCrateState) @@ -569,9 +569,9 @@ EMPTY_DTOR(AIPickUpCrateState) AIAttackMoveToState( StateMachine *machine ); //virtual ~AIAttackMoveToState(); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; #ifdef STATE_MACHINE_DEBUG virtual AsciiString getName() const ; #endif @@ -585,9 +585,9 @@ EMPTY_DTOR(AIPickUpCrateState) Int m_retryCount; protected: // snapshot interface - 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; }; //----------------------------------------------------------------------------------------------------------- @@ -609,15 +609,15 @@ class AIFollowWaypointPathState : public AIInternalMoveToState { m_angle = 0.0f; } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: // snapshot interface - 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: Coord2D m_groupOffset; @@ -651,15 +651,15 @@ class AIFollowWaypointPathExactState : public AIInternalMoveToState AIFollowWaypointPathExactState( StateMachine *machine, Bool asGroup ) : m_moveAsGroup(asGroup), m_lastWaypoint(nullptr), AIInternalMoveToState( machine, "AIFollowWaypointPathExactState" ) { } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: // snapshot interface - 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: const Waypoint *m_lastWaypoint; @@ -677,9 +677,9 @@ class AIAttackFollowWaypointPathState : public AIFollowWaypointPathState public: AIAttackFollowWaypointPathState( StateMachine *machine, Bool asGroup ); //virtual ~AIAttackFollowWaypointPathState(); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; #ifdef STATE_MACHINE_DEBUG virtual AsciiString getName() const ; #endif @@ -689,9 +689,9 @@ class AIAttackFollowWaypointPathState : public AIFollowWaypointPathState StateMachine *m_attackFollowMachine; protected: // snapshot interface - 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; }; //----------------------------------------------------------------------------------------------------------- @@ -710,15 +710,15 @@ class AIWanderState : public AIFollowWaypointPathState m_timer = 0; m_waitFrames = 0; } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: // snapshot interface - 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_waitFrames; @@ -740,15 +740,15 @@ class AIWanderInPlaceState : public AIInternalMoveToState m_waitFrames = 0; m_timer = 0; } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: // snapshot interface - 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: void computeWanderGoal(); @@ -772,14 +772,14 @@ class AIPanicState : public AIFollowWaypointPathState setName("AIPanicState"); #endif } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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_waitFrames; @@ -802,9 +802,9 @@ class AIFollowPathState : public AIInternalMoveToState m_index(0), m_retryCount(10), AIInternalMoveToState( machine, name ) { } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: @@ -814,9 +814,9 @@ class AIFollowPathState : public AIInternalMoveToState protected: // snapshot interface - 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; private: Int m_index; ///< current path index @@ -838,14 +838,14 @@ class AIMoveAndEvacuateState : public AIInternalMoveToState { m_origin.zero(); } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: // snapshot interface - 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; private: Coord3D m_origin; ///< current position - set as goal on exit in case we follow with MoveToAndDelete. @@ -864,14 +864,14 @@ class AIMoveAndDeleteState : public AIInternalMoveToState { m_appendGoalPosition = FALSE; } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: // snapshot interface - 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: Bool m_appendGoalPosition; @@ -891,14 +891,14 @@ class AIAttackAimAtTargetState : public State m_setLocomotor(false) { } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: // snapshot interface - 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; private: const Bool m_isAttackingObject; Bool m_canTurnInPlace; @@ -913,12 +913,12 @@ class AIWaitState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIWaitState, "AIWaitState") public: AIWaitState( StateMachine *machine ) : State( machine,"AIWaitState" ) { } - virtual StateReturnType update(); + virtual StateReturnType update() override; protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; }; EMPTY_DTOR(AIWaitState) @@ -943,14 +943,14 @@ class AIAttackFireWeaponState : public State m_att(att) { } - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); - virtual StateReturnType onEnter(); + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType onEnter() override; protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; private: NotifyWeaponFiredInterface *const m_att; // this is NOT owned by us and should not be freed }; @@ -972,27 +972,27 @@ class AIAttackState : public State, public NotifyWeaponFiredInterface AIAttackState( StateMachine *machine, Bool follow, Bool attackingObject, Bool forceAttacking, AttackExitConditionsInterface* attackParameters); //~AIAttackState(); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; - virtual void notifyFired() { /* nothing */ } - virtual void notifyNewVictimChosen(Object* victim); - virtual const Coord3D* getOriginalVictimPos() const { return &m_originalVictimPos; } - virtual Bool isWeaponSlotOkToFire(WeaponSlotType wslot) const { return true; } - virtual Bool isAttackingObject() const { return m_isAttackingObject; } + virtual void notifyFired() override { /* nothing */ } + virtual void notifyNewVictimChosen(Object* victim) override; + virtual const Coord3D* getOriginalVictimPos() const override { return &m_originalVictimPos; } + virtual Bool isWeaponSlotOkToFire(WeaponSlotType wslot) const override { return true; } + virtual Bool isAttackingObject() const override { return m_isAttackingObject; } virtual Bool isForceAttacking() const { return m_isForceAttacking; } #ifdef STATE_MACHINE_DEBUG virtual AsciiString getName() const ; #endif - virtual Bool isAttack() const { return TRUE; } + virtual Bool isAttack() const override { return TRUE; } protected: // snapshot interface - 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; private: @@ -1017,9 +1017,9 @@ class AIAttackSquadState : public State State( machine , "AIAttackSquadState") { } //~AIAttackSquadState(); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; Object *chooseVictim(); #ifdef STATE_MACHINE_DEBUG virtual AsciiString getName() const ; @@ -1028,9 +1028,9 @@ class AIAttackSquadState : public State protected: // snapshot interface - 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; private: StateMachine *m_attackSquadMachine; ///< state sub-machine for attack behavior @@ -1042,14 +1042,14 @@ class AIDeadState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDeadState, "AIDeadState") public: AIDeadState( StateMachine *machine ) : State( machine, "AIDeadState" ) { } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; }; EMPTY_DTOR(AIDeadState) @@ -1060,18 +1060,18 @@ class AIDockState : public State public: AIDockState( StateMachine *machine ) : State( machine, "AIDockState" ), m_dockMachine(nullptr), m_usingPrecisionMovement(FALSE) { } //~AIDockState(); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; #ifdef STATE_MACHINE_DEBUG virtual AsciiString getName() const ; #endif protected: // snapshot interface - 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; private: StateMachine *m_dockMachine; ///< state sub-machine for docking behavior @@ -1088,14 +1088,14 @@ class AIEnterState : public AIInternalMoveToState ObjectID m_entryToClear; protected: // snapshot interface - 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; public: AIEnterState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIEnterState" ) { } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; }; EMPTY_DTOR(AIEnterState) @@ -1107,14 +1107,14 @@ class AIExitState : public State ObjectID m_entryToClear; protected: // snapshot interface - 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; public: AIExitState( StateMachine *machine ) : State( machine, "AIExitState" ) { } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; }; EMPTY_DTOR(AIExitState) @@ -1131,17 +1131,17 @@ class AIGuardState : public State m_guardMachine = nullptr; } //~AIGuardState(); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; #ifdef STATE_MACHINE_DEBUG virtual AsciiString getName() const ; #endif protected: // snapshot interface - 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; private: AIGuardMachine *m_guardMachine; ///< state sub-machine for guard behavior @@ -1160,17 +1160,17 @@ class AITunnelNetworkGuardState : public State m_guardMachine = nullptr; } //~AIGuardState(); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; #ifdef STATE_MACHINE_DEBUG virtual AsciiString getName() const ; #endif protected: // snapshot interface - 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; private: AITNGuardMachine *m_guardMachine; ///< state sub-machine for guard behavior @@ -1189,18 +1189,18 @@ class AIHuntState : public State m_nextEnemyScanTime = 0; } //~AIHuntState(); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; #ifdef STATE_MACHINE_DEBUG virtual AsciiString getName() const ; #endif protected: // snapshot interface - 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; private: StateMachine* m_huntMachine; ///< state sub-machine for hunt behavior @@ -1219,18 +1219,18 @@ class AIAttackAreaState : public State AIAttackAreaState( StateMachine *machine ) : State( machine, "AIAttackAreaState" ), m_attackMachine(nullptr), m_nextEnemyScanTime(0) { } //~AIAttackAreaState(); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; #ifdef STATE_MACHINE_DEBUG virtual AsciiString getName() const ; #endif protected: // snapshot interface - 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; private: StateMachine *m_attackMachine; ///< state sub-machine for attack behavior @@ -1246,14 +1246,14 @@ class AIFaceState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIFaceState, "AIFaceState") public: AIFaceState( StateMachine *machine, Bool obj ) : State( machine, "AIFaceState" ), m_canTurnInPlace(false), m_obj(obj) { } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: // snapshot interface . - 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: const Bool m_obj; diff --git a/Generals/Code/GameEngine/Include/GameLogic/AITNGuard.h b/Generals/Code/GameEngine/Include/GameLogic/AITNGuard.h index 750f117494f..6170464b89f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AITNGuard.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AITNGuard.h @@ -70,7 +70,7 @@ class TunnelNetworkExitConditions : public AttackExitConditionsInterface { } - virtual Bool shouldExit(const StateMachine* machine) const; + virtual Bool shouldExit(const StateMachine* machine) const override; }; @@ -88,9 +88,9 @@ class AITNGuardMachine : public StateMachine protected: // snapshot interface - 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; public: /** @@ -122,14 +122,14 @@ class AITNGuardInnerState : public State { m_attackState = nullptr; } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: AITNGuardMachine* getGuardMachine() { return (AITNGuardMachine*)getMachine(); } @@ -144,14 +144,14 @@ class AITNGuardIdleState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardIdleState, "AITNGuardIdleState") public: AITNGuardIdleState( StateMachine *machine ) : State( machine, "AITNGuardIdleState" ) { } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: AITNGuardMachine* getGuardMachine() { return (AITNGuardMachine*)getMachine(); } @@ -169,14 +169,14 @@ class AITNGuardOuterState : public State { m_attackState = nullptr; } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: AITNGuardMachine* getGuardMachine() { return (AITNGuardMachine*)getMachine(); } @@ -195,18 +195,18 @@ class AITNGuardReturnState : public AIEnterState { m_nextReturnScanTime = 0; } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: UnsignedInt m_nextReturnScanTime; protected: // snapshot interface - 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; }; EMPTY_DTOR(AITNGuardReturnState) @@ -217,9 +217,9 @@ class AITNGuardPickUpCrateState : public AIPickUpCrateState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardPickUpCrateState, "AITNGuardPickUpCrateState") public: AITNGuardPickUpCrateState( StateMachine *machine ); - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; }; EMPTY_DTOR(AITNGuardPickUpCrateState) @@ -229,14 +229,14 @@ class AITNGuardAttackAggressorState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardAttackAggressorState, "AITNGuardAttackAggressorState") public: AITNGuardAttackAggressorState( StateMachine *machine ); - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: AITNGuardMachine* getGuardMachine() { return (AITNGuardMachine*)getMachine(); } TunnelNetworkExitConditions m_exitConditions; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Armor.h b/Generals/Code/GameEngine/Include/GameLogic/Armor.h index dacf23a594e..ffa97d84b2c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Armor.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Armor.h @@ -99,11 +99,11 @@ class ArmorStore : public SubsystemInterface public: ArmorStore(); - ~ArmorStore(); + virtual ~ArmorStore() override; - void init() { } - void reset() { } - void update() { } + virtual void init() override { } + virtual void reset() override { } + virtual void update() override { } const ArmorTemplate* findArmorTemplate(NameKeyType namekey) const; /** diff --git a/Generals/Code/GameEngine/Include/GameLogic/CaveSystem.h b/Generals/Code/GameEngine/Include/GameLogic/CaveSystem.h index 9424b4fadec..73ec70eb18d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/CaveSystem.h +++ b/Generals/Code/GameEngine/Include/GameLogic/CaveSystem.h @@ -44,11 +44,11 @@ class CaveSystem : public SubsystemInterface, { public: CaveSystem(); - ~CaveSystem(); + virtual ~CaveSystem() override; - void init(); - void reset(); - void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; Bool canSwitchIndexToIndex( Int oldIndex, Int newIndex ); // If either Index has guys in it, no, you can't void registerNewCave( Int theIndex ); // All Caves are born with a default index, which could be new @@ -58,9 +58,9 @@ class CaveSystem : public SubsystemInterface, 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 { } private: std::vector m_tunnelTrackerVector;// A vector of pointers where the indexes are known by diff --git a/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h b/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h index c7c4745e31c..8fbdcc58fb0 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h +++ b/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h @@ -88,11 +88,11 @@ class CrateSystem : public SubsystemInterface { public: CrateSystem(); - ~CrateSystem(); + virtual ~CrateSystem() override; - void init(); - void reset(); - void update(){} + virtual void init() override; + virtual void reset() override; + virtual void update() override{} const CrateTemplate *findCrateTemplate(AsciiString name) const; CrateTemplate *friend_findCrateTemplate(AsciiString name); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Damage.h b/Generals/Code/GameEngine/Include/GameLogic/Damage.h index 5d070334631..7f5ed8dbb17 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Damage.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Damage.h @@ -297,9 +297,9 @@ class DamageInfoInput : public Snapshot 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 { } }; @@ -340,9 +340,9 @@ class DamageInfoOutput : public Snapshot 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 { } }; @@ -366,8 +366,8 @@ class DamageInfo : public Snapshot protected: - 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 { } }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/ExperienceTracker.h b/Generals/Code/GameEngine/Include/GameLogic/ExperienceTracker.h index 353502e1346..08cb86958c7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ExperienceTracker.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ExperienceTracker.h @@ -63,9 +63,9 @@ class ExperienceTracker : public MemoryPoolObject, public Snapshot void setExperienceScalar( Real scalar ) { m_experienceScalar = scalar; } // --------------- inherited from Snapshot interface -------------- - void crc( Xfer *xfer ); - void xfer( Xfer *xfer ); - void loadPostProcess(); + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; private: Object* m_parent; ///< Object I am owned by diff --git a/Generals/Code/GameEngine/Include/GameLogic/FiringTracker.h b/Generals/Code/GameEngine/Include/GameLogic/FiringTracker.h index 46637984e5e..aac2dc3cd3b 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/FiringTracker.h +++ b/Generals/Code/GameEngine/Include/GameLogic/FiringTracker.h @@ -57,9 +57,9 @@ class FiringTracker : public UpdateModule Int getNumConsecutiveShotsAtVictim( const Object *victim ) const; /// this is never disabled, since we want disabled things to continue to slowly "spin down"... (srj) - virtual DisabledMaskType getDisabledTypesToProcess() const { return DISABLEDMASK_ALL; } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return DISABLEDMASK_ALL; } - virtual UpdateSleepTime update(); ///< See if spin down is needed because we haven't shot in a while + virtual UpdateSleepTime update() override; ///< See if spin down is needed because we haven't shot in a while protected: @@ -68,7 +68,7 @@ class FiringTracker : public UpdateModule user update modules, so it redefines this. Please don't redefine this for other modules without very careful deliberation. (srj) */ - virtual SleepyUpdatePhase getUpdatePhase() const + virtual SleepyUpdatePhase getUpdatePhase() const override { return PHASE_FINAL; } diff --git a/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h b/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h index a5b91bb8f6f..bd7cc32d7ae 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h +++ b/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h @@ -101,12 +101,12 @@ class GameLogic : public SubsystemInterface, public Snapshot public: GameLogic(); - virtual ~GameLogic(); + virtual ~GameLogic() override; // subsystem methods - virtual void init(); ///< Initialize or re-initialize the instance - virtual void reset(); ///< Reset the logic system - virtual void update(); ///< update the world + virtual void init() override; ///< Initialize or re-initialize the instance + virtual void reset() override; ///< Reset the logic system + virtual void update() override; ///< update the world void preUpdate(); @@ -246,9 +246,9 @@ class GameLogic : public SubsystemInterface, public Snapshot 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; private: diff --git a/Generals/Code/GameEngine/Include/GameLogic/GhostObject.h b/Generals/Code/GameEngine/Include/GameLogic/GhostObject.h index 6c63ee2f769..eebaf3cea78 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/GhostObject.h +++ b/Generals/Code/GameEngine/Include/GameLogic/GhostObject.h @@ -56,9 +56,9 @@ class GhostObject : public Snapshot const Coord3D *getParentPosition() const {return &m_parentPosition;} protected: - 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; Object *m_parentObject; ///< object which we are ghosting GeometryType m_parentGeometryType; @@ -89,9 +89,9 @@ class GhostObjectManager : public Snapshot inline Bool trackAllPlayers() const; ///< returns whether the ghost object status is tracked for all players or for the local player only protected: - 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; Int m_localPlayer; Bool m_lockGhostObjects; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h b/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h index c8d23e750e9..22ab24b7e6e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h @@ -383,9 +383,9 @@ class Locomotor : public MemoryPoolObject, public Snapshot 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: @@ -457,11 +457,11 @@ class LocomotorStore : public SubsystemInterface public: LocomotorStore(); - ~LocomotorStore(); + virtual ~LocomotorStore() override; - void init() { }; - void reset(); - void update(); + virtual void init() override { }; + virtual void reset() override; + virtual void update() override; /** Find the LocomotorTemplate with the given name. If no such LocomotorTemplate exists, return null. diff --git a/Generals/Code/GameEngine/Include/GameLogic/LocomotorSet.h b/Generals/Code/GameEngine/Include/GameLogic/LocomotorSet.h index 134d8646247..e7c107ecf08 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/LocomotorSet.h +++ b/Generals/Code/GameEngine/Include/GameLogic/LocomotorSet.h @@ -86,9 +86,9 @@ class LocomotorSet : public Snapshot 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; public: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h index 19dd94ab080..66fd996b7d3 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h @@ -199,9 +199,9 @@ class AIUpdateModuleData : public UpdateModuleData #endif AIUpdateModuleData(); - virtual ~AIUpdateModuleData(); + virtual ~AIUpdateModuleData() override; - virtual Bool isAiModuleData() const { return true; } + virtual Bool isAiModuleData() const override { return true; } const LocomotorTemplateVector* findLocomotorTemplateVector(LocomotorSetType t) const; static void buildFieldParse(MultiIniFieldParse& p); @@ -291,10 +291,10 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface AIUpdateInterface( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual AIUpdateInterface* getAIUpdateInterface() { return this; } + virtual AIUpdateInterface* getAIUpdateInterface() override { return this; } // Disabled conditions to process (AI will still process held status) - virtual DisabledMaskType getDisabledTypesToProcess() const { return MAKE_DISABLED_MASK( DISABLED_HELD ); } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return MAKE_DISABLED_MASK( DISABLED_HELD ); } // Some very specific, complex behaviors are used by more than one AIUpdate. Here are their interfaces. virtual DozerAIInterface* getDozerAIInterface() {return nullptr;} @@ -337,10 +337,10 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface //Definition of busy -- when explicitly in the busy state. Moving or attacking is not considered busy! virtual Bool isBusy() const; - virtual void onObjectCreated(); + virtual void onObjectCreated() override; virtual void doQuickExit( std::vector* path ); ///< get out of this Object - virtual void aiDoCommand(const AICommandParms* parms); + virtual void aiDoCommand(const AICommandParms* parms) override; virtual const Coord3D *getGuardLocation() const { return &m_locationToGuard; } virtual ObjectID getGuardObject() const { return m_objectToGuard; } @@ -511,7 +511,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface Bool hasHigherPathPriority(AIUpdateInterface *otherAI) const; void setFinalPosition(const Coord3D *pos) { m_finalPosition = *pos; m_doFinalPosition = false;} - virtual UpdateSleepTime update(); ///< update this object's AI + virtual UpdateSleepTime update() override; ///< update this object's AI /// if we are attacking "fromID", stop that and attack "toID" instead void transferAttack(ObjectID fromID, ObjectID toID); @@ -589,7 +589,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface interesting oscillations can occur in some situations, with friction being applied either before or after the locomotive force, making for huge stuttery messes. (srj) */ - virtual SleepyUpdatePhase getUpdatePhase() const { return PHASE_INITIAL; } + virtual SleepyUpdatePhase getUpdatePhase() const override { return PHASE_INITIAL; } void setGoalPositionClipped(const Coord3D* in, CommandSourceType cmdSource); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h index 8af9d5a040a..9c80b361d93 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h @@ -68,46 +68,46 @@ class ActiveBody : public BodyModule ActiveBody( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onDelete(); + virtual void onDelete() override; - virtual void attemptDamage( DamageInfo *damageInfo ); ///< try to damage this object - virtual Real estimateDamage( DamageInfoInput& damageInfo ) const; - virtual void attemptHealing( DamageInfo *damageInfo ); ///< try to heal this object - virtual Real getHealth() const; ///< get current health - virtual BodyDamageType getDamageState() const; - virtual void setDamageState( BodyDamageType newState ); ///< control damage state directly. Will adjust hitpoints. - virtual void setAflame( Bool setting );///< This is a major change like a damage state. + virtual void attemptDamage( DamageInfo *damageInfo ) override; ///< try to damage this object + virtual Real estimateDamage( DamageInfoInput& damageInfo ) const override; + virtual void attemptHealing( DamageInfo *damageInfo ) override; ///< try to heal this object + virtual Real getHealth() const override; ///< get current health + virtual BodyDamageType getDamageState() const override; + virtual void setDamageState( BodyDamageType newState ) override; ///< control damage state directly. Will adjust hitpoints. + virtual void setAflame( Bool setting ) override;///< This is a major change like a damage state. - virtual const DamageInfo *getLastDamageInfo() const { return &m_lastDamageInfo; } ///< return info on last damage dealt to this object - virtual UnsignedInt getLastDamageTimestamp() const { return m_lastDamageTimestamp; } ///< return frame of last damage dealt - virtual UnsignedInt getLastHealingTimestamp() const { return m_lastHealingTimestamp; } ///< return frame of last damage dealt - virtual ObjectID getClearableLastAttacker() const { return (m_lastDamageCleared ? INVALID_ID : m_lastDamageInfo.in.m_sourceID); } - virtual void clearLastAttacker() { m_lastDamageCleared = true; } + virtual const DamageInfo *getLastDamageInfo() const override { return &m_lastDamageInfo; } ///< return info on last damage dealt to this object + virtual UnsignedInt getLastDamageTimestamp() const override { return m_lastDamageTimestamp; } ///< return frame of last damage dealt + virtual UnsignedInt getLastHealingTimestamp() const override { return m_lastHealingTimestamp; } ///< return frame of last damage dealt + virtual ObjectID getClearableLastAttacker() const override { return (m_lastDamageCleared ? INVALID_ID : m_lastDamageInfo.in.m_sourceID); } + virtual void clearLastAttacker() override { m_lastDamageCleared = true; } - void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback = TRUE ); + virtual void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback = TRUE ) override; - virtual void setArmorSetFlag(ArmorSetType ast) { m_curArmorSetFlags.set(ast, 1); } - virtual void clearArmorSetFlag(ArmorSetType ast) { m_curArmorSetFlags.set(ast, 0); } + virtual void setArmorSetFlag(ArmorSetType ast) override { m_curArmorSetFlags.set(ast, 1); } + virtual void clearArmorSetFlag(ArmorSetType ast) override { m_curArmorSetFlags.set(ast, 0); } - virtual void setInitialHealth(Int initialPercent); ///< Sets the initial load health %. - virtual void setMaxHealth( Real maxHealth, MaxHealthChangeType healthChangeType = SAME_CURRENTHEALTH ); ///< Sets the initial max health + virtual void setInitialHealth(Int initialPercent) override; ///< Sets the initial load health %. + virtual void setMaxHealth( Real maxHealth, MaxHealthChangeType healthChangeType = SAME_CURRENTHEALTH ) override; ///< Sets the initial max health - virtual Bool getFrontCrushed() const { return m_frontCrushed; } - virtual Bool getBackCrushed() const { return m_backCrushed; } + virtual Bool getFrontCrushed() const override { return m_frontCrushed; } + virtual Bool getBackCrushed() const override { return m_backCrushed; } - virtual void setFrontCrushed(Bool v) { m_frontCrushed = v; } - virtual void setBackCrushed(Bool v) { m_backCrushed = v; } + virtual void setFrontCrushed(Bool v) override { m_frontCrushed = v; } + virtual void setBackCrushed(Bool v) override { m_backCrushed = v; } - virtual Real getMaxHealth() const; ///< return max health - virtual Real getInitialHealth() const; // return initial health + virtual Real getMaxHealth() const override; ///< return max health + virtual Real getInitialHealth() const override; // return initial health - virtual void setIndestructible( Bool indestructible ); - virtual Bool isIndestructible() const { return m_indestructible; } + virtual void setIndestructible( Bool indestructible ) override; + virtual Bool isIndestructible() const override { return m_indestructible; } - virtual void internalChangeHealth( Real delta ); ///< change health + virtual void internalChangeHealth( Real delta ) override; ///< change health - virtual void evaluateVisualCondition(); - virtual void updateBodyParticleSystems();// made public for topple anf building collapse updates -ML + virtual void evaluateVisualCondition() override; + virtual void updateBodyParticleSystems() override;// made public for topple anf building collapse updates -ML protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h index d1c4606b72b..ca89b9064ad 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h @@ -68,7 +68,7 @@ class ActiveShroudUpgrade : public UpgradeModule protected: - virtual void upgradeImplementation(); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation() override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h index 35f8c146df7..6c713002b71 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h @@ -75,8 +75,8 @@ class ArmorUpgrade : public UpgradeModule // virtual destructor prototype defined by MemoryPoolObject protected: - virtual void upgradeImplementation( ); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation( ) override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h index 38571a42640..64720aafe45 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h @@ -90,12 +90,12 @@ class AssaultTransportAIUpdate : public AIUpdateInterface, public AssaultTranspo AssaultTransportAIUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void aiDoCommand(const AICommandParms* parms); - virtual Bool isIdle() const; - virtual UpdateSleepTime update(); - virtual AssaultTransportAIInterface* getAssaultTransportAIInterface() { return this; } - virtual const AssaultTransportAIInterface* getAssaultTransportAIInterface() const { return this; } - virtual void beginAssault( const Object *designatedTarget ) const; + virtual void aiDoCommand(const AICommandParms* parms) override; + virtual Bool isIdle() const override; + virtual UpdateSleepTime update() override; + virtual AssaultTransportAIInterface* getAssaultTransportAIInterface() override { return this; } + virtual const AssaultTransportAIInterface* getAssaultTransportAIInterface() const override { return this; } + virtual void beginAssault( const Object *designatedTarget ) const override; UpdateSleepTime calcSleepTime(); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h index 802da8ff781..04284c0f18a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h @@ -65,7 +65,7 @@ class AssistedTargetingUpdate : public UpdateModule AssistedTargetingUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; Bool isFreeToAssist() const; void assistAttack( const Object *requestingObject, Object *victimObject ); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h index 388906bbec2..5aaedde7523 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h @@ -110,7 +110,7 @@ class AutoDepositUpdate : public UpdateModule // virtual destructor prototype provided by memory pool declaration void awardInitialCaptureBonus( Player *player ); // Test and award the initial capture bonus - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h index 5786e668631..062b3d8bf49 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h @@ -69,8 +69,8 @@ class AutoFindHealingUpdate : public UpdateModule AutoFindHealingUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onObjectCreated(); - virtual UpdateSleepTime update(); + virtual void onObjectCreated() override; + virtual UpdateSleepTime update() override; Object* scanClosestTarget(); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h index de6c91aa4c7..64d77d3542f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h @@ -117,46 +117,46 @@ class AutoHealBehavior : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | MODULEINTERFACE_UPGRADE | MODULEINTERFACE_DAMAGE; } // BehaviorModule - virtual UpgradeModuleInterface* getUpgrade() { return this; } - virtual DamageModuleInterface* getDamage() { return this; } + virtual UpgradeModuleInterface* getUpgrade() override { return this; } + virtual DamageModuleInterface* getDamage() override { return this; } // DamageModuleInterface - virtual void onDamage( DamageInfo *damageInfo ); - virtual void onHealing( DamageInfo *damageInfo ) { } - virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState) { } + virtual void onDamage( DamageInfo *damageInfo ) override; + virtual void onHealing( DamageInfo *damageInfo ) override { } + virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState) override { } // UpdateModuleInterface - virtual UpdateSleepTime update(); - virtual DisabledMaskType getDisabledTypesToProcess() const { return MAKE_DISABLED_MASK( DISABLED_HELD ); } + virtual UpdateSleepTime update() override; + virtual DisabledMaskType getDisabledTypesToProcess() const override { return MAKE_DISABLED_MASK( DISABLED_HELD ); } void stopHealing(); void undoUpgrade(); ///m_upgradeMuxData.getUpgradeActivationMasks(activation, conflicting); } - virtual void performUpgradeFX() + virtual void performUpgradeFX() override { getAutoHealBehaviorModuleData()->m_upgradeMuxData.performUpgradeFX(getObject()); } - virtual Bool requiresAllActivationUpgrades() const + virtual Bool requiresAllActivationUpgrades() const override { return getAutoHealBehaviorModuleData()->m_upgradeMuxData.m_requiresAllTriggers; } Bool isUpgradeActive() const { return isAlreadyUpgraded(); } - virtual Bool isSubObjectsUpgrade() { return false; } + virtual Bool isSubObjectsUpgrade() override { return false; } private: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h index 80a93df9812..10164f37a0d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h @@ -76,8 +76,8 @@ class BaikonurLaunchPower : public SpecialPowerModule BaikonurLaunchPower( Thing *thing, const ModuleData *moduleData ); - virtual void doSpecialPower( UnsignedInt commandOptions ); - virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ); + virtual void doSpecialPower( UnsignedInt commandOptions ) override; + virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ) override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h index 3cebcdd8894..fdf16855298 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h @@ -64,16 +64,16 @@ class BaseRegenerateUpdate : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | MODULEINTERFACE_DAMAGE; } // BehaviorModule - virtual DamageModuleInterface* getDamage() { return this; } + virtual DamageModuleInterface* getDamage() override { return this; } // UpdateModuleInterface - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // DamageModuleInterface - virtual void onDamage( DamageInfo *damageInfo ); - virtual void onHealing( DamageInfo *damageInfo ) { } - virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState) { } - virtual DisabledMaskType getDisabledTypesToProcess() const { return MAKE_DISABLED_MASK( DISABLED_UNDERPOWERED ); } + virtual void onDamage( DamageInfo *damageInfo ) override; + virtual void onHealing( DamageInfo *damageInfo ) override { } + virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState) override { } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return MAKE_DISABLED_MASK( DISABLED_UNDERPOWERED ); } private: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h index 0c293c9b2f7..ae93f31951f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h @@ -146,24 +146,24 @@ class BattlePlanUpdate : public UpdateModule, public SpecialPowerUpdateInterface // virtual destructor prototype provided by memory pool declaration // SpecialPowerUpdateInterface - virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ); - virtual Bool isSpecialAbility() const { return false; } - virtual Bool isSpecialPower() const { return true; } - virtual Bool isActive() const {return m_status != TRANSITIONSTATUS_IDLE;} - virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() { return this; } - virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const { return false; } //Is it active now? - virtual Bool doesSpecialPowerHaveOverridableDestination() const { return false; } //Does it have it, even if it's not active? - virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ) {} - virtual Bool isPowerCurrentlyInUse( const CommandButton *command = nullptr ) const; + virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ) override; + virtual Bool isSpecialAbility() const override { return false; } + virtual Bool isSpecialPower() const override { return true; } + virtual Bool isActive() const override {return m_status != TRANSITIONSTATUS_IDLE;} + virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() override { return this; } + virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const override { return false; } //Is it active now? + virtual Bool doesSpecialPowerHaveOverridableDestination() const override { return false; } //Does it have it, even if it's not active? + virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ) override {} + virtual Bool isPowerCurrentlyInUse( const CommandButton *command = nullptr ) const override; //Returns the currently active battle plan -- unpacked and ready... returns PLANSTATUS_NONE if in transition! BattlePlanStatus getActiveBattlePlan() const; - virtual void onObjectCreated(); - virtual void onDelete(); - virtual UpdateSleepTime update(); + virtual void onObjectCreated() override; + virtual void onDelete() override; + virtual UpdateSleepTime update() override; - virtual CommandOption getCommandOption() const; + virtual CommandOption getCommandOption() const override; protected: void setStatus( TransitionStatus status ); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h index 0adc0fc8c83..4a3987db749 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h @@ -151,49 +151,49 @@ class BehaviorModule : public ObjectModule, public BehaviorModuleInterface static Int getInterfaceMask() { return 0; } static ModuleType getModuleType() { return MODULETYPE_BEHAVIOR; } - virtual BodyModuleInterface* getBody() { return nullptr; } - virtual CollideModuleInterface* getCollide() { return nullptr; } - virtual ContainModuleInterface* getContain() { return nullptr; } - virtual CreateModuleInterface* getCreate() { return nullptr; } - virtual DamageModuleInterface* getDamage() { return nullptr; } - virtual DestroyModuleInterface* getDestroy() { return nullptr; } - virtual DieModuleInterface* getDie() { return nullptr; } - virtual SpecialPowerModuleInterface* getSpecialPower() { return nullptr; } - virtual UpdateModuleInterface* getUpdate() { return nullptr; } - virtual UpgradeModuleInterface* getUpgrade() { return nullptr; } + virtual BodyModuleInterface* getBody() override { return nullptr; } + virtual CollideModuleInterface* getCollide() override { return nullptr; } + virtual ContainModuleInterface* getContain() override { return nullptr; } + virtual CreateModuleInterface* getCreate() override { return nullptr; } + virtual DamageModuleInterface* getDamage() override { return nullptr; } + virtual DestroyModuleInterface* getDestroy() override { return nullptr; } + virtual DieModuleInterface* getDie() override { return nullptr; } + virtual SpecialPowerModuleInterface* getSpecialPower() override { return nullptr; } + virtual UpdateModuleInterface* getUpdate() override { return nullptr; } + virtual UpgradeModuleInterface* getUpgrade() override { return nullptr; } virtual StealthUpdate* getStealth() { return nullptr; } - virtual ParkingPlaceBehaviorInterface* getParkingPlaceBehaviorInterface() { return nullptr; } - virtual RebuildHoleBehaviorInterface* getRebuildHoleBehaviorInterface() { return nullptr; } - virtual BridgeBehaviorInterface* getBridgeBehaviorInterface() { return nullptr; } - virtual BridgeTowerBehaviorInterface* getBridgeTowerBehaviorInterface() { return nullptr; } - virtual BridgeScaffoldBehaviorInterface* getBridgeScaffoldBehaviorInterface() { return nullptr; } - virtual OverchargeBehaviorInterface* getOverchargeBehaviorInterface() { return nullptr; } - virtual TransportPassengerInterface* getTransportPassengerInterface() { return nullptr; } - virtual CaveInterface* getCaveInterface() { return nullptr; } - virtual LandMineInterface* getLandMineInterface() { return nullptr; } - virtual DieModuleInterface* getEjectPilotDieInterface() { return nullptr; } + virtual ParkingPlaceBehaviorInterface* getParkingPlaceBehaviorInterface() override { return nullptr; } + virtual RebuildHoleBehaviorInterface* getRebuildHoleBehaviorInterface() override { return nullptr; } + virtual BridgeBehaviorInterface* getBridgeBehaviorInterface() override { return nullptr; } + virtual BridgeTowerBehaviorInterface* getBridgeTowerBehaviorInterface() override { return nullptr; } + virtual BridgeScaffoldBehaviorInterface* getBridgeScaffoldBehaviorInterface() override { return nullptr; } + virtual OverchargeBehaviorInterface* getOverchargeBehaviorInterface() override { return nullptr; } + virtual TransportPassengerInterface* getTransportPassengerInterface() override { return nullptr; } + virtual CaveInterface* getCaveInterface() override { return nullptr; } + virtual LandMineInterface* getLandMineInterface() override { return nullptr; } + virtual DieModuleInterface* getEjectPilotDieInterface() override { return nullptr; } // interface acquisition (moved from UpdateModule) - virtual ProjectileUpdateInterface* getProjectileUpdateInterface() { return nullptr; } - virtual AIUpdateInterface* getAIUpdateInterface() { return nullptr; } - virtual ExitInterface* getUpdateExitInterface() { return nullptr; } - virtual DelayedUpgradeUpdateInterface* getDelayedUpgradeUpdateInterface() { return nullptr; } - virtual DockUpdateInterface* getDockUpdateInterface() { return nullptr; } - virtual RailedTransportDockUpdateInterface *getRailedTransportDockUpdateInterface() { return nullptr; } - virtual SlowDeathBehaviorInterface* getSlowDeathBehaviorInterface() { return nullptr; } - virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() { return nullptr; } - virtual SlavedUpdateInterface* getSlavedUpdateInterface() { return nullptr; } - virtual ProductionUpdateInterface* getProductionUpdateInterface() { return nullptr; } - virtual HordeUpdateInterface* getHordeUpdateInterface() { return nullptr; } - virtual PowerPlantUpdateInterface* getPowerPlantUpdateInterface() { return nullptr; } - virtual SpawnBehaviorInterface* getSpawnBehaviorInterface() { return nullptr; } + virtual ProjectileUpdateInterface* getProjectileUpdateInterface() override { return nullptr; } + virtual AIUpdateInterface* getAIUpdateInterface() override { return nullptr; } + virtual ExitInterface* getUpdateExitInterface() override { return nullptr; } + virtual DelayedUpgradeUpdateInterface* getDelayedUpgradeUpdateInterface() override { return nullptr; } + virtual DockUpdateInterface* getDockUpdateInterface() override { return nullptr; } + virtual RailedTransportDockUpdateInterface *getRailedTransportDockUpdateInterface() override { return nullptr; } + virtual SlowDeathBehaviorInterface* getSlowDeathBehaviorInterface() override { return nullptr; } + virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() override { return nullptr; } + virtual SlavedUpdateInterface* getSlavedUpdateInterface() override { return nullptr; } + virtual ProductionUpdateInterface* getProductionUpdateInterface() override { return nullptr; } + virtual HordeUpdateInterface* getHordeUpdateInterface() override { return nullptr; } + virtual PowerPlantUpdateInterface* getPowerPlantUpdateInterface() override { return nullptr; } + virtual SpawnBehaviorInterface* getSpawnBehaviorInterface() override { return nullptr; } 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; }; inline BehaviorModule::BehaviorModule( Thing *thing, const ModuleData* moduleData ) : ObjectModule( thing, moduleData ) { } diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h index 0d538b1c03a..161d56e6a5e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h @@ -205,7 +205,7 @@ class BodyModule : public BehaviorModule, public BodyModuleInterface static Int getInterfaceMask() { return MODULEINTERFACE_BODY; } // BehaviorModule - virtual BodyModuleInterface* getBody() { return this; } + virtual BodyModuleInterface* getBody() override { return this; } /** Try to damage this Object. The module's Armor @@ -213,13 +213,13 @@ class BodyModule : public BehaviorModule, public BodyModuleInterface considerably from what you requested. Also note that (if damage is done) the DamageFX will be invoked to provide a/v fx as appropriate. */ - virtual void attemptDamage( DamageInfo *damageInfo ) = 0; + virtual void attemptDamage( DamageInfo *damageInfo ) override = 0; /** Instead of having negative damage count as healing, or allowing access to the private changeHealth Method, we will use this parallel to attemptDamage to do healing without hack. */ - virtual void attemptHealing( DamageInfo *healingInfo ) = 0; + virtual void attemptHealing( DamageInfo *healingInfo ) override = 0; /** Estimate the (unclipped) damage that would be done to this object @@ -227,44 +227,44 @@ class BodyModule : public BehaviorModule, public BodyModuleInterface but DO NOT alter the body in any way. (This is used by the AI system to choose weapons.) */ - virtual Real estimateDamage( DamageInfoInput& damageInfo ) const = 0; + virtual Real estimateDamage( DamageInfoInput& damageInfo ) const override = 0; - virtual Real getHealth() const = 0; ///< get current health + virtual Real getHealth() const override = 0; ///< get current health - virtual Real getMaxHealth() const {return 0.0f;} ///< return max health + virtual Real getMaxHealth() const override {return 0.0f;} ///< return max health - virtual Real getInitialHealth() const {return 0.0f;} // return initial health + virtual Real getInitialHealth() const override {return 0.0f;} // return initial health - virtual BodyDamageType getDamageState() const = 0; - virtual void setDamageState( BodyDamageType newState ) = 0; ///< control damage state directly. Will adjust hitpoints. - virtual void setAflame( Bool setting ) = 0;///< This is a major change like a damage state. + virtual BodyDamageType getDamageState() const override = 0; + virtual void setDamageState( BodyDamageType newState ) override = 0; ///< control damage state directly. Will adjust hitpoints. + virtual void setAflame( Bool setting ) override = 0;///< This is a major change like a damage state. - virtual void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback = FALSE ) = 0; ///< I just achieved this level right this moment + virtual void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback = FALSE ) override = 0; ///< I just achieved this level right this moment - virtual void setArmorSetFlag(ArmorSetType ast) = 0; - virtual void clearArmorSetFlag(ArmorSetType ast) = 0; + virtual void setArmorSetFlag(ArmorSetType ast) override = 0; + virtual void clearArmorSetFlag(ArmorSetType ast) override = 0; - virtual const DamageInfo *getLastDamageInfo() const { return nullptr; } ///< return info on last damage dealt to this object - virtual UnsignedInt getLastDamageTimestamp() const { return 0; } ///< return frame of last damage dealt - virtual UnsignedInt getLastHealingTimestamp() const { return 0; } ///< return frame of last healing dealt - virtual ObjectID getClearableLastAttacker() const { return INVALID_ID; } - virtual void clearLastAttacker() { } - virtual Bool getFrontCrushed() const { return false; } - virtual Bool getBackCrushed() const { return false; } + virtual const DamageInfo *getLastDamageInfo() const override { return nullptr; } ///< return info on last damage dealt to this object + virtual UnsignedInt getLastDamageTimestamp() const override { return 0; } ///< return frame of last damage dealt + virtual UnsignedInt getLastHealingTimestamp() const override { return 0; } ///< return frame of last healing dealt + virtual ObjectID getClearableLastAttacker() const override { return INVALID_ID; } + virtual void clearLastAttacker() override { } + virtual Bool getFrontCrushed() const override { return false; } + virtual Bool getBackCrushed() const override { return false; } - virtual void setInitialHealth(Int initialPercent) { } ///< Sets the initial load health %. - virtual void setMaxHealth(Real maxHealth, MaxHealthChangeType healthChangeType = SAME_CURRENTHEALTH ) { } ///< Sets the max health. + virtual void setInitialHealth(Int initialPercent) override { } ///< Sets the initial load health %. + virtual void setMaxHealth(Real maxHealth, MaxHealthChangeType healthChangeType = SAME_CURRENTHEALTH ) override { } ///< Sets the max health. - virtual void setFrontCrushed(Bool v) { DEBUG_CRASH(("you should never call this for generic Bodys")); } - virtual void setBackCrushed(Bool v) { DEBUG_CRASH(("you should never call this for generic Bodys")); } + virtual void setFrontCrushed(Bool v) override { DEBUG_CRASH(("you should never call this for generic Bodys")); } + virtual void setBackCrushed(Bool v) override { DEBUG_CRASH(("you should never call this for generic Bodys")); } - virtual void setIndestructible( Bool indestructible ) { } - virtual Bool isIndestructible() const { return TRUE; } + virtual void setIndestructible( Bool indestructible ) override { } + virtual Bool isIndestructible() const override { return TRUE; } //Allows outside systems to apply defensive bonuses or penalties (they all stack as a multiplier!) - virtual void applyDamageScalar( Real scalar ) { m_damageScalar *= scalar; } - virtual Real getDamageScalar() const { return m_damageScalar; } + virtual void applyDamageScalar( Real scalar ) override { m_damageScalar *= scalar; } + virtual Real getDamageScalar() const override { return m_damageScalar; } /** Change the module's health by the given delta. Note that @@ -273,17 +273,17 @@ class BodyModule : public BehaviorModule, public BodyModuleInterface call this directly (especially when when decreasing health, since you probably want "attemptDamage" or "attemptHealing") */ - virtual void internalChangeHealth( Real delta ) = 0; + virtual void internalChangeHealth( Real delta ) override = 0; - virtual void evaluateVisualCondition() { } - virtual void updateBodyParticleSystems() { };// made public for topple anf building collapse updates -ML + virtual void evaluateVisualCondition() override { } + virtual void updateBodyParticleSystems() override { };// made public for topple anf building collapse updates -ML 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; Real m_damageScalar; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h index b1959cb10f4..ebe6a5d7017 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h @@ -52,14 +52,14 @@ class BoneFXDamage : public DamageModule // virtual destructor prototype provided by memory pool declaration // damage module methods - virtual void onDamage( DamageInfo *damageInfo ) { } - virtual void onHealing( DamageInfo *damageInfo ) { } + virtual void onDamage( DamageInfo *damageInfo ) override { } + virtual void onHealing( DamageInfo *damageInfo ) override { } virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, BodyDamageType oldState, - BodyDamageType newState ); + BodyDamageType newState ) override; protected: - virtual void onObjectCreated(); + virtual void onObjectCreated() override; }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h index 593552ba916..30c6fd2e749 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h @@ -241,11 +241,11 @@ class BoneFXUpdate : public UpdateModule void changeBodyDamageState( BodyDamageType oldState, BodyDamageType newState); void stopAllBoneFX(); - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: - virtual void onObjectCreated(); + virtual void onObjectCreated() override; virtual void resolveBoneLocations(); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h index e56ecd7f5dd..c135919cf29 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h @@ -95,7 +95,7 @@ class BridgeBehaviorModuleData : public BehaviorModuleData public: BridgeBehaviorModuleData(); - ~BridgeBehaviorModuleData(); + ~BridgeBehaviorModuleData() override; static void buildFieldParse( MultiIniFieldParse &p ); @@ -129,33 +129,33 @@ class BridgeBehavior : public UpdateModule, static Int getInterfaceMask() { return (MODULEINTERFACE_DAMAGE) | (MODULEINTERFACE_DIE) | (MODULEINTERFACE_UPDATE); } - virtual BridgeBehaviorInterface* getBridgeBehaviorInterface() { return this; } - virtual void onDelete(); + virtual BridgeBehaviorInterface* getBridgeBehaviorInterface() override { return this; } + virtual void onDelete() override; // Damage methods - virtual DamageModuleInterface* getDamage() { return this; } - virtual void onDamage( DamageInfo *damageInfo ); - virtual void onHealing( DamageInfo *damageInfo ); + virtual DamageModuleInterface* getDamage() override { return this; } + virtual void onDamage( DamageInfo *damageInfo ) override; + virtual void onHealing( DamageInfo *damageInfo ) override; virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, BodyDamageType oldState, - BodyDamageType newState ); + BodyDamageType newState ) override; // Die methods - virtual DieModuleInterface* getDie() { return this; } - virtual void onDie( const DamageInfo *damageInfo ); + virtual DieModuleInterface* getDie() override { return this; } + virtual void onDie( const DamageInfo *damageInfo ) override; // Update methods - virtual UpdateModuleInterface *getUpdate() { return this; } - virtual UpdateSleepTime update(); + virtual UpdateModuleInterface *getUpdate() override { return this; } + virtual UpdateSleepTime update() override; // our own methods static BridgeBehaviorInterface *getBridgeBehaviorInterfaceFromObject( Object *obj ); - virtual void setTower( BridgeTowerType towerType, Object *tower ); ///< connect tower to us - virtual ObjectID getTowerID( BridgeTowerType towerType ); ///< retrive one of our towers - virtual void createScaffolding(); ///< create scaffolding around bridge - virtual void removeScaffolding(); ///< remove scaffolding around bridge - virtual Bool isScaffoldInMotion(); ///< is scaffold in motion - virtual Bool isScaffoldPresent() { return m_scaffoldPresent; } + virtual void setTower( BridgeTowerType towerType, Object *tower ) override; ///< connect tower to us + virtual ObjectID getTowerID( BridgeTowerType towerType ) override; ///< retrive one of our towers + virtual void createScaffolding() override; ///< create scaffolding around bridge + virtual void removeScaffolding() override; ///< remove scaffolding around bridge + virtual Bool isScaffoldInMotion() override; ///< is scaffold in motion + virtual Bool isScaffoldPresent() override { return m_scaffoldPresent; } protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h index 9a94fe58532..dbe0a7fd89e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h @@ -77,20 +77,20 @@ class BridgeScaffoldBehavior : public UpdateModule, // virtual destructor prototype provided by memory pool declaration // behavior module methods - virtual BridgeScaffoldBehaviorInterface* getBridgeScaffoldBehaviorInterface() { return this; } + virtual BridgeScaffoldBehaviorInterface* getBridgeScaffoldBehaviorInterface() override { return this; } // update methods - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // bridge scaffold interface methods virtual void setPositions( const Coord3D *createPos, const Coord3D *riseToPos, - const Coord3D *buildPos ); - virtual void setMotion( ScaffoldTargetMotion targetMotion ); - virtual ScaffoldTargetMotion getCurrentMotion() { return m_targetMotion; } - virtual void reverseMotion(); - virtual void setLateralSpeed( Real lateralSpeed ) { m_lateralSpeed = lateralSpeed; } - virtual void setVerticalSpeed( Real verticalSpeed ) { m_verticalSpeed = verticalSpeed; } + const Coord3D *buildPos ) override; + virtual void setMotion( ScaffoldTargetMotion targetMotion ) override; + virtual ScaffoldTargetMotion getCurrentMotion() override { return m_targetMotion; } + virtual void reverseMotion() override; + virtual void setLateralSpeed( Real lateralSpeed ) override { m_lateralSpeed = lateralSpeed; } + virtual void setVerticalSpeed( Real verticalSpeed ) override { m_verticalSpeed = verticalSpeed; } // public interface acquisition static BridgeScaffoldBehaviorInterface *getBridgeScaffoldBehaviorInterfaceFromObject( Object *obj ); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h index 6cf7e2dc37a..82cd99da09c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h @@ -66,25 +66,25 @@ class BridgeTowerBehavior : public BehaviorModule, // virtual destructor prototype provided by memory pool declaration static Int getInterfaceMask() { return (MODULEINTERFACE_DAMAGE) | (MODULEINTERFACE_DIE); } - BridgeTowerBehaviorInterface* getBridgeTowerBehaviorInterface() { return this; } + BridgeTowerBehaviorInterface* getBridgeTowerBehaviorInterface() override { return this; } - virtual void setBridge( Object *bridge ); - virtual ObjectID getBridgeID(); - virtual void setTowerType( BridgeTowerType type ); + virtual void setBridge( Object *bridge ) override; + virtual ObjectID getBridgeID() override; + virtual void setTowerType( BridgeTowerType type ) override; static BridgeTowerBehaviorInterface *getBridgeTowerBehaviorInterfaceFromObject( Object *obj ); // Damage methods - virtual DamageModuleInterface* getDamage() { return this; } - virtual void onDamage( DamageInfo *damageInfo ); - virtual void onHealing( DamageInfo *damageInfo ); + virtual DamageModuleInterface* getDamage() override { return this; } + virtual void onDamage( DamageInfo *damageInfo ) override; + virtual void onHealing( DamageInfo *damageInfo ) override; virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, BodyDamageType oldState, - BodyDamageType newState ); + BodyDamageType newState ) override; // Die methods - virtual DieModuleInterface* getDie() { return this; } - virtual void onDie( const DamageInfo *damageInfo ); + virtual DieModuleInterface* getDie() override { return this; } + virtual void onDie( const DamageInfo *damageInfo ) override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h index 1ff8c9ad870..d338c2e8b26 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h @@ -113,11 +113,11 @@ class CashBountyPower : public SpecialPowerModule CashBountyPower( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype defined by MemoryPoolObject - virtual void onObjectCreated(); + virtual void onObjectCreated() override; //virtual void onBuildComplete(); ///< This is called when you are a finished game object - virtual void onSpecialPowerCreation(); ///< This is called when you are a finished game object - virtual void doSpecialPower( UnsignedInt commandOptions ) { return; } + virtual void onSpecialPowerCreation() override; ///< This is called when you are a finished game object + virtual void doSpecialPower( UnsignedInt commandOptions ) override { return; } protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h index 09a3ee4d84f..2f636770077 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h @@ -74,8 +74,8 @@ class CashHackSpecialPower : public SpecialPowerModule CashHackSpecialPower( Thing *thing, const ModuleData *moduleData ); // virtual destructor provided by memory pool object - virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions ); - virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ); + virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions ) override; + virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ) override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CaveContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CaveContain.h index 692ece8096a..3663ae85fa4 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CaveContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CaveContain.h @@ -74,44 +74,44 @@ class CaveContain : public OpenContain, public CreateModuleInterface, public Cav CaveContain( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual CreateModuleInterface* getCreate() { return this; } - virtual CaveInterface* getCaveInterface() { return this; } + virtual CreateModuleInterface* getCreate() override { return this; } + virtual CaveInterface* getCaveInterface() override { return this; } static Int getInterfaceMask() { return OpenContain::getInterfaceMask() | (MODULEINTERFACE_CREATE); } - virtual OpenContain *asOpenContain() { return this; } ///< treat as open container - virtual Bool isGarrisonable() const { return false; } ///< can this unit be Garrisoned? (ick) - virtual Bool isHealContain() const { return false; } ///< true when container only contains units while healing (not a transport!) + virtual OpenContain *asOpenContain() override { return this; } ///< treat as open container + virtual Bool isGarrisonable() const override { return false; } ///< can this unit be Garrisoned? (ick) + virtual Bool isHealContain() const override { return false; } ///< true when container only contains units while healing (not a transport!) - virtual void onContaining( Object *obj ); ///< object now contains 'obj' - virtual void onRemoving( Object *obj ); ///< object no longer contains 'obj' + virtual void onContaining( Object *obj ) override; ///< object now contains 'obj' + virtual void onRemoving( Object *obj ) override; ///< object no longer contains 'obj' - virtual Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const; - virtual void addToContainList( Object *obj ); ///< The part of AddToContain that inheritors can override (Can't do whole thing because of all the private stuff involved) - virtual void removeFromContain( Object *obj, Bool exposeStealthUnits = FALSE ); ///< remove 'obj' from contain list - virtual void removeAllContained( Bool exposeStealthUnits = FALSE ); ///< remove all objects on contain list + virtual Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const override; + virtual void addToContainList( Object *obj ) override; ///< The part of AddToContain that inheritors can override (Can't do whole thing because of all the private stuff involved) + virtual void removeFromContain( Object *obj, Bool exposeStealthUnits = FALSE ) override; ///< remove 'obj' from contain list + virtual void removeAllContained( Bool exposeStealthUnits = FALSE ) override; ///< remove all objects on contain list /** return the player that *appears* to control this unit. if null, use getObject()->getControllingPlayer() instead. */ - virtual void recalcApparentControllingPlayer(); + virtual void recalcApparentControllingPlayer() override; // contain list access - virtual void iterateContained( ContainIterateFunc func, void *userData, Bool reverse ); - virtual UnsignedInt getContainCount() const; - virtual Int getContainMax() const; - virtual const ContainedItemsList* getContainedItemsList() const; - virtual Bool isKickOutOnCapture(){ return FALSE; }///< Caves and Tunnels don't kick out on capture. + virtual void iterateContained( ContainIterateFunc func, void *userData, Bool reverse ) override; + virtual UnsignedInt getContainCount() const override; + virtual Int getContainMax() const override; + virtual const ContainedItemsList* getContainedItemsList() const override; + virtual Bool isKickOutOnCapture() override { return FALSE; }///< Caves and Tunnels don't kick out on capture. // override the onDie we inherit from OpenContain - virtual void onDie( const DamageInfo *damageInfo ); ///< the die callback + virtual void onDie( const DamageInfo *damageInfo ) override; ///< the die callback - virtual void onCreate(); - virtual void onBuildComplete(); ///< This is called when you are a finished game object - virtual Bool shouldDoOnBuildComplete() const { return m_needToRunOnBuildComplete; } + virtual void onCreate() override; + virtual void onBuildComplete() override; ///< This is called when you are a finished game object + virtual Bool shouldDoOnBuildComplete() const override { return m_needToRunOnBuildComplete; } // Unique to Cave Contain - virtual void tryToSetCaveIndex( Int newIndex ); ///< Called by script as an alternative to instancing separate objects. 'Try', because can fail. - virtual void setOriginalTeam( Team *oldTeam ); ///< This is a distributed Garrison in terms of capturing, so when one node triggers the change, he needs to tell everyone, so anyone can do the un-change. + virtual void tryToSetCaveIndex( Int newIndex ) override; ///< Called by script as an alternative to instancing separate objects. 'Try', because can fail. + virtual void setOriginalTeam( Team *oldTeam ) override; ///< This is a distributed Garrison in terms of capturing, so when one node triggers the change, he needs to tell everyone, so anyone can do the un-change. protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h index 1d5aa45ad38..99228c6c19f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h @@ -74,7 +74,7 @@ class CheckpointUpdate : public UpdateModule CheckpointUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: Bool m_enemyNear; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h index fc8102420d9..c0d09714d82 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h @@ -83,31 +83,31 @@ class ChinookAIUpdate : public SupplyTruckAIUpdate ChinookAIUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); - virtual void aiDoCommand(const AICommandParms* parms); - virtual Bool chooseLocomotorSet(LocomotorSetType wst); + virtual UpdateSleepTime update() override; + virtual void aiDoCommand(const AICommandParms* parms) override; + virtual Bool chooseLocomotorSet(LocomotorSetType wst) override; // this is present solely for some transports to override, so that they can land before // allowing people to exit... - virtual AIFreeToExitType getAiFreeToExit(const Object* exiter) const; - virtual Bool isAllowedToAdjustDestination() const; - virtual ObjectID getBuildingToNotPathAround() const; + virtual AIFreeToExitType getAiFreeToExit(const Object* exiter) const override; + virtual Bool isAllowedToAdjustDestination() const override; + virtual ObjectID getBuildingToNotPathAround() const override; // this is present for subclasses (eg, Chinook) to override, to // prevent supply-ferry behavior in some cases (eg, when toting passengers) - virtual Bool isAvailableForSupplying() const; - virtual Bool isCurrentlyFerryingSupplies() const; + virtual Bool isAvailableForSupplying() const override; + virtual Bool isCurrentlyFerryingSupplies() const override; - virtual Bool isIdle() const; + virtual Bool isIdle() const override; const ChinookAIUpdateModuleData* friend_getData() const { return getChinookAIUpdateModuleData(); } void friend_setFlightStatus(ChinookFlightStatus a) { m_flightStatus = a; } protected: - virtual AIStateMachine* makeStateMachine(); + virtual AIStateMachine* makeStateMachine() override; - virtual void privateCombatDrop( Object *target, const Coord3D& pos, CommandSourceType cmdSource ); - virtual void privateGetRepaired( Object *repairDepot, CommandSourceType cmdSource );///< get repaired at repair depot + virtual void privateCombatDrop( Object *target, const Coord3D& pos, CommandSourceType cmdSource ) override; + virtual void privateGetRepaired( Object *repairDepot, CommandSourceType cmdSource ) override;///< get repaired at repair depot private: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h index bda1ae8a052..7c6d454cee2 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h @@ -70,5 +70,5 @@ class CleanupAreaPower : public SpecialPowerModule CleanupAreaPower( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype defined by MemoryPoolObject - virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ); + virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ) override; }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h index a9d12e58ee5..a275b9b4b77 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h @@ -68,8 +68,8 @@ class CleanupHazardUpdate : public UpdateModule CleanupHazardUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onObjectCreated(); - virtual UpdateSleepTime update(); + virtual void onObjectCreated() override; + virtual UpdateSleepTime update() override; Object* scanClosestTarget(); void fireWhenReady(); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CollideModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CollideModule.h index c31d45f4194..a24b778d705 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CollideModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CollideModule.h @@ -82,16 +82,16 @@ class CollideModule : public BehaviorModule, static Int getInterfaceMask() { return MODULEINTERFACE_COLLIDE; } // BehaviorModule - virtual CollideModuleInterface* getCollide() { return this; } + virtual CollideModuleInterface* getCollide() override { return this; } - virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ) = 0; + virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ) override = 0; /// this is used for things like pilots, to determine if they can "enter" something - virtual Bool wouldLikeToCollideWith(const Object* other) const { return false; } - virtual Bool isHijackedVehicleCrateCollide() const { return false; } - virtual Bool isCarBombCrateCollide() const { return false; } - virtual Bool isRailroad() const { return false;} - virtual Bool isSalvageCrateCollide() const { return false; } + virtual Bool wouldLikeToCollideWith(const Object* other) const override { return false; } + virtual Bool isHijackedVehicleCrateCollide() const override { return false; } + virtual Bool isCarBombCrateCollide() const override { return false; } + virtual Bool isRailroad() const override { return false;} + virtual Bool isSalvageCrateCollide() const override { return false; } }; inline CollideModule::CollideModule( Thing *thing, const ModuleData* moduleData ) : BehaviorModule( thing, moduleData ) { } diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h index 2b94e2eccd8..887179026d0 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h @@ -67,8 +67,8 @@ class CommandButtonHuntUpdate : public UpdateModule CommandButtonHuntUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onObjectCreated(); - virtual UpdateSleepTime update(); + virtual void onObjectCreated() override; + virtual UpdateSleepTime update() override; void setCommandButton(const AsciiString& buttonName); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h index 271d87744c5..f5efc0b659b 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h @@ -58,7 +58,7 @@ class CommandSetUpgrade : public UpgradeModule // virtual destructor prototype defined by MemoryPoolObject protected: - virtual void upgradeImplementation( ); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation( ) override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h index 8a227f58fe8..07b298e3f1f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h @@ -79,10 +79,10 @@ class ConvertToCarBombCrateCollide : public CrateCollide protected: /// This allows specific vetoes to certain types of crates and their data - virtual Bool isValidToExecute( const Object *other ) const; + virtual Bool isValidToExecute( const Object *other ) const override; /// This is the game logic execution function that all real CrateCollides will implement - virtual Bool executeCrateBehavior( Object *other ); - virtual Bool isRailroad() const { return FALSE;}; - virtual Bool isCarBombCrateCollide() const { return TRUE; } + virtual Bool executeCrateBehavior( Object *other ) override; + virtual Bool isRailroad() const override { return FALSE;}; + virtual Bool isCarBombCrateCollide() const override { return TRUE; } }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h index 653737df53e..621de08f602 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h @@ -73,10 +73,10 @@ class ConvertToHijackedVehicleCrateCollide : public CrateCollide protected: /// This allows specific vetoes to certain types of crates and their data - virtual Bool isValidToExecute( const Object *other ) const; + virtual Bool isValidToExecute( const Object *other ) const override; /// This is the game logic execution function that all real CrateCollides will implement - virtual Bool executeCrateBehavior( Object *other ); + virtual Bool executeCrateBehavior( Object *other ) override; - virtual Bool isHijackedVehicleCrateCollide() const { return TRUE; } + virtual Bool isHijackedVehicleCrateCollide() const override { return TRUE; } }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h index fe910bdeb51..b062d4690d6 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h @@ -103,12 +103,12 @@ class CostModifierUpgrade : public UpgradeModule CostModifierUpgrade( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype defined by MemoryPoolObject - virtual void onDelete(); ///< we have some work to do when this module goes away - virtual void onCapture( Player *oldOwner, Player *newOwner ); + virtual void onDelete() override; ///< we have some work to do when this module goes away + virtual void onCapture( Player *oldOwner, Player *newOwner ) override; protected: - virtual void upgradeImplementation(); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation() override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h index 2903a7953e0..a03545b4562 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h @@ -74,13 +74,13 @@ class CrateCollide : public CollideModule // virtual destructor prototype provided by memory pool declaration /// This collide method gets called when collision occur - virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ); + virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ) override; - virtual Bool wouldLikeToCollideWith(const Object* other) const { return isValidToExecute(other); } + virtual Bool wouldLikeToCollideWith(const Object* other) const override { return isValidToExecute(other); } - virtual Bool isRailroad() const { return FALSE;}; - virtual Bool isCarBombCrateCollide() const { return FALSE; } - virtual Bool isHijackedVehicleCrateCollide() const { return FALSE; } + virtual Bool isRailroad() const override { return FALSE;}; + virtual Bool isCarBombCrateCollide() const override { return FALSE; } + virtual Bool isHijackedVehicleCrateCollide() const override { return FALSE; } protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h index 3fab216672b..5a047c96b64 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h @@ -48,7 +48,7 @@ class CreateCrateDieModuleData : public DieModuleData { m_crateNameList.clear(); } - ~CreateCrateDieModuleData() + virtual ~CreateCrateDieModuleData() override { m_crateNameList.clear(); } @@ -81,7 +81,7 @@ class CreateCrateDie : public DieModule CreateCrateDie( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; private: Bool testCreationChance( CrateTemplate const *currentCrateData ); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateModule.h index 698b9f7232a..b5e6eaa965b 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateModule.h @@ -71,11 +71,11 @@ class CreateModule : public BehaviorModule, public CreateModuleInterface static Int getInterfaceMask() { return MODULEINTERFACE_CREATE; } // BehaviorModule - virtual CreateModuleInterface* getCreate() { return this; } + virtual CreateModuleInterface* getCreate() override { return this; } - virtual void onCreate() = 0; ///< This is called when you become a code Object - virtual void onBuildComplete(){ m_needToRunOnBuildComplete = FALSE; } ///< This is called when you are a finished game object - virtual Bool shouldDoOnBuildComplete() const { return m_needToRunOnBuildComplete; } + virtual void onCreate() override = 0; ///< This is called when you become a code Object + virtual void onBuildComplete() override{ m_needToRunOnBuildComplete = FALSE; } ///< This is called when you are a finished game object + virtual Bool shouldDoOnBuildComplete() const override { return m_needToRunOnBuildComplete; } private: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h index e8b61f9d908..8dff7456e8b 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h @@ -65,6 +65,6 @@ class CreateObjectDie : public DieModule CreateObjectDie( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CrushDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CrushDie.h index cb753449c24..4d0010ba812 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CrushDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CrushDie.h @@ -95,6 +95,6 @@ class CrushDie : public DieModule CrushDie( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DamDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DamDie.h index 92d7e942d42..56d592ed9cf 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DamDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DamDie.h @@ -58,6 +58,6 @@ class DamDie : public DieModule DamDie( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by MemoryPoolObject - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DamageModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DamageModule.h index b14723f0faf..8ec8fcea046 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DamageModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DamageModule.h @@ -95,14 +95,14 @@ class DamageModule : public BehaviorModule, public DamageModuleInterface static Int getInterfaceMask() { return MODULEINTERFACE_DAMAGE; } // BehaviorModule - virtual DamageModuleInterface* getDamage() { return this; } + virtual DamageModuleInterface* getDamage() override { return this; } // damage module callbacks - virtual void onDamage( DamageInfo *damageInfo ) = 0; ///< damage callback - virtual void onHealing( DamageInfo *damageInfo ) = 0; ///< healing callback + virtual void onDamage( DamageInfo *damageInfo ) override = 0; ///< damage callback + virtual void onHealing( DamageInfo *damageInfo ) override = 0; ///< healing callback virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, BodyDamageType oldState, - BodyDamageType newState) = 0; ///< state change callback + BodyDamageType newState) override = 0; ///< state change callback protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h index 30461b0bb56..294c8d6ae63 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h @@ -71,23 +71,23 @@ class DefaultProductionExitUpdate : public UpdateModule, public ExitInterface public: - virtual ExitInterface* getUpdateExitInterface() { return this; } + virtual ExitInterface* getUpdateExitInterface() override { return this; } DefaultProductionExitUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration // Required funcs to fulfill interface requirements - virtual Bool isExitBusy() const {return FALSE;} ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. - virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ) { return DOOR_1; } - virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ); - virtual void unreserveDoorForExit( ExitDoorType exitDoor ) { /* nothing */ } - virtual void exitObjectByBudding( Object *newObj, Object *budHost ) { return; } - - virtual void setRallyPoint( const Coord3D *pos ); ///< define a "rally point" for units to move towards - virtual const Coord3D *getRallyPoint() const; ///< define a "rally point" for units to move towards - virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) const; ///< get the natural "rally point" for units to move towards - virtual Bool getExitPosition( Coord3D& exitPosition ) const; ///< access to the "Door" position of the production object - virtual UpdateSleepTime update() { return UPDATE_SLEEP_FOREVER; } + virtual Bool isExitBusy() const override {return FALSE;} ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. + virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ) override { return DOOR_1; } + virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ) override; + virtual void unreserveDoorForExit( ExitDoorType exitDoor ) override { /* nothing */ } + virtual void exitObjectByBudding( Object *newObj, Object *budHost ) override { return; } + + virtual void setRallyPoint( const Coord3D *pos ) override; ///< define a "rally point" for units to move towards + virtual const Coord3D *getRallyPoint() const override; ///< define a "rally point" for units to move towards + virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) const override; ///< get the natural "rally point" for units to move towards + virtual Bool getExitPosition( Coord3D& exitPosition ) const override; ///< access to the "Door" position of the production object + virtual UpdateSleepTime update() override { return UPDATE_SLEEP_FOREVER; } protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h index 240ab04771d..fad873af8c3 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h @@ -72,8 +72,8 @@ class DefectorSpecialPower : public SpecialPowerModule DefectorSpecialPower( Thing *thing, const ModuleData *moduleData ); // virtual destructor prototype provided by memory pool object - virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions ); - virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ); + virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions ) override; + virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ) override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedUpgrade.h index 98bead9fb20..5897d37759c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedUpgrade.h @@ -75,7 +75,7 @@ class DelayedUpgrade : public UpgradeModule protected: - virtual void upgradeImplementation( ); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation( ) override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedWeaponSetUpgradeUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedWeaponSetUpgradeUpdate.h index 0ece7370374..3d36e891ee9 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedWeaponSetUpgradeUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedWeaponSetUpgradeUpdate.h @@ -58,10 +58,10 @@ class DelayedWeaponSetUpgradeUpdate : public UpdateModule, public DelayedUpgrade DelayedWeaponSetUpgradeUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual Bool isTriggeredBy( const UpgradeMaskType& potentialMask ); ///< If you were an upgrade, would you trigger for this? - virtual void setDelay( UnsignedInt startingDelay ); ///< Start the upgrade doing countdown + virtual Bool isTriggeredBy( const UpgradeMaskType& potentialMask ) override; ///< If you were an upgrade, would you trigger for this? + virtual void setDelay( UnsignedInt startingDelay ) override; ///< Start the upgrade doing countdown - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h index 5464a6aec8f..bde4064038f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h @@ -74,7 +74,7 @@ class DeletionUpdate : public UpdateModule void setLifetimeRange( UnsignedInt minFrames, UnsignedInt maxFrames ); UnsignedInt getDieFrame() { return m_dieFrame; } - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h index fa9018c5c8f..7e6885a05f8 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h @@ -45,9 +45,9 @@ class DeliverPayloadStateMachine : public StateMachine protected: // snapshot interface - 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; }; //------------------------------------------------------------------------------------------------- @@ -57,13 +57,13 @@ class ApproachState : public State //Approaching the drop zone public: ApproachState( StateMachine *machine ) :State( machine, "ApproachState" ) {} - virtual StateReturnType update(); - virtual StateReturnType onEnter(); + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; protected: // snapshot interface STUBBED - no member vars to save. jba. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; }; EMPTY_DTOR(ApproachState) @@ -78,14 +78,14 @@ class DeliveringState : public State m_dropDelayLeft = 0; m_didOpen = false; } - virtual StateReturnType update(); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: UnsignedInt m_dropDelayLeft; @@ -100,14 +100,14 @@ class ConsiderNewApproachState : public State //Should I try again? Has own data to keep track. public: ConsiderNewApproachState( StateMachine *machine ) : State( machine, "ConsiderNewApproachState" ), m_numberEntriesToState(0) { } - virtual StateReturnType update(); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: Int m_numberEntriesToState; @@ -120,13 +120,13 @@ class RecoverFromOffMapState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(RecoverFromOffMapState, "RecoverFromOffMapState") public: RecoverFromOffMapState( StateMachine *machine ) : State( machine, "RecoverFromOffMapState" ), m_reEntryFrame(0) { } - virtual StateReturnType update(); - virtual StateReturnType onEnter(); + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; protected: // snapshot interface - 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; private: UnsignedInt m_reEntryFrame; @@ -140,13 +140,13 @@ class HeadOffMapState : public State //I'm outta here public: HeadOffMapState( StateMachine *machine ) :State( machine, "HeadOffMapState" ) {} - virtual StateReturnType update(); - virtual StateReturnType onEnter(); + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; protected: // snapshot interface STUBBED - no member vars to save. jba. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; }; EMPTY_DTOR(HeadOffMapState) @@ -157,13 +157,13 @@ class CleanUpState : public State //Made it off map, delete ourselves public: CleanUpState( StateMachine *machine ) :State( machine, "CleanUpState" ) {} - virtual StateReturnType update(){return STATE_CONTINUE;} - virtual StateReturnType onEnter(); + virtual StateReturnType update() override{return STATE_CONTINUE;} + virtual StateReturnType onEnter() override; protected: // snapshot interface STUBBED - no member vars to save. jba. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; }; EMPTY_DTOR(CleanUpState) @@ -309,7 +309,7 @@ class DeliverPayloadAIUpdate : public AIUpdateInterface DeliverPayloadAIUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual AIFreeToExitType getAiFreeToExit(const Object* exiter) const; + virtual AIFreeToExitType getAiFreeToExit(const Object* exiter) const override; const Coord3D* getTargetPos() const { return &m_targetPos; } const Coord3D* getMoveToPos() const { return &m_moveToPos; } @@ -336,7 +336,7 @@ class DeliverPayloadAIUpdate : public AIUpdateInterface const DeliverPayloadData* getData() { return &m_data; } - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; void killDeliveryDecal(); @@ -345,8 +345,8 @@ class DeliverPayloadAIUpdate : public AIUpdateInterface protected: - virtual AIStateMachine* makeStateMachine(); - virtual Bool isAllowedToRespondToAiCommands(const AICommandParms* parms) const; + virtual AIStateMachine* makeStateMachine() override; + virtual Bool isAllowedToRespondToAiCommands(const AICommandParms* parms) const override; DeliverPayloadStateMachine* m_deliverPayloadStateMachine; ///< Controls my special logic Coord3D m_targetPos; ///< Where I plan to deliver my little friends, if obj is null diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h index ecb65aef278..42c5475bb1d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h @@ -73,8 +73,8 @@ class DemoTrapUpdate : public UpdateModule DemoTrapUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onObjectCreated(); - virtual UpdateSleepTime update(); + virtual void onObjectCreated() override; + virtual UpdateSleepTime update() override; void detonate(); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h index 40ba705747d..c4f22db449c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h @@ -92,9 +92,9 @@ class DeployStyleAIUpdate : public AIUpdateInterface DeployStyleAIUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void aiDoCommand(const AICommandParms* parms); - virtual Bool isIdle() const; - virtual UpdateSleepTime update(); + virtual void aiDoCommand(const AICommandParms* parms) override; + virtual Bool isIdle() const override; + virtual UpdateSleepTime update() override; UnsignedInt getUnpackTime() const { return getDeployStyleAIUpdateModuleData()->m_unpackTime; } UnsignedInt getPackTime() const { return getDeployStyleAIUpdateModuleData()->m_packTime; } diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h index f2b8cce9098..3eeb61154d3 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h @@ -47,6 +47,6 @@ class DestroyDie : public DieModule DestroyDie( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h index 569b2bf5419..fabf0882308 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h @@ -56,9 +56,9 @@ class DestroyModule : public BehaviorModule, public DestroyModuleInterface static Int getInterfaceMask() { return MODULEINTERFACE_DESTROY; } // BehaviorModule - virtual DestroyModuleInterface* getDestroy() { return this; } + virtual DestroyModuleInterface* getDestroy() override { return this; } - virtual void onDestroy() = 0; + virtual void onDestroy() override = 0; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DieModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DieModule.h index d16a49ab3d9..a3028c6010d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DieModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DieModule.h @@ -95,9 +95,9 @@ class DieModule : public BehaviorModule, public DieModuleInterface static Int getInterfaceMask() { return MODULEINTERFACE_DIE; } // BehaviorModule - virtual DieModuleInterface* getDie() { return this; } + virtual DieModuleInterface* getDie() override { return this; } - void onDie( const DamageInfo *damageInfo ) = 0; + virtual void onDie( const DamageInfo *damageInfo ) override = 0; protected: Bool isDieApplicable(const DamageInfo *damageInfo) const { return getDieModuleData()->isDieApplicable(getObject(), damageInfo); } diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h index 6d9a1cf4613..7bea573a0a6 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h @@ -72,61 +72,61 @@ class DockUpdate : public UpdateModule , public DockUpdateInterface /** Returns true if it is okay for the docker to approach and prepare to dock. False could mean the queue is full, for example. */ - virtual Bool isClearToApproach( Object const* docker ) const; + virtual Bool isClearToApproach( Object const* docker ) const override; /** Give me a Queue point to drive to, and record that that point is taken. Returning null means there are none free */ - virtual Bool reserveApproachPosition( Object* docker, Coord3D *position, Int *index ); + virtual Bool reserveApproachPosition( Object* docker, Coord3D *position, Int *index ) override; /** Give me the next Queue point to drive to, and record that that point is taken. */ - virtual Bool advanceApproachPosition( Object* docker, Coord3D *position, Int *index ); + virtual Bool advanceApproachPosition( Object* docker, Coord3D *position, Int *index ) override; /** Return true when it is OK for docker to begin entering the dock The Dock will lift the restriction on one particular docker on its own, so you must continually ask. */ - virtual Bool isClearToEnter( Object const* docker ) const; + virtual Bool isClearToEnter( Object const* docker ) const override; /** Return true when it is OK for docker to request a new Approach position. The dock is in charge of keeping track of holes in the line, but the docker will remind us of their spot. */ - virtual Bool isClearToAdvance( Object const* docker, Int dockerIndex ) const; + virtual Bool isClearToAdvance( Object const* docker, Int dockerIndex ) const override; /** Give me the point that is the start of your docking path Returning null means there is none free All functions take docker as arg so we could have multiple docks on a building. Docker is not assumed, it is recorded and checked. */ - virtual void getEnterPosition( Object* docker, Coord3D *position ); + virtual void getEnterPosition( Object* docker, Coord3D *position ) override; /** Give me the middle point of the dock process where the action() happens */ - virtual void getDockPosition( Object* docker, Coord3D *position ); + virtual void getDockPosition( Object* docker, Coord3D *position ) override; /** Give me the point to drive to when I am done */ - virtual void getExitPosition( Object* docker, Coord3D *position ); + virtual void getExitPosition( Object* docker, Coord3D *position ) override; - virtual void onApproachReached( Object* docker ); ///< I have reached the Approach Point. - virtual void onEnterReached( Object* docker ); ///< I have reached the Enter Point. - virtual void onDockReached( Object* docker ); ///< I have reached the Dock point - virtual void onExitReached( Object* docker ); ///< I have reached the exit. You are no longer busy + virtual void onApproachReached( Object* docker ) override; ///< I have reached the Approach Point. + virtual void onEnterReached( Object* docker ) override; ///< I have reached the Enter Point. + virtual void onDockReached( Object* docker ) override; ///< I have reached the Dock point + virtual void onExitReached( Object* docker ) override; ///< I have reached the exit. You are no longer busy //The fact that action() is not here is intentional. This object cannot exist. You must //derive off it and implement action(). - virtual void cancelDock( Object* docker ); ///< Clear me from any reserved points, and if I was the reason you were Busy, you aren't anymore. + virtual void cancelDock( Object* docker ) override; ///< Clear me from any reserved points, and if I was the reason you were Busy, you aren't anymore. - virtual Bool isDockOpen() { return m_dockOpen; } ///< Is the dock open to accepting dockers - virtual void setDockOpen( Bool open ) { m_dockOpen = open; } ///< Open/Close the dock + virtual Bool isDockOpen() override { return m_dockOpen; } ///< Is the dock open to accepting dockers + virtual void setDockOpen( Bool open ) override { m_dockOpen = open; } ///< Open/Close the dock - virtual Bool isAllowPassthroughType(); ///< Not all docks allow you to path through them in your AIDock machine + virtual Bool isAllowPassthroughType() override; ///< Not all docks allow you to path through them in your AIDock machine - virtual Bool isRallyPointAfterDockType(){return FALSE;} ///< A minority of docks want to give you a final command to their rally point + virtual Bool isRallyPointAfterDockType() override{return FALSE;} ///< A minority of docks want to give you a final command to their rally point - virtual void setDockCrippled( Bool setting ); ///< Game Logic can set me as inoperative. I get to decide what that means. + virtual void setDockCrippled( Bool setting ) override; ///< Game Logic can set me as inoperative. I get to decide what that means. - virtual UpdateSleepTime update(); ///< In charge of lifting dock restriction for one registered as Approached if all is ready + virtual UpdateSleepTime update() override; ///< In charge of lifting dock restriction for one registered as Approached if all is ready protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h index b23be569be9..16681f0864b 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h @@ -56,9 +56,9 @@ class DozerPrimaryStateMachine : public StateMachine protected: // snapshot interface - 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; }; @@ -207,76 +207,76 @@ class DozerAIUpdate : public AIUpdateInterface, public DozerAIInterface DozerAIUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual DozerAIInterface* getDozerAIInterface() {return this;} - virtual const DozerAIInterface* getDozerAIInterface() const {return this;} + virtual DozerAIInterface* getDozerAIInterface() override {return this;} + virtual const DozerAIInterface* getDozerAIInterface() const override {return this;} - virtual void onDelete(); + virtual void onDelete() override; // // module data methods ... this is LAME, multiple inheritance off an interface with replicated // data and code, ick! // NOTE: If you edit module data you must do it in both the Dozer *AND* the Worker // - virtual Real getRepairHealthPerSecond() const; ///< get health to repair per second - virtual Real getBoredTime() const; ///< how long till we're bored - virtual Real getBoredRange() const; ///< when we're bored, we look this far away to do things + virtual Real getRepairHealthPerSecond() const override; ///< get health to repair per second + virtual Real getBoredTime() const override; ///< how long till we're bored + virtual Real getBoredRange() const override; ///< when we're bored, we look this far away to do things // methods to override for the dozer behaviors virtual Object* construct( const ThingTemplate *what, const Coord3D *pos, Real angle, Player *owningPlayer, - Bool isRebuild ); ///< construct an object + Bool isRebuild ) override; ///< construct an object // get task information - virtual DozerTask getMostRecentCommand(); ///< return task that was most recently issued - virtual Bool isTaskPending( DozerTask task ); ///< is there a desire to do the requested task - virtual ObjectID getTaskTarget( DozerTask task ); ///< get target of task - virtual Bool isAnyTaskPending(); ///< is there any dozer task pending - virtual DozerTask getCurrentTask() const { return m_currentTask; } ///< return the current task we're doing - virtual void setCurrentTask( DozerTask task ) { m_currentTask = task; } ///< set the current task of the dozer + virtual DozerTask getMostRecentCommand() override; ///< return task that was most recently issued + virtual Bool isTaskPending( DozerTask task ) override; ///< is there a desire to do the requested task + virtual ObjectID getTaskTarget( DozerTask task ) override; ///< get target of task + virtual Bool isAnyTaskPending() override; ///< is there any dozer task pending + virtual DozerTask getCurrentTask() const override { return m_currentTask; } ///< return the current task we're doing + virtual void setCurrentTask( DozerTask task ) override { m_currentTask = task; } ///< set the current task of the dozer - virtual Bool getIsRebuild() { return m_isRebuild; } ///< get whether or not this building is a rebuild. + virtual Bool getIsRebuild() override { return m_isRebuild; } ///< get whether or not this building is a rebuild. // task actions - virtual void newTask( DozerTask task, Object *target ); ///< set a desire to do the requrested task - virtual void cancelTask( DozerTask task ); ///< cancel this task from the queue, if it's the current task the dozer will stop working on it - virtual void cancelAllTasks(); ///< cancel all tasks from the queue, if it's the current task the dozer will stop working on it - virtual void resumePreviousTask(); ///< resume the previous task if there was one + virtual void newTask( DozerTask task, Object *target ) override; ///< set a desire to do the requrested task + virtual void cancelTask( DozerTask task ) override; ///< cancel this task from the queue, if it's the current task the dozer will stop working on it + virtual void cancelAllTasks() override; ///< cancel all tasks from the queue, if it's the current task the dozer will stop working on it + virtual void resumePreviousTask() override; ///< resume the previous task if there was one // internal methods to manage behavior from within the dozer state machine - virtual void internalTaskComplete( DozerTask task ); ///< set a dozer task as successfully completed - virtual void internalCancelTask( DozerTask task ); ///< cancel this task from the dozer - virtual void internalTaskCompleteOrCancelled( DozerTask task ); ///< this is called when tasks are cancelled or completed + virtual void internalTaskComplete( DozerTask task ) override; ///< set a dozer task as successfully completed + virtual void internalCancelTask( DozerTask task ) override; ///< cancel this task from the dozer + virtual void internalTaskCompleteOrCancelled( DozerTask task ) override; ///< this is called when tasks are cancelled or completed /** return a dock point for the action and task (if valid) ... note it can return nullptr if no point has been set for the combination of task and point */ - virtual const Coord3D* getDockPoint( DozerTask task, DozerDockPoint point ); + virtual const Coord3D* getDockPoint( DozerTask task, DozerDockPoint point ) override; - virtual void setBuildSubTask( DozerBuildSubTask subTask ) { m_buildSubTask = subTask; }; - virtual DozerBuildSubTask getBuildSubTask() { return m_buildSubTask; } + virtual void setBuildSubTask( DozerBuildSubTask subTask ) override { m_buildSubTask = subTask; }; + virtual DozerBuildSubTask getBuildSubTask() override { return m_buildSubTask; } - virtual UpdateSleepTime update(); ///< the update entry point + virtual UpdateSleepTime update() override; ///< the update entry point // repairing - virtual Bool canAcceptNewRepair( Object *obj ); - virtual void createBridgeScaffolding( Object *bridgeTower ); - virtual void removeBridgeScaffolding( Object *bridgeTower ); + virtual Bool canAcceptNewRepair( Object *obj ) override; + virtual void createBridgeScaffolding( Object *bridgeTower ) override; + virtual void removeBridgeScaffolding( Object *bridgeTower ) override; - virtual void startBuildingSound( const AudioEventRTS *sound, ObjectID constructionSiteID ); - virtual void finishBuildingSound(); + virtual void startBuildingSound( const AudioEventRTS *sound, ObjectID constructionSiteID ) override; + virtual void finishBuildingSound() override; // // the following methods must be overridden so that if a player issues a command the dozer // can exit the internal state machine and do whatever the player says // - virtual void aiDoCommand(const AICommandParms* parms); + virtual void aiDoCommand(const AICommandParms* parms) override; protected: - virtual void privateRepair( Object *obj, CommandSourceType cmdSource ); ///< repair the target - virtual void privateResumeConstruction( Object *obj, CommandSourceType cmdSource ); ///< resume construction on obj + virtual void privateRepair( Object *obj, CommandSourceType cmdSource ) override; ///< repair the target + virtual void privateResumeConstruction( Object *obj, CommandSourceType cmdSource ) override; ///< resume construction on obj struct DozerTaskInfo { diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h index 5c565545a73..932e28f713a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h @@ -83,15 +83,15 @@ class DumbProjectileBehavior : public UpdateModule, public ProjectileUpdateInter // virtual destructor provided by memory pool object // UpdateModuleInterface - virtual UpdateSleepTime update(); - virtual ProjectileUpdateInterface* getProjectileUpdateInterface() { return this; } + virtual UpdateSleepTime update() override; + virtual ProjectileUpdateInterface* getProjectileUpdateInterface() override { return this; } // ProjectileUpdateInterface - virtual void projectileLaunchAtObjectOrPosition(const Object *victim, const Coord3D* victimPos, const Object *launcher, WeaponSlotType wslot, Int specificBarrelToUse, const WeaponTemplate* detWeap, const ParticleSystemTemplate* exhaustSysOverride); - virtual void projectileFireAtObjectOrPosition( const Object *victim, const Coord3D *victimPos, const WeaponTemplate *detWeap, const ParticleSystemTemplate* exhaustSysOverride ); - virtual Bool projectileHandleCollision( Object *other ); - virtual Bool projectileIsArmed() const { return true; } - virtual ObjectID projectileGetLauncherID() const { return m_launcherID; } + virtual void projectileLaunchAtObjectOrPosition(const Object *victim, const Coord3D* victimPos, const Object *launcher, WeaponSlotType wslot, Int specificBarrelToUse, const WeaponTemplate* detWeap, const ParticleSystemTemplate* exhaustSysOverride) override; + virtual void projectileFireAtObjectOrPosition( const Object *victim, const Coord3D *victimPos, const WeaponTemplate *detWeap, const ParticleSystemTemplate* exhaustSysOverride ) override; + virtual Bool projectileHandleCollision( Object *other ) override; + virtual Bool projectileIsArmed() const override { return true; } + virtual ObjectID projectileGetLauncherID() const override { return m_launcherID; } protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h index eaf2eef4d50..e78c2b6785b 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h @@ -76,7 +76,7 @@ class DynamicGeometryInfoUpdate : public UpdateModule DynamicGeometryInfoUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h index 3fd0f226bd2..1273c91ef54 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h @@ -73,7 +73,7 @@ class DynamicShroudClearingRangeUpdate : public UpdateModule DynamicShroudClearingRangeUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; void createGridDecals( const RadiusDecalTemplate& tmpl, Real radius, const Coord3D& pos ); void killGridDecals(); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h index 5ae1447fd6a..310c1b8ed86 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h @@ -103,7 +103,7 @@ class EMPUpdate : public UpdateModule UnsignedInt getDieFrame() { return m_dieFrame; } - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; void doDisableAttack(); protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h index fe211a4439e..ec12757ca32 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h @@ -65,7 +65,7 @@ class EjectPilotDie : public DieModule static void ejectPilot(const ObjectCreationList* ocl, const Object* dyingObject, const Object* damageDealer); - virtual void onDie( const DamageInfo *damageInfo ); - virtual DieModuleInterface* getEjectPilotDieInterface() {return this; } + virtual void onDie( const DamageInfo *damageInfo ) override; + virtual DieModuleInterface* getEjectPilotDieInterface() override {return this; } }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h index dec0f8f7761..5e8075ca8fb 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h @@ -71,7 +71,7 @@ class EnemyNearUpdate : public UpdateModule EnemyNearUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h index 00d6dbba0d9..a4bb8c7dea0 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h @@ -65,7 +65,7 @@ class ExperienceScalarUpgrade : public UpgradeModule protected: - virtual void upgradeImplementation(); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation() override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FXListDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FXListDie.h index 4ed1081837f..fd013ffd778 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FXListDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FXListDie.h @@ -78,6 +78,6 @@ class FXListDie : public DieModule FXListDie( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h index 90a71879877..63428c663c4 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h @@ -63,30 +63,30 @@ class FireOCLAfterWeaponCooldownUpdate : public UpdateModule, public UpgradeMux // virtual destructor prototype provided by memory pool declaration // update methods - virtual UpdateSleepTime update(); ///< called once per frame + virtual UpdateSleepTime update() override; ///< called once per frame protected: - virtual void upgradeImplementation() + virtual void upgradeImplementation() override { // nothing! } - virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const + virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const override { getFireOCLAfterWeaponCooldownUpdateModuleData()->m_upgradeMuxData.getUpgradeActivationMasks(activation, conflicting); } - virtual void performUpgradeFX() + virtual void performUpgradeFX() override { getFireOCLAfterWeaponCooldownUpdateModuleData()->m_upgradeMuxData.performUpgradeFX(getObject()); } - virtual Bool requiresAllActivationUpgrades() const + virtual Bool requiresAllActivationUpgrades() const override { return getFireOCLAfterWeaponCooldownUpdateModuleData()->m_upgradeMuxData.m_requiresAllTriggers; } - virtual Bool isSubObjectsUpgrade() { return false; } + virtual Bool isSubObjectsUpgrade() override { return false; } void resetStats(); void fireOCL(); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h index 3f2c9212863..e636edc17c2 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h @@ -64,7 +64,7 @@ class FireSpreadUpdate : public UpdateModule FireSpreadUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; void startFireSpreading(); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h index 2eb6702b866..f4d121adf86 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h @@ -68,7 +68,7 @@ class FireWeaponCollide : public CollideModule protected: - virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ); + virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ) override; virtual Bool shouldFireWeapon(); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h index 123e2c2e90c..37f7e8342be 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h @@ -59,7 +59,7 @@ class FireWeaponUpdate : public UpdateModule FireWeaponUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h index 8ad3082431c..49de3fb0d0f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h @@ -116,42 +116,42 @@ class FireWeaponWhenDamagedBehavior : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_UPGRADE) | (MODULEINTERFACE_DAMAGE); } // BehaviorModule - virtual UpgradeModuleInterface* getUpgrade() { return this; } - virtual DamageModuleInterface* getDamage() { return this; } + virtual UpgradeModuleInterface* getUpgrade() override { return this; } + virtual DamageModuleInterface* getDamage() override { return this; } // DamageModuleInterface - virtual void onDamage( DamageInfo *damageInfo ); - virtual void onHealing( DamageInfo *damageInfo ) { } - virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState) { } + virtual void onDamage( DamageInfo *damageInfo ) override; + virtual void onHealing( DamageInfo *damageInfo ) override { } + virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState) override { } // UpdateModuleInterface - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: - virtual void upgradeImplementation() + virtual void upgradeImplementation() override { setWakeFrame(getObject(), UPDATE_SLEEP_NONE); } - virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const + virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const override { getFireWeaponWhenDamagedBehaviorModuleData()->m_upgradeMuxData.getUpgradeActivationMasks(activation, conflicting); } - virtual void performUpgradeFX() + virtual void performUpgradeFX() override { getFireWeaponWhenDamagedBehaviorModuleData()->m_upgradeMuxData.performUpgradeFX(getObject()); } - virtual Bool requiresAllActivationUpgrades() const + virtual Bool requiresAllActivationUpgrades() const override { return getFireWeaponWhenDamagedBehaviorModuleData()->m_upgradeMuxData.m_requiresAllTriggers; } Bool isUpgradeActive() const { return isAlreadyUpgraded(); } - virtual Bool isSubObjectsUpgrade() { return false; } + virtual Bool isSubObjectsUpgrade() override { return false; } private: Weapon *m_reactionWeaponPristine; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h index 5b16eccb242..03d70d210f7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h @@ -85,36 +85,36 @@ class FireWeaponWhenDeadBehavior : public BehaviorModule, static Int getInterfaceMask() { return BehaviorModule::getInterfaceMask() | (MODULEINTERFACE_UPGRADE) | (MODULEINTERFACE_DIE); } // BehaviorModule - virtual UpgradeModuleInterface* getUpgrade() { return this; } - virtual DieModuleInterface* getDie() { return this; } + virtual UpgradeModuleInterface* getUpgrade() override { return this; } + virtual DieModuleInterface* getDie() override { return this; } // DamageModuleInterface - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; protected: - virtual void upgradeImplementation() + virtual void upgradeImplementation() override { // nothing! } - virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const + virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const override { getFireWeaponWhenDeadBehaviorModuleData()->m_upgradeMuxData.getUpgradeActivationMasks(activation, conflicting); } - virtual void performUpgradeFX() + virtual void performUpgradeFX() override { getFireWeaponWhenDeadBehaviorModuleData()->m_upgradeMuxData.performUpgradeFX(getObject()); } - virtual Bool requiresAllActivationUpgrades() const + virtual Bool requiresAllActivationUpgrades() const override { return getFireWeaponWhenDeadBehaviorModuleData()->m_upgradeMuxData.m_requiresAllTriggers; } Bool isUpgradeActive() const { return isAlreadyUpgraded(); } - virtual Bool isSubObjectsUpgrade() { return false; } + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h index 177702f7932..3151758a8df 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h @@ -70,7 +70,7 @@ class FirestormDynamicGeometryInfoUpdate : public DynamicGeometryInfoUpdate FirestormDynamicGeometryInfoUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h index 33ee283915b..9b0b2f3774c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h @@ -80,20 +80,20 @@ class FlammableUpdate : public UpdateModule, public DamageModuleInterface // virtual destructor prototype provided by memory pool declaration static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DAMAGE); } - virtual DamageModuleInterface* getDamage() { return this; } + virtual DamageModuleInterface* getDamage() override { return this; } void tryToIgnite(); ///< FlammabeDamage uses this. It is up to me to decide if I am burnable Bool wouldIgnite(); ///< Since we need to cheat sometimes and light something directly, ask if this would light //UpdateModuleInterface - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; //DamageModuleInterface - virtual void onDamage( DamageInfo *damageInfo ); - virtual void onHealing( DamageInfo *damageInfo ) { } + virtual void onDamage( DamageInfo *damageInfo ) override; + virtual void onHealing( DamageInfo *damageInfo ) override { } virtual void onBodyDamageStateChange( const DamageInfo *damageInfo, BodyDamageType oldState, - BodyDamageType newState ) { } + BodyDamageType newState ) override { } protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h index 6d7ab5ca243..f67356a3fb0 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h @@ -63,7 +63,7 @@ class FloatUpdate : public UpdateModule void setEnabled( Bool enabled ) { m_enabled = enabled; } ///< enable/disable floating - virtual UpdateSleepTime update(); ///< Deciding whether or not to make new guys + virtual UpdateSleepTime update() override; ///< Deciding whether or not to make new guys protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h index 65d850f7ffe..0993215eec2 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h @@ -100,45 +100,45 @@ class GarrisonContain : public OpenContain GarrisonContain( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); ///< called once per frame + virtual UpdateSleepTime update() override; ///< called once per frame - virtual Bool isValidContainerFor( const Object* obj, Bool checkCapacity) const; // Garrison has an extra check forbidding any containment if ReallyDamaged - virtual Bool isGarrisonable() const { return true; } ///< can this unit be Garrisoned? (ick) - virtual Bool isImmuneToClearBuildingAttacks() const { return getGarrisonContainModuleData()->m_immuneToClearBuildingAttacks; } - virtual Bool isHealContain() const { return false; } ///< true when container only contains units while healing (not a transport!) - virtual Bool isPassengerAllowedToFire() const; ///< Hey, can I shoot out of this container? + virtual Bool isValidContainerFor( const Object* obj, Bool checkCapacity) const override; // Garrison has an extra check forbidding any containment if ReallyDamaged + virtual Bool isGarrisonable() const override { return true; } ///< can this unit be Garrisoned? (ick) + virtual Bool isImmuneToClearBuildingAttacks() const override { return getGarrisonContainModuleData()->m_immuneToClearBuildingAttacks; } + virtual Bool isHealContain() const override { return false; } ///< true when container only contains units while healing (not a transport!) + virtual Bool isPassengerAllowedToFire() const override; ///< Hey, can I shoot out of this container? - virtual void removeAllContained( Bool exposeStealthUnits ); ///< remove all contents of this open container + virtual void removeAllContained( Bool exposeStealthUnits ) override; ///< remove all contents of this open container - virtual void exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor ); ///< exit one of our content items from us - virtual void exitObjectByBudding( Object *newObj, Object *budHost ) { return; }; - virtual void onContaining( Object *obj ); ///< object now contains 'obj' - virtual void onRemoving( Object *obj ); ///< object no longer contains 'obj' + virtual void exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor ) override; ///< exit one of our content items from us + virtual void exitObjectByBudding( Object *newObj, Object *budHost ) override { return; }; + virtual void onContaining( Object *obj ) override; ///< object now contains 'obj' + virtual void onRemoving( Object *obj ) override; ///< object no longer contains 'obj' // A Garrison Contain must eject all passengers when it crosses the ReallyDamaged threshold. virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, BodyDamageType oldState, - BodyDamageType newState); ///< Die Interface state change callback + BodyDamageType newState) override; ///< Die Interface state change callback /** return the player that *appears* to control this unit, given an observing player. if null, use getObject()->getControllingPlayer() instead. */ - virtual const Player* getApparentControllingPlayer( const Player* observingPlayer ) const; - virtual void recalcApparentControllingPlayer(); - virtual Bool isDisplayedOnControlBar() const {return TRUE;}///< Does this container display its contents on the ControlBar? + virtual const Player* getApparentControllingPlayer( const Player* observingPlayer ) const override; + virtual void recalcApparentControllingPlayer() override; + virtual Bool isDisplayedOnControlBar() const override {return TRUE;}///< Does this container display its contents on the ControlBar? protected: - virtual void redeployOccupants(); ///< redeploy the occupants of us at all available garrison points - virtual void onObjectCreated(); + virtual void redeployOccupants() override; ///< redeploy the occupants of us at all available garrison points + virtual void onObjectCreated() override; void validateRallyPoint(); ///< validate (if necessary) and pick (if possible) an exit rally point - virtual Bool calcBestGarrisonPosition( Coord3D *sourcePos, const Coord3D *targetPos ); - virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, Object *victim ); - virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, const Coord3D *targetPos ); + virtual Bool calcBestGarrisonPosition( Coord3D *sourcePos, const Coord3D *targetPos ) override; + virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, Object *victim ) override; + virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, const Coord3D *targetPos ) override; void updateEffects(); ///< do any effects needed per frame void loadGarrisonPoints(); ///< load garrison point position data and save for later diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h index 91b1d681774..ba1e9d36fbe 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h @@ -79,28 +79,28 @@ class GenerateMinefieldBehavior : public BehaviorModule, static Int getInterfaceMask() { return (MODULEINTERFACE_DIE) | (MODULEINTERFACE_UPGRADE); } // BehaviorModule - virtual DieModuleInterface* getDie() { return this; } - virtual UpgradeModuleInterface* getUpgrade() { return this; } + virtual DieModuleInterface* getDie() override { return this; } + virtual UpgradeModuleInterface* getUpgrade() override { return this; } // DamageModuleInterface - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; void setMinefieldTarget(const Coord3D* pos); protected: - virtual void upgradeImplementation(); - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation() override; + virtual Bool isSubObjectsUpgrade() override { return false; } - virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const + virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const override { getGenerateMinefieldBehaviorModuleData()->m_upgradeMuxData.getUpgradeActivationMasks(activation, conflicting); } - virtual void performUpgradeFX() + virtual void performUpgradeFX() override { getGenerateMinefieldBehaviorModuleData()->m_upgradeMuxData.performUpgradeFX(getObject()); } - virtual Bool requiresAllActivationUpgrades() const + virtual Bool requiresAllActivationUpgrades() const override { return getGenerateMinefieldBehaviorModuleData()->m_upgradeMuxData.m_requiresAllTriggers; } diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h index 22dec4994e8..2b7817e1e5a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h @@ -68,8 +68,8 @@ class GrantUpgradeCreate : public CreateModule // virtual destructor prototype provided by memory pool declaration /// the create method - virtual void onCreate(); - virtual void onBuildComplete(); ///< This is called when you are a finished game object + virtual void onCreate() override; + virtual void onBuildComplete() override; ///< This is called when you are a finished game object protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h index f95eac09a6c..3d0c9d3e364 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h @@ -48,15 +48,15 @@ class HackInternetState : public State { m_framesRemaining = 0; } - virtual StateReturnType update(); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: UnsignedInt m_framesRemaining; //frames till next cash update @@ -72,14 +72,14 @@ class PackingState : public State { m_framesRemaining = 0; } - virtual StateReturnType update(); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: UnsignedInt m_framesRemaining; //frames till packing animation complete @@ -95,14 +95,14 @@ class UnpackingState : public State { m_framesRemaining = 0; } - virtual StateReturnType update(); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: UnsignedInt m_framesRemaining; //frames till unpacking animation complete @@ -186,7 +186,7 @@ class HackInternetAIUpdate : public AIUpdateInterface, public HackInternetAIInte HackInternetAIUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void aiDoCommand(const AICommandParms* parms); + virtual void aiDoCommand(const AICommandParms* parms) override; Real getPackUnpackVariationFactor() const { return getHackInternetAIUpdateModuleData()->m_packUnpackVariationFactor; } UnsignedInt getUnpackTime() const; @@ -199,19 +199,19 @@ class HackInternetAIUpdate : public AIUpdateInterface, public HackInternetAIInte UnsignedInt getXpPerCashUpdate() const { return getHackInternetAIUpdateModuleData()->m_xpPerCashUpdate; } void hackInternet(); - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; - virtual Bool isIdle() const; + virtual Bool isIdle() const override; - virtual HackInternetAIInterface* getHackInternetAIInterface() { return this; } - virtual const HackInternetAIInterface* getHackInternetAIInterface() const { return this; } + virtual HackInternetAIInterface* getHackInternetAIInterface() override { return this; } + virtual const HackInternetAIInterface* getHackInternetAIInterface() const override { return this; } - virtual Bool isHacking() const; - virtual Bool isHackingPackingOrUnpacking() const; + virtual Bool isHacking() const override; + virtual Bool isHackingPackingOrUnpacking() const override; protected: - virtual AIStateMachine* makeStateMachine(); + virtual AIStateMachine* makeStateMachine() override; AICommandParmsStorage m_pendingCommand; Bool m_hasPendingCommand; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HealContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HealContain.h index 9e25402bc05..4ff851e8d50 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HealContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HealContain.h @@ -61,9 +61,9 @@ class HealContain : public OpenContain HealContain( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); ///< called once per frame - virtual Bool isHealContain() const { return true; } ///< true when container only contains units while healing (not a transport!) - virtual Bool isTunnelContain() const { return FALSE; } + virtual UpdateSleepTime update() override; ///< called once per frame + virtual Bool isHealContain() const override { return true; } ///< true when container only contains units while healing (not a transport!) + virtual Bool isTunnelContain() const override { return FALSE; } protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h index 8768958c1a0..7980d83b7eb 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h @@ -51,5 +51,5 @@ class HealCrateCollide : public CrateCollide protected: /// This is the game logic execution function that all real CrateCollides will implement - virtual Bool executeCrateBehavior( Object *other ); + virtual Bool executeCrateBehavior( Object *other ) override; }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h index 27840b2c0c9..f8ff7f5a548 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h @@ -65,7 +65,7 @@ class HeightDieUpdate : public UpdateModule HeightDieUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h index e75981190ee..e47af45495f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h @@ -91,8 +91,8 @@ class HelicopterSlowDeathBehavior : public SlowDeathBehavior HelicopterSlowDeathBehavior( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void beginSlowDeath( const DamageInfo *damageInfo ); ///< begin the slow death cycle - virtual UpdateSleepTime update(); + virtual void beginSlowDeath( const DamageInfo *damageInfo ) override; ///< begin the slow death cycle + virtual UpdateSleepTime update() override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h index bb721a431e9..e938afea293 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h @@ -49,7 +49,7 @@ class HighlanderBody : public ActiveBody HighlanderBody( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void attemptDamage( DamageInfo *damageInfo ); ///< try to damage this object + virtual void attemptDamage( DamageInfo *damageInfo ) override; ///< try to damage this object protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h index f8b11cf1924..de0f3ccd841 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h @@ -70,7 +70,7 @@ class HijackerUpdate : public UpdateModule HijackerUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); ///< called once per frame + virtual UpdateSleepTime update() override; ///< called once per frame void setTargetObject( const Object *object ); Object* getTargetObject() const; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h index 02dbab9fec7..2fd17c9870a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h @@ -76,5 +76,5 @@ class HiveStructureBody : public StructureBody protected: - virtual void attemptDamage( DamageInfo *damageInfo ); ///< try to damage this object + virtual void attemptDamage( DamageInfo *damageInfo ) override; ///< try to damage this object }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h index 372346c2ca9..1518dda858f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h @@ -122,16 +122,16 @@ class HordeUpdate : public UpdateModule, public HordeUpdateInterface HordeUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - HordeUpdateInterface *getHordeUpdateInterface() { return this; } + virtual HordeUpdateInterface *getHordeUpdateInterface() override { return this; } - virtual void onDrawableBoundToObject(); - virtual UpdateSleepTime update(); ///< update this object's AI + virtual void onDrawableBoundToObject() override; + virtual UpdateSleepTime update() override; ///< update this object's AI - virtual Bool isInHorde() const { return m_inHorde; } - virtual Bool hasFlag() const { return m_hasFlag; } - virtual Bool isTrueHordeMember() const { return m_trueHordeMember && m_inHorde; } - virtual Bool isAllowedNationalism() const; - virtual HordeActionType getHordeActionType() const { return getHordeUpdateModuleData()->m_action; }; + virtual Bool isInHorde() const override { return m_inHorde; } + virtual Bool hasFlag() const override { return m_hasFlag; } + virtual Bool isTrueHordeMember() const override { return m_trueHordeMember && m_inHorde; } + virtual Bool isAllowedNationalism() const override; + virtual HordeActionType getHordeActionType() const override { return getHordeUpdateModuleData()->m_action; }; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h index c430234a5d2..3c98e5cf5ae 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h @@ -49,7 +49,7 @@ class ImmortalBody : public ActiveBody ImmortalBody( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void internalChangeHealth( Real delta ); ///< change health + virtual void internalChangeHealth( Real delta ) override; ///< change health protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h b/Generals/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h index bc1708bbf33..fd5fa665e89 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h @@ -47,20 +47,20 @@ class InactiveBody : public BodyModule InactiveBody( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void attemptDamage( DamageInfo *damageInfo ); ///< try to damage this object - virtual void attemptHealing( DamageInfo *damageInfo ); ///< try to heal this object - virtual Real estimateDamage( DamageInfoInput& damageInfo ) const; - virtual Real getHealth() const; ///< get current health - virtual BodyDamageType getDamageState() const; - virtual void setDamageState( BodyDamageType newState ); ///< control damage state directly. Will adjust hitpoints. - virtual void setAflame( Bool setting ){}///< This is a major change like a damage state. + virtual void attemptDamage( DamageInfo *damageInfo ) override; ///< try to damage this object + virtual void attemptHealing( DamageInfo *damageInfo ) override; ///< try to heal this object + virtual Real estimateDamage( DamageInfoInput& damageInfo ) const override; + virtual Real getHealth() const override; ///< get current health + virtual BodyDamageType getDamageState() const override; + virtual void setDamageState( BodyDamageType newState ) override; ///< control damage state directly. Will adjust hitpoints. + virtual void setAflame( Bool setting ) override{}///< This is a major change like a damage state. - void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback ) { /* nothing */ } + virtual void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback ) override { /* nothing */ } - virtual void setArmorSetFlag(ArmorSetType ast) { /* nothing */ } - virtual void clearArmorSetFlag(ArmorSetType ast) { /* nothing */ } + virtual void setArmorSetFlag(ArmorSetType ast) override { /* nothing */ } + virtual void clearArmorSetFlag(ArmorSetType ast) override { /* nothing */ } - virtual void internalChangeHealth( Real delta ); + virtual void internalChangeHealth( Real delta ) override; private: Bool m_dieCalled; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h index 1eb543cc56c..6a32434efbf 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h @@ -70,6 +70,6 @@ class InstantDeathBehavior : public DieModule // virtual destructor prototype provided by memory pool declaration // DieModuleInterface - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h index 3c8579ebf11..e0af3a3939f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h @@ -74,27 +74,27 @@ class JetAIUpdate : public AIUpdateInterface MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( JetAIUpdate, "JetAIUpdate" ) MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( JetAIUpdate, JetAIUpdateModuleData ) - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; public: JetAIUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onObjectCreated(); - virtual void onDelete(); + virtual void onObjectCreated() override; + virtual void onDelete() override; - virtual void aiDoCommand(const AICommandParms* parms); - virtual Bool chooseLocomotorSet(LocomotorSetType wst); - virtual void setLocomotorGoalNone(); - virtual Bool isIdle() const; + virtual void aiDoCommand(const AICommandParms* parms) override; + virtual Bool chooseLocomotorSet(LocomotorSetType wst) override; + virtual void setLocomotorGoalNone() override; + virtual Bool isIdle() const override; - virtual Bool isAllowedToMoveAwayFromUnit() const; - virtual Bool getSneakyTargetingOffset(Coord3D* offset) const; - virtual void addTargeter(ObjectID id, Bool add); - virtual Bool isTemporarilyPreventingAimSuccess() const; - virtual Bool isDoingGroundMovement() const; - virtual void notifyVictimIsDead(); + virtual Bool isAllowedToMoveAwayFromUnit() const override; + virtual Bool getSneakyTargetingOffset(Coord3D* offset) const override; + virtual void addTargeter(ObjectID id, Bool add) override; + virtual Bool isTemporarilyPreventingAimSuccess() const override; + virtual Bool isDoingGroundMovement() const override; + virtual void notifyVictimIsDead() override; const Coord3D* friend_getProducerLocation() const { return &m_producerLocation; } Real friend_getOutOfAmmoDamagePerSecond() const { return getJetAIUpdateModuleData()->m_outOfAmmoDamagePerSecond; } @@ -120,17 +120,17 @@ class JetAIUpdate : public AIUpdateInterface protected: - virtual AIStateMachine* makeStateMachine(); + virtual AIStateMachine* makeStateMachine() override; virtual void privateFollowPath( std::vector* path, Object *ignoreObject, CommandSourceType cmdSource, Bool exitProduction );///< follow the path defined by the given array of points - virtual void privateFollowPathAppend( const Coord3D *pos, CommandSourceType cmdSource ); - virtual void privateEnter( Object *obj, CommandSourceType cmdSource ); ///< enter the given object - virtual void privateGetRepaired( Object *repairDepot, CommandSourceType cmdSource );///< get repaired at repair depot + virtual void privateFollowPathAppend( const Coord3D *pos, CommandSourceType cmdSource ) override; + virtual void privateEnter( Object *obj, CommandSourceType cmdSource ) override; ///< enter the given object + virtual void privateGetRepaired( Object *repairDepot, CommandSourceType cmdSource ) override;///< get repaired at repair depot void pruneDeadTargeters(); void positionLockon(); - virtual Bool getTreatAsAircraftForLocoDistToGoal() const; + virtual Bool getTreatAsAircraftForLocoDistToGoal() const override; Bool isParkedAt(const Object* obj) const; private: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h index 931739bcb04..020e7fbb38f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h @@ -88,9 +88,9 @@ class JetSlowDeathBehavior : public SlowDeathBehavior // virtual destructor prototype provided by memory pool declaration // slow death methods - virtual void onDie( const DamageInfo *damageInfo ); - virtual void beginSlowDeath( const DamageInfo *damageInfo ); - virtual UpdateSleepTime update(); + virtual void onDie( const DamageInfo *damageInfo ) override; + virtual void beginSlowDeath( const DamageInfo *damageInfo ) override; + virtual UpdateSleepTime update() override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h index e3d9361139b..521599c59f9 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h @@ -50,6 +50,6 @@ class KeepObjectDie : public DieModule KeepObjectDie( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h index 57203e391a0..f7240a94c6a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h @@ -109,7 +109,7 @@ class LaserUpdate : public ClientUpdateModule void setDirty( Bool dirty ) { m_dirty = dirty; } Bool isDirty() const { return m_dirty; } - virtual void clientUpdate(); + virtual void clientUpdate() override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h index 76943ab0c67..c8d56cf82c2 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h @@ -74,7 +74,7 @@ class LifetimeUpdate : public UpdateModule void setLifetimeRange( UnsignedInt minFrames, UnsignedInt maxFrames ); UnsignedInt getDieFrame() const { return m_dieFrame; } - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; private: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h index e6c68e7af96..ebc2344d40c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h @@ -50,7 +50,7 @@ class LocomotorSetUpgrade : public UpgradeModule // virtual destructor prototype defined by MemoryPoolObject protected: - virtual void upgradeImplementation( ); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation( ) override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h index a7b01191b8c..62c90801186 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h @@ -67,7 +67,7 @@ class MaxHealthUpgrade : public UpgradeModule protected: - virtual void upgradeImplementation(); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation() override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h index d0ad4e355f2..2f4d60d1217 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h @@ -80,33 +80,33 @@ class MinefieldBehavior : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_COLLIDE) | (MODULEINTERFACE_DAMAGE) | (MODULEINTERFACE_DIE); } // BehaviorModule - virtual CollideModuleInterface* getCollide() { return this; } - virtual LandMineInterface* getLandMineInterface() { return this; } - virtual DamageModuleInterface* getDamage() { return this; } - virtual DieModuleInterface* getDie() { return this; } + virtual CollideModuleInterface* getCollide() override { return this; } + virtual LandMineInterface* getLandMineInterface() override { return this; } + virtual DamageModuleInterface* getDamage() override { return this; } + virtual DieModuleInterface* getDie() override { return this; } // DamageModuleInterface - virtual void onDamage( DamageInfo *damageInfo ); - virtual void onHealing( DamageInfo *damageInfo ); - virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState) { } + virtual void onDamage( DamageInfo *damageInfo ) override; + virtual void onHealing( DamageInfo *damageInfo ) override; + virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState) override { } // DieModuleInterface - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; // UpdateModuleInterface - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // CollideModuleInterface - virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ); - virtual Bool wouldLikeToCollideWith(const Object* other) const { return false; } - virtual Bool isHijackedVehicleCrateCollide() const { return false; } - virtual Bool isCarBombCrateCollide() const { return false; } - virtual Bool isRailroad() const { return false;} - virtual Bool isSalvageCrateCollide() const { return false; } + virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ) override; + virtual Bool wouldLikeToCollideWith(const Object* other) const override { return false; } + virtual Bool isHijackedVehicleCrateCollide() const override { return false; } + virtual Bool isCarBombCrateCollide() const override { return false; } + virtual Bool isRailroad() const override { return false;} + virtual Bool isSalvageCrateCollide() const override { return false; } // Minefield specific methods - virtual void setScootParms(const Coord3D& start, const Coord3D& end); - virtual void disarm(); + virtual void setScootParms(const Coord3D& start, const Coord3D& end) override; + virtual void disarm() override; private: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h index 14a4ca41569..9d02fecca23 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h @@ -86,17 +86,17 @@ class MissileAIUpdate : public AIUpdateInterface, public ProjectileUpdateInterfa KILL_SELF = 7, ///< Destroy self. }; - virtual ProjectileUpdateInterface* getProjectileUpdateInterface() { return this; } - virtual void projectileFireAtObjectOrPosition( const Object *victim, const Coord3D *victimPos, const WeaponTemplate *detWeap, const ParticleSystemTemplate* exhaustSysOverride ); - virtual void projectileLaunchAtObjectOrPosition(const Object *victim, const Coord3D* victimPos, const Object *launcher, WeaponSlotType wslot, Int specificBarrelToUse, const WeaponTemplate* detWeap, const ParticleSystemTemplate* exhaustSysOverride); - virtual Bool projectileHandleCollision( Object *other ); - virtual Bool projectileIsArmed() const { return m_isArmed; } - virtual ObjectID projectileGetLauncherID() const { return m_launcherID; } + virtual ProjectileUpdateInterface* getProjectileUpdateInterface() override { return this; } + virtual void projectileFireAtObjectOrPosition( const Object *victim, const Coord3D *victimPos, const WeaponTemplate *detWeap, const ParticleSystemTemplate* exhaustSysOverride ) override; + virtual void projectileLaunchAtObjectOrPosition(const Object *victim, const Coord3D* victimPos, const Object *launcher, WeaponSlotType wslot, Int specificBarrelToUse, const WeaponTemplate* detWeap, const ParticleSystemTemplate* exhaustSysOverride) override; + virtual Bool projectileHandleCollision( Object *other ) override; + virtual Bool projectileIsArmed() const override { return m_isArmed; } + virtual ObjectID projectileGetLauncherID() const override { return m_launcherID; } - virtual Bool processCollision(PhysicsBehavior *physics, Object *other); ///< Returns true if the physics collide should apply the force. Normally not. jba. + virtual Bool processCollision(PhysicsBehavior *physics, Object *other) override; ///< Returns true if the physics collide should apply the force. Normally not. jba. - virtual UpdateSleepTime update(); - virtual void onDelete(); + virtual UpdateSleepTime update() override; + virtual void onDelete() override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h index 3d2008bbbcd..0726c45a79c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h @@ -99,20 +99,20 @@ class MissileLauncherBuildingUpdate : public UpdateModule, public SpecialPowerUp // virtual destructor prototype provided by memory pool declaration //SpecialPowerUpdateInterface pure virtual implementations - virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ); - virtual Bool isSpecialAbility() const { return false; } - virtual Bool isSpecialPower() const { return true; } - virtual Bool isActive() const { return m_doorState != m_timeoutState; } + virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ) override; + virtual Bool isSpecialAbility() const override { return false; } + virtual Bool isSpecialPower() const override { return true; } + virtual Bool isActive() const override { return m_doorState != m_timeoutState; } SpecialPowerTemplate* getTemplate() const; - virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const { return false; } //Is it active now? - virtual Bool doesSpecialPowerHaveOverridableDestination() const { return false; } //Does it have it, even if it's not active? - virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ) {} + virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const override { return false; } //Is it active now? + virtual Bool doesSpecialPowerHaveOverridableDestination() const override { return false; } //Does it have it, even if it's not active? + virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ) override {} - virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() { return this; } - virtual CommandOption getCommandOption() const { return (CommandOption)0; } + virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() override { return this; } + virtual CommandOption getCommandOption() const override { return (CommandOption)0; } - virtual UpdateSleepTime update(); ///< Deciding whether or not to make new guys - virtual Bool isPowerCurrentlyInUse( const CommandButton *command = nullptr ) const; + virtual UpdateSleepTime update() override; ///< Deciding whether or not to make new guys + virtual Bool isPowerCurrentlyInUse( const CommandButton *command = nullptr ) const override; private: enum DoorStateType diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h index 8f878a1f1fb..97681fbe5b9 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h @@ -97,14 +97,14 @@ class MobMemberSlavedUpdate : public UpdateModule, public SlavedUpdateInterface MobMemberSlavedUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual SlavedUpdateInterface* getSlavedUpdateInterface() { return this; }// hee hee... behaves just like slavedupdate + virtual SlavedUpdateInterface* getSlavedUpdateInterface() override { return this; }// hee hee... behaves just like slavedupdate - virtual ObjectID getSlaverID() const { return m_slaver; } - virtual void onEnslave( const Object *slaver ); - virtual void onSlaverDie( const DamageInfo *info ); - virtual void onSlaverDamage( const DamageInfo *info ); - virtual void onObjectCreated(); - virtual Bool isSelfTasking() const { return m_isSelfTasking; }; + virtual ObjectID getSlaverID() const override { return m_slaver; } + virtual void onEnslave( const Object *slaver ) override; + virtual void onSlaverDie( const DamageInfo *info ) override; + virtual void onSlaverDamage( const DamageInfo *info ) override; + virtual void onObjectCreated() override; + virtual Bool isSelfTasking() const override { return m_isSelfTasking; }; void doCatchUpLogic( Coord3D *pinnedPosition ); @@ -112,7 +112,7 @@ class MobMemberSlavedUpdate : public UpdateModule, public SlavedUpdateInterface MobStates getMobState() { return m_mobState; }; - virtual UpdateSleepTime update(); ///< Deciding whether or not to make new guys + virtual UpdateSleepTime update() override; ///< Deciding whether or not to make new guys private: void startSlavedEffects( const Object *slaver ); ///< We have been marked as Slaved, so we can't be selected or move too far or other stuff diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h index 43fd762d4fa..9eeb7a72025 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h @@ -73,25 +73,25 @@ class MobNexusContain : public OpenContain, // lorenzen add a MobMemberInterface // lorenzen add a MobMemberInterface // lorenzen add a MobMemberInterface - virtual TransportPassengerInterface* getTransportPassengerInterface() { return this; }// lorenzen add a MobMemberInterface + virtual TransportPassengerInterface* getTransportPassengerInterface() override { return this; }// lorenzen add a MobMemberInterface // lorenzen add a MobMemberInterface // lorenzen add a MobMemberInterface // lorenzen add a MobMemberInterface - virtual Bool isValidContainerFor( const Object* obj, Bool checkCapacity) const; + virtual Bool isValidContainerFor( const Object* obj, Bool checkCapacity) const override; - virtual void onContaining( Object *obj ); ///< object now contains 'obj' - virtual void onRemoving( Object *obj ); ///< object no longer contains 'obj' - virtual UpdateSleepTime update(); ///< called once per frame + virtual void onContaining( Object *obj ) override; ///< object now contains 'obj' + virtual void onRemoving( Object *obj ) override; ///< object no longer contains 'obj' + virtual UpdateSleepTime update() override; ///< called once per frame - virtual Int getContainMax() const; + virtual Int getContainMax() const override; - virtual void onObjectCreated(); - virtual Int getExtraSlotsInUse() { return m_extraSlotsInUse; } + virtual void onObjectCreated() override; + virtual Int getExtraSlotsInUse() override { return m_extraSlotsInUse; } - virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ); ///< All types can answer if they are free to exit or not, and you can ask about a specific guy or just exit anything in general - virtual void unreserveDoorForExit( ExitDoorType exitDoor ); + virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ) override; ///< All types can answer if they are free to exit or not, and you can ask about a specific guy or just exit anything in general + virtual void unreserveDoorForExit( ExitDoorType exitDoor ) override; - virtual Bool tryToEvacuate( Bool exposeStealthedUnits ); ///< Will try to kick everybody out with game checks, and will return whether anyone made it + virtual Bool tryToEvacuate( Bool exposeStealthedUnits ) override; ///< Will try to kick everybody out with game checks, and will return whether anyone made it protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h index c471d1ac8d1..1f463b575c7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h @@ -76,5 +76,5 @@ class MoneyCrateCollide : public CrateCollide protected: /// This is the game logic execution function that all real CrateCollides will implement - virtual Bool executeCrateBehavior( Object *other ); + virtual Bool executeCrateBehavior( Object *other ) override; }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h index 887ffc5eef1..6cb3902809a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h @@ -96,7 +96,7 @@ class NeutronMissileSlowDeathBehavior : public SlowDeathBehavior NeutronMissileSlowDeathBehavior( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); ///< the update call + virtual UpdateSleepTime update() override; ///< the update call protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h index c0b540f8122..5e4b4c62de1 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h @@ -80,12 +80,12 @@ class NeutronMissileUpdate : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DIE); } // BehaviorModule - virtual DieModuleInterface* getDie() { return this; } + virtual DieModuleInterface* getDie() override { return this; } // DieModuleInterface - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; - virtual ProjectileUpdateInterface* getProjectileUpdateInterface() { return this; } + virtual ProjectileUpdateInterface* getProjectileUpdateInterface() override { return this; } enum MissileStateType { @@ -95,15 +95,15 @@ class NeutronMissileUpdate : public UpdateModule, DEAD }; - virtual void projectileLaunchAtObjectOrPosition(const Object *victim, const Coord3D* victimPos, const Object *launcher, WeaponSlotType wslot, Int specificBarrelToUse, const WeaponTemplate* detWeap, const ParticleSystemTemplate* exhaustSysOverride); - virtual void projectileFireAtObjectOrPosition( const Object *victim, const Coord3D *victimPos, const WeaponTemplate *detWeap, const ParticleSystemTemplate* exhaustSysOverride ); - virtual Bool projectileIsArmed() const { return m_isArmed; } ///< return true if the missile is armed and ready to explode - virtual ObjectID projectileGetLauncherID() const { return m_launcherID; } ///< Return firer of missile. Returns 0 if not yet fired. - virtual Bool projectileHandleCollision( Object *other ); + virtual void projectileLaunchAtObjectOrPosition(const Object *victim, const Coord3D* victimPos, const Object *launcher, WeaponSlotType wslot, Int specificBarrelToUse, const WeaponTemplate* detWeap, const ParticleSystemTemplate* exhaustSysOverride) override; + virtual void projectileFireAtObjectOrPosition( const Object *victim, const Coord3D *victimPos, const WeaponTemplate *detWeap, const ParticleSystemTemplate* exhaustSysOverride ) override; + virtual Bool projectileIsArmed() const override { return m_isArmed; } ///< return true if the missile is armed and ready to explode + virtual ObjectID projectileGetLauncherID() const override { return m_launcherID; } ///< Return firer of missile. Returns 0 if not yet fired. + virtual Bool projectileHandleCollision( Object *other ) override; virtual const Coord3D *getVelocity() const { return &m_vel; } ///< get current velocity - virtual UpdateSleepTime update(); - virtual void onDelete(); + virtual UpdateSleepTime update() override; + virtual void onDelete() override; private: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h index d2f2505857c..5c1064bf048 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h @@ -87,9 +87,9 @@ class OCLSpecialPower : public SpecialPowerModule OCLSpecialPower( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool object - virtual void doSpecialPower( UnsignedInt commandOptions ); - virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions ); - virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ); + virtual void doSpecialPower( UnsignedInt commandOptions ) override; + virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions ) override; + virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ) override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h index c54e8186d21..24ea86fc88c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h @@ -64,7 +64,7 @@ class OCLUpdate : public UpdateModule OCLUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; Real getCountdownPercent() const; ///< goes from 0% to 100% UnsignedInt getRemainingFrames() const; ///< For feedback display diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h index 5efa2cc74dc..3896283614b 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h @@ -66,11 +66,11 @@ class ObjectCreationUpgrade : public UpgradeModule ObjectCreationUpgrade( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype defined by MemoryPoolObject - void onDelete(); ///< we have some work to do when this module goes away + void onDelete() override; ///< we have some work to do when this module goes away protected: - virtual void upgradeImplementation(); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation() override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h index 60343b19c86..ea282e7fdd8 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h @@ -68,10 +68,10 @@ class ObjectDefectionHelper : public ObjectHelper } // virtual destructor prototype provided by memory pool object - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // Disabled conditions to process -- defection helper must ignore all disabled types. - virtual DisabledMaskType getDisabledTypesToProcess() const { return DISABLEDMASK_ALL; } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return DISABLEDMASK_ALL; } // specific to this class. void startDefectionTimer(UnsignedInt numFrames, Bool withDefectorFX = TRUE); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h index b026efe179f..ac7b3e5f597 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h @@ -42,9 +42,9 @@ class ObjectHelper : public UpdateModule 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; public: @@ -55,7 +55,7 @@ class ObjectHelper : public UpdateModule } // inherited from UpdateModuleInterface - virtual UpdateSleepTime update() = 0; + virtual UpdateSleepTime update() override = 0; // custom to this class. void sleepUntil(UnsignedInt when); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h index 4cf6117fcb7..9e4b227a26d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h @@ -52,6 +52,6 @@ class ObjectRepulsorHelper : public ObjectHelper ObjectRepulsorHelper( Thing *thing, const ModuleData *modData ) : ObjectHelper( thing, modData ) { } // virtual destructor prototype provided by memory pool object - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h index 48539043364..82f22db8462 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h @@ -52,6 +52,6 @@ class ObjectSMCHelper : public ObjectHelper ObjectSMCHelper( Thing *thing, const ModuleData *modData ) : ObjectHelper( thing, modData ) { } // virtual destructor prototype provided by memory pool object - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h index aa31747d0e5..5de48081afd 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h @@ -56,7 +56,7 @@ class ObjectWeaponStatusHelper : public ObjectHelper user update modules, so it redefines this. Please don't redefine this for other modules without very careful deliberation. (srj) */ - virtual SleepyUpdatePhase getUpdatePhase() const + virtual SleepyUpdatePhase getUpdatePhase() const override { return PHASE_FINAL; } @@ -71,7 +71,7 @@ class ObjectWeaponStatusHelper : public ObjectHelper } // virtual destructor prototype provided by memory pool object - virtual UpdateSleepTime update() + virtual UpdateSleepTime update() override { getObject()->adjustModelConditionForWeaponStatus(); // unlike other helpers, this one must run every frame. diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/OpenContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/OpenContain.h index e69304683b9..c3dc8a535ba 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/OpenContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/OpenContain.h @@ -91,107 +91,107 @@ class OpenContain : public UpdateModule, OpenContain( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual ContainModuleInterface* getContain() { return this; } - virtual CollideModuleInterface* getCollide() { return this; } - virtual DieModuleInterface* getDie() { return this; } - virtual DamageModuleInterface* getDamage() { return this; } + virtual ContainModuleInterface* getContain() override { return this; } + virtual CollideModuleInterface* getCollide() override { return this; } + virtual DieModuleInterface* getDie() override { return this; } + virtual DamageModuleInterface* getDamage() override { return this; } static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_CONTAIN) | (MODULEINTERFACE_COLLIDE) | (MODULEINTERFACE_DIE) | (MODULEINTERFACE_DAMAGE); } - virtual void onDie( const DamageInfo *damageInfo ); ///< the die callback - virtual void onDelete(); ///< Last possible moment cleanup - virtual void onCapture( Player *oldOwner, Player *newOwner ){} + virtual void onDie( const DamageInfo *damageInfo ) override; ///< the die callback + virtual void onDelete() override; ///< Last possible moment cleanup + virtual void onCapture( Player *oldOwner, Player *newOwner ) override {} // CollideModuleInterface - virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ); - virtual Bool wouldLikeToCollideWith(const Object* other) const { return false; } - virtual Bool isCarBombCrateCollide() const { return false; } - virtual Bool isHijackedVehicleCrateCollide() const { return false; } - virtual Bool isRailroad() const { return false;} - virtual Bool isSalvageCrateCollide() const { return false; } + virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ) override; + virtual Bool wouldLikeToCollideWith(const Object* other) const override { return false; } + virtual Bool isCarBombCrateCollide() const override { return false; } + virtual Bool isHijackedVehicleCrateCollide() const override { return false; } + virtual Bool isRailroad() const override { return false;} + virtual Bool isSalvageCrateCollide() const override { return false; } // UpdateModule - virtual UpdateSleepTime update(); ///< called once per frame + virtual UpdateSleepTime update() override; ///< called once per frame // ContainModuleInterface - virtual OpenContain *asOpenContain() { return this; } ///< treat as open container + virtual OpenContain *asOpenContain() override { return this; } ///< treat as open container // DamageModuleInterface - virtual void onDamage( DamageInfo *damageInfo ){}; ///< damage callback - virtual void onHealing( DamageInfo *damageInfo ){}; ///< healing callback + virtual void onDamage( DamageInfo *damageInfo ) override {}; ///< damage callback + virtual void onHealing( DamageInfo *damageInfo ) override {}; ///< healing callback virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, BodyDamageType oldState, - BodyDamageType newState){}; ///< state change callback + BodyDamageType newState) override {}; ///< state change callback // our object changed position... react as appropriate. - virtual void containReactToTransformChange(); + virtual void containReactToTransformChange() override; - virtual Bool calcBestGarrisonPosition( Coord3D *sourcePos, const Coord3D *targetPos ) { return FALSE; } - virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, Object *victim ) { return FALSE; } - virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, const Coord3D *targetPos ) { return FALSE; } + virtual Bool calcBestGarrisonPosition( Coord3D *sourcePos, const Coord3D *targetPos ) override { return FALSE; } + virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, Object *victim ) override { return FALSE; } + virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, const Coord3D *targetPos ) override { return FALSE; } ///< if my object gets selected, then my visible passengers should, too ///< this gets called from - virtual void clientVisibleContainedFlashAsSelected() {}; + virtual void clientVisibleContainedFlashAsSelected() override {}; - virtual const Player* getApparentControllingPlayer(const Player* observingPlayer) const { return nullptr; } - virtual void recalcApparentControllingPlayer() { } + virtual const Player* getApparentControllingPlayer(const Player* observingPlayer) const override { return nullptr; } + virtual void recalcApparentControllingPlayer() override { } - virtual void onContaining( Object *obj ); ///< object now contains 'obj' - virtual void onRemoving( Object *obj ); ///< object no longer contains 'obj' - virtual void onSelling();///< Container is being sold. Open responds by kicking people out + virtual void onContaining( Object *obj ) override; ///< object now contains 'obj' + virtual void onRemoving( Object *obj ) override; ///< object no longer contains 'obj' + virtual void onSelling() override;///< Container is being sold. Open responds by kicking people out - virtual void orderAllPassengersToExit( CommandSourceType commandSource ); ///< All of the smarts of exiting are in the passenger's AIExit. removeAllFrommContain is a last ditch system call, this is the game Evacuate - virtual void markAllPassengersDetected(); ///< Cool game stuff got added to the system calls since this layer didn't exist, so this regains that functionality + virtual void orderAllPassengersToExit( CommandSourceType commandSource ) override; ///< All of the smarts of exiting are in the passenger's AIExit. removeAllFrommContain is a last ditch system call, this is the game Evacuate + virtual void markAllPassengersDetected() override; ///< Cool game stuff got added to the system calls since this layer didn't exist, so this regains that functionality // default OpenContain has unlimited capacity...! - virtual Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const; - virtual void addToContain( Object *obj ); ///< add 'obj' to contain list + virtual Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const override; + virtual void addToContain( Object *obj ) override; ///< add 'obj' to contain list virtual void addToContainList( Object *obj ); ///< The part of AddToContain that inheritors can override (Can't do whole thing because of all the private stuff involved) - virtual void removeFromContain( Object *obj, Bool exposeStealthUnits = FALSE ); ///< remove 'obj' from contain list - virtual void removeAllContained( Bool exposeStealthUnits = FALSE ); ///< remove all objects on contain list - virtual Bool isEnclosingContainerFor( const Object *obj ) const; ///< Does this type of Contain Visibly enclose its contents? - virtual Bool isPassengerAllowedToFire() const; ///< Hey, can I shoot out of this container? - virtual void setOverrideDestination( const Coord3D * ){} ///< Instead of falling peacefully towards a clear spot, I will now aim here - virtual Bool isDisplayedOnControlBar() const {return FALSE;}///< Does this container display its contents on the ControlBar? - virtual Int getExtraSlotsInUse() { return 0; } - virtual Bool isKickOutOnCapture(){ return TRUE; }///< By default, yes, all contain modules kick passengers out on capture + virtual void removeFromContain( Object *obj, Bool exposeStealthUnits = FALSE ) override; ///< remove 'obj' from contain list + virtual void removeAllContained( Bool exposeStealthUnits = FALSE ) override; ///< remove all objects on contain list + virtual Bool isEnclosingContainerFor( const Object *obj ) const override; ///< Does this type of Contain Visibly enclose its contents? + virtual Bool isPassengerAllowedToFire() const override; ///< Hey, can I shoot out of this container? + virtual void setOverrideDestination( const Coord3D * ) override {} ///< Instead of falling peacefully towards a clear spot, I will now aim here + virtual Bool isDisplayedOnControlBar() const override {return FALSE;}///< Does this container display its contents on the ControlBar? + virtual Int getExtraSlotsInUse() override { return 0; } + virtual Bool isKickOutOnCapture() override { return TRUE; }///< By default, yes, all contain modules kick passengers out on capture // contain list access - virtual void iterateContained( ContainIterateFunc func, void *userData, Bool reverse ); - virtual UnsignedInt getContainCount() const { return m_containListSize; } - virtual const ContainedItemsList* getContainedItemsList() const { return &m_containList; } - virtual const Object *friend_getRider() const{return nullptr;} ///< Damn. The draw order dependency bug for riders means that our draw module needs to cheat to get around it. - virtual Real getContainedItemsMass() const; - virtual UnsignedInt getStealthUnitsContained() const { return m_stealthUnitsContained; } - virtual UnsignedInt getHeroUnitsContained() const { return m_heroUnitsContained; } + virtual void iterateContained( ContainIterateFunc func, void *userData, Bool reverse ) override; + virtual UnsignedInt getContainCount() const override { return m_containListSize; } + virtual const ContainedItemsList* getContainedItemsList() const override { return &m_containList; } + virtual const Object *friend_getRider() const override {return nullptr;} ///< Damn. The draw order dependency bug for riders means that our draw module needs to cheat to get around it. + virtual Real getContainedItemsMass() const override; + virtual UnsignedInt getStealthUnitsContained() const override { return m_stealthUnitsContained; } + virtual UnsignedInt getHeroUnitsContained() const override { return m_heroUnitsContained; } - virtual PlayerMaskType getPlayerWhoEntered() const { return m_playerEnteredMask; } + virtual PlayerMaskType getPlayerWhoEntered() const override { return m_playerEnteredMask; } - virtual Int getContainMax() const; + virtual Int getContainMax() const override; // ExitInterface - virtual Bool isExitBusy() const {return FALSE;} ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. - virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ) { return DOOR_1; } - virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ); - virtual void exitObjectInAHurry( Object *newObj ); + virtual Bool isExitBusy() const override {return FALSE;} ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. + virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ) override { return DOOR_1; } + virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ) override; + virtual void exitObjectInAHurry( Object *newObj ) override; - virtual void unreserveDoorForExit( ExitDoorType exitDoor ) { /*nothing*/ } - virtual void exitObjectByBudding( Object *newObj, Object *budHost ) { return; }; + virtual void unreserveDoorForExit( ExitDoorType exitDoor ) override { /*nothing*/ } + virtual void exitObjectByBudding( Object *newObj, Object *budHost ) override { return; }; - virtual void setRallyPoint( const Coord3D *pos ); ///< define a "rally point" for units to move towards - virtual const Coord3D *getRallyPoint() const; ///< define a "rally point" for units to move towards - virtual Bool getExitPosition(Coord3D& exitPosition ) const { return FALSE; }; ///< access to the "Door" position of the production object - virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) const; ///< get the natural "rally point" for units to move towards + virtual void setRallyPoint( const Coord3D *pos ) override; ///< define a "rally point" for units to move towards + virtual const Coord3D *getRallyPoint() const override; ///< define a "rally point" for units to move towards + virtual Bool getExitPosition(Coord3D& exitPosition ) const override { return FALSE; }; ///< access to the "Door" position of the production object + virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) const override; ///< get the natural "rally point" for units to move towards - virtual ExitInterface* getContainExitInterface() { return this; } + virtual ExitInterface* getContainExitInterface() override { return this; } - virtual Bool isGarrisonable() const { return false; } ///< can this unit be Garrisoned? (ick) - virtual Bool isHealContain() const { return false; } ///< true when container only contains units while healing (not a transport!) - virtual Bool isTunnelContain() const { return FALSE; } - virtual Bool isSpecialZeroSlotContainer() const { return false; } - virtual Bool isImmuneToClearBuildingAttacks() const { return true; } + virtual Bool isGarrisonable() const override { return false; } ///< can this unit be Garrisoned? (ick) + virtual Bool isHealContain() const override { return false; } ///< true when container only contains units while healing (not a transport!) + virtual Bool isTunnelContain() const override { return FALSE; } + virtual Bool isSpecialZeroSlotContainer() const override { return false; } + virtual Bool isImmuneToClearBuildingAttacks() const override { return true; } /** this is used for containers that must do something to allow people to enter or exit... @@ -199,14 +199,14 @@ class OpenContain : public UpdateModule, when something is in the enter state, and wants=ENTS_NOTHING when the unit has either entered, or given up... */ - virtual void onObjectWantsToEnterOrExit(Object* obj, ObjectEnterExitType wants); + virtual void onObjectWantsToEnterOrExit(Object* obj, ObjectEnterExitType wants) override; // returns true iff there are objects currently waiting to enter. - virtual Bool hasObjectsWantingToEnterOrExit() const; + virtual Bool hasObjectsWantingToEnterOrExit() const override; - virtual void processDamageToContained(); ///< Do our % damage to units now. + virtual void processDamageToContained() override; ///< Do our % damage to units now. - virtual void enableLoadSounds( Bool enable ) { m_loadSoundsEnabled = enable; } + virtual void enableLoadSounds( Bool enable ) override { m_loadSoundsEnabled = enable; } protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h index ea4097494c3..43eec81ed22 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h @@ -81,30 +81,30 @@ class OverchargeBehavior : public UpdateModule, // virtual destructor prototype provided by memory pool declaration // interface housekeeping - virtual OverchargeBehaviorInterface* getOverchargeBehaviorInterface() { return this; } + virtual OverchargeBehaviorInterface* getOverchargeBehaviorInterface() override { return this; } static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DAMAGE); } // BehaviorModule - virtual DamageModuleInterface* getDamage() { return this; } + virtual DamageModuleInterface* getDamage() override { return this; } // UpdateModuleInterface - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // DamageModuleInterface - virtual void onDamage( DamageInfo *damageInfo ); - virtual void onHealing( DamageInfo *damageInfo ) { } + virtual void onDamage( DamageInfo *damageInfo ) override; + virtual void onHealing( DamageInfo *damageInfo ) override { } virtual void onBodyDamageStateChange( const DamageInfo *damageInfo, BodyDamageType oldState, - BodyDamageType newState ) { } + BodyDamageType newState ) override { } // specific methods - virtual void toggle(); ///< toggle overcharge on/off - virtual void enable( Bool enable ); ///< turn overcharge on/off - virtual Bool isOverchargeActive() { return m_overchargeActive; } + virtual void toggle() override; ///< toggle overcharge on/off + virtual void enable( Bool enable ) override; ///< turn overcharge on/off + virtual Bool isOverchargeActive() override { return m_overchargeActive; } - void onDelete(); ///< we have some work to do when this module goes away - void onCapture( Player *oldOwner, Player *newOwner ); ///< object containing upgrade has changed teams + void onDelete() override; ///< we have some work to do when this module goes away + void onCapture( Player *oldOwner, Player *newOwner ) override; ///< object containing upgrade has changed teams protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h index eccc748f467..0ec95d3cbd7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h @@ -51,48 +51,48 @@ class OverlordContain : public TransportContain virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, BodyDamageType oldState, - BodyDamageType newState); ///< state change callback + BodyDamageType newState) override; ///< state change callback public: OverlordContain( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual OpenContain *asOpenContain() { return this; } ///< treat as open container - virtual Bool isGarrisonable() const; ///< can this unit be Garrisoned? (ick) - virtual Bool isHealContain() const { return false; } ///< true when container only contains units while healing (not a transport!) - virtual Bool isImmuneToClearBuildingAttacks() const { return true; } + virtual OpenContain *asOpenContain() override { return this; } ///< treat as open container + virtual Bool isGarrisonable() const override; ///< can this unit be Garrisoned? (ick) + virtual Bool isHealContain() const override { return false; } ///< true when container only contains units while healing (not a transport!) + virtual Bool isImmuneToClearBuildingAttacks() const override { return true; } - virtual void onDie( const DamageInfo *damageInfo ); ///< the die callback - virtual void onDelete(); ///< Last possible moment cleanup - virtual void onCapture( Player *oldOwner, Player *newOwner ); // Our main guy goes with us, but our redirected contain needs to do his thing too + virtual void onDie( const DamageInfo *damageInfo ) override; ///< the die callback + virtual void onDelete() override; ///< Last possible moment cleanup + virtual void onCapture( Player *oldOwner, Player *newOwner ) override; // Our main guy goes with us, but our redirected contain needs to do his thing too // Contain stuff we need to override to redirect on a condition - virtual void onContaining( Object *obj ); ///< object now contains 'obj' - virtual void onRemoving( Object *obj ); ///< object no longer contains 'obj' + virtual void onContaining( Object *obj ) override; ///< object now contains 'obj' + virtual void onRemoving( Object *obj ) override; ///< object no longer contains 'obj' - virtual Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const; - virtual void addToContain( Object *obj ); ///< add 'obj' to contain list + virtual Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const override; + virtual void addToContain( Object *obj ) override; ///< add 'obj' to contain list virtual void addToContainList( Object *obj ); ///< The part of AddToContain that inheritors can override (Can't do whole thing because of all the private stuff involved) - virtual void removeFromContain( Object *obj, Bool exposeStealthUnits = FALSE ); ///< remove 'obj' from contain list - virtual void removeAllContained( Bool exposeStealthUnits = FALSE ); ///< remove all objects on contain list - virtual Bool isEnclosingContainerFor( const Object *obj ) const; ///< Does this type of Contain Visibly enclose its contents? - virtual Bool isDisplayedOnControlBar() const ;///< Does this container display its contents on the ControlBar? - virtual Bool isKickOutOnCapture();// The bunker may want to, but we certainly don't + virtual void removeFromContain( Object *obj, Bool exposeStealthUnits = FALSE ) override; ///< remove 'obj' from contain list + virtual void removeAllContained( Bool exposeStealthUnits = FALSE ) override; ///< remove all objects on contain list + virtual Bool isEnclosingContainerFor( const Object *obj ) const override; ///< Does this type of Contain Visibly enclose its contents? + virtual Bool isDisplayedOnControlBar() const override;///< Does this container display its contents on the ControlBar? + virtual Bool isKickOutOnCapture() override;// The bunker may want to, but we certainly don't // contain list access - virtual void iterateContained( ContainIterateFunc func, void *userData, Bool reverse ); - virtual UnsignedInt getContainCount() const; - virtual Int getContainMax() const; - virtual const ContainedItemsList* getContainedItemsList() const; + virtual void iterateContained( ContainIterateFunc func, void *userData, Bool reverse ) override; + virtual UnsignedInt getContainCount() const override; + virtual Int getContainMax() const override; + virtual const ContainedItemsList* getContainedItemsList() const override; // Friend for our Draw module only. - virtual const Object *friend_getRider() const; ///< Damn. The draw order dependency bug for riders means that our draw module needs to cheat to get around it. + virtual const Object *friend_getRider() const override; ///< Damn. The draw order dependency bug for riders means that our draw module needs to cheat to get around it. ///< if my object gets selected, then my visible passengers should, too ///< this gets called from - virtual void clientVisibleContainedFlashAsSelected(); + virtual void clientVisibleContainedFlashAsSelected() override; - virtual Bool getContainerPipsToShow(Int& numTotal, Int& numFull); + virtual Bool getContainerPipsToShow(Int& numTotal, Int& numFull) override; private: /**< An empty overlord is a container, but a full one redirects calls to its passengers. If this returns null, diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h index 7d9e4065e15..4218cec3bbe 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h @@ -60,28 +60,28 @@ class ParachuteContain : public OpenContain ParachuteContain( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onDrawableBoundToObject(); + virtual void onDrawableBoundToObject() override; - virtual Bool isValidContainerFor( const Object* obj, bool checkCapacity) const; - virtual Bool isEnclosingContainerFor( const Object *obj ) const { return FALSE; } ///< Does this type of Contain Visibly enclose its contents? - virtual Bool isSpecialZeroSlotContainer() const { return true; } + virtual Bool isValidContainerFor( const Object* obj, bool checkCapacity) const override; + virtual Bool isEnclosingContainerFor( const Object *obj ) const override { return FALSE; } ///< Does this type of Contain Visibly enclose its contents? + virtual Bool isSpecialZeroSlotContainer() const override { return true; } - virtual void onContaining( Object *obj ); ///< object now contains 'obj' - virtual void onRemoving( Object *obj ); ///< object no longer contains 'obj' + virtual void onContaining( Object *obj ) override; ///< object now contains 'obj' + virtual void onRemoving( Object *obj ) override; ///< object no longer contains 'obj' - virtual UpdateSleepTime update(); ///< called once per frame + virtual UpdateSleepTime update() override; ///< called once per frame - virtual void containReactToTransformChange(); + virtual void containReactToTransformChange() override; - virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ); - virtual void onDie( const DamageInfo * damageInfo ); + virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ) override; + virtual void onDie( const DamageInfo * damageInfo ) override; - virtual void setOverrideDestination( const Coord3D *dest ); ///< Instead of falling peacefully towards a clear spot, I will now aim here + virtual void setOverrideDestination( const Coord3D *dest ) override; ///< Instead of falling peacefully towards a clear spot, I will now aim here protected: virtual Bool isFullyEnclosingContainer() const { return false; } - virtual void positionContainedObjectsRelativeToContainer(); + virtual void positionContainedObjectsRelativeToContainer() override; private: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h index b545969e5af..d1df810b4d9 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h @@ -98,44 +98,44 @@ class ParkingPlaceBehavior : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DIE); } // BehaviorModule - virtual DieModuleInterface *getDie() { return this; } - virtual ParkingPlaceBehaviorInterface* getParkingPlaceBehaviorInterface() { return this; } - virtual ExitInterface* getUpdateExitInterface() { return this; } + virtual DieModuleInterface *getDie() override { return this; } + virtual ParkingPlaceBehaviorInterface* getParkingPlaceBehaviorInterface() override { return this; } + virtual ExitInterface* getUpdateExitInterface() override { return this; } // ExitInterface - virtual Bool isExitBusy() const {return FALSE;} ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. - virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ); - virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ); - virtual void unreserveDoorForExit( ExitDoorType exitDoor ); - virtual void exitObjectByBudding( Object *newObj, Object *budHost ) { return; } + virtual Bool isExitBusy() const override {return FALSE;} ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. + virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ) override; + virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ) override; + virtual void unreserveDoorForExit( ExitDoorType exitDoor ) override; + virtual void exitObjectByBudding( Object *newObj, Object *budHost ) override { return; } - virtual Bool getExitPosition( Coord3D& rallyPoint ) const; - virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) const; - virtual void setRallyPoint( const Coord3D *pos ); ///< define a "rally point" for units to move towards - virtual const Coord3D *getRallyPoint() const; ///< define a "rally point" for units to move towards + virtual Bool getExitPosition( Coord3D& rallyPoint ) const override; + virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) const override; + virtual void setRallyPoint( const Coord3D *pos ) override; ///< define a "rally point" for units to move towards + virtual const Coord3D *getRallyPoint() const override; ///< define a "rally point" for units to move towards // UpdateModule - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // DieModule - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; // ParkingPlaceBehaviorInterface - Bool shouldReserveDoorWhenQueued(const ThingTemplate* thing) const; - Bool hasAvailableSpaceFor(const ThingTemplate* thing) const; - Bool hasReservedSpace(ObjectID id) const; - Bool reserveSpace(ObjectID id, Real parkingOffset, PPInfo* info); - void releaseSpace(ObjectID id); - Bool reserveRunway(ObjectID id, Bool forLanding); - void releaseRunway(ObjectID id); - virtual Int getRunwayIndex(ObjectID id); - Int getRunwayCount() const { return m_runways.size(); } - ObjectID getRunwayReservation(Int r); - void transferRunwayReservationToNextInLineForTakeoff(ObjectID id); - Real getApproachHeight() const { return getParkingPlaceBehaviorModuleData()->m_approachHeight; } - void setHealee(Object* healee, Bool add); - void killAllParkedUnits(); - void defectAllParkedUnits(Team* newTeam, UnsignedInt detectionTime); + virtual Bool shouldReserveDoorWhenQueued(const ThingTemplate* thing) const override; + virtual Bool hasAvailableSpaceFor(const ThingTemplate* thing) const override; + virtual Bool hasReservedSpace(ObjectID id) const override; + virtual Bool reserveSpace(ObjectID id, Real parkingOffset, PPInfo* info) override; + virtual void releaseSpace(ObjectID id) override; + virtual Bool reserveRunway(ObjectID id, Bool forLanding) override; + virtual void releaseRunway(ObjectID id) override; + virtual Int getRunwayIndex(ObjectID id) override; + virtual Int getRunwayCount() const override { return m_runways.size(); } + virtual ObjectID getRunwayReservation(Int r) override; + virtual void transferRunwayReservationToNextInLineForTakeoff(ObjectID id) override; + virtual Real getApproachHeight() const override { return getParkingPlaceBehaviorModuleData()->m_approachHeight; } + virtual void setHealee(Object* healee, Bool add) override; + virtual void killAllParkedUnits() override; + virtual void defectAllParkedUnits(Team* newTeam, UnsignedInt detectionTime) override; private: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h index 4e2a2ee7243..ea793adc920 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h @@ -154,16 +154,16 @@ class ParticleUplinkCannonUpdate : public UpdateModule, public SpecialPowerUpdat // virtual destructor prototype provided by memory pool declaration // SpecialPowerUpdateInterface - virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ); - virtual Bool isSpecialAbility() const { return false; } - virtual Bool isSpecialPower() const { return true; } - virtual Bool isActive() const {return m_status != STATUS_IDLE;} - virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() { return this; } - virtual CommandOption getCommandOption() const { return (CommandOption)0; } - virtual Bool isPowerCurrentlyInUse( const CommandButton *command = nullptr ) const; + virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ) override; + virtual Bool isSpecialAbility() const override { return false; } + virtual Bool isSpecialPower() const override { return true; } + virtual Bool isActive() const override {return m_status != STATUS_IDLE;} + virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() override { return this; } + virtual CommandOption getCommandOption() const override { return (CommandOption)0; } + virtual Bool isPowerCurrentlyInUse( const CommandButton *command = nullptr ) const override; - virtual void onObjectCreated(); - virtual UpdateSleepTime update(); + virtual void onObjectCreated() override; + virtual UpdateSleepTime update() override; void removeAllEffects(); @@ -178,12 +178,12 @@ class ParticleUplinkCannonUpdate : public UpdateModule, public SpecialPowerUpdat Bool calculateDefaultInformation(); Bool calculateUpBonePositions(); - virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const; //Is it active now? - virtual Bool doesSpecialPowerHaveOverridableDestination() const { return true; } //Does it have it, even if it's not active? - virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ); + virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const override; //Is it active now? + virtual Bool doesSpecialPowerHaveOverridableDestination() const override { return true; } //Does it have it, even if it's not active? + virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ) override; // Disabled conditions to process (termination conditions!) - virtual DisabledMaskType getDisabledTypesToProcess() const { return MAKE_DISABLED_MASK3( DISABLED_UNDERPOWERED, DISABLED_EMP, DISABLED_HACKED ); } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return MAKE_DISABLED_MASK3( DISABLED_UNDERPOWERED, DISABLED_EMP, DISABLED_HACKED ); } protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h index ccb308a1989..c0bfca6804f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h @@ -83,23 +83,23 @@ class PhysicsBehavior : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_COLLIDE); } - virtual void onObjectCreated(); + virtual void onObjectCreated() override; // BehaviorModule - virtual CollideModuleInterface* getCollide() { return this; } + virtual CollideModuleInterface* getCollide() override { return this; } // CollideModuleInterface - virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ); - virtual Bool wouldLikeToCollideWith(const Object* other) const { return false; } - virtual Bool isCarBombCrateCollide() const { return false; } - virtual Bool isHijackedVehicleCrateCollide() const { return false; } - virtual Bool isRailroad() const { return false;} - virtual Bool isSalvageCrateCollide() const { return false; } + virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ) override; + virtual Bool wouldLikeToCollideWith(const Object* other) const override { return false; } + virtual Bool isCarBombCrateCollide() const override { return false; } + virtual Bool isHijackedVehicleCrateCollide() const override { return false; } + virtual Bool isRailroad() const override { return false;} + virtual Bool isSalvageCrateCollide() const override { return false; } // UpdateModuleInterface - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // Disabled conditions to process -- all - virtual DisabledMaskType getDisabledTypesToProcess() const { return DISABLEDMASK_ALL; } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return DISABLEDMASK_ALL; } void applyForce( const Coord3D *force ); ///< apply a force at the object's CG void addVelocityTo(const Coord3D* vel) ; @@ -206,7 +206,7 @@ class PhysicsBehavior : public UpdateModule, interesting oscillations can occur in some situations, with friction being applied either before or after the locomotive force, making for huge stuttery messes. (srj) */ - virtual SleepyUpdatePhase getUpdatePhase() const { return PHASE_PHYSICS; } + virtual SleepyUpdatePhase getUpdatePhase() const override { return PHASE_PHYSICS; } Real getAerodynamicFriction() const; Real getForwardFriction() const; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h index 9d064ba7997..a5dd8a629df 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h @@ -68,8 +68,8 @@ class PilotFindVehicleUpdate : public UpdateModule PilotFindVehicleUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onObjectCreated(); - virtual UpdateSleepTime update(); + virtual void onObjectCreated() override; + virtual UpdateSleepTime update() override; Object* scanClosestTarget(); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h index b26bbddc626..19c42c0cf40 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h @@ -71,8 +71,8 @@ class PointDefenseLaserUpdate : public UpdateModule PointDefenseLaserUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onObjectCreated(); - virtual UpdateSleepTime update(); + virtual void onObjectCreated() override; + virtual UpdateSleepTime update() override; Object* scanClosestTarget(); void fireWhenReady(); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h index a535d3cf9f4..17d2a95021e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h @@ -67,17 +67,17 @@ class PoisonedBehavior : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DAMAGE); } // BehaviorModule - virtual DamageModuleInterface* getDamage() { return this; } + virtual DamageModuleInterface* getDamage() override { return this; } // DamageModuleInterface - virtual void onDamage( DamageInfo *damageInfo ); - virtual void onHealing( DamageInfo *damageInfo ); - virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState) { } + virtual void onDamage( DamageInfo *damageInfo ) override; + virtual void onHealing( DamageInfo *damageInfo ) override; + virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState) override { } // UpdateInterface - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // Disabled conditions to process (we should still poison disabled things) - virtual DisabledMaskType getDisabledTypesToProcess() const { return DISABLEDMASK_ALL; } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return DISABLEDMASK_ALL; } protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h index d4c6126542e..f4ab2745636 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h @@ -86,10 +86,10 @@ class PowerPlantUpdate : public UpdateModule, // virtual destructor prototype defined by MemoryPoolObject // interface housekeeping - virtual PowerPlantUpdateInterface* getPowerPlantUpdateInterface() { return this; } + virtual PowerPlantUpdateInterface* getPowerPlantUpdateInterface() override { return this; } - void extendRods( Bool extend ); ///< extend the rods from this object - virtual UpdateSleepTime update(); ///< Here's the actual work of Upgrading + void extendRods( Bool extend ) override; ///< extend the rods from this object + virtual UpdateSleepTime update() override; ///< Here's the actual work of Upgrading protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h index 1c08e79e162..9ac1324f20e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h @@ -50,12 +50,12 @@ class PowerPlantUpgrade : public UpgradeModule PowerPlantUpgrade( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype defined by MemoryPoolObject - virtual void onDelete(); ///< we have some work to do when this module goes away - virtual void onCapture( Player *oldOwner, Player *newOwner ); ///< object containing upgrade has changed teams + virtual void onDelete() override; ///< we have some work to do when this module goes away + virtual void onCapture( Player *oldOwner, Player *newOwner ) override; ///< object containing upgrade has changed teams protected: - virtual void upgradeImplementation(); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation() override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h index f6386b9ff78..90ea6405535 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h @@ -49,8 +49,8 @@ class PreorderCreate : public CreateModule PreorderCreate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onCreate(); - virtual void onBuildComplete(); + virtual void onCreate() override; + virtual void onBuildComplete() override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h index b0754eee327..6ca26ace2d5 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h @@ -189,43 +189,43 @@ class ProductionUpdate : public UpdateModule, public ProductionUpdateInterface, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DIE); } // Disabled conditions to process (AI will still process held status) - virtual DisabledMaskType getDisabledTypesToProcess() const { return getProductionUpdateModuleData()->m_disabledTypesToProcess; } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return getProductionUpdateModuleData()->m_disabledTypesToProcess; } - virtual ProductionUpdateInterface* getProductionUpdateInterface() { return this; } - virtual DieModuleInterface* getDie() { return this; } + virtual ProductionUpdateInterface* getProductionUpdateInterface() override { return this; } + virtual DieModuleInterface* getDie() override { return this; } static ProductionUpdateInterface *getProductionUpdateInterfaceFromObject( Object *obj ); - virtual CanMakeType canQueueCreateUnit( const ThingTemplate *unitType ) const; - virtual CanMakeType canQueueUpgrade( const UpgradeTemplate *upgrade ) const; + virtual CanMakeType canQueueCreateUnit( const ThingTemplate *unitType ) const override; + virtual CanMakeType canQueueUpgrade( const UpgradeTemplate *upgrade ) const override; /** this method is used to request a unique ID to assign to the production of a single unit. It is unique to all units that can be created from this source object, but is not unique among multiple source objects */ - virtual ProductionID requestUniqueUnitID() { ProductionID tmp = m_uniqueID; m_uniqueID = (ProductionID)(m_uniqueID+1); return tmp; } + virtual ProductionID requestUniqueUnitID() override { ProductionID tmp = m_uniqueID; m_uniqueID = (ProductionID)(m_uniqueID+1); return tmp; } - virtual Bool queueUpgrade( const UpgradeTemplate *upgrade ); ///< queue upgrade "research" - virtual void cancelUpgrade( const UpgradeTemplate *upgrade ); ///< cancel upgrade "research" - virtual Bool isUpgradeInQueue( const UpgradeTemplate *upgrade ) const; ///< is the upgrade in our production queue already - virtual UnsignedInt countUnitTypeInQueue( const ThingTemplate *unitType ) const; ///< count number of units with matching unit type in the production queue + virtual Bool queueUpgrade( const UpgradeTemplate *upgrade ) override; ///< queue upgrade "research" + virtual void cancelUpgrade( const UpgradeTemplate *upgrade ) override; ///< cancel upgrade "research" + virtual Bool isUpgradeInQueue( const UpgradeTemplate *upgrade ) const override; ///< is the upgrade in our production queue already + virtual UnsignedInt countUnitTypeInQueue( const ThingTemplate *unitType ) const override; ///< count number of units with matching unit type in the production queue - virtual Bool queueCreateUnit( const ThingTemplate *unitType, ProductionID productionID ); ///< queue unit to be produced - virtual void cancelUnitCreate( ProductionID productionID ); ///< cancel construction of unit with matching production ID - virtual void cancelAllUnitsOfType( const ThingTemplate *unitType); ///< cancel all production of type unitType + virtual Bool queueCreateUnit( const ThingTemplate *unitType, ProductionID productionID ) override; ///< queue unit to be produced + virtual void cancelUnitCreate( ProductionID productionID ) override; ///< cancel construction of unit with matching production ID + virtual void cancelAllUnitsOfType( const ThingTemplate *unitType) override; ///< cancel all production of type unitType - virtual void cancelAndRefundAllProduction(); ///< cancel and refund anything in the production queue + virtual void cancelAndRefundAllProduction() override; ///< cancel and refund anything in the production queue - virtual UnsignedInt getProductionCount() const { return m_productionCount; } ///< return # of things in the production queue + virtual UnsignedInt getProductionCount() const override { return m_productionCount; } ///< return # of things in the production queue // walking the production list from outside - virtual const ProductionEntry *firstProduction() const { return m_productionQueue; } - virtual const ProductionEntry *nextProduction( const ProductionEntry *p ) const { return p ? p->m_next : nullptr; } + virtual const ProductionEntry *firstProduction() const override { return m_productionQueue; } + virtual const ProductionEntry *nextProduction( const ProductionEntry *p ) const override { return p ? p->m_next : nullptr; } - virtual void setHoldDoorOpen(ExitDoorType exitDoor, Bool holdIt); + virtual void setHoldDoorOpen(ExitDoorType exitDoor, Bool holdIt) override; - virtual UpdateSleepTime update(); ///< the update + virtual UpdateSleepTime update() override; ///< the update // DieModuleInterface - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h index 65afb8d35fc..af9466970da 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h @@ -58,7 +58,7 @@ class ProjectileStreamUpdate : public UpdateModule void getAllPoints( Vector3 *points, Int *count ); ///< unroll circlular array and write down all projectile positions void setPosition( const Coord3D *newPosition ); ///< I need to exist at the place I want to draw since only (near) on screen Drawables get updated - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h index 1ca107561c1..33acdb44d5d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h @@ -66,7 +66,7 @@ class ProneUpdate : public UpdateModule void goProne( const DamageInfo *damageInfo ); - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h index 2694ae55807..d5adf894ded 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h @@ -77,21 +77,21 @@ class PropagandaTowerBehavior : public UpdateModule, // module methods static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DIE); } - virtual void onDelete(); - void onObjectCreated(); + virtual void onDelete() override; + void onObjectCreated() override; // update module methods - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // die module methods - virtual DieModuleInterface *getDie() { return this; } - virtual void onDie( const DamageInfo *damageInfo ); - virtual void onCapture( Player *oldOwner, Player *newOwner ); + virtual DieModuleInterface *getDie() override { return this; } + virtual void onDie( const DamageInfo *damageInfo ) override; + virtual void onCapture( Player *oldOwner, Player *newOwner ) override; // Disabled conditions to process. Need to process when disabled, because our update needs to actively let go // of our effect on people. We don't say "Be affected for n frames", we toggle people. We need to process // so we can toggle everyone off. - virtual DisabledMaskType getDisabledTypesToProcess() const { return DISABLEDMASK_ALL; } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return DISABLEDMASK_ALL; } // our own public module methods diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h index da31ff94283..639669d4ff9 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h @@ -80,24 +80,24 @@ class QueueProductionExitUpdate : public UpdateModule, public ExitInterface public: - virtual ExitInterface* getUpdateExitInterface() { return this; } + virtual ExitInterface* getUpdateExitInterface() override { return this; } QueueProductionExitUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration // Required funcs to fulfill interface requirements - virtual Bool isExitBusy() const {return FALSE;} ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. - virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ); - virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ); - virtual void exitObjectByBudding( Object *newObj, Object *budHost ); - virtual void unreserveDoorForExit( ExitDoorType exitDoor ); - - virtual void setRallyPoint( const Coord3D *pos ); ///< define a "rally point" for units to move towards - virtual const Coord3D *getRallyPoint() const; ///< define a "rally point" for units to move towards - virtual Bool getExitPosition( Coord3D& exitPosition ) const; ///< access to the "Door" position of the production object - virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) const; ///< get the natural "rally point" for units to move towards - - virtual UpdateSleepTime update(); + virtual Bool isExitBusy() const override {return FALSE;} ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. + virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ) override; + virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ) override; + virtual void exitObjectByBudding( Object *newObj, Object *budHost ) override; + virtual void unreserveDoorForExit( ExitDoorType exitDoor ) override; + + virtual void setRallyPoint( const Coord3D *pos ) override; ///< define a "rally point" for units to move towards + virtual const Coord3D *getRallyPoint() const override; ///< define a "rally point" for units to move towards + virtual Bool getExitPosition( Coord3D& exitPosition ) const override; ///< access to the "Door" position of the production object + virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) const override; ///< get the natural "rally point" for units to move towards + + virtual UpdateSleepTime update() override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h index 64f8e1104d8..6d95c7c144b 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h @@ -76,7 +76,7 @@ class RadarUpdate : public UpdateModule void extendRadar(); ///< extend the radar from this object Bool isRadarActive() { return m_radarActive; } - virtual UpdateSleepTime update(); ///< Here's the actual work of Upgrading + virtual UpdateSleepTime update() override; ///< Here's the actual work of Upgrading protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h index 3f08a4c8302..b8bd0748248 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h @@ -64,14 +64,14 @@ class RadarUpgrade : public UpgradeModule RadarUpgrade( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype defined by MemoryPoolObject - virtual void onDelete(); ///< we have some work to do when this module goes away - virtual void onCapture( Player *oldOwner, Player *newOwner ); ///< object containing upgrade has changed teams + virtual void onDelete() override; ///< we have some work to do when this module goes away + virtual void onCapture( Player *oldOwner, Player *newOwner ) override; ///< object containing upgrade has changed teams Bool getIsDisableProof() const { return getRadarUpgradeModuleData()->m_isDisableProof; } protected: - virtual void upgradeImplementation(); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation() override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h index 100ee82b19d..2fd30bf2f4f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h @@ -74,7 +74,7 @@ class RadiusDecalUpdate : public UpdateModule void killWhenNoLongerAttacking(Bool v) { m_killWhenNoLongerAttacking = v; } void killRadiusDecal(); - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; private: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h index a4751fd24e7..c9c2dd7e676 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h @@ -64,14 +64,14 @@ class RailedTransportAIUpdate : public AIUpdateInterface // virtual destructor prototype provided by memory pool declaration // AIUpdate interface methods - virtual void aiDoCommand( const AICommandParms *parms ); - virtual UpdateSleepTime update(); + virtual void aiDoCommand( const AICommandParms *parms ) override; + virtual UpdateSleepTime update() override; protected: // ai module methods - virtual void privateExecuteRailedTransport( CommandSourceType cmdSource ); - virtual void privateEvacuate( Int exposeStealthUnits, CommandSourceType cmdSource ); + virtual void privateExecuteRailedTransport( CommandSourceType cmdSource ) override; + virtual void privateEvacuate( Int exposeStealthUnits, CommandSourceType cmdSource ) override; // our methods void setInTransit( Bool inTransit ); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h index a1b5982f980..24450d5237a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h @@ -45,12 +45,12 @@ class RailedTransportContain : public TransportContain RailedTransportContain( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onRemoving( Object *obj ); ///< object no longer contains 'obj' - virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ); - virtual void exitObjectByBudding( Object *newObj, Object *budHost ) { return; }; + virtual void onRemoving( Object *obj ) override; ///< object no longer contains 'obj' + virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ) override; + virtual void exitObjectByBudding( Object *newObj, Object *budHost ) override { return; }; protected: - virtual Bool isSpecificRiderFreeToExit( Object *obj ); + virtual Bool isSpecificRiderFreeToExit( Object *obj ) override; }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h index 47bfbe80c62..af1b0d3a85c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h @@ -78,20 +78,20 @@ class RailedTransportDockUpdate : public DockUpdate, // virtual destructor prototype provided by memory pool declaration // module interfaces - virtual RailedTransportDockUpdateInterface *getRailedTransportDockUpdateInterface() { return this; } + virtual RailedTransportDockUpdateInterface *getRailedTransportDockUpdateInterface() override { return this; } // update module methods - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // dock methods - virtual DockUpdateInterface* getDockUpdateInterface() { return this; } - virtual Bool action( Object* docker, Object *drone = nullptr ); - virtual Bool isClearToEnter( Object const* docker ) const; + virtual DockUpdateInterface* getDockUpdateInterface() override { return this; } + virtual Bool action( Object* docker, Object *drone = nullptr ) override; + virtual Bool isClearToEnter( Object const* docker ) const override; // our own methods - virtual Bool isLoadingOrUnloading(); - virtual void unloadAll(); - virtual void unloadSingleObject( Object *obj ); + virtual Bool isLoadingOrUnloading() override; + virtual void unloadAll() override; + virtual void unloadSingleObject( Object *obj ) override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h index 59d81b98be1..6365458d2eb 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h @@ -219,12 +219,12 @@ class RailroadBehavior : public PhysicsBehavior // virtual SleepyUpdatePhase getUpdatePhase() const { return PHASE_FINAL; } // PhysicsBehavior methods - virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ); - virtual Bool wouldLikeToCollideWith(const Object* other) const {return FALSE;}; // will need to add this! - virtual Bool isHijackedVehicleCrateCollide() const {return FALSE;}; - virtual Bool isCarBombCrateCollide() const {return FALSE;}; - virtual Bool isRailroad() const ; - virtual UpdateSleepTime update(); + virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ) override; + virtual Bool wouldLikeToCollideWith(const Object* other) const override {return FALSE;}; // will need to add this! + virtual Bool isHijackedVehicleCrateCollide() const override {return FALSE;}; + virtual Bool isCarBombCrateCollide() const override {return FALSE;}; + virtual Bool isRailroad() const override; + virtual UpdateSleepTime update() override; // TRAINY METHODS void getPulled( PullInfo *info ); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h index b5fdd173b44..248c2ba3027 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h @@ -82,24 +82,24 @@ class RebuildHoleBehavior : public UpdateModule, RebuildHoleBehavior( Thing *thing, const ModuleData *moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual RebuildHoleBehaviorInterface* getRebuildHoleBehaviorInterface() { return this; } + virtual RebuildHoleBehaviorInterface* getRebuildHoleBehaviorInterface() override { return this; } static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DIE); } // BehaviorModule - virtual DieModuleInterface* getDie() { return this; } + virtual DieModuleInterface* getDie() override { return this; } // UpdateModuleInterface - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // DieModuleInterface - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; // RebuildHole specific methods - virtual void startRebuildProcess( const ThingTemplate *rebuild, ObjectID spawnerID ); - virtual ObjectID getSpawnerID() { return m_spawnerObjectID; } - virtual ObjectID getReconstructedBuildingID() { return m_reconstructingID; } - virtual const ThingTemplate* getRebuildTemplate() const { return m_rebuildTemplate; } + virtual void startRebuildProcess( const ThingTemplate *rebuild, ObjectID spawnerID ) override; + virtual ObjectID getSpawnerID() override { return m_spawnerObjectID; } + virtual ObjectID getReconstructedBuildingID() override { return m_reconstructingID; } + virtual const ThingTemplate* getRebuildTemplate() const override { return m_rebuildTemplate; } void transferBombs( Object *reconstruction ); // interface acquisition diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h index 88bcd94b29a..58cbd5b44ee 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h @@ -66,6 +66,6 @@ class RebuildHoleExposeDie : public DieModule RebuildHoleExposeDie( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h index 15f0d70d813..a7a18f63e14 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h @@ -61,11 +61,11 @@ class RepairDockUpdate : public DockUpdate RepairDockUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by MemoryPoolObject base class - virtual DockUpdateInterface* getDockUpdateInterface() { return this; } + virtual DockUpdateInterface* getDockUpdateInterface() override { return this; } - virtual Bool action( Object *docker, Object *drone = nullptr ); ///< for me this means do some repair + virtual Bool action( Object *docker, Object *drone = nullptr ) override; ///< for me this means do some repair - virtual Bool isRallyPointAfterDockType(){return TRUE;} ///< A minority of docks want to give you a final command to their rally point + virtual Bool isRallyPointAfterDockType() override{return TRUE;} ///< A minority of docks want to give you a final command to their rally point protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h index ee5336aff5c..419a0d8bb86 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h @@ -87,15 +87,15 @@ class SalvageCrateCollide : public CrateCollide SalvageCrateCollide( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual Bool isSalvageCrateCollide() const { return true; } + virtual Bool isSalvageCrateCollide() const override { return true; } protected: /// This allows specific vetoes to certain types of crates and their data - virtual Bool isValidToExecute( const Object *other ) const; + virtual Bool isValidToExecute( const Object *other ) const override; /// This is the game logic execution function that all real CrateCollides will implement - virtual Bool executeCrateBehavior( Object *other ); + virtual Bool executeCrateBehavior( Object *other ) override; private: Bool eligibleForWeaponSet( Object *other ); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h index 566cdf14c75..1e2e7c49577 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h @@ -51,5 +51,5 @@ class ShroudCrateCollide : public CrateCollide protected: /// This is the game logic execution function that all real CrateCollides will implement - virtual Bool executeCrateBehavior( Object *other ); + virtual Bool executeCrateBehavior( Object *other ) override; }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h index 5356c02bbf3..16b34443c31 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h @@ -144,14 +144,14 @@ class SlavedUpdate : public UpdateModule, public SlavedUpdateInterface SlavedUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual SlavedUpdateInterface* getSlavedUpdateInterface() { return this; } + virtual SlavedUpdateInterface* getSlavedUpdateInterface() override { return this; } - virtual ObjectID getSlaverID() const { return m_slaver; } - virtual void onEnslave( const Object *slaver ); - virtual void onSlaverDie( const DamageInfo *info ); - virtual void onSlaverDamage( const DamageInfo *info ); - virtual void onObjectCreated(); - virtual Bool isSelfTasking() const { return FALSE; }; + virtual ObjectID getSlaverID() const override { return m_slaver; } + virtual void onEnslave( const Object *slaver ) override; + virtual void onSlaverDie( const DamageInfo *info ) override; + virtual void onSlaverDamage( const DamageInfo *info ) override; + virtual void onObjectCreated() override; + virtual Bool isSelfTasking() const override { return FALSE; }; void doScoutLogic( const Coord3D *mastersDestination ); @@ -163,7 +163,7 @@ class SlavedUpdate : public UpdateModule, public SlavedUpdateInterface void setRepairModelConditionStates( ModelConditionFlagType flag ); void moveToNewRepairSpot(); - virtual UpdateSleepTime update(); ///< Deciding whether or not to make new guys + virtual UpdateSleepTime update() override; ///< Deciding whether or not to make new guys private: void startSlavedEffects( const Object *slaver ); ///< We have been marked as Slaved, so we can't be selected or move too far or other stuff diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h index a5da244dd7c..47b94c4fbec 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h @@ -137,21 +137,21 @@ class SlowDeathBehavior : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DIE); } // BehaviorModule - virtual DieModuleInterface* getDie() { return this; } + virtual DieModuleInterface* getDie() override { return this; } // UpdateModuleInterface - virtual UpdateSleepTime update(); - virtual SlowDeathBehaviorInterface* getSlowDeathBehaviorInterface() { return this; } + virtual UpdateSleepTime update() override; + virtual SlowDeathBehaviorInterface* getSlowDeathBehaviorInterface() override { return this; } // Disabled conditions to process -- all - virtual DisabledMaskType getDisabledTypesToProcess() const { return DISABLEDMASK_ALL; } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return DISABLEDMASK_ALL; } // DieModuleInterface - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; // SlowDeathBehaviorInterface - virtual void beginSlowDeath( const DamageInfo *damageInfo ); - virtual Int getProbabilityModifier( const DamageInfo *damageInfo ) const; - virtual Bool isDieApplicable(const DamageInfo *damageInfo) const { return getSlowDeathBehaviorModuleData()->m_dieMuxData.isDieApplicable(getObject(), damageInfo); } + virtual void beginSlowDeath( const DamageInfo *damageInfo ) override; + virtual Int getProbabilityModifier( const DamageInfo *damageInfo ) const override; + virtual Bool isDieApplicable(const DamageInfo *damageInfo) const override { return getSlowDeathBehaviorModuleData()->m_dieMuxData.isDieApplicable(getObject(), damageInfo); } protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h index 2dd2c1bc319..95ec3c8cd7c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h @@ -131,35 +131,35 @@ class SpawnBehavior : public UpdateModule, // module methods static Int getInterfaceMask() { return (MODULEINTERFACE_UPDATE) | (MODULEINTERFACE_DIE) | (MODULEINTERFACE_DAMAGE); } - virtual void onDelete(); - virtual UpdateModuleInterface *getUpdate() { return this; } - virtual DieModuleInterface *getDie() { return this; } - virtual DamageModuleInterface *getDamage() { return this; } - virtual SpawnBehaviorInterface* getSpawnBehaviorInterface() { return this; } + virtual void onDelete() override; + virtual UpdateModuleInterface *getUpdate() override { return this; } + virtual DieModuleInterface *getDie() override { return this; } + virtual DamageModuleInterface *getDamage() override { return this; } + virtual SpawnBehaviorInterface* getSpawnBehaviorInterface() override { return this; } // update methods - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // die methods - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; // damage methods - virtual void onDamage( DamageInfo *damageInfo ); - virtual void onHealing( DamageInfo *damageInfo ) { } + virtual void onDamage( DamageInfo *damageInfo ) override; + virtual void onHealing( DamageInfo *damageInfo ) override { } virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, BodyDamageType oldState, - BodyDamageType newState) { } + BodyDamageType newState) override { } // SpawnBehaviorInterface methods - virtual Bool maySpawnSelfTaskAI( Real maxSelfTaskersRatio ); - virtual void onSpawnDeath( ObjectID deadSpawn, DamageInfo *damageInfo ); ///< Something we spawned and set up to tell us it died just died. - virtual Object* getClosestSlave( const Coord3D *pos ); - virtual void orderSlavesToAttackTarget( Object *target, Int maxShotsToFire, CommandSourceType cmdSource ); - virtual void orderSlavesToAttackPosition( const Coord3D *pos, Int maxShotsToFire, CommandSourceType cmdSource ); - virtual CanAttackResult getCanAnySlavesAttackSpecificTarget( AbleToAttackType attackType, const Object *target, CommandSourceType cmdSource ); - virtual CanAttackResult getCanAnySlavesUseWeaponAgainstTarget( AbleToAttackType attackType, const Object *victim, const Coord3D *pos, CommandSourceType cmdSource ); - virtual Bool canAnySlavesAttack(); - virtual void orderSlavesToGoIdle( CommandSourceType cmdSource ); + virtual Bool maySpawnSelfTaskAI( Real maxSelfTaskersRatio ) override; + virtual void onSpawnDeath( ObjectID deadSpawn, DamageInfo *damageInfo ) override; ///< Something we spawned and set up to tell us it died just died. + virtual Object* getClosestSlave( const Coord3D *pos ) override; + virtual void orderSlavesToAttackTarget( Object *target, Int maxShotsToFire, CommandSourceType cmdSource ) override; + virtual void orderSlavesToAttackPosition( const Coord3D *pos, Int maxShotsToFire, CommandSourceType cmdSource ) override; + virtual CanAttackResult getCanAnySlavesAttackSpecificTarget( AbleToAttackType attackType, const Object *target, CommandSourceType cmdSource ) override; + virtual CanAttackResult getCanAnySlavesUseWeaponAgainstTarget( AbleToAttackType attackType, const Object *victim, const Coord3D *pos, CommandSourceType cmdSource ) override; + virtual Bool canAnySlavesAttack() override; + virtual void orderSlavesToGoIdle( CommandSourceType cmdSource ) override; // ********************************************************************************************** // our own methods diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h index 02095d304db..2cdd983e17d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h @@ -68,21 +68,21 @@ class SpawnPointProductionExitUpdate : public UpdateModule, public ExitInterface public: - virtual ExitInterface* getUpdateExitInterface() { return this; } + virtual ExitInterface* getUpdateExitInterface() override { return this; } SpawnPointProductionExitUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration // Required funcs to fulfill interface requirements - virtual Bool isExitBusy() const {return FALSE;} ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. - virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ); - virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ); - virtual void unreserveDoorForExit( ExitDoorType exitDoor ); - virtual void setRallyPoint( const Coord3D * ){} - virtual const Coord3D *getRallyPoint() const { return nullptr; } - virtual void exitObjectByBudding( Object *newObj, Object *budHost ) { return; } - - virtual UpdateSleepTime update() { return UPDATE_SLEEP_FOREVER; } + virtual Bool isExitBusy() const override {return FALSE;} ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. + virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ) override; + virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ) override; + virtual void unreserveDoorForExit( ExitDoorType exitDoor ) override; + virtual void setRallyPoint( const Coord3D * ) override{} + virtual const Coord3D *getRallyPoint() const override { return nullptr; } + virtual void exitObjectByBudding( Object *newObj, Object *budHost ) override { return; } + + virtual UpdateSleepTime update() override { return UPDATE_SLEEP_FOREVER; } protected: Bool m_bonesInitialized; ///< To prevent creation bugs, only init the World coords when first asked for one diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h index 0696e6e1130..2142fb7b68e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h @@ -55,9 +55,9 @@ class SpecialAbility : public SpecialPowerModule SpecialAbility( Thing *thing, const ModuleData *moduleData ); - virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions ); - virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ); - virtual void doSpecialPower( UnsignedInt commandOptions ); + virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions ) override; + virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ) override; + virtual void doSpecialPower( UnsignedInt commandOptions ) override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h index caa016d828b..dde2e4ddf37 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h @@ -170,21 +170,21 @@ class SpecialAbilityUpdate : public UpdateModule, public SpecialPowerUpdateInter // virtual destructor prototype provided by memory pool declaration // SpecialPowerUpdateInterface - virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ); - virtual Bool isSpecialAbility() const { return true; } - virtual Bool isSpecialPower() const { return false; } - virtual Bool isActive() const { return m_active; } - virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const { return false; } //Is it active now? - virtual Bool doesSpecialPowerHaveOverridableDestination() const { return false; } //Does it have it, even if it's not active? - virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ) {} - virtual Bool isPowerCurrentlyInUse( const CommandButton *command = nullptr ) const; + virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ) override; + virtual Bool isSpecialAbility() const override { return true; } + virtual Bool isSpecialPower() const override { return false; } + virtual Bool isActive() const override { return m_active; } + virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const override { return false; } //Is it active now? + virtual Bool doesSpecialPowerHaveOverridableDestination() const override { return false; } //Does it have it, even if it's not active? + virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ) override {} + virtual Bool isPowerCurrentlyInUse( const CommandButton *command = nullptr ) const override; // virtual Bool isBusy() const { return m_isBusy; } // UpdateModule - virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() { return this; } - virtual CommandOption getCommandOption() const { return (CommandOption)0; } - virtual UpdateSleepTime update(); + virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() override { return this; } + virtual CommandOption getCommandOption() const override { return (CommandOption)0; } + virtual UpdateSleepTime update() override; // ??? ugh, public stuff that shouldn't be -- hell yeah! UnsignedInt getSpecialObjectCount() const; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h index 45e1d18f8b8..789ce9f576f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h @@ -77,7 +77,7 @@ class SpecialPowerCompletionDie : public DieModule void setCreator( ObjectID creatorID ); void notifyScriptEngine(); - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h index df370f418ce..8ee4e95e106 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h @@ -48,8 +48,8 @@ class SpecialPowerCreate : public CreateModule SpecialPowerCreate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onCreate(); - virtual void onBuildComplete(); ///< This is called when you are a finished game object + virtual void onCreate() override; + virtual void onBuildComplete() override; ///< This is called when you are a finished game object protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h index 33e4e77f464..63e6b78ae6e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h @@ -100,39 +100,39 @@ class SpecialPowerModule : public BehaviorModule, static Int getInterfaceMask() { return MODULEINTERFACE_SPECIAL_POWER; } // BehaviorModule - virtual SpecialPowerModuleInterface* getSpecialPower() { return this; } + virtual SpecialPowerModuleInterface* getSpecialPower() override { return this; } - Bool isModuleForPower( const SpecialPowerTemplate *specialPowerTemplate ) const; ///< is this module for the specified special power - Bool isReady() const; ///< is this special power available now + Bool isModuleForPower( const SpecialPowerTemplate *specialPowerTemplate ) const override; ///< is this module for the specified special power + Bool isReady() const override; ///< is this special power available now // This is the althernate way to one-at-a-time BlackLotus' specials; we'll keep it commented her until Dustin decides, or until 12/10/02 // Bool isBusy() const { return FALSE; } - Real getPercentReady() const; ///< get the percent ready (1.0 = ready now, 0.5 = half charged up etc.) + Real getPercentReady() const override; ///< get the percent ready (1.0 = ready now, 0.5 = half charged up etc.) - UnsignedInt getReadyFrame() const; ///< get the frame at which we are ready - AsciiString getPowerName() const; + UnsignedInt getReadyFrame() const override; ///< get the frame at which we are ready + AsciiString getPowerName() const override; void syncReadyFrameToStatusQuo(); - const SpecialPowerTemplate* getSpecialPowerTemplate() const; - ScienceType getRequiredScience() const; + const SpecialPowerTemplate* getSpecialPowerTemplate() const override; + ScienceType getRequiredScience() const override; - void onSpecialPowerCreation(); // called by a create module to start our countdown + void onSpecialPowerCreation() override; // called by a create module to start our countdown // // The following methods are for use by the scripting engine ONLY // - void setReadyFrame( UnsignedInt frame ) { m_availableOnFrame = frame; } + void setReadyFrame( UnsignedInt frame ) override { m_availableOnFrame = frame; } UnsignedInt getReadyFrame() { return m_availableOnFrame; }// USED BY PLAYER TO KEEP RECHARGE TIMERS IN SYNC - void pauseCountdown( Bool pause ); + void pauseCountdown( Bool pause ) override; // // the following methods should be *EXTENDED* for any special power module implementations // and carry out the special power executions // - virtual void doSpecialPower( UnsignedInt commandOptions ); - virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions ); - virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ); - virtual void doSpecialPowerUsingWaypoints( const Waypoint *way, UnsignedInt commandOptions ); + virtual void doSpecialPower( UnsignedInt commandOptions ) override; + virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions ) override; + virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ) override; + virtual void doSpecialPowerUsingWaypoints( const Waypoint *way, UnsignedInt commandOptions ) override; /** Now, there are special powers that require some preliminary processing before the actual @@ -145,12 +145,12 @@ class SpecialPowerModule : public BehaviorModule, module. The update module then orders the unit to move within range, and it isn't until the hacker start the physical attack, that the timer is reset and the attack technically begins. */ - virtual void markSpecialPowerTriggered( const Coord3D *location ); + virtual void markSpecialPowerTriggered( const Coord3D *location ) override; /** start the recharge process for this special power. public because some powers call it repeatedly. */ - virtual void startPowerRecharge(); - virtual const AudioEventRTS& getInitiateSound() const; + virtual void startPowerRecharge() override; + virtual const AudioEventRTS& getInitiateSound() const override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h index 0533ff8178b..61e5e81dd7e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h @@ -65,7 +65,7 @@ class SpyVisionSpecialPower : public SpecialPowerModule SpyVisionSpecialPower( Thing *thing, const ModuleData *moduleData ); // virtual destructor prototype provided by memory pool object - virtual void doSpecialPower( UnsignedInt commandOptions ); + virtual void doSpecialPower( UnsignedInt commandOptions ) override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h index 1afdf17b4c0..e64471edea8 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h @@ -59,8 +59,8 @@ class SpyVisionUpdate : public UpdateModule SpyVisionUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onDelete(); - virtual UpdateSleepTime update(); + virtual void onDelete() override; + virtual UpdateSleepTime update() override; void activateSpyVision( UnsignedInt duration ); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h index b8ea5018475..86548e4ac18 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h @@ -50,7 +50,7 @@ class SquishCollide : public CollideModule // virtual destructor prototype provided by memory pool declaration /// This collide method gets called when collision occur - virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ); + virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ) override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h index 6e572c40c38..f7fe50aac42 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h @@ -91,8 +91,8 @@ class StatusBitsUpgrade : public UpgradeModule // virtual destructor prototype defined by MemoryPoolObject protected: - virtual void upgradeImplementation( ); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation( ) override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h index d545415f7d3..9c00c9a76c5 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h @@ -87,8 +87,8 @@ class StealthDetectorUpdate : public UpdateModule Bool isSDEnabled() const { return m_enabled; } void setSDEnabled( Bool enabled ); - virtual UpdateSleepTime update(); - virtual DisabledMaskType getDisabledTypesToProcess() const { return MAKE_DISABLED_MASK( DISABLED_HELD ); } + virtual UpdateSleepTime update() override; + virtual DisabledMaskType getDisabledTypesToProcess() const override { return MAKE_DISABLED_MASK( DISABLED_HELD ); } private: Bool m_enabled; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h index 81b4487bf85..e4c746dbae5 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h @@ -117,12 +117,12 @@ class StealthUpdate : public UpdateModule StealthUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual StealthUpdate* getStealth() { return this; } + virtual StealthUpdate* getStealth() override { return this; } - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; //Still gets called, even if held -ML - virtual DisabledMaskType getDisabledTypesToProcess() const { return MAKE_DISABLED_MASK( DISABLED_HELD ); } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return MAKE_DISABLED_MASK( DISABLED_HELD ); } // ??? ugh Bool isDisguised() const { return m_disguiseAsTemplate != nullptr; } diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h index d6a860c17c9..504b030dd03 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h @@ -50,7 +50,7 @@ class StealthUpgrade : public UpgradeModule // virtual destructor prototype defined by MemoryPoolObject protected: - virtual void upgradeImplementation( ); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation( ) override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h index 08bc0444de3..c12c74aa09c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h @@ -69,9 +69,9 @@ class StickyBombUpdate : public UpdateModule StickyBombUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onObjectCreated(); + virtual void onObjectCreated() override; - virtual UpdateSleepTime update(); ///< called once per frame + virtual UpdateSleepTime update() override; ///< called once per frame void init( const Object *object, const Object *bomber ); void detonate(); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h index 13c1919e7f1..4b52f0cde76 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h @@ -109,13 +109,13 @@ class StructureCollapseUpdate : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DIE); } // BehaviorModule - virtual DieModuleInterface* getDie() { return this; } + virtual DieModuleInterface* getDie() override { return this; } // UpdateModuleInterface - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // DieModuleInterface - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h index e33a10d0bc7..a4f4d26b62f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h @@ -150,13 +150,13 @@ class StructureToppleUpdate : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DIE); } // BehaviorModule - virtual DieModuleInterface* getDie() { return this; } + virtual DieModuleInterface* getDie() override { return this; } // UpdateModuleInterface - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // DieModuleInterface - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h index dfc24b45e12..6a68c82869a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h @@ -81,7 +81,7 @@ class SubObjectsUpgrade : public UpgradeModule // virtual destructor prototype defined by MemoryPoolObject protected: - virtual void upgradeImplementation( ); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return true; } + virtual void upgradeImplementation( ) override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return true; } }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h index b36e5678045..0bc93489578 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h @@ -48,8 +48,8 @@ class SupplyCenterCreate : public CreateModule SupplyCenterCreate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onCreate(); - virtual void onBuildComplete(); ///< This is called when you are a finished game object + virtual void onCreate() override; + virtual void onBuildComplete() override; ///< This is called when you are a finished game object protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h index cd341426212..525848d5ebc 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h @@ -58,10 +58,10 @@ class SupplyCenterDockUpdate : public DockUpdate SupplyCenterDockUpdate( Thing *thing, const ModuleData* moduleData ); - virtual DockUpdateInterface* getDockUpdateInterface() { return this; } - virtual Bool action( Object* docker, Object *drone = nullptr ); ///xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; public: SupplyTruckWantsToPickUpOrDeliverBoxesState( StateMachine *machine ) : State( machine, "SupplyTruckWantsToPickUpOrDeliverBoxesState" ) {} - virtual StateReturnType update(); - virtual StateReturnType onEnter(); - virtual void onExit(StateExitType status); + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; + virtual void onExit(StateExitType status) override; }; EMPTY_DTOR(SupplyTruckWantsToPickUpOrDeliverBoxesState) @@ -78,14 +78,14 @@ class RegroupingState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(RegroupingState, "RegroupingState") protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; public: RegroupingState( StateMachine *machine ) : State( machine, "RegroupingState" ) {} - virtual StateReturnType update(){ return STATE_CONTINUE;}// Nothing to do but wait for a transition - virtual StateReturnType onEnter();// Will tell me to aiMove back to base. - virtual void onExit(StateExitType status); + virtual StateReturnType update() override{ return STATE_CONTINUE;}// Nothing to do but wait for a transition + virtual StateReturnType onEnter() override;// Will tell me to aiMove back to base. + virtual void onExit(StateExitType status) override; }; EMPTY_DTOR(RegroupingState) @@ -95,14 +95,14 @@ class DockingState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DockingState, "DockingState") protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; public: DockingState( StateMachine *machine ) :State( machine, "DockingState" ) {} - virtual StateReturnType update(); - virtual StateReturnType onEnter(); - virtual void onExit(StateExitType status); + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; + virtual void onExit(StateExitType status) override; }; EMPTY_DTOR(DockingState) @@ -191,35 +191,35 @@ class SupplyTruckAIUpdate : public AIUpdateInterface, public SupplyTruckAIInterf SupplyTruckAIUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual SupplyTruckAIInterface* getSupplyTruckAIInterface() {return this;} - virtual const SupplyTruckAIInterface* getSupplyTruckAIInterface() const {return this;} + virtual SupplyTruckAIInterface* getSupplyTruckAIInterface() override {return this;} + virtual const SupplyTruckAIInterface* getSupplyTruckAIInterface() const override {return this;} - virtual Int getNumberBoxes() const { return m_numberBoxes; } - virtual Bool loseOneBox(); - virtual Bool gainOneBox( Int remainingStock ); + virtual Int getNumberBoxes() const override { return m_numberBoxes; } + virtual Bool loseOneBox() override; + virtual Bool gainOneBox( Int remainingStock ) override; // this is present for subclasses (eg, Chinook) to override, to // prevent supply-ferry behavior in some cases (eg, when toting passengers) - virtual Bool isAvailableForSupplying() const; - virtual Bool isCurrentlyFerryingSupplies() const; - virtual Real getWarehouseScanDistance() const; ///< How far can I look for a warehouse? + virtual Bool isAvailableForSupplying() const override; + virtual Bool isCurrentlyFerryingSupplies() const override; + virtual Real getWarehouseScanDistance() const override; ///< How far can I look for a warehouse? - virtual void setForceWantingState(Bool v) { m_forcePending = v; } // When a Supply Center creates us (or maybe other sources later), we need to hop into autopilot mode. - virtual Bool isForcedIntoWantingState() const { return m_forcePending; } + virtual void setForceWantingState(Bool v) override { m_forcePending = v; } // When a Supply Center creates us (or maybe other sources later), we need to hop into autopilot mode. + virtual Bool isForcedIntoWantingState() const override { return m_forcePending; } - virtual void setForceBusyState(Bool v) { m_forcedBusyPending = v; } - virtual Bool isForcedIntoBusyState() const { return m_forcedBusyPending; } + virtual void setForceBusyState(Bool v) override { m_forcedBusyPending = v; } + virtual Bool isForcedIntoBusyState() const override { return m_forcedBusyPending; } - virtual ObjectID getPreferredDockID() const { return m_preferredDock; } - virtual UnsignedInt getActionDelayForDock( Object *dock ); + virtual ObjectID getPreferredDockID() const override { return m_preferredDock; } + virtual UnsignedInt getActionDelayForDock( Object *dock ) override; - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: - virtual AIStateMachine* makeStateMachine(); - virtual void privateDock( Object *obj, CommandSourceType cmdSource ); - virtual void privateIdle(CommandSourceType cmdSource); ///< Enter idle state. + virtual AIStateMachine* makeStateMachine() override; + virtual void privateDock( Object *obj, CommandSourceType cmdSource ) override; + virtual void privateIdle(CommandSourceType cmdSource) override; ///< Enter idle state. private: SupplyTruckStateMachine* m_supplyTruckStateMachine; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h index 560aa005f8e..e408e6dec7d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h @@ -48,7 +48,7 @@ class SupplyWarehouseCreate : public CreateModule SupplyWarehouseCreate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onCreate(); + virtual void onCreate() override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h index 18b6e9440bc..7f246496165 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h @@ -68,15 +68,15 @@ class SupplyWarehouseCripplingBehavior : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DAMAGE); } // BehaviorModule - virtual DamageModuleInterface* getDamage() { return this; } + virtual DamageModuleInterface* getDamage() override { return this; } // DamageModuleInterface - virtual void onDamage( DamageInfo *damageInfo ); - virtual void onHealing( DamageInfo *damageInfo ){} - virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState); + virtual void onDamage( DamageInfo *damageInfo ) override; + virtual void onHealing( DamageInfo *damageInfo ) override{} + virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState) override; // UpdateInterface - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: virtual void resetSelfHealSupression();// Reset our able to heal timer, as we took damage diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h index f461f6f5f8f..1a37a717ec9 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h @@ -57,18 +57,18 @@ class SupplyWarehouseDockUpdate : public DockUpdate public: - virtual DockUpdateInterface* getDockUpdateInterface() { return this; } + virtual DockUpdateInterface* getDockUpdateInterface() override { return this; } SupplyWarehouseDockUpdate( Thing *thing, const ModuleData* moduleData ); - virtual void setDockCrippled( Bool setting ); ///< Game Logic can set me as inoperative. I get to decide what that means. - virtual Bool action( Object* docker, Object *drone = nullptr ); ///m_upgradeMuxData.m_requiresAllTriggers; } - virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const + virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const override { getUpgradeModuleData()->m_upgradeMuxData.getUpgradeActivationMasks(activation, conflicting); } - virtual void performUpgradeFX() + virtual void performUpgradeFX() override { getUpgradeModuleData()->m_upgradeMuxData.performUpgradeFX(getObject()); } diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h index 0f184125683..4673da2b9c5 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h @@ -82,10 +82,10 @@ class VeterancyCrateCollide : public CrateCollide protected: /// This allows specific vetoes to certain types of crates and their data - virtual Bool isValidToExecute( const Object *other ) const; + virtual Bool isValidToExecute( const Object *other ) const override; /// This is the game logic execution function that all real CrateCollides will implement - virtual Bool executeCrateBehavior( Object *other ); + virtual Bool executeCrateBehavior( Object *other ) override; Int getLevelsToGain() const; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h index 3770d05a771..13fff283183 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h @@ -62,7 +62,7 @@ class VeterancyGainCreate : public CreateModule // virtual destructor prototype provided by memory pool declaration /// the create method - virtual void onCreate(); + virtual void onCreate() override; protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h index 3b94033618e..3c8f1017e2f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h @@ -47,7 +47,7 @@ class WanderAIUpdate : public AIUpdateInterface for an example.) */ - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; public: @@ -57,6 +57,6 @@ class WanderAIUpdate : public AIUpdateInterface protected: - virtual AIStateMachine* makeStateMachine(); + virtual AIStateMachine* makeStateMachine() override; }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h index 304bfe3f3a0..feca1bc5e17 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h @@ -77,7 +77,7 @@ class WaveGuideUpdate : public UpdateModule WaveGuideUpdate( Thing *thing, const ModuleData *moduleData ); // virtual destructor prototype provided by MemoryPoolObject - virtual UpdateSleepTime update(); ///< the update implementation + virtual UpdateSleepTime update() override; ///< the update implementation protected: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h index 79c1f42c7a4..855eefa2142 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h @@ -75,8 +75,8 @@ class WeaponBonusUpgrade : public UpgradeModule // virtual destructor prototype defined by MemoryPoolObject protected: - virtual void upgradeImplementation( ); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation( ) override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h index acb4df3d52f..e88e87dc6fa 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h @@ -50,7 +50,7 @@ class WeaponSetUpgrade : public UpgradeModule // virtual destructor prototype defined by MemoryPoolObject protected: - virtual void upgradeImplementation( ); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation( ) override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h index 3fd5e5e2c1f..9b15198c754 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h @@ -50,9 +50,9 @@ class WorkerStateMachine : public StateMachine protected: // snapshot interface - 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; }; // ------------------------------------------------------------------------------------------------ @@ -123,91 +123,91 @@ class WorkerAIUpdate : public AIUpdateInterface, public DozerAIInterface, public WorkerAIUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual DozerAIInterface* getDozerAIInterface() {return this;} - virtual const DozerAIInterface* getDozerAIInterface() const {return this;} - virtual SupplyTruckAIInterface* getSupplyTruckAIInterface() {return this;} - virtual const SupplyTruckAIInterface* getSupplyTruckAIInterface() const {return this;} - virtual WorkerAIInterface* getWorkerAIInterface() { return this; } - virtual const WorkerAIInterface* getWorkerAIInterface() const { return this; } + virtual DozerAIInterface* getDozerAIInterface() override {return this;} + virtual const DozerAIInterface* getDozerAIInterface() const override {return this;} + virtual SupplyTruckAIInterface* getSupplyTruckAIInterface() override {return this;} + virtual const SupplyTruckAIInterface* getSupplyTruckAIInterface() const override {return this;} + virtual WorkerAIInterface* getWorkerAIInterface() override { return this; } + virtual const WorkerAIInterface* getWorkerAIInterface() const override { return this; } // Dozer side - virtual void onDelete(); + virtual void onDelete() override; - virtual Real getRepairHealthPerSecond() const; ///< get health to repair per second - virtual Real getBoredTime() const; ///< how long till we're bored - virtual Real getBoredRange() const; ///< when we're bored, we look this far away to do things + virtual Real getRepairHealthPerSecond() const override; ///< get health to repair per second + virtual Real getBoredTime() const override; ///< how long till we're bored + virtual Real getBoredRange() const override; ///< when we're bored, we look this far away to do things virtual Object *construct( const ThingTemplate *what, const Coord3D *pos, Real angle, Player *owningPlayer, - Bool isRebuild ); ///< construct a building + Bool isRebuild ) override; ///< construct a building // get task information - virtual DozerTask getMostRecentCommand(); ///< return task that was most recently issued - virtual Bool isTaskPending( DozerTask task ); ///< is there a desire to do the requested task - virtual ObjectID getTaskTarget( DozerTask task ); ///< get target of task - virtual Bool isAnyTaskPending(); ///< is there any dozer task pending - virtual DozerTask getCurrentTask() const { return m_currentTask; } ///< return the current task we're doing - virtual void setCurrentTask( DozerTask task ) { m_currentTask = task; } ///< set the current task of the dozer + virtual DozerTask getMostRecentCommand() override; ///< return task that was most recently issued + virtual Bool isTaskPending( DozerTask task ) override; ///< is there a desire to do the requested task + virtual ObjectID getTaskTarget( DozerTask task ) override; ///< get target of task + virtual Bool isAnyTaskPending() override; ///< is there any dozer task pending + virtual DozerTask getCurrentTask() const override { return m_currentTask; } ///< return the current task we're doing + virtual void setCurrentTask( DozerTask task ) override { m_currentTask = task; } ///< set the current task of the dozer - virtual Bool getIsRebuild() { return m_isRebuild; } ///< get whether or not our task is a rebuild. + virtual Bool getIsRebuild() override { return m_isRebuild; } ///< get whether or not our task is a rebuild. // task actions - virtual void newTask( DozerTask task, Object* target ); ///< set a desire to do the requrested task - virtual void cancelTask( DozerTask task ); ///< cancel this task from the queue, if it's the current task the dozer will stop working on it - virtual void cancelAllTasks(); ///< cancel all tasks from the queue, if it's the current task the dozer will stop working on it - virtual void resumePreviousTask(); ///< resume the previous task if there was one + virtual void newTask( DozerTask task, Object* target ) override; ///< set a desire to do the requrested task + virtual void cancelTask( DozerTask task ) override; ///< cancel this task from the queue, if it's the current task the dozer will stop working on it + virtual void cancelAllTasks() override; ///< cancel all tasks from the queue, if it's the current task the dozer will stop working on it + virtual void resumePreviousTask() override; ///< resume the previous task if there was one // internal methods to manage behavior from within the dozer state machine - virtual void internalTaskComplete( DozerTask task ); ///< set a dozer task as successfully completed - virtual void internalCancelTask( DozerTask task ); ///< cancel this task from the dozer - virtual void internalTaskCompleteOrCancelled( DozerTask task ); ///< this is called when tasks are cancelled or completed + virtual void internalTaskComplete( DozerTask task ) override; ///< set a dozer task as successfully completed + virtual void internalCancelTask( DozerTask task ) override; ///< cancel this task from the dozer + virtual void internalTaskCompleteOrCancelled( DozerTask task ) override; ///< this is called when tasks are cancelled or completed /** return a dock point for the action and task (if valid) ... note it can return nullptr if no point has been set for the combination of task and point */ - virtual const Coord3D* getDockPoint( DozerTask task, DozerDockPoint point ); + virtual const Coord3D* getDockPoint( DozerTask task, DozerDockPoint point ) override; - virtual void setBuildSubTask( DozerBuildSubTask subTask ) { m_buildSubTask = subTask; }; - virtual DozerBuildSubTask getBuildSubTask() { return m_buildSubTask; } + virtual void setBuildSubTask( DozerBuildSubTask subTask ) override { m_buildSubTask = subTask; }; + virtual DozerBuildSubTask getBuildSubTask() override { return m_buildSubTask; } // // the following methods must be overridden so that if a player issues a command the dozer // can exit the internal state machine and do whatever the player says // - virtual void aiDoCommand(const AICommandParms* parms); + virtual void aiDoCommand(const AICommandParms* parms) override; // Supply truck stuff - virtual Int getNumberBoxes() const { return m_numberBoxes; } - virtual Bool loseOneBox(); - virtual Bool gainOneBox( Int remainingStock ); + virtual Int getNumberBoxes() const override { return m_numberBoxes; } + virtual Bool loseOneBox() override; + virtual Bool gainOneBox( Int remainingStock ) override; - virtual Bool isAvailableForSupplying() const; - virtual Bool isCurrentlyFerryingSupplies() const; - virtual Real getWarehouseScanDistance() const; ///< How far can I look for a warehouse? + virtual Bool isAvailableForSupplying() const override; + virtual Bool isCurrentlyFerryingSupplies() const override; + virtual Real getWarehouseScanDistance() const override; ///< How far can I look for a warehouse? - virtual void setForceBusyState(Bool v) { m_forcedBusyPending = v; } - virtual Bool isForcedIntoBusyState() const { return m_forcedBusyPending; } + virtual void setForceBusyState(Bool v) override { m_forcedBusyPending = v; } + virtual Bool isForcedIntoBusyState() const override { return m_forcedBusyPending; } - virtual void setForceWantingState(Bool v){ m_forcePending = v; } - virtual Bool isForcedIntoWantingState() const { return m_forcePending; } - virtual ObjectID getPreferredDockID() const { return m_preferredDock; } - virtual UnsignedInt getActionDelayForDock( Object *dock ); + virtual void setForceWantingState(Bool v) override { m_forcePending = v; } + virtual Bool isForcedIntoWantingState() const override { return m_forcePending; } + virtual ObjectID getPreferredDockID() const override { return m_preferredDock; } + virtual UnsignedInt getActionDelayForDock( Object *dock ) override; // worker specific Bool isSupplyTruckBrainActiveAndBusy(); void resetSupplyTruckBrain(); void resetDozerBrain(); - virtual void exitingSupplyTruckState(); ///< This worker is leaving a supply truck task and should go back to Dozer mode. + virtual void exitingSupplyTruckState() override; ///< This worker is leaving a supply truck task and should go back to Dozer mode. - virtual UpdateSleepTime update(); ///< the update entry point + virtual UpdateSleepTime update() override; ///< the update entry point // repairing - virtual Bool canAcceptNewRepair( Object *obj ); - virtual void createBridgeScaffolding( Object *bridgeTower ); - virtual void removeBridgeScaffolding( Object *bridgeTower ); + virtual Bool canAcceptNewRepair( Object *obj ) override; + virtual void createBridgeScaffolding( Object *bridgeTower ) override; + virtual void removeBridgeScaffolding( Object *bridgeTower ) override; - virtual void startBuildingSound( const AudioEventRTS *sound, ObjectID constructionSiteID ); - virtual void finishBuildingSound(); + virtual void startBuildingSound( const AudioEventRTS *sound, ObjectID constructionSiteID ) override; + virtual void finishBuildingSound() override; protected: @@ -259,10 +259,10 @@ class WorkerAIUpdate : public AIUpdateInterface, public DozerAIInterface, public AudioEventRTS m_buildingSound; ///< sound is pulled from the object we are building! protected: - virtual void privateRepair( Object *obj, CommandSourceType cmdSource ); ///< repair the target - virtual void privateResumeConstruction( Object *obj, CommandSourceType cmdSource ); ///< resume construction on obj - virtual void privateDock( Object *obj, CommandSourceType cmdSource ); - virtual void privateIdle(CommandSourceType cmdSource); ///< Enter idle state. + virtual void privateRepair( Object *obj, CommandSourceType cmdSource ) override; ///< repair the target + virtual void privateResumeConstruction( Object *obj, CommandSourceType cmdSource ) override; ///< resume construction on obj + virtual void privateDock( Object *obj, CommandSourceType cmdSource ) override; + virtual void privateIdle(CommandSourceType cmdSource) override; ///< Enter idle state. private: diff --git a/Generals/Code/GameEngine/Include/GameLogic/Object.h b/Generals/Code/GameEngine/Include/GameLogic/Object.h index 004306f4fa6..ad936c42ebb 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Object.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Object.h @@ -607,9 +607,9 @@ class Object : public Thing, public Snapshot // snapshot methods - void crc( Xfer *xfer ); - void xfer( Xfer *xfer ); - void loadPostProcess(); + virtual void crc( Xfer *xfer ) override; + virtual void xfer( Xfer *xfer ) override; + virtual void loadPostProcess() override; void handleShroud(); void handleValueMap(); @@ -623,10 +623,10 @@ class Object : public Thing, public Snapshot Bool didEnterOrExit() const; void setID( ObjectID id ); - virtual Object *asObjectMeth() { return this; } - virtual const Object *asObjectMeth() const { return this; } + virtual Object *asObjectMeth() override { return this; } + virtual const Object *asObjectMeth() const override { return this; } - virtual Real calculateHeightAboveTerrain() const; // Calculates the actual height above terrain. Doesn't use cache. + virtual Real calculateHeightAboveTerrain() const override; // Calculates the actual height above terrain. Doesn't use cache. void updateTriggerAreaFlags(); void setTriggerAreaFlagsForChangeInPosition(); @@ -644,7 +644,7 @@ class Object : public Thing, public Snapshot void addThreat(); void removeThreat(); - virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle); + virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle) override; private: diff --git a/Generals/Code/GameEngine/Include/GameLogic/ObjectCreationList.h b/Generals/Code/GameEngine/Include/GameLogic/ObjectCreationList.h index 5b7c8615485..b403756bd17 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ObjectCreationList.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ObjectCreationList.h @@ -187,11 +187,11 @@ class ObjectCreationListStore : public SubsystemInterface public: ObjectCreationListStore(); - ~ObjectCreationListStore(); + virtual ~ObjectCreationListStore() override; - void init() { } - void reset() { } - void update() { } + virtual void init() override { } + virtual void reset() override { } + virtual void update() override { } /** return the ObjectCreationList with the given namekey. diff --git a/Generals/Code/GameEngine/Include/GameLogic/ObjectIter.h b/Generals/Code/GameEngine/Include/GameLogic/ObjectIter.h index 3eebc9f8b34..c0d43739217 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ObjectIter.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ObjectIter.h @@ -121,8 +121,8 @@ class SimpleObjectIterator : public ObjectIterator public: SimpleObjectIterator(); //~SimpleObjectIterator(); // provided by MPO - Object *first() { return firstWithNumeric(nullptr); } - Object *next() { return nextWithNumeric(nullptr); } + virtual Object *first() override { return firstWithNumeric(nullptr); } + virtual Object *next() override { return nextWithNumeric(nullptr); } Object *firstWithNumeric(Real *num = nullptr) { reset(); return nextWithNumeric(num); } Object *nextWithNumeric(Real *num = nullptr); diff --git a/Generals/Code/GameEngine/Include/GameLogic/ObjectTypes.h b/Generals/Code/GameEngine/Include/GameLogic/ObjectTypes.h index 3cb442f9dec..e6bc7b2447b 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ObjectTypes.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ObjectTypes.h @@ -50,9 +50,9 @@ class ObjectTypes : public MemoryPoolObject, 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; public: ObjectTypes(); diff --git a/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h b/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h index b3bcab29801..a333318a9c6 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h +++ b/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h @@ -257,9 +257,9 @@ class SightingInfo : public MemoryPoolObject, public Snapshot protected: // snapshot method - 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; }; @@ -315,9 +315,9 @@ class PartitionCell : public Snapshot // not MPO: allocated in an array ~PartitionCell(); // --------------- inherited from Snapshot interface -------------- - void crc( Xfer *xfer ); - void xfer( Xfer *xfer ); - void loadPostProcess(); + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; Int getCoiCount() const { return m_coiCount; } ///< return number of COIs touching this cell. Int getCellX() const { return m_cellX; } @@ -609,7 +609,7 @@ class PartitionFilterIsFlying : public PartitionFilter { public: PartitionFilterIsFlying() { } - virtual Bool allow(Object *objOther); + virtual Bool allow(Object *objOther) override; #if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterIsFlying"; } #endif @@ -625,7 +625,7 @@ class PartitionFilterWouldCollide : public PartitionFilter Bool m_desiredCollisionResult; // collision must match this for allow to return true public: PartitionFilterWouldCollide(const Coord3D& pos, const GeometryInfo& geom, Real angle, Bool desired); - virtual Bool allow(Object *objOther); + virtual Bool allow(Object *objOther) override; #if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterWouldCollide"; } #endif @@ -641,7 +641,7 @@ class PartitionFilterSamePlayer : public PartitionFilter const Player *m_player; public: PartitionFilterSamePlayer(const Player *player) : m_player(player) { } - virtual Bool allow(Object *objOther); + virtual Bool allow(Object *objOther) override; #if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterSamePlayer"; } #endif @@ -667,7 +667,7 @@ class PartitionFilterRelationship : public PartitionFilter ALLOW_NEUTRAL = (1<xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; }; EMPTY_DTOR(TurretAIAimTurretState) @@ -173,14 +173,14 @@ class TurretAIRecenterTurretState : public TurretState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIRecenterTurretState, "TurretAIRecenterTurretState") public: TurretAIRecenterTurretState( TurretStateMachine* machine ) : TurretState( machine, "TurretAIRecenterTurretState" ) { } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: // snapshot interface STUBBED - no member vars to save. jba. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; }; EMPTY_DTOR(TurretAIRecenterTurretState) @@ -198,14 +198,14 @@ class TurretAIHoldTurretState : public TurretState { m_timestamp = 0; } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: // snapshot interface - 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; }; EMPTY_DTOR(TurretAIHoldTurretState) @@ -286,7 +286,7 @@ class TurretAI : public MemoryPoolObject, public Snapshot, public NotifyWeaponFi Bool isOwnersCurWeaponOnTurret() const; Bool isWeaponSlotOnTurret(WeaponSlotType wslot) const; - Bool isAttackingObject() const { return m_target == TARGET_OBJECT; } + virtual Bool isAttackingObject() const override { return m_target == TARGET_OBJECT; } Bool isForceAttacking() const { return m_isForceAttacking; } // this will cause the turret to continuously track the given victim. @@ -307,10 +307,10 @@ class TurretAI : public MemoryPoolObject, public Snapshot, public NotifyWeaponFi UpdateSleepTime updateTurretAI(); ///< implement this module's behavior - virtual void notifyFired(); - virtual void notifyNewVictimChosen(Object* victim); - virtual const Coord3D* getOriginalVictimPos() const { return nullptr; } // yes, we return nullptr here - virtual Bool isWeaponSlotOkToFire(WeaponSlotType wslot) const; + virtual void notifyFired() override; + virtual void notifyNewVictimChosen(Object* victim) override; + virtual const Coord3D* getOriginalVictimPos() const override { return nullptr; } // yes, we return nullptr here + virtual Bool isWeaponSlotOkToFire(WeaponSlotType wslot) const override; // these are only for use by the state machines... don't call them otherwise, please Bool friend_turnTowardsAngle(Real desiredAngle, Real rateModifier, Real relThresh); @@ -332,9 +332,9 @@ class TurretAI : public MemoryPoolObject, public Snapshot, public NotifyWeaponFi protected: // snapshot interface - 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; private: diff --git a/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h b/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h index 59d54c40113..423012829b4 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h +++ b/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h @@ -51,9 +51,9 @@ class VictoryConditionsInterface : public SubsystemInterface public: VictoryConditionsInterface() { m_victoryConditions = 0; } - virtual void init() = 0; - virtual void reset() = 0; - virtual void update() = 0; + virtual void init() override = 0; + virtual void reset() override = 0; + virtual void update() override = 0; void setVictoryConditions( Int victoryConditions ) { m_victoryConditions = victoryConditions; } Int getVictoryConditions() { return m_victoryConditions; } diff --git a/Generals/Code/GameEngine/Include/GameLogic/Weapon.h b/Generals/Code/GameEngine/Include/GameLogic/Weapon.h index 90adec59c33..c0408a1c25d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Weapon.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Weapon.h @@ -568,9 +568,9 @@ class Weapon : public MemoryPoolObject, 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; public: @@ -804,12 +804,12 @@ class WeaponStore : public SubsystemInterface public: WeaponStore(); - ~WeaponStore(); + virtual ~WeaponStore() override; - void init() { }; - void postProcessLoad(); - void reset(); - void update(); + virtual void init() override { }; + virtual void postProcessLoad() override; + virtual void reset() override; + virtual void update() override; /** Find the WeaponTemplate with the given name. If no such WeaponTemplate exists, return null. diff --git a/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h b/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h index cc118a02094..e0bc297f3d9 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h +++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h @@ -189,9 +189,9 @@ class WeaponSet : public Snapshot 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; public: diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp index 2604bf2d7eb..497bcd95ede 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp @@ -122,11 +122,11 @@ class DownloadManagerMunkee : public DownloadManager { public: DownloadManagerMunkee() {m_shouldQuitOnSuccess = true; m_shouldQuitOnSuccess = false;} - virtual HRESULT OnError( Int error ); - virtual HRESULT OnEnd(); - virtual HRESULT OnProgressUpdate( Int bytesread, Int totalsize, Int timetaken, Int timeleft ); - virtual HRESULT OnStatusUpdate( Int status ); - virtual HRESULT downloadFile( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume ); + virtual HRESULT OnError( Int error ) override; + virtual HRESULT OnEnd() override; + virtual HRESULT OnProgressUpdate( Int bytesread, Int totalsize, Int timetaken, Int timeleft ) override; + virtual HRESULT OnStatusUpdate( Int status ) override; + virtual HRESULT downloadFile( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume ) override; private: Bool m_shouldQuitOnSuccess; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp index 00b68081b57..6edaba07101 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp @@ -88,12 +88,12 @@ class GameSpyLoginPreferences : public UserPreferences { public: GameSpyLoginPreferences(); - virtual ~GameSpyLoginPreferences(); + virtual ~GameSpyLoginPreferences() override; Bool loadFromIniFile(); - virtual Bool load(AsciiString fname); - virtual Bool write(); + virtual Bool load(AsciiString fname) override; + virtual Bool write() override; AsciiString getPasswordForEmail( AsciiString email ); AsciiString getDateForEmail( AsciiString email, AsciiString &month, AsciiString &date, AsciiString &year ); diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp index 655c1ee3e46..e3c879cf3a1 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp @@ -513,7 +513,7 @@ class PartitionFilterLiveMapEnemies : public PartitionFilter public: PartitionFilterLiveMapEnemies(const Object *obj) : m_obj(obj) { } - virtual Bool allow(Object *objOther) + virtual Bool allow(Object *objOther) override { // this is way fast (bit test) so do it first. if (objOther->isEffectivelyDead()) @@ -543,7 +543,7 @@ class PartitionFilterWithinAttackRange : public PartitionFilter public: PartitionFilterWithinAttackRange(const Object* obj) : m_obj(obj) { } - virtual Bool allow(Object* objOther) + virtual Bool allow(Object* objOther) override { for (Int i = 0; i < WEAPONSLOT_COUNT; i++ ) { diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp index 801e04364dc..3ac19981a52 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp @@ -1906,9 +1906,9 @@ class AIAttackMoveStateMachine : public StateMachine protected: // snapshot interface - 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; }; // ------------------------------------------------------------------------------------------------ @@ -5535,9 +5535,9 @@ class AIAttackThenIdleStateMachine : public StateMachine AIAttackThenIdleStateMachine( Object *owner, AsciiString name ); protected: // snapshot interface . - 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; }; // ------------------------------------------------------------------------------------------------ diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp index 8875411be31..c3508284362 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp @@ -123,7 +123,7 @@ class FireWeaponNugget : public ObjectCreationNugget { } - virtual Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const + virtual Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const override { if (!primaryObj || !primary || !secondary) { @@ -170,7 +170,7 @@ class AttackNugget : public ObjectCreationNugget { } - virtual Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const + virtual Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const override { if (!primaryObj || !primary || !secondary) { @@ -252,12 +252,12 @@ class DeliverPayloadNugget : public ObjectCreationNugget m_transportName.clear(); } - virtual Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, UnsignedInt lifetimeFrames = 0 ) const + virtual Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, UnsignedInt lifetimeFrames = 0 ) const override { return create( primaryObj, primary, secondary, true, lifetimeFrames ); } - virtual Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Bool createOwner, UnsignedInt lifetimeFrames = 0 ) const + virtual Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Bool createOwner, UnsignedInt lifetimeFrames = 0 ) const override { if (!primaryObj || !primary || !secondary) { @@ -610,7 +610,7 @@ class ApplyRandomForceNugget : public ObjectCreationNugget { } - virtual Object* create( const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const + virtual Object* create( const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const override { if (primary) { @@ -641,7 +641,7 @@ class ApplyRandomForceNugget : public ObjectCreationNugget return nullptr; } - virtual Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const + virtual Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const override { DEBUG_CRASH(("You must call this effect with an object, not a location")); return nullptr; @@ -765,7 +765,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget m_offset.zero(); } - virtual Object* create(const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const + virtual Object* create(const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const override { if (primary) { @@ -781,7 +781,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget return nullptr; } - virtual Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const + virtual Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const override { if (primary) { diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp index cb975592722..00daaac8f93 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp @@ -110,13 +110,13 @@ class ChinookEvacuateState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookEvacuateState, "ChinookEvacuateState") protected: // snapshot interface STUBBED - no member vars to save. jba. - 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 {}; public: ChinookEvacuateState( StateMachine *machine ) : State( machine, "ChinookEvacuateState" ) { } - StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* obj = getMachineOwner(); if( obj->getContain() ) @@ -127,7 +127,7 @@ class ChinookEvacuateState : public State return STATE_SUCCESS; } - virtual StateReturnType update() + virtual StateReturnType update() override { return STATE_SUCCESS; } @@ -141,13 +141,13 @@ class ChinookHeadOffMapState : public State //I'm outta here protected: // snapshot interface STUBBED - no member vars to save. jba. - 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 {}; public: ChinookHeadOffMapState( StateMachine *machine ) : State( machine, "ChinookHeadOffMapState" ) {} - StateReturnType onEnter() // Give move order out of town + virtual StateReturnType onEnter() override // Give move order out of town { Object *owner = getMachineOwner(); AIUpdateInterface *ai = owner->getAIUpdateInterface(); @@ -170,7 +170,7 @@ class ChinookHeadOffMapState : public State return STATE_CONTINUE; } - StateReturnType update() + virtual StateReturnType update() override { Object *owner = getMachineOwner(); @@ -197,12 +197,12 @@ class ChinookTakeoffOrLandingState : public State protected: // snapshot interface - virtual void crc( Xfer *xfer ) + virtual void crc( Xfer *xfer ) override { // empty } - virtual void xfer( Xfer *xfer ) + virtual void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -213,7 +213,7 @@ class ChinookTakeoffOrLandingState : public State xfer->xferBool(&m_landing); } - virtual void loadPostProcess() + virtual void loadPostProcess() override { // empty } @@ -224,7 +224,7 @@ class ChinookTakeoffOrLandingState : public State m_destLoc.zero(); } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* obj = getMachineOwner(); ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface(); @@ -281,7 +281,7 @@ class ChinookTakeoffOrLandingState : public State return STATE_CONTINUE; } - virtual StateReturnType update() + virtual StateReturnType update() override { Object* obj = getMachineOwner(); if (obj->isEffectivelyDead()) @@ -299,7 +299,7 @@ class ChinookTakeoffOrLandingState : public State return STATE_CONTINUE; } - virtual void onExit( StateExitType status ) + virtual void onExit( StateExitType status ) override { Object* obj = getMachineOwner(); ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface(); @@ -415,12 +415,12 @@ class ChinookCombatDropState : public State protected: // snapshot interface - virtual void crc( Xfer *xfer ) + virtual void crc( Xfer *xfer ) override { // empty } - virtual void xfer( Xfer *xfer ) + virtual void xfer( Xfer *xfer ) override { // version const XferVersion currentVersion = 2; @@ -467,7 +467,7 @@ class ChinookCombatDropState : public State } } - virtual void loadPostProcess() + virtual void loadPostProcess() override { for (std::vector::iterator it = m_ropes.begin(); it != m_ropes.end(); ++it) { @@ -481,7 +481,7 @@ class ChinookCombatDropState : public State ChinookCombatDropState( StateMachine *machine ): State( machine, "ChinookCombatDropState" ) { } // -------------- - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* obj = getMachineOwner(); Drawable* draw = obj->getDrawable(); @@ -547,7 +547,7 @@ class ChinookCombatDropState : public State } // -------------- - virtual StateReturnType update() + virtual StateReturnType update() override { Object* obj = getMachineOwner(); ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface(); @@ -639,7 +639,7 @@ class ChinookCombatDropState : public State } // -------------- - virtual void onExit( StateExitType status ) + virtual void onExit( StateExitType status ) override { Object* obj = getMachineOwner(); ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface(); @@ -697,12 +697,12 @@ class ChinookMoveToBldgState : public AIMoveToState Real m_destZ; protected: // snapshot interface - virtual void crc( Xfer *xfer ) + virtual void crc( Xfer *xfer ) override { // empty } - virtual void xfer( Xfer *xfer ) + virtual void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -714,7 +714,7 @@ class ChinookMoveToBldgState : public AIMoveToState xfer->xferReal(&m_destZ); } - virtual void loadPostProcess() + virtual void loadPostProcess() override { // empty } @@ -722,7 +722,7 @@ class ChinookMoveToBldgState : public AIMoveToState public: ChinookMoveToBldgState( StateMachine *machine ): AIMoveToState( machine ) { } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* obj = getMachineOwner(); ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface(); @@ -753,7 +753,7 @@ class ChinookMoveToBldgState : public AIMoveToState return AIMoveToState::onEnter(); } - virtual StateReturnType update() + virtual StateReturnType update() override { Object* obj = getMachineOwner(); @@ -767,7 +767,7 @@ class ChinookMoveToBldgState : public AIMoveToState return status; } - virtual void onExit( StateExitType status ) + virtual void onExit( StateExitType status ) override { Object* obj = getMachineOwner(); ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface(); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp index e8e996e350c..79eb4aef39e 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp @@ -86,13 +86,13 @@ class DozerActionPickActionPosState : public State public: DozerActionPickActionPosState( StateMachine *machine, DozerTask task ); - virtual StateReturnType update(); + virtual StateReturnType update() override; protected: // snapshot interface - 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: @@ -243,13 +243,13 @@ class DozerActionMoveToActionPosState : public State public: DozerActionMoveToActionPosState( StateMachine *machine, DozerTask task ) : State( machine, "DozerActionMoveToActionPosState" ) { m_task = task; } - virtual StateReturnType update(); + virtual StateReturnType update() override; protected: // snapshot interface - 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: @@ -386,15 +386,15 @@ class DozerActionDoActionState : public State m_task = task; m_enterFrame = 0; } - virtual StateReturnType update(); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ) { } + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override { } protected: // snapshot interface - 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: @@ -792,9 +792,9 @@ class DozerActionStateMachine : public StateMachine protected: // snapshot interface - 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: @@ -967,15 +967,15 @@ class DozerPrimaryIdleState : public State m_idlePlayerNumber = 0; m_isMarkedAsIdle = FALSE; } - virtual StateReturnType update(); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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: @@ -1154,16 +1154,16 @@ class DozerActionState : public State Note that we DON'T use CONVERT_SLEEP_TO_CONTINUE; since we're not doing anything else interesting in update, we can sleep when this machine sleeps */ - virtual StateReturnType update() { return m_actionMachine->updateStateMachine(); } + virtual StateReturnType update() override { return m_actionMachine->updateStateMachine(); } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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: @@ -1253,14 +1253,14 @@ class DozerPrimaryGoingHomeState : public State protected: // snapshot interface STUBBED no member vars - 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 {}; public: DozerPrimaryGoingHomeState( StateMachine *machine ) : State( machine, "DozerPrimaryGoingHomeState" ) { } - virtual StateReturnType update() { return STATE_FAILURE; } + virtual StateReturnType update() override { return STATE_FAILURE; } }; EMPTY_DTOR(DozerPrimaryGoingHomeState) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp index 53469cd7a21..b1dc808eb6e 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp @@ -134,7 +134,7 @@ class PartitionFilterHasParkingPlace : public PartitionFilter #if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterHasParkingPlace"; } #endif - virtual Bool allow(Object *objOther) + virtual Bool allow(Object *objOther) override { ParkingPlaceBehaviorInterface* pp = getPP(objOther->getID()); if (pp != nullptr && pp->reserveSpace(m_id, 0.0f, nullptr)) @@ -182,16 +182,16 @@ class JetAwaitingRunwayState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetAwaitingRunwayState, "JetAwaitingRunwayState") protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override {}; + virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override {}; private: const Bool m_landing; public: JetAwaitingRunwayState( StateMachine *machine, Bool landing ) : m_landing(landing), State( machine, "JetAwaitingRunwayState") { } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -204,7 +204,7 @@ class JetAwaitingRunwayState : public State return STATE_CONTINUE; } - virtual StateReturnType update() + virtual StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -238,7 +238,7 @@ class JetAwaitingRunwayState : public State return STATE_CONTINUE; } - virtual void onExit(StateExitType status) + virtual void onExit(StateExitType status) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -264,9 +264,9 @@ class JetOrHeliCirclingDeadAirfieldState : public State protected: // snapshot interface STUBBED. // The state will check immediately after a load game, but I think that's ok. jba. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override {}; + virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override {}; private: Int m_checkAirfield; @@ -282,7 +282,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State State( machine, "JetOrHeliCirclingDeadAirfieldState"), m_checkAirfield(0) { } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -313,7 +313,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State return STATE_CONTINUE; } - virtual StateReturnType update() + virtual StateReturnType update() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -369,7 +369,7 @@ class JetOrHeliReturningToDeadAirfieldState : public AIInternalMoveToState public: JetOrHeliReturningToDeadAirfieldState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturningToDeadAirfieldState") { } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -430,7 +430,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState public: JetOrHeliTaxiState( StateMachine *machine, TaxiType m ) : m_taxiMode(m), AIMoveOutOfTheWayState( machine ) { } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -509,7 +509,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState return ret; } - virtual void onExit( StateExitType status ) + virtual void onExit( StateExitType status ) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -550,7 +550,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState public: JetTakeoffOrLandingState( StateMachine *machine, Bool landing ) : m_landing(landing), AIFollowPathState( machine, "JetTakeoffOrLandingState" ) { } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -633,7 +633,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState return ret; } - virtual StateReturnType update() + virtual StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -695,7 +695,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState return ret; } - virtual void onExit( StateExitType status ) + virtual void onExit( StateExitType status ) override { AIFollowPathState::onExit(status); @@ -753,12 +753,12 @@ class HeliTakeoffOrLandingState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(HeliTakeoffOrLandingState, "HeliTakeoffOrLandingState") protected: // snapshot interface - virtual void crc( Xfer *xfer ) + virtual void crc( Xfer *xfer ) override { // empty. jba. } - virtual void xfer( Xfer *xfer ) + virtual void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -772,7 +772,7 @@ class HeliTakeoffOrLandingState : public State xfer->xferCoord3D(&m_parkingLoc); xfer->xferReal(&m_parkingOrientation); } - virtual void loadPostProcess() + virtual void loadPostProcess() override { // empty. jba. } @@ -790,7 +790,7 @@ class HeliTakeoffOrLandingState : public State m_parkingLoc.zero(); } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -856,7 +856,7 @@ class HeliTakeoffOrLandingState : public State return STATE_CONTINUE; } - virtual StateReturnType update() + virtual StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -918,7 +918,7 @@ class HeliTakeoffOrLandingState : public State return STATE_CONTINUE; } - virtual void onExit( StateExitType status ) + virtual void onExit( StateExitType status ) override { // just in case. Object* jet = getMachineOwner(); @@ -965,14 +965,14 @@ class JetOrHeliParkOrientState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliParkOrientState, "JetOrHeliParkOrientState") protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override {}; + virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override {}; public: JetOrHeliParkOrientState( StateMachine *machine ) : State( machine, "JetOrHeliParkOrientState") { } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -991,7 +991,7 @@ class JetOrHeliParkOrientState : public State return STATE_CONTINUE; } - virtual StateReturnType update() + virtual StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -1026,7 +1026,7 @@ class JetOrHeliParkOrientState : public State return STATE_CONTINUE; } - virtual void onExit( StateExitType status ) + virtual void onExit( StateExitType status ) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1046,12 +1046,12 @@ class JetPauseBeforeTakeoffState : public AIFaceState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetPauseBeforeTakeoffState, "JetPauseBeforeTakeoffState") protected: // snapshot interface - virtual void crc( Xfer *xfer ) + virtual void crc( Xfer *xfer ) override { // empty. jba. } - virtual void xfer( Xfer *xfer ) + virtual void xfer( Xfer *xfer ) override { // version #if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE @@ -1085,7 +1085,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState xfer->xferObjectID(&m_waitedForTaxiID); } - virtual void loadPostProcess() + virtual void loadPostProcess() override { // empty. jba. } @@ -1177,7 +1177,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState // nothing } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1209,7 +1209,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState } #if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE - virtual StateReturnType update() + virtual StateReturnType update() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1263,7 +1263,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState #else // TheSuperHackers @bugfix Reimplements the update to wait for another Jet on another runway. // If this must work with more than 2 runways, then this logic needs another look. - virtual StateReturnType update() + virtual StateReturnType update() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1336,7 +1336,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState } #endif - virtual void onExit(StateExitType status) + virtual void onExit(StateExitType status) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1359,12 +1359,12 @@ class JetOrHeliReloadAmmoState : public State protected: // snapshot interface - virtual void crc( Xfer *xfer ) + virtual void crc( Xfer *xfer ) override { // empty. jba. } - virtual void xfer( Xfer *xfer ) + virtual void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -1375,7 +1375,7 @@ class JetOrHeliReloadAmmoState : public State xfer->xferUnsignedInt(&m_reloadTime); xfer->xferUnsignedInt(&m_reloadDoneFrame); } - virtual void loadPostProcess() + virtual void loadPostProcess() override { // empty. jba. } @@ -1383,7 +1383,7 @@ class JetOrHeliReloadAmmoState : public State public: JetOrHeliReloadAmmoState( StateMachine *machine ) : State( machine, "JetOrHeliReloadAmmoState") { } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1420,7 +1420,7 @@ class JetOrHeliReloadAmmoState : public State return STATE_CONTINUE; } - virtual StateReturnType update() + virtual StateReturnType update() override { Object* jet = getMachineOwner(); UnsignedInt now = TheGameLogic->getFrame(); @@ -1446,7 +1446,7 @@ class JetOrHeliReloadAmmoState : public State return STATE_CONTINUE; } - virtual void onExit(StateExitType status) + virtual void onExit(StateExitType status) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1468,7 +1468,7 @@ class JetOrHeliReturnForLandingState : public AIInternalMoveToState public: JetOrHeliReturnForLandingState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturnForLandingState") { } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp index 9c429e5ff04..283d7926a9d 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp @@ -866,7 +866,7 @@ class PartitionFilterIsValidCarriage : public PartitionFilter virtual const char* debugGetName() { return "PartitionFilterIsValidCarriage"; } #endif - virtual Bool allow(Object *objOther) + virtual Bool allow(Object *objOther) override { // must exist! diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp index cde201a6546..7b7ed3a3cb0 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp @@ -287,13 +287,13 @@ class SupplyTruckBusyState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckBusyState, "SupplyTruckBusyState") protected: // snapshot interface STUBBED. - 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 {}; public: SupplyTruckBusyState( StateMachine *machine ) : State( machine, "SupplyTruckBusyState" ) { } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { if( getMachineOwner() && getMachineOwner()->getAI() ) { @@ -311,11 +311,11 @@ TheInGameUI->DEBUG_addFloatingText("entering busy state", getMachineOwner()->get #endif return STATE_CONTINUE; } - virtual StateReturnType update() + virtual StateReturnType update() override { return STATE_CONTINUE; } - virtual void onExit(StateExitType status) + virtual void onExit(StateExitType status) override { #ifdef DEBUG_SUPPLY_STATE TheInGameUI->DEBUG_addFloatingText("exiting busy state", getMachineOwner()->getPosition(), GameMakeColor(255, 0, 0, 255)); @@ -331,18 +331,18 @@ class SupplyTruckIdleState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckIdleState, "SupplyTruckIdleState") protected: // snapshot interface STUBBED. - 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 {}; public: SupplyTruckIdleState( StateMachine *machine ) : State( machine, "SupplyTruckIdleState" ) { } - virtual StateReturnType onEnter(); - virtual StateReturnType update() + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override { return STATE_CONTINUE; } - virtual void onExit(StateExitType status) + virtual void onExit(StateExitType status) override { #ifdef DEBUG_SUPPLY_STATE TheInGameUI->DEBUG_addFloatingText("exiting idle state", getMachineOwner()->getPosition(), GameMakeColor(255, 0, 0, 255)); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp index be65da47f48..d8610312c94 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp @@ -1162,14 +1162,14 @@ class ActAsDozerState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ActAsDozerState, "ActAsDozerState") protected: // snapshot interface STUBBED. - 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 {}; public: ActAsDozerState( StateMachine *machine ) :State( machine, "ActAsDozerState" ){} - virtual StateReturnType onEnter(); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; virtual StateReturnType onExit(); }; EMPTY_DTOR(ActAsDozerState) @@ -1181,14 +1181,14 @@ class ActAsSupplyTruckState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ActAsSupplyTruckState, "ActAsSupplyTruckState") protected: // snapshot interface STUBBED. - 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 {}; public: ActAsSupplyTruckState( StateMachine *machine ) :State( machine, "ActAsSupplyTruckState" ){} - virtual StateReturnType onEnter(); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; virtual StateReturnType onExit(); }; EMPTY_DTOR(ActAsSupplyTruckState) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp index 4d83fa85dc0..cb442a291b7 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp @@ -50,7 +50,7 @@ class PartitionFilterFlammable : public PartitionFilter PartitionFilterFlammable(){ } - virtual Bool allow(Object *objOther); + virtual Bool allow(Object *objOther) override; #if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterFlammable"; } #endif diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp index 86f08beaed1..e139eadf4b0 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp @@ -78,7 +78,7 @@ class PartitionFilterHordeMember : public PartitionFilter virtual const char* debugGetName() { return "PartitionFilterHordeMember"; } #endif - virtual Bool allow(Object *objOther) + virtual Bool allow(Object *objOther) override { // must be exact same type as us (well, maybe) if (m_data->m_exactMatch && m_obj->getTemplate() != objOther->getTemplate()) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp index 4faaf00fe4f..adc55e7a379 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp @@ -114,7 +114,7 @@ class PartitionFilterStealthedOrStealthGarrisoned : public PartitionFilter public: PartitionFilterStealthedOrStealthGarrisoned() { } - virtual Bool allow(Object *objOther); + virtual Bool allow(Object *objOther) override; #if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterStealthedOrStealthGarrisoned"; } diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp index e94d5e05574..a0e9296ccdc 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp @@ -74,7 +74,7 @@ class PartitionFilterTensileFormationMember : public PartitionFilter #if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterTensileFormationMember"; } #endif - virtual Bool allow( Object *objOther ) + virtual Bool allow( Object *objOther ) override { return ( getTFU( objOther ) != nullptr ); } diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp index d9f5f4f08c4..3023b0964ec 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp @@ -76,21 +76,21 @@ class VictoryConditions : public VictoryConditionsInterface public: VictoryConditions(); - void init(); - void reset(); - void update(); + void init() override; + void reset() override; + void update() override; - Bool hasAchievedVictory(Player *player); ///< has a specific player and his allies won? - Bool hasBeenDefeated(Player *player); ///< has a specific player and his allies lost? - Bool hasSinglePlayerBeenDefeated(Player *player); ///< has a specific player lost? + virtual Bool hasAchievedVictory(Player *player) override; ///< has a specific player and his allies won? + virtual Bool hasBeenDefeated(Player *player) override; ///< has a specific player and his allies lost? + virtual Bool hasSinglePlayerBeenDefeated(Player *player) override; ///< has a specific player lost? - void cachePlayerPtrs(); ///< players have been created - cache the ones of interest + void cachePlayerPtrs() override; ///< players have been created - cache the ones of interest - Bool isLocalAlliedVictory(); ///< convenience function - Bool isLocalAlliedDefeat(); ///< convenience function - Bool isLocalDefeat(); ///< convenience function - Bool amIObserver() { return m_isObserver;} ///< Am I an observer?( need this for scripts ) - virtual UnsignedInt getEndFrame() { return m_endFrame; } ///< on which frame was the game effectively over? + Bool isLocalAlliedVictory() override; ///< convenience function + Bool isLocalAlliedDefeat() override; ///< convenience function + Bool isLocalDefeat() override; ///< convenience function + Bool amIObserver() override { return m_isObserver;} ///< Am I an observer?( need this for scripts ) + virtual UnsignedInt getEndFrame() override { return m_endFrame; } ///< on which frame was the game effectively over? private: Player* findFirstUndefeatedPlayer(); ///< Find the first player that has not been defeated. void markAllianceVictorious(Player* victoriousPlayer); ///< Mark the victorious player and his allies as victorious. diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h index 0d59284fa03..cca4969ce3f 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h @@ -40,11 +40,11 @@ class W3DFunctionLexicon : public FunctionLexicon public: W3DFunctionLexicon(); - virtual ~W3DFunctionLexicon(); + virtual ~W3DFunctionLexicon() override; - virtual void init(); - virtual void reset(); - virtual void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; protected: diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h index 555ad5631e2..150d8667265 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h @@ -43,6 +43,6 @@ class W3DModuleFactory : public ModuleFactory public: - virtual void init(); + virtual void init() override; }; diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h index 2ec83c1cfd2..d21e02d4395 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h @@ -42,5 +42,5 @@ class W3DThingFactory : public ThingFactory public: W3DThingFactory(); - virtual ~W3DThingFactory(); + virtual ~W3DThingFactory() override; }; diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h index 47918cab361..82d95451060 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h @@ -54,12 +54,12 @@ class W3DAssetManager: public WW3DAssetManager { public: W3DAssetManager(); - virtual ~W3DAssetManager(); + virtual ~W3DAssetManager() override; - virtual RenderObjClass * Create_Render_Obj(const char * name); + virtual RenderObjClass * Create_Render_Obj(const char * name) override; // unique to W3DAssetManager - virtual HAnimClass * Get_HAnim(const char * name); - virtual bool Load_3D_Assets( const char * filename ); // This CANNOT be Bool, as it will not inherit properly if you make Bool == Int + virtual HAnimClass * Get_HAnim(const char * name) override; + virtual bool Load_3D_Assets( const char * filename ) override; // This CANNOT be Bool, as it will not inherit properly if you make Bool == Int virtual TextureClass * Get_Texture( const char * filename, MipCountType mip_level_count=MIP_LEVELS_ALL, diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h index 8ce846e22c5..cdf3c0e91e2 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h @@ -72,7 +72,7 @@ class W3DDebugDisplay : public DebugDisplay public: W3DDebugDisplay(); - virtual ~W3DDebugDisplay(); + virtual ~W3DDebugDisplay() override; void init(); ///< Initialized the display void setFont( GameFont *font ); ///< Set the font to render with @@ -86,7 +86,7 @@ class W3DDebugDisplay : public DebugDisplay Int m_fontHeight; DisplayString *m_displayString; - virtual void drawText( Int x, Int y, Char *text ); ///< Render null ternimated string at current cursor position + virtual void drawText( Int x, Int y, Char *text ) override; ///< Render null ternimated string at current cursor position }; diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h index 34b0c54a201..6239402321f 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h @@ -56,87 +56,87 @@ class W3DDisplay : public Display public: W3DDisplay(); - ~W3DDisplay(); - - virtual void init(); ///< initialize or re-initialize the sytsem - virtual void reset() ; ///< Reset system - - virtual void setWidth( UnsignedInt width ); - virtual void setHeight( UnsignedInt height ); - virtual Bool setDisplayMode( UnsignedInt xres, UnsignedInt yres, UnsignedInt bitdepth, Bool windowed ); - virtual Int getDisplayModeCount(); ///removeShadow(this);} ///removeShadow(this);} ///removeShadow(this);} ///removeShadow(this);} ///Class_ID(); } - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { deleteInstance(this); } + virtual const char* Get_Name() const override { return Name.str(); } + virtual int Get_Class_ID() const override { return Proto->Class_ID(); } + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { deleteInstance(this); } protected: //virtual ~W3DPrototypeClass(); diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp index 9ba4bd16acb..3770b3ce653 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp @@ -68,9 +68,9 @@ class W3DRenderObjectSnapshot : public Snapshot protected: - 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; #ifdef DEBUG_FOG_MEMORY const char *m_robjName; ///HAnimManager ) { }; - virtual void First() { Iterator.First(); } - virtual void Next() { Iterator.Next(); } - virtual bool Is_Done() { return Iterator.Is_Done(); } - virtual const char * Current_Item_Name() { return Iterator.Get_Current_Anim()->Get_Name(); } + virtual void First() override { Iterator.First(); } + virtual void Next() override { Iterator.Next(); } + virtual bool Is_Done() override { return Iterator.Is_Done(); } + virtual const char * Current_Item_Name() override { return Iterator.Get_Current_Anim()->Get_Name(); } protected: HAnimManagerIterator Iterator; @@ -164,8 +164,8 @@ class HAnimIterator : public AssetIterator class HTreeIterator : public AssetIterator { public: - virtual bool Is_Done(); - virtual const char * Current_Item_Name(); + virtual bool Is_Done() override; + virtual const char * Current_Item_Name() override; protected: friend class WW3DAssetManager; }; @@ -174,10 +174,10 @@ class Font3DDataIterator : public AssetIterator { public: - virtual void First() { Node = WW3DAssetManager::Get_Instance()->Font3DDatas.Head(); } - virtual void Next() { Node = Node->Next(); } - virtual bool Is_Done() { return Node==nullptr; } - virtual const char * Current_Item_Name() { return Node->Data()->Name; } + virtual void First() override { Node = WW3DAssetManager::Get_Instance()->Font3DDatas.Head(); } + virtual void Next() override { Node = Node->Next(); } + virtual bool Is_Done() override { return Node==nullptr; } + virtual const char * Current_Item_Name() override { return Node->Data()->Name; } protected: diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h index 1f710081020..d69025ef28b 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h @@ -77,9 +77,9 @@ class BoxRenderObjClass : public RenderObjClass BoxRenderObjClass(const BoxRenderObjClass & src); BoxRenderObjClass & operator = (const BoxRenderObjClass &); - virtual int Get_Num_Polys() const; - virtual const char * Get_Name() const; - virtual void Set_Name(const char * name); + virtual int Get_Num_Polys() const override; + virtual const char * Get_Name() const override; + virtual void Set_Name(const char * name) override; void Set_Color(const Vector3 & color); void Set_Opacity(float opacity) { Opacity = opacity; } @@ -143,19 +143,19 @@ class AABoxRenderObjClass : public W3DMPO, public BoxRenderObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const; - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); - virtual bool Cast_Ray(RayCollisionTestClass & raytest); - virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest); - virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); - virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); - virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override; + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; + virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override; + virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override; + virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest) override; + virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest) override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // AABoxRenderObjClass Interface @@ -164,7 +164,7 @@ class AABoxRenderObjClass : public W3DMPO, public BoxRenderObjClass protected: - virtual void update_cached_box(); + virtual void update_cached_box() override; AABoxClass CachedBox; @@ -194,19 +194,19 @@ class OBBoxRenderObjClass : public W3DMPO, public BoxRenderObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const; - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); - virtual bool Cast_Ray(RayCollisionTestClass & raytest); - virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest); - virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); - virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); - virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override; + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; + virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override; + virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override; + virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest) override; + virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest) override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // OBBoxRenderObjClass Interface @@ -215,7 +215,7 @@ class OBBoxRenderObjClass : public W3DMPO, public BoxRenderObjClass protected: - virtual void update_cached_box(); + virtual void update_cached_box() override; OBBoxClass CachedBox; @@ -228,8 +228,8 @@ class OBBoxRenderObjClass : public W3DMPO, public BoxRenderObjClass class BoxLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type () { return W3D_CHUNK_BOX; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type () override { return W3D_CHUNK_BOX; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; @@ -242,10 +242,10 @@ class BoxPrototypeClass : public W3DMPO, public PrototypeClass W3DMPO_GLUE(BoxPrototypeClass) public: BoxPrototypeClass(W3dBoxStruct box); - virtual const char * Get_Name() const; - virtual int Get_Class_ID() const; - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override; + virtual int Get_Class_ID() const override; + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { delete this; } private: W3dBoxStruct Definition; }; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h index 1502f293848..5b5d7549213 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h @@ -120,28 +120,28 @@ class CameraClass : public RenderObjClass CameraClass(); CameraClass(const CameraClass & src); CameraClass & operator = (const CameraClass &); - virtual ~CameraClass(); - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_CAMERA; } + virtual ~CameraClass() override; + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_CAMERA; } ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Rendering, cameras don't "render" ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo) { } + virtual void Render(RenderInfoClass & rinfo) override { } ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - "Scene Graph" // Cameras cache their frustum description, this is invalidated whenever // the transform/position is changed ///////////////////////////////////////////////////////////////////////////// - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Bounding Volumes ///////////////////////////////////////////////////////////////////////////// - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; /////////////////////////////////////////////////////////////////////////// // Camera parameter control diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp index 9374826cff8..5016c7253ac 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp @@ -1327,9 +1327,9 @@ void DazzleRenderObjClass::Special_Render(SpecialRenderInfoClass & rinfo) class DazzlePersistFactoryClass : public PersistFactoryClass { - virtual uint32 Chunk_ID() const; - virtual PersistClass * Load(ChunkLoadClass & cload) const; - virtual void Save(ChunkSaveClass & csave,PersistClass * obj) const; + virtual uint32 Chunk_ID() const override; + virtual PersistClass * Load(ChunkLoadClass & cload) const override; + virtual void Save(ChunkSaveClass & csave,PersistClass * obj) const override; enum { diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h index bfb263fc50c..c903098bf91 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h @@ -271,15 +271,15 @@ class DazzleRenderObjClass : public RenderObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_DAZZLE; } + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_DAZZLE; } - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); - virtual void Set_Transform(const Matrix3D &m); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; - virtual void Scale(float scale) { radius*=scale; }; + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; + virtual void Scale(float scale) override { radius*=scale; }; void Set_Dazzle_Color(const Vector3& col) { dazzle_color=col; } void Set_Halo_Color(const Vector3& col) { halo_color=col; } @@ -300,7 +300,7 @@ class DazzleRenderObjClass : public RenderObjClass // Persistent object save-load interface // Dazzles save their "dazzle-type" and transform - virtual const PersistFactoryClass & Get_Factory () const; + virtual const PersistFactoryClass & Get_Factory () const override; // Set the static "current layer" variable. This variable is used in the // Render() call so that the dazzle knows which list to add itself to if @@ -359,10 +359,10 @@ class DazzlePrototypeClass : public W3DMPO, public PrototypeClass public: DazzlePrototypeClass() : DazzleType(0) { } - virtual const char * Get_Name() const { return Name; } - virtual int Get_Class_ID() const { return RenderObjClass::CLASSID_DAZZLE; } - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override { return Name; } + virtual int Get_Class_ID() const override { return RenderObjClass::CLASSID_DAZZLE; } + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { delete this; } WW3DErrorType Load_W3D(ChunkLoadClass & cload); @@ -384,8 +384,8 @@ class DazzleLoaderClass : public PrototypeLoaderClass DazzleLoaderClass() { } ~DazzleLoaderClass() { } - virtual int Chunk_Type() { return W3D_CHUNK_DAZZLE; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type() override { return W3D_CHUNK_DAZZLE; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; extern DazzleLoaderClass _DazzleLoader; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h index 27d053f9098..a61be107dfa 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h @@ -55,7 +55,7 @@ class IndexBufferClass : public W3DMPO, public RefCountClass // nope, it's an ABC //W3DMPO_GLUE(IndexBufferClass) protected: - virtual ~IndexBufferClass(); + virtual ~IndexBufferClass() override; public: IndexBufferClass(unsigned type, unsigned short index_count); @@ -122,7 +122,7 @@ class DynamicIBAccessClass : public W3DMPO public: DynamicIBAccessClass(unsigned short type, unsigned short index_count); - ~DynamicIBAccessClass(); + virtual ~DynamicIBAccessClass() override; unsigned Get_Type() const { return Type; } unsigned short Get_Index_Count() const { return IndexCount; } @@ -168,7 +168,7 @@ class DX8IndexBufferClass : public IndexBufferClass }; DX8IndexBufferClass(unsigned short index_count,UsageType usage=USAGE_DEFAULT); - ~DX8IndexBufferClass(); + virtual ~DX8IndexBufferClass() override; void Copy(unsigned int* indices,unsigned start_index,unsigned index_count); void Copy(unsigned short* indices,unsigned start_index,unsigned index_count); @@ -192,7 +192,7 @@ class SortingIndexBufferClass : public IndexBufferClass friend DynamicIBAccessClass::WriteLockClass; public: SortingIndexBufferClass(unsigned short index_count); - ~SortingIndexBufferClass(); + virtual ~SortingIndexBufferClass() override; protected: unsigned short* index_buffer; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h index 1fb49fd3ff4..d67f46467e2 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h @@ -86,7 +86,7 @@ class DX8TextureCategoryClass : public MultiListObjectClass public: DX8TextureCategoryClass(DX8FVFCategoryContainer* container,TextureClass** textures, ShaderClass shd, VertexMaterialClass* mat,int pass); - ~DX8TextureCategoryClass(); + virtual ~DX8TextureCategoryClass() override; void Add_Render_Task(DX8PolygonRendererClass * p_renderer,MeshClass * p_mesh); @@ -172,7 +172,7 @@ class DX8FVFCategoryContainer : public MultiListObjectClass public: DX8FVFCategoryContainer(unsigned FVF,bool sorting); - virtual ~DX8FVFCategoryContainer(); + virtual ~DX8FVFCategoryContainer() override; static unsigned Define_FVF(MeshModelClass* mmc,bool enable_lighting); bool Is_Sorting() const { return sorting; } @@ -236,13 +236,13 @@ class DX8RigidFVFCategoryContainer : public DX8FVFCategoryContainer { public: DX8RigidFVFCategoryContainer(unsigned FVF,bool sorting); - ~DX8RigidFVFCategoryContainer(); + virtual ~DX8RigidFVFCategoryContainer() override; - void Add_Mesh(MeshModelClass* mmc); - void Log(bool only_visible); - bool Check_If_Mesh_Fits(MeshModelClass* mmc); + virtual void Add_Mesh(MeshModelClass* mmc) override; + virtual void Log(bool only_visible) override; + virtual bool Check_If_Mesh_Fits(MeshModelClass* mmc) override; - void Render(); // Generic render function + void Render() override; // Generic render function protected: @@ -260,12 +260,12 @@ class DX8SkinFVFCategoryContainer: public DX8FVFCategoryContainer { public: DX8SkinFVFCategoryContainer(bool sorting); - ~DX8SkinFVFCategoryContainer(); + virtual ~DX8SkinFVFCategoryContainer() override; - void Render(); - void Add_Mesh(MeshModelClass* mmc); - void Log(bool only_visible); - bool Check_If_Mesh_Fits(MeshModelClass* mmc); + void Render() override; + void Add_Mesh(MeshModelClass* mmc) override; + void Log(bool only_visible) override; + bool Check_If_Mesh_Fits(MeshModelClass* mmc) override; void Add_Visible_Skin(MeshClass * mesh); diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h index a6609136cde..668b1ab411d 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h @@ -79,7 +79,7 @@ class VertexBufferClass : public W3DMPO, public RefCountClass protected: VertexBufferClass(unsigned type, unsigned FVF, unsigned short VertexCount); - virtual ~VertexBufferClass(); + virtual ~VertexBufferClass() override; public: const FVFInfoClass& FVF_Info() const { return *fvf_info; } @@ -201,7 +201,7 @@ class DX8VertexBufferClass : public VertexBufferClass { W3DMPO_GLUE(DX8VertexBufferClass) protected: - ~DX8VertexBufferClass(); + virtual ~DX8VertexBufferClass() override; public: enum UsageType { USAGE_DEFAULT=0, @@ -249,7 +249,7 @@ class SortingVertexBufferClass : public VertexBufferClass VertexFormatXYZNDUV2* VertexBuffer; protected: - ~SortingVertexBufferClass(); + virtual ~SortingVertexBufferClass() override; public: SortingVertexBufferClass(unsigned short VertexCount); }; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h index 6c74312ff97..2eaa9be3744 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h @@ -53,9 +53,9 @@ class MissingAnimClass : public HashableClass { public: MissingAnimClass( const char * name ) : Name( name ) {} - virtual ~MissingAnimClass() {} + virtual ~MissingAnimClass() override {} - virtual const char * Get_Key() { return Name; } + virtual const char * Get_Key() override { return Name; } private: StringClass Name; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h index 662c23b611d..5cc84338e13 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h @@ -69,14 +69,14 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass HLodClass(const HModelDefClass & def); HLodClass & operator = (const HLodClass &); - virtual ~HLodClass(); + virtual ~HLodClass() override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Cloning and Identification ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_HLOD; } - virtual int Get_Num_Polys() const; + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_HLOD; } + virtual int Get_Num_Polys() const override; ///////////////////////////////////////////////////////////////////////////// // HLod Interface - Editing and information @@ -107,102 +107,102 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Rendering ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - "Scene Graph" ///////////////////////////////////////////////////////////////////////////// - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; - virtual void Notify_Added(SceneClass * scene); - virtual void Notify_Removed(SceneClass * scene); + virtual void Notify_Added(SceneClass * scene) override; + virtual void Notify_Removed(SceneClass * scene) override; - virtual int Get_Num_Sub_Objects() const; - virtual RenderObjClass * Get_Sub_Object(int index) const; - virtual int Add_Sub_Object(RenderObjClass * subobj); - virtual int Remove_Sub_Object(RenderObjClass * robj); + virtual int Get_Num_Sub_Objects() const override; + virtual RenderObjClass * Get_Sub_Object(int index) const override; + virtual int Add_Sub_Object(RenderObjClass * subobj) override; + virtual int Remove_Sub_Object(RenderObjClass * robj) override; - virtual int Get_Num_Sub_Objects_On_Bone(int boneindex) const; - virtual RenderObjClass * Get_Sub_Object_On_Bone(int index,int boneindex) const; - virtual int Get_Sub_Object_Bone_Index(RenderObjClass * subobj) const; - virtual int Get_Sub_Object_Bone_Index(int LodIndex, int ModelIndex) const; - virtual int Add_Sub_Object_To_Bone(RenderObjClass * subobj,int bone_index); + virtual int Get_Num_Sub_Objects_On_Bone(int boneindex) const override; + virtual RenderObjClass * Get_Sub_Object_On_Bone(int index,int boneindex) const override; + virtual int Get_Sub_Object_Bone_Index(RenderObjClass * subobj) const override; + virtual int Get_Sub_Object_Bone_Index(int LodIndex, int ModelIndex) const override; + virtual int Add_Sub_Object_To_Bone(RenderObjClass * subobj,int bone_index) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Hierarchical Animation ///////////////////////////////////////////////////////////////////////////// - virtual void Set_Animation(); + virtual void Set_Animation() override; virtual void Set_Animation( HAnimClass * motion, - float frame, int anim_mode = ANIM_MODE_MANUAL); + float frame, int anim_mode = ANIM_MODE_MANUAL) override; virtual void Set_Animation( HAnimClass * motion0, float frame0, HAnimClass * motion1, float frame1, - float percentage); - virtual void Set_Animation( HAnimComboClass * anim_combo); + float percentage) override; + virtual void Set_Animation( HAnimComboClass * anim_combo) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Collision Detection, Ray Tracing ///////////////////////////////////////////////////////////////////////////// - virtual bool Cast_Ray(RayCollisionTestClass & raytest); - virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest); - virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); - virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); - virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; + virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override; + virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override; + virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest) override; + virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Predictive LOD ///////////////////////////////////////////////////////////////////////////// - virtual void Prepare_LOD(CameraClass &camera); - virtual void Recalculate_Static_LOD_Factors(); - virtual void Increment_LOD(); - virtual void Decrement_LOD(); - virtual float Get_Cost() const; - virtual float Get_Value() const; - virtual float Get_Post_Increment_Value() const; - virtual void Set_LOD_Level(int lod); - virtual int Get_LOD_Level() const; - virtual int Get_LOD_Count() const; - virtual void Set_LOD_Bias(float bias); - virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const; - virtual RenderObjClass * Get_Current_LOD(); + virtual void Prepare_LOD(CameraClass &camera) override; + virtual void Recalculate_Static_LOD_Factors() override; + virtual void Increment_LOD() override; + virtual void Decrement_LOD() override; + virtual float Get_Cost() const override; + virtual float Get_Value() const override; + virtual float Get_Post_Increment_Value() const override; + virtual void Set_LOD_Level(int lod) override; + virtual int Get_LOD_Level() const override; + virtual int Get_LOD_Count() const override; + virtual void Set_LOD_Bias(float bias) override; + virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const override; + virtual RenderObjClass * Get_Current_LOD() override; /////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Render Object Interface - Bounding Volumes /////////////////////////////////////////////////////////////////////////////////////////////////////////////// - virtual const SphereClass & Get_Bounding_Sphere() const; - virtual const AABoxClass & Get_Bounding_Box() const; - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual const SphereClass & Get_Bounding_Sphere() const override; + virtual const AABoxClass & Get_Bounding_Box() const override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; /////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Render Object Interface - Decals /////////////////////////////////////////////////////////////////////////////////////////////////////////////// - virtual void Create_Decal(DecalGeneratorClass * generator); - virtual void Delete_Decal(uint32 decal_id); + virtual void Create_Decal(DecalGeneratorClass * generator) override; + virtual void Delete_Decal(uint32 decal_id) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Attributes, Options, Properties, etc ///////////////////////////////////////////////////////////////////////////// // virtual void Set_Texture_Reduction_Factor(float trf); - virtual void Scale(float scale); - virtual void Scale(float scalex, float scaley, float scalez) { } - virtual int Get_Num_Snap_Points(); - virtual void Get_Snap_Point(int index,Vector3 * set); - virtual void Set_Hidden(int onoff); + virtual void Scale(float scale) override; + virtual void Scale(float scalex, float scaley, float scalez) override { } + virtual int Get_Num_Snap_Points() override; + virtual void Get_Snap_Point(int index,Vector3 * set) override; + virtual void Set_Hidden(int onoff) override; // (gth) TESTING DYNAMICALLY SWAPPING SKELETONS! - virtual void Set_HTree(HTreeClass * htree); + virtual void Set_HTree(HTreeClass * htree) override; protected: HLodClass(); void Free(); - virtual void Update_Sub_Object_Transforms(); - virtual void Update_Obj_Space_Bounding_Volumes(); + virtual void Update_Sub_Object_Transforms() override; + virtual void Update_Obj_Space_Bounding_Volumes() override; protected: @@ -266,8 +266,8 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass class HLodLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type () { return W3D_CHUNK_HLOD; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type () override { return W3D_CHUNK_HLOD; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; @@ -283,7 +283,7 @@ class HLodDefClass : public W3DMPO HLodDefClass(); HLodDefClass(HLodClass &src_lod); - ~HLodDefClass(); + ~HLodDefClass() override; WW3DErrorType Load_W3D(ChunkLoadClass & cload); WW3DErrorType Save(ChunkSaveClass & csave); @@ -348,15 +348,15 @@ class HLodPrototypeClass : public W3DMPO, public PrototypeClass public: HLodPrototypeClass( HLodDefClass *def ) { Definition = def; } - virtual const char * Get_Name() const { return Definition->Get_Name(); } - virtual int Get_Class_ID() const { return RenderObjClass::CLASSID_HLOD; } - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override { return Definition->Get_Name(); } + virtual int Get_Class_ID() const override { return RenderObjClass::CLASSID_HLOD; } + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { delete this; } HLodDefClass * Get_Definition() const { return Definition; } protected: - virtual ~HLodPrototypeClass() { delete Definition; } + virtual ~HLodPrototypeClass() override { delete Definition; } private: HLodDefClass * Definition; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h index a8b600d0118..35c41eeef48 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h @@ -75,30 +75,30 @@ class HMorphAnimClass : public HAnimClass }; HMorphAnimClass(); - ~HMorphAnimClass(); + ~HMorphAnimClass() override; void Free_Morph(); int Create_New_Morph(const int channels, HAnimClass *anim[]); int Load_W3D(ChunkLoadClass & cload); int Save_W3D(ChunkSaveClass & csave); - const char * Get_Name() const { return Name; } - const char * Get_HName() const { return HierarchyName; } + const char * Get_Name() const override { return Name; } + const char * Get_HName() const override { return HierarchyName; } - int Get_Num_Frames() { return FrameCount; } - float Get_Frame_Rate() { return FrameRate; } - float Get_Total_Time() { return (float)FrameCount / FrameRate; } + int Get_Num_Frames() override { return FrameCount; } + float Get_Frame_Rate() override { return FrameRate; } + float Get_Total_Time() override { return (float)FrameCount / FrameRate; } - void Get_Translation(Vector3& translation, int pividx,float frame) const; - void Get_Orientation(Quaternion& orientation, int pividx,float frame) const; - void Get_Transform(Matrix3D& transform, int pividx,float frame) const; - bool Get_Visibility(int pividx,float frame) { return true; } + virtual void Get_Translation(Vector3& translation, int pividx,float frame) const override; + virtual void Get_Orientation(Quaternion& orientation, int pividx,float frame) const override; + virtual void Get_Transform(Matrix3D& transform, int pividx,float frame) const override; + virtual bool Get_Visibility(int pividx,float frame) override { return true; } void Insert_Morph_Key (const int channel, uint32 morph_frame, uint32 pose_frame); void Release_Keys (); - bool Is_Node_Motion_Present(int pividx) { return true; } - int Get_Num_Pivots() const { return NumNodes; } + bool Is_Node_Motion_Present(int pividx) override { return true; } + int Get_Num_Pivots() const override { return NumNodes; } void Set_Name(const char * name); void Set_HName(const char * hname); diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h index 80efcc735e0..4859be645ae 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h @@ -82,32 +82,32 @@ class HRawAnimClass : public HAnimClass }; HRawAnimClass(); - ~HRawAnimClass(); + ~HRawAnimClass() override; int Load_W3D(ChunkLoadClass & cload); - const char * Get_Name() const { return Name; } - const char * Get_HName() const { return HierarchyName; } - int Get_Num_Frames() { return NumFrames; } - float Get_Frame_Rate() { return FrameRate; } - float Get_Total_Time() { return (float)NumFrames / FrameRate; } + const char * Get_Name() const override { return Name; } + const char * Get_HName() const override { return HierarchyName; } + int Get_Num_Frames() override { return NumFrames; } + float Get_Frame_Rate() override { return FrameRate; } + float Get_Total_Time() override { return (float)NumFrames / FrameRate; } - void Get_Translation(Vector3& translation, int pividx,float frame) const; - void Get_Orientation(Quaternion& orientation, int pividx,float frame) const; - void Get_Transform(Matrix3D& transform, int pividx,float frame) const; - bool Get_Visibility(int pividx,float frame); + virtual void Get_Translation(Vector3& translation, int pividx,float frame) const override; + virtual void Get_Orientation(Quaternion& orientation, int pividx,float frame) const override; + virtual void Get_Transform(Matrix3D& transform, int pividx,float frame) const override; + virtual bool Get_Visibility(int pividx,float frame) override; - bool Is_Node_Motion_Present(int pividx); - int Get_Num_Pivots() const { return NumNodes; } + bool Is_Node_Motion_Present(int pividx) override; + int Get_Num_Pivots() const override { return NumNodes; } // Methods that test the presence of a certain motion channel. - bool Has_X_Translation (int pividx); - bool Has_Y_Translation (int pividx); - bool Has_Z_Translation (int pividx); - bool Has_Rotation (int pividx); - bool Has_Visibility (int pividx); + bool Has_X_Translation (int pividx) override; + bool Has_Y_Translation (int pividx) override; + bool Has_Z_Translation (int pividx) override; + bool Has_Rotation (int pividx) override; + bool Has_Visibility (int pividx) override; NodeMotionStruct *Get_Node_Motion_Array() {return NodeMotion;} - virtual int Class_ID() const { return CLASSID_HRAWANIM; } + virtual int Class_ID() const override { return CLASSID_HRAWANIM; } private: diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h index d8674b146ee..1fd7a0b6235 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h @@ -68,30 +68,30 @@ class LightClass : public RenderObjClass LightClass(LightType type = POINT); LightClass(const LightClass & src); LightClass & operator = (const LightClass &); - virtual ~LightClass(); - RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_LIGHT; } + virtual ~LightClass() override; + RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_LIGHT; } ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Rendering // Lights do not "Render" but they are vertex processors. ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo) { } + virtual void Render(RenderInfoClass & rinfo) override { } virtual bool Is_Vertex_Processor() { return true; } ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - "Scene Graph" // Lights register themselves with the scene as VertexProcessors. ///////////////////////////////////////////////////////////////////////////// - virtual void Notify_Added(SceneClass * scene); - virtual void Notify_Removed(SceneClass * scene); + virtual void Notify_Added(SceneClass * scene) override; + virtual void Notify_Removed(SceneClass * scene) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Bounding Volumes // Bounding volume of a light extends to its attenuation radius ///////////////////////////////////////////////////////////////////////////// - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // LightClass Interface @@ -145,9 +145,9 @@ class LightClass : public RenderObjClass ///////////////////////////////////////////////////////////////////////////// // Persistent object save-load interface ///////////////////////////////////////////////////////////////////////////// - virtual const PersistFactoryClass & Get_Factory () const; - virtual bool Save (ChunkSaveClass &csave); - virtual bool Load (ChunkLoadClass &cload); + virtual const PersistFactoryClass & Get_Factory () const override; + virtual bool Save (ChunkSaveClass &csave) override; + virtual bool Load (ChunkLoadClass &cload) override; //bool isDonut() {return Donut; }; //void setDonut(bool donut) { Donut = donut; }; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h index 38ef8598e13..6c0d256c537 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h @@ -113,11 +113,11 @@ class ScaleTextureMapperClass : public TextureMapperClass ScaleTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); ScaleTextureMapperClass(const ScaleTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_SCALE;} + virtual int Mapper_ID() const override { return MAPPER_ID_SCALE;} - virtual TextureMapperClass *Clone() const { return NEW_REF( ScaleTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( ScaleTextureMapperClass, (*this)); } - virtual void Apply(int uv_array_index); + virtual void Apply(int uv_array_index) override; protected: Vector2 Scale; // Scale @@ -135,14 +135,14 @@ class LinearOffsetTextureMapperClass : public ScaleTextureMapperClass LinearOffsetTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); LinearOffsetTextureMapperClass(const LinearOffsetTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_LINEAR_OFFSET;} + virtual int Mapper_ID() const override { return MAPPER_ID_LINEAR_OFFSET;} - virtual TextureMapperClass *Clone() const { return NEW_REF( LinearOffsetTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( LinearOffsetTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } + virtual bool Is_Time_Variant() override { return true; } - virtual void Apply(int uv_array_index); - virtual void Reset() { Set_Current_UV_Offset(Vector2(0.0f, 0.0f)); } + virtual void Apply(int uv_array_index) override; + virtual void Reset() override { Set_Current_UV_Offset(Vector2(0.0f, 0.0f)); } void Set_Current_UV_Offset(const Vector2 &cur) { CurrentUVOffset = cur; @@ -175,13 +175,13 @@ class GridTextureMapperClass : public TextureMapperClass GridTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); GridTextureMapperClass(const GridTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_GRID;} + virtual int Mapper_ID() const override { return MAPPER_ID_GRID;} - virtual TextureMapperClass *Clone() const { return NEW_REF( GridTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( GridTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } - virtual void Apply(int uv_array_index); - virtual void Reset(); + virtual bool Is_Time_Variant() override { return true; } + virtual void Apply(int uv_array_index) override; + virtual void Reset() override; void Set_Frame(unsigned int frame) { CurrentFrame=frame; } void Set_Frame_Per_Second(float fps); @@ -217,13 +217,13 @@ class RotateTextureMapperClass : public ScaleTextureMapperClass RotateTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); RotateTextureMapperClass(const RotateTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_ROTATE;} + virtual int Mapper_ID() const override { return MAPPER_ID_ROTATE;} - virtual TextureMapperClass *Clone() const { return NEW_REF( RotateTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( RotateTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } - virtual void Apply(int uv_array_index); - virtual void Reset() { CurrentAngle = 0.0f; } + virtual bool Is_Time_Variant() override { return true; } + virtual void Apply(int uv_array_index) override; + virtual void Reset() override { CurrentAngle = 0.0f; } private: float CurrentAngle; @@ -244,13 +244,13 @@ class SineLinearOffsetTextureMapperClass : public TextureMapperClass SineLinearOffsetTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); SineLinearOffsetTextureMapperClass(const SineLinearOffsetTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_SINE_LINEAR_OFFSET;} + virtual int Mapper_ID() const override { return MAPPER_ID_SINE_LINEAR_OFFSET;} - virtual TextureMapperClass *Clone() const { return NEW_REF( SineLinearOffsetTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( SineLinearOffsetTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } - virtual void Apply(int uv_array_index); - virtual void Reset() { CurrentAngle = 0.0f; } + virtual bool Is_Time_Variant() override { return true; } + virtual void Apply(int uv_array_index) override; + virtual void Reset() override { CurrentAngle = 0.0f; } private: Vector3 UAFP; // U Coordinate Amplitude frequency phase @@ -271,13 +271,13 @@ class StepLinearOffsetTextureMapperClass : public TextureMapperClass StepLinearOffsetTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); StepLinearOffsetTextureMapperClass(const StepLinearOffsetTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_STEP_LINEAR_OFFSET;} + virtual int Mapper_ID() const override { return MAPPER_ID_STEP_LINEAR_OFFSET;} - virtual TextureMapperClass *Clone() const { return NEW_REF( StepLinearOffsetTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( StepLinearOffsetTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } - virtual void Apply(int uv_array_index); - virtual void Reset(); + virtual bool Is_Time_Variant() override { return true; } + virtual void Apply(int uv_array_index) override; + virtual void Reset() override; private: Vector2 Step; // Size of step @@ -298,13 +298,13 @@ class ZigZagLinearOffsetTextureMapperClass : public TextureMapperClass ZigZagLinearOffsetTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); ZigZagLinearOffsetTextureMapperClass(const ZigZagLinearOffsetTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_ZIGZAG_LINEAR_OFFSET;} + virtual int Mapper_ID() const override { return MAPPER_ID_ZIGZAG_LINEAR_OFFSET;} - virtual TextureMapperClass *Clone() const { return NEW_REF( ZigZagLinearOffsetTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( ZigZagLinearOffsetTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } - virtual void Apply(int uv_array_index); - virtual void Reset(); + virtual bool Is_Time_Variant() override { return true; } + virtual void Apply(int uv_array_index) override; + virtual void Reset() override; private: Vector2 Speed; // Speed of zigzag @@ -325,10 +325,10 @@ class ClassicEnvironmentMapperClass : public TextureMapperClass public: ClassicEnvironmentMapperClass(unsigned int stage) : TextureMapperClass(stage) { } ClassicEnvironmentMapperClass(const ClassicEnvironmentMapperClass & src) : TextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_CLASSIC_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( ClassicEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual bool Needs_Normals() { return true; } + virtual int Mapper_ID() const override { return MAPPER_ID_CLASSIC_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( ClassicEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual bool Needs_Normals() override { return true; } }; class EnvironmentMapperClass : public TextureMapperClass @@ -337,10 +337,10 @@ class EnvironmentMapperClass : public TextureMapperClass public: EnvironmentMapperClass(unsigned int stage) : TextureMapperClass(stage) { } EnvironmentMapperClass(const EnvironmentMapperClass & src) : TextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( EnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual bool Needs_Normals() { return true; } + virtual int Mapper_ID() const override { return MAPPER_ID_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( EnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual bool Needs_Normals() override { return true; } }; class EdgeMapperClass : public TextureMapperClass @@ -350,12 +350,12 @@ class EdgeMapperClass : public TextureMapperClass EdgeMapperClass(unsigned int stage); EdgeMapperClass(const INIClass &ini, const char *section, unsigned int stage); EdgeMapperClass(const EdgeMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_EDGE;} - virtual TextureMapperClass* Clone() const { return NEW_REF( EdgeMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual void Reset(); - virtual bool Is_Time_Variant() { return true; } - virtual bool Needs_Normals() { return true; } + virtual int Mapper_ID() const override { return MAPPER_ID_EDGE;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( EdgeMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual void Reset() override; + virtual bool Is_Time_Variant() override { return true; } + virtual bool Needs_Normals() override { return true; } protected: unsigned int LastUsedSyncTime; // Sync time last used to update offset @@ -369,10 +369,10 @@ class WSClassicEnvironmentMapperClass : public TextureMapperClass public: WSClassicEnvironmentMapperClass(unsigned int stage) : TextureMapperClass(stage) { } WSClassicEnvironmentMapperClass(const WSClassicEnvironmentMapperClass & src) : TextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_WS_CLASSIC_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( WSClassicEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual bool Needs_Normals() { return true; } + virtual int Mapper_ID() const override { return MAPPER_ID_WS_CLASSIC_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( WSClassicEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual bool Needs_Normals() override { return true; } }; class WSEnvironmentMapperClass : public TextureMapperClass @@ -381,10 +381,10 @@ class WSEnvironmentMapperClass : public TextureMapperClass public: WSEnvironmentMapperClass(unsigned int stage) : TextureMapperClass(stage) { } WSEnvironmentMapperClass(const WSEnvironmentMapperClass & src) : TextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_WS_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( WSEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual bool Needs_Normals() { return true; } + virtual int Mapper_ID() const override { return MAPPER_ID_WS_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( WSEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual bool Needs_Normals() override { return true; } }; class GridClassicEnvironmentMapperClass : public GridTextureMapperClass @@ -394,10 +394,10 @@ class GridClassicEnvironmentMapperClass : public GridTextureMapperClass GridClassicEnvironmentMapperClass(float fps,unsigned int gridwidth, unsigned int stage):GridTextureMapperClass(fps,gridwidth,stage) { } GridClassicEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage) : GridTextureMapperClass(ini,section,stage) { } GridClassicEnvironmentMapperClass(const GridTextureMapperClass & src) : GridTextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_GRID_CLASSIC_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( GridClassicEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual bool Needs_Normals() { return true; } + virtual int Mapper_ID() const override { return MAPPER_ID_GRID_CLASSIC_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( GridClassicEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual bool Needs_Normals() override { return true; } }; class GridEnvironmentMapperClass : public GridTextureMapperClass @@ -407,10 +407,10 @@ class GridEnvironmentMapperClass : public GridTextureMapperClass GridEnvironmentMapperClass(float fps,unsigned int gridwidth, unsigned int stage):GridTextureMapperClass(fps,gridwidth,stage) { } GridEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage) : GridTextureMapperClass(ini,section,stage) { } GridEnvironmentMapperClass(const GridTextureMapperClass & src) : GridTextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_GRID_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( GridEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual bool Needs_Normals() { return true; } + virtual int Mapper_ID() const override { return MAPPER_ID_GRID_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( GridEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual bool Needs_Normals() override { return true; } }; // ---------------------------------------------------------------------------- @@ -426,9 +426,9 @@ class ScreenMapperClass : public LinearOffsetTextureMapperClass ScreenMapperClass(const Vector2 &offset_per_sec, const Vector2 &scale, unsigned int stage):LinearOffsetTextureMapperClass(offset_per_sec,scale,stage) { } ScreenMapperClass(const INIClass &ini, const char *section, unsigned int stage):LinearOffsetTextureMapperClass(ini,section,stage) { } ScreenMapperClass(const LinearOffsetTextureMapperClass & src):LinearOffsetTextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_SCREEN;} - virtual TextureMapperClass* Clone() const { return NEW_REF( ScreenMapperClass, (*this)); } - virtual void Apply(int uv_array_index); + virtual int Mapper_ID() const override { return MAPPER_ID_SCREEN;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( ScreenMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; }; /** @@ -443,13 +443,13 @@ class RandomTextureMapperClass : public TextureMapperClass RandomTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); RandomTextureMapperClass(const RandomTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_RANDOM;} + virtual int Mapper_ID() const override { return MAPPER_ID_RANDOM;} - virtual TextureMapperClass *Clone() const { return NEW_REF( RandomTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( RandomTextureMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual void Reset(); - virtual bool Is_Time_Variant() { return true; } + virtual void Apply(int uv_array_index) override; + virtual void Reset() override; + virtual bool Is_Time_Variant() override { return true; } protected: float FPS; @@ -472,11 +472,11 @@ class BumpEnvTextureMapperClass : public LinearOffsetTextureMapperClass BumpEnvTextureMapperClass(INIClass &ini, const char *section, unsigned int stage); BumpEnvTextureMapperClass(const BumpEnvTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_BUMPENV;} + virtual int Mapper_ID() const override { return MAPPER_ID_BUMPENV;} - virtual TextureMapperClass *Clone() const { return NEW_REF( BumpEnvTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( BumpEnvTextureMapperClass, (*this)); } - virtual void Apply(int uv_array_index); + virtual void Apply(int uv_array_index) override; protected: diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h index b6f3bac9ad3..e0e48d55ed5 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h @@ -94,9 +94,9 @@ class MatrixMapperClass : public TextureMapperClass void Compute_Texture_Coordinate(const Vector3 & point,Vector3 * set_stq); - TextureMapperClass* Clone() const { WWASSERT(0); return nullptr; } + TextureMapperClass* Clone() const override { WWASSERT(0); return nullptr; } - virtual void Apply(int uv_array_index); + virtual void Apply(int uv_array_index) override; protected: diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h index da78f40d4cf..244883fe068 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h @@ -73,51 +73,51 @@ class MeshClass : public W3DMPO, public RenderObjClass MeshClass(); MeshClass(const MeshClass & src); MeshClass & operator = (const MeshClass &); - virtual ~MeshClass(); + virtual ~MeshClass() override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_MESH; } - virtual const char * Get_Name() const; - virtual void Set_Name(const char * name); - virtual int Get_Num_Polys() const; - virtual void Render(RenderInfoClass & rinfo); + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_MESH; } + virtual const char * Get_Name() const override; + virtual void Set_Name(const char * name) override; + virtual int Get_Num_Polys() const override; + virtual void Render(RenderInfoClass & rinfo) override; void Render_Material_Pass(MaterialPassClass * pass,IndexBufferClass * ib); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Collision Detection ///////////////////////////////////////////////////////////////////////////// - virtual bool Cast_Ray(RayCollisionTestClass & raytest); - virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest); - virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); - virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); - virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; + virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override; + virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override; + virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest) override; + virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Bounding Volumes ///////////////////////////////////////////////////////////////////////////// - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Attributes, Options, Properties, etc ///////////////////////////////////////////////////////////////////////////// - virtual void Scale(float scale); - virtual void Scale(float scalex, float scaley, float scalez); - virtual MaterialInfoClass * Get_Material_Info(); + virtual void Scale(float scale) override; + virtual void Scale(float scalex, float scaley, float scalez) override; + virtual MaterialInfoClass * Get_Material_Info() override; - virtual int Get_Sort_Level() const; - virtual void Set_Sort_Level(int level); + virtual int Get_Sort_Level() const override; + virtual void Set_Sort_Level(int level) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Decals ///////////////////////////////////////////////////////////////////////////// - virtual void Create_Decal(DecalGeneratorClass * generator); - virtual void Delete_Decal(uint32 decal_id); + virtual void Create_Decal(DecalGeneratorClass * generator) override; + virtual void Delete_Decal(uint32 decal_id) override; ///////////////////////////////////////////////////////////////////////////// // MeshClass Interface @@ -165,9 +165,9 @@ class MeshClass : public W3DMPO, public RenderObjClass protected: - virtual void Add_Dependencies_To_List (DynamicVectorClass &file_list, bool textures_only = false); + virtual void Add_Dependencies_To_List (DynamicVectorClass &file_list, bool textures_only = false) override; - virtual void Update_Cached_Bounding_Volumes() const; + virtual void Update_Cached_Bounding_Volumes() const override; void Free(); diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp index 093a948772d..4b315d43e6f 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp @@ -103,7 +103,7 @@ class FaceHasherClass : public HashCalculatorClass { public: - virtual bool Items_Match(const MeshBuilderClass::FaceClass & a, const MeshBuilderClass::FaceClass & b) + virtual bool Items_Match(const MeshBuilderClass::FaceClass & a, const MeshBuilderClass::FaceClass & b) override { // Note: if we want this to detect duplicates that are "rotated", must change // both this function and the Compute_Hash function... @@ -115,7 +115,7 @@ class FaceHasherClass : public HashCalculatorClass ); } - virtual void Compute_Hash(const MeshBuilderClass::FaceClass & item) + virtual void Compute_Hash(const MeshBuilderClass::FaceClass & item) override { HashVal = (int)(item.VertIdx[0]*12345.6f + item.VertIdx[1]*1714.38484f + item.VertIdx[2]*27561.3f)&1023; } @@ -130,7 +130,7 @@ class FaceHasherClass : public HashCalculatorClass return 1; } - virtual int Get_Hash_Value(int /*index*/) + virtual int Get_Hash_Value(int /*index*/) override { return HashVal; } diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h index 3ff2f7187f1..1d04e255aba 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h @@ -89,7 +89,7 @@ class MeshGeometryClass : public W3DMPO, public RefCountClass, public MultiListO MeshGeometryClass(); MeshGeometryClass(const MeshGeometryClass & that); - virtual ~MeshGeometryClass(); + virtual ~MeshGeometryClass() override; MeshGeometryClass & operator = (const MeshGeometryClass & that); diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h index ec74ec611ae..cbf4a2a7525 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h @@ -72,7 +72,7 @@ class MeshMatDescClass : public W3DMPO MeshMatDescClass(); MeshMatDescClass(const MeshMatDescClass & that); - ~MeshMatDescClass(); + ~MeshMatDescClass() override; void Reset(int polycount,int vertcount,int passcount); MeshMatDescClass & operator = (const MeshMatDescClass & that); @@ -234,7 +234,7 @@ class MatBufferClass : public ShareBufferClass < VertexMaterialClass * > public: MatBufferClass(int count, const char* msg) : ShareBufferClass(count, msg) { Clear(); } MatBufferClass(const MatBufferClass & that); - ~MatBufferClass(); + ~MatBufferClass() override; void Set_Element(int index,VertexMaterialClass * mat); VertexMaterialClass * Get_Element(int index); @@ -256,7 +256,7 @@ class TexBufferClass : public ShareBufferClass < TextureClass * > public: TexBufferClass(int count, const char* msg) : ShareBufferClass(count, msg) { Clear(); } TexBufferClass(const TexBufferClass & that); - ~TexBufferClass(); + ~TexBufferClass() override; void Set_Element(int index,TextureClass * mat); TextureClass * Get_Element(int index); diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h index bc4e130a392..2333b905b16 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h @@ -133,7 +133,7 @@ class GapFillerClass : public W3DMPO public: GapFillerClass(MeshModelClass* mmc); GapFillerClass(const GapFillerClass& that); - ~GapFillerClass(); + ~GapFillerClass() override; WWINLINE const TriIndex* Get_Polygon_Array() const { return PolygonArray; } WWINLINE unsigned Get_Polygon_Count() const { return PolygonCount; } @@ -154,7 +154,7 @@ class MeshModelClass : public MeshGeometryClass MeshModelClass(); MeshModelClass(const MeshModelClass & that); - ~MeshModelClass(); + ~MeshModelClass() override; MeshModelClass & operator = (const MeshModelClass & that); void Reset(int polycount,int vertcount,int passcount); @@ -224,7 +224,7 @@ class MeshModelClass : public MeshGeometryClass void Make_Color_Array_Unique(int array_index=0); // Load the w3d file format - WW3DErrorType Load_W3D(ChunkLoadClass & cload); + WW3DErrorType Load_W3D(ChunkLoadClass & cload) override; ///////////////////////////////////////////////////////////////////////////////////// // Decal interface diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp index 27573d49e3b..418b4b1586c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp @@ -114,7 +114,7 @@ class MeshLoadContextClass : public W3DMPO W3DMPO_GLUE(MeshLoadContextClass) private: MeshLoadContextClass(); - ~MeshLoadContextClass(); + ~MeshLoadContextClass() override; W3dTexCoordStruct * Get_Texcoord_Array(); diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h index 0ff5860e613..17ffe58e2b0 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h @@ -63,7 +63,7 @@ class MotionChannelClass : public W3DMPO public: MotionChannelClass(); - ~MotionChannelClass(); + ~MotionChannelClass() override; bool Load_W3D(ChunkLoadClass & cload); WWINLINE int Get_Type() const { return Type; } @@ -154,7 +154,7 @@ class BitChannelClass : public W3DMPO public: BitChannelClass(); - ~BitChannelClass(); + ~BitChannelClass() override; bool Load_W3D(ChunkLoadClass & cload); WWINLINE int Get_Type() const { return Type; } @@ -210,7 +210,7 @@ class TimeCodedMotionChannelClass : public W3DMPO public: TimeCodedMotionChannelClass(); - ~TimeCodedMotionChannelClass(); + ~TimeCodedMotionChannelClass() override; bool Load_W3D(ChunkLoadClass & cload); int Get_Type() { return Type; } @@ -248,7 +248,7 @@ class AdaptiveDeltaMotionChannelClass : public W3DMPO public: AdaptiveDeltaMotionChannelClass(); - ~AdaptiveDeltaMotionChannelClass(); + ~AdaptiveDeltaMotionChannelClass() override; bool Load_W3D(ChunkLoadClass & cload); int Get_Type() { return Type; } @@ -297,7 +297,7 @@ class TimeCodedBitChannelClass : public W3DMPO public: TimeCodedBitChannelClass(); - ~TimeCodedBitChannelClass(); + ~TimeCodedBitChannelClass() override; bool Load_W3D(ChunkLoadClass & cload); int Get_Type() { return Type; } diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h index 4fa3f11f214..5652c0e9de1 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h @@ -47,12 +47,12 @@ class Null3DObjClass : public RenderObjClass Null3DObjClass(const Null3DObjClass & src); Null3DObjClass & operator = (const Null3DObjClass & that); - virtual int Class_ID() const; - virtual RenderObjClass * Clone() const; - virtual const char * Get_Name() const { return Name; } - virtual void Render(RenderInfoClass & rinfo); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual int Class_ID() const override; + virtual RenderObjClass * Clone() const override; + virtual const char * Get_Name() const override { return Name; } + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; protected: @@ -67,10 +67,10 @@ class NullPrototypeClass : public W3DMPO, public PrototypeClass NullPrototypeClass(); NullPrototypeClass(const W3dNullObjectStruct &null); - virtual const char * Get_Name() const { return Definition.Name; } - virtual int Get_Class_ID() const { return RenderObjClass::CLASSID_NULL; } - virtual RenderObjClass * Create() { return NEW_REF(Null3DObjClass,(Definition.Name)); } - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override { return Definition.Name; } + virtual int Get_Class_ID() const override { return RenderObjClass::CLASSID_NULL; } + virtual RenderObjClass * Create() override { return NEW_REF(Null3DObjClass,(Definition.Name)); } + virtual void DeleteSelf() override { delete this; } protected: W3dNullObjectStruct Definition; @@ -80,8 +80,8 @@ class NullPrototypeClass : public W3DMPO, public PrototypeClass class NullLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type() { return W3D_CHUNK_NULL_OBJECT; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type() override { return W3D_CHUNK_NULL_OBJECT; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h index 31ee182c80c..2331a8573dd 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h @@ -92,23 +92,23 @@ class ParticleBufferClass : public RenderObjClass ParticleBufferClass(const ParticleBufferClass & src); ParticleBufferClass & operator = (const ParticleBufferClass &); - virtual ~ParticleBufferClass(); + virtual ~ParticleBufferClass() override; /* ** RenderObjClass Interface: */ - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_PARTICLEBUFFER; } + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_PARTICLEBUFFER; } - virtual int Get_Num_Polys() const; + virtual int Get_Num_Polys() const override; int Get_Particle_Count() const; // Update particle state and draw the particles. - virtual void Render(RenderInfoClass & rinfo); + virtual void Render(RenderInfoClass & rinfo) override; // Scales the size of the individual particles but doesn't affect their // position (and therefore the size of the particle system as a whole) - virtual void Scale(float scale); + virtual void Scale(float scale) override; // The particle buffer never receives a Set_Transform/Position call, // evem though its bounding volume changes. Since bounding volume @@ -116,29 +116,29 @@ class ParticleBufferClass : public RenderObjClass // the cached bounding volumes will not be invalidated unless we do // it elsewhere (such as here). We also need to call the particle // emitter's Emit() function (done here to avoid order dependence). - virtual void On_Frame_Update(); + virtual void On_Frame_Update() override; - virtual void Notify_Added(SceneClass * scene); - virtual void Notify_Removed(SceneClass * scene); + virtual void Notify_Added(SceneClass * scene) override; + virtual void Notify_Removed(SceneClass * scene) override; - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Predictive LOD ///////////////////////////////////////////////////////////////////////////// - virtual void Prepare_LOD(CameraClass &camera); - virtual void Increment_LOD(); - virtual void Decrement_LOD(); - virtual float Get_Cost() const; - virtual float Get_Value() const; - virtual float Get_Post_Increment_Value() const; - virtual void Set_LOD_Level(int lod); - virtual int Get_LOD_Level() const; - virtual int Get_LOD_Count() const; - virtual void Set_LOD_Bias(float bias) { LodBias = MAX(bias, 0.0f); } - virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const; + virtual void Prepare_LOD(CameraClass &camera) override; + virtual void Increment_LOD() override; + virtual void Decrement_LOD() override; + virtual float Get_Cost() const override; + virtual float Get_Value() const override; + virtual float Get_Post_Increment_Value() const override; + virtual void Set_LOD_Level(int lod) override; + virtual int Get_LOD_Level() const override; + virtual int Get_LOD_Count() const override; + virtual void Set_LOD_Bias(float bias) override { LodBias = MAX(bias, 0.0f); } + virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const override; /* ** These members are not part of the RenderObjClass Interface: @@ -161,7 +161,7 @@ class ParticleBufferClass : public RenderObjClass void Set_Emitter(ParticleEmitterClass *emitter); // from RenderObj... - virtual bool Is_Complete() { return IsEmitterDead && !NonNewNum && !NewNum; } + virtual bool Is_Complete() override { return IsEmitterDead && !NonNewNum && !NewNum; } // This adds an uninitialized NewParticleStuct to the new particle // buffer and returns its address so the particle emitter can @@ -227,7 +227,7 @@ class ParticleBufferClass : public RenderObjClass protected: - virtual void Update_Cached_Bounding_Volumes() const; + virtual void Update_Cached_Bounding_Volumes() const override; // render the particle system as a collection of particles void Render_Particles(RenderInfoClass & rinfo); diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h index 52477dcc204..b26f67b6e63 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h @@ -121,42 +121,42 @@ class ParticleEmitterClass : public RenderObjClass ParticleEmitterClass(const ParticleEmitterClass & src); ParticleEmitterClass & operator = (const ParticleEmitterClass &); - virtual ~ParticleEmitterClass(); + virtual ~ParticleEmitterClass() override; // Creation/serialization methods - virtual RenderObjClass * Clone() const; + virtual RenderObjClass * Clone() const override; static ParticleEmitterClass * Create_From_Definition (const ParticleEmitterDefClass &definition); ParticleEmitterDefClass * Build_Definition () const; WW3DErrorType Save (ChunkSaveClass &chunk_save) const; // Identification methods - virtual int Class_ID () const { return CLASSID_PARTICLEEMITTER; } - virtual const char * Get_Name () const { return NameString; } - virtual void Set_Name (const char *pname); + virtual int Class_ID () const override { return CLASSID_PARTICLEEMITTER; } + virtual const char * Get_Name () const override { return NameString; } + virtual void Set_Name (const char *pname) override; - virtual void Notify_Added(SceneClass * scene); - virtual void Notify_Removed(SceneClass * scene); + virtual void Notify_Added(SceneClass * scene) override; + virtual void Notify_Removed(SceneClass * scene) override; // Update particle state and draw the particles. - virtual void Render(RenderInfoClass & rinfo) { } - virtual void Restart(); + virtual void Render(RenderInfoClass & rinfo) override { } + virtual void Restart() override; // Scales the size of all particles and effects positions/velocities of // particles emitted after the Scale() call (but not before) - virtual void Scale(float scale); + virtual void Scale(float scale) override; // Put particle buffer in scene if this is the first time (clunky code // - hopefully can be rewritten more cleanly in future)... - virtual void On_Frame_Update(); + virtual void On_Frame_Update() override; - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const { sphere.Center.Set(0,0,0); sphere.Radius = 0; } - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const { box.Center.Set(0,0,0); box.Extent.Set(0,0,0); } - virtual void Set_Hidden(int onoff) { RenderObjClass::Set_Hidden (onoff); Update_On_Visibility (); } - virtual void Set_Visible(int onoff) { RenderObjClass::Set_Visible (onoff); Update_On_Visibility (); } - virtual void Set_Animation_Hidden(int onoff) { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibility (); } - virtual void Set_Force_Visible(int onoff) { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibility (); } + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override { sphere.Center.Set(0,0,0); sphere.Radius = 0; } + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override { box.Center.Set(0,0,0); box.Extent.Set(0,0,0); } + virtual void Set_Hidden(int onoff) override { RenderObjClass::Set_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Visible(int onoff) override { RenderObjClass::Set_Visible (onoff); Update_On_Visibility (); } + virtual void Set_Animation_Hidden(int onoff) override { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Force_Visible(int onoff) override { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibility (); } - virtual void Set_LOD_Bias(float bias) { if (Buffer) Buffer->Set_LOD_Bias(bias); } + virtual void Set_LOD_Bias(float bias) override { if (Buffer) Buffer->Set_LOD_Bias(bias); } // These are not part of the renderobject interface: @@ -202,7 +202,7 @@ class ParticleEmitterClass : public RenderObjClass void Remove_Buffer_From_Scene () { Buffer->Remove (); FirstTime = true; BufferSceneNeeded = true; } // from RenderObj... - virtual bool Is_Complete() { return IsComplete; } + virtual bool Is_Complete() override { return IsComplete; } // Auto deletion behavior controls bool Is_Remove_On_Complete_Enabled() { return RemoveOnComplete; } @@ -274,7 +274,7 @@ class ParticleEmitterClass : public RenderObjClass protected: // Used to build a list of filenames this emitter is dependent on - virtual void Add_Dependencies_To_List (DynamicVectorClass &file_list, bool textures_only = false); + virtual void Add_Dependencies_To_List (DynamicVectorClass &file_list, bool textures_only = false) override; // This method is called each time the visibility state of the emitter changes. virtual void Update_On_Visibility (); @@ -284,7 +284,7 @@ class ParticleEmitterClass : public RenderObjClass // Collision sphere is a point - emitter emits also when not visible, // so this is only important to avoid affecting the collision spheres // of hierarchy objects into which the emitter is inserted. - virtual void Update_Cached_Bounding_Volumes() const; + virtual void Update_Cached_Bounding_Volumes() const override; // Create new particles and pass them to the particle buffer. Receives // the end-of-interval quaternion and origin and interpolates between diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h index 3777bcfe9eb..72368f13138 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h @@ -327,14 +327,14 @@ class ParticleEmitterPrototypeClass : public W3DMPO, public PrototypeClass // // Public methods // - virtual const char * Get_Name () const { return m_pDefinition->Get_Name(); } - virtual int Get_Class_ID () const { return RenderObjClass::CLASSID_PARTICLEEMITTER; } - virtual RenderObjClass * Create (); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name () const override { return m_pDefinition->Get_Name(); } + virtual int Get_Class_ID () const override { return RenderObjClass::CLASSID_PARTICLEEMITTER; } + virtual RenderObjClass * Create () override; + virtual void DeleteSelf() override { delete this; } virtual ParticleEmitterDefClass * Get_Definition () const { return m_pDefinition; } protected: - virtual ~ParticleEmitterPrototypeClass () { delete m_pDefinition; } + virtual ~ParticleEmitterPrototypeClass () override { delete m_pDefinition; } protected: /////////////////////////////////////////////////////////// @@ -353,8 +353,8 @@ class ParticleEmitterLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type () { return W3D_CHUNK_EMITTER; } - virtual PrototypeClass * Load_W3D (ChunkLoadClass &chunk_load); + virtual int Chunk_Type () override { return W3D_CHUNK_EMITTER; } + virtual PrototypeClass * Load_W3D (ChunkLoadClass &chunk_load) override; }; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h index 7c5d0f12b25..57cf782d41c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h @@ -95,7 +95,7 @@ class Render2DClass : public W3DMPO W3DMPO_GLUE(Render2DClass) public: Render2DClass( TextureClass* tex = nullptr ); - virtual ~Render2DClass(); + virtual ~Render2DClass() override; virtual void Reset(); void Render(); @@ -189,9 +189,9 @@ class Render2DClass : public W3DMPO class Render2DTextClass : public Render2DClass { public: Render2DTextClass(Font3DInstanceClass *font=nullptr); - ~Render2DTextClass(); + virtual ~Render2DTextClass() override; - virtual void Reset(); + virtual void Reset() override; Font3DInstanceClass * Peek_Font() { return Font; } void Set_Font( Font3DInstanceClass *font ); diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp index 3e9b74d5d44..f30876585f2 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp @@ -92,10 +92,10 @@ enum class SimpleSceneIterator : public SceneIterator { public: - virtual void First(); - virtual void Next(); - virtual bool Is_Done(); - virtual RenderObjClass * Current_Item(); + virtual void First() override; + virtual void Next() override; + virtual bool Is_Done() override; + virtual RenderObjClass * Current_Item() override; protected: diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h index 09bbd21f614..b8392ebffbc 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h @@ -88,7 +88,7 @@ class SceneClass : public RefCountClass { public: SceneClass(); - virtual ~SceneClass(); + virtual ~SceneClass() override; /////////////////////////////////////////////////////////////////////////////////// // RTTI information. @@ -218,20 +218,20 @@ class SimpleSceneClass : public SceneClass public: SimpleSceneClass(); - virtual ~SimpleSceneClass(); + virtual ~SimpleSceneClass() override; virtual int Get_Scene_ID() { return SCENE_ID_SIMPLE; } - virtual void Add_Render_Object(RenderObjClass * obj); - virtual void Remove_Render_Object(RenderObjClass * obj); + virtual void Add_Render_Object(RenderObjClass * obj) override; + virtual void Remove_Render_Object(RenderObjClass * obj) override; virtual void Remove_All_Render_Objects(); - virtual void Register(RenderObjClass * obj,RegType for_what); - virtual void Unregister(RenderObjClass * obj,RegType for_what); + virtual void Register(RenderObjClass * obj,RegType for_what) override; + virtual void Unregister(RenderObjClass * obj,RegType for_what) override; - virtual SceneIterator * Create_Iterator(bool onlyvisible = false); - virtual void Destroy_Iterator(SceneIterator * it); + virtual SceneIterator * Create_Iterator(bool onlyvisible = false) override; + virtual void Destroy_Iterator(SceneIterator * it) override; // Set visibility status for my render objects. If not called explicitly // beforehand, will be called inside Render(). @@ -241,7 +241,7 @@ class SimpleSceneClass : public SceneClass // Point visibility - used by DazzleRenderObj when no custom handler is installed /////////////////////////////////////////////////////////////////////////////////// virtual float Compute_Point_Visibility( RenderInfoClass & rinfo, - const Vector3 & point); + const Vector3 & point) override; protected: @@ -255,6 +255,6 @@ class SimpleSceneClass : public SceneClass friend class SimpleSceneIterator; - virtual void Customized_Render(RenderInfoClass & rinfo); - virtual void Post_Render_Processing(RenderInfoClass& rinfo); + virtual void Customized_Render(RenderInfoClass & rinfo) override; + virtual void Post_Render_Processing(RenderInfoClass& rinfo) override; }; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h index b2703c87f85..f7f7baad224 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h @@ -101,7 +101,7 @@ class VertexMaterialClass : public W3DMPO, public RefCountClass VertexMaterialClass(); VertexMaterialClass(const VertexMaterialClass & src); - ~VertexMaterialClass(); + ~VertexMaterialClass() override; VertexMaterialClass & operator = (const VertexMaterialClass &src); VertexMaterialClass * Clone() { VertexMaterialClass * mat = NEW_REF (VertexMaterialClass,()); *mat = *this; return mat;} diff --git a/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h b/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h index 24086a3e220..1333fb0e95a 100644 --- a/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h +++ b/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h @@ -64,68 +64,68 @@ class GUIEditDisplay : public Display public: GUIEditDisplay( void ); - virtual ~GUIEditDisplay( void ); + virtual ~GUIEditDisplay( void ) override; - virtual void draw( void ) { }; + virtual void draw( void ) override { }; /// draw a line on the display in pixel coordinates with the specified color virtual void drawLine( Int startX, Int startY, Int endX, Int endY, - Real lineWidth, UnsignedInt lineColor ); + Real lineWidth, UnsignedInt lineColor ) override; virtual void drawLine( Int startX, Int startY, Int endX, Int endY, - Real lineWidth, UnsignedInt lineColor1, UnsignedInt lineColor2 ) { } + Real lineWidth, UnsignedInt lineColor1, UnsignedInt lineColor2 ) override { } /// draw a rect border on the display in pixel coordinates with the specified color virtual void drawOpenRect( Int startX, Int startY, Int width, Int height, - Real lineWidth, UnsignedInt lineColor ); + Real lineWidth, UnsignedInt lineColor ) override; /// draw a filled rect on the display in pixel coords with the specified color virtual void drawFillRect( Int startX, Int startY, Int width, Int height, - UnsignedInt color ); + UnsignedInt color ) override; /// Draw a percentage of a rectangle, much like a clock - virtual void drawRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) { } - virtual void drawRemainingRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) { } + virtual void drawRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) override { } + virtual void drawRemainingRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) override { } /// draw an image fit within the screen coordinates virtual void drawImage( const Image *image, Int startX, Int startY, - Int endX, Int endY, Color color = 0xFFFFFFFF, DrawImageMode mode=DRAW_IMAGE_ALPHA); + Int endX, Int endY, Color color = 0xFFFFFFFF, DrawImageMode mode=DRAW_IMAGE_ALPHA) override; /// image clipping support - virtual void setClipRegion( IRegion2D *region ); - virtual Bool isClippingEnabled( void ); - virtual void enableClipping( Bool onoff ); + virtual void setClipRegion( IRegion2D *region ) override; + virtual Bool isClippingEnabled( void ) override; + virtual void enableClipping( Bool onoff ) override; // These are stub functions to allow compilation: /// Create a video buffer that can be used for this display - virtual VideoBuffer* createVideoBuffer( void ) { return nullptr; } + virtual VideoBuffer* createVideoBuffer( void ) override { return nullptr; } /// draw a video buffer fit within the screen coordinates - virtual void drawScaledVideoBuffer( VideoBuffer *buffer, VideoStreamInterface *stream ) { } + virtual void drawScaledVideoBuffer( VideoBuffer *buffer, VideoStreamInterface *stream ) override { } virtual void drawVideoBuffer( VideoBuffer *buffer, Int startX, Int startY, - Int endX, Int endY ) { } - virtual void takeScreenShot(void){ } - virtual void toggleMovieCapture(void) {} + Int endX, Int endY ) override { } + virtual void takeScreenShot(void) override { } + virtual void toggleMovieCapture(void) override {} // methods that we need to stub - virtual void setTimeOfDay( TimeOfDay tod ) {} + virtual void setTimeOfDay( TimeOfDay tod ) override {} virtual void createLightPulse( const Coord3D *pos, const RGBColor *color, Real innerRadius, Real attenuationWidth, - UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime ) {} - virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting) {} - void setBorderShroudLevel(UnsignedByte level){} - virtual void clearShroud() {} - virtual void preloadModelAssets( AsciiString model ) {} - virtual void preloadTextureAssets( AsciiString texture ) {} - virtual void toggleLetterBox(void) {} - virtual void enableLetterBox(Bool enable) {} + UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime ) override {} + virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting) override {} + void setBorderShroudLevel(UnsignedByte level) override {} + virtual void clearShroud() override {} + virtual void preloadModelAssets( AsciiString model ) override {} + virtual void preloadTextureAssets( AsciiString texture ) override {} + virtual void toggleLetterBox(void) override {} + virtual void enableLetterBox(Bool enable) override {} #if defined(RTS_DEBUG) virtual void dumpModelAssets(const char *path) {} #endif - virtual void doSmartAssetPurgeAndPreload(const char* usageFileName) {} + virtual void doSmartAssetPurgeAndPreload(const char* usageFileName) override {} #if defined(RTS_DEBUG) virtual void dumpAssetUsage(const char* mapname) {} #endif - virtual Real getAverageFPS(void) { return 0; } - virtual Real getCurrentFPS(void) { return 0; } - virtual Int getLastFrameDrawCalls( void ) { return 0; } + virtual Real getAverageFPS(void) override { return 0; } + virtual Real getCurrentFPS(void) override { return 0; } + virtual Int getLastFrameDrawCalls( void ) override { return 0; } protected: diff --git a/Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h b/Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h index 03846f8aa82..f9795dee57e 100644 --- a/Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h +++ b/Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h @@ -46,16 +46,16 @@ class GUIEditWindowManager : public W3DGameWindowManager public: GUIEditWindowManager( void ); - virtual ~GUIEditWindowManager( void ); + virtual ~GUIEditWindowManager( void ) override; - virtual void init( void ); ///< initialize system + virtual void init( void ) override; ///< initialize system - virtual Int winDestroy( GameWindow *window ); ///< destroy this window + virtual Int winDestroy( GameWindow *window ) override; ///< destroy this window /// create a new window by setting up parameters and callbacks virtual GameWindow *winCreate( GameWindow *parent, UnsignedInt status, Int x, Int y, Int width, Int height, GameWinSystemFunc system, - WinInstanceData *instData = nullptr ); + WinInstanceData *instData = nullptr ) override; // ************************************************************************** // GUIEdit specific methods ************************************************* diff --git a/Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h b/Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h index 7cc7b305f36..cf0fd459370 100644 --- a/Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h @@ -33,10 +33,10 @@ class AutoEdgeOutTool : public Tool { public: AutoEdgeOutTool(void); - ~AutoEdgeOutTool(void); + ~AutoEdgeOutTool(void) override; public: /// Perform tool on mouse down. - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void activate(); ///< Become the current tool. + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void activate() override; ///< Become the current tool. }; diff --git a/Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h b/Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h index 8267d6ef9cd..246fdc34872 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h +++ b/Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h @@ -41,7 +41,7 @@ class BaseBuildProps : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(BaseBuildProps) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -49,8 +49,8 @@ class BaseBuildProps : public CDialog // Generated message map functions //{{AFX_MSG(BaseBuildProps) - virtual BOOL OnInitDialog(); - virtual void OnOK(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h b/Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h index 14bc29938d8..3667fd310d4 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h @@ -36,11 +36,11 @@ class BlendEdgeTool : public Tool public: BlendEdgeTool(void); - ~BlendEdgeTool(void); + ~BlendEdgeTool(void) override; public: /// Perform tool on mouse down. - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; }; diff --git a/Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h b/Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h index 59ed246aa9e..62e6ac63f3d 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h +++ b/Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h @@ -45,10 +45,10 @@ class BlendMaterial : public COptionsPanel // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(BlendMaterial) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnOK(){return;}; ///< Modeless dialogs don't OK, so eat this for modeless. - virtual void OnCancel(){return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless. - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void OnOK() override {return;}; ///< Modeless dialogs don't OK, so eat this for modeless. + virtual void OnCancel() override {return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless. + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -56,7 +56,7 @@ class BlendMaterial : public COptionsPanel enum {MIN_TILE_SIZE=2, MAX_TILE_SIZE = 100}; // Generated message map functions //{{AFX_MSG(BlendMaterial) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Generals/Code/Tools/WorldBuilder/include/BorderTool.h b/Generals/Code/Tools/WorldBuilder/include/BorderTool.h index dcf9864c091..a1979152c3a 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BorderTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/BorderTool.h @@ -32,17 +32,17 @@ class BorderTool : public Tool public: BorderTool(); - ~BorderTool(); + ~BorderTool() override; Int getToolID(void) {return m_toolID;} - virtual void setCursor(void); + virtual void setCursor(void) override; - virtual void activate(); - virtual void deactivate(); + virtual void activate() override; + virtual void deactivate() override; - virtual Bool followsTerrain(void) { return false; } + virtual Bool followsTerrain(void) override { return false; } - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; }; diff --git a/Generals/Code/Tools/WorldBuilder/include/BrushTool.h b/Generals/Code/Tools/WorldBuilder/include/BrushTool.h index 19c829ca148..3f6c401551b 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BrushTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/BrushTool.h @@ -42,7 +42,7 @@ class BrushTool : public Tool public: BrushTool(void); - ~BrushTool(void); + ~BrushTool(void) override; public: static Int getWidth(void) {return m_brushWidth;}; ///loadSides();}; static void setSelectedBuildList(BuildListInfo *pInfo); - virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial); - virtual void PopSliderChanged(const long sliderID, long theVal); - virtual void PopSliderFinished(const long sliderID, long theVal); + virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial) override; + virtual void PopSliderChanged(const long sliderID, long theVal) override; + virtual void PopSliderFinished(const long sliderID, long theVal) override; }; diff --git a/Generals/Code/Tools/WorldBuilder/include/BuildListTool.h b/Generals/Code/Tools/WorldBuilder/include/BuildListTool.h index 0a4b00ab259..38583f1524b 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BuildListTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/BuildListTool.h @@ -56,7 +56,7 @@ class BuildListTool : public Tool public: BuildListTool(void); - ~BuildListTool(void); + ~BuildListTool(void) override; private: void createWindow(void); @@ -68,10 +68,10 @@ class BuildListTool : public Tool public: /// Perform tool on mouse down. - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void setCursor(void); - virtual void activate(); ///< Become the current tool. - virtual void deactivate(); ///< Become not the current tool. + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void setCursor(void) override; + virtual void activate() override; ///< Become the current tool. + virtual void deactivate() override; ///< Become not the current tool. }; diff --git a/Generals/Code/Tools/WorldBuilder/include/CButtonShowColor.h b/Generals/Code/Tools/WorldBuilder/include/CButtonShowColor.h index 5b98bb34f6c..52db8a7f2c0 100644 --- a/Generals/Code/Tools/WorldBuilder/include/CButtonShowColor.h +++ b/Generals/Code/Tools/WorldBuilder/include/CButtonShowColor.h @@ -27,7 +27,7 @@ class CButtonShowColor : public CButton const RGBColor& getColor(void) const { return m_color; } void setColor(Int color) { m_color.setFromInt(color); } void setColor(const RGBColor& color) { m_color = color; } - ~CButtonShowColor(); + ~CButtonShowColor() override; static COLORREF RGBtoBGR(Int color); diff --git a/Generals/Code/Tools/WorldBuilder/include/CFixTeamOwnerDialog.h b/Generals/Code/Tools/WorldBuilder/include/CFixTeamOwnerDialog.h index b7406987297..21797baf160 100644 --- a/Generals/Code/Tools/WorldBuilder/include/CFixTeamOwnerDialog.h +++ b/Generals/Code/Tools/WorldBuilder/include/CFixTeamOwnerDialog.h @@ -31,8 +31,8 @@ class CFixTeamOwnerDialog : public CDialog Bool pickedValidTeam() { return m_pickedValidTeam; } protected: - virtual BOOL OnInitDialog(); - afx_msg void OnOK(); + virtual BOOL OnInitDialog() override; + afx_msg void OnOK() override; DECLARE_MESSAGE_MAP() protected: diff --git a/Generals/Code/Tools/WorldBuilder/include/CUndoable.h b/Generals/Code/Tools/WorldBuilder/include/CUndoable.h index f444e3d0cb3..125103533d2 100644 --- a/Generals/Code/Tools/WorldBuilder/include/CUndoable.h +++ b/Generals/Code/Tools/WorldBuilder/include/CUndoable.h @@ -42,7 +42,7 @@ class Undoable : public RefCountClass public: Undoable(void); - ~Undoable(void); + ~Undoable(void) override; public: virtual void Do(void)=0; ///< pure virtual. @@ -77,10 +77,10 @@ class WBDocUndoable : public Undoable WBDocUndoable(CWorldBuilderDoc *pDoc, WorldHeightMapEdit *pNewHtMap, Coord3D *pObjOffset = nullptr); // destructor. - ~WBDocUndoable(void); - virtual void Do(void); - virtual void Undo(void); - virtual void Redo(void); + ~WBDocUndoable(void) override; + virtual void Do(void) override; + virtual void Undo(void) override; + virtual void Redo(void) override; }; @@ -99,9 +99,9 @@ class AddObjectUndoable : public Undoable AddObjectUndoable(CWorldBuilderDoc *pDoc, MapObject *pObjectToAdd); // destructor. - ~AddObjectUndoable(void); - virtual void Do(void); - virtual void Undo(void); + ~AddObjectUndoable(void) override; + virtual void Do(void) override; + virtual void Undo(void) override; }; @@ -146,11 +146,11 @@ class ModifyObjectUndoable : public Undoable public: ModifyObjectUndoable(CWorldBuilderDoc *pDoc); // destructor. - ~ModifyObjectUndoable(void); + ~ModifyObjectUndoable(void) override; - virtual void Do(void); - virtual void Undo(void); - virtual void Redo(void); + virtual void Do(void) override; + virtual void Undo(void) override; + virtual void Redo(void) override; void SetOffset(Real x, Real y); void SetZOffset(Real z); @@ -188,11 +188,11 @@ class ModifyFlagsUndoable : public Undoable public: ModifyFlagsUndoable(CWorldBuilderDoc *pDoc, Int flagMask, Int flagValue); // destructor. - ~ModifyFlagsUndoable(void); + ~ModifyFlagsUndoable(void) override; - virtual void Do(void); - virtual void Undo(void); - virtual void Redo(void); + virtual void Do(void) override; + virtual void Undo(void) override; + virtual void Redo(void) override; }; @@ -205,10 +205,10 @@ class SidesListUndoable : public Undoable public: SidesListUndoable(const SidesList& newSL, CWorldBuilderDoc *pDoc); - ~SidesListUndoable(void); + ~SidesListUndoable(void) override; - virtual void Do(void); - virtual void Undo(void); + virtual void Do(void) override; + virtual void Undo(void) override; }; @@ -231,10 +231,10 @@ class DictItemUndoable : public Undoable // if you want to substitute the entire contents of the new dict, pass NAMEKEY_INVALID. DictItemUndoable(Dict **d, Dict data, NameKeyType key, Int dictsToModify = 1, CWorldBuilderDoc *pDoc = nullptr, Bool inval = false); // destructor. - ~DictItemUndoable(void); + ~DictItemUndoable(void) override; - virtual void Do(void); - virtual void Undo(void); + virtual void Do(void) override; + virtual void Undo(void) override; }; @@ -267,9 +267,9 @@ class DeleteObjectUndoable : public Undoable DeleteObjectUndoable(CWorldBuilderDoc *pDoc); // destructor. - ~DeleteObjectUndoable(void); - virtual void Do(void); - virtual void Undo(void); + ~DeleteObjectUndoable(void) override; + virtual void Do(void) override; + virtual void Undo(void) override; }; /// AddPolygonUndoable @@ -282,9 +282,9 @@ class AddPolygonUndoable : public Undoable public: AddPolygonUndoable( PolygonTrigger *pTrig); // destructor. - ~AddPolygonUndoable(void); - virtual void Do(void); - virtual void Undo(void); + ~AddPolygonUndoable(void) override; + virtual void Do(void) override; + virtual void Undo(void) override; }; /// AddPolygonPointUndoable @@ -297,9 +297,9 @@ class AddPolygonPointUndoable : public Undoable public: AddPolygonPointUndoable(PolygonTrigger *pTrig, ICoord3D pt); // destructor. - ~AddPolygonPointUndoable(void); - virtual void Do(void); - virtual void Undo(void); + ~AddPolygonPointUndoable(void) override; + virtual void Do(void) override; + virtual void Undo(void) override; }; /// ModifyPolygonPointUndoable @@ -314,9 +314,9 @@ class ModifyPolygonPointUndoable : public Undoable public: ModifyPolygonPointUndoable(PolygonTrigger *pTrig, Int ndx); // destructor. - ~ModifyPolygonPointUndoable(void); - virtual void Do(void); - virtual void Undo(void); + ~ModifyPolygonPointUndoable(void) override; + virtual void Do(void) override; + virtual void Undo(void) override; }; /// MovePolygonUndoable @@ -330,9 +330,9 @@ class MovePolygonUndoable : public Undoable public: MovePolygonUndoable(PolygonTrigger *pTrig); // destructor. - ~MovePolygonUndoable(void); - virtual void Do(void); - virtual void Undo(void); + ~MovePolygonUndoable(void) override; + virtual void Do(void) override; + virtual void Undo(void) override; void SetOffset(const ICoord3D &offset); PolygonTrigger *getTrigger(void) {return m_trigger;} @@ -349,9 +349,9 @@ class InsertPolygonPointUndoable : public Undoable public: InsertPolygonPointUndoable(PolygonTrigger *pTrig, ICoord3D pt, Int ndx); // destructor. - ~InsertPolygonPointUndoable(void); - virtual void Do(void); - virtual void Undo(void); + ~InsertPolygonPointUndoable(void) override; + virtual void Do(void) override; + virtual void Undo(void) override; }; /// DeletePolygonPointUndoable @@ -365,9 +365,9 @@ class DeletePolygonPointUndoable : public Undoable public: DeletePolygonPointUndoable(PolygonTrigger *pTrig, Int ndx); // destructor. - ~DeletePolygonPointUndoable(void); - virtual void Do(void); - virtual void Undo(void); + ~DeletePolygonPointUndoable(void) override; + virtual void Do(void) override; + virtual void Undo(void) override; }; /// DeletePolygonUndoable @@ -380,7 +380,7 @@ class DeletePolygonUndoable : public Undoable public: DeletePolygonUndoable(PolygonTrigger *pTrig); // destructor. - ~DeletePolygonUndoable(void); - virtual void Do(void); - virtual void Undo(void); + ~DeletePolygonUndoable(void) override; + virtual void Do(void) override; + virtual void Undo(void) override; }; diff --git a/Generals/Code/Tools/WorldBuilder/include/CameraOptions.h b/Generals/Code/Tools/WorldBuilder/include/CameraOptions.h index ee7470ea05b..15b559a6cd5 100644 --- a/Generals/Code/Tools/WorldBuilder/include/CameraOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/CameraOptions.h @@ -44,7 +44,7 @@ class CameraOptions : public CDialog, public PopupSliderOwner // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CameraOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -54,7 +54,7 @@ class CameraOptions : public CDialog, public PopupSliderOwner //{{AFX_MSG(CameraOptions) afx_msg void OnCameraReset(); afx_msg void OnMove(int x, int y); - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnChangePitchEdit(); afx_msg void OnShowWindow(BOOL bShow, UINT nStatus); //}}AFX_MSG @@ -73,9 +73,9 @@ class CameraOptions : public CDialog, public PopupSliderOwner public: // popup slider interface. - virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial); - virtual void PopSliderChanged(const long sliderID, long theVal); - virtual void PopSliderFinished(const long sliderID, long theVal); + virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial) override; + virtual void PopSliderChanged(const long sliderID, long theVal) override; + virtual void PopSliderFinished(const long sliderID, long theVal) override; public: void update( void ); diff --git a/Generals/Code/Tools/WorldBuilder/include/CellWidth.h b/Generals/Code/Tools/WorldBuilder/include/CellWidth.h index 7694b43fdaa..5fb0ca63b33 100644 --- a/Generals/Code/Tools/WorldBuilder/include/CellWidth.h +++ b/Generals/Code/Tools/WorldBuilder/include/CellWidth.h @@ -42,8 +42,8 @@ class CellWidth : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CellWidth) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnOK(); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void OnOK() override; //}}AFX_VIRTUAL // Implementation @@ -54,7 +54,7 @@ class CellWidth : public CDialog // Generated message map functions //{{AFX_MSG(CellWidth) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/Generals/Code/Tools/WorldBuilder/include/ContourOptions.h b/Generals/Code/Tools/WorldBuilder/include/ContourOptions.h index 6601cb982c5..36a1483e276 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ContourOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ContourOptions.h @@ -48,7 +48,7 @@ class ContourOptions : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(ContourOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -56,7 +56,7 @@ class ContourOptions : public CDialog // Generated message map functions //{{AFX_MSG(ContourOptions) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar); afx_msg void OnShowContours(); //}}AFX_MSG diff --git a/Generals/Code/Tools/WorldBuilder/include/DrawObject.h b/Generals/Code/Tools/WorldBuilder/include/DrawObject.h index e2b39381def..31cc18d64f5 100644 --- a/Generals/Code/Tools/WorldBuilder/include/DrawObject.h +++ b/Generals/Code/Tools/WorldBuilder/include/DrawObject.h @@ -46,26 +46,26 @@ class DrawObject : public RenderObjClass DrawObject(void); DrawObject(const DrawObject & src); DrawObject & operator = (const DrawObject &); - ~DrawObject(void); + ~DrawObject(void) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone(void) const; - virtual int Class_ID(void) const; - virtual void Render(RenderInfoClass & rinfo); + virtual RenderObjClass * Clone(void) const override; + virtual int Class_ID(void) const override; + virtual void Render(RenderInfoClass & rinfo) override; // virtual void Special_Render(SpecialRenderInfoClass & rinfo); // virtual void Set_Transform(const Matrix3D &m); // virtual void Set_Position(const Vector3 &v); //TODO: MW: do these later - only needed for collision detection - virtual Bool Cast_Ray(RayCollisionTestClass & raytest); + virtual Bool Cast_Ray(RayCollisionTestClass & raytest) override; // virtual Bool Cast_AABox(AABoxCollisionTestClass & boxtest); // virtual Bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); // virtual Bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); // virtual Bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const override; // virtual int Get_Num_Polys(void) const; diff --git a/Generals/Code/Tools/WorldBuilder/include/EditAction.h b/Generals/Code/Tools/WorldBuilder/include/EditAction.h index ac04d34e8a3..cfae6a683bd 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditAction.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditAction.h @@ -45,8 +45,8 @@ class EditAction : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(EditAction) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -67,7 +67,7 @@ class EditAction : public CDialog // Generated message map functions //{{AFX_MSG(EditAction) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnSelchangeScriptActionType(); afx_msg void OnTimer(UINT nIDEvent); //}}AFX_MSG diff --git a/Generals/Code/Tools/WorldBuilder/include/EditCondition.h b/Generals/Code/Tools/WorldBuilder/include/EditCondition.h index a0eb69a0ae4..cbd29f3282e 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditCondition.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditCondition.h @@ -44,8 +44,8 @@ class EditCondition : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(EditCondition) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -66,7 +66,7 @@ class EditCondition : public CDialog // Generated message map functions //{{AFX_MSG(EditCondition) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnSelchangeConditionType(); afx_msg void OnTimer(UINT nIDEvent); //}}AFX_MSG diff --git a/Generals/Code/Tools/WorldBuilder/include/EditCoordParameter.h b/Generals/Code/Tools/WorldBuilder/include/EditCoordParameter.h index 94e88687d82..87b2bf2c9fd 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditCoordParameter.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditCoordParameter.h @@ -43,7 +43,7 @@ friend class EditParameter; // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(EditCoordParameter) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -59,9 +59,9 @@ friend class EditParameter; // Generated message map functions //{{AFX_MSG(EditCoordParameter) - virtual BOOL OnInitDialog(); - virtual void OnOK(); - virtual void OnCancel(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; + virtual void OnCancel() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/Generals/Code/Tools/WorldBuilder/include/EditGroup.h b/Generals/Code/Tools/WorldBuilder/include/EditGroup.h index ece1ab0345b..8993f79b0e4 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditGroup.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditGroup.h @@ -42,7 +42,7 @@ class EditGroup : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(EditGroup) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -53,8 +53,8 @@ class EditGroup : public CDialog // Generated message map functions //{{AFX_MSG(EditGroup) - virtual void OnOK(); - virtual BOOL OnInitDialog(); + virtual void OnOK() override; + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/Generals/Code/Tools/WorldBuilder/include/EditObjectParameter.h b/Generals/Code/Tools/WorldBuilder/include/EditObjectParameter.h index 0ab31d75293..901d64d2744 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditObjectParameter.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditObjectParameter.h @@ -43,7 +43,7 @@ friend class EditParameter; // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(EditObjectParameter) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -62,9 +62,9 @@ friend class EditParameter; // Generated message map functions //{{AFX_MSG(EditObjectParameter) - virtual BOOL OnInitDialog(); - virtual void OnOK(); - virtual void OnCancel(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; + virtual void OnCancel() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/Generals/Code/Tools/WorldBuilder/include/EditParameter.h b/Generals/Code/Tools/WorldBuilder/include/EditParameter.h index 2ac6663eaee..02172ec544d 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditParameter.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditParameter.h @@ -44,7 +44,7 @@ class EditParameter : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(EditParameter) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -115,9 +115,9 @@ class EditParameter : public CDialog //{{AFX_MSG(EditParameter) afx_msg void OnChangeEdit(); afx_msg void OnEditchangeCombo(); - virtual BOOL OnInitDialog(); - virtual void OnOK(); - virtual void OnCancel(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; + virtual void OnCancel() override; afx_msg void OnPreviewSound(); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Generals/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h b/Generals/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h index 33625c14bf8..1d30a759123 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h @@ -41,7 +41,7 @@ class ExportScriptsOptions : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(ExportScriptsOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -61,8 +61,8 @@ class ExportScriptsOptions : public CDialog // Generated message map functions //{{AFX_MSG(ExportScriptsOptions) - virtual void OnOK(); - virtual BOOL OnInitDialog(); + virtual void OnOK() override; + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/Generals/Code/Tools/WorldBuilder/include/EyedropperTool.h b/Generals/Code/Tools/WorldBuilder/include/EyedropperTool.h index 44929f34ae2..1f63469784b 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EyedropperTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/EyedropperTool.h @@ -33,10 +33,10 @@ class EyedropperTool : public Tool { public: EyedropperTool(void); - ~EyedropperTool(void); + ~EyedropperTool(void) override; public: /// Perform tool on mouse down. - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void activate(); ///< Become the current tool. + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void activate() override; ///< Become the current tool. }; diff --git a/Generals/Code/Tools/WorldBuilder/include/FeatherOptions.h b/Generals/Code/Tools/WorldBuilder/include/FeatherOptions.h index 1b412ae9fab..452b981dc89 100644 --- a/Generals/Code/Tools/WorldBuilder/include/FeatherOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/FeatherOptions.h @@ -50,9 +50,9 @@ class FeatherOptions : public COptionsPanel , public PopupSliderOwner // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(FeatherOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnOK(){return;}; //!< Modeless dialogs don't OK, so eat this for modeless. - virtual void OnCancel(){return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void OnOK() override {return;}; //!< Modeless dialogs don't OK, so eat this for modeless. + virtual void OnCancel() override {return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. //}}AFX_VIRTUAL // Implementation @@ -60,7 +60,7 @@ class FeatherOptions : public COptionsPanel , public PopupSliderOwner // Generated message map functions //{{AFX_MSG(FeatherOptions) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnChangeSizeEdit(); //}}AFX_MSG DECLARE_MESSAGE_MAP() @@ -83,9 +83,9 @@ class FeatherOptions : public COptionsPanel , public PopupSliderOwner public: - virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial); - virtual void PopSliderChanged(const long sliderID, long theVal); - virtual void PopSliderFinished(const long sliderID, long theVal); + virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial) override; + virtual void PopSliderChanged(const long sliderID, long theVal) override; + virtual void PopSliderFinished(const long sliderID, long theVal) override; }; diff --git a/Generals/Code/Tools/WorldBuilder/include/FeatherTool.h b/Generals/Code/Tools/WorldBuilder/include/FeatherTool.h index f606a6c8901..8d08966bae3 100644 --- a/Generals/Code/Tools/WorldBuilder/include/FeatherTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/FeatherTool.h @@ -41,15 +41,15 @@ class FeatherTool : public Tool static Int m_radius; public: FeatherTool(void); - ~FeatherTool(void); + ~FeatherTool(void) override; static void setFeather(Int feather); static void setRate(Int rate); static void setRadius(Int Radius); public: - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual WorldHeightMapEdit *getHeightMap(void) {return m_htMapEditCopy;}; - virtual void activate(); ///< Become the current tool. + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual WorldHeightMapEdit *getHeightMap(void) override {return m_htMapEditCopy;}; + virtual void activate() override; ///< Become the current tool. }; diff --git a/Generals/Code/Tools/WorldBuilder/include/FenceOptions.h b/Generals/Code/Tools/WorldBuilder/include/FenceOptions.h index 144244eb03c..d05b543960d 100644 --- a/Generals/Code/Tools/WorldBuilder/include/FenceOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/FenceOptions.h @@ -35,7 +35,7 @@ class FenceOptions : public COptionsPanel public: FenceOptions(CWnd* pParent = nullptr); ///< standard constructor - ~FenceOptions(void); ///< standard destructor + ~FenceOptions(void) override; ///< standard destructor enum { NAME_MAX_LEN = 64 }; // Dialog Data //{{AFX_DATA(FenceOptions) @@ -48,10 +48,10 @@ class FenceOptions : public COptionsPanel // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(FenceOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnOK(){return;}; ///< Modeless dialogs don't OK, so eat this for modeless. - virtual void OnCancel(){return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless. - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void OnOK() override {return;}; ///< Modeless dialogs don't OK, so eat this for modeless. + virtual void OnCancel() override {return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless. + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -59,7 +59,7 @@ class FenceOptions : public COptionsPanel // Generated message map functions //{{AFX_MSG(FenceOptions) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnChangeFenceSpacingEdit(); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Generals/Code/Tools/WorldBuilder/include/FenceTool.h b/Generals/Code/Tools/WorldBuilder/include/FenceTool.h index 67b9b3423f2..836aaf4a963 100644 --- a/Generals/Code/Tools/WorldBuilder/include/FenceTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/FenceTool.h @@ -42,15 +42,15 @@ class FenceTool : public Tool public: FenceTool(void); - ~FenceTool(void); + ~FenceTool(void) override; protected: void updateMapObjectList(Coord3D downPt, Coord3D curPt, WbView* pView, CWorldBuilderDoc *pDoc, Bool checkPlayers); public: - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void activate(); ///< Become the current tool. - virtual void deactivate(); ///< Become not the current tool. + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void activate() override; ///< Become the current tool. + virtual void deactivate() override; ///< Become not the current tool. }; diff --git a/Generals/Code/Tools/WorldBuilder/include/FloodFillTool.h b/Generals/Code/Tools/WorldBuilder/include/FloodFillTool.h index 1801fcc33ff..1c9681bcb6d 100644 --- a/Generals/Code/Tools/WorldBuilder/include/FloodFillTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/FloodFillTool.h @@ -32,7 +32,7 @@ class FloodFillTool : public Tool { public: FloodFillTool(void); - ~FloodFillTool(void); + ~FloodFillTool(void) override; protected: Int m_textureClassToDraw; ///< The texture to fill with. Foreground for mousedDown, background for mouseDownRt. @@ -40,9 +40,9 @@ class FloodFillTool : public Tool static Bool m_adjustCliffTextures; public: - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void activate(); ///< Become the current tool. - virtual void setCursor(void); + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void activate() override; ///< Become the current tool. + virtual void setCursor(void) override; Bool getAdjustCliffs(void) {return m_adjustCliffTextures;} void setAdjustCliffs(Bool val) {m_adjustCliffTextures = val;} diff --git a/Generals/Code/Tools/WorldBuilder/include/GlobalLightOptions.h b/Generals/Code/Tools/WorldBuilder/include/GlobalLightOptions.h index 5ac3346e5f1..91a2eb1b0b4 100644 --- a/Generals/Code/Tools/WorldBuilder/include/GlobalLightOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/GlobalLightOptions.h @@ -53,7 +53,7 @@ class GlobalLightOptions : public CDialog , public PopupSliderOwner // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(GlobalLightOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -61,7 +61,7 @@ class GlobalLightOptions : public CDialog , public PopupSliderOwner // Generated message map functions //{{AFX_MSG(GlobalLightOptions) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnShowWindow(BOOL bShow, UINT nStatus); afx_msg void OnMove(int x, int y); afx_msg void OnChangeFrontBackEdit(); @@ -73,8 +73,8 @@ class GlobalLightOptions : public CDialog , public PopupSliderOwner afx_msg void OnColorPress(); afx_msg void OnResetLights(); afx_msg void OnClose(); - virtual void OnOK(){return;}; //!< Modeless dialogs don't OK, so eat this for modeless. - virtual void OnCancel(){return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. + virtual void OnOK() override {return;}; //!< Modeless dialogs don't OK, so eat this for modeless. + virtual void OnCancel() override {return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. //}}AFX_MSG DECLARE_MESSAGE_MAP() @@ -127,9 +127,9 @@ class GlobalLightOptions : public CDialog , public PopupSliderOwner void stuffValuesIntoFields(Int lightIndex = 0); public: - virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial); - virtual void PopSliderChanged(const long sliderID, long theVal); - virtual void PopSliderFinished(const long sliderID, long theVal); + virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial) override; + virtual void PopSliderChanged(const long sliderID, long theVal) override; + virtual void PopSliderFinished(const long sliderID, long theVal) override; }; diff --git a/Generals/Code/Tools/WorldBuilder/include/GroveOptions.h b/Generals/Code/Tools/WorldBuilder/include/GroveOptions.h index a176b4858bd..8b6c1e7c8cc 100644 --- a/Generals/Code/Tools/WorldBuilder/include/GroveOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/GroveOptions.h @@ -46,10 +46,10 @@ class GroveOptions : public COptionsPanel public: GroveOptions(CWnd* pParent = nullptr); - ~GroveOptions(); + ~GroveOptions() override; void makeMain(void); - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; int getNumTrees(void); int getNumType(int type); AsciiString getTypeName(int type); @@ -69,7 +69,7 @@ class GroveOptions : public COptionsPanel afx_msg void _updateGroveMakeup(void); afx_msg void _updatePlacementAllowed(void); - virtual void OnOK(); + virtual void OnOK() override; virtual void OnClose(); DECLARE_MESSAGE_MAP() }; diff --git a/Generals/Code/Tools/WorldBuilder/include/GroveTool.h b/Generals/Code/Tools/WorldBuilder/include/GroveTool.h index 3cfbedaa6e7..3065482249e 100644 --- a/Generals/Code/Tools/WorldBuilder/include/GroveTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/GroveTool.h @@ -46,15 +46,15 @@ class GroveTool : public Tool void _plantGroveInBox(CPoint tl, CPoint br, WbView* pView); void addObj(Coord3D *pos, AsciiString name); - void activate(); + void activate() override; public: GroveTool(void); - ~GroveTool(void); + ~GroveTool(void) override; public: /// Perform tool on mouse down. - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; }; diff --git a/Generals/Code/Tools/WorldBuilder/include/HandScrollTool.h b/Generals/Code/Tools/WorldBuilder/include/HandScrollTool.h index 23643471564..fd675ddf08f 100644 --- a/Generals/Code/Tools/WorldBuilder/include/HandScrollTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/HandScrollTool.h @@ -31,7 +31,7 @@ class HandScrollTool : public Tool { public: HandScrollTool(void); - ~HandScrollTool(void); + ~HandScrollTool(void) override; protected: enum {HYSTERESIS = 3}; @@ -42,11 +42,11 @@ class HandScrollTool : public Tool public: /// Start scrolling. - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; /// Scroll. - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; /// End scroll. - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void activate(); ///< Become the current tool. - virtual Bool followsTerrain(void) {return false;}; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void activate() override; ///< Become the current tool. + virtual Bool followsTerrain(void) override {return false;}; }; diff --git a/Generals/Code/Tools/WorldBuilder/include/ImpassableOptions.h b/Generals/Code/Tools/WorldBuilder/include/ImpassableOptions.h index a70ed8b653b..8621c3da58b 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ImpassableOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ImpassableOptions.h @@ -25,7 +25,7 @@ class ImpassableOptions : public CDialog public: ImpassableOptions(CWnd* pParent = nullptr, Real defaultSlope = 45.0f); - virtual ~ImpassableOptions(); + virtual ~ImpassableOptions() override; Real GetSlopeToShow() const { return m_slopeToShow; } Real GetDefaultSlope() const { return m_defaultSlopeToShow; } void SetDefaultSlopeToShow(Real slopeToShow) { m_slopeToShow = slopeToShow; } @@ -38,7 +38,7 @@ class ImpassableOptions : public CDialog Bool ValidateSlope(); // Returns TRUE if it was valid, FALSE if it had to adjust it. protected: - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnAngleChange(); afx_msg void OnPreview(); DECLARE_MESSAGE_MAP() diff --git a/Generals/Code/Tools/WorldBuilder/include/LayersList.h b/Generals/Code/Tools/WorldBuilder/include/LayersList.h index 2b761c4917e..b5525eaa0f0 100644 --- a/Generals/Code/Tools/WorldBuilder/include/LayersList.h +++ b/Generals/Code/Tools/WorldBuilder/include/LayersList.h @@ -82,7 +82,7 @@ class LayersList : public CDialog public: enum { IDD = IDD_LAYERSLIST }; LayersList(UINT nIDTemplate = LayersList::IDD, CWnd *parentWnd = nullptr); - virtual ~LayersList(); + virtual ~LayersList() override; void resetLayers(); void addMapObjectToLayersList(IN MapObject *objToAdd, AsciiString layerToAddTo = AsciiString(TheDefaultLayerName.c_str())); @@ -139,9 +139,9 @@ class LayersList : public CDialog void removeMapObjectFromLayer(IN MapObject *objToRemove, IN ListLayerIt *layerIt = nullptr, IN ListMapObjectPtrIt *MapObjectIt = nullptr); protected: - virtual void OnOK(); - virtual void OnCancel(); - virtual BOOL OnInitDialog(); + virtual void OnOK() override; + virtual void OnCancel() override; + virtual BOOL OnInitDialog() override; afx_msg void OnBeginEditLabel(NMHDR *pNotifyStruct, LRESULT* pResult); afx_msg void OnEndEditLabel(NMHDR *pNotifyStruct, LRESULT* pResult); diff --git a/Generals/Code/Tools/WorldBuilder/include/LightOptions.h b/Generals/Code/Tools/WorldBuilder/include/LightOptions.h index adcd549594f..fdc99825258 100644 --- a/Generals/Code/Tools/WorldBuilder/include/LightOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/LightOptions.h @@ -44,9 +44,9 @@ class LightOptions : public COptionsPanel // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(LightOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnOK(){return;}; //!< Modeless dialogs don't OK, so eat this for modeless. - virtual void OnCancel(){return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void OnOK() override {return;}; //!< Modeless dialogs don't OK, so eat this for modeless. + virtual void OnCancel() override {return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. //}}AFX_VIRTUAL // Implementation @@ -54,7 +54,7 @@ class LightOptions : public COptionsPanel // Generated message map functions //{{AFX_MSG(LightOptions) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnChangeLightEdit(); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Generals/Code/Tools/WorldBuilder/include/MainFrm.h b/Generals/Code/Tools/WorldBuilder/include/MainFrm.h index 54e353ee816..aa7bc262f79 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MainFrm.h +++ b/Generals/Code/Tools/WorldBuilder/include/MainFrm.h @@ -68,12 +68,12 @@ class CMainFrame : public CFrameWnd // Overrides // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CMainFrame) - virtual BOOL PreCreateWindow(CREATESTRUCT& cs); + virtual BOOL PreCreateWindow(CREATESTRUCT& cs) override; //}}AFX_VIRTUAL // Implementation public: - virtual ~CMainFrame(); + virtual ~CMainFrame() override; #ifdef RTS_DEBUG virtual void AssertValid() const; virtual void Dump(CDumpContext& dc) const; diff --git a/Generals/Code/Tools/WorldBuilder/include/MapSettings.h b/Generals/Code/Tools/WorldBuilder/include/MapSettings.h index eae8eedcb62..0a0d8b3d529 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MapSettings.h +++ b/Generals/Code/Tools/WorldBuilder/include/MapSettings.h @@ -41,7 +41,7 @@ class MapSettings : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(MapSettings) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -51,8 +51,8 @@ class MapSettings : public CDialog //{{AFX_MSG(MapSettings) afx_msg void OnChangeMapTimeofday(); afx_msg void OnChangeMapWeather(); - virtual BOOL OnInitDialog(); - virtual void OnOK(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; afx_msg void OnChangeMapTitle(); afx_msg void OnChangeMapCompression(); //}}AFX_MSG diff --git a/Generals/Code/Tools/WorldBuilder/include/MeshMoldOptions.h b/Generals/Code/Tools/WorldBuilder/include/MeshMoldOptions.h index 02d37096098..68852ca3db0 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MeshMoldOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/MeshMoldOptions.h @@ -50,11 +50,11 @@ class MeshMoldOptions : public COptionsPanel , public PopupSliderOwner // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(MeshMoldOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnInitDialog(); - virtual void OnOK(){return;}; //!< Modeless dialogs don't OK, so eat this for modeless. - virtual void OnCancel(){return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnInitDialog() override; + virtual void OnOK() override {return;}; //!< Modeless dialogs don't OK, so eat this for modeless. + virtual void OnCancel() override {return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -103,9 +103,9 @@ class MeshMoldOptions : public COptionsPanel , public PopupSliderOwner static AsciiString getModelName(void) {if (m_staticThis) return m_staticThis->m_meshModelName; return "";}; public: //PopupSliderOwner methods. - virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial); - virtual void PopSliderChanged(const long sliderID, long theVal); - virtual void PopSliderFinished(const long sliderID, long theVal); + virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial) override; + virtual void PopSliderChanged(const long sliderID, long theVal) override; + virtual void PopSliderFinished(const long sliderID, long theVal) override; }; //{{AFX_INSERT_LOCATION}} diff --git a/Generals/Code/Tools/WorldBuilder/include/MeshMoldTool.h b/Generals/Code/Tools/WorldBuilder/include/MeshMoldTool.h index e945bb59799..6f63c9a4935 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MeshMoldTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/MeshMoldTool.h @@ -42,7 +42,7 @@ class MeshMoldTool : public Tool public: MeshMoldTool(void); - ~MeshMoldTool(void); + ~MeshMoldTool(void) override; protected: static void applyMesh(CWorldBuilderDoc *pDoc); ///< Apply the mesh to copy of terrain. @@ -50,13 +50,13 @@ class MeshMoldTool : public Tool static void apply(CWorldBuilderDoc *pDoc); ///< Apply the mesh to the terrain & execute undoable. public: //Tool methods. - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual WorldHeightMapEdit *getHeightMap(void) {return m_htMapEditCopy;}; - virtual void activate(); ///< Become the current tool. - virtual void deactivate(); ///< Become the current tool. - virtual Bool followsTerrain(void) {return false;}; + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual WorldHeightMapEdit *getHeightMap(void) override {return m_htMapEditCopy;}; + virtual void activate() override; ///< Become the current tool. + virtual void deactivate() override; ///< Become the current tool. + virtual Bool followsTerrain(void) override {return false;}; public: // Methods specific to MeshMoldTool. static void updateMeshLocation(Bool changePreview); diff --git a/Generals/Code/Tools/WorldBuilder/include/MoundOptions.h b/Generals/Code/Tools/WorldBuilder/include/MoundOptions.h index d2f691323f1..9ce5e94d88f 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MoundOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/MoundOptions.h @@ -54,9 +54,9 @@ class MoundOptions : public COptionsPanel , public PopupSliderOwner // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(MoundOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnOK(){return;}; //!< Modeless dialogs don't OK, so eat this for modeless. - virtual void OnCancel(){return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void OnOK() override {return;}; //!< Modeless dialogs don't OK, so eat this for modeless. + virtual void OnCancel() override {return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. //}}AFX_VIRTUAL // Implementation @@ -64,7 +64,7 @@ class MoundOptions : public COptionsPanel , public PopupSliderOwner // Generated message map functions //{{AFX_MSG(MoundOptions) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnChangeFeatherEdit(); afx_msg void OnChangeSizeEdit(); afx_msg void OnChangeHeightEdit(); @@ -89,9 +89,9 @@ class MoundOptions : public COptionsPanel , public PopupSliderOwner public: - virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial); - virtual void PopSliderChanged(const long sliderID, long theVal); - virtual void PopSliderFinished(const long sliderID, long theVal); + virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial) override; + virtual void PopSliderChanged(const long sliderID, long theVal) override; + virtual void PopSliderFinished(const long sliderID, long theVal) override; }; //{{AFX_INSERT_LOCATION}} diff --git a/Generals/Code/Tools/WorldBuilder/include/MoundTool.h b/Generals/Code/Tools/WorldBuilder/include/MoundTool.h index 4e57d8eff9e..5082b8db06f 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MoundTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/MoundTool.h @@ -42,7 +42,7 @@ class MoundTool : public Tool public: MoundTool(void); - ~MoundTool(void); + ~MoundTool(void) override; public: static Int getMoundHeight(void) {return m_moundHeight;}; @@ -53,11 +53,11 @@ class MoundTool : public Tool static void setFeather(Int feather); public: - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual WorldHeightMapEdit *getHeightMap(void) {return m_htMapEditCopy;}; - virtual void activate(); ///< Become the current tool. + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual WorldHeightMapEdit *getHeightMap(void) override {return m_htMapEditCopy;}; + virtual void activate() override; ///< Become the current tool. }; /************************************************************************* diff --git a/Generals/Code/Tools/WorldBuilder/include/MyToolbar.h b/Generals/Code/Tools/WorldBuilder/include/MyToolbar.h index 00d6dee3624..5a58873b2b7 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MyToolbar.h +++ b/Generals/Code/Tools/WorldBuilder/include/MyToolbar.h @@ -33,11 +33,11 @@ class CellSizeToolBar : public CDialogBar protected: afx_msg void OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar); - virtual LRESULT WindowProc( UINT message, WPARAM wParam, LPARAM lParam ); + virtual LRESULT WindowProc( UINT message, WPARAM wParam, LPARAM lParam ) override; DECLARE_MESSAGE_MAP() public: - ~CellSizeToolBar(void); + ~CellSizeToolBar(void) override; void SetupSlider(void); static void CellSizeChanged(Int cellSize); diff --git a/Generals/Code/Tools/WorldBuilder/include/NewHeightMap.h b/Generals/Code/Tools/WorldBuilder/include/NewHeightMap.h index 3cacd82ec1c..3430d6c6d93 100644 --- a/Generals/Code/Tools/WorldBuilder/include/NewHeightMap.h +++ b/Generals/Code/Tools/WorldBuilder/include/NewHeightMap.h @@ -57,9 +57,9 @@ class CNewHeightMap : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CNewHeightMap) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnOK(); - virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void OnOK() override; + virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL // Implementation @@ -74,7 +74,7 @@ class CNewHeightMap : public CDialog // Generated message map functions //{{AFX_MSG(CNewHeightMap) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/Generals/Code/Tools/WorldBuilder/include/ObjectOptions.h b/Generals/Code/Tools/WorldBuilder/include/ObjectOptions.h index d4f0a798948..3e08a997b45 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ObjectOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ObjectOptions.h @@ -35,7 +35,7 @@ class ObjectOptions : public COptionsPanel public: ObjectOptions(CWnd* pParent = nullptr); ///< standard constructor - ~ObjectOptions(void); ///< standard destructor + ~ObjectOptions(void) override; ///< standard destructor enum { NAME_MAX_LEN = 64 }; // Dialog Data //{{AFX_DATA(ObjectOptions) @@ -48,10 +48,10 @@ class ObjectOptions : public COptionsPanel // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(ObjectOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnOK(){return;}; ///< Modeless dialogs don't OK, so eat this for modeless. - virtual void OnCancel(){return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless. - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void OnOK() override {return;}; ///< Modeless dialogs don't OK, so eat this for modeless. + virtual void OnCancel() override {return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless. + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -59,7 +59,7 @@ class ObjectOptions : public COptionsPanel // Generated message map functions //{{AFX_MSG(ObjectOptions) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnEditchangeOwningteam(); afx_msg void OnCloseupOwningteam(); afx_msg void OnSelchangeOwningteam(); diff --git a/Generals/Code/Tools/WorldBuilder/include/ObjectPreview.h b/Generals/Code/Tools/WorldBuilder/include/ObjectPreview.h index cc9b5259e90..a1791971a94 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ObjectPreview.h +++ b/Generals/Code/Tools/WorldBuilder/include/ObjectPreview.h @@ -46,7 +46,7 @@ class ObjectPreview : public CWnd // Implementation public: - virtual ~ObjectPreview(); + virtual ~ObjectPreview() override; void SetThingTemplate(const ThingTemplate *tTempl); diff --git a/Generals/Code/Tools/WorldBuilder/include/ObjectTool.h b/Generals/Code/Tools/WorldBuilder/include/ObjectTool.h index 613f6784741..f903aa92248 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ObjectTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/ObjectTool.h @@ -37,16 +37,16 @@ class ObjectTool : public Tool public: ObjectTool(void); - ~ObjectTool(void); + ~ObjectTool(void) override; public: static Real calcAngle(Coord3D downPt, Coord3D curPt, WbView* pView); public: /// Perform tool on mouse down. - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void activate(); ///< Become the current tool. - virtual void deactivate(); ///< Become not the current tool. + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void activate() override; ///< Become the current tool. + virtual void deactivate() override; ///< Become not the current tool. }; diff --git a/Generals/Code/Tools/WorldBuilder/include/OpenMap.h b/Generals/Code/Tools/WorldBuilder/include/OpenMap.h index 29b937ef7ae..15a848c9698 100644 --- a/Generals/Code/Tools/WorldBuilder/include/OpenMap.h +++ b/Generals/Code/Tools/WorldBuilder/include/OpenMap.h @@ -48,7 +48,7 @@ class OpenMap : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(OpenMap) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -63,8 +63,8 @@ class OpenMap : public CDialog afx_msg void OnBrowse(); afx_msg void OnSystemMaps(); afx_msg void OnUserMaps(); - virtual void OnOK(); - virtual BOOL OnInitDialog(); + virtual void OnOK() override; + virtual BOOL OnInitDialog() override; afx_msg void OnDblclkOpenList(); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Generals/Code/Tools/WorldBuilder/include/OptionsPanel.h b/Generals/Code/Tools/WorldBuilder/include/OptionsPanel.h index 15ca6081cc3..d34051cb6d0 100644 --- a/Generals/Code/Tools/WorldBuilder/include/OptionsPanel.h +++ b/Generals/Code/Tools/WorldBuilder/include/OptionsPanel.h @@ -45,7 +45,7 @@ class COptionsPanel : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(COptionsPanel) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation diff --git a/Generals/Code/Tools/WorldBuilder/include/PickUnitDialog.h b/Generals/Code/Tools/WorldBuilder/include/PickUnitDialog.h index dcd641a5090..a49d4a59b16 100644 --- a/Generals/Code/Tools/WorldBuilder/include/PickUnitDialog.h +++ b/Generals/Code/Tools/WorldBuilder/include/PickUnitDialog.h @@ -48,7 +48,7 @@ class PickUnitDialog : public CDialog public: PickUnitDialog(CWnd* pParent = nullptr); // standard constructor PickUnitDialog(UINT id, CWnd* pParent = nullptr); // standard constructor - ~PickUnitDialog(void); ///< standard destructor + ~PickUnitDialog(void) override; ///< standard destructor // Dialog Data //{{AFX_DATA(PickUnitDialog) @@ -61,8 +61,8 @@ class PickUnitDialog : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(PickUnitDialog) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -70,7 +70,7 @@ class PickUnitDialog : public CDialog // Generated message map functions //{{AFX_MSG(PickUnitDialog) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnMove(int x, int y); //}}AFX_MSG DECLARE_MESSAGE_MAP() @@ -95,7 +95,7 @@ class ReplaceUnitDialog : public PickUnitDialog // Generated message map functions //{{AFX_MSG(ReplaceUnitDialog) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Generals/Code/Tools/WorldBuilder/include/PointerTool.h b/Generals/Code/Tools/WorldBuilder/include/PointerTool.h index 962a46946a6..2550f4b1cbc 100644 --- a/Generals/Code/Tools/WorldBuilder/include/PointerTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/PointerTool.h @@ -58,17 +58,17 @@ class PointerTool : public PolygonTool public: PointerTool(void); - ~PointerTool(void); + ~PointerTool(void) override; public: /// Clear the selection on activate or deactivate. - virtual void activate(); - virtual void deactivate(); + virtual void activate() override; + virtual void deactivate() override; - virtual void setCursor(void); - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); + virtual void setCursor(void) override; + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; public: static void clearSelection(void); ///< Clears the selected objects selected flags. diff --git a/Generals/Code/Tools/WorldBuilder/include/PolygonTool.h b/Generals/Code/Tools/WorldBuilder/include/PolygonTool.h index e4f52559fc2..377468ecde6 100644 --- a/Generals/Code/Tools/WorldBuilder/include/PolygonTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/PolygonTool.h @@ -36,7 +36,7 @@ class PolygonTool : public Tool { public: PolygonTool(void); - ~PolygonTool(void); + ~PolygonTool(void) override; protected: Coord3D m_poly_mouseDownPt; @@ -74,10 +74,10 @@ class PolygonTool : public Tool public: /// Perform tool on mouse down. - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void setCursor(void); - virtual void activate(); ///< Become the current tool. - virtual void deactivate(); ///< Become not the current tool. + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void setCursor(void) override; + virtual void activate() override; ///< Become the current tool. + virtual void deactivate() override; ///< Become not the current tool. }; diff --git a/Generals/Code/Tools/WorldBuilder/include/RampOptions.h b/Generals/Code/Tools/WorldBuilder/include/RampOptions.h index 154b6167010..e6d83754449 100644 --- a/Generals/Code/Tools/WorldBuilder/include/RampOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/RampOptions.h @@ -48,7 +48,7 @@ class RampOptions : public COptionsPanel public: enum { IDD = IDD_RAMP_OPTIONS }; RampOptions(CWnd* pParent = nullptr); - virtual ~RampOptions(); + virtual ~RampOptions() override; Bool shouldApplyTheRamp(); Real getRampWidth() { return m_rampWidth; } diff --git a/Generals/Code/Tools/WorldBuilder/include/RampTool.h b/Generals/Code/Tools/WorldBuilder/include/RampTool.h index 0b5718ac81c..af1c60a684b 100644 --- a/Generals/Code/Tools/WorldBuilder/include/RampTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/RampTool.h @@ -49,14 +49,14 @@ class RampTool : public Tool public: RampTool(); - virtual void activate(); - virtual void deactivate(); ///< Become not the current tool. + virtual void activate() override; + virtual void deactivate() override; ///< Become not the current tool. - virtual Bool followsTerrain(void); + virtual Bool followsTerrain(void) override; - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; protected: void drawFeedback(Coord3D* endPoint); diff --git a/Generals/Code/Tools/WorldBuilder/include/RoadOptions.h b/Generals/Code/Tools/WorldBuilder/include/RoadOptions.h index f62b02bb6f4..48631431491 100644 --- a/Generals/Code/Tools/WorldBuilder/include/RoadOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/RoadOptions.h @@ -35,7 +35,7 @@ class RoadOptions : public COptionsPanel public: RoadOptions(CWnd* pParent = nullptr); ///< standard constructor - ~RoadOptions(void); ///< standard destructor + ~RoadOptions(void) override; ///< standard destructor enum { NAME_MAX_LEN = 64 }; // Dialog Data //{{AFX_DATA(RoadOptions) @@ -48,10 +48,10 @@ class RoadOptions : public COptionsPanel // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(RoadOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnOK(){return;}; ///< Modeless dialogs don't OK, so eat this for modeless. - virtual void OnCancel(){return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless. - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void OnOK() override {return;}; ///< Modeless dialogs don't OK, so eat this for modeless. + virtual void OnCancel() override {return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless. + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -59,7 +59,7 @@ class RoadOptions : public COptionsPanel // Generated message map functions //{{AFX_MSG(RoadOptions) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnTightCurve(); afx_msg void OnAngled(); afx_msg void OnBroadCurve(); diff --git a/Generals/Code/Tools/WorldBuilder/include/RoadTool.h b/Generals/Code/Tools/WorldBuilder/include/RoadTool.h index 1abd0aa7bca..145ad0f340c 100644 --- a/Generals/Code/Tools/WorldBuilder/include/RoadTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/RoadTool.h @@ -43,15 +43,15 @@ class RoadTool : public Tool public: RoadTool(void); - ~RoadTool(void); + ~RoadTool(void) override; public: static Bool snap(Coord3D *pLoc, Bool skipLast); public: /// Perform tool on mouse down. - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void activate(); ///< Become the current tool. + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void activate() override; ///< Become the current tool. }; diff --git a/Generals/Code/Tools/WorldBuilder/include/SaveMap.h b/Generals/Code/Tools/WorldBuilder/include/SaveMap.h index 8e7f513687a..9bd68806c70 100644 --- a/Generals/Code/Tools/WorldBuilder/include/SaveMap.h +++ b/Generals/Code/Tools/WorldBuilder/include/SaveMap.h @@ -49,7 +49,7 @@ class SaveMap : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(SaveMap) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -61,13 +61,13 @@ class SaveMap : public CDialog // Generated message map functions //{{AFX_MSG(SaveMap) - virtual void OnOK(); - virtual void OnCancel(); + virtual void OnOK() override; + virtual void OnCancel() override; afx_msg void OnBrowse(); afx_msg void OnSystemMaps(); afx_msg void OnUserMaps(); afx_msg void OnSelchangeSaveList(); - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/Generals/Code/Tools/WorldBuilder/include/ScorchOptions.h b/Generals/Code/Tools/WorldBuilder/include/ScorchOptions.h index 128bcd5d53e..45b8d6a1a5f 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScorchOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScorchOptions.h @@ -47,9 +47,9 @@ class ScorchOptions : public COptionsPanel, public PopupSliderOwner // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(ScorchOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnOK(){return;}; //!< Modeless dialogs don't OK, so eat this for modeless. - virtual void OnCancel(){return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void OnOK() override {return;}; //!< Modeless dialogs don't OK, so eat this for modeless. + virtual void OnCancel() override {return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. //}}AFX_VIRTUAL // Implementation @@ -57,7 +57,7 @@ class ScorchOptions : public COptionsPanel, public PopupSliderOwner // Generated message map functions //{{AFX_MSG(ScorchOptions) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnChangeScorchtype(); afx_msg void OnChangeSizeEdit(); //}}AFX_MSG @@ -83,9 +83,9 @@ class ScorchOptions : public COptionsPanel, public PopupSliderOwner static Scorches getScorchType(void) {return m_scorchtype;} static Real getScorchSize(void) {return m_scorchsize;} - virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial); - virtual void PopSliderChanged(const long sliderID, long theVal); - virtual void PopSliderFinished(const long sliderID, long theVal); + virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial) override; + virtual void PopSliderChanged(const long sliderID, long theVal) override; + virtual void PopSliderFinished(const long sliderID, long theVal) override; }; //{{AFX_INSERT_LOCATION}} diff --git a/Generals/Code/Tools/WorldBuilder/include/ScorchTool.h b/Generals/Code/Tools/WorldBuilder/include/ScorchTool.h index 0cdc3039b07..c506be1f263 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScorchTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScorchTool.h @@ -32,7 +32,7 @@ class ScorchTool : public Tool { public: ScorchTool(void); - ~ScorchTool(void); + ~ScorchTool(void) override; protected: Coord3D m_mouseDownPt; @@ -42,9 +42,9 @@ class ScorchTool : public Tool public: /// Perform tool on mouse down. - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void activate(); ///< Become the current tool. - virtual void deactivate(); ///< Become not the current tool. + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void activate() override; ///< Become the current tool. + virtual void deactivate() override; ///< Become not the current tool. }; diff --git a/Generals/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h b/Generals/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h index 98fc05ef6f7..404936bb66e 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h @@ -33,7 +33,7 @@ class ScriptActionsFalse : public CPropertyPage // Construction public: ScriptActionsFalse(); - ~ScriptActionsFalse(); + ~ScriptActionsFalse() override; // Dialog Data //{{AFX_DATA(ScriptActionsFalse) @@ -47,7 +47,7 @@ class ScriptActionsFalse : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(ScriptActionsFalse) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -67,7 +67,7 @@ class ScriptActionsFalse : public CPropertyPage protected: // Generated message map functions //{{AFX_MSG(ScriptActionsFalse) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnEditAction(); afx_msg void OnSelchangeActionList(); afx_msg void OnDblclkActionList(); diff --git a/Generals/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h b/Generals/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h index 3f41b7efd7d..ee59dfdd500 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h @@ -33,7 +33,7 @@ class ScriptActionsTrue : public CPropertyPage // Construction public: ScriptActionsTrue(); - ~ScriptActionsTrue(); + ~ScriptActionsTrue() override; // Dialog Data //{{AFX_DATA(ScriptActionsTrue) @@ -47,7 +47,7 @@ class ScriptActionsTrue : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(ScriptActionsTrue) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -67,7 +67,7 @@ class ScriptActionsTrue : public CPropertyPage protected: // Generated message map functions //{{AFX_MSG(ScriptActionsTrue) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnEditAction(); afx_msg void OnSelchangeActionList(); afx_msg void OnDblclkActionList(); diff --git a/Generals/Code/Tools/WorldBuilder/include/ScriptConditions.h b/Generals/Code/Tools/WorldBuilder/include/ScriptConditions.h index 6233557c5d6..ec930940534 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScriptConditions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScriptConditions.h @@ -34,7 +34,7 @@ class ScriptConditionsDlg : public CPropertyPage // Construction public: ScriptConditionsDlg(); - ~ScriptConditionsDlg(); + ~ScriptConditionsDlg() override; // Dialog Data //{{AFX_DATA(ScriptConditionsDlg) @@ -48,7 +48,7 @@ class ScriptConditionsDlg : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(ScriptConditionsDlg) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -71,7 +71,7 @@ class ScriptConditionsDlg : public CPropertyPage protected: // Generated message map functions //{{AFX_MSG(ScriptConditionsDlg) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnEditCondition(); afx_msg void OnSelchangeConditionList(); afx_msg void OnDblclkConditionList(); diff --git a/Generals/Code/Tools/WorldBuilder/include/ScriptDialog.h b/Generals/Code/Tools/WorldBuilder/include/ScriptDialog.h index 55f3f8b130a..8a6615b99f1 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScriptDialog.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScriptDialog.h @@ -62,7 +62,7 @@ class ScriptDialog : public CDialog // Construction public: ScriptDialog(CWnd* pParent = nullptr); // standard constructor - ~ScriptDialog(); // destructor + ~ScriptDialog() override; // destructor // Dialog Data //{{AFX_DATA(ScriptDialog) @@ -75,7 +75,7 @@ class ScriptDialog : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(ScriptDialog) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -132,7 +132,7 @@ class ScriptDialog : public CDialog // Generated message map functions //{{AFX_MSG(ScriptDialog) afx_msg void OnSelchangedScriptTree(NMHDR* pNMHDR, LRESULT* pResult); - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnNewFolder(); afx_msg void OnNewScript(); afx_msg void OnEditScript(); @@ -141,8 +141,8 @@ class ScriptDialog : public CDialog afx_msg void OnSave(); afx_msg void OnLoad(); afx_msg void OnDblclkScriptTree(NMHDR* pNMHDR, LRESULT* pResult); - virtual void OnOK(); - virtual void OnCancel(); + virtual void OnOK() override; + virtual void OnCancel() override; afx_msg void OnBegindragScriptTree(NMHDR* pNMHDR, LRESULT* pResult); afx_msg void OnScriptActivate(); afx_msg void OnMouseMove(UINT nFlags, CPoint point); diff --git a/Generals/Code/Tools/WorldBuilder/include/ScriptProperties.h b/Generals/Code/Tools/WorldBuilder/include/ScriptProperties.h index 9ee638472b2..d41fe29f5e5 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScriptProperties.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScriptProperties.h @@ -31,7 +31,7 @@ class ScriptProperties : public CPropertyPage // Construction public: ScriptProperties(); - ~ScriptProperties(); + ~ScriptProperties() override; // Dialog Data //{{AFX_DATA(ScriptProperties) @@ -45,9 +45,9 @@ class ScriptProperties : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(ScriptProperties) public: - virtual BOOL OnSetActive(); + virtual BOOL OnSetActive() override; protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation diff --git a/Generals/Code/Tools/WorldBuilder/include/SelectMacrotexture.h b/Generals/Code/Tools/WorldBuilder/include/SelectMacrotexture.h index 6b8f68f1b86..f2bed8d6467 100644 --- a/Generals/Code/Tools/WorldBuilder/include/SelectMacrotexture.h +++ b/Generals/Code/Tools/WorldBuilder/include/SelectMacrotexture.h @@ -41,8 +41,8 @@ class SelectMacrotexture : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(SelectMacrotexture) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL protected: @@ -54,7 +54,7 @@ class SelectMacrotexture : public CDialog // Generated message map functions //{{AFX_MSG(SelectMacrotexture) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/Generals/Code/Tools/WorldBuilder/include/ShadowOptions.h b/Generals/Code/Tools/WorldBuilder/include/ShadowOptions.h index 40c1ea107fd..ba5cee3b42a 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ShadowOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ShadowOptions.h @@ -41,7 +41,7 @@ class ShadowOptions : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(ShadowOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -60,7 +60,7 @@ class ShadowOptions : public CDialog afx_msg void OnChangeBaEdit(); afx_msg void OnChangeGaEdit(); afx_msg void OnChangeRaEdit(); - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/Generals/Code/Tools/WorldBuilder/include/TeamBehavior.h b/Generals/Code/Tools/WorldBuilder/include/TeamBehavior.h index f588f65aaa6..4ac4e1c5e6d 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TeamBehavior.h +++ b/Generals/Code/Tools/WorldBuilder/include/TeamBehavior.h @@ -41,7 +41,7 @@ class TeamBehavior : public CPropertyPage // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(TeamBehavior) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -57,7 +57,7 @@ class TeamBehavior : public CPropertyPage // Generated message map functions //{{AFX_MSG(TeamBehavior) afx_msg void OnSelchangeOnCreateScript(); - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnTransportsReturn(); afx_msg void OnAvoidThreats(); afx_msg void OnSelchangeOnEnemySighted(); diff --git a/Generals/Code/Tools/WorldBuilder/include/TeamGeneric.h b/Generals/Code/Tools/WorldBuilder/include/TeamGeneric.h index 40c599c7484..5ea5a062f3e 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TeamGeneric.h +++ b/Generals/Code/Tools/WorldBuilder/include/TeamGeneric.h @@ -40,7 +40,7 @@ class TeamGeneric : public CPropertyPage protected: // Windows Functions - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void _scriptsToDict(); afx_msg void OnScriptAdjust(); DECLARE_MESSAGE_MAP() diff --git a/Generals/Code/Tools/WorldBuilder/include/TeamIdentity.h b/Generals/Code/Tools/WorldBuilder/include/TeamIdentity.h index 58b74c8edb5..1ca51663abb 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TeamIdentity.h +++ b/Generals/Code/Tools/WorldBuilder/include/TeamIdentity.h @@ -43,8 +43,8 @@ class TeamIdentity : public CPropertyPage // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(TeamIdentity) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL protected: @@ -64,7 +64,7 @@ class TeamIdentity : public CPropertyPage // Generated message map functions //{{AFX_MSG(TeamIdentity) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnAiRecruitable(); afx_msg void OnAutoReinforce(); afx_msg void OnBaseDefense(); diff --git a/Generals/Code/Tools/WorldBuilder/include/TeamReinforcement.h b/Generals/Code/Tools/WorldBuilder/include/TeamReinforcement.h index cce3eb0069c..0748649e572 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TeamReinforcement.h +++ b/Generals/Code/Tools/WorldBuilder/include/TeamReinforcement.h @@ -41,7 +41,7 @@ class TeamReinforcement : public CPropertyPage // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(TeamReinforcement) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -59,7 +59,7 @@ class TeamReinforcement : public CPropertyPage afx_msg void OnTransportsExit(); afx_msg void OnSelchangeVeterancy(); afx_msg void OnSelchangeWaypointCombo(); - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/Generals/Code/Tools/WorldBuilder/include/TerrainMaterial.h b/Generals/Code/Tools/WorldBuilder/include/TerrainMaterial.h index bc625943abb..a971e7b2e28 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TerrainMaterial.h +++ b/Generals/Code/Tools/WorldBuilder/include/TerrainMaterial.h @@ -45,10 +45,10 @@ class TerrainMaterial : public COptionsPanel, public PopupSliderOwner // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(TerrainMaterial) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnOK(){return;}; ///< Modeless dialogs don't OK, so eat this for modeless. - virtual void OnCancel(){return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless. - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void OnOK() override {return;}; ///< Modeless dialogs don't OK, so eat this for modeless. + virtual void OnCancel() override {return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless. + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -56,7 +56,7 @@ class TerrainMaterial : public COptionsPanel, public PopupSliderOwner enum {MIN_TILE_SIZE=2, MAX_TILE_SIZE = 100}; // Generated message map functions //{{AFX_MSG(TerrainMaterial) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnSwapTextures(); afx_msg void OnChangeSizeEdit(); afx_msg void OnImpassable(); @@ -102,9 +102,9 @@ class TerrainMaterial : public COptionsPanel, public PopupSliderOwner Bool setTerrainTreeViewSelection(HTREEITEM parent, Int selection); // Popup slider interface. - virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial); - virtual void PopSliderChanged(const long sliderID, long theVal); - virtual void PopSliderFinished(const long sliderID, long theVal); + virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial) override; + virtual void PopSliderChanged(const long sliderID, long theVal) override; + virtual void PopSliderFinished(const long sliderID, long theVal) override; }; //{{AFX_INSERT_LOCATION}} diff --git a/Generals/Code/Tools/WorldBuilder/include/TerrainModal.h b/Generals/Code/Tools/WorldBuilder/include/TerrainModal.h index 96427faeb8e..6e3e527eba9 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TerrainModal.h +++ b/Generals/Code/Tools/WorldBuilder/include/TerrainModal.h @@ -44,8 +44,8 @@ class TerrainModal : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(TerrainModal) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -53,7 +53,7 @@ class TerrainModal : public CDialog // Generated message map functions //{{AFX_MSG(TerrainModal) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Generals/Code/Tools/WorldBuilder/include/TerrainSwatches.h b/Generals/Code/Tools/WorldBuilder/include/TerrainSwatches.h index eeb972b450a..63d069a67fa 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TerrainSwatches.h +++ b/Generals/Code/Tools/WorldBuilder/include/TerrainSwatches.h @@ -44,7 +44,7 @@ class TerrainSwatches : public CWnd // Implementation public: - virtual ~TerrainSwatches(); + virtual ~TerrainSwatches() override; // Generated message map functions protected: diff --git a/Generals/Code/Tools/WorldBuilder/include/TileTool.h b/Generals/Code/Tools/WorldBuilder/include/TileTool.h index 9d227e538af..6418fd5704b 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TileTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/TileTool.h @@ -36,14 +36,14 @@ class TileTool : public Tool public: TileTool(void); - ~TileTool(void); + ~TileTool(void) override; public: - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual WorldHeightMapEdit *getHeightMap(void) {return m_htMapEditCopy;}; - virtual void activate(); ///< Become the current tool. + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual WorldHeightMapEdit *getHeightMap(void) override {return m_htMapEditCopy;}; + virtual void activate() override; ///< Become the current tool. virtual Int getWidth(void) {return 1;}; }; @@ -57,12 +57,12 @@ class BigTileTool : public TileTool static Int m_currentWidth; public: - virtual void activate(); ///< Become the current tool. + virtual void activate() override; ///< Become the current tool. public: BigTileTool(void); static void setWidth(Int width) ; - virtual Int getWidth(void) {return m_currentWidth;}; + virtual Int getWidth(void) override {return m_currentWidth;}; }; diff --git a/Generals/Code/Tools/WorldBuilder/include/WBFrameWnd.h b/Generals/Code/Tools/WorldBuilder/include/WBFrameWnd.h index 9ac20bab965..1527c7a79ad 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WBFrameWnd.h +++ b/Generals/Code/Tools/WorldBuilder/include/WBFrameWnd.h @@ -42,13 +42,13 @@ class CWBFrameWnd : public CFrameWnd virtual BOOL LoadFrame(UINT nIDResource, DWORD dwDefaultStyle = WS_OVERLAPPEDWINDOW | FWS_ADDTOTITLE, CWnd* pParentWnd = nullptr, - CCreateContext* pContext = nullptr); + CCreateContext* pContext = nullptr) override; // ClassWizard generated virtual function overrides //}}AFX_VIRTUAL // Implementation protected: - virtual ~CWBFrameWnd(); + virtual ~CWBFrameWnd() override; // Generated message map functions //{{AFX_MSG(CWBFrameWnd) @@ -71,14 +71,14 @@ class CWB3dFrameWnd : public CMainFrame virtual BOOL LoadFrame(UINT nIDResource, DWORD dwDefaultStyle = WS_OVERLAPPEDWINDOW | FWS_ADDTOTITLE, CWnd* pParentWnd = nullptr, - CCreateContext* pContext = nullptr); + CCreateContext* pContext = nullptr) override; // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CWB3dFrameWnd) public: //}}AFX_VIRTUAL // Implementation protected: - virtual ~CWB3dFrameWnd(); + virtual ~CWB3dFrameWnd() override; // Generated message map functions //{{AFX_MSG(CWB3dFrameWnd) afx_msg void OnMove(int x, int y); diff --git a/Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h b/Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h index 0cf36b5305b..e0f87d25261 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h +++ b/Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h @@ -29,8 +29,8 @@ class WBHeightMap : public HeightMapRenderObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface (W3D methods) ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo); - virtual Bool Cast_Ray(RayCollisionTestClass & raytest); + virtual void Render(RenderInfoClass & rinfo) override; + virtual Bool Cast_Ray(RayCollisionTestClass & raytest) override; virtual Real getHeightMapHeight(Real x, Real y, Coord3D* normal); ///Write(pData, numBytes); diff --git a/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp index 3209097a103..2334a45a2a8 100644 --- a/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp @@ -109,7 +109,7 @@ class WBGameFileClass : public GameFileClass public: WBGameFileClass(char const *filename):GameFileClass(filename){}; - virtual char const * Set_Name(char const *filename); + virtual char const * Set_Name(char const *filename) override; }; //------------------------------------------------------------------------------------------------- @@ -136,7 +136,7 @@ char const * WBGameFileClass::Set_Name( char const *filename ) // wb only data. jba. class WB_W3DFileSystem : public W3DFileSystem { - virtual FileClass * Get_File( char const *filename ); + virtual FileClass * Get_File( char const *filename ) override; }; //------------------------------------------------------------------------------------------------- @@ -571,7 +571,7 @@ class CAboutDlg : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CAboutDlg) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation diff --git a/Generals/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp b/Generals/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp index 0278870e0d6..91b9ddec8ba 100644 --- a/Generals/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp @@ -158,7 +158,7 @@ class MFCFileOutputStream : public OutputStream CFile *m_file; public: MFCFileOutputStream(CFile *pFile):m_file(pFile) {}; - virtual Int write(const void *pData, Int numBytes) { + virtual Int write(const void *pData, Int numBytes) override { Int numBytesWritten = 0; try { m_file->Write(pData, numBytes); @@ -182,7 +182,7 @@ class CachedMFCFileOutputStream : public OutputStream Int m_totalBytes; public: CachedMFCFileOutputStream(CFile *pFile):m_file(pFile), m_totalBytes(0) {}; - virtual Int write(const void *pData, Int numBytes) { + virtual Int write(const void *pData, Int numBytes) override { UnsignedByte *tmp = new UnsignedByte[numBytes]; memcpy(tmp, pData, numBytes); CachedChunk c; @@ -216,7 +216,7 @@ class CompressedCachedMFCFileOutputStream : public OutputStream Int m_totalBytes; public: CompressedCachedMFCFileOutputStream(CFile *pFile):m_file(pFile), m_totalBytes(0) {}; - virtual Int write(const void *pData, Int numBytes) { + virtual Int write(const void *pData, Int numBytes) override { UnsignedByte *tmp = new UnsignedByte[numBytes]; memcpy(tmp, pData, numBytes); CachedChunk c; diff --git a/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp b/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp index e1cc4e6c97d..b44c73cbc7e 100644 --- a/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp @@ -159,42 +159,42 @@ class PlaceholderView : public View Int m_originX, m_originY; ///< Location of top/left view corner protected: - virtual View *prependViewToList( View *list ) {return nullptr;}; ///< Prepend this view to the given list, return the new list - virtual View *getNextView( void ) { return nullptr; } ///< Return next view in the set + virtual View *prependViewToList( View *list ) override {return nullptr;}; ///< Prepend this view to the given list, return the new list + virtual View *getNextView( void ) override { return nullptr; } ///< Return next view in the set public: - virtual void init( void ){}; + virtual void init( void ) override {}; - virtual UnsignedInt getID( void ) { return 1; } + virtual UnsignedInt getID( void ) override { return 1; } - virtual Drawable *pickDrawable( const ICoord2D *screen, Bool forceAttack, PickType pickType ){return nullptr;}; ///< pick drawable given the screen pixel coords + virtual Drawable *pickDrawable( const ICoord2D *screen, Bool forceAttack, PickType pickType ) override {return nullptr;}; ///< pick drawable given the screen pixel coords /// all drawables in the 2D screen region will call the 'callback' virtual Int iterateDrawablesInRegion( IRegion2D *screenRegion, Bool (*callback)( Drawable *draw, void *userData ), - void *userData ) {return 0;}; - virtual WorldToScreenReturn worldToScreenTriReturn( const Coord3D *w, ICoord2D *s ) { return WTS_INVALID; }; ///< Transform world coordinate "w" into screen coordinate "s" - virtual void screenToTerrain( const ICoord2D *screen, Coord3D *world ) {}; ///< transform screen coord to a point on the 3D terrain - virtual void screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z ) {}; ///< transform screen point to world point at the specified world Z value + void *userData ) override {return 0;}; + virtual WorldToScreenReturn worldToScreenTriReturn( const Coord3D *w, ICoord2D *s ) override { return WTS_INVALID; }; ///< Transform world coordinate "w" into screen coordinate "s" + virtual void screenToTerrain( const ICoord2D *screen, Coord3D *world ) override {}; ///< transform screen coord to a point on the 3D terrain + virtual void screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z ) override {}; ///< transform screen point to world point at the specified world Z value virtual void getScreenCornerWorldPointsAtZ( Coord3D *topLeft, Coord3D *topRight, Coord3D *bottomRight, Coord3D *bottomLeft, - Real z ){}; + Real z ) override {}; - virtual void drawView( void ) {}; ///< Render the world visible in this view. - virtual void updateView( void ) {}; ///< Render the world visible in this view. - virtual void stepView() {}; ///< Update view for every fixed time step + virtual void drawView( void ) override {}; ///< Render the world visible in this view. + virtual void updateView( void ) override {}; ///< Render the world visible in this view. + virtual void stepView() override {}; ///< Update view for every fixed time step - virtual void setZoomLimited( Bool limit ) {} ///< limit the zoom height - virtual Bool isZoomLimited( void ) { return TRUE; } ///< get status of zoom limit + virtual void setZoomLimited( Bool limit ) override {} ///< limit the zoom height + virtual Bool isZoomLimited( void ) const override { return TRUE; } ///< get status of zoom limit - virtual void setWidth( Int width ) { m_width = width; } - virtual Int getWidth( void ) { return m_width; } - virtual void setHeight( Int height ) { m_height = height; } - virtual Int getHeight( void ) { return m_height; } - virtual void setOrigin( Int x, Int y) { m_originX=x; m_originY=y;} ///< Sets location of top-left view corner on display - virtual void getOrigin( Int *x, Int *y) { *x=m_originX; *y=m_originY;} ///< Return location of top-left view corner on display + virtual void setWidth( Int width ) override { m_width = width; } + virtual Int getWidth( void ) override { return m_width; } + virtual void setHeight( Int height ) override { m_height = height; } + virtual Int getHeight( void ) override { return m_height; } + virtual void setOrigin( Int x, Int y) override { m_originX=x; m_originY=y;} ///< Sets location of top-left view corner on display + virtual void getOrigin( Int *x, Int *y) override { *x=m_originX; *y=m_originY;} ///< Return location of top-left view corner on display - virtual void forceRedraw() { } + virtual void forceRedraw() override { } virtual Bool isDoingScriptedCamera() { return false; } virtual void stopDoingScriptedCamera() {} @@ -206,81 +206,81 @@ class PlaceholderView : public View Bool orient) {lookAt(o);}; virtual void moveCameraAlongWaypointPath(Waypoint *way, Int frames, Int shutter, Bool orient) {}; - virtual Bool isCameraMovementFinished(void) {return true;}; + virtual Bool isCameraMovementFinished(void) override {return true;}; virtual void resetCamera(const Coord3D *location, Int frames) {}; ///< Move camera to location, and reset to default angle & zoom. virtual void rotateCamera(Real rotations, Int frames) {}; ///< Rotate camera about current viewpoint. virtual void rotateCameraTowardObject(ObjectID id, Int milliseconds, Int holdMilliseconds) {}; ///< Rotate camera to face an object, and hold on it virtual void cameraModFinalZoom(Real finalZoom){}; ///< Final zoom for current camera movement. - virtual void cameraModRollingAverage(Int framesToAverage){}; ///< Number of frames to average movement for current camera movement. - virtual void cameraModFinalTimeMultiplier(Int finalMultiplier){}; ///< Final time multiplier for current camera movement. + virtual void cameraModRollingAverage(Int framesToAverage) override {}; ///< Number of frames to average movement for current camera movement. + virtual void cameraModFinalTimeMultiplier(Int finalMultiplier) override {}; ///< Final time multiplier for current camera movement. virtual void cameraModFinalPitch(Real finalPitch){}; ///< Final pitch for current camera movement. - virtual void cameraModFreezeTime(void){} ///< Freezes time during the next camera movement. - virtual void cameraModFreezeAngle(void){} ///< Freezes time during the next camera movement. - virtual void cameraModLookToward(Coord3D *pLoc){} ///< Sets a look at point during camera movement. - virtual void cameraModFinalLookToward(Coord3D *pLoc){} ///< Sets a look at point during camera movement. - virtual void cameraModFinalMoveTo(Coord3D *pLoc){ }; ///< Sets a final move to. - virtual Bool isTimeFrozen(void){ return false;} ///< Freezes time during the next camera movement. - virtual Int getTimeMultiplier(void) {return 1;}; ///< Get the time multiplier. - virtual void setTimeMultiplier(Int multiple) {}; ///< Set the time multiplier. - virtual void setDefaultView(Real pitch, Real angle, Real maxHeight) {}; + virtual void cameraModFreezeTime(void) override {} ///< Freezes time during the next camera movement. + virtual void cameraModFreezeAngle(void) override {} ///< Freezes time during the next camera movement. + virtual void cameraModLookToward(Coord3D *pLoc) override {} ///< Sets a look at point during camera movement. + virtual void cameraModFinalLookToward(Coord3D *pLoc) override {} ///< Sets a look at point during camera movement. + virtual void cameraModFinalMoveTo(Coord3D *pLoc) override { }; ///< Sets a final move to. + virtual Bool isTimeFrozen(void) override { return false;} ///< Freezes time during the next camera movement. + virtual Int getTimeMultiplier(void) override {return 1;}; ///< Get the time multiplier. + virtual void setTimeMultiplier(Int multiple) override {}; ///< Set the time multiplier. + virtual void setDefaultView(Real pitch, Real angle, Real maxHeight) override {}; virtual void zoomCamera( Real finalZoom, Int milliseconds ) {}; virtual void pitchCamera( Real finalPitch, Int milliseconds ) {}; - virtual void setAngle( Real angle ){}; ///< Rotate the view around the up axis to the given angle - virtual Real getAngle( void ) { return 0; } - virtual void setPitch( Real angle ){}; ///< Rotate the view around the horizontal axis to the given angle - virtual Real getPitch( void ) { return 0; } ///< Return current camera pitch - virtual void setAngleToDefault( void ) {} ///< Set the view angle back to default - virtual void setPitchToDefault( void ) {} ///< Set the view pitch back to default + virtual void setAngle( Real angle ) override {}; ///< Rotate the view around the up axis to the given angle + virtual Real getAngle( void ) override { return 0; } + virtual void setPitch( Real angle ) override {}; ///< Rotate the view around the horizontal axis to the given angle + virtual Real getPitch( void ) override { return 0; } ///< Return current camera pitch + virtual void setAngleToDefault( void ) override {} ///< Set the view angle back to default + virtual void setPitchToDefault( void ) override {} ///< Set the view pitch back to default virtual void getPosition(Coord3D *pos) {} ///< Return camera position - virtual Real getHeightAboveGround() { return 1; } - virtual void setHeightAboveGround(Real z) { } - virtual Real getZoom() { return 1; } - virtual void setZoom(Real z) { } + virtual Real getHeightAboveGround() override { return 1; } + virtual void setHeightAboveGround(Real z) override { } + virtual Real getZoom() override { return 1; } + virtual void setZoom(Real z) override { } virtual void zoomIn( void ) { } ///< Zoom in, closer to the ground, limit to min virtual void zoomOut( void ) { } ///< Zoom out, farther away from the ground, limit to max - virtual void setZoomToDefault( void ) { } ///< Set zoom to default value + virtual void setZoomToDefault( void ) override { } ///< Set zoom to default value virtual Real getMaxZoom( void ) { return 0.0f; } - virtual void setOkToAdjustHeight( Bool val ) { } ///< Set this to adjust camera height + virtual void setOkToAdjustHeight( Bool val ) override { } ///< Set this to adjust camera height - virtual Real getTerrainHeightAtPivot() { return 0.0f; } - virtual Real getCurrentHeightAboveGround() { return 0.0f; } + virtual Real getTerrainHeightAtPivot() override { return 0.0f; } + virtual Real getCurrentHeightAboveGround() override { return 0.0f; } - virtual void getLocation ( ViewLocation *location ) {}; ///< write the view's current location in to the view location object - virtual void setLocation ( const ViewLocation *location ){}; ///< set the view's current location from to the view location object + virtual void getLocation ( ViewLocation *location ) override {}; ///< write the view's current location in to the view location object + virtual void setLocation ( const ViewLocation *location ) override {}; ///< set the view's current location from to the view location object - virtual ObjectID getCameraLock() const { return INVALID_ID; } - virtual void setCameraLock(ObjectID id) { } - virtual void snapToCameraLock( void ) { } - virtual void setSnapMode( CameraLockType lockType, Real lockDist ) { } + virtual ObjectID getCameraLock() const override { return INVALID_ID; } + virtual void setCameraLock(ObjectID id) override { } + virtual void snapToCameraLock( void ) override { } + virtual void setSnapMode( CameraLockType lockType, Real lockDist ) override { } - virtual Drawable *getCameraLockDrawable() const { return nullptr; } - virtual void setCameraLockDrawable(Drawable *drawable) { } + virtual Drawable *getCameraLockDrawable() const override { return nullptr; } + virtual void setCameraLockDrawable(Drawable *drawable) override { } - virtual void setMouseLock( Bool mouseLocked ) {} ///< lock/unlock the mouse input to the tactical view - virtual Bool isMouseLocked( void ) { return FALSE; } ///< is the mouse input locked to the tactical view? + virtual void setMouseLock( Bool mouseLocked ) override {} ///< lock/unlock the mouse input to the tactical view + virtual Bool isMouseLocked( void ) override { return FALSE; } ///< is the mouse input locked to the tactical view? - virtual void setFieldOfView( Real angle ) {}; ///< Set the horizontal field of view angle - virtual Real getFieldOfView( void ) {return 0;}; ///< Get the horizontal field of view angle + virtual void setFieldOfView( Real angle ) override {}; ///< Set the horizontal field of view angle + virtual Real getFieldOfView( void ) override {return 0;}; ///< Get the horizontal field of view angle - virtual Bool setViewFilterMode(enum FilterModes) {return FALSE;} /// is a good one. Otherwise override it. diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Science.h b/GeneralsMD/Code/GameEngine/Include/Common/Science.h index 6c402af11e4..9bea0fb0e96 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Science.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Science.h @@ -78,11 +78,11 @@ class ScienceStore : public SubsystemInterface friend class ScienceInfo; public: - virtual ~ScienceStore(); + virtual ~ScienceStore() override; - void init(); - void reset(); - void update() { } + virtual void init() override; + virtual void reset() override; + virtual void update() override { } Bool isValidScience(ScienceType st) const; diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ScoreKeeper.h b/GeneralsMD/Code/GameEngine/Include/Common/ScoreKeeper.h index 6df58b3c5c4..ab129333e4a 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ScoreKeeper.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ScoreKeeper.h @@ -99,9 +99,9 @@ class ScoreKeeper : public Snapshot 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; private: diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SkirmishBattleHonors.h b/GeneralsMD/Code/GameEngine/Include/Common/SkirmishBattleHonors.h index 0badedb9035..ff4710d4ee8 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SkirmishBattleHonors.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SkirmishBattleHonors.h @@ -47,7 +47,7 @@ class SkirmishBattleHonors : public UserPreferences { public: SkirmishBattleHonors(); - virtual ~SkirmishBattleHonors(); + virtual ~SkirmishBattleHonors() override; Bool loadFromIniFile(); diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SkirmishPreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/SkirmishPreferences.h index d44a1dc4edc..f63c611078f 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SkirmishPreferences.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SkirmishPreferences.h @@ -42,11 +42,11 @@ class SkirmishPreferences : public UserPreferences { public: SkirmishPreferences(); - virtual ~SkirmishPreferences(); + virtual ~SkirmishPreferences() override; Bool loadFromIniFile(); - virtual Bool write(); + virtual Bool write() override; AsciiString getSlotList(); void setSlotList(); UnicodeString getUserName(); // convenience function diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPower.h b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPower.h index fa335907521..945ec5555dd 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPower.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPower.h @@ -157,11 +157,11 @@ class SpecialPowerStore : public SubsystemInterface public: SpecialPowerStore(); - ~SpecialPowerStore(); + ~SpecialPowerStore() override; - virtual void init() { }; - virtual void update() { }; - virtual void reset(); + virtual void init() override { }; + virtual void update() override { }; + virtual void reset() override; const SpecialPowerTemplate *findSpecialPowerTemplate( AsciiString name ) { return findSpecialPowerTemplatePrivate(name); } const SpecialPowerTemplate *findSpecialPowerTemplateByID( UnsignedInt id ); diff --git a/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h b/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h index c8e252ca381..ba59b7d423f 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h @@ -186,9 +186,9 @@ class State : public MemoryPoolObject, public Snapshot // Essentially all the member data gets set up on creation and shouldn't change. // So none of it needs to be saved, and it nicely forces all user states to // remember to implement crc, xfer & loadPostProcess. jba - virtual void crc( Xfer *xfer )=0; - virtual void xfer( Xfer *xfer )=0; - virtual void loadPostProcess()=0; + virtual void crc( Xfer *xfer ) override =0; + virtual void xfer( Xfer *xfer ) override =0; + virtual void loadPostProcess() override =0; private: @@ -336,9 +336,9 @@ class StateMachine : public MemoryPoolObject, public Snapshot protected: // snapshot interface - 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: @@ -404,13 +404,13 @@ class SuccessState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SuccessState, "SuccessState") public: SuccessState( StateMachine *machine ) : State( machine, "SuccessState") { } - virtual StateReturnType onEnter() { return STATE_SUCCESS; } - virtual StateReturnType update() { return STATE_SUCCESS; } + virtual StateReturnType onEnter() override { return STATE_SUCCESS; } + virtual StateReturnType update() override { return STATE_SUCCESS; } protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; }; EMPTY_DTOR(SuccessState) @@ -424,13 +424,13 @@ class FailureState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FailureState, "FailureState") public: FailureState( StateMachine *machine ) : State( machine, "FailureState") { } - virtual StateReturnType onEnter() { return STATE_FAILURE; } - virtual StateReturnType update() { return STATE_FAILURE; } + virtual StateReturnType onEnter() override { return STATE_FAILURE; } + virtual StateReturnType update() override { return STATE_FAILURE; } protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; }; EMPTY_DTOR(FailureState) @@ -444,13 +444,13 @@ class ContinueState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ContinueState, "ContinueState") public: ContinueState( StateMachine *machine ) : State( machine, "ContinueState" ) { } - virtual StateReturnType onEnter() { return STATE_CONTINUE; } - virtual StateReturnType update() { return STATE_CONTINUE; } + virtual StateReturnType onEnter() override { return STATE_CONTINUE; } + virtual StateReturnType update() override { return STATE_CONTINUE; } protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; }; EMPTY_DTOR(ContinueState) @@ -464,13 +464,13 @@ class SleepState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SleepState, "SleepState") public: SleepState( StateMachine *machine ) : State( machine, "SleepState" ) { } - virtual StateReturnType onEnter() { return STATE_SLEEP_FOREVER; } - virtual StateReturnType update() { return STATE_SLEEP_FOREVER; } + virtual StateReturnType onEnter() override { return STATE_SLEEP_FOREVER; } + virtual StateReturnType update() override { return STATE_SLEEP_FOREVER; } protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; }; EMPTY_DTOR(SleepState) diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Team.h b/GeneralsMD/Code/GameEngine/Include/Common/Team.h index d3eae038fa2..a9deba8c0d4 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Team.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Team.h @@ -60,9 +60,9 @@ class TeamRelationMap : public MemoryPoolObject, protected: - 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; }; @@ -168,9 +168,9 @@ class TeamTemplateInfo : public Snapshot 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; }; @@ -233,9 +233,9 @@ class Team : public MemoryPoolObject, 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; public: @@ -635,9 +635,9 @@ class TeamPrototype : public MemoryPoolObject, 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; private: @@ -680,12 +680,12 @@ class TeamFactory : public SubsystemInterface, public: TeamFactory(); - ~TeamFactory(); + virtual ~TeamFactory() override; // subsystem methods - virtual void init(); - virtual void reset(); - virtual void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; void clear(); void initFromSides(SidesList *sides); @@ -727,9 +727,9 @@ class TeamFactory : public SubsystemInterface, 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; private: diff --git a/GeneralsMD/Code/GameEngine/Include/Common/TerrainTypes.h b/GeneralsMD/Code/GameEngine/Include/Common/TerrainTypes.h index 2467e8f61cc..21829375a99 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/TerrainTypes.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/TerrainTypes.h @@ -213,11 +213,11 @@ class TerrainTypeCollection : public SubsystemInterface public: TerrainTypeCollection(); - ~TerrainTypeCollection(); + ~TerrainTypeCollection() override; - void init() { } - void reset() { } - void update() { } + virtual void init() override { } + virtual void reset() override { } + virtual void update() override { } TerrainType *findTerrain( AsciiString name ); ///< find terrain by name TerrainType *newTerrain( AsciiString name ); ///< allocate a new terrain diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ThingFactory.h b/GeneralsMD/Code/GameEngine/Include/Common/ThingFactory.h index 411ce955bf7..e1b29581c64 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ThingFactory.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ThingFactory.h @@ -54,13 +54,13 @@ class ThingFactory : public SubsystemInterface public: ThingFactory(); - virtual ~ThingFactory(); + virtual ~ThingFactory() override; // From the subsystem interface ================================================================= - 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; //=============================================================================================== /// create a new template with name 'name' and add to template list diff --git a/GeneralsMD/Code/GameEngine/Include/Common/TunnelTracker.h b/GeneralsMD/Code/GameEngine/Include/Common/TunnelTracker.h index 90be5aea202..d9a7976a468 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/TunnelTracker.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/TunnelTracker.h @@ -75,9 +75,9 @@ class TunnelTracker : public MemoryPoolObject, protected: - 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; private: void updateFullHealTime(); diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h b/GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h index 1a30ef35518..71c7b36bd7f 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h @@ -131,9 +131,9 @@ class Upgrade : public MemoryPoolObject, 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; const UpgradeTemplate *m_template; ///< template this upgrade instance is based on UpgradeStatusType m_status; ///< status of upgrade @@ -231,11 +231,11 @@ class UpgradeCenter : public SubsystemInterface public: UpgradeCenter(); - virtual ~UpgradeCenter(); + virtual ~UpgradeCenter() override; - void init(); ///< subsystem interface - void reset(); ///< subsystem interface - void update() { } ///< subsystem interface + void init() override; ///< subsystem interface + void reset() override; ///< subsystem interface + void update() override { } ///< subsystem interface UpgradeTemplate *firstUpgradeTemplate(); ///< return the first upgrade template const UpgradeTemplate *findUpgradeByKey( NameKeyType key ) const; ///< find upgrade by name key diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h index 0cfed5c61d7..cdbe22c4c42 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h @@ -167,9 +167,9 @@ friend class Anim2DCollection; 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 { } void tryNextFrame(); ///< we've just drawn ... try to update our frame if necessary @@ -196,11 +196,11 @@ class Anim2DCollection : public SubsystemInterface public: Anim2DCollection(); - virtual ~Anim2DCollection(); + virtual ~Anim2DCollection() override; - virtual void init(); ///< initialize system - virtual void reset() { }; ///< reset system - virtual void update(); ///< update system + virtual void init() override; ///< initialize system + virtual void reset() override { }; ///< reset system + virtual void update() override; ///< update system Anim2DTemplate *findTemplate( const AsciiString& name ); ///< find animation template Anim2DTemplate *newTemplate( const AsciiString& name ); ///< allocate a new template to be loaded diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h b/GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h index 61e0c3d6e96..c5741f3fbf2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h @@ -163,12 +163,12 @@ class AnimateWindowManager : public SubsystemInterface { public: AnimateWindowManager(); - ~AnimateWindowManager(); + ~AnimateWindowManager() override; // Inhertited from subsystem ==================================================================== - virtual void init(); - virtual void reset(); - virtual void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; //=============================================================================================== void registerGameWindow(GameWindow *win, AnimTypes animType, Bool needsToFinish, UnsignedInt ms = 0, UnsignedInt delayMs = 0); // Registers a new window to animate. diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/CampaignManager.h b/GeneralsMD/Code/GameEngine/Include/GameClient/CampaignManager.h index 0c8fd9efe14..2ce69f80538 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/CampaignManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/CampaignManager.h @@ -118,9 +118,9 @@ class CampaignManager : public Snapshot ~CampaignManager(); // 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; void init(); Campaign *getCurrentCampaign(); ///< Returns a point to the current Campaign diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h b/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h index d7843bdd224..3d46fefa252 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h @@ -37,7 +37,7 @@ class CommandTranslator : public GameMessageTranslator public: CommandTranslator(); - ~CommandTranslator(); + virtual ~CommandTranslator() override; enum CommandEvaluateType { DO_COMMAND, DO_HINT, EVALUATE_ONLY }; @@ -65,7 +65,7 @@ class CommandTranslator : public GameMessageTranslator GameMessage::Type issueFireWeaponCommand( const CommandButton *command, CommandEvaluateType commandType, Drawable *target, const Coord3D *pos ); GameMessage::Type issueCombatDropCommand( const CommandButton *command, CommandEvaluateType commandType, Drawable *target, const Coord3D *pos ); - virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); + virtual GameMessageDisposition translateGameMessage(const GameMessage *msg) override; }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h index f93bc609fcf..c98ff132065 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h @@ -646,11 +646,11 @@ class ControlBar : public SubsystemInterface public: ControlBar(); - virtual ~ControlBar(); + virtual ~ControlBar() override; - virtual void init(); ///< from subsystem interface - virtual void reset(); ///< from subsystem interface - virtual void update(); ///< from subsystem interface + virtual void init() override; ///< from subsystem interface + virtual void reset() override; ///< from subsystem interface + virtual void update() override; ///< from subsystem interface /// mark the UI as dirty so the context of everything is re-evaluated void markUIDirty(); diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h b/GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h index 1dcc0af3ea4..e8e2c82971b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h @@ -110,18 +110,18 @@ class DebugDisplay : public DebugDisplayInterface public: DebugDisplay(); - virtual ~DebugDisplay() {}; - - virtual void printf( const Char *format, ...); ///< Print formatted text at current cursor position - virtual void setCursorPos( Int x, Int y ); ///< Set new cursor position - virtual Int getCursorXPos(); ///< Get current X position of cursor - virtual Int getCursorYPos(); ///< Get current Y position of cursor - virtual Int getWidth(); ///< Get character width of display - virtual Int getHeight(); ///< Get character height of display - virtual void setTextColor( Color color ); ///< set text color - virtual void setRightMargin( Int rightPos ); ///< set right margin position - virtual void setLeftMargin( Int leftPos ); ///< set left margin position - virtual void reset(); ///< Reset back to default settings + virtual ~DebugDisplay() override {}; + + virtual void printf( const Char *format, ...) override; ///< Print formatted text at current cursor position + virtual void setCursorPos( Int x, Int y ) override; ///< Set new cursor position + virtual Int getCursorXPos() override; ///< Get current X position of cursor + virtual Int getCursorYPos() override; ///< Get current Y position of cursor + virtual Int getWidth() override; ///< Get character width of display + virtual Int getHeight() override; ///< Get character height of display + virtual void setTextColor( Color color ) override; ///< set text color + virtual void setRightMargin( Int rightPos ) override; ///< set right margin position + virtual void setLeftMargin( Int leftPos ) override; ///< set left margin position + virtual void reset() override; ///< Reset back to default settings protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h index 4b02b8817e6..319b15dc651 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h @@ -64,11 +64,11 @@ class Display : public SubsystemInterface typedef void (DebugDisplayCallback)( DebugDisplayInterface *debugDisplay, void *userData, FILE *fp ); Display(); - virtual ~Display(); + virtual ~Display() override; - virtual void init() { }; ///< Initialize - virtual void reset(); ///< Reset system - virtual void update(); ///< Update system + virtual void init() override { }; ///< Initialize + virtual void reset() override; ///< Reset system + virtual void update() override; ///< Update system //--------------------------------------------------------------------------------------- // Display attribute methods @@ -114,7 +114,7 @@ class Display : public SubsystemInterface virtual void enableClipping( Bool onoff ) = 0; virtual void step() {}; ///< Do one fixed time step - virtual void draw(); ///< Redraw the entire display + virtual void draw() override; ///< Redraw the entire display virtual void setTimeOfDay( TimeOfDay tod ) = 0; ///< Set the time of day for this display virtual void createLightPulse( const Coord3D *pos, const RGBColor *color, Real innerRadius,Real attenuationWidth, UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime//, Bool donut = FALSE diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h index f5906db0859..e0e4707f93c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h @@ -181,9 +181,9 @@ class TintEnvelope : public MemoryPoolObject, public Snapshot 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; private: @@ -595,15 +595,15 @@ class Drawable : public Thing, 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; void xferDrawableModules( Xfer *xfer ); void startAmbientSound( BodyDamageType dt, TimeOfDay tod, Bool onlyIfPermanent = false ); - Drawable *asDrawableMeth() { return this; } - const Drawable *asDrawableMeth() const { return this; } + virtual Drawable *asDrawableMeth() override { return this; } + virtual const Drawable *asDrawableMeth() const override { return this; } Module** getModuleList(ModuleType i) { @@ -644,7 +644,7 @@ class Drawable : public Thing, void validatePos() const; #endif - virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle); + virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle) override; void updateHiddenStatus(); void replaceModelConditionStateInDrawable(); diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Eva.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Eva.h index d76d4858aa7..8d8acc370de 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Eva.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Eva.h @@ -178,12 +178,12 @@ class Eva : public SubsystemInterface public: Eva(); - virtual ~Eva(); + virtual ~Eva() override; public: // From SubsystemInterface - virtual void init(); - virtual void reset(); - virtual void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; static EvaMessage nameToMessage(const AsciiString& name); static AsciiString messageToName(EvaMessage message); diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GUICommandTranslator.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GUICommandTranslator.h index 93da04cf7d5..a4626d0eb0b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GUICommandTranslator.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GUICommandTranslator.h @@ -42,7 +42,7 @@ class GUICommandTranslator : public GameMessageTranslator public: GUICommandTranslator(); - ~GUICommandTranslator(); + ~GUICommandTranslator() override; - virtual GameMessageDisposition translateGameMessage( const GameMessage *msg ); + virtual GameMessageDisposition translateGameMessage( const GameMessage *msg ) override; }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameClient.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameClient.h index 7959a404cd7..a808ec2c75b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameClient.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameClient.h @@ -69,8 +69,8 @@ typedef std::vector DrawablePtrVector; class GameClientMessageDispatcher : public GameMessageTranslator { public: - virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); - virtual ~GameClientMessageDispatcher() { } + virtual GameMessageDisposition translateGameMessage(const GameMessage *msg) override; + virtual ~GameClientMessageDispatcher() override { } }; @@ -86,12 +86,12 @@ class GameClient : public SubsystemInterface, public: GameClient(); - virtual ~GameClient(); + virtual ~GameClient() override; // subsystem methods - virtual void init(); ///< Initialize resources - virtual void update(); ///< Updates the GUI, display, audio, etc - virtual void reset(); ///< reset system + virtual void init() override; ///< Initialize resources + virtual void update() override; ///< Updates the GUI, display, audio, etc + virtual void reset() override; ///< reset system virtual void setFrame( UnsignedInt frame ) { m_frame = frame; } ///< Set the GameClient's internal frame number virtual void registerDrawable( Drawable *draw ); ///< Given a drawable, register it with the GameClient and give it a unique ID @@ -159,9 +159,9 @@ class GameClient : public SubsystemInterface, 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; // @todo Should there be a separate GameClient frame counter? UnsignedInt m_frame; ///< Simulation frame number from server diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowManager.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowManager.h index 2d25e33b0d4..e976c6f5735 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowManager.h @@ -77,12 +77,12 @@ friend class GameWindow; public: GameWindowManager(); - virtual ~GameWindowManager(); + virtual ~GameWindowManager() override; //----------------------------------------------------------------------------------------------- - virtual void init(); ///< initialize function - virtual void reset(); ///< reset the system - virtual void update(); ///< update method, called once per frame + virtual void init() override; ///< initialize function + virtual void reset() override; ///< reset the system + virtual void update() override; ///< update method, called once per frame virtual GameWindow *allocateNewWindow() = 0; ///< new game window @@ -384,31 +384,31 @@ extern WindowMsgHandledType PassMessagesToParentSystem( GameWindow *window, class GameWindowManagerDummy : public GameWindowManager { public: - virtual GameWindow *winGetWindowFromId(GameWindow *window, Int id); - virtual GameWindow *winCreateFromScript(AsciiString filenameString, WindowLayoutInfo *info); - - virtual GameWindow *allocateNewWindow() { return newInstance(GameWindowDummy); } - - virtual GameWinDrawFunc getPushButtonImageDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getPushButtonDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getCheckBoxImageDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getCheckBoxDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getRadioButtonImageDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getRadioButtonDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getTabControlImageDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getTabControlDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getListBoxImageDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getListBoxDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getComboBoxImageDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getComboBoxDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getHorizontalSliderImageDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getHorizontalSliderDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getVerticalSliderImageDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getVerticalSliderDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getProgressBarImageDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getProgressBarDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getStaticTextImageDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getStaticTextDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getTextEntryImageDrawFunc() { return nullptr; } - virtual GameWinDrawFunc getTextEntryDrawFunc() { return nullptr; } + virtual GameWindow *winGetWindowFromId(GameWindow *window, Int id) override; + virtual GameWindow *winCreateFromScript(AsciiString filenameString, WindowLayoutInfo *info) override; + + virtual GameWindow *allocateNewWindow() override { return newInstance(GameWindowDummy); } + + virtual GameWinDrawFunc getPushButtonImageDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getPushButtonDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getCheckBoxImageDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getCheckBoxDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getRadioButtonImageDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getRadioButtonDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getTabControlImageDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getTabControlDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getListBoxImageDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getListBoxDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getComboBoxImageDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getComboBoxDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getHorizontalSliderImageDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getHorizontalSliderDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getVerticalSliderImageDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getVerticalSliderDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getProgressBarImageDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getProgressBarDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getStaticTextImageDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getStaticTextDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getTextEntryImageDrawFunc() override { return nullptr; } + virtual GameWinDrawFunc getTextEntryDrawFunc() override { return nullptr; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/HintSpy.h b/GeneralsMD/Code/GameEngine/Include/GameClient/HintSpy.h index e8c45b0d030..ada5761f05e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/HintSpy.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/HintSpy.h @@ -33,6 +33,6 @@ class HintSpyTranslator : public GameMessageTranslator { public: - virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); - virtual ~HintSpyTranslator() { } + virtual GameMessageDisposition translateGameMessage(const GameMessage *msg) override; + virtual ~HintSpyTranslator() override { } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/HotKey.h b/GeneralsMD/Code/GameEngine/Include/GameClient/HotKey.h index c968b671ca5..be9445cf771 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/HotKey.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/HotKey.h @@ -66,8 +66,8 @@ class GameWindow; class HotKeyTranslator : public GameMessageTranslator { public: - virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); - virtual ~HotKeyTranslator() { } + virtual GameMessageDisposition translateGameMessage(const GameMessage *msg) override; + virtual ~HotKeyTranslator() override { } }; //----------------------------------------------------------------------------- @@ -85,11 +85,11 @@ class HotKeyManager : public SubsystemInterface { public: HotKeyManager(); - ~HotKeyManager(); + ~HotKeyManager() override; // Inherited from subsystem interface ----------------------------------------------------------- - virtual void init(); ///< Initialize the Hotkey system - virtual void update() {} ///< A No-op for us - virtual void reset(); ///< Reset + virtual void init() override; ///< Initialize the Hotkey system + virtual void update() override {} ///< A No-op for us + virtual void reset() override; ///< Reset //----------------------------------------------------------------------------------------------- void addHotKey( GameWindow *win, const AsciiString& key); diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Image.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Image.h index 51fe4dfeb36..07b72c91928 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Image.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Image.h @@ -121,11 +121,11 @@ class ImageCollection : public SubsystemInterface public: ImageCollection(); - virtual ~ImageCollection(); + virtual ~ImageCollection() override; - virtual void init() { }; ///< initialize system - virtual void reset() { }; ///< reset system - virtual void update() { }; ///< update system + virtual void init() override { }; ///< initialize system + virtual void reset() override { }; ///< reset system + virtual void update() override { }; ///< update system void load( Int textureSize ); ///< load images diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h b/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h index 2ed0c91abfd..47ec2f07e88 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h @@ -362,12 +362,12 @@ friend class Drawable; // for selection/deselection transactions }; InGameUI(); - virtual ~InGameUI(); + virtual ~InGameUI() override; // Inherited from subsystem interface ----------------------------------------------------------- - virtual void init(); ///< Initialize the in-game user interface - virtual void update(); ///< Update the UI by calling preDraw(), draw(), and postDraw() - virtual void reset(); ///< Reset + virtual void init() override; ///< Initialize the in-game user interface + virtual void update() override; ///< Update the UI by calling preDraw(), draw(), and postDraw() + virtual void reset() override; ///< Reset //----------------------------------------------------------------------------------------------- // interface for the popup messages @@ -470,7 +470,7 @@ friend class Drawable; // for selection/deselection transactions virtual void disregardDrawable( Drawable *draw ); ///< Drawable is being destroyed, clean up any UI elements associated with it virtual void preDraw(); ///< Logic which needs to occur before the UI renders - virtual void draw() = 0; ///< Render the in-game user interface + virtual void draw() override = 0; ///< Render the in-game user interface virtual void postDraw(); ///< Logic which needs to occur after the UI renders virtual void postWindowDraw(); ///< Logic which needs to occur after the WindowManager has repainted the menus @@ -620,9 +620,9 @@ friend class Drawable; // for selection/deselection transactions 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: diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/LookAtXlat.h b/GeneralsMD/Code/GameEngine/Include/GameClient/LookAtXlat.h index 92472aa09c9..eec10e8dcc9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/LookAtXlat.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/LookAtXlat.h @@ -46,9 +46,9 @@ class LookAtTranslator : public GameMessageTranslator { public: LookAtTranslator(); - ~LookAtTranslator(); + virtual ~LookAtTranslator() override; - virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); + virtual GameMessageDisposition translateGameMessage(const GameMessage *msg) override; virtual const ICoord2D* getRMBScrollAnchor(); // get m_anchor ICoord2D if we're RMB scrolling Bool hasMouseMovedRecently(); void setCurrentPos( const ICoord2D& pos ); diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h b/GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h index 3d1013758d5..fed637c54ca 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h @@ -364,8 +364,8 @@ class MetaEventTranslator : public GameMessageTranslator public: MetaEventTranslator(); - ~MetaEventTranslator(); - virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); + virtual ~MetaEventTranslator() override; + virtual GameMessageDisposition translateGameMessage(const GameMessage *msg) override; }; //----------------------------------------------------------------------------- @@ -383,11 +383,11 @@ class MetaMap : public SubsystemInterface public: MetaMap(); - ~MetaMap(); + virtual ~MetaMap() override; - void init() { } - void reset() { } - void update() { } + virtual void init() override { } + virtual void reset() override { } + virtual void update() override { } static void parseMetaMap(INI* ini); diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h index 99de556f399..6815b788d98 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h @@ -47,7 +47,7 @@ class AnimatedParticleSysBoneClientUpdate : public ClientUpdateModule // virtual destructor prototype provided by memory pool declaration /// the client update callback - virtual void clientUpdate(); + virtual void clientUpdate() override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h index f5f6926929c..2ddd7d9061a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h @@ -44,7 +44,7 @@ class BeaconClientUpdateModuleData : public ClientUpdateModuleData UnsignedInt m_radarPulseDuration; BeaconClientUpdateModuleData(); - ~BeaconClientUpdateModuleData(); + virtual ~BeaconClientUpdateModuleData() override; static void buildFieldParse(MultiIniFieldParse& p); }; @@ -63,7 +63,7 @@ class BeaconClientUpdate : public ClientUpdateModule // virtual destructor prototype provided by memory pool declaration /// the client update callback - virtual void clientUpdate(); + virtual void clientUpdate() override; void hideBeacon(); protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h index 400709f289c..5670afa2eaa 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h @@ -50,7 +50,7 @@ class SwayClientUpdate : public ClientUpdateModule // virtual destructor prototype provided by memory pool declaration /// the client update callback - virtual void clientUpdate(); + virtual void clientUpdate() override; void stopSway() { m_swaying = false; } diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h b/GeneralsMD/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h index 188173300dd..d4f0c8e458f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h @@ -37,6 +37,6 @@ class PlaceEventTranslator : public GameMessageTranslator public: PlaceEventTranslator(); - ~PlaceEventTranslator(); - virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); + virtual ~PlaceEventTranslator() override; + virtual GameMessageDisposition translateGameMessage(const GameMessage *msg) override; }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/RayEffect.h b/GeneralsMD/Code/GameEngine/Include/GameClient/RayEffect.h index 4ada0dd97bc..c742c896811 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/RayEffect.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/RayEffect.h @@ -57,11 +57,11 @@ class RayEffectSystem : public SubsystemInterface public: RayEffectSystem(); - ~RayEffectSystem(); + ~RayEffectSystem() override; - virtual void init(); - virtual void reset(); - virtual void update() { } + virtual void init() override; + virtual void reset() override; + virtual void update() override { } /// add a ray effect entry for this drawable void addRayEffect( const Drawable *draw, const Coord3D *startLoc, const Coord3D *endLoc ); diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h b/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h index 79334bb0049..bf9900a9f42 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h @@ -62,8 +62,8 @@ class SelectionTranslator : public GameMessageTranslator public: SelectionTranslator(); - ~SelectionTranslator(); - virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); + virtual ~SelectionTranslator() override; + virtual GameMessageDisposition translateGameMessage(const GameMessage *msg) override; //added for fix to the drag selection when entering control bar //changes the mode of drag selecting to it's opposite void setDragSelecting(Bool dragSelect); diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h index b67e5211ad6..381c44b86e5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h @@ -114,12 +114,12 @@ class Shell : public SubsystemInterface public: Shell(); - ~Shell(); + ~Shell() override; // Inhertited from subsystem ==================================================================== - virtual void init(); - virtual void reset(); - virtual void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; //=============================================================================================== void recreateWindowLayouts(); diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/WindowXlat.h b/GeneralsMD/Code/GameEngine/Include/GameClient/WindowXlat.h index ce1714939d7..9436123cfa7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/WindowXlat.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/WindowXlat.h @@ -36,6 +36,6 @@ class WindowTranslator : public GameMessageTranslator // nothing public: WindowTranslator(); - ~WindowTranslator(); - virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); + virtual ~WindowTranslator() override; + virtual GameMessageDisposition translateGameMessage(const GameMessage *msg) override; }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h index 87d3c1302d0..46659cab8f3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h @@ -147,9 +147,9 @@ class TAiData : public Snapshot void addFactionBuildList(AISideBuildList *buildList); // --------------- inherited from Snapshot interface -------------- - void crc( Xfer *xfer ); - void xfer( Xfer *xfer ); - void loadPostProcess(); + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; Real m_structureSeconds; // Try to build a structure every N seconds. Real m_teamSeconds; // Try to build a team every N seconds. @@ -247,11 +247,11 @@ class AI : public SubsystemInterface, public Snapshot { public: AI(); - ~AI(); + ~AI() override; - virtual void init(); ///< initialize AI to default values - virtual void reset(); ///< reset the AI system to prepare for a new map - virtual void update(); ///< do one frame of AI computation + virtual void init() override; ///< initialize AI to default values + virtual void reset() override; ///< reset the AI system to prepare for a new map + virtual void update() override; ///< do one frame of AI computation Pathfinder *pathfinder() { return m_pathfinder; } ///< public access to the pathfind system enum @@ -271,9 +271,9 @@ class AI : public SubsystemInterface, public Snapshot Object *findClosestAlly( const Object *me, Real range, UnsignedInt qualifiers); // --------------- inherited from Snapshot interface -------------- - void crc( Xfer *xfer ); - void xfer( Xfer *xfer ); - void loadPostProcess(); + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; // AI Groups ----------------------------------------------------------------------------------------------- AIGroupPtr createGroup(); ///< instantiate a new AI Group @@ -891,9 +891,9 @@ class AIGroup : public MemoryPoolObject, public Snapshot public: // --------------- inherited from Snapshot interface -------------- - void crc( Xfer *xfer ); - void xfer( Xfer *xfer ); - void loadPostProcess(); + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; #if !RETAIL_COMPATIBLE_AIGROUP void Add_Ref() const { m_refCount.Add_Ref(); } diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIDock.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIDock.h index 7506ad8df71..77c5591642f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIDock.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIDock.h @@ -62,15 +62,15 @@ class AIDockMachine : public StateMachine AIDockMachine( Object *owner ); static Bool ableToAdvance( State *thisState, void* userData ); // Condition for scooting forward in line while waiting - virtual void halt(); ///< Stops the state machine & disables it in preparation for deleting it. + virtual void halt() override; ///< Stops the state machine & disables it in preparation for deleting it. Int m_approachPosition; ///< The Approach Position I am holding, to make scoot forward checks quicker. protected: // snapshot interface - 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; }; @@ -82,14 +82,14 @@ class AIDockApproachState : public AIInternalMoveToState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockApproachState, "AIDockApproachState") public: AIDockApproachState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockApproachState" ) { } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: // snapshot interface STUBBED. - 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{}; }; EMPTY_DTOR(AIDockApproachState) @@ -99,16 +99,16 @@ class AIDockWaitForClearanceState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockWaitForClearanceState, "AIDockWaitForClearanceState") public: AIDockWaitForClearanceState( StateMachine *machine ) : State( machine, "AIDockWaitForClearanceState" ), m_enterFrame(0) { } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: UnsignedInt m_enterFrame; protected: // snapshot interface STUBBED. - 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{}; }; EMPTY_DTOR(AIDockWaitForClearanceState) @@ -118,9 +118,9 @@ class AIDockAdvancePositionState : public AIInternalMoveToState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockAdvancePositionState, "AIDockAdvancePositionState") public: AIDockAdvancePositionState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockApproachState" ) { } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; }; EMPTY_DTOR(AIDockAdvancePositionState) @@ -130,9 +130,9 @@ class AIDockMoveToEntryState : public AIInternalMoveToState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToEntryState, "AIDockMoveToEntryState") public: AIDockMoveToEntryState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockMoveToEntryState" ) { } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; }; EMPTY_DTOR(AIDockMoveToEntryState) @@ -142,9 +142,9 @@ class AIDockMoveToDockState : public AIInternalMoveToState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToDockState, "AIDockMoveToDockState") public: AIDockMoveToDockState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockMoveToDockState" ) { } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; }; EMPTY_DTOR(AIDockMoveToDockState) @@ -154,9 +154,9 @@ class AIDockMoveToRallyState : public AIInternalMoveToState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToRallyState, "AIDockMoveToRallyState") public: AIDockMoveToRallyState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockMoveToRallyState" ) { } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; }; EMPTY_DTOR(AIDockMoveToRallyState) @@ -166,9 +166,9 @@ class AIDockProcessDockState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockProcessDockState, "AIDockProcessDockState") public: AIDockProcessDockState( StateMachine *machine ); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; void setNextDockActionFrame();//This puts a delay between callings of Action to tweak the speed of docking. UnsignedInt m_nextDockActionFrame;// In the unlikely event of saving a game in the middle of docking, you may @@ -177,9 +177,9 @@ class AIDockProcessDockState : public State protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; private: ObjectID m_droneID; ///< If I have a drone, the drone will get repaired too. @@ -193,9 +193,9 @@ class AIDockMoveToExitState : public AIInternalMoveToState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToExitState, "AIDockMoveToExitState") public: AIDockMoveToExitState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockMoveToExitState" ) { } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; }; EMPTY_DTOR(AIDockMoveToExitState) diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h index aa5d14a9097..640c4329935 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h @@ -81,7 +81,7 @@ class ExitConditions : public AttackExitConditionsInterface m_center.zero(); } - virtual Bool shouldExit(const StateMachine* machine) const; + virtual Bool shouldExit(const StateMachine* machine) const override; }; @@ -101,9 +101,9 @@ class AIGuardMachine : public StateMachine protected: // snapshot interface - 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; public: /** @@ -141,15 +141,15 @@ class AIGuardInnerState : public State m_attackState = nullptr; m_enterState = nullptr; } - virtual Bool isAttack() const { return m_attackState ? m_attackState->isAttack() : FALSE; } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual Bool isAttack() const override { return m_attackState ? m_attackState->isAttack() : FALSE; } + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: AIGuardMachine* getGuardMachine() { return (AIGuardMachine*)getMachine(); } @@ -164,16 +164,16 @@ class AIGuardIdleState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardIdleState, "AIGuardIdleState") public: AIGuardIdleState( StateMachine *machine ) : State( machine, "AIGuardIdleState" ) { } - virtual Bool isAttack() const { return FALSE; } - virtual Bool isGuardIdle() const { return TRUE; } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual Bool isAttack() const override { return FALSE; } + virtual Bool isGuardIdle() const override { return TRUE; } + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: AIGuardMachine* getGuardMachine() { return (AIGuardMachine*)getMachine(); } @@ -191,15 +191,15 @@ class AIGuardOuterState : public State { m_attackState = nullptr; } - virtual Bool isAttack() const { return m_attackState ? m_attackState->isAttack() : FALSE; } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual Bool isAttack() const override { return m_attackState ? m_attackState->isAttack() : FALSE; } + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: AIGuardMachine* getGuardMachine() { return (AIGuardMachine*)getMachine(); } @@ -218,15 +218,15 @@ class AIGuardReturnState : public AIInternalMoveToState { m_nextReturnScanTime = 0; } - virtual Bool isAttack() const { return FALSE; } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual Bool isAttack() const override { return FALSE; } + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: UnsignedInt m_nextReturnScanTime; }; @@ -239,10 +239,10 @@ class AIGuardPickUpCrateState : public AIPickUpCrateState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardPickUpCrateState, "AIGuardPickUpCrateState") public: AIGuardPickUpCrateState( StateMachine *machine ); - virtual Bool isAttack() const { return FALSE; } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual Bool isAttack() const override { return FALSE; } + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; }; EMPTY_DTOR(AIGuardPickUpCrateState) @@ -252,15 +252,15 @@ class AIGuardAttackAggressorState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardAttackAggressorState, "AIGuardAttackAggressorState") public: AIGuardAttackAggressorState( StateMachine *machine ); - virtual Bool isAttack() const { return m_attackState ? m_attackState->isAttack() : FALSE; } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual Bool isAttack() const override { return m_attackState ? m_attackState->isAttack() : FALSE; } + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: AIGuardMachine* getGuardMachine() { return (AIGuardMachine*)getMachine(); } ExitConditions m_exitConditions; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h index 9141d44f07b..2ba2dca5030 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h @@ -79,7 +79,7 @@ class GuardRetaliateExitConditions : public AttackExitConditionsInterface m_center.zero(); } - virtual Bool shouldExit(const StateMachine* machine) const; + virtual Bool shouldExit(const StateMachine* machine) const override; }; @@ -96,9 +96,9 @@ class AIGuardRetaliateMachine : public StateMachine protected: // snapshot interface - 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; public: /** @@ -130,14 +130,14 @@ class AIGuardRetaliateInnerState : public State m_attackState = 0; m_enterState = 0; } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: AIGuardRetaliateMachine* getGuardMachine() { return (AIGuardRetaliateMachine*)getMachine(); } @@ -152,14 +152,14 @@ class AIGuardRetaliateIdleState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardRetaliateIdleState, "AIGuardRetaliateIdleState") public: AIGuardRetaliateIdleState( StateMachine *machine ) : State( machine, "AIGuardRetaliateIdleState" ) { } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: AIGuardRetaliateMachine* getGuardMachine() { return (AIGuardRetaliateMachine*)getMachine(); } @@ -177,14 +177,14 @@ class AIGuardRetaliateOuterState : public State { m_attackState = nullptr; } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: AIGuardRetaliateMachine* getGuardMachine() { return (AIGuardRetaliateMachine*)getMachine(); } @@ -203,14 +203,14 @@ class AIGuardRetaliateReturnState : public AIInternalMoveToState { m_nextReturnScanTime = 0; } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: UnsignedInt m_nextReturnScanTime; }; @@ -223,9 +223,9 @@ class AIGuardRetaliatePickUpCrateState : public AIPickUpCrateState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardRetaliatePickUpCrateState, "AIGuardRetaliatePickUpCrateState") public: AIGuardRetaliatePickUpCrateState( StateMachine *machine ); - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; }; EMPTY_DTOR(AIGuardRetaliatePickUpCrateState) @@ -235,17 +235,17 @@ class AIGuardRetaliateAttackAggressorState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardRetaliateAttackAggressorState, "AIGuardRetaliateAttackAggressorState") public: AIGuardRetaliateAttackAggressorState( StateMachine *machine ); - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; #ifdef STATE_MACHINE_DEBUG virtual AsciiString getName() const ; #endif protected: // snapshot interface - 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; private: AIGuardRetaliateMachine* getGuardMachine() { return (AIGuardRetaliateMachine*)getMachine(); } GuardRetaliateExitConditions m_exitConditions; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h index 23ccf5ab2cd..4e9b69f8151 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h @@ -68,9 +68,9 @@ class WorkOrder : public MemoryPoolObject, 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; }; @@ -99,9 +99,9 @@ class TeamInQueue : public MemoryPoolObject, 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; public: @@ -213,9 +213,9 @@ class AIPlayer : public MemoryPoolObject, 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; virtual void doBaseBuilding(); virtual void checkReadyTeams(); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h index 5a14daeaa87..a89b6f7d631 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h @@ -45,56 +45,56 @@ class AISkirmishPlayer : public AIPlayer public: // AISkirmish specific methods. AISkirmishPlayer( Player *p ); ///< constructor - virtual Bool computeSuperweaponTarget(const SpecialPowerTemplate *power, Coord3D *pos, Int playerNdx, Real weaponRadius); ///< Calculates best pos for weapon given radius. + virtual Bool computeSuperweaponTarget(const SpecialPowerTemplate *power, Coord3D *pos, Int playerNdx, Real weaponRadius) override; ///< Calculates best pos for weapon given radius. public: // AIPlayer interface methods. - virtual void update(); ///< simulates the behavior of a player + virtual void update() override; ///< simulates the behavior of a player - virtual void newMap(); ///< New map loaded call. + virtual void newMap() override; ///< New map loaded call. /// Invoked when a unit I am training comes into existence - virtual void onUnitProduced( Object *factory, Object *unit ); + virtual void onUnitProduced( Object *factory, Object *unit ) override; - virtual void buildSpecificAITeam(TeamPrototype *teamProto, Bool priorityBuild); ///< Builds this team immediately. + virtual void buildSpecificAITeam(TeamPrototype *teamProto, Bool priorityBuild) override; ///< Builds this team immediately. - virtual void buildSpecificAIBuilding(const AsciiString &thingName); ///< Builds this building as soon as possible. + virtual void buildSpecificAIBuilding(const AsciiString &thingName) override; ///< Builds this building as soon as possible. - virtual void buildAIBaseDefense(Bool flank); ///< Builds base defense on front or flank of base. + virtual void buildAIBaseDefense(Bool flank) override; ///< Builds base defense on front or flank of base. - virtual void buildAIBaseDefenseStructure(const AsciiString &thingName, Bool flank); ///< Builds base defense on front or flank of base. + virtual void buildAIBaseDefenseStructure(const AsciiString &thingName, Bool flank) override; ///< Builds base defense on front or flank of base. - virtual void recruitSpecificAITeam(TeamPrototype *teamProto, Real recruitRadius); ///< Builds this team immediately. + virtual void recruitSpecificAITeam(TeamPrototype *teamProto, Real recruitRadius) override; ///< Builds this team immediately. - virtual Bool isSkirmishAI() {return true;} + virtual Bool isSkirmishAI() override {return true;} - virtual Bool checkBridges(Object *unit, Waypoint *way); + virtual Bool checkBridges(Object *unit, Waypoint *way) override; - virtual Player *getAiEnemy(); ///< Solo AI attacks based on scripting. Only skirmish auto-acquires an enemy at this point. jba. + virtual Player *getAiEnemy() override; ///< Solo AI attacks based on scripting. Only skirmish auto-acquires an enemy at this point. jba. 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; - virtual void doBaseBuilding(); - virtual void checkReadyTeams(); - virtual void checkQueuedTeams(); - virtual void doTeamBuilding(); - virtual Object *findDozer(const Coord3D *pos); - virtual void queueDozer(); + virtual void doBaseBuilding() override; + virtual void checkReadyTeams() override; + virtual void checkQueuedTeams() override; + virtual void doTeamBuilding() override; + virtual Object *findDozer(const Coord3D *pos) override; + virtual void queueDozer() override; protected: - virtual Bool selectTeamToBuild(); ///< determine the next team to build - virtual Bool selectTeamToReinforce( Int minPriority ); ///< determine the next team to reinforce - virtual Bool startTraining( WorkOrder *order, Bool busyOK, AsciiString teamName); ///< find a production building that can handle the order, and start building + virtual Bool selectTeamToBuild() override; ///< determine the next team to build + virtual Bool selectTeamToReinforce( Int minPriority ) override; ///< determine the next team to reinforce + virtual Bool startTraining( WorkOrder *order, Bool busyOK, AsciiString teamName) override; ///< find a production building that can handle the order, and start building - virtual Bool isAGoodIdeaToBuildTeam( TeamPrototype *proto ); ///< return true if team should be built - virtual void processBaseBuilding(); ///< do base-building behaviors - virtual void processTeamBuilding(); ///< do team-building behaviors + virtual Bool isAGoodIdeaToBuildTeam( TeamPrototype *proto ) override; ///< return true if team should be built + virtual void processBaseBuilding() override; ///< do base-building behaviors + virtual void processTeamBuilding() override; ///< do team-building behaviors protected: void adjustBuildList(BuildListInfo *list); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h index 620cdeb94cf..8f86b5874da 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h @@ -136,9 +136,9 @@ class AIStateMachine : public StateMachine */ AIStateMachine( Object *owner, AsciiString name ); - virtual void clear(); - virtual StateReturnType resetToDefaultState(); - virtual StateReturnType setState( StateID newStateID ); + virtual void clear() override; + virtual StateReturnType resetToDefaultState() override; + virtual StateReturnType setState( StateID newStateID ) override; /// @todo Rethink state parameter passing. Continuing in this fashion will have a pile of params in the machine (MSB) void setGoalPath( std::vector* path ); @@ -161,16 +161,16 @@ class AIStateMachine : public StateMachine StateID getTemporaryState() const {return m_temporaryState?m_temporaryState->getID():INVALID_STATE_ID;} public: // overrides. - virtual StateReturnType updateStateMachine(); ///< run one step of the machine + virtual StateReturnType updateStateMachine() override; ///< run one step of the machine #ifdef STATE_MACHINE_DEBUG virtual AsciiString getCurrentStateName() const ; #endif protected: // snapshot interface - 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; private: std::vector m_goalPath; ///< defines a simple path to follow @@ -202,9 +202,9 @@ enum StateType CPP_11(: Int) protected: // snapshot interface - 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; }; //----------------------------------------------------------------------------------------------------------- @@ -225,16 +225,16 @@ class AIIdleState : public State LOOK_FOR_TARGETS, DO_NOT_LOOK_FOR_TARGETS }; - virtual Bool isIdle() const { return true; } + virtual Bool isIdle() const override { return true; } AIIdleState( StateMachine *machine, AIIdleTargetingType shouldLookForTargets); - virtual StateReturnType onEnter(); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; protected: // snapshot interface - 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; }; EMPTY_DTOR(AIIdleState) @@ -258,9 +258,9 @@ class AIInternalMoveToState : public State m_goalLayer = LAYER_INVALID; } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: @@ -283,9 +283,9 @@ class AIInternalMoveToState : public State protected: // snapshot interface - 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; private: enum { MIN_REPATH_TIME = 10 }; ///< minimum # of frames must elapse before re-pathing @@ -318,15 +318,15 @@ class AIRappelState : public State Bool m_targetIsBldg; protected: // snapshot interface - 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; public: AIRappelState( StateMachine *machine ); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; }; EMPTY_DTOR(AIRappelState) @@ -339,15 +339,15 @@ class AIBusyState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIBusyState, "AIBusyState") public: AIBusyState( StateMachine *machine ) : State( machine, "AIBusyState" ) { } - virtual StateReturnType onEnter() { return STATE_CONTINUE; } - virtual void onExit( StateExitType status ) { } - virtual StateReturnType update() { return STATE_CONTINUE; } - virtual Bool isBusy() const { return true; } + virtual StateReturnType onEnter() override { return STATE_CONTINUE; } + virtual void onExit( StateExitType status ) override { } + virtual StateReturnType update() override { return STATE_CONTINUE; } + virtual Bool isBusy() const override { return true; } protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; }; EMPTY_DTOR(AIBusyState) @@ -363,9 +363,9 @@ class AIMoveToState : public AIInternalMoveToState Bool m_isMoveTo; public: AIMoveToState( StateMachine *machine ); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; }; EMPTY_DTOR(AIMoveToState) @@ -378,11 +378,11 @@ class AIMoveOutOfTheWayState : public AIInternalMoveToState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveOutOfTheWayState, "AIMoveOutOfTheWayState") public: AIMoveOutOfTheWayState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIMoveOutOfTheWayState" ) { } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: - virtual Bool computePath(); ///< compute the path + virtual Bool computePath() override; ///< compute the path }; EMPTY_DTOR(AIMoveOutOfTheWayState) @@ -405,17 +405,17 @@ class AIMoveAndTightenState : public AIInternalMoveToState m_checkForPath = false; m_okToRepathTimes = 0; } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; protected: - virtual Bool computePath(); ///< compute the path + virtual Bool computePath() override; ///< compute the path Int m_okToRepathTimes; Bool m_checkForPath; protected: // snapshot interface - 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; }; EMPTY_DTOR(AIMoveAndTightenState) @@ -428,11 +428,11 @@ class AIMoveAwayFromRepulsorsState : public AIMoveAndTightenState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveAwayFromRepulsorsState, "AIMoveAwayFromRepulsorsState") public: AIMoveAwayFromRepulsorsState( StateMachine *machine ) : AIMoveAndTightenState( machine, "AIMoveAwayFromRepulsors" ) { } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: - virtual Bool computePath(); ///< compute the path + virtual Bool computePath() override; ///< compute the path }; EMPTY_DTOR(AIMoveAwayFromRepulsorsState) @@ -455,18 +455,18 @@ class AIAttackApproachTargetState : public AIInternalMoveToState // we're setting m_isInitialApproach to true in the constructor because we want the first pass // through this state to allow a unit to attack incidental targets (if it is turreted) } - virtual Bool isAttack() const { return TRUE; } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual Bool isAttack() const override { return TRUE; } + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: - virtual Bool computePath(); ///< compute the path + virtual Bool computePath() override; ///< compute the path protected: // snapshot interface - 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; private: @@ -504,18 +504,18 @@ class AIAttackPursueTargetState : public AIInternalMoveToState // we're setting m_isInitialApproach to true in the constructor because we want the first pass // through this state to allow a unit to attack incidental targets (if it is turreted) } - virtual Bool isAttack() const { return TRUE; } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual Bool isAttack() const override { return TRUE; } + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: - virtual Bool computePath(); ///< compute the path + virtual Bool computePath() override; ///< compute the path protected: // snapshot interface - 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; private: @@ -547,19 +547,19 @@ class AIPickUpCrateState : public AIInternalMoveToState // we're setting m_isInitialApproach to true in the constructor because we want the first pass // through this state to allow a unit to attack incidental targets (if it is turreted) } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: - virtual Bool computePath(); ///< compute the path + virtual Bool computePath() override; ///< compute the path private: Int m_delayCounter; protected: // snapshot interface - 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; }; EMPTY_DTOR(AIPickUpCrateState) @@ -574,10 +574,10 @@ EMPTY_DTOR(AIPickUpCrateState) AIAttackMoveToState( StateMachine *machine ); //virtual ~AIAttackMoveToState(); - virtual Bool isAttack() const { return m_attackMoveMachine ? m_attackMoveMachine->isInAttackState() : FALSE; } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual Bool isAttack() const override { return m_attackMoveMachine ? m_attackMoveMachine->isInAttackState() : FALSE; } + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; #ifdef STATE_MACHINE_DEBUG virtual AsciiString getName() const ; #endif @@ -591,9 +591,9 @@ EMPTY_DTOR(AIPickUpCrateState) Int m_retryCount; protected: // snapshot interface - 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; }; //----------------------------------------------------------------------------------------------------------- @@ -615,15 +615,15 @@ class AIFollowWaypointPathState : public AIInternalMoveToState { m_angle = 0.0f; } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: // snapshot interface - 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: Coord2D m_groupOffset; @@ -657,15 +657,15 @@ class AIFollowWaypointPathExactState : public AIInternalMoveToState AIFollowWaypointPathExactState( StateMachine *machine, Bool asGroup ) : m_moveAsGroup(asGroup), m_lastWaypoint(nullptr), AIInternalMoveToState( machine, "AIFollowWaypointPathExactState" ) { } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: // snapshot interface - 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: const Waypoint *m_lastWaypoint; @@ -684,11 +684,11 @@ class AIAttackFollowWaypointPathState : public AIFollowWaypointPathState AIAttackFollowWaypointPathState( StateMachine *machine, Bool asGroup ); //virtual ~AIAttackFollowWaypointPathState(); - virtual Bool isAttack() const { return m_attackFollowMachine ? m_attackFollowMachine->isInAttackState() : FALSE; } + virtual Bool isAttack() const override { return m_attackFollowMachine ? m_attackFollowMachine->isInAttackState() : FALSE; } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; #ifdef STATE_MACHINE_DEBUG virtual AsciiString getName() const ; #endif @@ -698,9 +698,9 @@ class AIAttackFollowWaypointPathState : public AIFollowWaypointPathState StateMachine *m_attackFollowMachine; protected: // snapshot interface - 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; }; //----------------------------------------------------------------------------------------------------------- @@ -719,15 +719,15 @@ class AIWanderState : public AIFollowWaypointPathState m_timer = 0; m_waitFrames = 0; } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: // snapshot interface - 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_waitFrames; @@ -749,15 +749,15 @@ class AIWanderInPlaceState : public AIInternalMoveToState m_waitFrames = 0; m_timer = 0; } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: // snapshot interface - 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: void computeWanderGoal(); @@ -781,14 +781,14 @@ class AIPanicState : public AIFollowWaypointPathState setName("AIPanicState"); #endif } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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_waitFrames; @@ -811,9 +811,9 @@ class AIFollowPathState : public AIInternalMoveToState m_index(0), m_retryCount(10), AIInternalMoveToState( machine, name ) { } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: @@ -823,9 +823,9 @@ class AIFollowPathState : public AIInternalMoveToState protected: // snapshot interface - 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; private: Int m_index; ///< current path index @@ -847,14 +847,14 @@ class AIMoveAndEvacuateState : public AIInternalMoveToState { m_origin.zero(); } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: // snapshot interface - 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; private: Coord3D m_origin; ///< current position - set as goal on exit in case we follow with MoveToAndDelete. @@ -873,14 +873,14 @@ class AIMoveAndDeleteState : public AIInternalMoveToState { m_appendGoalPosition = FALSE; } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: // snapshot interface - 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: Bool m_appendGoalPosition; @@ -900,15 +900,15 @@ class AIAttackAimAtTargetState : public State m_setLocomotor(false) { } - virtual Bool isAttack() const { return TRUE; } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual Bool isAttack() const override { return TRUE; } + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: // snapshot interface - 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; private: const Bool m_isAttackingObject; Bool m_canTurnInPlace; @@ -923,12 +923,12 @@ class AIWaitState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIWaitState, "AIWaitState") public: AIWaitState( StateMachine *machine ) : State( machine,"AIWaitState" ) { } - virtual StateReturnType update(); + virtual StateReturnType update() override; protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; }; EMPTY_DTOR(AIWaitState) @@ -953,15 +953,15 @@ class AIAttackFireWeaponState : public State m_att(att) { } - virtual Bool isAttack() const { return TRUE; } - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); - virtual StateReturnType onEnter(); + virtual Bool isAttack() const override { return TRUE; } + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType onEnter() override; protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; private: NotifyWeaponFiredInterface *const m_att; // this is NOT owned by us and should not be freed }; @@ -983,16 +983,16 @@ class AIAttackState : public State, public NotifyWeaponFiredInterface AIAttackState( StateMachine *machine, Bool follow, Bool attackingObject, Bool forceAttacking, AttackExitConditionsInterface* attackParameters); //~AIAttackState(); - virtual Bool isAttack() const { return TRUE; } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual Bool isAttack() const override { return TRUE; } + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; - virtual void notifyFired() { /* nothing */ } - virtual void notifyNewVictimChosen(Object* victim); - virtual const Coord3D* getOriginalVictimPos() const { return &m_originalVictimPos; } - virtual Bool isWeaponSlotOkToFire(WeaponSlotType wslot) const { return true; } - virtual Bool isAttackingObject() const { return m_isAttackingObject; } + virtual void notifyFired() override { /* nothing */ } + virtual void notifyNewVictimChosen(Object* victim) override; + virtual const Coord3D* getOriginalVictimPos() const override { return &m_originalVictimPos; } + virtual Bool isWeaponSlotOkToFire(WeaponSlotType wslot) const override { return true; } + virtual Bool isAttackingObject() const override { return m_isAttackingObject; } virtual Bool isForceAttacking() const { return m_isForceAttacking; } #ifdef STATE_MACHINE_DEBUG virtual AsciiString getName() const ; @@ -1000,9 +1000,9 @@ class AIAttackState : public State, public NotifyWeaponFiredInterface protected: // snapshot interface - 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; private: @@ -1027,10 +1027,10 @@ class AIAttackSquadState : public State State( machine , "AIAttackSquadState") { } //~AIAttackSquadState(); - virtual Bool isAttack() const { return m_attackSquadMachine ? m_attackSquadMachine->isInAttackState() : FALSE; } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual Bool isAttack() const override { return m_attackSquadMachine ? m_attackSquadMachine->isInAttackState() : FALSE; } + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; Object *chooseVictim(); #ifdef STATE_MACHINE_DEBUG virtual AsciiString getName() const ; @@ -1039,9 +1039,9 @@ class AIAttackSquadState : public State protected: // snapshot interface - 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; private: StateMachine *m_attackSquadMachine; ///< state sub-machine for attack behavior @@ -1053,14 +1053,14 @@ class AIDeadState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDeadState, "AIDeadState") public: AIDeadState( StateMachine *machine ) : State( machine, "AIDeadState" ) { } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; }; EMPTY_DTOR(AIDeadState) @@ -1071,19 +1071,19 @@ class AIDockState : public State public: AIDockState( StateMachine *machine ) : State( machine, "AIDockState" ), m_dockMachine(nullptr), m_usingPrecisionMovement(FALSE) { } //~AIDockState(); - virtual Bool isAttack() const { return m_dockMachine ? m_dockMachine->isInAttackState() : FALSE; } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual Bool isAttack() const override { return m_dockMachine ? m_dockMachine->isInAttackState() : FALSE; } + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; #ifdef STATE_MACHINE_DEBUG virtual AsciiString getName() const ; #endif protected: // snapshot interface - 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; private: StateMachine *m_dockMachine; ///< state sub-machine for docking behavior @@ -1100,14 +1100,14 @@ class AIEnterState : public AIInternalMoveToState ObjectID m_entryToClear; protected: // snapshot interface - 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; public: AIEnterState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIEnterState" ) { } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; }; EMPTY_DTOR(AIEnterState) @@ -1119,14 +1119,14 @@ class AIExitState : public State ObjectID m_entryToClear; protected: // snapshot interface - 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; public: AIExitState( StateMachine *machine ) : State( machine, "AIExitState" ) { } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; }; EMPTY_DTOR(AIExitState) @@ -1138,14 +1138,14 @@ class AIExitInstantlyState : public State ObjectID m_entryToClear; protected: // snapshot interface - 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; public: AIExitInstantlyState( StateMachine *machine ) : State( machine, "AIExitInstantlyState" ) { } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; }; EMPTY_DTOR(AIExitInstantlyState) @@ -1163,19 +1163,19 @@ class AIGuardState : public State m_guardMachine = nullptr; } //~AIGuardState(); - virtual Bool isAttack() const; - virtual Bool isGuardIdle() const; - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual Bool isAttack() const override; + virtual Bool isGuardIdle() const override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; #ifdef STATE_MACHINE_DEBUG virtual AsciiString getName() const ; #endif protected: // snapshot interface - 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; private: AIGuardMachine *m_guardMachine; ///< state sub-machine for guard behavior @@ -1191,18 +1191,18 @@ class AIGuardRetaliateState : public State public: AIGuardRetaliateState( StateMachine *machine ) : State( machine, "AIGuardRetaliateState" ), m_guardRetaliateMachine(nullptr) {} //~AIGuardRetaliateState(); - virtual Bool isAttack() const; - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual Bool isAttack() const override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; #ifdef STATE_MACHINE_DEBUG virtual AsciiString getName() const ; #endif protected: // snapshot interface - 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; private: AIGuardRetaliateMachine *m_guardRetaliateMachine; ///< state sub-machine for retaliate behavior @@ -1221,18 +1221,18 @@ class AITunnelNetworkGuardState : public State m_guardMachine = nullptr; } //~AIGuardState(); - virtual Bool isAttack() const; - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual Bool isAttack() const override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; #ifdef STATE_MACHINE_DEBUG virtual AsciiString getName() const ; #endif protected: // snapshot interface - 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; private: AITNGuardMachine *m_guardMachine; ///< state sub-machine for guard behavior @@ -1251,19 +1251,19 @@ class AIHuntState : public State m_nextEnemyScanTime = 0; } //~AIHuntState(); - virtual Bool isAttack() const; - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual Bool isAttack() const override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; #ifdef STATE_MACHINE_DEBUG virtual AsciiString getName() const ; #endif protected: // snapshot interface - 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; private: StateMachine* m_huntMachine; ///< state sub-machine for hunt behavior @@ -1282,19 +1282,19 @@ class AIAttackAreaState : public State AIAttackAreaState( StateMachine *machine ) : State( machine, "AIAttackAreaState" ), m_attackMachine(nullptr), m_nextEnemyScanTime(0) { } //~AIAttackAreaState(); - virtual Bool isAttack() const { return m_attackMachine ? m_attackMachine->isInAttackState() : FALSE; } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual Bool isAttack() const override { return m_attackMachine ? m_attackMachine->isInAttackState() : FALSE; } + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; #ifdef STATE_MACHINE_DEBUG virtual AsciiString getName() const ; #endif protected: // snapshot interface - 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; private: StateMachine *m_attackMachine; ///< state sub-machine for attack behavior @@ -1310,14 +1310,14 @@ class AIFaceState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIFaceState, "AIFaceState") public: AIFaceState( StateMachine *machine, Bool obj ) : State( machine, "AIFaceState" ), m_canTurnInPlace(false), m_obj(obj) { } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: // snapshot interface . - 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: const Bool m_obj; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AITNGuard.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AITNGuard.h index 276f304a760..4603d62a1fb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AITNGuard.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AITNGuard.h @@ -70,7 +70,7 @@ class TunnelNetworkExitConditions : public AttackExitConditionsInterface { } - virtual Bool shouldExit(const StateMachine* machine) const; + virtual Bool shouldExit(const StateMachine* machine) const override; }; @@ -88,9 +88,9 @@ class AITNGuardMachine : public StateMachine protected: // snapshot interface - 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; public: /** @@ -122,14 +122,14 @@ class AITNGuardInnerState : public State { m_attackState = nullptr; } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: AITNGuardMachine* getGuardMachine() { return (AITNGuardMachine*)getMachine(); } @@ -144,14 +144,14 @@ class AITNGuardIdleState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardIdleState, "AITNGuardIdleState") public: AITNGuardIdleState( StateMachine *machine ) : State( machine, "AITNGuardIdleState" ) { } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: AITNGuardMachine* getGuardMachine() { return (AITNGuardMachine*)getMachine(); } @@ -169,14 +169,14 @@ class AITNGuardOuterState : public State { m_attackState = nullptr; } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: AITNGuardMachine* getGuardMachine() { return (AITNGuardMachine*)getMachine(); } @@ -195,18 +195,18 @@ class AITNGuardReturnState : public AIEnterState { m_nextReturnScanTime = 0; } - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: UnsignedInt m_nextReturnScanTime; protected: // snapshot interface - 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; }; EMPTY_DTOR(AITNGuardReturnState) @@ -217,9 +217,9 @@ class AITNGuardPickUpCrateState : public AIPickUpCrateState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardPickUpCrateState, "AITNGuardPickUpCrateState") public: AITNGuardPickUpCrateState( StateMachine *machine ); - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; }; EMPTY_DTOR(AITNGuardPickUpCrateState) @@ -229,14 +229,14 @@ class AITNGuardAttackAggressorState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardAttackAggressorState, "AITNGuardAttackAggressorState") public: AITNGuardAttackAggressorState( StateMachine *machine ); - virtual StateReturnType onEnter(); - virtual StateReturnType update(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: AITNGuardMachine* getGuardMachine() { return (AITNGuardMachine*)getMachine(); } TunnelNetworkExitConditions m_exitConditions; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h index bd584b46a92..62ade9d5ee1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h @@ -99,11 +99,11 @@ class ArmorStore : public SubsystemInterface public: ArmorStore(); - ~ArmorStore(); + virtual ~ArmorStore() override; - void init() { } - void reset() { } - void update() { } + virtual void init() override { } + virtual void reset() override { } + virtual void update() override { } const ArmorTemplate* findArmorTemplate(NameKeyType namekey) const; /** diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/CaveSystem.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/CaveSystem.h index aad9dc9c0b0..348ad1b9150 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/CaveSystem.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/CaveSystem.h @@ -44,11 +44,11 @@ class CaveSystem : public SubsystemInterface, { public: CaveSystem(); - ~CaveSystem(); + virtual ~CaveSystem() override; - void init(); - void reset(); - void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; Bool canSwitchIndexToIndex( Int oldIndex, Int newIndex ); // If either Index has guys in it, no, you can't void registerNewCave( Int theIndex ); // All Caves are born with a default index, which could be new @@ -58,9 +58,9 @@ class CaveSystem : public SubsystemInterface, 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 { } private: std::vector m_tunnelTrackerVector;// A vector of pointers where the indexes are known by diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h index b40d4d2d7d5..b81d69be64d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h @@ -88,11 +88,11 @@ class CrateSystem : public SubsystemInterface { public: CrateSystem(); - ~CrateSystem(); + virtual ~CrateSystem() override; - void init(); - void reset(); - void update(){} + virtual void init() override; + virtual void reset() override; + virtual void update() override{} const CrateTemplate *findCrateTemplate(AsciiString name) const; CrateTemplate *friend_findCrateTemplate(AsciiString name); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h index 99288c6a28f..5f6b1859f28 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h @@ -297,9 +297,9 @@ class DamageInfoInput : public Snapshot 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 { } }; @@ -340,9 +340,9 @@ class DamageInfoOutput : public Snapshot 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 { } }; @@ -366,8 +366,8 @@ class DamageInfo : public Snapshot protected: - 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 { } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ExperienceTracker.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ExperienceTracker.h index 8025d0cb91f..e07c93f9bd9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ExperienceTracker.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ExperienceTracker.h @@ -63,9 +63,9 @@ class ExperienceTracker : public MemoryPoolObject, public Snapshot void setExperienceScalar( Real scalar ) { m_experienceScalar = scalar; } // --------------- inherited from Snapshot interface -------------- - void crc( Xfer *xfer ); - void xfer( Xfer *xfer ); - void loadPostProcess(); + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; private: Object* m_parent; ///< Object I am owned by diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/FiringTracker.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/FiringTracker.h index 237b009bb3e..cabe72e18f4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/FiringTracker.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/FiringTracker.h @@ -57,9 +57,9 @@ class FiringTracker : public UpdateModule Int getNumConsecutiveShotsAtVictim( const Object *victim ) const; /// this is never disabled, since we want disabled things to continue to slowly "spin down"... (srj) - virtual DisabledMaskType getDisabledTypesToProcess() const { return DISABLEDMASK_ALL; } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return DISABLEDMASK_ALL; } - virtual UpdateSleepTime update(); ///< See if spin down is needed because we haven't shot in a while + virtual UpdateSleepTime update() override; ///< See if spin down is needed because we haven't shot in a while protected: @@ -68,7 +68,7 @@ class FiringTracker : public UpdateModule user update modules, so it redefines this. Please don't redefine this for other modules without very careful deliberation. (srj) */ - virtual SleepyUpdatePhase getUpdatePhase() const + virtual SleepyUpdatePhase getUpdatePhase() const override { return PHASE_FINAL; } diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h index 160d1dbd4cf..83cf4dd5230 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h @@ -103,12 +103,12 @@ class GameLogic : public SubsystemInterface, public Snapshot public: GameLogic(); - virtual ~GameLogic(); + virtual ~GameLogic() override; // subsystem methods - virtual void init(); ///< Initialize or re-initialize the instance - virtual void reset(); ///< Reset the logic system - virtual void update(); ///< update the world + virtual void init() override; ///< Initialize or re-initialize the instance + virtual void reset() override; ///< Reset the logic system + virtual void update() override; ///< update the world void preUpdate(); @@ -264,9 +264,9 @@ class GameLogic : public SubsystemInterface, public Snapshot 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; private: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/GhostObject.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/GhostObject.h index 907596e94bf..093d0174360 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/GhostObject.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/GhostObject.h @@ -56,9 +56,9 @@ class GhostObject : public Snapshot const Coord3D *getParentPosition() const {return &m_parentPosition;} protected: - 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; Object *m_parentObject; ///< object which we are ghosting GeometryType m_parentGeometryType; @@ -89,9 +89,9 @@ class GhostObjectManager : public Snapshot inline Bool trackAllPlayers() const; ///< returns whether the ghost object status is tracked for all players or for the local player only protected: - 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; Int m_localPlayer; Bool m_lockGhostObjects; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h index 711e433c58e..59c4e908f47 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h @@ -401,9 +401,9 @@ class Locomotor : public MemoryPoolObject, public Snapshot 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: @@ -475,11 +475,11 @@ class LocomotorStore : public SubsystemInterface public: LocomotorStore(); - ~LocomotorStore(); + virtual ~LocomotorStore() override; - void init() { }; - void reset(); - void update(); + virtual void init() override { }; + virtual void reset() override; + virtual void update() override; /** Find the LocomotorTemplate with the given name. If no such LocomotorTemplate exists, return null. diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/LocomotorSet.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/LocomotorSet.h index 52c5dab44de..111368d37d0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/LocomotorSet.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/LocomotorSet.h @@ -86,9 +86,9 @@ class LocomotorSet : public Snapshot 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; public: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h index fdd54683256..a475e3d40b1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h @@ -203,9 +203,9 @@ class AIUpdateModuleData : public UpdateModuleData AIUpdateModuleData(); - virtual ~AIUpdateModuleData(); + virtual ~AIUpdateModuleData() override; - virtual Bool isAiModuleData() const { return true; } + virtual Bool isAiModuleData() const override { return true; } const LocomotorTemplateVector* findLocomotorTemplateVector(LocomotorSetType t) const; static void buildFieldParse(MultiIniFieldParse& p); @@ -299,10 +299,10 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface AIUpdateInterface( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual AIUpdateInterface* getAIUpdateInterface() { return this; } + virtual AIUpdateInterface* getAIUpdateInterface() override { return this; } // Disabled conditions to process (AI will still process held status) - virtual DisabledMaskType getDisabledTypesToProcess() const { return MAKE_DISABLED_MASK( DISABLED_HELD ); } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return MAKE_DISABLED_MASK( DISABLED_HELD ); } // Some very specific, complex behaviors are used by more than one AIUpdate. Here are their interfaces. virtual DozerAIInterface* getDozerAIInterface() {return nullptr;} @@ -350,10 +350,10 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface //Definition of busy -- when explicitly in the busy state. Moving or attacking is not considered busy! virtual Bool isBusy() const; - virtual void onObjectCreated(); + virtual void onObjectCreated() override; virtual void doQuickExit( std::vector* path ); ///< get out of this Object - virtual void aiDoCommand(const AICommandParms* parms); + virtual void aiDoCommand(const AICommandParms* parms) override; virtual const Coord3D *getGuardLocation() const { return &m_locationToGuard; } virtual ObjectID getGuardObject() const { return m_objectToGuard; } @@ -524,7 +524,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface Bool hasHigherPathPriority(AIUpdateInterface *otherAI) const; void setFinalPosition(const Coord3D *pos) { m_finalPosition = *pos; m_doFinalPosition = false;} - virtual UpdateSleepTime update(); ///< update this object's AI + virtual UpdateSleepTime update() override; ///< update this object's AI /// if we are attacking "fromID", stop that and attack "toID" instead void transferAttack(ObjectID fromID, ObjectID toID); @@ -604,7 +604,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface interesting oscillations can occur in some situations, with friction being applied either before or after the locomotive force, making for huge stuttery messes. (srj) */ - virtual SleepyUpdatePhase getUpdatePhase() const { return PHASE_INITIAL; } + virtual SleepyUpdatePhase getUpdatePhase() const override { return PHASE_INITIAL; } void setGoalPositionClipped(const Coord3D* in, CommandSourceType cmdSource); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h index e0be87ad87e..f29567555f7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h @@ -72,53 +72,53 @@ class ActiveBody : public BodyModule ActiveBody( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onDelete(); + virtual void onDelete() override; - virtual void attemptDamage( DamageInfo *damageInfo ); ///< try to damage this object - virtual Real estimateDamage( DamageInfoInput& damageInfo ) const; - virtual void attemptHealing( DamageInfo *damageInfo ); ///< try to heal this object - virtual Real getHealth() const; ///< get current health - virtual BodyDamageType getDamageState() const; - virtual void setDamageState( BodyDamageType newState ); ///< control damage state directly. Will adjust hitpoints. - virtual void setAflame( Bool setting );///< This is a major change like a damage state. - virtual UnsignedInt getSubdualDamageHealRate() const; - virtual Real getSubdualDamageHealAmount() const; - virtual Bool hasAnySubdualDamage() const; - virtual Real getCurrentSubdualDamageAmount() const { return m_currentSubdualDamage; } + virtual void attemptDamage( DamageInfo *damageInfo ) override; ///< try to damage this object + virtual Real estimateDamage( DamageInfoInput& damageInfo ) const override; + virtual void attemptHealing( DamageInfo *damageInfo ) override; ///< try to heal this object + virtual Real getHealth() const override; ///< get current health + virtual BodyDamageType getDamageState() const override; + virtual void setDamageState( BodyDamageType newState ) override; ///< control damage state directly. Will adjust hitpoints. + virtual void setAflame( Bool setting ) override;///< This is a major change like a damage state. + virtual UnsignedInt getSubdualDamageHealRate() const override; + virtual Real getSubdualDamageHealAmount() const override; + virtual Bool hasAnySubdualDamage() const override; + virtual Real getCurrentSubdualDamageAmount() const override { return m_currentSubdualDamage; } - virtual const DamageInfo *getLastDamageInfo() const { return &m_lastDamageInfo; } ///< return info on last damage dealt to this object - virtual UnsignedInt getLastDamageTimestamp() const { return m_lastDamageTimestamp; } ///< return frame of last damage dealt - virtual UnsignedInt getLastHealingTimestamp() const { return m_lastHealingTimestamp; } ///< return frame of last damage dealt - virtual ObjectID getClearableLastAttacker() const { return (m_lastDamageCleared ? INVALID_ID : m_lastDamageInfo.in.m_sourceID); } - virtual void clearLastAttacker() { m_lastDamageCleared = true; } + virtual const DamageInfo *getLastDamageInfo() const override { return &m_lastDamageInfo; } ///< return info on last damage dealt to this object + virtual UnsignedInt getLastDamageTimestamp() const override { return m_lastDamageTimestamp; } ///< return frame of last damage dealt + virtual UnsignedInt getLastHealingTimestamp() const override { return m_lastHealingTimestamp; } ///< return frame of last damage dealt + virtual ObjectID getClearableLastAttacker() const override { return (m_lastDamageCleared ? INVALID_ID : m_lastDamageInfo.in.m_sourceID); } + virtual void clearLastAttacker() override { m_lastDamageCleared = true; } - void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback = TRUE ); + virtual void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback = TRUE ) override; - virtual void setArmorSetFlag(ArmorSetType ast) { m_curArmorSetFlags.set(ast, 1); } - virtual void clearArmorSetFlag(ArmorSetType ast) { m_curArmorSetFlags.set(ast, 0); } - virtual Bool testArmorSetFlag(ArmorSetType ast) { return m_curArmorSetFlags.test(ast); } + virtual void setArmorSetFlag(ArmorSetType ast) override { m_curArmorSetFlags.set(ast, 1); } + virtual void clearArmorSetFlag(ArmorSetType ast) override { m_curArmorSetFlags.set(ast, 0); } + virtual Bool testArmorSetFlag(ArmorSetType ast) override { return m_curArmorSetFlags.test(ast); } - virtual void setInitialHealth(Int initialPercent); ///< Sets the initial load health %. - virtual void setMaxHealth( Real maxHealth, MaxHealthChangeType healthChangeType = SAME_CURRENTHEALTH ); ///< Sets the initial max health + virtual void setInitialHealth(Int initialPercent) override; ///< Sets the initial load health %. + virtual void setMaxHealth( Real maxHealth, MaxHealthChangeType healthChangeType = SAME_CURRENTHEALTH ) override; ///< Sets the initial max health - virtual Bool getFrontCrushed() const { return m_frontCrushed; } - virtual Bool getBackCrushed() const { return m_backCrushed; } + virtual Bool getFrontCrushed() const override { return m_frontCrushed; } + virtual Bool getBackCrushed() const override { return m_backCrushed; } - virtual void setFrontCrushed(Bool v) { m_frontCrushed = v; } - virtual void setBackCrushed(Bool v) { m_backCrushed = v; } + virtual void setFrontCrushed(Bool v) override { m_frontCrushed = v; } + virtual void setBackCrushed(Bool v) override { m_backCrushed = v; } - virtual Real getMaxHealth() const; ///< return max health - virtual Real getInitialHealth() const; // return initial health + virtual Real getMaxHealth() const override; ///< return max health + virtual Real getInitialHealth() const override; // return initial health - virtual Real getPreviousHealth() const { return m_prevHealth; } + virtual Real getPreviousHealth() const override { return m_prevHealth; } - virtual void setIndestructible( Bool indestructible ); - virtual Bool isIndestructible() const { return m_indestructible; } + virtual void setIndestructible( Bool indestructible ) override; + virtual Bool isIndestructible() const override { return m_indestructible; } - virtual void internalChangeHealth( Real delta ); ///< change health + virtual void internalChangeHealth( Real delta ) override; ///< change health - virtual void evaluateVisualCondition(); - virtual void updateBodyParticleSystems();// made public for topple anf building collapse updates -ML + virtual void evaluateVisualCondition() override; + virtual void updateBodyParticleSystems() override;// made public for topple anf building collapse updates -ML // Subdual Damage virtual Bool isSubdued() const; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h index 4221d26242e..fcc581c2cbe 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h @@ -68,7 +68,7 @@ class ActiveShroudUpgrade : public UpgradeModule protected: - virtual void upgradeImplementation(); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation() override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AnimationSteeringUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AnimationSteeringUpdate.h index 48dceca4615..0300cb158e4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AnimationSteeringUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AnimationSteeringUpdate.h @@ -73,7 +73,7 @@ class AnimationSteeringUpdate : public UpdateModule AnimationSteeringUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype defined by MemoryPoolObject - virtual UpdateSleepTime update(); ///< Here's the actual work of Upgrading + virtual UpdateSleepTime update() override; ///< Here's the actual work of Upgrading protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h index 38998a466ef..b616974c90b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h @@ -75,8 +75,8 @@ class ArmorUpgrade : public UpgradeModule // virtual destructor prototype defined by MemoryPoolObject protected: - virtual void upgradeImplementation( ); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation( ) override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h index 6b5f8af4400..42ef23b866e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h @@ -90,12 +90,12 @@ class AssaultTransportAIUpdate : public AIUpdateInterface, public AssaultTranspo AssaultTransportAIUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void aiDoCommand(const AICommandParms* parms); - virtual Bool isIdle() const; - virtual UpdateSleepTime update(); - virtual AssaultTransportAIInterface* getAssaultTransportAIInterface() { return this; } - virtual const AssaultTransportAIInterface* getAssaultTransportAIInterface() const { return this; } - virtual void beginAssault( const Object *designatedTarget ) const; + virtual void aiDoCommand(const AICommandParms* parms) override; + virtual Bool isIdle() const override; + virtual UpdateSleepTime update() override; + virtual AssaultTransportAIInterface* getAssaultTransportAIInterface() override { return this; } + virtual const AssaultTransportAIInterface* getAssaultTransportAIInterface() const override { return this; } + virtual void beginAssault( const Object *designatedTarget ) const override; UpdateSleepTime calcSleepTime(); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h index 15b653b3169..c784a12d450 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h @@ -66,7 +66,7 @@ class AssistedTargetingUpdate : public UpdateModule AssistedTargetingUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; Bool isFreeToAssist() const; void assistAttack( const Object *requestingObject, Object *victimObject ); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h index ccc8c0b501b..e5c3dd0e6f3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h @@ -117,7 +117,7 @@ class AutoDepositUpdate : public UpdateModule // virtual destructor prototype provided by memory pool declaration void awardInitialCaptureBonus( Player *player ); // Test and award the initial capture bonus - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h index 0ef89bcd787..acf570cd449 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h @@ -69,8 +69,8 @@ class AutoFindHealingUpdate : public UpdateModule AutoFindHealingUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onObjectCreated(); - virtual UpdateSleepTime update(); + virtual void onObjectCreated() override; + virtual UpdateSleepTime update() override; Object* scanClosestTarget(); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h index a05c750670d..d9a2db32ee3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h @@ -123,52 +123,52 @@ class AutoHealBehavior : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | MODULEINTERFACE_UPGRADE | MODULEINTERFACE_DAMAGE; } // BehaviorModule - virtual UpgradeModuleInterface* getUpgrade() { return this; } - virtual DamageModuleInterface* getDamage() { return this; } + virtual UpgradeModuleInterface* getUpgrade() override { return this; } + virtual DamageModuleInterface* getDamage() override { return this; } // DamageModuleInterface - virtual void onDamage( DamageInfo *damageInfo ); - virtual void onHealing( DamageInfo *damageInfo ) { } - virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState) { } + virtual void onDamage( DamageInfo *damageInfo ) override; + virtual void onHealing( DamageInfo *damageInfo ) override { } + virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState) override { } // UpdateModuleInterface - virtual UpdateSleepTime update(); - virtual DisabledMaskType getDisabledTypesToProcess() const { return MAKE_DISABLED_MASK( DISABLED_HELD ); } + virtual UpdateSleepTime update() override; + virtual DisabledMaskType getDisabledTypesToProcess() const override { return MAKE_DISABLED_MASK( DISABLED_HELD ); } void stopHealing(); void undoUpgrade(); ///m_upgradeMuxData.getUpgradeActivationMasks(activation, conflicting); } - virtual void performUpgradeFX() + virtual void performUpgradeFX() override { getAutoHealBehaviorModuleData()->m_upgradeMuxData.performUpgradeFX(getObject()); } - virtual void processUpgradeRemoval() + virtual void processUpgradeRemoval() override { // I can't take it any more. Let the record show that I think the UpgradeMux multiple inheritance is CRAP. getAutoHealBehaviorModuleData()->m_upgradeMuxData.muxDataProcessUpgradeRemoval(getObject()); } - virtual Bool requiresAllActivationUpgrades() const + virtual Bool requiresAllActivationUpgrades() const override { return getAutoHealBehaviorModuleData()->m_upgradeMuxData.m_requiresAllTriggers; } Bool isUpgradeActive() const { return isAlreadyUpgraded(); } - virtual Bool isSubObjectsUpgrade() { return false; } + virtual Bool isSubObjectsUpgrade() override { return false; } private: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h index f4627272880..2bd592cd293 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h @@ -76,8 +76,8 @@ class BaikonurLaunchPower : public SpecialPowerModule BaikonurLaunchPower( Thing *thing, const ModuleData *moduleData ); - virtual void doSpecialPower( UnsignedInt commandOptions ); - virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ); + virtual void doSpecialPower( UnsignedInt commandOptions ) override; + virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ) override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h index 21a851810c5..95dbd16052c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h @@ -64,16 +64,16 @@ class BaseRegenerateUpdate : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | MODULEINTERFACE_DAMAGE; } // BehaviorModule - virtual DamageModuleInterface* getDamage() { return this; } + virtual DamageModuleInterface* getDamage() override { return this; } // UpdateModuleInterface - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // DamageModuleInterface - virtual void onDamage( DamageInfo *damageInfo ); - virtual void onHealing( DamageInfo *damageInfo ) { } - virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState) { } - virtual DisabledMaskType getDisabledTypesToProcess() const { return MAKE_DISABLED_MASK( DISABLED_UNDERPOWERED ); } + virtual void onDamage( DamageInfo *damageInfo ) override; + virtual void onHealing( DamageInfo *damageInfo ) override { } + virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState) override { } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return MAKE_DISABLED_MASK( DISABLED_UNDERPOWERED ); } private: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattleBusSlowDeathBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattleBusSlowDeathBehavior.h index 347903abafc..3993191f350 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattleBusSlowDeathBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattleBusSlowDeathBehavior.h @@ -73,9 +73,9 @@ class BattleBusSlowDeathBehavior : public SlowDeathBehavior // virtual destructor prototype provided by memory pool declaration // slow death methods - virtual void onDie( const DamageInfo *damageInfo ); - virtual void beginSlowDeath( const DamageInfo *damageInfo ); - virtual UpdateSleepTime update(); + virtual void onDie( const DamageInfo *damageInfo ) override; + virtual void beginSlowDeath( const DamageInfo *damageInfo ) override; + virtual UpdateSleepTime update() override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h index 47952342633..2d16d1c481b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h @@ -146,24 +146,24 @@ class BattlePlanUpdate : public SpecialPowerUpdateModule // virtual destructor prototype provided by memory pool declaration // SpecialPowerUpdateInterface - virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ); - virtual Bool isSpecialAbility() const { return false; } - virtual Bool isSpecialPower() const { return true; } - virtual Bool isActive() const {return m_status != TRANSITIONSTATUS_IDLE;} - virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() { return this; } - virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const { return false; } //Is it active now? - virtual Bool doesSpecialPowerHaveOverridableDestination() const { return false; } //Does it have it, even if it's not active? - virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ) {} - virtual Bool isPowerCurrentlyInUse( const CommandButton *command = nullptr ) const; + virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ) override; + virtual Bool isSpecialAbility() const override { return false; } + virtual Bool isSpecialPower() const override { return true; } + virtual Bool isActive() const override {return m_status != TRANSITIONSTATUS_IDLE;} + virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() override { return this; } + virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const override { return false; } //Is it active now? + virtual Bool doesSpecialPowerHaveOverridableDestination() const override { return false; } //Does it have it, even if it's not active? + virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ) override {} + virtual Bool isPowerCurrentlyInUse( const CommandButton *command = nullptr ) const override; //Returns the currently active battle plan -- unpacked and ready... returns PLANSTATUS_NONE if in transition! BattlePlanStatus getActiveBattlePlan() const; - virtual void onObjectCreated(); - virtual void onDelete(); - virtual UpdateSleepTime update(); + virtual void onObjectCreated() override; + virtual void onDelete() override; + virtual UpdateSleepTime update() override; - virtual CommandOption getCommandOption() const; + virtual CommandOption getCommandOption() const override; protected: void setStatus( TransitionStatus status ); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h index 19337b0f3eb..42ddc913646 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h @@ -153,51 +153,51 @@ class BehaviorModule : public ObjectModule, public BehaviorModuleInterface static Int getInterfaceMask() { return 0; } static ModuleType getModuleType() { return MODULETYPE_BEHAVIOR; } - virtual BodyModuleInterface* getBody() { return nullptr; } - virtual CollideModuleInterface* getCollide() { return nullptr; } - virtual ContainModuleInterface* getContain() { return nullptr; } - virtual CreateModuleInterface* getCreate() { return nullptr; } - virtual DamageModuleInterface* getDamage() { return nullptr; } - virtual DestroyModuleInterface* getDestroy() { return nullptr; } - virtual DieModuleInterface* getDie() { return nullptr; } - virtual SpecialPowerModuleInterface* getSpecialPower() { return nullptr; } - virtual UpdateModuleInterface* getUpdate() { return nullptr; } - virtual UpgradeModuleInterface* getUpgrade() { return nullptr; } + virtual BodyModuleInterface* getBody() override { return nullptr; } + virtual CollideModuleInterface* getCollide() override { return nullptr; } + virtual ContainModuleInterface* getContain() override { return nullptr; } + virtual CreateModuleInterface* getCreate() override { return nullptr; } + virtual DamageModuleInterface* getDamage() override { return nullptr; } + virtual DestroyModuleInterface* getDestroy() override { return nullptr; } + virtual DieModuleInterface* getDie() override { return nullptr; } + virtual SpecialPowerModuleInterface* getSpecialPower() override { return nullptr; } + virtual UpdateModuleInterface* getUpdate() override { return nullptr; } + virtual UpgradeModuleInterface* getUpgrade() override { return nullptr; } virtual StealthUpdate* getStealth() { return nullptr; } virtual SpyVisionUpdate* getSpyVisionUpdate() { return nullptr; } - virtual ParkingPlaceBehaviorInterface* getParkingPlaceBehaviorInterface() { return nullptr; } - virtual RebuildHoleBehaviorInterface* getRebuildHoleBehaviorInterface() { return nullptr; } - virtual BridgeBehaviorInterface* getBridgeBehaviorInterface() { return nullptr; } - virtual BridgeTowerBehaviorInterface* getBridgeTowerBehaviorInterface() { return nullptr; } - virtual BridgeScaffoldBehaviorInterface* getBridgeScaffoldBehaviorInterface() { return nullptr; } - virtual OverchargeBehaviorInterface* getOverchargeBehaviorInterface() { return nullptr; } - virtual TransportPassengerInterface* getTransportPassengerInterface() { return nullptr; } - virtual CaveInterface* getCaveInterface() { return nullptr; } - virtual LandMineInterface* getLandMineInterface() { return nullptr; } - virtual DieModuleInterface* getEjectPilotDieInterface() { return nullptr; } + virtual ParkingPlaceBehaviorInterface* getParkingPlaceBehaviorInterface() override { return nullptr; } + virtual RebuildHoleBehaviorInterface* getRebuildHoleBehaviorInterface() override { return nullptr; } + virtual BridgeBehaviorInterface* getBridgeBehaviorInterface() override { return nullptr; } + virtual BridgeTowerBehaviorInterface* getBridgeTowerBehaviorInterface() override { return nullptr; } + virtual BridgeScaffoldBehaviorInterface* getBridgeScaffoldBehaviorInterface() override { return nullptr; } + virtual OverchargeBehaviorInterface* getOverchargeBehaviorInterface() override { return nullptr; } + virtual TransportPassengerInterface* getTransportPassengerInterface() override { return nullptr; } + virtual CaveInterface* getCaveInterface() override { return nullptr; } + virtual LandMineInterface* getLandMineInterface() override { return nullptr; } + virtual DieModuleInterface* getEjectPilotDieInterface() override { return nullptr; } // interface acquisition (moved from UpdateModule) - virtual ProjectileUpdateInterface* getProjectileUpdateInterface() { return nullptr; } - virtual AIUpdateInterface* getAIUpdateInterface() { return nullptr; } - virtual ExitInterface* getUpdateExitInterface() { return nullptr; } - virtual DockUpdateInterface* getDockUpdateInterface() { return nullptr; } - virtual RailedTransportDockUpdateInterface *getRailedTransportDockUpdateInterface() { return nullptr; } - virtual SlowDeathBehaviorInterface* getSlowDeathBehaviorInterface() { return nullptr; } - virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() { return nullptr; } - virtual SlavedUpdateInterface* getSlavedUpdateInterface() { return nullptr; } - virtual ProductionUpdateInterface* getProductionUpdateInterface() { return nullptr; } - virtual HordeUpdateInterface* getHordeUpdateInterface() { return nullptr; } - virtual PowerPlantUpdateInterface* getPowerPlantUpdateInterface() { return nullptr; } - virtual SpawnBehaviorInterface* getSpawnBehaviorInterface() { return nullptr; } - virtual CountermeasuresBehaviorInterface* getCountermeasuresBehaviorInterface() { return nullptr; } - virtual const CountermeasuresBehaviorInterface* getCountermeasuresBehaviorInterface() const { return nullptr; } + virtual ProjectileUpdateInterface* getProjectileUpdateInterface() override { return nullptr; } + virtual AIUpdateInterface* getAIUpdateInterface() override { return nullptr; } + virtual ExitInterface* getUpdateExitInterface() override { return nullptr; } + virtual DockUpdateInterface* getDockUpdateInterface() override { return nullptr; } + virtual RailedTransportDockUpdateInterface *getRailedTransportDockUpdateInterface() override { return nullptr; } + virtual SlowDeathBehaviorInterface* getSlowDeathBehaviorInterface() override { return nullptr; } + virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() override { return nullptr; } + virtual SlavedUpdateInterface* getSlavedUpdateInterface() override { return nullptr; } + virtual ProductionUpdateInterface* getProductionUpdateInterface() override { return nullptr; } + virtual HordeUpdateInterface* getHordeUpdateInterface() override { return nullptr; } + virtual PowerPlantUpdateInterface* getPowerPlantUpdateInterface() override { return nullptr; } + virtual SpawnBehaviorInterface* getSpawnBehaviorInterface() override { return nullptr; } + virtual CountermeasuresBehaviorInterface* getCountermeasuresBehaviorInterface() override { return nullptr; } + virtual const CountermeasuresBehaviorInterface* getCountermeasuresBehaviorInterface() const override { return nullptr; } 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; }; inline BehaviorModule::BehaviorModule( Thing *thing, const ModuleData* moduleData ) : ObjectModule( thing, moduleData ) { } diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h index dc40fccacdd..1fdfc986274 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h @@ -215,7 +215,7 @@ class BodyModule : public BehaviorModule, public BodyModuleInterface static Int getInterfaceMask() { return MODULEINTERFACE_BODY; } // BehaviorModule - virtual BodyModuleInterface* getBody() { return this; } + virtual BodyModuleInterface* getBody() override { return this; } /** Try to damage this Object. The module's Armor @@ -223,13 +223,13 @@ class BodyModule : public BehaviorModule, public BodyModuleInterface considerably from what you requested. Also note that (if damage is done) the DamageFX will be invoked to provide a/v fx as appropriate. */ - virtual void attemptDamage( DamageInfo *damageInfo ) = 0; + virtual void attemptDamage( DamageInfo *damageInfo ) override = 0; /** Instead of having negative damage count as healing, or allowing access to the private changeHealth Method, we will use this parallel to attemptDamage to do healing without hack. */ - virtual void attemptHealing( DamageInfo *healingInfo ) = 0; + virtual void attemptHealing( DamageInfo *healingInfo ) override = 0; /** Estimate the (unclipped) damage that would be done to this object @@ -237,51 +237,51 @@ class BodyModule : public BehaviorModule, public BodyModuleInterface but DO NOT alter the body in any way. (This is used by the AI system to choose weapons.) */ - virtual Real estimateDamage( DamageInfoInput& damageInfo ) const = 0; + virtual Real estimateDamage( DamageInfoInput& damageInfo ) const override = 0; - virtual Real getHealth() const = 0; ///< get current health + virtual Real getHealth() const override = 0; ///< get current health - virtual Real getMaxHealth() const {return 0.0f;} ///< return max health - virtual Real getPreviousHealth() const { return 0.0f; } ///< return previous health + virtual Real getMaxHealth() const override {return 0.0f;} ///< return max health + virtual Real getPreviousHealth() const override { return 0.0f; } ///< return previous health - virtual UnsignedInt getSubdualDamageHealRate() const {return 0;} - virtual Real getSubdualDamageHealAmount() const {return 0.0f;} - virtual Bool hasAnySubdualDamage() const{return FALSE;} - virtual Real getCurrentSubdualDamageAmount() const { return 0.0f; } + virtual UnsignedInt getSubdualDamageHealRate() const override {return 0;} + virtual Real getSubdualDamageHealAmount() const override {return 0.0f;} + virtual Bool hasAnySubdualDamage() const override{return FALSE;} + virtual Real getCurrentSubdualDamageAmount() const override { return 0.0f; } - virtual Real getInitialHealth() const {return 0.0f;} // return initial health + virtual Real getInitialHealth() const override {return 0.0f;} // return initial health - virtual BodyDamageType getDamageState() const = 0; - virtual void setDamageState( BodyDamageType newState ) = 0; ///< control damage state directly. Will adjust hitpoints. - virtual void setAflame( Bool setting ) = 0;///< This is a major change like a damage state. + virtual BodyDamageType getDamageState() const override = 0; + virtual void setDamageState( BodyDamageType newState ) override = 0; ///< control damage state directly. Will adjust hitpoints. + virtual void setAflame( Bool setting ) override = 0;///< This is a major change like a damage state. - virtual void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback = FALSE ) = 0; ///< I just achieved this level right this moment + virtual void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback = FALSE ) override = 0; ///< I just achieved this level right this moment - virtual void setArmorSetFlag(ArmorSetType ast) = 0; - virtual void clearArmorSetFlag(ArmorSetType ast) = 0; - virtual Bool testArmorSetFlag(ArmorSetType ast) = 0; + virtual void setArmorSetFlag(ArmorSetType ast) override = 0; + virtual void clearArmorSetFlag(ArmorSetType ast) override = 0; + virtual Bool testArmorSetFlag(ArmorSetType ast) override = 0; - virtual const DamageInfo *getLastDamageInfo() const { return nullptr; } ///< return info on last damage dealt to this object - virtual UnsignedInt getLastDamageTimestamp() const { return 0; } ///< return frame of last damage dealt - virtual UnsignedInt getLastHealingTimestamp() const { return 0; } ///< return frame of last healing dealt - virtual ObjectID getClearableLastAttacker() const { return INVALID_ID; } - virtual void clearLastAttacker() { } - virtual Bool getFrontCrushed() const { return false; } - virtual Bool getBackCrushed() const { return false; } + virtual const DamageInfo *getLastDamageInfo() const override { return nullptr; } ///< return info on last damage dealt to this object + virtual UnsignedInt getLastDamageTimestamp() const override { return 0; } ///< return frame of last damage dealt + virtual UnsignedInt getLastHealingTimestamp() const override { return 0; } ///< return frame of last healing dealt + virtual ObjectID getClearableLastAttacker() const override { return INVALID_ID; } + virtual void clearLastAttacker() override { } + virtual Bool getFrontCrushed() const override { return false; } + virtual Bool getBackCrushed() const override { return false; } - virtual void setInitialHealth(Int initialPercent) { } ///< Sets the initial load health %. - virtual void setMaxHealth(Real maxHealth, MaxHealthChangeType healthChangeType = SAME_CURRENTHEALTH ) { } ///< Sets the max health. + virtual void setInitialHealth(Int initialPercent) override { } ///< Sets the initial load health %. + virtual void setMaxHealth(Real maxHealth, MaxHealthChangeType healthChangeType = SAME_CURRENTHEALTH ) override { } ///< Sets the max health. - virtual void setFrontCrushed(Bool v) { DEBUG_CRASH(("you should never call this for generic Bodys")); } - virtual void setBackCrushed(Bool v) { DEBUG_CRASH(("you should never call this for generic Bodys")); } + virtual void setFrontCrushed(Bool v) override { DEBUG_CRASH(("you should never call this for generic Bodys")); } + virtual void setBackCrushed(Bool v) override { DEBUG_CRASH(("you should never call this for generic Bodys")); } - virtual void setIndestructible( Bool indestructible ) { } - virtual Bool isIndestructible() const { return TRUE; } + virtual void setIndestructible( Bool indestructible ) override { } + virtual Bool isIndestructible() const override { return TRUE; } //Allows outside systems to apply defensive bonuses or penalties (they all stack as a multiplier!) - virtual void applyDamageScalar( Real scalar ) { m_damageScalar *= scalar; } - virtual Real getDamageScalar() const { return m_damageScalar; } + virtual void applyDamageScalar( Real scalar ) override { m_damageScalar *= scalar; } + virtual Real getDamageScalar() const override { return m_damageScalar; } /** Change the module's health by the given delta. Note that @@ -290,17 +290,17 @@ class BodyModule : public BehaviorModule, public BodyModuleInterface call this directly (especially when when decreasing health, since you probably want "attemptDamage" or "attemptHealing") */ - virtual void internalChangeHealth( Real delta ) = 0; + virtual void internalChangeHealth( Real delta ) override = 0; - virtual void evaluateVisualCondition() { } - virtual void updateBodyParticleSystems() { };// made public for topple anf building collapse updates -ML + virtual void evaluateVisualCondition() override { } + virtual void updateBodyParticleSystems() override { };// made public for topple anf building collapse updates -ML 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; Real m_damageScalar; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h index aede96065c9..ca3af83ec59 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h @@ -52,14 +52,14 @@ class BoneFXDamage : public DamageModule // virtual destructor prototype provided by memory pool declaration // damage module methods - virtual void onDamage( DamageInfo *damageInfo ) { } - virtual void onHealing( DamageInfo *damageInfo ) { } + virtual void onDamage( DamageInfo *damageInfo ) override { } + virtual void onHealing( DamageInfo *damageInfo ) override { } virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, BodyDamageType oldState, - BodyDamageType newState ); + BodyDamageType newState ) override; protected: - virtual void onObjectCreated(); + virtual void onObjectCreated() override; }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h index 06b82ca6178..c48775d2682 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h @@ -241,11 +241,11 @@ class BoneFXUpdate : public UpdateModule void changeBodyDamageState( BodyDamageType oldState, BodyDamageType newState); void stopAllBoneFX(); - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: - virtual void onObjectCreated(); + virtual void onObjectCreated() override; virtual void resolveBoneLocations(); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h index 9e9de2b1d8a..502316ae6e2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h @@ -95,7 +95,7 @@ class BridgeBehaviorModuleData : public BehaviorModuleData public: BridgeBehaviorModuleData(); - ~BridgeBehaviorModuleData(); + ~BridgeBehaviorModuleData() override; static void buildFieldParse( MultiIniFieldParse &p ); @@ -129,33 +129,33 @@ class BridgeBehavior : public UpdateModule, static Int getInterfaceMask() { return (MODULEINTERFACE_DAMAGE) | (MODULEINTERFACE_DIE) | (MODULEINTERFACE_UPDATE); } - virtual BridgeBehaviorInterface* getBridgeBehaviorInterface() { return this; } - virtual void onDelete(); + virtual BridgeBehaviorInterface* getBridgeBehaviorInterface() override { return this; } + virtual void onDelete() override; // Damage methods - virtual DamageModuleInterface* getDamage() { return this; } - virtual void onDamage( DamageInfo *damageInfo ); - virtual void onHealing( DamageInfo *damageInfo ); + virtual DamageModuleInterface* getDamage() override { return this; } + virtual void onDamage( DamageInfo *damageInfo ) override; + virtual void onHealing( DamageInfo *damageInfo ) override; virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, BodyDamageType oldState, - BodyDamageType newState ); + BodyDamageType newState ) override; // Die methods - virtual DieModuleInterface* getDie() { return this; } - virtual void onDie( const DamageInfo *damageInfo ); + virtual DieModuleInterface* getDie() override { return this; } + virtual void onDie( const DamageInfo *damageInfo ) override; // Update methods - virtual UpdateModuleInterface *getUpdate() { return this; } - virtual UpdateSleepTime update(); + virtual UpdateModuleInterface *getUpdate() override { return this; } + virtual UpdateSleepTime update() override; // our own methods static BridgeBehaviorInterface *getBridgeBehaviorInterfaceFromObject( Object *obj ); - virtual void setTower( BridgeTowerType towerType, Object *tower ); ///< connect tower to us - virtual ObjectID getTowerID( BridgeTowerType towerType ); ///< retrieve one of our towers - virtual void createScaffolding(); ///< create scaffolding around bridge - virtual void removeScaffolding(); ///< remove scaffolding around bridge - virtual Bool isScaffoldInMotion(); ///< is scaffold in motion - virtual Bool isScaffoldPresent() { return m_scaffoldPresent; } + virtual void setTower( BridgeTowerType towerType, Object *tower ) override; ///< connect tower to us + virtual ObjectID getTowerID( BridgeTowerType towerType ) override; ///< retrieve one of our towers + virtual void createScaffolding() override; ///< create scaffolding around bridge + virtual void removeScaffolding() override; ///< remove scaffolding around bridge + virtual Bool isScaffoldInMotion() override; ///< is scaffold in motion + virtual Bool isScaffoldPresent() override { return m_scaffoldPresent; } protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h index 5ec5bd7aca4..4ed38fb7ed1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h @@ -77,20 +77,20 @@ class BridgeScaffoldBehavior : public UpdateModule, // virtual destructor prototype provided by memory pool declaration // behavior module methods - virtual BridgeScaffoldBehaviorInterface* getBridgeScaffoldBehaviorInterface() { return this; } + virtual BridgeScaffoldBehaviorInterface* getBridgeScaffoldBehaviorInterface() override { return this; } // update methods - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // bridge scaffold interface methods virtual void setPositions( const Coord3D *createPos, const Coord3D *riseToPos, - const Coord3D *buildPos ); - virtual void setMotion( ScaffoldTargetMotion targetMotion ); - virtual ScaffoldTargetMotion getCurrentMotion() { return m_targetMotion; } - virtual void reverseMotion(); - virtual void setLateralSpeed( Real lateralSpeed ) { m_lateralSpeed = lateralSpeed; } - virtual void setVerticalSpeed( Real verticalSpeed ) { m_verticalSpeed = verticalSpeed; } + const Coord3D *buildPos ) override; + virtual void setMotion( ScaffoldTargetMotion targetMotion ) override; + virtual ScaffoldTargetMotion getCurrentMotion() override { return m_targetMotion; } + virtual void reverseMotion() override; + virtual void setLateralSpeed( Real lateralSpeed ) override { m_lateralSpeed = lateralSpeed; } + virtual void setVerticalSpeed( Real verticalSpeed ) override { m_verticalSpeed = verticalSpeed; } // public interface acquisition static BridgeScaffoldBehaviorInterface *getBridgeScaffoldBehaviorInterfaceFromObject( Object *obj ); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h index 2ee7ae114e7..18d063408de 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h @@ -66,25 +66,25 @@ class BridgeTowerBehavior : public BehaviorModule, // virtual destructor prototype provided by memory pool declaration static Int getInterfaceMask() { return (MODULEINTERFACE_DAMAGE) | (MODULEINTERFACE_DIE); } - BridgeTowerBehaviorInterface* getBridgeTowerBehaviorInterface() { return this; } + BridgeTowerBehaviorInterface* getBridgeTowerBehaviorInterface() override { return this; } - virtual void setBridge( Object *bridge ); - virtual ObjectID getBridgeID(); - virtual void setTowerType( BridgeTowerType type ); + virtual void setBridge( Object *bridge ) override; + virtual ObjectID getBridgeID() override; + virtual void setTowerType( BridgeTowerType type ) override; static BridgeTowerBehaviorInterface *getBridgeTowerBehaviorInterfaceFromObject( Object *obj ); // Damage methods - virtual DamageModuleInterface* getDamage() { return this; } - virtual void onDamage( DamageInfo *damageInfo ); - virtual void onHealing( DamageInfo *damageInfo ); + virtual DamageModuleInterface* getDamage() override { return this; } + virtual void onDamage( DamageInfo *damageInfo ) override; + virtual void onHealing( DamageInfo *damageInfo ) override; virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, BodyDamageType oldState, - BodyDamageType newState ); + BodyDamageType newState ) override; // Die methods - virtual DieModuleInterface* getDie() { return this; } - virtual void onDie( const DamageInfo *damageInfo ); + virtual DieModuleInterface* getDie() override { return this; } + virtual void onDie( const DamageInfo *damageInfo ) override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BunkerBusterBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BunkerBusterBehavior.h index 976ddc085f4..dd0be86ec2b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BunkerBusterBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BunkerBusterBehavior.h @@ -83,12 +83,12 @@ class BunkerBusterBehavior : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DIE); } // update module methods - virtual UpdateSleepTime update(); - virtual void onObjectCreated(); + virtual UpdateSleepTime update() override; + virtual void onObjectCreated() override; // die module methods - virtual DieModuleInterface *getDie() { return this; } - virtual void onDie( const DamageInfo *damageInfo ); + virtual DieModuleInterface *getDie() override { return this; } + virtual void onDie( const DamageInfo *damageInfo ) override; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h index 6a0e5ab8295..d7ec57bbfb0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h @@ -113,11 +113,11 @@ class CashBountyPower : public SpecialPowerModule CashBountyPower( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype defined by MemoryPoolObject - virtual void onObjectCreated(); + virtual void onObjectCreated() override; //virtual void onBuildComplete(); ///< This is called when you are a finished game object - virtual void onSpecialPowerCreation(); ///< This is called when you are a finished game object - virtual void doSpecialPower( UnsignedInt commandOptions ) { return; } + virtual void onSpecialPowerCreation() override; ///< This is called when you are a finished game object + virtual void doSpecialPower( UnsignedInt commandOptions ) override { return; } protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h index 8662ee3645f..df414489582 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h @@ -74,8 +74,8 @@ class CashHackSpecialPower : public SpecialPowerModule CashHackSpecialPower( Thing *thing, const ModuleData *moduleData ); // virtual destructor provided by memory pool object - virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions ); - virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ); + virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions ) override; + virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ) override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CaveContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CaveContain.h index 07ada221b6d..677efcbe848 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CaveContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CaveContain.h @@ -74,45 +74,45 @@ class CaveContain : public OpenContain, public CreateModuleInterface, public Cav CaveContain( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual CreateModuleInterface* getCreate() { return this; } - virtual CaveInterface* getCaveInterface() { return this; } + virtual CreateModuleInterface* getCreate() override { return this; } + virtual CaveInterface* getCaveInterface() override { return this; } static Int getInterfaceMask() { return OpenContain::getInterfaceMask() | (MODULEINTERFACE_CREATE); } - virtual OpenContain *asOpenContain() { return this; } ///< treat as open container - virtual Bool isGarrisonable() const { return false; } ///< can this unit be Garrisoned? (ick) - virtual Bool isBustable() const { return TRUE; } ///< can this container get busted by a bunkerbuster - virtual Bool isHealContain() const { return false; } ///< true when container only contains units while healing (not a transport!) + virtual OpenContain *asOpenContain() override { return this; } ///< treat as open container + virtual Bool isGarrisonable() const override { return false; } ///< can this unit be Garrisoned? (ick) + virtual Bool isBustable() const override { return TRUE; } ///< can this container get busted by a bunkerbuster + virtual Bool isHealContain() const override { return false; } ///< true when container only contains units while healing (not a transport!) - virtual void onContaining( Object *obj, Bool wasSelected ); ///< object now contains 'obj' - virtual void onRemoving( Object *obj ); ///< object no longer contains 'obj' + virtual void onContaining( Object *obj, Bool wasSelected ) override; ///< object now contains 'obj' + virtual void onRemoving( Object *obj ) override; ///< object no longer contains 'obj' - virtual Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const; - virtual void addToContainList( Object *obj ); ///< The part of AddToContain that inheritors can override (Can't do whole thing because of all the private stuff involved) - virtual void removeFromContain( Object *obj, Bool exposeStealthUnits = FALSE ); ///< remove 'obj' from contain list - virtual void removeAllContained( Bool exposeStealthUnits = FALSE ); ///< remove all objects on contain list + virtual Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const override; + virtual void addToContainList( Object *obj ) override; ///< The part of AddToContain that inheritors can override (Can't do whole thing because of all the private stuff involved) + virtual void removeFromContain( Object *obj, Bool exposeStealthUnits = FALSE ) override; ///< remove 'obj' from contain list + virtual void removeAllContained( Bool exposeStealthUnits = FALSE ) override; ///< remove all objects on contain list /** return the player that *appears* to control this unit. if null, use getObject()->getControllingPlayer() instead. */ - virtual void recalcApparentControllingPlayer(); + virtual void recalcApparentControllingPlayer() override; // contain list access - virtual void iterateContained( ContainIterateFunc func, void *userData, Bool reverse ); - virtual UnsignedInt getContainCount() const; - virtual Int getContainMax() const; - virtual const ContainedItemsList* getContainedItemsList() const; - virtual Bool isKickOutOnCapture(){ return FALSE; }///< Caves and Tunnels don't kick out on capture. + virtual void iterateContained( ContainIterateFunc func, void *userData, Bool reverse ) override; + virtual UnsignedInt getContainCount() const override; + virtual Int getContainMax() const override; + virtual const ContainedItemsList* getContainedItemsList() const override; + virtual Bool isKickOutOnCapture() override { return FALSE; }///< Caves and Tunnels don't kick out on capture. // override the onDie we inherit from OpenContain - virtual void onDie( const DamageInfo *damageInfo ); ///< the die callback + virtual void onDie( const DamageInfo *damageInfo ) override; ///< the die callback - virtual void onCreate(); - virtual void onBuildComplete(); ///< This is called when you are a finished game object - virtual Bool shouldDoOnBuildComplete() const { return m_needToRunOnBuildComplete; } + virtual void onCreate() override; + virtual void onBuildComplete() override; ///< This is called when you are a finished game object + virtual Bool shouldDoOnBuildComplete() const override { return m_needToRunOnBuildComplete; } // Unique to Cave Contain - virtual void tryToSetCaveIndex( Int newIndex ); ///< Called by script as an alternative to instancing separate objects. 'Try', because can fail. - virtual void setOriginalTeam( Team *oldTeam ); ///< This is a distributed Garrison in terms of capturing, so when one node triggers the change, he needs to tell everyone, so anyone can do the un-change. + virtual void tryToSetCaveIndex( Int newIndex ) override; ///< Called by script as an alternative to instancing separate objects. 'Try', because can fail. + virtual void setOriginalTeam( Team *oldTeam ) override; ///< This is a distributed Garrison in terms of capturing, so when one node triggers the change, he needs to tell everyone, so anyone can do the un-change. protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h index 91254566091..4c50f16ec97 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h @@ -74,7 +74,7 @@ class CheckpointUpdate : public UpdateModule CheckpointUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: Bool m_enemyNear; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h index 0b0279a0464..39314d5b649 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h @@ -85,21 +85,21 @@ class ChinookAIUpdate : public SupplyTruckAIUpdate ChinookAIUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); - virtual void aiDoCommand(const AICommandParms* parms); - virtual Bool chooseLocomotorSet(LocomotorSetType wst); + virtual UpdateSleepTime update() override; + virtual void aiDoCommand(const AICommandParms* parms) override; + virtual Bool chooseLocomotorSet(LocomotorSetType wst) override; // this is present solely for some transports to override, so that they can land before // allowing people to exit... - virtual AIFreeToExitType getAiFreeToExit(const Object* exiter) const; - virtual Bool isAllowedToAdjustDestination() const; - virtual ObjectID getBuildingToNotPathAround() const; + virtual AIFreeToExitType getAiFreeToExit(const Object* exiter) const override; + virtual Bool isAllowedToAdjustDestination() const override; + virtual ObjectID getBuildingToNotPathAround() const override; // this is present for subclasses (eg, Chinook) to override, to // prevent supply-ferry behavior in some cases (eg, when toting passengers) - virtual Bool isAvailableForSupplying() const; - virtual Bool isCurrentlyFerryingSupplies() const; + virtual Bool isAvailableForSupplying() const override; + virtual Bool isCurrentlyFerryingSupplies() const override; - virtual Bool isIdle() const; + virtual Bool isIdle() const override; const ChinookAIUpdateModuleData* friend_getData() const { return getChinookAIUpdateModuleData(); } void friend_setFlightStatus(ChinookFlightStatus a) { m_flightStatus = a; } @@ -107,21 +107,21 @@ class ChinookAIUpdate : public SupplyTruckAIUpdate void recordOriginalPosition( const Coord3D &pos ) { m_originalPos.set( &pos ); } const Coord3D* getOriginalPosition() const { return &m_originalPos; } - Int getUpgradedSupplyBoost() const; + virtual Int getUpgradedSupplyBoost() const override; protected: - virtual AIStateMachine* makeStateMachine(); + virtual AIStateMachine* makeStateMachine() override; - virtual void privateCombatDrop( Object *target, const Coord3D& pos, CommandSourceType cmdSource ); - virtual void privateGetRepaired( Object *repairDepot, CommandSourceType cmdSource );///< get repaired at repair depot + virtual void privateCombatDrop( Object *target, const Coord3D& pos, CommandSourceType cmdSource ) override; + virtual void privateGetRepaired( Object *repairDepot, CommandSourceType cmdSource ) override;///< get repaired at repair depot - virtual void privateAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource );///< Extension. Also tell occupants to attackObject - virtual void privateAttackPosition( const Coord3D *pos, Int maxShotsToFire, CommandSourceType cmdSource );///< Extension. Also tell occupants to attackPosition - virtual void privateForceAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource );///< Extension. Also tell occupants to forceAttackObject + virtual void privateAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource ) override;///< Extension. Also tell occupants to attackObject + virtual void privateAttackPosition( const Coord3D *pos, Int maxShotsToFire, CommandSourceType cmdSource ) override;///< Extension. Also tell occupants to attackPosition + virtual void privateForceAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource ) override;///< Extension. Also tell occupants to forceAttackObject - virtual void privateIdle(CommandSourceType cmdSource); + virtual void privateIdle(CommandSourceType cmdSource) override; void private___TellPortableStructureToAttackWithMe( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource ); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h index 94f802a8ede..39d08e21de1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h @@ -70,5 +70,5 @@ class CleanupAreaPower : public SpecialPowerModule CleanupAreaPower( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype defined by MemoryPoolObject - virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ); + virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ) override; }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h index 8268e7db553..64722e1250d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h @@ -68,8 +68,8 @@ class CleanupHazardUpdate : public UpdateModule CleanupHazardUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onObjectCreated(); - virtual UpdateSleepTime update(); + virtual void onObjectCreated() override; + virtual UpdateSleepTime update() override; Object* scanClosestTarget(); void fireWhenReady(); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CollideModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CollideModule.h index 316cb721402..6e9c912d439 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CollideModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CollideModule.h @@ -83,17 +83,17 @@ class CollideModule : public BehaviorModule, static Int getInterfaceMask() { return MODULEINTERFACE_COLLIDE; } // BehaviorModule - virtual CollideModuleInterface* getCollide() { return this; } + virtual CollideModuleInterface* getCollide() override { return this; } - virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ) = 0; + virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ) override = 0; /// this is used for things like pilots, to determine if they can "enter" something - virtual Bool wouldLikeToCollideWith(const Object* other) const { return false; } - virtual Bool isHijackedVehicleCrateCollide() const { return false; } - virtual Bool isSabotageBuildingCrateCollide() const { return false; } - virtual Bool isCarBombCrateCollide() const { return false; } - virtual Bool isRailroad() const { return false;} - virtual Bool isSalvageCrateCollide() const { return false; } + virtual Bool wouldLikeToCollideWith(const Object* other) const override { return false; } + virtual Bool isHijackedVehicleCrateCollide() const override { return false; } + virtual Bool isSabotageBuildingCrateCollide() const override { return false; } + virtual Bool isCarBombCrateCollide() const override { return false; } + virtual Bool isRailroad() const override { return false;} + virtual Bool isSalvageCrateCollide() const override { return false; } }; inline CollideModule::CollideModule( Thing *thing, const ModuleData* moduleData ) : BehaviorModule( thing, moduleData ) { } diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h index 9b62e8df1cf..5b6773f535b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h @@ -67,8 +67,8 @@ class CommandButtonHuntUpdate : public UpdateModule CommandButtonHuntUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onObjectCreated(); - virtual UpdateSleepTime update(); + virtual void onObjectCreated() override; + virtual UpdateSleepTime update() override; void setCommandButton(const AsciiString& buttonName); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h index e034b17685b..f001663c5b3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h @@ -62,7 +62,7 @@ class CommandSetUpgrade : public UpgradeModule // virtual destructor prototype defined by MemoryPoolObject protected: - virtual void upgradeImplementation( ); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation( ) override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h index 922a4a9bdcc..358547373da 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h @@ -79,10 +79,10 @@ class ConvertToCarBombCrateCollide : public CrateCollide protected: /// This allows specific vetoes to certain types of crates and their data - virtual Bool isValidToExecute( const Object *other ) const; + virtual Bool isValidToExecute( const Object *other ) const override; /// This is the game logic execution function that all real CrateCollides will implement - virtual Bool executeCrateBehavior( Object *other ); - virtual Bool isRailroad() const { return FALSE;}; - virtual Bool isCarBombCrateCollide() const { return TRUE; } + virtual Bool executeCrateBehavior( Object *other ) override; + virtual Bool isRailroad() const override { return FALSE;}; + virtual Bool isCarBombCrateCollide() const override { return TRUE; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h index 7abd85627db..33d73d914cc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h @@ -73,10 +73,10 @@ class ConvertToHijackedVehicleCrateCollide : public CrateCollide protected: /// This allows specific vetoes to certain types of crates and their data - virtual Bool isValidToExecute( const Object *other ) const; + virtual Bool isValidToExecute( const Object *other ) const override; /// This is the game logic execution function that all real CrateCollides will implement - virtual Bool executeCrateBehavior( Object *other ); + virtual Bool executeCrateBehavior( Object *other ) override; - virtual Bool isHijackedVehicleCrateCollide() const { return TRUE; } + virtual Bool isHijackedVehicleCrateCollide() const override { return TRUE; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h index 43db92cc224..c75579c871f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h @@ -103,12 +103,12 @@ class CostModifierUpgrade : public UpgradeModule CostModifierUpgrade( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype defined by MemoryPoolObject - virtual void onDelete(); ///< we have some work to do when this module goes away - virtual void onCapture( Player *oldOwner, Player *newOwner ); + virtual void onDelete() override; ///< we have some work to do when this module goes away + virtual void onCapture( Player *oldOwner, Player *newOwner ) override; protected: - virtual void upgradeImplementation(); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation() override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CountermeasuresBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CountermeasuresBehavior.h index a583b07dbe5..84e5159ad66 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CountermeasuresBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CountermeasuresBehavior.h @@ -130,52 +130,52 @@ class CountermeasuresBehavior : public UpdateModule, public UpgradeMux, public C static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | MODULEINTERFACE_UPGRADE; } // BehaviorModule - virtual UpgradeModuleInterface* getUpgrade() { return this; } - virtual CountermeasuresBehaviorInterface* getCountermeasuresBehaviorInterface() { return this; } - virtual const CountermeasuresBehaviorInterface* getCountermeasuresBehaviorInterface() const { return this; } + virtual UpgradeModuleInterface* getUpgrade() override { return this; } + virtual CountermeasuresBehaviorInterface* getCountermeasuresBehaviorInterface() override { return this; } + virtual const CountermeasuresBehaviorInterface* getCountermeasuresBehaviorInterface() const override { return this; } // UpdateModuleInterface - virtual UpdateSleepTime update(); - virtual DisabledMaskType getDisabledTypesToProcess() const { return MAKE_DISABLED_MASK( DISABLED_HELD ); } + virtual UpdateSleepTime update() override; + virtual DisabledMaskType getDisabledTypesToProcess() const override { return MAKE_DISABLED_MASK( DISABLED_HELD ); } // CountermeasuresBehaviorInterface - virtual void reportMissileForCountermeasures( Object *missile ); - virtual ObjectID calculateCountermeasureToDivertTo( const Object& victim ); - virtual void reloadCountermeasures(); - virtual Bool isActive() const; + virtual void reportMissileForCountermeasures( Object *missile ) override; + virtual ObjectID calculateCountermeasureToDivertTo( const Object& victim ) override; + virtual void reloadCountermeasures() override; + virtual Bool isActive() const override; protected: - virtual void upgradeImplementation() + virtual void upgradeImplementation() override { setWakeFrame(getObject(), UPDATE_SLEEP_NONE); } - virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const + virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const override { getCountermeasuresBehaviorModuleData()->m_upgradeMuxData.getUpgradeActivationMasks(activation, conflicting); } - virtual void performUpgradeFX() + virtual void performUpgradeFX() override { getCountermeasuresBehaviorModuleData()->m_upgradeMuxData.performUpgradeFX(getObject()); } - virtual void processUpgradeRemoval() + virtual void processUpgradeRemoval() override { // I can't take it any more. Let the record show that I think the UpgradeMux multiple inheritance is CRAP. getCountermeasuresBehaviorModuleData()->m_upgradeMuxData.muxDataProcessUpgradeRemoval(getObject()); } - virtual Bool requiresAllActivationUpgrades() const + virtual Bool requiresAllActivationUpgrades() const override { return getCountermeasuresBehaviorModuleData()->m_upgradeMuxData.m_requiresAllTriggers; } Bool isUpgradeActive() const { return isAlreadyUpgraded(); } - virtual Bool isSubObjectsUpgrade() { return false; } + virtual Bool isSubObjectsUpgrade() override { return false; } void launchVolley(); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h index 4156cfb6222..e362d1e43f1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h @@ -87,14 +87,14 @@ enum SabotageVictimType CPP_11(: Int) // virtual destructor prototype provided by memory pool declaration /// This collide method gets called when collision occur - virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ); + virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ) override; - virtual Bool wouldLikeToCollideWith(const Object* other) const { return isValidToExecute(other); } + virtual Bool wouldLikeToCollideWith(const Object* other) const override { return isValidToExecute(other); } - virtual Bool isRailroad() const { return FALSE;}; - virtual Bool isCarBombCrateCollide() const { return FALSE; } - virtual Bool isHijackedVehicleCrateCollide() const { return FALSE; } - virtual Bool isSabotageBuildingCrateCollide() const { return FALSE; } + virtual Bool isRailroad() const override { return FALSE;}; + virtual Bool isCarBombCrateCollide() const override { return FALSE; } + virtual Bool isHijackedVehicleCrateCollide() const override { return FALSE; } + virtual Bool isSabotageBuildingCrateCollide() const override { return FALSE; } void doSabotageFeedbackFX( const Object *other, SabotageVictimType type = SAB_VICTIM_GENERIC ); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h index eb476ab5895..51f65e9ae0e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h @@ -48,7 +48,7 @@ class CreateCrateDieModuleData : public DieModuleData { m_crateNameList.clear(); } - ~CreateCrateDieModuleData() + virtual ~CreateCrateDieModuleData() override { m_crateNameList.clear(); } @@ -81,7 +81,7 @@ class CreateCrateDie : public DieModule CreateCrateDie( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; private: Bool testCreationChance( CrateTemplate const *currentCrateData ); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateModule.h index 8b6de2d9fc3..a2cd84e9ff9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateModule.h @@ -71,11 +71,11 @@ class CreateModule : public BehaviorModule, public CreateModuleInterface static Int getInterfaceMask() { return MODULEINTERFACE_CREATE; } // BehaviorModule - virtual CreateModuleInterface* getCreate() { return this; } + virtual CreateModuleInterface* getCreate() override { return this; } - virtual void onCreate() = 0; ///< This is called when you become a code Object - virtual void onBuildComplete(){ m_needToRunOnBuildComplete = FALSE; } ///< This is called when you are a finished game object - virtual Bool shouldDoOnBuildComplete() const { return m_needToRunOnBuildComplete; } + virtual void onCreate() override = 0; ///< This is called when you become a code Object + virtual void onBuildComplete() override{ m_needToRunOnBuildComplete = FALSE; } ///< This is called when you are a finished game object + virtual Bool shouldDoOnBuildComplete() const override { return m_needToRunOnBuildComplete; } private: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h index 12f0386c1f1..72417766ffc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h @@ -67,6 +67,6 @@ class CreateObjectDie : public DieModule CreateObjectDie( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrushDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrushDie.h index 457d5ae6dfd..2f3093c5538 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrushDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrushDie.h @@ -95,6 +95,6 @@ class CrushDie : public DieModule CrushDie( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamDie.h index 1a63cd30ba1..36c1c711588 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamDie.h @@ -58,6 +58,6 @@ class DamDie : public DieModule DamDie( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by MemoryPoolObject - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h index be732c89ed7..ae20d5583de 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h @@ -95,14 +95,14 @@ class DamageModule : public BehaviorModule, public DamageModuleInterface static Int getInterfaceMask() { return MODULEINTERFACE_DAMAGE; } // BehaviorModule - virtual DamageModuleInterface* getDamage() { return this; } + virtual DamageModuleInterface* getDamage() override { return this; } // damage module callbacks - virtual void onDamage( DamageInfo *damageInfo ) = 0; ///< damage callback - virtual void onHealing( DamageInfo *damageInfo ) = 0; ///< healing callback + virtual void onDamage( DamageInfo *damageInfo ) override = 0; ///< damage callback + virtual void onHealing( DamageInfo *damageInfo ) override = 0; ///< healing callback virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, BodyDamageType oldState, - BodyDamageType newState) = 0; ///< state change callback + BodyDamageType newState) override = 0; ///< state change callback protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h index 45f86ba1bfb..a156e7290eb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h @@ -74,24 +74,24 @@ class DefaultProductionExitUpdate : public UpdateModule, public ExitInterface public: - virtual ExitInterface* getUpdateExitInterface() { return this; } + virtual ExitInterface* getUpdateExitInterface() override { return this; } DefaultProductionExitUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration // Required funcs to fulfill interface requirements - virtual Bool isExitBusy() const {return FALSE;} ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. - virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ) { return DOOR_1; } - virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ); - virtual void unreserveDoorForExit( ExitDoorType exitDoor ) { /* nothing */ } - virtual void exitObjectByBudding( Object *newObj, Object *budHost ) { return; } - - virtual void setRallyPoint( const Coord3D *pos ); ///< define a "rally point" for units to move towards - virtual const Coord3D *getRallyPoint() const; ///< define a "rally point" for units to move towards - virtual Bool useSpawnRallyPoint() const; - virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) const; ///< get the natural "rally point" for units to move towards - virtual Bool getExitPosition( Coord3D& exitPosition ) const; ///< access to the "Door" position of the production object - virtual UpdateSleepTime update() { return UPDATE_SLEEP_FOREVER; } + virtual Bool isExitBusy() const override {return FALSE;} ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. + virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ) override { return DOOR_1; } + virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ) override; + virtual void unreserveDoorForExit( ExitDoorType exitDoor ) override { /* nothing */ } + virtual void exitObjectByBudding( Object *newObj, Object *budHost ) override { return; } + + virtual void setRallyPoint( const Coord3D *pos ) override; ///< define a "rally point" for units to move towards + virtual const Coord3D *getRallyPoint() const override; ///< define a "rally point" for units to move towards + virtual Bool useSpawnRallyPoint() const override; + virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) const override; ///< get the natural "rally point" for units to move towards + virtual Bool getExitPosition( Coord3D& exitPosition ) const override; ///< access to the "Door" position of the production object + virtual UpdateSleepTime update() override { return UPDATE_SLEEP_FOREVER; } protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h index adf4f31f2f7..3aae2fe392c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h @@ -72,8 +72,8 @@ class DefectorSpecialPower : public SpecialPowerModule DefectorSpecialPower( Thing *thing, const ModuleData *moduleData ); // virtual destructor prototype provided by memory pool object - virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions ); - virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ); + virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions ) override; + virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ) override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h index 7aa5e99339e..86238247091 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h @@ -74,7 +74,7 @@ class DeletionUpdate : public UpdateModule void setLifetimeRange( UnsignedInt minFrames, UnsignedInt maxFrames ); UnsignedInt getDieFrame() { return m_dieFrame; } - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h index f028aabe93a..1328f5784e5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h @@ -45,9 +45,9 @@ class DeliverPayloadStateMachine : public StateMachine protected: // snapshot interface - 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; }; //------------------------------------------------------------------------------------------------- @@ -57,13 +57,13 @@ class ApproachState : public State //Approaching the drop zone public: ApproachState( StateMachine *machine ) :State( machine, "ApproachState" ) {} - virtual StateReturnType update(); - virtual StateReturnType onEnter(); + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; protected: // snapshot interface STUBBED - no member vars to save. jba. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; }; EMPTY_DTOR(ApproachState) @@ -78,14 +78,14 @@ class DeliveringState : public State m_dropDelayLeft = 0; m_didOpen = false; } - virtual StateReturnType update(); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: UnsignedInt m_dropDelayLeft; @@ -100,14 +100,14 @@ class ConsiderNewApproachState : public State //Should I try again? Has own data to keep track. public: ConsiderNewApproachState( StateMachine *machine ) : State( machine, "ConsiderNewApproachState" ), m_numberEntriesToState(0) { } - virtual StateReturnType update(); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: Int m_numberEntriesToState; @@ -120,13 +120,13 @@ class RecoverFromOffMapState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(RecoverFromOffMapState, "RecoverFromOffMapState") public: RecoverFromOffMapState( StateMachine *machine ) : State( machine, "RecoverFromOffMapState" ), m_reEntryFrame(0) { } - virtual StateReturnType update(); - virtual StateReturnType onEnter(); + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; protected: // snapshot interface - 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; private: UnsignedInt m_reEntryFrame; @@ -140,13 +140,13 @@ class HeadOffMapState : public State //I'm outta here public: HeadOffMapState( StateMachine *machine ) :State( machine, "HeadOffMapState" ) { facingDirectionUponDelivery.zero(); } - virtual StateReturnType update(); - virtual StateReturnType onEnter(); + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; protected: // snapshot interface STUBBED - no member vars to save. jba. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; Coord3D facingDirectionUponDelivery; }; @@ -159,13 +159,13 @@ class CleanUpState : public State //Made it off map, delete ourselves public: CleanUpState( StateMachine *machine ) :State( machine, "CleanUpState" ) {} - virtual StateReturnType update(){return STATE_CONTINUE;} - virtual StateReturnType onEnter(); + virtual StateReturnType update() override{return STATE_CONTINUE;} + virtual StateReturnType onEnter() override; protected: // snapshot interface STUBBED - no member vars to save. jba. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; }; EMPTY_DTOR(CleanUpState) @@ -311,7 +311,7 @@ class DeliverPayloadAIUpdate : public AIUpdateInterface DeliverPayloadAIUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual AIFreeToExitType getAiFreeToExit(const Object* exiter) const; + virtual AIFreeToExitType getAiFreeToExit(const Object* exiter) const override; const Coord3D* getTargetPos() const { return &m_targetPos; } const Coord3D* getMoveToPos() const { return &m_moveToPos; } @@ -338,7 +338,7 @@ class DeliverPayloadAIUpdate : public AIUpdateInterface const DeliverPayloadData* getData() { return &m_data; } - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; void killDeliveryDecal(); @@ -347,8 +347,8 @@ class DeliverPayloadAIUpdate : public AIUpdateInterface protected: - virtual AIStateMachine* makeStateMachine(); - virtual Bool isAllowedToRespondToAiCommands(const AICommandParms* parms) const; + virtual AIStateMachine* makeStateMachine() override; + virtual Bool isAllowedToRespondToAiCommands(const AICommandParms* parms) const override; DeliverPayloadStateMachine* m_deliverPayloadStateMachine; ///< Controls my special logic Coord3D m_targetPos; ///< Where I plan to deliver my little friends, if obj is null diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h index 9085a9c9825..1ef8946bcae 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h @@ -73,8 +73,8 @@ class DemoTrapUpdate : public UpdateModule DemoTrapUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onObjectCreated(); - virtual UpdateSleepTime update(); + virtual void onObjectCreated() override; + virtual UpdateSleepTime update() override; void detonate(); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h index c8ad16ae630..57e0bd7ea83 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h @@ -95,9 +95,9 @@ class DeployStyleAIUpdate : public AIUpdateInterface DeployStyleAIUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void aiDoCommand(const AICommandParms* parms); - virtual Bool isIdle() const; - virtual UpdateSleepTime update(); + virtual void aiDoCommand(const AICommandParms* parms) override; + virtual Bool isIdle() const override; + virtual UpdateSleepTime update() override; UnsignedInt getUnpackTime() const { return getDeployStyleAIUpdateModuleData()->m_unpackTime; } UnsignedInt getPackTime() const { return getDeployStyleAIUpdateModuleData()->m_packTime; } diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h index f365c12956c..9c7251a4881 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h @@ -47,6 +47,6 @@ class DestroyDie : public DieModule DestroyDie( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h index c71fb130505..265f672407d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h @@ -56,9 +56,9 @@ class DestroyModule : public BehaviorModule, public DestroyModuleInterface static Int getInterfaceMask() { return MODULEINTERFACE_DESTROY; } // BehaviorModule - virtual DestroyModuleInterface* getDestroy() { return this; } + virtual DestroyModuleInterface* getDestroy() override { return this; } - virtual void onDestroy() = 0; + virtual void onDestroy() override = 0; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DieModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DieModule.h index c3a28c08d92..250c59ae68d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DieModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DieModule.h @@ -95,9 +95,9 @@ class DieModule : public BehaviorModule, public DieModuleInterface static Int getInterfaceMask() { return MODULEINTERFACE_DIE; } // BehaviorModule - virtual DieModuleInterface* getDie() { return this; } + virtual DieModuleInterface* getDie() override { return this; } - void onDie( const DamageInfo *damageInfo ) = 0; + virtual void onDie( const DamageInfo *damageInfo ) override = 0; protected: Bool isDieApplicable(const DamageInfo *damageInfo) const { return getDieModuleData()->isDieApplicable(getObject(), damageInfo); } diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h index 8706609875d..ace8afa7685 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h @@ -72,61 +72,61 @@ class DockUpdate : public UpdateModule , public DockUpdateInterface /** Returns true if it is okay for the docker to approach and prepare to dock. False could mean the queue is full, for example. */ - virtual Bool isClearToApproach( Object const* docker ) const; + virtual Bool isClearToApproach( Object const* docker ) const override; /** Give me a Queue point to drive to, and record that that point is taken. Returning null means there are none free */ - virtual Bool reserveApproachPosition( Object* docker, Coord3D *position, Int *index ); + virtual Bool reserveApproachPosition( Object* docker, Coord3D *position, Int *index ) override; /** Give me the next Queue point to drive to, and record that that point is taken. */ - virtual Bool advanceApproachPosition( Object* docker, Coord3D *position, Int *index ); + virtual Bool advanceApproachPosition( Object* docker, Coord3D *position, Int *index ) override; /** Return true when it is OK for docker to begin entering the dock The Dock will lift the restriction on one particular docker on its own, so you must continually ask. */ - virtual Bool isClearToEnter( Object const* docker ) const; + virtual Bool isClearToEnter( Object const* docker ) const override; /** Return true when it is OK for docker to request a new Approach position. The dock is in charge of keeping track of holes in the line, but the docker will remind us of their spot. */ - virtual Bool isClearToAdvance( Object const* docker, Int dockerIndex ) const; + virtual Bool isClearToAdvance( Object const* docker, Int dockerIndex ) const override; /** Give me the point that is the start of your docking path Returning null means there is none free All functions take docker as arg so we could have multiple docks on a building. Docker is not assumed, it is recorded and checked. */ - virtual void getEnterPosition( Object* docker, Coord3D *position ); + virtual void getEnterPosition( Object* docker, Coord3D *position ) override; /** Give me the middle point of the dock process where the action() happens */ - virtual void getDockPosition( Object* docker, Coord3D *position ); + virtual void getDockPosition( Object* docker, Coord3D *position ) override; /** Give me the point to drive to when I am done */ - virtual void getExitPosition( Object* docker, Coord3D *position ); + virtual void getExitPosition( Object* docker, Coord3D *position ) override; - virtual void onApproachReached( Object* docker ); ///< I have reached the Approach Point. - virtual void onEnterReached( Object* docker ); ///< I have reached the Enter Point. - virtual void onDockReached( Object* docker ); ///< I have reached the Dock point - virtual void onExitReached( Object* docker ); ///< I have reached the exit. You are no longer busy + virtual void onApproachReached( Object* docker ) override; ///< I have reached the Approach Point. + virtual void onEnterReached( Object* docker ) override; ///< I have reached the Enter Point. + virtual void onDockReached( Object* docker ) override; ///< I have reached the Dock point + virtual void onExitReached( Object* docker ) override; ///< I have reached the exit. You are no longer busy //The fact that action() is not here is intentional. This object cannot exist. You must //derive off it and implement action(). - virtual void cancelDock( Object* docker ); ///< Clear me from any reserved points, and if I was the reason you were Busy, you aren't anymore. + virtual void cancelDock( Object* docker ) override; ///< Clear me from any reserved points, and if I was the reason you were Busy, you aren't anymore. - virtual Bool isDockOpen() { return m_dockOpen; } ///< Is the dock open to accepting dockers - virtual void setDockOpen( Bool open ) { m_dockOpen = open; } ///< Open/Close the dock + virtual Bool isDockOpen() override { return m_dockOpen; } ///< Is the dock open to accepting dockers + virtual void setDockOpen( Bool open ) override { m_dockOpen = open; } ///< Open/Close the dock - virtual Bool isAllowPassthroughType(); ///< Not all docks allow you to path through them in your AIDock machine + virtual Bool isAllowPassthroughType() override; ///< Not all docks allow you to path through them in your AIDock machine - virtual Bool isRallyPointAfterDockType(){return FALSE;} ///< A minority of docks want to give you a final command to their rally point + virtual Bool isRallyPointAfterDockType() override{return FALSE;} ///< A minority of docks want to give you a final command to their rally point - virtual void setDockCrippled( Bool setting ); ///< Game Logic can set me as inoperative. I get to decide what that means. + virtual void setDockCrippled( Bool setting ) override; ///< Game Logic can set me as inoperative. I get to decide what that means. - virtual UpdateSleepTime update(); ///< In charge of lifting dock restriction for one registered as Approached if all is ready + virtual UpdateSleepTime update() override; ///< In charge of lifting dock restriction for one registered as Approached if all is ready protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h index 51807c9e9d5..150e893762d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h @@ -56,9 +56,9 @@ class DozerPrimaryStateMachine : public StateMachine protected: // snapshot interface - 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; }; @@ -207,76 +207,76 @@ class DozerAIUpdate : public AIUpdateInterface, public DozerAIInterface DozerAIUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual DozerAIInterface* getDozerAIInterface() {return this;} - virtual const DozerAIInterface* getDozerAIInterface() const {return this;} + virtual DozerAIInterface* getDozerAIInterface() override {return this;} + virtual const DozerAIInterface* getDozerAIInterface() const override {return this;} - virtual void onDelete(); + virtual void onDelete() override; // // module data methods ... this is LAME, multiple inheritance off an interface with replicated // data and code, ick! // NOTE: If you edit module data you must do it in both the Dozer *AND* the Worker // - virtual Real getRepairHealthPerSecond() const; ///< get health to repair per second - virtual Real getBoredTime() const; ///< how long till we're bored - virtual Real getBoredRange() const; ///< when we're bored, we look this far away to do things + virtual Real getRepairHealthPerSecond() const override; ///< get health to repair per second + virtual Real getBoredTime() const override; ///< how long till we're bored + virtual Real getBoredRange() const override; ///< when we're bored, we look this far away to do things // methods to override for the dozer behaviors virtual Object* construct( const ThingTemplate *what, const Coord3D *pos, Real angle, Player *owningPlayer, - Bool isRebuild ); ///< construct an object + Bool isRebuild ) override; ///< construct an object // get task information - virtual DozerTask getMostRecentCommand(); ///< return task that was most recently issued - virtual Bool isTaskPending( DozerTask task ); ///< is there a desire to do the requested task - virtual ObjectID getTaskTarget( DozerTask task ); ///< get target of task - virtual Bool isAnyTaskPending(); ///< is there any dozer task pending - virtual DozerTask getCurrentTask() const { return m_currentTask; } ///< return the current task we're doing - virtual void setCurrentTask( DozerTask task ) { m_currentTask = task; } ///< set the current task of the dozer + virtual DozerTask getMostRecentCommand() override; ///< return task that was most recently issued + virtual Bool isTaskPending( DozerTask task ) override; ///< is there a desire to do the requested task + virtual ObjectID getTaskTarget( DozerTask task ) override; ///< get target of task + virtual Bool isAnyTaskPending() override; ///< is there any dozer task pending + virtual DozerTask getCurrentTask() const override { return m_currentTask; } ///< return the current task we're doing + virtual void setCurrentTask( DozerTask task ) override { m_currentTask = task; } ///< set the current task of the dozer - virtual Bool getIsRebuild() { return m_isRebuild; } ///< get whether or not this building is a rebuild. + virtual Bool getIsRebuild() override { return m_isRebuild; } ///< get whether or not this building is a rebuild. // task actions - virtual void newTask( DozerTask task, Object *target ); ///< set a desire to do the requested task - virtual void cancelTask( DozerTask task ); ///< cancel this task from the queue, if it's the current task the dozer will stop working on it - virtual void cancelAllTasks(); ///< cancel all tasks from the queue, if it's the current task the dozer will stop working on it - virtual void resumePreviousTask(); ///< resume the previous task if there was one + virtual void newTask( DozerTask task, Object *target ) override; ///< set a desire to do the requested task + virtual void cancelTask( DozerTask task ) override; ///< cancel this task from the queue, if it's the current task the dozer will stop working on it + virtual void cancelAllTasks() override; ///< cancel all tasks from the queue, if it's the current task the dozer will stop working on it + virtual void resumePreviousTask() override; ///< resume the previous task if there was one // internal methods to manage behavior from within the dozer state machine - virtual void internalTaskComplete( DozerTask task ); ///< set a dozer task as successfully completed - virtual void internalCancelTask( DozerTask task ); ///< cancel this task from the dozer - virtual void internalTaskCompleteOrCancelled( DozerTask task ); ///< this is called when tasks are cancelled or completed + virtual void internalTaskComplete( DozerTask task ) override; ///< set a dozer task as successfully completed + virtual void internalCancelTask( DozerTask task ) override; ///< cancel this task from the dozer + virtual void internalTaskCompleteOrCancelled( DozerTask task ) override; ///< this is called when tasks are cancelled or completed /** return a dock point for the action and task (if valid) ... note it can return nullptr if no point has been set for the combination of task and point */ - virtual const Coord3D* getDockPoint( DozerTask task, DozerDockPoint point ); + virtual const Coord3D* getDockPoint( DozerTask task, DozerDockPoint point ) override; - virtual void setBuildSubTask( DozerBuildSubTask subTask ) { m_buildSubTask = subTask; }; - virtual DozerBuildSubTask getBuildSubTask() { return m_buildSubTask; } + virtual void setBuildSubTask( DozerBuildSubTask subTask ) override { m_buildSubTask = subTask; }; + virtual DozerBuildSubTask getBuildSubTask() override { return m_buildSubTask; } - virtual UpdateSleepTime update(); ///< the update entry point + virtual UpdateSleepTime update() override; ///< the update entry point // repairing - virtual Bool canAcceptNewRepair( Object *obj ); - virtual void createBridgeScaffolding( Object *bridgeTower ); - virtual void removeBridgeScaffolding( Object *bridgeTower ); + virtual Bool canAcceptNewRepair( Object *obj ) override; + virtual void createBridgeScaffolding( Object *bridgeTower ) override; + virtual void removeBridgeScaffolding( Object *bridgeTower ) override; - virtual void startBuildingSound( const AudioEventRTS *sound, ObjectID constructionSiteID ); - virtual void finishBuildingSound(); + virtual void startBuildingSound( const AudioEventRTS *sound, ObjectID constructionSiteID ) override; + virtual void finishBuildingSound() override; // // the following methods must be overridden so that if a player issues a command the dozer // can exit the internal state machine and do whatever the player says // - virtual void aiDoCommand(const AICommandParms* parms); + virtual void aiDoCommand(const AICommandParms* parms) override; protected: - virtual void privateRepair( Object *obj, CommandSourceType cmdSource ); ///< repair the target - virtual void privateResumeConstruction( Object *obj, CommandSourceType cmdSource ); ///< resume construction on obj + virtual void privateRepair( Object *obj, CommandSourceType cmdSource ) override; ///< repair the target + virtual void privateResumeConstruction( Object *obj, CommandSourceType cmdSource ) override; ///< resume construction on obj struct DozerTaskInfo { diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h index ac230ffc2e7..4e7a5237acc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h @@ -83,17 +83,17 @@ class DumbProjectileBehavior : public UpdateModule, public ProjectileUpdateInter // virtual destructor provided by memory pool object // UpdateModuleInterface - virtual UpdateSleepTime update(); - virtual ProjectileUpdateInterface* getProjectileUpdateInterface() { return this; } + virtual UpdateSleepTime update() override; + virtual ProjectileUpdateInterface* getProjectileUpdateInterface() override { return this; } // ProjectileUpdateInterface - virtual void projectileLaunchAtObjectOrPosition(const Object *victim, const Coord3D* victimPos, const Object *launcher, WeaponSlotType wslot, Int specificBarrelToUse, const WeaponTemplate* detWeap, const ParticleSystemTemplate* exhaustSysOverride); - virtual void projectileFireAtObjectOrPosition( const Object *victim, const Coord3D *victimPos, const WeaponTemplate *detWeap, const ParticleSystemTemplate* exhaustSysOverride ); - virtual Bool projectileHandleCollision( Object *other ); - virtual Bool projectileIsArmed() const { return true; } - virtual ObjectID projectileGetLauncherID() const { return m_launcherID; } - virtual void setFramesTillCountermeasureDiversionOccurs( UnsignedInt frames ) {} - virtual void projectileNowJammed() {} + virtual void projectileLaunchAtObjectOrPosition(const Object *victim, const Coord3D* victimPos, const Object *launcher, WeaponSlotType wslot, Int specificBarrelToUse, const WeaponTemplate* detWeap, const ParticleSystemTemplate* exhaustSysOverride) override; + virtual void projectileFireAtObjectOrPosition( const Object *victim, const Coord3D *victimPos, const WeaponTemplate *detWeap, const ParticleSystemTemplate* exhaustSysOverride ) override; + virtual Bool projectileHandleCollision( Object *other ) override; + virtual Bool projectileIsArmed() const override { return true; } + virtual ObjectID projectileGetLauncherID() const override { return m_launcherID; } + virtual void setFramesTillCountermeasureDiversionOccurs( UnsignedInt frames ) override {} + virtual void projectileNowJammed() override {} protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h index 96b0e953dd2..d46148a3eb7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h @@ -76,7 +76,7 @@ class DynamicGeometryInfoUpdate : public UpdateModule DynamicGeometryInfoUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h index 519169c903f..adbdb80b6a3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h @@ -73,7 +73,7 @@ class DynamicShroudClearingRangeUpdate : public UpdateModule DynamicShroudClearingRangeUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; void createGridDecals( const RadiusDecalTemplate& tmpl, Real radius, const Coord3D& pos ); void killGridDecals(); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h index 2746d46deb0..94904e80f16 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h @@ -122,7 +122,7 @@ class EMPUpdate : public UpdateModule UnsignedInt getDieFrame() { return m_dieFrame; } - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; void doDisableAttack(); protected: @@ -202,14 +202,14 @@ class LeafletDropBehavior : public UpdateModule, LeafletDropBehavior( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; void doDisableAttack(); // BehaviorModule - virtual DieModuleInterface* getDie() { return this; } + virtual DieModuleInterface* getDie() override { return this; } // DieModuleInterface - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h index abc0b9e3b54..42d25175826 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h @@ -65,7 +65,7 @@ class EjectPilotDie : public DieModule static void ejectPilot(const ObjectCreationList* ocl, const Object* dyingObject, const Object* damageDealer); - virtual void onDie( const DamageInfo *damageInfo ); - virtual DieModuleInterface* getEjectPilotDieInterface() {return this; } + virtual void onDie( const DamageInfo *damageInfo ) override; + virtual DieModuleInterface* getEjectPilotDieInterface() override {return this; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h index 8c6bcd5e63d..25bfa92d729 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h @@ -71,7 +71,7 @@ class EnemyNearUpdate : public UpdateModule EnemyNearUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h index ccd26ae24c6..52845063870 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h @@ -65,7 +65,7 @@ class ExperienceScalarUpgrade : public UpgradeModule protected: - virtual void upgradeImplementation(); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation() override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FXListDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FXListDie.h index 92e3665382d..af6c1dcedf8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FXListDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FXListDie.h @@ -88,42 +88,42 @@ class FXListDie : public DieModule, public UpgradeMux static Int getInterfaceMask() { return BehaviorModule::getInterfaceMask() | (MODULEINTERFACE_UPGRADE) | (MODULEINTERFACE_DIE); } // BehaviorModule - virtual UpgradeModuleInterface* getUpgrade() { return this; } - virtual DieModuleInterface* getDie() { return this; } + virtual UpgradeModuleInterface* getUpgrade() override { return this; } + virtual DieModuleInterface* getDie() override { return this; } - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; protected: - virtual void upgradeImplementation() + virtual void upgradeImplementation() override { // nothing! } - virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const + virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const override { getFXListDieModuleData()->m_upgradeMuxData.getUpgradeActivationMasks(activation, conflicting); } - virtual void performUpgradeFX() + virtual void performUpgradeFX() override { getFXListDieModuleData()->m_upgradeMuxData.performUpgradeFX(getObject()); } - virtual void processUpgradeRemoval() + virtual void processUpgradeRemoval() override { // I can't take it any more. Let the record show that I think the UpgradeMux multiple inheritance is CRAP. getFXListDieModuleData()->m_upgradeMuxData.muxDataProcessUpgradeRemoval(getObject()); } - virtual Bool requiresAllActivationUpgrades() const + virtual Bool requiresAllActivationUpgrades() const override { return getFXListDieModuleData()->m_upgradeMuxData.m_requiresAllTriggers; } Bool isUpgradeActive() const { return isAlreadyUpgraded(); } - virtual Bool isSubObjectsUpgrade() { return false; } + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h index 2d62be1ebe6..c9dd90d96ab 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h @@ -63,36 +63,36 @@ class FireOCLAfterWeaponCooldownUpdate : public UpdateModule, public UpgradeMux // virtual destructor prototype provided by memory pool declaration // update methods - virtual UpdateSleepTime update(); ///< called once per frame + virtual UpdateSleepTime update() override; ///< called once per frame protected: - virtual void upgradeImplementation() + virtual void upgradeImplementation() override { // nothing! } - virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const + virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const override { getFireOCLAfterWeaponCooldownUpdateModuleData()->m_upgradeMuxData.getUpgradeActivationMasks(activation, conflicting); } - virtual void performUpgradeFX() + virtual void performUpgradeFX() override { getFireOCLAfterWeaponCooldownUpdateModuleData()->m_upgradeMuxData.performUpgradeFX(getObject()); } - virtual void processUpgradeRemoval() + virtual void processUpgradeRemoval() override { // I can't take it any more. Let the record show that I think the UpgradeMux multiple inheritance is CRAP. getFireOCLAfterWeaponCooldownUpdateModuleData()->m_upgradeMuxData.muxDataProcessUpgradeRemoval(getObject()); } - virtual Bool requiresAllActivationUpgrades() const + virtual Bool requiresAllActivationUpgrades() const override { return getFireOCLAfterWeaponCooldownUpdateModuleData()->m_upgradeMuxData.m_requiresAllTriggers; } - virtual Bool isSubObjectsUpgrade() { return false; } + virtual Bool isSubObjectsUpgrade() override { return false; } void resetStats(); void fireOCL(); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h index 7d73089bc4a..9f15120c201 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h @@ -64,7 +64,7 @@ class FireSpreadUpdate : public UpdateModule FireSpreadUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; void startFireSpreading(); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h index fce140d0690..c2b594772d4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h @@ -68,7 +68,7 @@ class FireWeaponCollide : public CollideModule protected: - virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ); + virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ) override; virtual Bool shouldFireWeapon(); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponPower.h index 5db2ecb9012..5ca8cf9b4c2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponPower.h @@ -75,9 +75,9 @@ class FireWeaponPower : public SpecialPowerModule FireWeaponPower( Thing *thing, const ModuleData *moduleData ); - virtual void doSpecialPower( UnsignedInt commandOptions ); - virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ); - virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions ); + virtual void doSpecialPower( UnsignedInt commandOptions ) override; + virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ) override; + virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions ) override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h index 3532abe8552..11673032127 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h @@ -62,7 +62,7 @@ class FireWeaponUpdate : public UpdateModule FireWeaponUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h index d293c2acada..1d9a657c2d6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h @@ -116,48 +116,48 @@ class FireWeaponWhenDamagedBehavior : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_UPGRADE) | (MODULEINTERFACE_DAMAGE); } // BehaviorModule - virtual UpgradeModuleInterface* getUpgrade() { return this; } - virtual DamageModuleInterface* getDamage() { return this; } + virtual UpgradeModuleInterface* getUpgrade() override { return this; } + virtual DamageModuleInterface* getDamage() override { return this; } // DamageModuleInterface - virtual void onDamage( DamageInfo *damageInfo ); - virtual void onHealing( DamageInfo *damageInfo ) { } - virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState) { } + virtual void onDamage( DamageInfo *damageInfo ) override; + virtual void onHealing( DamageInfo *damageInfo ) override { } + virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState) override { } // UpdateModuleInterface - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: - virtual void upgradeImplementation() + virtual void upgradeImplementation() override { setWakeFrame(getObject(), UPDATE_SLEEP_NONE); } - virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const + virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const override { getFireWeaponWhenDamagedBehaviorModuleData()->m_upgradeMuxData.getUpgradeActivationMasks(activation, conflicting); } - virtual void performUpgradeFX() + virtual void performUpgradeFX() override { getFireWeaponWhenDamagedBehaviorModuleData()->m_upgradeMuxData.performUpgradeFX(getObject()); } - virtual void processUpgradeRemoval() + virtual void processUpgradeRemoval() override { // I can't take it any more. Let the record show that I think the UpgradeMux multiple inheritance is CRAP. getFireWeaponWhenDamagedBehaviorModuleData()->m_upgradeMuxData.muxDataProcessUpgradeRemoval(getObject()); } - virtual Bool requiresAllActivationUpgrades() const + virtual Bool requiresAllActivationUpgrades() const override { return getFireWeaponWhenDamagedBehaviorModuleData()->m_upgradeMuxData.m_requiresAllTriggers; } Bool isUpgradeActive() const { return isAlreadyUpgraded(); } - virtual Bool isSubObjectsUpgrade() { return false; } + virtual Bool isSubObjectsUpgrade() override { return false; } private: Weapon *m_reactionWeaponPristine; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h index cd33e9afccb..9890cf85de5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h @@ -86,42 +86,42 @@ class FireWeaponWhenDeadBehavior : public BehaviorModule, static Int getInterfaceMask() { return BehaviorModule::getInterfaceMask() | (MODULEINTERFACE_UPGRADE) | (MODULEINTERFACE_DIE); } // BehaviorModule - virtual UpgradeModuleInterface* getUpgrade() { return this; } - virtual DieModuleInterface* getDie() { return this; } + virtual UpgradeModuleInterface* getUpgrade() override { return this; } + virtual DieModuleInterface* getDie() override { return this; } // DamageModuleInterface - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; protected: - virtual void upgradeImplementation() + virtual void upgradeImplementation() override { // nothing! } - virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const + virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const override { getFireWeaponWhenDeadBehaviorModuleData()->m_upgradeMuxData.getUpgradeActivationMasks(activation, conflicting); } - virtual void performUpgradeFX() + virtual void performUpgradeFX() override { getFireWeaponWhenDeadBehaviorModuleData()->m_upgradeMuxData.performUpgradeFX(getObject()); } - virtual void processUpgradeRemoval() + virtual void processUpgradeRemoval() override { // I can't take it any more. Let the record show that I think the UpgradeMux multiple inheritance is CRAP. getFireWeaponWhenDeadBehaviorModuleData()->m_upgradeMuxData.muxDataProcessUpgradeRemoval(getObject()); } - virtual Bool requiresAllActivationUpgrades() const + virtual Bool requiresAllActivationUpgrades() const override { return getFireWeaponWhenDeadBehaviorModuleData()->m_upgradeMuxData.m_requiresAllTriggers; } Bool isUpgradeActive() const { return isAlreadyUpgraded(); } - virtual Bool isSubObjectsUpgrade() { return false; } + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h index 14b7b0a41d6..97d44acb0a9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h @@ -70,7 +70,7 @@ class FirestormDynamicGeometryInfoUpdate : public DynamicGeometryInfoUpdate FirestormDynamicGeometryInfoUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h index 67ab98c966a..f47026314bf 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h @@ -80,20 +80,20 @@ class FlammableUpdate : public UpdateModule, public DamageModuleInterface // virtual destructor prototype provided by memory pool declaration static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DAMAGE); } - virtual DamageModuleInterface* getDamage() { return this; } + virtual DamageModuleInterface* getDamage() override { return this; } void tryToIgnite(); ///< FlammabeDamage uses this. It is up to me to decide if I am burnable Bool wouldIgnite(); ///< Since we need to cheat sometimes and light something directly, ask if this would light //UpdateModuleInterface - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; //DamageModuleInterface - virtual void onDamage( DamageInfo *damageInfo ); - virtual void onHealing( DamageInfo *damageInfo ) { } + virtual void onDamage( DamageInfo *damageInfo ) override; + virtual void onHealing( DamageInfo *damageInfo ) override { } virtual void onBodyDamageStateChange( const DamageInfo *damageInfo, BodyDamageType oldState, - BodyDamageType newState ) { } + BodyDamageType newState ) override { } protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h index a39cdaf6c04..c284ecf2ab0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h @@ -105,50 +105,50 @@ class FlightDeckBehavior : public AIUpdateInterface, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DIE); } // BehaviorModule - virtual ParkingPlaceBehaviorInterface* getParkingPlaceBehaviorInterface() { return this; } - virtual ExitInterface* getUpdateExitInterface() { return this; } - virtual DieModuleInterface* getDie() { return this; } + virtual ParkingPlaceBehaviorInterface* getParkingPlaceBehaviorInterface() override { return this; } + virtual ExitInterface* getUpdateExitInterface() override { return this; } + virtual DieModuleInterface* getDie() override { return this; } // ExitInterface - virtual Bool isExitBusy() const {return FALSE;} ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. - virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ); - virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ); - virtual void unreserveDoorForExit( ExitDoorType exitDoor ); - virtual void exitObjectByBudding( Object *newObj, Object *budHost ) { return; } - virtual Bool getExitPosition( Coord3D& rallyPoint ) const { return FALSE; } + virtual Bool isExitBusy() const override {return FALSE;} ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. + virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ) override; + virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ) override; + virtual void unreserveDoorForExit( ExitDoorType exitDoor ) override; + virtual void exitObjectByBudding( Object *newObj, Object *budHost ) override { return; } + virtual Bool getExitPosition( Coord3D& rallyPoint ) const override { return FALSE; } virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) { return FALSE; } - virtual void setRallyPoint( const Coord3D *pos ) {} - virtual const Coord3D *getRallyPoint() const { return nullptr;} + virtual void setRallyPoint( const Coord3D *pos ) override {} + virtual const Coord3D *getRallyPoint() const override { return nullptr;} // UpdateModule - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // DieModule - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; // ParkingPlaceBehaviorInterface - virtual Bool shouldReserveDoorWhenQueued(const ThingTemplate* thing) const; - virtual Bool hasAvailableSpaceFor(const ThingTemplate* thing) const; - virtual Bool hasReservedSpace(ObjectID id) const; - virtual Int getSpaceIndex( ObjectID id ) const; - virtual Bool reserveSpace(ObjectID id, Real parkingOffset, PPInfo* info); - virtual void releaseSpace(ObjectID id); - virtual Bool reserveRunway(ObjectID id, Bool forLanding); - virtual void releaseRunway(ObjectID id); - virtual void calcPPInfo( ObjectID id, PPInfo *info ); - virtual Int getRunwayIndex(ObjectID id); - virtual Int getRunwayCount() const { return m_runways.size(); } - virtual ObjectID getRunwayReservation( Int r, RunwayReservationType type ); - virtual void transferRunwayReservationToNextInLineForTakeoff(ObjectID id); - virtual Real getApproachHeight() const { return getFlightDeckBehaviorModuleData()->m_approachHeight; } - virtual Real getLandingDeckHeightOffset() const { return getFlightDeckBehaviorModuleData()->m_landingDeckHeightOffset; } - virtual void setHealee(Object* healee, Bool add); - virtual void killAllParkedUnits(); - virtual void defectAllParkedUnits(Team* newTeam, UnsignedInt detectionTime); - virtual Bool calcBestParkingAssignment( ObjectID id, Coord3D *pos, Int *oldIndex = nullptr, Int *newIndex = nullptr ); + virtual Bool shouldReserveDoorWhenQueued(const ThingTemplate* thing) const override; + virtual Bool hasAvailableSpaceFor(const ThingTemplate* thing) const override; + virtual Bool hasReservedSpace(ObjectID id) const override; + virtual Int getSpaceIndex( ObjectID id ) const override; + virtual Bool reserveSpace(ObjectID id, Real parkingOffset, PPInfo* info) override; + virtual void releaseSpace(ObjectID id) override; + virtual Bool reserveRunway(ObjectID id, Bool forLanding) override; + virtual void releaseRunway(ObjectID id) override; + virtual void calcPPInfo( ObjectID id, PPInfo *info ) override; + virtual Int getRunwayIndex(ObjectID id) override; + virtual Int getRunwayCount() const override { return m_runways.size(); } + virtual ObjectID getRunwayReservation( Int r, RunwayReservationType type ) override; + virtual void transferRunwayReservationToNextInLineForTakeoff(ObjectID id) override; + virtual Real getApproachHeight() const override { return getFlightDeckBehaviorModuleData()->m_approachHeight; } + virtual Real getLandingDeckHeightOffset() const override { return getFlightDeckBehaviorModuleData()->m_landingDeckHeightOffset; } + virtual void setHealee(Object* healee, Bool add) override; + virtual void killAllParkedUnits() override; + virtual void defectAllParkedUnits(Team* newTeam, UnsignedInt detectionTime) override; + virtual Bool calcBestParkingAssignment( ObjectID id, Coord3D *pos, Int *oldIndex = nullptr, Int *newIndex = nullptr ) override; // AIUpdateInterface - virtual void aiDoCommand(const AICommandParms* parms); + virtual void aiDoCommand(const AICommandParms* parms) override; virtual const std::vector* getTaxiLocations( ObjectID id ) const; virtual const std::vector* getCreationLocations( ObjectID id ) const; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h index c267ba8e169..99eb94906cb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h @@ -63,7 +63,7 @@ class FloatUpdate : public UpdateModule void setEnabled( Bool enabled ) { m_enabled = enabled; } ///< enable/disable floating - virtual UpdateSleepTime update(); ///< Deciding whether or not to make new guys + virtual UpdateSleepTime update() override; ///< Deciding whether or not to make new guys protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h index 3c0cc4e0753..910a9c46435 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h @@ -105,54 +105,54 @@ class GarrisonContain : public OpenContain GarrisonContain( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); ///< called once per frame + virtual UpdateSleepTime update() override; ///< called once per frame - virtual Bool isValidContainerFor( const Object* obj, Bool checkCapacity) const; // Garrison has an extra check forbidding any containment if ReallyDamaged - virtual Bool isGarrisonable() const { return true; } ///< can this unit be Garrisoned? (ick) - virtual Bool isBustable() const { return TRUE; } ///< can this container get busted by a bunkerbuster - virtual Bool isImmuneToClearBuildingAttacks() const { return getGarrisonContainModuleData()->m_immuneToClearBuildingAttacks; } - virtual Bool isHealContain() const { return false; } ///< true when container only contains units while healing (not a transport!) - virtual Bool isTunnelContain() const { return FALSE; } - virtual Bool isPassengerAllowedToFire( ObjectID id = INVALID_ID ) const; ///< Hey, can I shoot out of this container? - virtual Bool isEnclosingContainerFor( const Object *obj ) const { return getGarrisonContainModuleData()->m_isEnclosingContainer; } - virtual Bool isSpecialOverlordStyleContainer() const {return FALSE;} + virtual Bool isValidContainerFor( const Object* obj, Bool checkCapacity) const override; // Garrison has an extra check forbidding any containment if ReallyDamaged + virtual Bool isGarrisonable() const override { return true; } ///< can this unit be Garrisoned? (ick) + virtual Bool isBustable() const override { return TRUE; } ///< can this container get busted by a bunkerbuster + virtual Bool isImmuneToClearBuildingAttacks() const override { return getGarrisonContainModuleData()->m_immuneToClearBuildingAttacks; } + virtual Bool isHealContain() const override { return false; } ///< true when container only contains units while healing (not a transport!) + virtual Bool isTunnelContain() const override { return FALSE; } + virtual Bool isPassengerAllowedToFire( ObjectID id = INVALID_ID ) const override; ///< Hey, can I shoot out of this container? + virtual Bool isEnclosingContainerFor( const Object *obj ) const override { return getGarrisonContainModuleData()->m_isEnclosingContainer; } + virtual Bool isSpecialOverlordStyleContainer() const override {return FALSE;} - virtual void removeAllContained( Bool exposeStealthUnits ); ///< remove all contents of this open container + virtual void removeAllContained( Bool exposeStealthUnits ) override; ///< remove all contents of this open container - virtual void exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor ); ///< exit one of our content items from us - virtual void exitObjectByBudding( Object *newObj, Object *budHost ) { return; }; - virtual void onContaining( Object *obj, Bool wasSelected ); ///< object now contains 'obj' - virtual void onRemoving( Object *obj ); ///< object no longer contains 'obj' - virtual void onSelling(); + virtual void exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor ) override; ///< exit one of our content items from us + virtual void exitObjectByBudding( Object *newObj, Object *budHost ) override { return; }; + virtual void onContaining( Object *obj, Bool wasSelected ) override; ///< object now contains 'obj' + virtual void onRemoving( Object *obj ) override; ///< object no longer contains 'obj' + virtual void onSelling() override; // A Garrison Contain must eject all passengers when it crosses the ReallyDamaged threshold. virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, BodyDamageType oldState, - BodyDamageType newState); ///< Die Interface state change callback + BodyDamageType newState) override; ///< Die Interface state change callback /** return the player that *appears* to control this unit, given an observing player. if null, use getObject()->getControllingPlayer() instead. */ - virtual const Player* getApparentControllingPlayer( const Player* observingPlayer ) const; - virtual void recalcApparentControllingPlayer(); - virtual Bool isDisplayedOnControlBar() const {return TRUE;}///< Does this container display its contents on the ControlBar? + virtual const Player* getApparentControllingPlayer( const Player* observingPlayer ) const override; + virtual void recalcApparentControllingPlayer() override; + virtual Bool isDisplayedOnControlBar() const override {return TRUE;}///< Does this container display its contents on the ControlBar? - virtual void onDamage( DamageInfo *info ); + virtual void onDamage( DamageInfo *info ) override; - virtual void setEvacDisposition( EvacDisposition disp ) { m_evacDisposition = disp; }; + virtual void setEvacDisposition( EvacDisposition disp ) override { m_evacDisposition = disp; }; protected: - virtual void redeployOccupants(); ///< redeploy the occupants of us at all available garrison points - virtual void onObjectCreated(); + virtual void redeployOccupants() override; ///< redeploy the occupants of us at all available garrison points + virtual void onObjectCreated() override; void validateRallyPoint(); ///< validate (if necessary) and pick (if possible) an exit rally point - virtual Bool calcBestGarrisonPosition( Coord3D *sourcePos, const Coord3D *targetPos ); - virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, Object *victim ); - virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, const Coord3D *targetPos ); + virtual Bool calcBestGarrisonPosition( Coord3D *sourcePos, const Coord3D *targetPos ) override; + virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, Object *victim ) override; + virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, const Coord3D *targetPos ) override; void updateEffects(); ///< do any effects needed per frame void loadGarrisonPoints(); ///< load garrison point position data and save for later diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h index 84d68fc7f1d..a29731e7962 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h @@ -82,35 +82,35 @@ class GenerateMinefieldBehavior : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DIE) | (MODULEINTERFACE_UPGRADE); } // BehaviorModule - virtual DieModuleInterface* getDie() { return this; } - virtual UpgradeModuleInterface* getUpgrade() { return this; } - virtual UpdateSleepTime update(); + virtual DieModuleInterface* getDie() override { return this; } + virtual UpgradeModuleInterface* getUpgrade() override { return this; } + virtual UpdateSleepTime update() override; // DamageModuleInterface - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; void setMinefieldTarget(const Coord3D* pos); protected: - virtual void upgradeImplementation(); - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation() override; + virtual Bool isSubObjectsUpgrade() override { return false; } - virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const + virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const override { getGenerateMinefieldBehaviorModuleData()->m_upgradeMuxData.getUpgradeActivationMasks(activation, conflicting); } - virtual void performUpgradeFX() + virtual void performUpgradeFX() override { getGenerateMinefieldBehaviorModuleData()->m_upgradeMuxData.performUpgradeFX(getObject()); } - virtual void processUpgradeRemoval() + virtual void processUpgradeRemoval() override { // I can't take it any more. Let the record show that I think the UpgradeMux multiple inheritance is CRAP. getGenerateMinefieldBehaviorModuleData()->m_upgradeMuxData.muxDataProcessUpgradeRemoval(getObject()); } - virtual Bool requiresAllActivationUpgrades() const + virtual Bool requiresAllActivationUpgrades() const override { return getGenerateMinefieldBehaviorModuleData()->m_upgradeMuxData.m_requiresAllTriggers; } diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantScienceUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantScienceUpgrade.h index 166afd3fb95..fa6e96f483b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantScienceUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantScienceUpgrade.h @@ -71,8 +71,8 @@ class GrantScienceUpgrade : public UpgradeModule // virtual destructor prototype defined by MemoryPoolObject protected: - virtual void upgradeImplementation( ); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation( ) override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } private: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantStealthBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantStealthBehavior.h index d7863c4756f..e431caaedbe 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantStealthBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantStealthBehavior.h @@ -95,7 +95,7 @@ class GrantStealthBehavior : public UpdateModule GrantStealthBehavior( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; private: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h index 309edde77a0..ce2e530a451 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h @@ -68,8 +68,8 @@ class GrantUpgradeCreate : public CreateModule // virtual destructor prototype provided by memory pool declaration /// the create method - virtual void onCreate(); - virtual void onBuildComplete(); ///< This is called when you are a finished game object + virtual void onCreate() override; + virtual void onBuildComplete() override; ///< This is called when you are a finished game object protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h index 1ee56d85707..81996262413 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h @@ -48,15 +48,15 @@ class HackInternetState : public State { m_framesRemaining = 0; } - virtual StateReturnType update(); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: UnsignedInt m_framesRemaining; //frames till next cash update @@ -72,14 +72,14 @@ class PackingState : public State { m_framesRemaining = 0; } - virtual StateReturnType update(); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: UnsignedInt m_framesRemaining; //frames till packing animation complete @@ -95,14 +95,14 @@ class UnpackingState : public State { m_framesRemaining = 0; } - virtual StateReturnType update(); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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; private: UnsignedInt m_framesRemaining; //frames till unpacking animation complete @@ -189,7 +189,7 @@ class HackInternetAIUpdate : public AIUpdateInterface, public HackInternetAIInte HackInternetAIUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void aiDoCommand(const AICommandParms* parms); + virtual void aiDoCommand(const AICommandParms* parms) override; Real getPackUnpackVariationFactor() const { return getHackInternetAIUpdateModuleData()->m_packUnpackVariationFactor; } UnsignedInt getUnpackTime() const; @@ -202,19 +202,19 @@ class HackInternetAIUpdate : public AIUpdateInterface, public HackInternetAIInte UnsignedInt getXpPerCashUpdate() const { return getHackInternetAIUpdateModuleData()->m_xpPerCashUpdate; } void hackInternet(); - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; - virtual Bool isIdle() const; + virtual Bool isIdle() const override; - virtual HackInternetAIInterface* getHackInternetAIInterface() { return this; } - virtual const HackInternetAIInterface* getHackInternetAIInterface() const { return this; } + virtual HackInternetAIInterface* getHackInternetAIInterface() override { return this; } + virtual const HackInternetAIInterface* getHackInternetAIInterface() const override { return this; } - virtual Bool isHacking() const; - virtual Bool isHackingPackingOrUnpacking() const; + virtual Bool isHacking() const override; + virtual Bool isHackingPackingOrUnpacking() const override; protected: - virtual AIStateMachine* makeStateMachine(); + virtual AIStateMachine* makeStateMachine() override; AICommandParmsStorage m_pendingCommand; Bool m_hasPendingCommand; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealContain.h index 461e9203fff..161649bad90 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealContain.h @@ -61,9 +61,9 @@ class HealContain : public OpenContain HealContain( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); ///< called once per frame - virtual Bool isHealContain() const { return true; } ///< true when container only contains units while healing (not a transport!) - virtual Bool isTunnelContain() const { return FALSE; } + virtual UpdateSleepTime update() override; ///< called once per frame + virtual Bool isHealContain() const override { return true; } ///< true when container only contains units while healing (not a transport!) + virtual Bool isTunnelContain() const override { return FALSE; } protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h index e2f8bdcd914..b0dc9e67156 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h @@ -51,5 +51,5 @@ class HealCrateCollide : public CrateCollide protected: /// This is the game logic execution function that all real CrateCollides will implement - virtual Bool executeCrateBehavior( Object *other ); + virtual Bool executeCrateBehavior( Object *other ) override; }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h index baf11636740..8df5111fa96 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h @@ -65,7 +65,7 @@ class HeightDieUpdate : public UpdateModule HeightDieUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h index 9e56bf22815..00a2702d1d5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h @@ -91,8 +91,8 @@ class HelicopterSlowDeathBehavior : public SlowDeathBehavior HelicopterSlowDeathBehavior( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void beginSlowDeath( const DamageInfo *damageInfo ); ///< begin the slow death cycle - virtual UpdateSleepTime update(); + virtual void beginSlowDeath( const DamageInfo *damageInfo ) override; ///< begin the slow death cycle + virtual UpdateSleepTime update() override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelixContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelixContain.h index 8b15f1468a5..0a8798c45ff 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelixContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelixContain.h @@ -63,50 +63,50 @@ class HelixContain : public TransportContain virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, BodyDamageType oldState, - BodyDamageType newState); ///< state change callback + BodyDamageType newState) override; ///< state change callback public: HelixContain( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual OpenContain *asOpenContain() { return this; } ///< treat as open container - virtual Bool isHealContain() const { return false; } ///< true when container only contains units while healing (not a transport!) - virtual Bool isTunnelContain() const { return FALSE; } - virtual Bool isImmuneToClearBuildingAttacks() const { return true; } - virtual Bool isSpecialOverlordStyleContainer() const {return TRUE;} + virtual OpenContain *asOpenContain() override { return this; } ///< treat as open container + virtual Bool isHealContain() const override { return false; } ///< true when container only contains units while healing (not a transport!) + virtual Bool isTunnelContain() const override { return FALSE; } + virtual Bool isImmuneToClearBuildingAttacks() const override { return true; } + virtual Bool isSpecialOverlordStyleContainer() const override {return TRUE;} - virtual void onDie( const DamageInfo *damageInfo ); ///< the die callback - virtual void onDelete(); ///< Last possible moment cleanup - virtual void onCapture( Player *oldOwner, Player *newOwner ); - virtual void onObjectCreated(); - virtual void onContaining( Object *obj, Bool wasSelected ); - virtual void onRemoving( Object *obj ); + virtual void onDie( const DamageInfo *damageInfo ) override; ///< the die callback + virtual void onDelete() override; ///< Last possible moment cleanup + virtual void onCapture( Player *oldOwner, Player *newOwner ) override; + virtual void onObjectCreated() override; + virtual void onContaining( Object *obj, Bool wasSelected ) override; + virtual void onRemoving( Object *obj ) override; - virtual UpdateSleepTime update(); ///< called once per frame + virtual UpdateSleepTime update() override; ///< called once per frame // virtual void onContaining( Object *obj, Bool wasSelected ); ///< object now contains 'obj' // virtual void onRemoving( Object *obj ); ///< object no longer contains 'obj' - virtual Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const; - virtual void addToContain( Object *obj ); ///< add 'obj' to contain list + virtual Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const override; + virtual void addToContain( Object *obj ) override; ///< add 'obj' to contain list virtual void addToContainList( Object *obj ); ///< The part of AddToContain that inheritors can override (Can't do whole thing because of all the private stuff involved) - virtual void removeFromContain( Object *obj, Bool exposeStealthUnits = FALSE ); ///< remove 'obj' from contain list + virtual void removeFromContain( Object *obj, Bool exposeStealthUnits = FALSE ) override; ///< remove 'obj' from contain list //virtual void removeAllContained( Bool exposeStealthUnits = FALSE ); ///< remove all objects on contain list - virtual Bool isEnclosingContainerFor( const Object *obj ) const; ///< Does this type of Contain Visibly enclose its contents? - virtual Bool isPassengerAllowedToFire( ObjectID id = INVALID_ID ) const; ///< Hey, can I shoot out of this container? + virtual Bool isEnclosingContainerFor( const Object *obj ) const override; ///< Does this type of Contain Visibly enclose its contents? + virtual Bool isPassengerAllowedToFire( ObjectID id = INVALID_ID ) const override; ///< Hey, can I shoot out of this container? // Friend for our Draw module only. - virtual const Object *friend_getRider() const; ///< Damn. The draw order dependency bug for riders means that our draw module needs to cheat to get around it. + virtual const Object *friend_getRider() const override; ///< Damn. The draw order dependency bug for riders means that our draw module needs to cheat to get around it. ///< if my object gets selected, then my visible passengers should, too ///< this gets called from - virtual void clientVisibleContainedFlashAsSelected(); + virtual void clientVisibleContainedFlashAsSelected() override; - virtual void redeployOccupants(); + virtual void redeployOccupants() override; - virtual Bool getContainerPipsToShow(Int& numTotal, Int& numFull) + virtual Bool getContainerPipsToShow(Int& numTotal, Int& numFull) override { if ( getHelixContainModuleData()->m_drawPips == FALSE ) { @@ -118,7 +118,7 @@ class HelixContain : public TransportContain return ContainModuleInterface::getContainerPipsToShow( numTotal, numFull ); } - virtual void createPayload(); + virtual void createPayload() override; private: void parseInitialPayload( INI* ini, void *instance, void *store, const void* /*userData*/ ); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h index 1ab52a67c19..547522cb980 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h @@ -49,7 +49,7 @@ class HighlanderBody : public ActiveBody HighlanderBody( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void attemptDamage( DamageInfo *damageInfo ); ///< try to damage this object + virtual void attemptDamage( DamageInfo *damageInfo ) override; ///< try to damage this object protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h index b0b2746216a..77d16200f76 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h @@ -70,7 +70,7 @@ class HijackerUpdate : public UpdateModule HijackerUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); ///< called once per frame + virtual UpdateSleepTime update() override; ///< called once per frame void setTargetObject( const Object *object ); Object* getTargetObject() const; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h index e938c79c083..1e73a873bc5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h @@ -76,5 +76,5 @@ class HiveStructureBody : public StructureBody protected: - virtual void attemptDamage( DamageInfo *damageInfo ); ///< try to damage this object + virtual void attemptDamage( DamageInfo *damageInfo ) override; ///< try to damage this object }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h index 221032336be..3270a9f7ab2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h @@ -122,16 +122,16 @@ class HordeUpdate : public UpdateModule, public HordeUpdateInterface HordeUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - HordeUpdateInterface *getHordeUpdateInterface() { return this; } + virtual HordeUpdateInterface *getHordeUpdateInterface() override { return this; } - virtual void onDrawableBoundToObject(); - virtual UpdateSleepTime update(); ///< update this object's AI + virtual void onDrawableBoundToObject() override; + virtual UpdateSleepTime update() override; ///< update this object's AI - virtual Bool isInHorde() const { return m_inHorde; } - virtual Bool hasFlag() const { return m_hasFlag; } - virtual Bool isTrueHordeMember() const { return m_trueHordeMember && m_inHorde; } - virtual Bool isAllowedNationalism() const; - virtual HordeActionType getHordeActionType() const { return getHordeUpdateModuleData()->m_action; }; + virtual Bool isInHorde() const override { return m_inHorde; } + virtual Bool hasFlag() const override { return m_hasFlag; } + virtual Bool isTrueHordeMember() const override { return m_trueHordeMember && m_inHorde; } + virtual Bool isAllowedNationalism() const override; + virtual HordeActionType getHordeActionType() const override { return getHordeUpdateModuleData()->m_action; }; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h index b29376bb303..0af50021c3c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h @@ -49,7 +49,7 @@ class ImmortalBody : public ActiveBody ImmortalBody( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void internalChangeHealth( Real delta ); ///< change health + virtual void internalChangeHealth( Real delta ) override; ///< change health protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h index 79ca7cd61c8..26d5ef791d2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h @@ -47,21 +47,21 @@ class InactiveBody : public BodyModule InactiveBody( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void attemptDamage( DamageInfo *damageInfo ); ///< try to damage this object - virtual void attemptHealing( DamageInfo *damageInfo ); ///< try to heal this object - virtual Real estimateDamage( DamageInfoInput& damageInfo ) const; - virtual Real getHealth() const; ///< get current health - virtual BodyDamageType getDamageState() const; - virtual void setDamageState( BodyDamageType newState ); ///< control damage state directly. Will adjust hitpoints. - virtual void setAflame( Bool setting ){}///< This is a major change like a damage state. + virtual void attemptDamage( DamageInfo *damageInfo ) override; ///< try to damage this object + virtual void attemptHealing( DamageInfo *damageInfo ) override; ///< try to heal this object + virtual Real estimateDamage( DamageInfoInput& damageInfo ) const override; + virtual Real getHealth() const override; ///< get current health + virtual BodyDamageType getDamageState() const override; + virtual void setDamageState( BodyDamageType newState ) override; ///< control damage state directly. Will adjust hitpoints. + virtual void setAflame( Bool setting ) override{}///< This is a major change like a damage state. - void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback ) { /* nothing */ } + virtual void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback ) override { /* nothing */ } - virtual void setArmorSetFlag(ArmorSetType ast) { /* nothing */ } - virtual void clearArmorSetFlag(ArmorSetType ast) { /* nothing */ } - virtual Bool testArmorSetFlag(ArmorSetType ast){ return FALSE; } + virtual void setArmorSetFlag(ArmorSetType ast) override { /* nothing */ } + virtual void clearArmorSetFlag(ArmorSetType ast) override { /* nothing */ } + virtual Bool testArmorSetFlag(ArmorSetType ast) override{ return FALSE; } - virtual void internalChangeHealth( Real delta ); + virtual void internalChangeHealth( Real delta ) override; private: Bool m_dieCalled; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h index 8000ecd3ce8..749d20f1e53 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h @@ -70,6 +70,6 @@ class InstantDeathBehavior : public DieModule // virtual destructor prototype provided by memory pool declaration // DieModuleInterface - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InternetHackContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InternetHackContain.h index 8f300b23997..43cbe3f790c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InternetHackContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InternetHackContain.h @@ -57,7 +57,7 @@ class InternetHackContain : public TransportContain InternetHackContain( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onContaining( Object *obj, Bool wasSelected ); ///< object now contains 'obj' + virtual void onContaining( Object *obj, Bool wasSelected ) override; ///< object now contains 'obj' protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h index a7cd1157aa1..1986d76dfd8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h @@ -74,32 +74,32 @@ class JetAIUpdate : public AIUpdateInterface MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( JetAIUpdate, "JetAIUpdate" ) MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( JetAIUpdate, JetAIUpdateModuleData ) - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; public: JetAIUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onObjectCreated(); - virtual void onDelete(); + virtual void onObjectCreated() override; + virtual void onDelete() override; - virtual JetAIUpdate* getJetAIUpdate() { return this; } - virtual const JetAIUpdate* getJetAIUpdate() const { return this; } + virtual JetAIUpdate* getJetAIUpdate() override { return this; } + virtual const JetAIUpdate* getJetAIUpdate() const override { return this; } - virtual void aiDoCommand(const AICommandParms* parms); - virtual Bool chooseLocomotorSet(LocomotorSetType wst); - virtual void setLocomotorGoalNone(); - virtual Bool isIdle() const; - virtual Bool isTaxiingToParking() const; //only applies to jets interacting with runways. + virtual void aiDoCommand(const AICommandParms* parms) override; + virtual Bool chooseLocomotorSet(LocomotorSetType wst) override; + virtual void setLocomotorGoalNone() override; + virtual Bool isIdle() const override; + virtual Bool isTaxiingToParking() const override; //only applies to jets interacting with runways. virtual Bool isReloading() const; - virtual Bool isAllowedToMoveAwayFromUnit() const; - virtual Bool getSneakyTargetingOffset(Coord3D* offset) const; - virtual void addTargeter(ObjectID id, Bool add); - virtual Bool isTemporarilyPreventingAimSuccess() const; - virtual Bool isDoingGroundMovement() const; - virtual void notifyVictimIsDead(); + virtual Bool isAllowedToMoveAwayFromUnit() const override; + virtual Bool getSneakyTargetingOffset(Coord3D* offset) const override; + virtual void addTargeter(ObjectID id, Bool add) override; + virtual Bool isTemporarilyPreventingAimSuccess() const override; + virtual Bool isDoingGroundMovement() const override; + virtual void notifyVictimIsDead() override; virtual Bool isOutOfSpecialReloadAmmo() const; const Coord3D* friend_getProducerLocation() const { return &m_producerLocation; } @@ -129,17 +129,17 @@ class JetAIUpdate : public AIUpdateInterface protected: - virtual AIStateMachine* makeStateMachine(); + virtual AIStateMachine* makeStateMachine() override; virtual void privateFollowPath( std::vector* path, Object *ignoreObject, CommandSourceType cmdSource, Bool exitProduction );///< follow the path defined by the given array of points - virtual void privateFollowPathAppend( const Coord3D *pos, CommandSourceType cmdSource ); - virtual void privateEnter( Object *obj, CommandSourceType cmdSource ); ///< enter the given object - virtual void privateGetRepaired( Object *repairDepot, CommandSourceType cmdSource );///< get repaired at repair depot + virtual void privateFollowPathAppend( const Coord3D *pos, CommandSourceType cmdSource ) override; + virtual void privateEnter( Object *obj, CommandSourceType cmdSource ) override; ///< enter the given object + virtual void privateGetRepaired( Object *repairDepot, CommandSourceType cmdSource ) override;///< get repaired at repair depot void pruneDeadTargeters(); void positionLockon(); - virtual Bool getTreatAsAircraftForLocoDistToGoal() const; + virtual Bool getTreatAsAircraftForLocoDistToGoal() const override; Bool isParkedAt(const Object* obj) const; private: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h index 4055c3219ec..e383abeb6a9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h @@ -88,9 +88,9 @@ class JetSlowDeathBehavior : public SlowDeathBehavior // virtual destructor prototype provided by memory pool declaration // slow death methods - virtual void onDie( const DamageInfo *damageInfo ); - virtual void beginSlowDeath( const DamageInfo *damageInfo ); - virtual UpdateSleepTime update(); + virtual void onDie( const DamageInfo *damageInfo ) override; + virtual void beginSlowDeath( const DamageInfo *damageInfo ) override; + virtual UpdateSleepTime update() override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h index 539ff20559e..b84b7a3467f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h @@ -50,6 +50,6 @@ class KeepObjectDie : public DieModule KeepObjectDie( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h index f921a04f537..ecfd548912a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h @@ -109,7 +109,7 @@ class LaserUpdate : public ClientUpdateModule void setDirty( Bool dirty ) { m_dirty = dirty; } Bool isDirty() const { return m_dirty; } - virtual void clientUpdate(); + virtual void clientUpdate() override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h index 0de76bd0673..0876e700f0d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h @@ -74,7 +74,7 @@ class LifetimeUpdate : public UpdateModule void setLifetimeRange( UnsignedInt minFrames, UnsignedInt maxFrames ); UnsignedInt getDieFrame() const { return m_dieFrame; } - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; private: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LockWeaponCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LockWeaponCreate.h index 1fdf50c4123..afeb97103b1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LockWeaponCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LockWeaponCreate.h @@ -62,8 +62,8 @@ class LockWeaponCreate : public CreateModule // virtual destructor prototype provided by memory pool declaration /// the create method - virtual void onCreate(); - virtual void onBuildComplete(); ///< This is called when you are a finished game object + virtual void onCreate() override; + virtual void onBuildComplete() override; ///< This is called when you are a finished game object protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h index 2df6b5e9344..cba77619112 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h @@ -50,7 +50,7 @@ class LocomotorSetUpgrade : public UpgradeModule // virtual destructor prototype defined by MemoryPoolObject protected: - virtual void upgradeImplementation( ); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation( ) override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h index 88c11cc89f7..36f908f73ea 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h @@ -67,7 +67,7 @@ class MaxHealthUpgrade : public UpgradeModule protected: - virtual void upgradeImplementation(); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation() override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h index f145d238be8..96bd6364eee 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h @@ -82,34 +82,34 @@ class MinefieldBehavior : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_COLLIDE) | (MODULEINTERFACE_DAMAGE) | (MODULEINTERFACE_DIE); } // BehaviorModule - virtual CollideModuleInterface* getCollide() { return this; } - virtual LandMineInterface* getLandMineInterface() { return this; } - virtual DamageModuleInterface* getDamage() { return this; } - virtual DieModuleInterface* getDie() { return this; } + virtual CollideModuleInterface* getCollide() override { return this; } + virtual LandMineInterface* getLandMineInterface() override { return this; } + virtual DamageModuleInterface* getDamage() override { return this; } + virtual DieModuleInterface* getDie() override { return this; } // DamageModuleInterface - virtual void onDamage( DamageInfo *damageInfo ); - virtual void onHealing( DamageInfo *damageInfo ); - virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState) { } + virtual void onDamage( DamageInfo *damageInfo ) override; + virtual void onHealing( DamageInfo *damageInfo ) override; + virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState) override { } // DieModuleInterface - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; // UpdateModuleInterface - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // CollideModuleInterface - virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ); - virtual Bool wouldLikeToCollideWith(const Object* other) const { return false; } - virtual Bool isHijackedVehicleCrateCollide() const { return false; } - virtual Bool isCarBombCrateCollide() const { return false; } - virtual Bool isRailroad() const { return false;} - virtual Bool isSalvageCrateCollide() const { return false; } - virtual Bool isSabotageBuildingCrateCollide() const { return FALSE; } + virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ) override; + virtual Bool wouldLikeToCollideWith(const Object* other) const override { return false; } + virtual Bool isHijackedVehicleCrateCollide() const override { return false; } + virtual Bool isCarBombCrateCollide() const override { return false; } + virtual Bool isRailroad() const override { return false;} + virtual Bool isSalvageCrateCollide() const override { return false; } + virtual Bool isSabotageBuildingCrateCollide() const override { return FALSE; } // Minefield specific methods - virtual void setScootParms(const Coord3D& start, const Coord3D& end); - virtual void disarm(); + virtual void setScootParms(const Coord3D& start, const Coord3D& end) override; + virtual void disarm() override; private: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h index e211203e6fb..82242012c00 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h @@ -88,19 +88,19 @@ class MissileAIUpdate : public AIUpdateInterface, public ProjectileUpdateInterfa KILL_SELF = 7, ///< Destroy self. }; - virtual ProjectileUpdateInterface* getProjectileUpdateInterface() { return this; } - virtual void projectileFireAtObjectOrPosition( const Object *victim, const Coord3D *victimPos, const WeaponTemplate *detWeap, const ParticleSystemTemplate* exhaustSysOverride ); - virtual void projectileLaunchAtObjectOrPosition(const Object *victim, const Coord3D* victimPos, const Object *launcher, WeaponSlotType wslot, Int specificBarrelToUse, const WeaponTemplate* detWeap, const ParticleSystemTemplate* exhaustSysOverride); - virtual Bool projectileHandleCollision( Object *other ); - virtual Bool projectileIsArmed() const { return m_isArmed; } - virtual ObjectID projectileGetLauncherID() const { return m_launcherID; } - virtual void setFramesTillCountermeasureDiversionOccurs( UnsignedInt frames ); ///< Number of frames till missile diverts to countermeasures. - virtual void projectileNowJammed();///< We lose our Object target and scatter to the ground - - virtual Bool processCollision(PhysicsBehavior *physics, Object *other); ///< Returns true if the physics collide should apply the force. Normally not. jba. - - virtual UpdateSleepTime update(); - virtual void onDelete(); + virtual ProjectileUpdateInterface* getProjectileUpdateInterface() override { return this; } + virtual void projectileFireAtObjectOrPosition( const Object *victim, const Coord3D *victimPos, const WeaponTemplate *detWeap, const ParticleSystemTemplate* exhaustSysOverride ) override; + virtual void projectileLaunchAtObjectOrPosition(const Object *victim, const Coord3D* victimPos, const Object *launcher, WeaponSlotType wslot, Int specificBarrelToUse, const WeaponTemplate* detWeap, const ParticleSystemTemplate* exhaustSysOverride) override; + virtual Bool projectileHandleCollision( Object *other ) override; + virtual Bool projectileIsArmed() const override { return m_isArmed; } + virtual ObjectID projectileGetLauncherID() const override { return m_launcherID; } + virtual void setFramesTillCountermeasureDiversionOccurs( UnsignedInt frames ) override; ///< Number of frames till missile diverts to countermeasures. + virtual void projectileNowJammed() override;///< We lose our Object target and scatter to the ground + + virtual Bool processCollision(PhysicsBehavior *physics, Object *other) override; ///< Returns true if the physics collide should apply the force. Normally not. jba. + + virtual UpdateSleepTime update() override; + virtual void onDelete() override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h index da27b222bbb..43156caa056 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h @@ -99,20 +99,20 @@ class MissileLauncherBuildingUpdate : public SpecialPowerUpdateModule // virtual destructor prototype provided by memory pool declaration //SpecialPowerUpdateInterface pure virtual implementations - virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ); - virtual Bool isSpecialAbility() const { return false; } - virtual Bool isSpecialPower() const { return true; } - virtual Bool isActive() const { return m_doorState != m_timeoutState; } + virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ) override; + virtual Bool isSpecialAbility() const override { return false; } + virtual Bool isSpecialPower() const override { return true; } + virtual Bool isActive() const override { return m_doorState != m_timeoutState; } SpecialPowerTemplate* getTemplate() const; - virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const { return false; } //Is it active now? - virtual Bool doesSpecialPowerHaveOverridableDestination() const { return false; } //Does it have it, even if it's not active? - virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ) {} + virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const override { return false; } //Is it active now? + virtual Bool doesSpecialPowerHaveOverridableDestination() const override { return false; } //Does it have it, even if it's not active? + virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ) override {} - virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() { return this; } - virtual CommandOption getCommandOption() const { return (CommandOption)0; } + virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() override { return this; } + virtual CommandOption getCommandOption() const override { return (CommandOption)0; } - virtual UpdateSleepTime update(); ///< Deciding whether or not to make new guys - virtual Bool isPowerCurrentlyInUse( const CommandButton *command = nullptr ) const; + virtual UpdateSleepTime update() override; ///< Deciding whether or not to make new guys + virtual Bool isPowerCurrentlyInUse( const CommandButton *command = nullptr ) const override; private: enum DoorStateType diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h index bfa7efb4d6b..ba89d9f7678 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h @@ -97,14 +97,14 @@ class MobMemberSlavedUpdate : public UpdateModule, public SlavedUpdateInterface MobMemberSlavedUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual SlavedUpdateInterface* getSlavedUpdateInterface() { return this; }// hee hee... behaves just like slavedupdate + virtual SlavedUpdateInterface* getSlavedUpdateInterface() override { return this; }// hee hee... behaves just like slavedupdate - virtual ObjectID getSlaverID() const { return m_slaver; } - virtual void onEnslave( const Object *slaver ); - virtual void onSlaverDie( const DamageInfo *info ); - virtual void onSlaverDamage( const DamageInfo *info ); - virtual void onObjectCreated(); - virtual Bool isSelfTasking() const { return m_isSelfTasking; }; + virtual ObjectID getSlaverID() const override { return m_slaver; } + virtual void onEnslave( const Object *slaver ) override; + virtual void onSlaverDie( const DamageInfo *info ) override; + virtual void onSlaverDamage( const DamageInfo *info ) override; + virtual void onObjectCreated() override; + virtual Bool isSelfTasking() const override { return m_isSelfTasking; }; void doCatchUpLogic( Coord3D *pinnedPosition ); @@ -112,7 +112,7 @@ class MobMemberSlavedUpdate : public UpdateModule, public SlavedUpdateInterface MobStates getMobState() { return m_mobState; }; - virtual UpdateSleepTime update(); ///< Deciding whether or not to make new guys + virtual UpdateSleepTime update() override; ///< Deciding whether or not to make new guys private: void startSlavedEffects( const Object *slaver ); ///< We have been marked as Slaved, so we can't be selected or move too far or other stuff diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h index a4655395433..40daf7be8ce 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h @@ -73,25 +73,25 @@ class MobNexusContain : public OpenContain, // lorenzen add a MobMemberInterface // lorenzen add a MobMemberInterface // lorenzen add a MobMemberInterface - virtual TransportPassengerInterface* getTransportPassengerInterface() { return this; }// lorenzen add a MobMemberInterface + virtual TransportPassengerInterface* getTransportPassengerInterface() override { return this; }// lorenzen add a MobMemberInterface // lorenzen add a MobMemberInterface // lorenzen add a MobMemberInterface // lorenzen add a MobMemberInterface - virtual Bool isValidContainerFor( const Object* obj, Bool checkCapacity) const; + virtual Bool isValidContainerFor( const Object* obj, Bool checkCapacity) const override; - virtual void onContaining( Object *obj, Bool wasSelected ); ///< object now contains 'obj' - virtual void onRemoving( Object *obj ); ///< object no longer contains 'obj' - virtual UpdateSleepTime update(); ///< called once per frame + virtual void onContaining( Object *obj, Bool wasSelected ) override; ///< object now contains 'obj' + virtual void onRemoving( Object *obj ) override; ///< object no longer contains 'obj' + virtual UpdateSleepTime update() override; ///< called once per frame - virtual Int getContainMax() const; + virtual Int getContainMax() const override; - virtual void onObjectCreated(); - virtual Int getExtraSlotsInUse() { return m_extraSlotsInUse; } + virtual void onObjectCreated() override; + virtual Int getExtraSlotsInUse() override { return m_extraSlotsInUse; } - virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ); ///< All types can answer if they are free to exit or not, and you can ask about a specific guy or just exit anything in general - virtual void unreserveDoorForExit( ExitDoorType exitDoor ); + virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ) override; ///< All types can answer if they are free to exit or not, and you can ask about a specific guy or just exit anything in general + virtual void unreserveDoorForExit( ExitDoorType exitDoor ) override; - virtual Bool tryToEvacuate( Bool exposeStealthedUnits ); ///< Will try to kick everybody out with game checks, and will return whether anyone made it + virtual Bool tryToEvacuate( Bool exposeStealthedUnits ) override; ///< Will try to kick everybody out with game checks, and will return whether anyone made it protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ModelConditionUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ModelConditionUpgrade.h index a1adfe69b72..253d0497f76 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ModelConditionUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ModelConditionUpgrade.h @@ -56,7 +56,7 @@ class ModelConditionUpgrade : public UpgradeModule // virtual destructor prototype defined by MemoryPoolObject protected: - virtual void upgradeImplementation( ); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation( ) override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h index 2dd3b3b42e6..bf152f492dc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h @@ -81,7 +81,7 @@ class MoneyCrateCollide : public CrateCollide protected: /// This is the game logic execution function that all real CrateCollides will implement - virtual Bool executeCrateBehavior( Object *other ); + virtual Bool executeCrateBehavior( Object *other ) override; Int getUpgradedSupplyBoost( Object *other ) const; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronBlastBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronBlastBehavior.h index 8ec75e55198..5594bfcfce0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronBlastBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronBlastBehavior.h @@ -80,11 +80,11 @@ class NeutronBlastBehavior : public UpdateModule, // virtual destructor prototype provided by memory pool declaration static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | MODULEINTERFACE_DIE; } - virtual DieModuleInterface* getDie() { return this; } + virtual DieModuleInterface* getDie() override { return this; } - virtual UpdateSleepTime update(); - virtual void onDie( const DamageInfo *damageInfo ); + virtual UpdateSleepTime update() override; + virtual void onDie( const DamageInfo *damageInfo ) override; private: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h index a14da55b396..7a868a4ab88 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h @@ -96,7 +96,7 @@ class NeutronMissileSlowDeathBehavior : public SlowDeathBehavior NeutronMissileSlowDeathBehavior( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); ///< the update call + virtual UpdateSleepTime update() override; ///< the update call protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h index 0b014982fb5..27332ebf6b6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h @@ -80,12 +80,12 @@ class NeutronMissileUpdate : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DIE); } // BehaviorModule - virtual DieModuleInterface* getDie() { return this; } + virtual DieModuleInterface* getDie() override { return this; } // DieModuleInterface - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; - virtual ProjectileUpdateInterface* getProjectileUpdateInterface() { return this; } + virtual ProjectileUpdateInterface* getProjectileUpdateInterface() override { return this; } enum MissileStateType { @@ -95,17 +95,17 @@ class NeutronMissileUpdate : public UpdateModule, DEAD }; - virtual void projectileLaunchAtObjectOrPosition(const Object *victim, const Coord3D* victimPos, const Object *launcher, WeaponSlotType wslot, Int specificBarrelToUse, const WeaponTemplate* detWeap, const ParticleSystemTemplate* exhaustSysOverride); - virtual void projectileFireAtObjectOrPosition( const Object *victim, const Coord3D *victimPos, const WeaponTemplate *detWeap, const ParticleSystemTemplate* exhaustSysOverride ); - virtual Bool projectileIsArmed() const { return m_isArmed; } ///< return true if the missile is armed and ready to explode - virtual ObjectID projectileGetLauncherID() const { return m_launcherID; } ///< Return firer of missile. Returns 0 if not yet fired. - virtual Bool projectileHandleCollision( Object *other ); + virtual void projectileLaunchAtObjectOrPosition(const Object *victim, const Coord3D* victimPos, const Object *launcher, WeaponSlotType wslot, Int specificBarrelToUse, const WeaponTemplate* detWeap, const ParticleSystemTemplate* exhaustSysOverride) override; + virtual void projectileFireAtObjectOrPosition( const Object *victim, const Coord3D *victimPos, const WeaponTemplate *detWeap, const ParticleSystemTemplate* exhaustSysOverride ) override; + virtual Bool projectileIsArmed() const override { return m_isArmed; } ///< return true if the missile is armed and ready to explode + virtual ObjectID projectileGetLauncherID() const override { return m_launcherID; } ///< Return firer of missile. Returns 0 if not yet fired. + virtual Bool projectileHandleCollision( Object *other ) override; virtual const Coord3D *getVelocity() const { return &m_vel; } ///< get current velocity - virtual void setFramesTillCountermeasureDiversionOccurs( UnsignedInt frames ) {} - virtual void projectileNowJammed() {} + virtual void setFramesTillCountermeasureDiversionOccurs( UnsignedInt frames ) override {} + virtual void projectileNowJammed() override {} - virtual UpdateSleepTime update(); - virtual void onDelete(); + virtual UpdateSleepTime update() override; + virtual void onDelete() override; private: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h index 9b00159f32b..05e12e0963d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h @@ -92,12 +92,12 @@ class OCLSpecialPower : public SpecialPowerModule OCLSpecialPower( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool object - virtual void doSpecialPower( UnsignedInt commandOptions ); - virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions ); - virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ); + virtual void doSpecialPower( UnsignedInt commandOptions ) override; + virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions ) override; + virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ) override; //If the special power launches a construction site, we need to know the final product for placement purposes. - virtual const ThingTemplate* getReferenceThingTemplate() const; + virtual const ThingTemplate* getReferenceThingTemplate() const override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h index 3e7e0546a09..dfd5de14fc9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h @@ -75,12 +75,12 @@ class OCLUpdate : public UpdateModule OCLUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; Real getCountdownPercent() const; ///< goes from 0% to 100% UnsignedInt getRemainingFrames() const; ///< For feedback display void resetTimer(); ///< added for sabotage purposes. - virtual DisabledMaskType getDisabledTypesToProcess() const { return DISABLEDMASK_ALL; } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return DISABLEDMASK_ALL; } protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h index b3c1833a09a..634e41816f1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h @@ -66,11 +66,11 @@ class ObjectCreationUpgrade : public UpgradeModule ObjectCreationUpgrade( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype defined by MemoryPoolObject - void onDelete(); ///< we have some work to do when this module goes away + void onDelete() override; ///< we have some work to do when this module goes away protected: - virtual void upgradeImplementation(); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation() override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h index 7200df8108d..78e03d640e8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h @@ -68,10 +68,10 @@ class ObjectDefectionHelper : public ObjectHelper } // virtual destructor prototype provided by memory pool object - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // Disabled conditions to process -- defection helper must ignore all disabled types. - virtual DisabledMaskType getDisabledTypesToProcess() const { return DISABLEDMASK_ALL; } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return DISABLEDMASK_ALL; } // specific to this class. void startDefectionTimer(UnsignedInt numFrames, Bool withDefectorFX = TRUE); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h index 95f9d7a3a01..1c0bc87245e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h @@ -42,9 +42,9 @@ class ObjectHelper : public UpdateModule 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; public: @@ -55,7 +55,7 @@ class ObjectHelper : public UpdateModule } // inherited from UpdateModuleInterface - virtual UpdateSleepTime update() = 0; + virtual UpdateSleepTime update() override = 0; // custom to this class. void sleepUntil(UnsignedInt when); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h index 445c05d3f98..d2a11ca4d4c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h @@ -52,6 +52,6 @@ class ObjectRepulsorHelper : public ObjectHelper ObjectRepulsorHelper( Thing *thing, const ModuleData *modData ) : ObjectHelper( thing, modData ) { } // virtual destructor prototype provided by memory pool object - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h index 2587ddb3781..80d0fbee2a9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h @@ -52,6 +52,6 @@ class ObjectSMCHelper : public ObjectHelper ObjectSMCHelper( Thing *thing, const ModuleData *modData ) : ObjectHelper( thing, modData ) { } // virtual destructor prototype provided by memory pool object - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h index 4b6582cf2d2..1094fc5e346 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h @@ -56,7 +56,7 @@ class ObjectWeaponStatusHelper : public ObjectHelper user update modules, so it redefines this. Please don't redefine this for other modules without very careful deliberation. (srj) */ - virtual SleepyUpdatePhase getUpdatePhase() const + virtual SleepyUpdatePhase getUpdatePhase() const override { return PHASE_FINAL; } @@ -71,7 +71,7 @@ class ObjectWeaponStatusHelper : public ObjectHelper } // virtual destructor prototype provided by memory pool object - virtual UpdateSleepTime update() + virtual UpdateSleepTime update() override { getObject()->adjustModelConditionForWeaponStatus(); // unlike other helpers, this one must run every frame. diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h index 428864d82fa..1b229d6c3b2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h @@ -93,119 +93,119 @@ class OpenContain : public UpdateModule, OpenContain( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual ContainModuleInterface* getContain() { return this; } - virtual CollideModuleInterface* getCollide() { return this; } - virtual DieModuleInterface* getDie() { return this; } - virtual DamageModuleInterface* getDamage() { return this; } + virtual ContainModuleInterface* getContain() override { return this; } + virtual CollideModuleInterface* getCollide() override { return this; } + virtual DieModuleInterface* getDie() override { return this; } + virtual DamageModuleInterface* getDamage() override { return this; } static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_CONTAIN) | (MODULEINTERFACE_COLLIDE) | (MODULEINTERFACE_DIE) | (MODULEINTERFACE_DAMAGE); } - virtual void onDie( const DamageInfo *damageInfo ); ///< the die callback - virtual void onDelete(); ///< Last possible moment cleanup - virtual void onCapture( Player *oldOwner, Player *newOwner ){} + virtual void onDie( const DamageInfo *damageInfo ) override; ///< the die callback + virtual void onDelete() override; ///< Last possible moment cleanup + virtual void onCapture( Player *oldOwner, Player *newOwner ) override {} // CollideModuleInterface - virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ); - virtual Bool wouldLikeToCollideWith(const Object* other) const { return false; } - virtual Bool isCarBombCrateCollide() const { return false; } - virtual Bool isHijackedVehicleCrateCollide() const { return false; } - virtual Bool isRailroad() const { return false;} - virtual Bool isSalvageCrateCollide() const { return false; } - virtual Bool isSabotageBuildingCrateCollide() const { return FALSE; } + virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ) override; + virtual Bool wouldLikeToCollideWith(const Object* other) const override { return false; } + virtual Bool isCarBombCrateCollide() const override { return false; } + virtual Bool isHijackedVehicleCrateCollide() const override { return false; } + virtual Bool isRailroad() const override { return false;} + virtual Bool isSalvageCrateCollide() const override { return false; } + virtual Bool isSabotageBuildingCrateCollide() const override { return FALSE; } // UpdateModule - virtual UpdateSleepTime update(); ///< called once per frame + virtual UpdateSleepTime update() override; ///< called once per frame // ContainModuleInterface - virtual OpenContain *asOpenContain() { return this; } ///< treat as open container + virtual OpenContain *asOpenContain() override { return this; } ///< treat as open container // DamageModuleInterface - virtual void onDamage( DamageInfo *damageInfo ){}; ///< damage callback - virtual void onHealing( DamageInfo *damageInfo ){}; ///< healing callback + virtual void onDamage( DamageInfo *damageInfo ) override {}; ///< damage callback + virtual void onHealing( DamageInfo *damageInfo ) override {}; ///< healing callback virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, BodyDamageType oldState, - BodyDamageType newState){}; ///< state change callback + BodyDamageType newState) override {}; ///< state change callback // our object changed position... react as appropriate. - virtual void containReactToTransformChange(); + virtual void containReactToTransformChange() override; - virtual Bool calcBestGarrisonPosition( Coord3D *sourcePos, const Coord3D *targetPos ) { return FALSE; } - virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, Object *victim ) { return FALSE; } - virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, const Coord3D *targetPos ) { return FALSE; } + virtual Bool calcBestGarrisonPosition( Coord3D *sourcePos, const Coord3D *targetPos ) override { return FALSE; } + virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, Object *victim ) override { return FALSE; } + virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, const Coord3D *targetPos ) override { return FALSE; } ///< if my object gets selected, then my visible passengers should, too ///< this gets called from - virtual void clientVisibleContainedFlashAsSelected() {}; + virtual void clientVisibleContainedFlashAsSelected() override {}; - virtual const Player* getApparentControllingPlayer(const Player* observingPlayer) const { return nullptr; } - virtual void recalcApparentControllingPlayer() { } + virtual const Player* getApparentControllingPlayer(const Player* observingPlayer) const override { return nullptr; } + virtual void recalcApparentControllingPlayer() override { } - virtual void onContaining( Object *obj, Bool wasSelected ); ///< object now contains 'obj' - virtual void onRemoving( Object *obj ); ///< object no longer contains 'obj' - virtual void onSelling();///< Container is being sold. Open responds by kicking people out + virtual void onContaining( Object *obj, Bool wasSelected ) override; ///< object now contains 'obj' + virtual void onRemoving( Object *obj ) override; ///< object no longer contains 'obj' + virtual void onSelling() override;///< Container is being sold. Open responds by kicking people out - virtual void orderAllPassengersToExit( CommandSourceType commandSource, Bool instantly ); ///< All of the smarts of exiting are in the passenger's AIExit. removeAllFrommContain is a last ditch system call, this is the game Evacuate - virtual void orderAllPassengersToIdle( CommandSourceType commandSource ); ///< Just like it sounds - virtual void orderAllPassengersToHackInternet( CommandSourceType ); ///< Just like it sounds - virtual void markAllPassengersDetected(); ///< Cool game stuff got added to the system calls since this layer didn't exist, so this regains that functionality + virtual void orderAllPassengersToExit( CommandSourceType commandSource, Bool instantly ) override; ///< All of the smarts of exiting are in the passenger's AIExit. removeAllFrommContain is a last ditch system call, this is the game Evacuate + virtual void orderAllPassengersToIdle( CommandSourceType commandSource ) override; ///< Just like it sounds + virtual void orderAllPassengersToHackInternet( CommandSourceType ) override; ///< Just like it sounds + virtual void markAllPassengersDetected() override; ///< Cool game stuff got added to the system calls since this layer didn't exist, so this regains that functionality // default OpenContain has unlimited capacity...! - virtual Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const; - virtual void addToContain( Object *obj ); ///< add 'obj' to contain list + virtual Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const override; + virtual void addToContain( Object *obj ) override; ///< add 'obj' to contain list virtual void addToContainList( Object *obj ); ///< The part of AddToContain that inheritors can override (Can't do whole thing because of all the private stuff involved) - virtual void removeFromContain( Object *obj, Bool exposeStealthUnits = FALSE ); ///< remove 'obj' from contain list - virtual void removeAllContained( Bool exposeStealthUnits = FALSE ); ///< remove all objects on contain list - virtual void killAllContained(); ///< kill all objects on contain list - virtual void harmAndForceExitAllContained( DamageInfo *info ); // apply canned damage against those contains - virtual Bool isEnclosingContainerFor( const Object *obj ) const; ///< Does this type of Contain Visibly enclose its contents? - virtual Bool isPassengerAllowedToFire( ObjectID id = INVALID_ID ) const; ///< Hey, can I shoot out of this container? + virtual void removeFromContain( Object *obj, Bool exposeStealthUnits = FALSE ) override; ///< remove 'obj' from contain list + virtual void removeAllContained( Bool exposeStealthUnits = FALSE ) override; ///< remove all objects on contain list + virtual void killAllContained() override; ///< kill all objects on contain list + virtual void harmAndForceExitAllContained( DamageInfo *info ) override; // apply canned damage against those contains + virtual Bool isEnclosingContainerFor( const Object *obj ) const override; ///< Does this type of Contain Visibly enclose its contents? + virtual Bool isPassengerAllowedToFire( ObjectID id = INVALID_ID ) const override; ///< Hey, can I shoot out of this container? - virtual void setPassengerAllowedToFire( Bool permission = TRUE ) { m_passengerAllowedToFire = permission; } ///< Hey, can I shoot out of this container? + virtual void setPassengerAllowedToFire( Bool permission = TRUE ) override { m_passengerAllowedToFire = permission; } ///< Hey, can I shoot out of this container? - virtual void setOverrideDestination( const Coord3D * ){} ///< Instead of falling peacefully towards a clear spot, I will now aim here - virtual Bool isDisplayedOnControlBar() const {return FALSE;}///< Does this container display its contents on the ControlBar? - virtual Int getExtraSlotsInUse() { return 0; } - virtual Bool isKickOutOnCapture(){ return TRUE; }///< By default, yes, all contain modules kick passengers out on capture + virtual void setOverrideDestination( const Coord3D * ) override {} ///< Instead of falling peacefully towards a clear spot, I will now aim here + virtual Bool isDisplayedOnControlBar() const override {return FALSE;}///< Does this container display its contents on the ControlBar? + virtual Int getExtraSlotsInUse() override { return 0; } + virtual Bool isKickOutOnCapture() override { return TRUE; }///< By default, yes, all contain modules kick passengers out on capture // contain list access - virtual void iterateContained( ContainIterateFunc func, void *userData, Bool reverse ); - virtual UnsignedInt getContainCount() const { return m_containListSize; } - virtual const ContainedItemsList* getContainedItemsList() const { return &m_containList; } - virtual const Object *friend_getRider() const{return nullptr;} ///< Damn. The draw order dependency bug for riders means that our draw module needs to cheat to get around it. - virtual Real getContainedItemsMass() const; - virtual UnsignedInt getStealthUnitsContained() const { return m_stealthUnitsContained; } - virtual UnsignedInt getHeroUnitsContained() const { return m_heroUnitsContained; } + virtual void iterateContained( ContainIterateFunc func, void *userData, Bool reverse ) override; + virtual UnsignedInt getContainCount() const override { return m_containListSize; } + virtual const ContainedItemsList* getContainedItemsList() const override { return &m_containList; } + virtual const Object *friend_getRider() const override {return nullptr;} ///< Damn. The draw order dependency bug for riders means that our draw module needs to cheat to get around it. + virtual Real getContainedItemsMass() const override; + virtual UnsignedInt getStealthUnitsContained() const override { return m_stealthUnitsContained; } + virtual UnsignedInt getHeroUnitsContained() const override { return m_heroUnitsContained; } - virtual PlayerMaskType getPlayerWhoEntered() const { return m_playerEnteredMask; } + virtual PlayerMaskType getPlayerWhoEntered() const override { return m_playerEnteredMask; } - virtual Int getContainMax() const; + virtual Int getContainMax() const override; // ExitInterface - virtual Bool isExitBusy() const {return FALSE;} ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. - virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ) { return DOOR_1; } - virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ); - virtual void exitObjectInAHurry( Object *newObj ); + virtual Bool isExitBusy() const override {return FALSE;} ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. + virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ) override { return DOOR_1; } + virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ) override; + virtual void exitObjectInAHurry( Object *newObj ) override; - virtual void unreserveDoorForExit( ExitDoorType exitDoor ) { /*nothing*/ } - virtual void exitObjectByBudding( Object *newObj, Object *budHost ) { return; }; + virtual void unreserveDoorForExit( ExitDoorType exitDoor ) override { /*nothing*/ } + virtual void exitObjectByBudding( Object *newObj, Object *budHost ) override { return; }; - virtual void setRallyPoint( const Coord3D *pos ); ///< define a "rally point" for units to move towards - virtual const Coord3D *getRallyPoint() const; ///< define a "rally point" for units to move towards - virtual Bool getExitPosition(Coord3D& exitPosition ) const { return FALSE; }; ///< access to the "Door" position of the production object - virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) const; ///< get the natural "rally point" for units to move towards + virtual void setRallyPoint( const Coord3D *pos ) override; ///< define a "rally point" for units to move towards + virtual const Coord3D *getRallyPoint() const override; ///< define a "rally point" for units to move towards + virtual Bool getExitPosition(Coord3D& exitPosition ) const override { return FALSE; }; ///< access to the "Door" position of the production object + virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) const override; ///< get the natural "rally point" for units to move towards - virtual ExitInterface* getContainExitInterface() { return this; } + virtual ExitInterface* getContainExitInterface() override { return this; } - virtual Bool isGarrisonable() const { return false; } ///< can this unit be Garrisoned? (ick) - virtual Bool isBustable() const { return false; } ///< can this container get busted by a bunkerbuster - virtual Bool isHealContain() const { return false; } ///< true when container only contains units while healing (not a transport!) - virtual Bool isTunnelContain() const { return FALSE; } - virtual Bool isRiderChangeContain() const { return FALSE; } - virtual Bool isSpecialZeroSlotContainer() const { return false; } - virtual Bool isImmuneToClearBuildingAttacks() const { return true; } - virtual Bool isSpecialOverlordStyleContainer() const { return false; } - virtual Bool isAnyRiderAttacking() const; + virtual Bool isGarrisonable() const override { return false; } ///< can this unit be Garrisoned? (ick) + virtual Bool isBustable() const override { return false; } ///< can this container get busted by a bunkerbuster + virtual Bool isHealContain() const override { return false; } ///< true when container only contains units while healing (not a transport!) + virtual Bool isTunnelContain() const override { return FALSE; } + virtual Bool isRiderChangeContain() const override { return FALSE; } + virtual Bool isSpecialZeroSlotContainer() const override { return false; } + virtual Bool isImmuneToClearBuildingAttacks() const override { return true; } + virtual Bool isSpecialOverlordStyleContainer() const override { return false; } + virtual Bool isAnyRiderAttacking() const override; /** this is used for containers that must do something to allow people to enter or exit... @@ -213,22 +213,22 @@ class OpenContain : public UpdateModule, when something is in the enter state, and wants=ENTS_NOTHING when the unit has either entered, or given up... */ - virtual void onObjectWantsToEnterOrExit(Object* obj, ObjectEnterExitType wants); + virtual void onObjectWantsToEnterOrExit(Object* obj, ObjectEnterExitType wants) override; // returns true iff there are objects currently waiting to enter. - virtual Bool hasObjectsWantingToEnterOrExit() const; + virtual Bool hasObjectsWantingToEnterOrExit() const override; - virtual void processDamageToContained(Real percentDamage); ///< Do our % damage to units now. + virtual void processDamageToContained(Real percentDamage) override; ///< Do our % damage to units now. - virtual Bool isWeaponBonusPassedToPassengers() const; - virtual WeaponBonusConditionFlags getWeaponBonusPassedToPassengers() const; + virtual Bool isWeaponBonusPassedToPassengers() const override; + virtual WeaponBonusConditionFlags getWeaponBonusPassedToPassengers() const override; - virtual void enableLoadSounds( Bool enable ) { m_loadSoundsEnabled = enable; } + virtual void enableLoadSounds( Bool enable ) override { m_loadSoundsEnabled = enable; } Real getDamagePercentageToUnits(); - virtual Object* getClosestRider ( const Coord3D *pos ); + virtual Object* getClosestRider ( const Coord3D *pos ) override; - virtual void setEvacDisposition( EvacDisposition disp ) {}; + virtual void setEvacDisposition( EvacDisposition disp ) override {}; protected: virtual void monitorConditionChanges(); ///< check to see if we need to update our occupant positions from a model change or anything else diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h index 2dbd8b98aac..d16dc971a20 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h @@ -81,30 +81,30 @@ class OverchargeBehavior : public UpdateModule, // virtual destructor prototype provided by memory pool declaration // interface housekeeping - virtual OverchargeBehaviorInterface* getOverchargeBehaviorInterface() { return this; } + virtual OverchargeBehaviorInterface* getOverchargeBehaviorInterface() override { return this; } static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DAMAGE); } // BehaviorModule - virtual DamageModuleInterface* getDamage() { return this; } + virtual DamageModuleInterface* getDamage() override { return this; } // UpdateModuleInterface - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // DamageModuleInterface - virtual void onDamage( DamageInfo *damageInfo ); - virtual void onHealing( DamageInfo *damageInfo ) { } + virtual void onDamage( DamageInfo *damageInfo ) override; + virtual void onHealing( DamageInfo *damageInfo ) override { } virtual void onBodyDamageStateChange( const DamageInfo *damageInfo, BodyDamageType oldState, - BodyDamageType newState ) { } + BodyDamageType newState ) override { } // specific methods - virtual void toggle(); ///< toggle overcharge on/off - virtual void enable( Bool enable ); ///< turn overcharge on/off - virtual Bool isOverchargeActive() { return m_overchargeActive; } + virtual void toggle() override; ///< toggle overcharge on/off + virtual void enable( Bool enable ) override; ///< turn overcharge on/off + virtual Bool isOverchargeActive() override { return m_overchargeActive; } - void onDelete(); ///< we have some work to do when this module goes away - void onCapture( Player *oldOwner, Player *newOwner ); ///< object containing upgrade has changed teams + void onDelete() override; ///< we have some work to do when this module goes away + void onCapture( Player *oldOwner, Player *newOwner ) override; ///< object containing upgrade has changed teams protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h index 131751748bd..410dba263c6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h @@ -61,56 +61,56 @@ class OverlordContain : public TransportContain virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, BodyDamageType oldState, - BodyDamageType newState); ///< state change callback + BodyDamageType newState) override; ///< state change callback public: OverlordContain( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual OpenContain *asOpenContain() { return this; } ///< treat as open container - virtual Bool isGarrisonable() const; ///< can this unit be Garrisoned? (ick) + virtual OpenContain *asOpenContain() override { return this; } ///< treat as open container + virtual Bool isGarrisonable() const override; ///< can this unit be Garrisoned? (ick) virtual Bool isBustable() { return false;}; ///< can this container get busted by bunkerbuster? (ick) - virtual Bool isHealContain() const { return false; } ///< true when container only contains units while healing (not a transport!) - virtual Bool isTunnelContain() const { return FALSE; } - virtual Bool isImmuneToClearBuildingAttacks() const { return true; } - virtual Bool isSpecialOverlordStyleContainer() const {return TRUE;} - virtual Bool isPassengerAllowedToFire( ObjectID id = INVALID_ID ) const; ///< Hey, can I shoot out of this container? + virtual Bool isHealContain() const override { return false; } ///< true when container only contains units while healing (not a transport!) + virtual Bool isTunnelContain() const override { return FALSE; } + virtual Bool isImmuneToClearBuildingAttacks() const override { return true; } + virtual Bool isSpecialOverlordStyleContainer() const override {return TRUE;} + virtual Bool isPassengerAllowedToFire( ObjectID id = INVALID_ID ) const override; ///< Hey, can I shoot out of this container? - virtual void onDie( const DamageInfo *damageInfo ); ///< the die callback - virtual void onDelete(); ///< Last possible moment cleanup - virtual void onCapture( Player *oldOwner, Player *newOwner ); // Our main guy goes with us, but our redirected contain needs to do his thing too - virtual void onObjectCreated(); + virtual void onDie( const DamageInfo *damageInfo ) override; ///< the die callback + virtual void onDelete() override; ///< Last possible moment cleanup + virtual void onCapture( Player *oldOwner, Player *newOwner ) override; // Our main guy goes with us, but our redirected contain needs to do his thing too + virtual void onObjectCreated() override; // Contain stuff we need to override to redirect on a condition - virtual void onContaining( Object *obj, Bool wasSelected ); ///< object now contains 'obj' - virtual void onRemoving( Object *obj ); ///< object no longer contains 'obj' + virtual void onContaining( Object *obj, Bool wasSelected ) override; ///< object now contains 'obj' + virtual void onRemoving( Object *obj ) override; ///< object no longer contains 'obj' - virtual Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const; - virtual void addToContain( Object *obj ); ///< add 'obj' to contain list + virtual Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const override; + virtual void addToContain( Object *obj ) override; ///< add 'obj' to contain list virtual void addToContainList( Object *obj ); ///< The part of AddToContain that inheritors can override (Can't do whole thing because of all the private stuff involved) - virtual void removeFromContain( Object *obj, Bool exposeStealthUnits = FALSE ); ///< remove 'obj' from contain list - virtual void removeAllContained( Bool exposeStealthUnits = FALSE ); ///< remove all objects on contain list - virtual Bool isEnclosingContainerFor( const Object *obj ) const; ///< Does this type of Contain Visibly enclose its contents? - virtual Bool isDisplayedOnControlBar() const ;///< Does this container display its contents on the ControlBar? - virtual Bool isKickOutOnCapture();// The bunker may want to, but we certainly don't - virtual void killAllContained(); ///< kill all objects inside. For us, this does not mean our rider + virtual void removeFromContain( Object *obj, Bool exposeStealthUnits = FALSE ) override; ///< remove 'obj' from contain list + virtual void removeAllContained( Bool exposeStealthUnits = FALSE ) override; ///< remove all objects on contain list + virtual Bool isEnclosingContainerFor( const Object *obj ) const override; ///< Does this type of Contain Visibly enclose its contents? + virtual Bool isDisplayedOnControlBar() const override;///< Does this container display its contents on the ControlBar? + virtual Bool isKickOutOnCapture() override;// The bunker may want to, but we certainly don't + virtual void killAllContained() override; ///< kill all objects inside. For us, this does not mean our rider // contain list access - virtual void iterateContained( ContainIterateFunc func, void *userData, Bool reverse ); - virtual UnsignedInt getContainCount() const; - virtual Int getContainMax() const; - virtual const ContainedItemsList* getContainedItemsList() const; + virtual void iterateContained( ContainIterateFunc func, void *userData, Bool reverse ) override; + virtual UnsignedInt getContainCount() const override; + virtual Int getContainMax() const override; + virtual const ContainedItemsList* getContainedItemsList() const override; // Friend for our Draw module only. - virtual const Object *friend_getRider() const; ///< Damn. The draw order dependency bug for riders means that our draw module needs to cheat to get around it. + virtual const Object *friend_getRider() const override; ///< Damn. The draw order dependency bug for riders means that our draw module needs to cheat to get around it. ///< if my object gets selected, then my visible passengers should, too ///< this gets called from - virtual void clientVisibleContainedFlashAsSelected(); + virtual void clientVisibleContainedFlashAsSelected() override; - virtual Bool getContainerPipsToShow(Int& numTotal, Int& numFull); - virtual void createPayload(); + virtual Bool getContainerPipsToShow(Int& numTotal, Int& numFull) override; + virtual void createPayload() override; private: /**< An empty overlord is a container, but a full one redirects calls to its passengers. If this returns null, diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h index 667afc6db3f..1fed2db0a5a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h @@ -60,28 +60,28 @@ class ParachuteContain : public OpenContain ParachuteContain( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onDrawableBoundToObject(); + virtual void onDrawableBoundToObject() override; - virtual Bool isValidContainerFor( const Object* obj, bool checkCapacity) const; - virtual Bool isEnclosingContainerFor( const Object *obj ) const { return FALSE; } ///< Does this type of Contain Visibly enclose its contents? - virtual Bool isSpecialZeroSlotContainer() const { return true; } + virtual Bool isValidContainerFor( const Object* obj, bool checkCapacity) const override; + virtual Bool isEnclosingContainerFor( const Object *obj ) const override { return FALSE; } ///< Does this type of Contain Visibly enclose its contents? + virtual Bool isSpecialZeroSlotContainer() const override { return true; } - virtual void onContaining( Object *obj, Bool wasSelected ); ///< object now contains 'obj' - virtual void onRemoving( Object *obj ); ///< object no longer contains 'obj' + virtual void onContaining( Object *obj, Bool wasSelected ) override; ///< object now contains 'obj' + virtual void onRemoving( Object *obj ) override; ///< object no longer contains 'obj' - virtual UpdateSleepTime update(); ///< called once per frame + virtual UpdateSleepTime update() override; ///< called once per frame - virtual void containReactToTransformChange(); + virtual void containReactToTransformChange() override; - virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ); - virtual void onDie( const DamageInfo * damageInfo ); + virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ) override; + virtual void onDie( const DamageInfo * damageInfo ) override; - virtual void setOverrideDestination( const Coord3D *dest ); ///< Instead of falling peacefully towards a clear spot, I will now aim here + virtual void setOverrideDestination( const Coord3D *dest ) override; ///< Instead of falling peacefully towards a clear spot, I will now aim here protected: virtual Bool isFullyEnclosingContainer() const { return false; } - virtual void positionContainedObjectsRelativeToContainer(); + virtual void positionContainedObjectsRelativeToContainer() override; private: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h index 617b29c9cf8..50dfe9e5fea 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h @@ -107,48 +107,48 @@ class ParkingPlaceBehavior : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DIE); } // BehaviorModule - virtual DieModuleInterface *getDie() { return this; } - virtual ParkingPlaceBehaviorInterface* getParkingPlaceBehaviorInterface() { return this; } - virtual ExitInterface* getUpdateExitInterface() { return this; } + virtual DieModuleInterface *getDie() override { return this; } + virtual ParkingPlaceBehaviorInterface* getParkingPlaceBehaviorInterface() override { return this; } + virtual ExitInterface* getUpdateExitInterface() override { return this; } // ExitInterface - virtual Bool isExitBusy() const {return FALSE;} ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. - virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ); - virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ); - virtual void unreserveDoorForExit( ExitDoorType exitDoor ); - virtual void exitObjectByBudding( Object *newObj, Object *budHost ) { return; } + virtual Bool isExitBusy() const override {return FALSE;} ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. + virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ) override; + virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ) override; + virtual void unreserveDoorForExit( ExitDoorType exitDoor ) override; + virtual void exitObjectByBudding( Object *newObj, Object *budHost ) override { return; } - virtual Bool getExitPosition( Coord3D& rallyPoint ) const; - virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) const; - virtual void setRallyPoint( const Coord3D *pos ); ///< define a "rally point" for units to move towards - virtual const Coord3D *getRallyPoint() const; ///< define a "rally point" for units to move towards + virtual Bool getExitPosition( Coord3D& rallyPoint ) const override; + virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) const override; + virtual void setRallyPoint( const Coord3D *pos ) override; ///< define a "rally point" for units to move towards + virtual const Coord3D *getRallyPoint() const override; ///< define a "rally point" for units to move towards // UpdateModule - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // DieModule - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; // ParkingPlaceBehaviorInterface - virtual Bool shouldReserveDoorWhenQueued(const ThingTemplate* thing) const; - virtual Bool hasAvailableSpaceFor(const ThingTemplate* thing) const; - virtual Bool hasReservedSpace(ObjectID id) const; - virtual Int getSpaceIndex( ObjectID id ) const; - virtual Bool reserveSpace(ObjectID id, Real parkingOffset, PPInfo* info); - virtual void releaseSpace(ObjectID id); - virtual Bool reserveRunway(ObjectID id, Bool forLanding); - virtual void releaseRunway(ObjectID id); - virtual void calcPPInfo( ObjectID id, PPInfo *info ); - virtual Int getRunwayIndex(ObjectID id); - virtual Int getRunwayCount() const { return m_runways.size(); } - virtual ObjectID getRunwayReservation( Int r, RunwayReservationType type ); - virtual void transferRunwayReservationToNextInLineForTakeoff(ObjectID id); - virtual Real getApproachHeight() const { return getParkingPlaceBehaviorModuleData()->m_approachHeight; } - virtual Real getLandingDeckHeightOffset() const { return getParkingPlaceBehaviorModuleData()->m_landingDeckHeightOffset; } - virtual void setHealee(Object* healee, Bool add); - virtual void killAllParkedUnits(); - virtual void defectAllParkedUnits(Team* newTeam, UnsignedInt detectionTime); - virtual Bool calcBestParkingAssignment( ObjectID id, Coord3D *pos, Int *oldIndex = nullptr, Int *newIndex = nullptr ) { return FALSE; } + virtual Bool shouldReserveDoorWhenQueued(const ThingTemplate* thing) const override; + virtual Bool hasAvailableSpaceFor(const ThingTemplate* thing) const override; + virtual Bool hasReservedSpace(ObjectID id) const override; + virtual Int getSpaceIndex( ObjectID id ) const override; + virtual Bool reserveSpace(ObjectID id, Real parkingOffset, PPInfo* info) override; + virtual void releaseSpace(ObjectID id) override; + virtual Bool reserveRunway(ObjectID id, Bool forLanding) override; + virtual void releaseRunway(ObjectID id) override; + virtual void calcPPInfo( ObjectID id, PPInfo *info ) override; + virtual Int getRunwayIndex(ObjectID id) override; + virtual Int getRunwayCount() const override { return m_runways.size(); } + virtual ObjectID getRunwayReservation( Int r, RunwayReservationType type ) override; + virtual void transferRunwayReservationToNextInLineForTakeoff(ObjectID id) override; + virtual Real getApproachHeight() const override { return getParkingPlaceBehaviorModuleData()->m_approachHeight; } + virtual Real getLandingDeckHeightOffset() const override { return getParkingPlaceBehaviorModuleData()->m_landingDeckHeightOffset; } + virtual void setHealee(Object* healee, Bool add) override; + virtual void killAllParkedUnits() override; + virtual void defectAllParkedUnits(Team* newTeam, UnsignedInt detectionTime) override; + virtual Bool calcBestParkingAssignment( ObjectID id, Coord3D *pos, Int *oldIndex = nullptr, Int *newIndex = nullptr ) override { return FALSE; } virtual const std::vector* getTaxiLocations( ObjectID id ) const { return nullptr; } virtual const std::vector* getCreationLocations( ObjectID id ) const { return nullptr; } diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h index 28d42e1f1a9..49a1d489835 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h @@ -155,17 +155,17 @@ class ParticleUplinkCannonUpdate : public SpecialPowerUpdateModule // virtual destructor prototype provided by memory pool declaration // SpecialPowerUpdateInterface - virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ); - virtual Bool isSpecialAbility() const { return false; } - virtual Bool isSpecialPower() const { return true; } - virtual Bool isActive() const {return m_status != STATUS_IDLE;} - virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() { return this; } - virtual CommandOption getCommandOption() const { return (CommandOption)0; } - virtual Bool isPowerCurrentlyInUse( const CommandButton *command = nullptr ) const; - virtual ScienceType getExtraRequiredScience() const { return SCIENCE_INVALID; } //Does this object have more than one special power module with the same spTemplate? - - virtual void onObjectCreated(); - virtual UpdateSleepTime update(); + virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ) override; + virtual Bool isSpecialAbility() const override { return false; } + virtual Bool isSpecialPower() const override { return true; } + virtual Bool isActive() const override {return m_status != STATUS_IDLE;} + virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() override { return this; } + virtual CommandOption getCommandOption() const override { return (CommandOption)0; } + virtual Bool isPowerCurrentlyInUse( const CommandButton *command = nullptr ) const override; + virtual ScienceType getExtraRequiredScience() const override { return SCIENCE_INVALID; } //Does this object have more than one special power module with the same spTemplate? + + virtual void onObjectCreated() override; + virtual UpdateSleepTime update() override; void removeAllEffects(); @@ -180,12 +180,12 @@ class ParticleUplinkCannonUpdate : public SpecialPowerUpdateModule Bool calculateDefaultInformation(); Bool calculateUpBonePositions(); - virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const; //Is it active now? - virtual Bool doesSpecialPowerHaveOverridableDestination() const { return true; } //Does it have it, even if it's not active? - virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ); + virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const override; //Is it active now? + virtual Bool doesSpecialPowerHaveOverridableDestination() const override { return true; } //Does it have it, even if it's not active? + virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ) override; // Disabled conditions to process (termination conditions!) - virtual DisabledMaskType getDisabledTypesToProcess() const { return MAKE_DISABLED_MASK4( DISABLED_SUBDUED, DISABLED_UNDERPOWERED, DISABLED_EMP, DISABLED_HACKED ); } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return MAKE_DISABLED_MASK4( DISABLED_SUBDUED, DISABLED_UNDERPOWERED, DISABLED_EMP, DISABLED_HACKED ); } protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PassengersFireUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PassengersFireUpgrade.h index a9d27ac14f7..ebcda8e9fa0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PassengersFireUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PassengersFireUpgrade.h @@ -48,8 +48,8 @@ class PassengersFireUpgrade : public UpgradeModule // virtual destructor prototype defined by MemoryPoolObject protected: - virtual void upgradeImplementation( ); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation( ) override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h index 86d3fb8ebe9..ad5645896d2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h @@ -88,24 +88,24 @@ class PhysicsBehavior : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_COLLIDE); } - virtual void onObjectCreated(); + virtual void onObjectCreated() override; // BehaviorModule - virtual CollideModuleInterface* getCollide() { return this; } + virtual CollideModuleInterface* getCollide() override { return this; } // CollideModuleInterface - virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ); - virtual Bool wouldLikeToCollideWith(const Object* other) const { return false; } - virtual Bool isCarBombCrateCollide() const { return false; } - virtual Bool isHijackedVehicleCrateCollide() const { return false; } - virtual Bool isRailroad() const { return false;} - virtual Bool isSalvageCrateCollide() const { return false; } - virtual Bool isSabotageBuildingCrateCollide() const { return FALSE; } + virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ) override; + virtual Bool wouldLikeToCollideWith(const Object* other) const override { return false; } + virtual Bool isCarBombCrateCollide() const override { return false; } + virtual Bool isHijackedVehicleCrateCollide() const override { return false; } + virtual Bool isRailroad() const override { return false;} + virtual Bool isSalvageCrateCollide() const override { return false; } + virtual Bool isSabotageBuildingCrateCollide() const override { return FALSE; } // UpdateModuleInterface - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // Disabled conditions to process -- all - virtual DisabledMaskType getDisabledTypesToProcess() const { return DISABLEDMASK_ALL; } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return DISABLEDMASK_ALL; } void applyForce( const Coord3D *force ); ///< apply a force at the object's CG void applyShock( const Coord3D *force ); ///< apply a shockwave force against the object's CG @@ -217,7 +217,7 @@ class PhysicsBehavior : public UpdateModule, interesting oscillations can occur in some situations, with friction being applied either before or after the locomotive force, making for huge stuttery messes. (srj) */ - virtual SleepyUpdatePhase getUpdatePhase() const { return PHASE_PHYSICS; } + virtual SleepyUpdatePhase getUpdatePhase() const override { return PHASE_PHYSICS; } Real getAerodynamicFriction() const; Real getForwardFriction() const; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h index 78c39e8c2df..9e26fed411e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h @@ -68,8 +68,8 @@ class PilotFindVehicleUpdate : public UpdateModule PilotFindVehicleUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onObjectCreated(); - virtual UpdateSleepTime update(); + virtual void onObjectCreated() override; + virtual UpdateSleepTime update() override; Object* scanClosestTarget(); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h index e66818f66f0..e935b421a72 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h @@ -71,8 +71,8 @@ class PointDefenseLaserUpdate : public UpdateModule PointDefenseLaserUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onObjectCreated(); - virtual UpdateSleepTime update(); + virtual void onObjectCreated() override; + virtual UpdateSleepTime update() override; Object* scanClosestTarget(); void fireWhenReady(); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h index 11537deedc3..5897092528a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h @@ -67,17 +67,17 @@ class PoisonedBehavior : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DAMAGE); } // BehaviorModule - virtual DamageModuleInterface* getDamage() { return this; } + virtual DamageModuleInterface* getDamage() override { return this; } // DamageModuleInterface - virtual void onDamage( DamageInfo *damageInfo ); - virtual void onHealing( DamageInfo *damageInfo ); - virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState) { } + virtual void onDamage( DamageInfo *damageInfo ) override; + virtual void onHealing( DamageInfo *damageInfo ) override; + virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState) override { } // UpdateInterface - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // Disabled conditions to process (we should still poison disabled things) - virtual DisabledMaskType getDisabledTypesToProcess() const { return DISABLEDMASK_ALL; } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return DISABLEDMASK_ALL; } protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h index d816541947d..21560d2971a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h @@ -86,10 +86,10 @@ class PowerPlantUpdate : public UpdateModule, // virtual destructor prototype defined by MemoryPoolObject // interface housekeeping - virtual PowerPlantUpdateInterface* getPowerPlantUpdateInterface() { return this; } + virtual PowerPlantUpdateInterface* getPowerPlantUpdateInterface() override { return this; } - void extendRods( Bool extend ); ///< extend the rods from this object - virtual UpdateSleepTime update(); ///< Here's the actual work of Upgrading + void extendRods( Bool extend ) override; ///< extend the rods from this object + virtual UpdateSleepTime update() override; ///< Here's the actual work of Upgrading protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h index aa8da0fc392..4322645826a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h @@ -50,12 +50,12 @@ class PowerPlantUpgrade : public UpgradeModule PowerPlantUpgrade( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype defined by MemoryPoolObject - virtual void onDelete(); ///< we have some work to do when this module goes away - virtual void onCapture( Player *oldOwner, Player *newOwner ); ///< object containing upgrade has changed teams + virtual void onDelete() override; ///< we have some work to do when this module goes away + virtual void onCapture( Player *oldOwner, Player *newOwner ) override; ///< object containing upgrade has changed teams protected: - virtual void upgradeImplementation(); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation() override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h index 0c921df8098..ee13191069d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h @@ -49,8 +49,8 @@ class PreorderCreate : public CreateModule PreorderCreate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onCreate(); - virtual void onBuildComplete(); + virtual void onCreate() override; + virtual void onBuildComplete() override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h index a3e3b5c01e5..2f89b4c969a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h @@ -194,48 +194,48 @@ class ProductionUpdate : public UpdateModule, public ProductionUpdateInterface, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DIE); } // Disabled conditions to process (AI will still process held status) - virtual DisabledMaskType getDisabledTypesToProcess() const { return getProductionUpdateModuleData()->m_disabledTypesToProcess; } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return getProductionUpdateModuleData()->m_disabledTypesToProcess; } - virtual ProductionUpdateInterface* getProductionUpdateInterface() { return this; } - virtual DieModuleInterface* getDie() { return this; } + virtual ProductionUpdateInterface* getProductionUpdateInterface() override { return this; } + virtual DieModuleInterface* getDie() override { return this; } static ProductionUpdateInterface *getProductionUpdateInterfaceFromObject( Object *obj ); - virtual CanMakeType canQueueCreateUnit( const ThingTemplate *unitType ) const; - virtual CanMakeType canQueueUpgrade( const UpgradeTemplate *upgrade ) const; + virtual CanMakeType canQueueCreateUnit( const ThingTemplate *unitType ) const override; + virtual CanMakeType canQueueUpgrade( const UpgradeTemplate *upgrade ) const override; /** this method is used to request a unique ID to assign to the production of a single unit. It is unique to all units that can be created from this source object, but is not unique among multiple source objects */ - virtual ProductionID requestUniqueUnitID() { ProductionID tmp = m_uniqueID; m_uniqueID = (ProductionID)(m_uniqueID+1); return tmp; } + virtual ProductionID requestUniqueUnitID() override { ProductionID tmp = m_uniqueID; m_uniqueID = (ProductionID)(m_uniqueID+1); return tmp; } - virtual Bool queueUpgrade( const UpgradeTemplate *upgrade ); ///< queue upgrade "research" - virtual void cancelUpgrade( const UpgradeTemplate *upgrade ); ///< cancel upgrade "research" - virtual Bool isUpgradeInQueue( const UpgradeTemplate *upgrade ) const; ///< is the upgrade in our production queue already - virtual UnsignedInt countUnitTypeInQueue( const ThingTemplate *unitType ) const; ///< count number of units with matching unit type in the production queue + virtual Bool queueUpgrade( const UpgradeTemplate *upgrade ) override; ///< queue upgrade "research" + virtual void cancelUpgrade( const UpgradeTemplate *upgrade ) override; ///< cancel upgrade "research" + virtual Bool isUpgradeInQueue( const UpgradeTemplate *upgrade ) const override; ///< is the upgrade in our production queue already + virtual UnsignedInt countUnitTypeInQueue( const ThingTemplate *unitType ) const override; ///< count number of units with matching unit type in the production queue - virtual Bool queueCreateUnit( const ThingTemplate *unitType, ProductionID productionID ); ///< queue unit to be produced - virtual void cancelUnitCreate( ProductionID productionID ); ///< cancel construction of unit with matching production ID - virtual void cancelAllUnitsOfType( const ThingTemplate *unitType); ///< cancel all production of type unitType + virtual Bool queueCreateUnit( const ThingTemplate *unitType, ProductionID productionID ) override; ///< queue unit to be produced + virtual void cancelUnitCreate( ProductionID productionID ) override; ///< cancel construction of unit with matching production ID + virtual void cancelAllUnitsOfType( const ThingTemplate *unitType) override; ///< cancel all production of type unitType - virtual void cancelAndRefundAllProduction(); ///< cancel and refund anything in the production queue + virtual void cancelAndRefundAllProduction() override; ///< cancel and refund anything in the production queue - virtual UnsignedInt getProductionCount() const { return m_productionCount; } ///< return # of things in the production queue + virtual UnsignedInt getProductionCount() const override { return m_productionCount; } ///< return # of things in the production queue // walking the production list from outside - virtual const ProductionEntry *firstProduction() const { return m_productionQueue; } - virtual const ProductionEntry *nextProduction( const ProductionEntry *p ) const { return p ? p->m_next : nullptr; } + virtual const ProductionEntry *firstProduction() const override { return m_productionQueue; } + virtual const ProductionEntry *nextProduction( const ProductionEntry *p ) const override { return p ? p->m_next : nullptr; } - virtual void setHoldDoorOpen(ExitDoorType exitDoor, Bool holdIt); + virtual void setHoldDoorOpen(ExitDoorType exitDoor, Bool holdIt) override; - virtual UpdateSleepTime update(); ///< the update + virtual UpdateSleepTime update() override; ///< the update //These functions keep track of the special power construction of a new building via a special power instead of standard production interface. //This was added for the sneak attack building functionality. - virtual const CommandButton* getSpecialPowerConstructionCommandButton() const { return m_specialPowerConstructionCommandButton; } - virtual void setSpecialPowerConstructionCommandButton( const CommandButton *commandButton ) { m_specialPowerConstructionCommandButton = commandButton; } + virtual const CommandButton* getSpecialPowerConstructionCommandButton() const override { return m_specialPowerConstructionCommandButton; } + virtual void setSpecialPowerConstructionCommandButton( const CommandButton *commandButton ) override { m_specialPowerConstructionCommandButton = commandButton; } // DieModuleInterface - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h index 7632d184bfa..83ac2013898 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h @@ -58,7 +58,7 @@ class ProjectileStreamUpdate : public UpdateModule void getAllPoints( Vector3 *points, Int *count ); ///< unroll circular array and write down all projectile positions void setPosition( const Coord3D *newPosition ); ///< I need to exist at the place I want to draw since only (near) on screen Drawables get updated - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h index 2aa74479938..0a00725334f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h @@ -66,7 +66,7 @@ class ProneUpdate : public UpdateModule void goProne( const DamageInfo *damageInfo ); - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h index 378b02e05b6..5ee319083d1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h @@ -78,21 +78,21 @@ class PropagandaTowerBehavior : public UpdateModule, // module methods static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DIE); } - virtual void onDelete(); - void onObjectCreated(); + virtual void onDelete() override; + void onObjectCreated() override; // update module methods - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // die module methods - virtual DieModuleInterface *getDie() { return this; } - virtual void onDie( const DamageInfo *damageInfo ); - virtual void onCapture( Player *oldOwner, Player *newOwner ); + virtual DieModuleInterface *getDie() override { return this; } + virtual void onDie( const DamageInfo *damageInfo ) override; + virtual void onCapture( Player *oldOwner, Player *newOwner ) override; // Disabled conditions to process. Need to process when disabled, because our update needs to actively let go // of our effect on people. We don't say "Be affected for n frames", we toggle people. We need to process // so we can toggle everyone off. - virtual DisabledMaskType getDisabledTypesToProcess() const { return DISABLEDMASK_ALL; } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return DISABLEDMASK_ALL; } // our own public module methods diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h index 4fb29ba0f81..2b4c5ee5b92 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h @@ -80,24 +80,24 @@ class QueueProductionExitUpdate : public UpdateModule, public ExitInterface public: - virtual ExitInterface* getUpdateExitInterface() { return this; } + virtual ExitInterface* getUpdateExitInterface() override { return this; } QueueProductionExitUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration // Required funcs to fulfill interface requirements - virtual Bool isExitBusy() const {return FALSE;} ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. - virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ); - virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ); - virtual void exitObjectByBudding( Object *newObj, Object *budHost ); - virtual void unreserveDoorForExit( ExitDoorType exitDoor ); - - virtual void setRallyPoint( const Coord3D *pos ); ///< define a "rally point" for units to move towards - virtual const Coord3D *getRallyPoint() const; ///< define a "rally point" for units to move towards - virtual Bool getExitPosition( Coord3D& exitPosition ) const; ///< access to the "Door" position of the production object - virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) const; ///< get the natural "rally point" for units to move towards - - virtual UpdateSleepTime update(); + virtual Bool isExitBusy() const override {return FALSE;} ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. + virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ) override; + virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ) override; + virtual void exitObjectByBudding( Object *newObj, Object *budHost ) override; + virtual void unreserveDoorForExit( ExitDoorType exitDoor ) override; + + virtual void setRallyPoint( const Coord3D *pos ) override; ///< define a "rally point" for units to move towards + virtual const Coord3D *getRallyPoint() const override; ///< define a "rally point" for units to move towards + virtual Bool getExitPosition( Coord3D& exitPosition ) const override; ///< access to the "Door" position of the production object + virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) const override; ///< get the natural "rally point" for units to move towards + + virtual UpdateSleepTime update() override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h index 893f396a6ad..30d27899b16 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h @@ -76,7 +76,7 @@ class RadarUpdate : public UpdateModule void extendRadar(); ///< extend the radar from this object Bool isRadarActive() { return m_radarActive; } - virtual UpdateSleepTime update(); ///< Here's the actual work of Upgrading + virtual UpdateSleepTime update() override; ///< Here's the actual work of Upgrading protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h index aa9d6e63563..65bb8cf5eb7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h @@ -64,14 +64,14 @@ class RadarUpgrade : public UpgradeModule RadarUpgrade( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype defined by MemoryPoolObject - virtual void onDelete(); ///< we have some work to do when this module goes away - virtual void onCapture( Player *oldOwner, Player *newOwner ); ///< object containing upgrade has changed teams + virtual void onDelete() override; ///< we have some work to do when this module goes away + virtual void onCapture( Player *oldOwner, Player *newOwner ) override; ///< object containing upgrade has changed teams Bool getIsDisableProof() const { return getRadarUpgradeModuleData()->m_isDisableProof; } protected: - virtual void upgradeImplementation(); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation() override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h index 53379499809..8c6ceac44c4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h @@ -74,7 +74,7 @@ class RadiusDecalUpdate : public UpdateModule void killWhenNoLongerAttacking(Bool v) { m_killWhenNoLongerAttacking = v; } void killRadiusDecal(); - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; private: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h index 4a7edc31e99..9d3d1ddead7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h @@ -64,14 +64,14 @@ class RailedTransportAIUpdate : public AIUpdateInterface // virtual destructor prototype provided by memory pool declaration // AIUpdate interface methods - virtual void aiDoCommand( const AICommandParms *parms ); - virtual UpdateSleepTime update(); + virtual void aiDoCommand( const AICommandParms *parms ) override; + virtual UpdateSleepTime update() override; protected: // ai module methods - virtual void privateExecuteRailedTransport( CommandSourceType cmdSource ); - virtual void privateEvacuate( Int exposeStealthUnits, CommandSourceType cmdSource ); + virtual void privateExecuteRailedTransport( CommandSourceType cmdSource ) override; + virtual void privateEvacuate( Int exposeStealthUnits, CommandSourceType cmdSource ) override; // our methods void setInTransit( Bool inTransit ); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h index 4b5357b27f3..c6adf082365 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h @@ -45,12 +45,12 @@ class RailedTransportContain : public TransportContain RailedTransportContain( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onRemoving( Object *obj ); ///< object no longer contains 'obj' - virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ); - virtual void exitObjectByBudding( Object *newObj, Object *budHost ) { return; }; + virtual void onRemoving( Object *obj ) override; ///< object no longer contains 'obj' + virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ) override; + virtual void exitObjectByBudding( Object *newObj, Object *budHost ) override { return; }; protected: - virtual Bool isSpecificRiderFreeToExit( Object *obj ); + virtual Bool isSpecificRiderFreeToExit( Object *obj ) override; }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h index 757db5abbe4..249246dd74a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h @@ -79,20 +79,20 @@ class RailedTransportDockUpdate : public DockUpdate, // virtual destructor prototype provided by memory pool declaration // module interfaces - virtual RailedTransportDockUpdateInterface *getRailedTransportDockUpdateInterface() { return this; } + virtual RailedTransportDockUpdateInterface *getRailedTransportDockUpdateInterface() override { return this; } // update module methods - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // dock methods - virtual DockUpdateInterface* getDockUpdateInterface() { return this; } - virtual Bool action( Object* docker, Object *drone = nullptr ); - virtual Bool isClearToEnter( Object const* docker ) const; + virtual DockUpdateInterface* getDockUpdateInterface() override { return this; } + virtual Bool action( Object* docker, Object *drone = nullptr ) override; + virtual Bool isClearToEnter( Object const* docker ) const override; // our own methods - virtual Bool isLoadingOrUnloading(); - virtual void unloadAll(); - virtual void unloadSingleObject( Object *obj ); + virtual Bool isLoadingOrUnloading() override; + virtual void unloadAll() override; + virtual void unloadSingleObject( Object *obj ) override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h index e576d123c40..2a002a3aa80 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h @@ -219,9 +219,9 @@ class RailroadBehavior : public PhysicsBehavior // virtual SleepyUpdatePhase getUpdatePhase() const { return PHASE_FINAL; } // PhysicsBehavior methods - virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ); - virtual Bool isRailroad() const ; - virtual UpdateSleepTime update(); + virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ) override; + virtual Bool isRailroad() const override; + virtual UpdateSleepTime update() override; // TRAINY METHODS diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h index 547469f3cfc..d3a172a5ba6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h @@ -82,24 +82,24 @@ class RebuildHoleBehavior : public UpdateModule, RebuildHoleBehavior( Thing *thing, const ModuleData *moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual RebuildHoleBehaviorInterface* getRebuildHoleBehaviorInterface() { return this; } + virtual RebuildHoleBehaviorInterface* getRebuildHoleBehaviorInterface() override { return this; } static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DIE); } // BehaviorModule - virtual DieModuleInterface* getDie() { return this; } + virtual DieModuleInterface* getDie() override { return this; } // UpdateModuleInterface - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // DieModuleInterface - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; // RebuildHole specific methods - virtual void startRebuildProcess( const ThingTemplate *rebuild, ObjectID spawnerID ); - virtual ObjectID getSpawnerID() { return m_spawnerObjectID; } - virtual ObjectID getReconstructedBuildingID() { return m_reconstructingID; } - virtual const ThingTemplate* getRebuildTemplate() const { return m_rebuildTemplate; } + virtual void startRebuildProcess( const ThingTemplate *rebuild, ObjectID spawnerID ) override; + virtual ObjectID getSpawnerID() override { return m_spawnerObjectID; } + virtual ObjectID getReconstructedBuildingID() override { return m_reconstructingID; } + virtual const ThingTemplate* getRebuildTemplate() const override { return m_rebuildTemplate; } void transferBombs( Object *reconstruction ); // interface acquisition diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h index 9644a0f1cc8..bed74c1e594 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h @@ -66,6 +66,6 @@ class RebuildHoleExposeDie : public DieModule RebuildHoleExposeDie( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h index ac1a7aad0f5..42c54bb6e7c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h @@ -61,11 +61,11 @@ class RepairDockUpdate : public DockUpdate RepairDockUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by MemoryPoolObject base class - virtual DockUpdateInterface* getDockUpdateInterface() { return this; } + virtual DockUpdateInterface* getDockUpdateInterface() override { return this; } - virtual Bool action( Object *docker, Object *drone = nullptr ); ///< for me this means do some repair + virtual Bool action( Object *docker, Object *drone = nullptr ) override; ///< for me this means do some repair - virtual Bool isRallyPointAfterDockType(){return TRUE;} ///< A minority of docks want to give you a final command to their rally point + virtual Bool isRallyPointAfterDockType() override{return TRUE;} ///< A minority of docks want to give you a final command to their rally point protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ReplaceObjectUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ReplaceObjectUpgrade.h index 0cdcb5234f1..532d549b06a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ReplaceObjectUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ReplaceObjectUpgrade.h @@ -57,7 +57,7 @@ class ReplaceObjectUpgrade : public UpgradeModule // virtual destructor prototype defined by MemoryPoolObject protected: - virtual void upgradeImplementation( ); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation( ) override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RiderChangeContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RiderChangeContain.h index d680dfd45ce..e8edfce597c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RiderChangeContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RiderChangeContain.h @@ -76,33 +76,33 @@ class RiderChangeContain : public TransportContain RiderChangeContain( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual Bool isValidContainerFor( const Object* obj, Bool checkCapacity) const; + virtual Bool isValidContainerFor( const Object* obj, Bool checkCapacity) const override; - virtual void onCapture( Player *oldOwner, Player *newOwner ); // have to kick everyone out on capture. - virtual void onContaining( Object *obj, Bool wasSelected ); ///< object now contains 'obj' - virtual void onRemoving( Object *obj ); ///< object no longer contains 'obj' - virtual UpdateSleepTime update(); ///< called once per frame + virtual void onCapture( Player *oldOwner, Player *newOwner ) override; // have to kick everyone out on capture. + virtual void onContaining( Object *obj, Bool wasSelected ) override; ///< object now contains 'obj' + virtual void onRemoving( Object *obj ) override; ///< object no longer contains 'obj' + virtual UpdateSleepTime update() override; ///< called once per frame - virtual Bool isRiderChangeContain() const { return TRUE; } - virtual const Object *friend_getRider() const; + virtual Bool isRiderChangeContain() const override { return TRUE; } + virtual const Object *friend_getRider() const override; - virtual Int getContainMax() const; + virtual Int getContainMax() const override; - virtual Int getExtraSlotsInUse() { return m_extraSlotsInUse; }///< Transports have the ability to carry guys how take up more than spot. + virtual Int getExtraSlotsInUse() override { return m_extraSlotsInUse; }///< Transports have the ability to carry guys how take up more than spot. - virtual Bool isExitBusy() const; ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. - virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ); - virtual void unreserveDoorForExit( ExitDoorType exitDoor ); - virtual Bool isDisplayedOnControlBar() const {return TRUE;}///< Does this container display its contents on the ControlBar? + virtual Bool isExitBusy() const override; ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. + virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ) override; + virtual void unreserveDoorForExit( ExitDoorType exitDoor ) override; + virtual Bool isDisplayedOnControlBar() const override {return TRUE;}///< Does this container display its contents on the ControlBar? - virtual Bool getContainerPipsToShow( Int& numTotal, Int& numFull ); + virtual Bool getContainerPipsToShow( Int& numTotal, Int& numFull ) override; protected: // exists primarily for RiderChangeContain to override - virtual void killRidersWhoAreNotFreeToExit(); - virtual Bool isSpecificRiderFreeToExit(Object* obj); - virtual void createPayload(); + virtual void killRidersWhoAreNotFreeToExit() override; + virtual Bool isSpecificRiderFreeToExit(Object* obj) override; + virtual void createPayload() override; private: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageCommandCenterCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageCommandCenterCrateCollide.h index ee0bd55023d..8c81bcf47d9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageCommandCenterCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageCommandCenterCrateCollide.h @@ -76,11 +76,11 @@ class SabotageCommandCenterCrateCollide : public CrateCollide protected: /// This allows specific vetoes to certain types of crates and their data - virtual Bool isValidToExecute( const Object *other ) const; + virtual Bool isValidToExecute( const Object *other ) const override; /// This is the game logic execution function that all real CrateCollides will implement - virtual Bool executeCrateBehavior( Object *other ); + virtual Bool executeCrateBehavior( Object *other ) override; - virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; } + virtual Bool isSabotageBuildingCrateCollide() const override { return TRUE; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageFakeBuildingCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageFakeBuildingCrateCollide.h index 7788a47ccdb..db7d0b8fb49 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageFakeBuildingCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageFakeBuildingCrateCollide.h @@ -76,11 +76,11 @@ class SabotageFakeBuildingCrateCollide : public CrateCollide protected: /// This allows specific vetoes to certain types of crates and their data - virtual Bool isValidToExecute( const Object *other ) const; + virtual Bool isValidToExecute( const Object *other ) const override; /// This is the game logic execution function that all real CrateCollides will implement - virtual Bool executeCrateBehavior( Object *other ); + virtual Bool executeCrateBehavior( Object *other ) override; - virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; } + virtual Bool isSabotageBuildingCrateCollide() const override { return TRUE; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageInternetCenterCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageInternetCenterCrateCollide.h index f00fb7a0821..92e5587f5ae 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageInternetCenterCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageInternetCenterCrateCollide.h @@ -79,11 +79,11 @@ class SabotageInternetCenterCrateCollide : public CrateCollide protected: /// This allows specific vetoes to certain types of crates and their data - virtual Bool isValidToExecute( const Object *other ) const; + virtual Bool isValidToExecute( const Object *other ) const override; /// This is the game logic execution function that all real CrateCollides will implement - virtual Bool executeCrateBehavior( Object *other ); + virtual Bool executeCrateBehavior( Object *other ) override; - virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; } + virtual Bool isSabotageBuildingCrateCollide() const override { return TRUE; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageMilitaryFactoryCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageMilitaryFactoryCrateCollide.h index e7ca672ca07..139845be292 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageMilitaryFactoryCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageMilitaryFactoryCrateCollide.h @@ -79,11 +79,11 @@ class SabotageMilitaryFactoryCrateCollide : public CrateCollide protected: /// This allows specific vetoes to certain types of crates and their data - virtual Bool isValidToExecute( const Object *other ) const; + virtual Bool isValidToExecute( const Object *other ) const override; /// This is the game logic execution function that all real CrateCollides will implement - virtual Bool executeCrateBehavior( Object *other ); + virtual Bool executeCrateBehavior( Object *other ) override; - virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; } + virtual Bool isSabotageBuildingCrateCollide() const override { return TRUE; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotagePowerPlantCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotagePowerPlantCrateCollide.h index 479b9db8e87..10e0d90e407 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotagePowerPlantCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotagePowerPlantCrateCollide.h @@ -79,11 +79,11 @@ class SabotagePowerPlantCrateCollide : public CrateCollide protected: /// This allows specific vetoes to certain types of crates and their data - virtual Bool isValidToExecute( const Object *other ) const; + virtual Bool isValidToExecute( const Object *other ) const override; /// This is the game logic execution function that all real CrateCollides will implement - virtual Bool executeCrateBehavior( Object *other ); + virtual Bool executeCrateBehavior( Object *other ) override; - virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; } + virtual Bool isSabotageBuildingCrateCollide() const override { return TRUE; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSuperweaponCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSuperweaponCrateCollide.h index ed26201b133..6eb16c85c8e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSuperweaponCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSuperweaponCrateCollide.h @@ -76,11 +76,11 @@ class SabotageSuperweaponCrateCollide : public CrateCollide protected: /// This allows specific vetoes to certain types of crates and their data - virtual Bool isValidToExecute( const Object *other ) const; + virtual Bool isValidToExecute( const Object *other ) const override; /// This is the game logic execution function that all real CrateCollides will implement - virtual Bool executeCrateBehavior( Object *other ); + virtual Bool executeCrateBehavior( Object *other ) override; - virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; } + virtual Bool isSabotageBuildingCrateCollide() const override { return TRUE; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyCenterCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyCenterCrateCollide.h index 9b62fdb0f17..b3deabef59e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyCenterCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyCenterCrateCollide.h @@ -79,11 +79,11 @@ class SabotageSupplyCenterCrateCollide : public CrateCollide protected: /// This allows specific vetoes to certain types of crates and their data - virtual Bool isValidToExecute( const Object *other ) const; + virtual Bool isValidToExecute( const Object *other ) const override; /// This is the game logic execution function that all real CrateCollides will implement - virtual Bool executeCrateBehavior( Object *other ); + virtual Bool executeCrateBehavior( Object *other ) override; - virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; } + virtual Bool isSabotageBuildingCrateCollide() const override { return TRUE; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyDropzoneCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyDropzoneCrateCollide.h index c85cb592344..7f808121beb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyDropzoneCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyDropzoneCrateCollide.h @@ -79,11 +79,11 @@ class SabotageSupplyDropzoneCrateCollide : public CrateCollide protected: /// This allows specific vetoes to certain types of crates and their data - virtual Bool isValidToExecute( const Object *other ) const; + virtual Bool isValidToExecute( const Object *other ) const override; /// This is the game logic execution function that all real CrateCollides will implement - virtual Bool executeCrateBehavior( Object *other ); + virtual Bool executeCrateBehavior( Object *other ) override; - virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; } + virtual Bool isSabotageBuildingCrateCollide() const override { return TRUE; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h index 5153d583317..a7e484ee306 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h @@ -87,15 +87,15 @@ class SalvageCrateCollide : public CrateCollide SalvageCrateCollide( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual Bool isSalvageCrateCollide() const { return true; } + virtual Bool isSalvageCrateCollide() const override { return true; } protected: /// This allows specific vetoes to certain types of crates and their data - virtual Bool isValidToExecute( const Object *other ) const; + virtual Bool isValidToExecute( const Object *other ) const override; /// This is the game logic execution function that all real CrateCollides will implement - virtual Bool executeCrateBehavior( Object *other ); + virtual Bool executeCrateBehavior( Object *other ) override; private: Bool eligibleForWeaponSet( Object *other ); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h index f77074e4066..2b03561decf 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h @@ -51,5 +51,5 @@ class ShroudCrateCollide : public CrateCollide protected: /// This is the game logic execution function that all real CrateCollides will implement - virtual Bool executeCrateBehavior( Object *other ); + virtual Bool executeCrateBehavior( Object *other ) override; }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h index f49cf3e7f17..0d6af7a5e5e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h @@ -144,14 +144,14 @@ class SlavedUpdate : public UpdateModule, public SlavedUpdateInterface SlavedUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual SlavedUpdateInterface* getSlavedUpdateInterface() { return this; } + virtual SlavedUpdateInterface* getSlavedUpdateInterface() override { return this; } - virtual ObjectID getSlaverID() const { return m_slaver; } - virtual void onEnslave( const Object *slaver ); - virtual void onSlaverDie( const DamageInfo *info ); - virtual void onSlaverDamage( const DamageInfo *info ); - virtual void onObjectCreated(); - virtual Bool isSelfTasking() const { return FALSE; }; + virtual ObjectID getSlaverID() const override { return m_slaver; } + virtual void onEnslave( const Object *slaver ) override; + virtual void onSlaverDie( const DamageInfo *info ) override; + virtual void onSlaverDamage( const DamageInfo *info ) override; + virtual void onObjectCreated() override; + virtual Bool isSelfTasking() const override { return FALSE; }; void doScoutLogic( const Coord3D *mastersDestination ); @@ -163,7 +163,7 @@ class SlavedUpdate : public UpdateModule, public SlavedUpdateInterface void setRepairModelConditionStates( ModelConditionFlagType flag ); void moveToNewRepairSpot(); - virtual UpdateSleepTime update(); ///< Deciding whether or not to make new guys + virtual UpdateSleepTime update() override; ///< Deciding whether or not to make new guys private: void startSlavedEffects( const Object *slaver ); ///< We have been marked as Slaved, so we can't be selected or move too far or other stuff diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h index d415bd9dd89..67cfccc5d31 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h @@ -137,21 +137,21 @@ class SlowDeathBehavior : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DIE); } // BehaviorModule - virtual DieModuleInterface* getDie() { return this; } + virtual DieModuleInterface* getDie() override { return this; } // UpdateModuleInterface - virtual UpdateSleepTime update(); - virtual SlowDeathBehaviorInterface* getSlowDeathBehaviorInterface() { return this; } + virtual UpdateSleepTime update() override; + virtual SlowDeathBehaviorInterface* getSlowDeathBehaviorInterface() override { return this; } // Disabled conditions to process -- all - virtual DisabledMaskType getDisabledTypesToProcess() const { return DISABLEDMASK_ALL; } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return DISABLEDMASK_ALL; } // DieModuleInterface - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; // SlowDeathBehaviorInterface - virtual void beginSlowDeath( const DamageInfo *damageInfo ); - virtual Int getProbabilityModifier( const DamageInfo *damageInfo ) const; - virtual Bool isDieApplicable(const DamageInfo *damageInfo) const { return getSlowDeathBehaviorModuleData()->m_dieMuxData.isDieApplicable(getObject(), damageInfo); } + virtual void beginSlowDeath( const DamageInfo *damageInfo ) override; + virtual Int getProbabilityModifier( const DamageInfo *damageInfo ) const override; + virtual Bool isDieApplicable(const DamageInfo *damageInfo) const override { return getSlowDeathBehaviorModuleData()->m_dieMuxData.isDieApplicable(getObject(), damageInfo); } protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SmartBombTargetHomingUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SmartBombTargetHomingUpdate.h index 4e95f36bd99..079d9cd2b70 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SmartBombTargetHomingUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SmartBombTargetHomingUpdate.h @@ -70,7 +70,7 @@ class SmartBombTargetHomingUpdate : public UpdateModule void SetTargetPosition( const Coord3D& target ); - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h index 9d7c3df596a..eb043d35121 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h @@ -142,41 +142,41 @@ class SpawnBehavior : public UpdateModule, // module methods static Int getInterfaceMask() { return (MODULEINTERFACE_UPDATE) | (MODULEINTERFACE_DIE) | (MODULEINTERFACE_DAMAGE); } - virtual void onDelete(); - virtual UpdateModuleInterface *getUpdate() { return this; } - virtual DieModuleInterface *getDie() { return this; } - virtual DamageModuleInterface *getDamage() { return this; } - virtual SpawnBehaviorInterface* getSpawnBehaviorInterface() { return this; } + virtual void onDelete() override; + virtual UpdateModuleInterface *getUpdate() override { return this; } + virtual DieModuleInterface *getDie() override { return this; } + virtual DamageModuleInterface *getDamage() override { return this; } + virtual SpawnBehaviorInterface* getSpawnBehaviorInterface() override { return this; } // update methods - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // die methods - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; // damage methods - virtual void onDamage( DamageInfo *damageInfo ); - virtual void onHealing( DamageInfo *damageInfo ) { } + virtual void onDamage( DamageInfo *damageInfo ) override; + virtual void onHealing( DamageInfo *damageInfo ) override { } virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, BodyDamageType oldState, - BodyDamageType newState) { } + BodyDamageType newState) override { } // SpawnBehaviorInterface methods - virtual Bool maySpawnSelfTaskAI( Real maxSelfTaskersRatio ); - virtual void onSpawnDeath( ObjectID deadSpawn, DamageInfo *damageInfo ); ///< Something we spawned and set up to tell us it died just died. - virtual Object* getClosestSlave( const Coord3D *pos ); - virtual void orderSlavesToAttackTarget( Object *target, Int maxShotsToFire, CommandSourceType cmdSource ); - virtual void orderSlavesToAttackPosition( const Coord3D *pos, Int maxShotsToFire, CommandSourceType cmdSource ); - virtual CanAttackResult getCanAnySlavesAttackSpecificTarget( AbleToAttackType attackType, const Object *target, CommandSourceType cmdSource ); - virtual CanAttackResult getCanAnySlavesUseWeaponAgainstTarget( AbleToAttackType attackType, const Object *victim, const Coord3D *pos, CommandSourceType cmdSource ); - virtual Bool canAnySlavesAttack(); - virtual void orderSlavesToGoIdle( CommandSourceType cmdSource ); - virtual void orderSlavesDisabledUntil( DisabledType type, UnsignedInt frame ); - virtual void orderSlavesToClearDisabled( DisabledType type ); - virtual void giveSlavesStealthUpgrade( Bool grantStealth ); - virtual Bool areAllSlavesStealthed() const; - virtual void revealSlaves(); - virtual Bool doSlavesHaveFreedom() const { return getSpawnBehaviorModuleData()->m_slavesHaveFreeWill; } + virtual Bool maySpawnSelfTaskAI( Real maxSelfTaskersRatio ) override; + virtual void onSpawnDeath( ObjectID deadSpawn, DamageInfo *damageInfo ) override; ///< Something we spawned and set up to tell us it died just died. + virtual Object* getClosestSlave( const Coord3D *pos ) override; + virtual void orderSlavesToAttackTarget( Object *target, Int maxShotsToFire, CommandSourceType cmdSource ) override; + virtual void orderSlavesToAttackPosition( const Coord3D *pos, Int maxShotsToFire, CommandSourceType cmdSource ) override; + virtual CanAttackResult getCanAnySlavesAttackSpecificTarget( AbleToAttackType attackType, const Object *target, CommandSourceType cmdSource ) override; + virtual CanAttackResult getCanAnySlavesUseWeaponAgainstTarget( AbleToAttackType attackType, const Object *victim, const Coord3D *pos, CommandSourceType cmdSource ) override; + virtual Bool canAnySlavesAttack() override; + virtual void orderSlavesToGoIdle( CommandSourceType cmdSource ) override; + virtual void orderSlavesDisabledUntil( DisabledType type, UnsignedInt frame ) override; + virtual void orderSlavesToClearDisabled( DisabledType type ) override; + virtual void giveSlavesStealthUpgrade( Bool grantStealth ) override; + virtual Bool areAllSlavesStealthed() const override; + virtual void revealSlaves() override; + virtual Bool doSlavesHaveFreedom() const override { return getSpawnBehaviorModuleData()->m_slavesHaveFreeWill; } // ********************************************************************************************** // our own methods diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h index 994bd31cdd7..abe6516aa92 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h @@ -68,21 +68,21 @@ class SpawnPointProductionExitUpdate : public UpdateModule, public ExitInterface public: - virtual ExitInterface* getUpdateExitInterface() { return this; } + virtual ExitInterface* getUpdateExitInterface() override { return this; } SpawnPointProductionExitUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration // Required funcs to fulfill interface requirements - virtual Bool isExitBusy() const {return FALSE;} ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. - virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ); - virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ); - virtual void unreserveDoorForExit( ExitDoorType exitDoor ); - virtual void setRallyPoint( const Coord3D * ){} - virtual const Coord3D *getRallyPoint() const { return nullptr; } - virtual void exitObjectByBudding( Object *newObj, Object *budHost ) { return; } - - virtual UpdateSleepTime update() { return UPDATE_SLEEP_FOREVER; } + virtual Bool isExitBusy() const override {return FALSE;} ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check. + virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ) override; + virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ) override; + virtual void unreserveDoorForExit( ExitDoorType exitDoor ) override; + virtual void setRallyPoint( const Coord3D * ) override{} + virtual const Coord3D *getRallyPoint() const override { return nullptr; } + virtual void exitObjectByBudding( Object *newObj, Object *budHost ) override { return; } + + virtual UpdateSleepTime update() override { return UPDATE_SLEEP_FOREVER; } protected: Bool m_bonesInitialized; ///< To prevent creation bugs, only init the World coords when first asked for one diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h index cd5abc5cd88..950195d7363 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h @@ -55,9 +55,9 @@ class SpecialAbility : public SpecialPowerModule SpecialAbility( Thing *thing, const ModuleData *moduleData ); - virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions ); - virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ); - virtual void doSpecialPower( UnsignedInt commandOptions ); + virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions ) override; + virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ) override; + virtual void doSpecialPower( UnsignedInt commandOptions ) override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h index 96e3a37cdeb..8800f111db8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h @@ -178,21 +178,21 @@ class SpecialAbilityUpdate : public SpecialPowerUpdateModule // virtual destructor prototype provided by memory pool declaration // SpecialPowerUpdateInterface - virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ); - virtual Bool isSpecialAbility() const { return true; } - virtual Bool isSpecialPower() const { return false; } - virtual Bool isActive() const { return m_active; } - virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const { return false; } //Is it active now? - virtual Bool doesSpecialPowerHaveOverridableDestination() const { return false; } //Does it have it, even if it's not active? - virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ) {} - virtual Bool isPowerCurrentlyInUse( const CommandButton *command = nullptr ) const; + virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ) override; + virtual Bool isSpecialAbility() const override { return true; } + virtual Bool isSpecialPower() const override { return false; } + virtual Bool isActive() const override { return m_active; } + virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const override { return false; } //Is it active now? + virtual Bool doesSpecialPowerHaveOverridableDestination() const override { return false; } //Does it have it, even if it's not active? + virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ) override {} + virtual Bool isPowerCurrentlyInUse( const CommandButton *command = nullptr ) const override; // virtual Bool isBusy() const { return m_isBusy; } // UpdateModule - virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() { return this; } - virtual CommandOption getCommandOption() const { return (CommandOption)0; } - virtual UpdateSleepTime update(); + virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() override { return this; } + virtual CommandOption getCommandOption() const override { return (CommandOption)0; } + virtual UpdateSleepTime update() override; // ??? ugh, public stuff that shouldn't be -- hell yeah! UnsignedInt getSpecialObjectCount() const; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h index 901262118e5..54261919079 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h @@ -77,7 +77,7 @@ class SpecialPowerCompletionDie : public DieModule void setCreator( ObjectID creatorID ); void notifyScriptEngine(); - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h index fa05edb2bdd..1a2524ef69f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h @@ -48,8 +48,8 @@ class SpecialPowerCreate : public CreateModule SpecialPowerCreate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onCreate(); - virtual void onBuildComplete(); ///< This is called when you are a finished game object + virtual void onCreate() override; + virtual void onBuildComplete() override; ///< This is called when you are a finished game object protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h index e731c516fa9..2a78e46fa7b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h @@ -105,39 +105,39 @@ class SpecialPowerModule : public BehaviorModule, static Int getInterfaceMask() { return MODULEINTERFACE_SPECIAL_POWER; } // BehaviorModule - virtual SpecialPowerModuleInterface* getSpecialPower() { return this; } + virtual SpecialPowerModuleInterface* getSpecialPower() override { return this; } - Bool isModuleForPower( const SpecialPowerTemplate *specialPowerTemplate ) const; ///< is this module for the specified special power - Bool isReady() const; ///< is this special power available now + Bool isModuleForPower( const SpecialPowerTemplate *specialPowerTemplate ) const override; ///< is this module for the specified special power + Bool isReady() const override; ///< is this special power available now // This is the althernate way to one-at-a-time BlackLotus' specials; we'll keep it commented her until Dustin decides, or until 12/10/02 // Bool isBusy() const { return FALSE; } - Real getPercentReady() const; ///< get the percent ready (1.0 = ready now, 0.5 = half charged up etc.) + Real getPercentReady() const override; ///< get the percent ready (1.0 = ready now, 0.5 = half charged up etc.) - UnsignedInt getReadyFrame() const; ///< get the frame at which we are ready - AsciiString getPowerName() const; + UnsignedInt getReadyFrame() const override; ///< get the frame at which we are ready + AsciiString getPowerName() const override; void syncReadyFrameToStatusQuo(); - const SpecialPowerTemplate* getSpecialPowerTemplate() const; - ScienceType getRequiredScience() const; + const SpecialPowerTemplate* getSpecialPowerTemplate() const override; + ScienceType getRequiredScience() const override; - void onSpecialPowerCreation(); // called by a create module to start our countdown + void onSpecialPowerCreation() override; // called by a create module to start our countdown // // The following methods are for use by the scripting engine ONLY // - void setReadyFrame( UnsignedInt frame ); + void setReadyFrame( UnsignedInt frame ) override; UnsignedInt getReadyFrame() { return m_availableOnFrame; }// USED BY PLAYER TO KEEP RECHARGE TIMERS IN SYNC - void pauseCountdown( Bool pause ); + void pauseCountdown( Bool pause ) override; // // the following methods should be *EXTENDED* for any special power module implementations // and carry out the special power executions // - virtual void doSpecialPower( UnsignedInt commandOptions ); - virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions ); - virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ); - virtual void doSpecialPowerUsingWaypoints( const Waypoint *way, UnsignedInt commandOptions ); + virtual void doSpecialPower( UnsignedInt commandOptions ) override; + virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions ) override; + virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ) override; + virtual void doSpecialPowerUsingWaypoints( const Waypoint *way, UnsignedInt commandOptions ) override; /** Now, there are special powers that require some preliminary processing before the actual @@ -150,17 +150,17 @@ class SpecialPowerModule : public BehaviorModule, module. The update module then orders the unit to move within range, and it isn't until the hacker start the physical attack, that the timer is reset and the attack technically begins. */ - virtual void markSpecialPowerTriggered( const Coord3D *location ); + virtual void markSpecialPowerTriggered( const Coord3D *location ) override; /** start the recharge process for this special power. public because some powers call it repeatedly. */ - virtual void startPowerRecharge(); - virtual const AudioEventRTS& getInitiateSound() const; + virtual void startPowerRecharge() override; + virtual const AudioEventRTS& getInitiateSound() const override; - virtual Bool isScriptOnly() const; + virtual Bool isScriptOnly() const override; //If the special power launches a construction site, we need to know the final product for placement purposes. - virtual const ThingTemplate* getReferenceThingTemplate() const { return nullptr; } + virtual const ThingTemplate* getReferenceThingTemplate() const override { return nullptr; } protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h index 5672fdc6ac5..9b2166d45e6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h @@ -63,18 +63,18 @@ class SpecialPowerUpdateModule : public UpdateModule, public SpecialPowerUpdateI // virtual destructor prototype defined by MemoryPoolObject //SpecialPowerUpdateInterface virtual implementations - virtual Bool doesSpecialPowerUpdatePassScienceTest() const; - virtual ScienceType getExtraRequiredScience() const { return SCIENCE_INVALID; } //Does this object have more than one special power module with the same spTemplate? + virtual Bool doesSpecialPowerUpdatePassScienceTest() const override; + virtual ScienceType getExtraRequiredScience() const override { return SCIENCE_INVALID; } //Does this object have more than one special power module with the same spTemplate? //SpecialPowerUpdateInterface PURE virtual implementations - virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ) = 0; - virtual Bool isSpecialAbility() const = 0; - virtual Bool isSpecialPower() const = 0; - virtual Bool isActive() const = 0; - virtual CommandOption getCommandOption() const = 0; - virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const = 0; //Is it active now? - virtual Bool doesSpecialPowerHaveOverridableDestination() const = 0; //Does it have it, even if it's not active? - virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ) = 0; - virtual Bool isPowerCurrentlyInUse( const CommandButton *command = nullptr ) const = 0; + virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ) override = 0; + virtual Bool isSpecialAbility() const override = 0; + virtual Bool isSpecialPower() const override = 0; + virtual Bool isActive() const override = 0; + virtual CommandOption getCommandOption() const override = 0; + virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const override = 0; //Is it active now? + virtual Bool doesSpecialPowerHaveOverridableDestination() const override = 0; //Does it have it, even if it's not active? + virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ) override = 0; + virtual Bool isPowerCurrentlyInUse( const CommandButton *command = nullptr ) const override = 0; }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipDeploymentUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipDeploymentUpdate.h index 5249b78d543..efc816ade07 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipDeploymentUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipDeploymentUpdate.h @@ -111,28 +111,28 @@ class SpectreGunshipDeploymentUpdate : public SpecialPowerUpdateModule // virtual destructor prototype provided by memory pool declaration // SpecialPowerUpdateInterface - virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ); - virtual Bool isSpecialAbility() const { return false; } - virtual Bool isSpecialPower() const { return true; } - virtual Bool isActive() const {return FALSE;} - virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() { return this; } - virtual CommandOption getCommandOption() const { return (CommandOption)0; } - virtual Bool isPowerCurrentlyInUse( const CommandButton *command = nullptr ) const { return FALSE; }; - virtual ScienceType getExtraRequiredScience() const { return getSpectreGunshipDeploymentUpdateModuleData()->m_extraRequiredScience; } //Does this object have more than one special power module with the same spTemplate? - - virtual void onObjectCreated(); - virtual UpdateSleepTime update(); + virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ) override; + virtual Bool isSpecialAbility() const override { return false; } + virtual Bool isSpecialPower() const override { return true; } + virtual Bool isActive() const override {return FALSE;} + virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() override { return this; } + virtual CommandOption getCommandOption() const override { return (CommandOption)0; } + virtual Bool isPowerCurrentlyInUse( const CommandButton *command = nullptr ) const override { return FALSE; }; + virtual ScienceType getExtraRequiredScience() const override { return getSpectreGunshipDeploymentUpdateModuleData()->m_extraRequiredScience; } //Does this object have more than one special power module with the same spTemplate? + + virtual void onObjectCreated() override; + virtual UpdateSleepTime update() override; void cleanUp(); - virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const { return FALSE; }; - virtual Bool doesSpecialPowerHaveOverridableDestination() const { return FALSE; } //Does it have it, even if it's not active? - virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ) {}; + virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const override { return FALSE; }; + virtual Bool doesSpecialPowerHaveOverridableDestination() const override { return FALSE; } //Does it have it, even if it's not active? + virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ) override {}; // Disabled conditions to process (termination conditions!) - virtual DisabledMaskType getDisabledTypesToProcess() const { return MAKE_DISABLED_MASK4( DISABLED_SUBDUED, DISABLED_UNDERPOWERED, DISABLED_EMP, DISABLED_HACKED ); } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return MAKE_DISABLED_MASK4( DISABLED_SUBDUED, DISABLED_UNDERPOWERED, DISABLED_EMP, DISABLED_HACKED ); } protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipUpdate.h index 6660616ace3..f54fc1f8246 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipUpdate.h @@ -99,27 +99,27 @@ class SpectreGunshipUpdate : public SpecialPowerUpdateModule // virtual destructor prototype provided by memory pool declaration // SpecialPowerUpdateInterface - virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ); - virtual Bool isSpecialAbility() const { return false; } - virtual Bool isSpecialPower() const { return true; } - virtual Bool isActive() const {return m_status < GUNSHIP_STATUS_DEPARTING;} - virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() { return this; } - virtual CommandOption getCommandOption() const { return (CommandOption)0; } - virtual Bool isPowerCurrentlyInUse( const CommandButton *command = nullptr ) const; + virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ) override; + virtual Bool isSpecialAbility() const override { return false; } + virtual Bool isSpecialPower() const override { return true; } + virtual Bool isActive() const override {return m_status < GUNSHIP_STATUS_DEPARTING;} + virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() override { return this; } + virtual CommandOption getCommandOption() const override { return (CommandOption)0; } + virtual Bool isPowerCurrentlyInUse( const CommandButton *command = nullptr ) const override; - virtual void onObjectCreated(); - virtual UpdateSleepTime update(); + virtual void onObjectCreated() override; + virtual UpdateSleepTime update() override; void cleanUp(); - virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const; - virtual Bool doesSpecialPowerHaveOverridableDestination() const { return true; } //Does it have it, even if it's not active? - virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ); + virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const override; + virtual Bool doesSpecialPowerHaveOverridableDestination() const override { return true; } //Does it have it, even if it's not active? + virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ) override; // Disabled conditions to process (termination conditions!) - virtual DisabledMaskType getDisabledTypesToProcess() const { return MAKE_DISABLED_MASK4( DISABLED_SUBDUED, DISABLED_UNDERPOWERED, DISABLED_EMP, DISABLED_HACKED ); } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return MAKE_DISABLED_MASK4( DISABLED_SUBDUED, DISABLED_UNDERPOWERED, DISABLED_EMP, DISABLED_HACKED ); } protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h index 0ba3d22c2c5..7b07edf9ad4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h @@ -65,7 +65,7 @@ class SpyVisionSpecialPower : public SpecialPowerModule SpyVisionSpecialPower( Thing *thing, const ModuleData *moduleData ); // virtual destructor prototype provided by memory pool object - virtual void doSpecialPower( UnsignedInt commandOptions ); + virtual void doSpecialPower( UnsignedInt commandOptions ) override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h index f804ebcdbb4..5d2ff45ccd4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h @@ -90,19 +90,19 @@ class SpyVisionUpdate : public UpdateModule, public UpgradeMux SpyVisionUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual SpyVisionUpdate* getSpyVisionUpdate() { return this; } + virtual SpyVisionUpdate* getSpyVisionUpdate() override { return this; } // module methods static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | MODULEINTERFACE_UPGRADE; } - virtual void onDelete(); - virtual void onCapture( Player *oldOwner, Player *newOwner ); - virtual void onDisabledEdge( Bool nowDisabled ); + virtual void onDelete() override; + virtual void onCapture( Player *oldOwner, Player *newOwner ) override; + virtual void onDisabledEdge( Bool nowDisabled ) override; // BehaviorModule - virtual UpgradeModuleInterface* getUpgrade() { return this; } + virtual UpgradeModuleInterface* getUpgrade() override { return this; } //Update module - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; void activateSpyVision( UnsignedInt duration ); @@ -112,27 +112,27 @@ class SpyVisionUpdate : public UpdateModule, public UpgradeMux protected: // UpgradeMux functions. Mux standing, of course, for Majorly Ugly Xhitcode - virtual void upgradeImplementation(); - virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const + virtual void upgradeImplementation() override; + virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const override { getSpyVisionUpdateModuleData()->m_upgradeMuxData.getUpgradeActivationMasks(activation, conflicting); } - virtual void performUpgradeFX() + virtual void performUpgradeFX() override { getSpyVisionUpdateModuleData()->m_upgradeMuxData.performUpgradeFX(getObject()); } - virtual void processUpgradeRemoval() + virtual void processUpgradeRemoval() override { // I can't take it any more. Let the record show that I think the UpgradeMux multiple inheritance is CRAP. getSpyVisionUpdateModuleData()->m_upgradeMuxData.muxDataProcessUpgradeRemoval(getObject()); } - virtual Bool requiresAllActivationUpgrades() const + virtual Bool requiresAllActivationUpgrades() const override { return getSpyVisionUpdateModuleData()->m_upgradeMuxData.m_requiresAllTriggers; } Bool isUpgradeActive() const { return isAlreadyUpgraded(); } - virtual Bool isSubObjectsUpgrade() { return false; } + virtual Bool isSubObjectsUpgrade() override { return false; } private: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h index 598bd98db1b..34aecc400bc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h @@ -50,7 +50,7 @@ class SquishCollide : public CollideModule // virtual destructor prototype provided by memory pool declaration /// This collide method gets called when collision occur - virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ); + virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ) override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h index c195a74f2e1..2cc3dd9e2a5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h @@ -91,8 +91,8 @@ class StatusBitsUpgrade : public UpgradeModule // virtual destructor prototype defined by MemoryPoolObject protected: - virtual void upgradeImplementation( ); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation( ) override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusDamageHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusDamageHelper.h index c5add818822..7a17e91c12f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusDamageHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusDamageHelper.h @@ -52,8 +52,8 @@ class StatusDamageHelper : public ObjectHelper StatusDamageHelper( Thing *thing, const ModuleData *modData ); // virtual destructor prototype provided by memory pool object - virtual DisabledMaskType getDisabledTypesToProcess() const { return DISABLEDMASK_ALL; } - virtual UpdateSleepTime update(); + virtual DisabledMaskType getDisabledTypesToProcess() const override { return DISABLEDMASK_ALL; } + virtual UpdateSleepTime update() override; void doStatusDamage( ObjectStatusTypes status, Real duration ); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h index 76ff0495304..86d9a1e7d20 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h @@ -87,8 +87,8 @@ class StealthDetectorUpdate : public UpdateModule Bool isSDEnabled() const { return m_enabled; } void setSDEnabled( Bool enabled ); - virtual UpdateSleepTime update(); - virtual DisabledMaskType getDisabledTypesToProcess() const { return MAKE_DISABLED_MASK( DISABLED_HELD ); } + virtual UpdateSleepTime update() override; + virtual DisabledMaskType getDisabledTypesToProcess() const override { return MAKE_DISABLED_MASK( DISABLED_HELD ); } private: Bool m_enabled; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h index a83288b1608..60d7f465e76 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h @@ -116,13 +116,13 @@ class StealthUpdate : public UpdateModule // virtual destructor prototype provided by memory pool declaration - virtual StealthUpdate* getStealth() { return this; } + virtual StealthUpdate* getStealth() override { return this; } - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; //Still gets called, even if held -ML - virtual DisabledMaskType getDisabledTypesToProcess() const { return MAKE_DISABLED_MASK( DISABLED_HELD ); } + virtual DisabledMaskType getDisabledTypesToProcess() const override { return MAKE_DISABLED_MASK( DISABLED_HELD ); } // ??? ugh Bool isDisguised() const { return m_disguiseAsTemplate != nullptr; } diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h index 511dfb38a95..c11ae3cf674 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h @@ -50,7 +50,7 @@ class StealthUpgrade : public UpgradeModule // virtual destructor prototype defined by MemoryPoolObject protected: - virtual void upgradeImplementation( ); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation( ) override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h index dde03c60252..efd32bd7424 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h @@ -78,9 +78,9 @@ class StickyBombUpdate : public UpdateModule StickyBombUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onObjectCreated(); + virtual void onObjectCreated() override; - virtual UpdateSleepTime update(); ///< called once per frame + virtual UpdateSleepTime update() override; ///< called once per frame void initStickyBomb( Object *object, const Object *bomber, const Coord3D *specificPos = nullptr ); void detonate(); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h index aecbb73b414..635977af03b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h @@ -109,13 +109,13 @@ class StructureCollapseUpdate : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DIE); } // BehaviorModule - virtual DieModuleInterface* getDie() { return this; } + virtual DieModuleInterface* getDie() override { return this; } // UpdateModuleInterface - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // DieModuleInterface - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h index a0d11786288..af646ff2f97 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h @@ -151,13 +151,13 @@ class StructureToppleUpdate : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DIE); } // BehaviorModule - virtual DieModuleInterface* getDie() { return this; } + virtual DieModuleInterface* getDie() override { return this; } // UpdateModuleInterface - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; // DieModuleInterface - virtual void onDie( const DamageInfo *damageInfo ); + virtual void onDie( const DamageInfo *damageInfo ) override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h index db1460646a2..7f8a1cf0300 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h @@ -81,7 +81,7 @@ class SubObjectsUpgrade : public UpgradeModule // virtual destructor prototype defined by MemoryPoolObject protected: - virtual void upgradeImplementation( ); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return true; } + virtual void upgradeImplementation( ) override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return true; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubdualDamageHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubdualDamageHelper.h index 46e45c24999..7b4feb71e1e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubdualDamageHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubdualDamageHelper.h @@ -52,8 +52,8 @@ class SubdualDamageHelper : public ObjectHelper SubdualDamageHelper( Thing *thing, const ModuleData *modData ); // virtual destructor prototype provided by memory pool object - virtual DisabledMaskType getDisabledTypesToProcess() const { return DISABLEDMASK_ALL; } - virtual UpdateSleepTime update(); + virtual DisabledMaskType getDisabledTypesToProcess() const override { return DISABLEDMASK_ALL; } + virtual UpdateSleepTime update() override; void notifySubdualDamage( Real amount ); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h index 610bcb61ca2..c289de39d02 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h @@ -48,8 +48,8 @@ class SupplyCenterCreate : public CreateModule SupplyCenterCreate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onCreate(); - virtual void onBuildComplete(); ///< This is called when you are a finished game object + virtual void onCreate() override; + virtual void onBuildComplete() override; ///< This is called when you are a finished game object protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h index 5c4af887ab6..d57a3dd0d69 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h @@ -57,10 +57,10 @@ class SupplyCenterDockUpdate : public DockUpdate SupplyCenterDockUpdate( Thing *thing, const ModuleData* moduleData ); - virtual DockUpdateInterface* getDockUpdateInterface() { return this; } - virtual Bool action( Object* docker, Object *drone = nullptr ); ///xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; public: SupplyTruckWantsToPickUpOrDeliverBoxesState( StateMachine *machine ) : State( machine, "SupplyTruckWantsToPickUpOrDeliverBoxesState" ) {} - virtual StateReturnType update(); - virtual StateReturnType onEnter(); - virtual void onExit(StateExitType status); + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; + virtual void onExit(StateExitType status) override; }; EMPTY_DTOR(SupplyTruckWantsToPickUpOrDeliverBoxesState) @@ -79,14 +79,14 @@ class RegroupingState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(RegroupingState, "RegroupingState") protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; public: RegroupingState( StateMachine *machine ) : State( machine, "RegroupingState" ) {} - virtual StateReturnType update(); - virtual StateReturnType onEnter();// Will tell me to aiMove back to base. - virtual void onExit(StateExitType status); + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override;// Will tell me to aiMove back to base. + virtual void onExit(StateExitType status) override; }; EMPTY_DTOR(RegroupingState) @@ -96,14 +96,14 @@ class DockingState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DockingState, "DockingState") protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; public: DockingState( StateMachine *machine ) :State( machine, "DockingState" ) {} - virtual StateReturnType update(); - virtual StateReturnType onEnter(); - virtual void onExit(StateExitType status); + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; + virtual void onExit(StateExitType status) override; }; EMPTY_DTOR(DockingState) @@ -193,36 +193,36 @@ class SupplyTruckAIUpdate : public AIUpdateInterface, public SupplyTruckAIInterf SupplyTruckAIUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual SupplyTruckAIInterface* getSupplyTruckAIInterface() {return this;} - virtual const SupplyTruckAIInterface* getSupplyTruckAIInterface() const {return this;} + virtual SupplyTruckAIInterface* getSupplyTruckAIInterface() override {return this;} + virtual const SupplyTruckAIInterface* getSupplyTruckAIInterface() const override {return this;} - virtual Int getNumberBoxes() const { return m_numberBoxes; } - virtual Bool loseOneBox(); - virtual Bool gainOneBox( Int remainingStock ); + virtual Int getNumberBoxes() const override { return m_numberBoxes; } + virtual Bool loseOneBox() override; + virtual Bool gainOneBox( Int remainingStock ) override; // this is present for subclasses (eg, Chinook) to override, to // prevent supply-ferry behavior in some cases (eg, when toting passengers) - virtual Bool isAvailableForSupplying() const; - virtual Bool isCurrentlyFerryingSupplies() const; - virtual Real getWarehouseScanDistance() const; ///< How far can I look for a warehouse? + virtual Bool isAvailableForSupplying() const override; + virtual Bool isCurrentlyFerryingSupplies() const override; + virtual Real getWarehouseScanDistance() const override; ///< How far can I look for a warehouse? - virtual void setForceWantingState(Bool v) { m_forcePending = v; } // When a Supply Center creates us (or maybe other sources later), we need to hop into autopilot mode. - virtual Bool isForcedIntoWantingState() const { return m_forcePending; } + virtual void setForceWantingState(Bool v) override { m_forcePending = v; } // When a Supply Center creates us (or maybe other sources later), we need to hop into autopilot mode. + virtual Bool isForcedIntoWantingState() const override { return m_forcePending; } - virtual void setForceBusyState(Bool v) { m_forcedBusyPending = v; } - virtual Bool isForcedIntoBusyState() const { return m_forcedBusyPending; } + virtual void setForceBusyState(Bool v) override { m_forcedBusyPending = v; } + virtual Bool isForcedIntoBusyState() const override { return m_forcedBusyPending; } - virtual ObjectID getPreferredDockID() const { return m_preferredDock; } - virtual UnsignedInt getActionDelayForDock( Object *dock ); - virtual Int getUpgradedSupplyBoost() const { return 0; } + virtual ObjectID getPreferredDockID() const override { return m_preferredDock; } + virtual UnsignedInt getActionDelayForDock( Object *dock ) override; + virtual Int getUpgradedSupplyBoost() const override { return 0; } - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: - virtual AIStateMachine* makeStateMachine(); - virtual void privateDock( Object *obj, CommandSourceType cmdSource ); - virtual void privateIdle(CommandSourceType cmdSource); ///< Enter idle state. + virtual AIStateMachine* makeStateMachine() override; + virtual void privateDock( Object *obj, CommandSourceType cmdSource ) override; + virtual void privateIdle(CommandSourceType cmdSource) override; ///< Enter idle state. private: SupplyTruckStateMachine* m_supplyTruckStateMachine; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h index 8d8b272c67b..32486fdf0c6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h @@ -48,7 +48,7 @@ class SupplyWarehouseCreate : public CreateModule SupplyWarehouseCreate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual void onCreate(); + virtual void onCreate() override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h index 8a5c9bfefce..1602dff3a02 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h @@ -68,15 +68,15 @@ class SupplyWarehouseCripplingBehavior : public UpdateModule, static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_DAMAGE); } // BehaviorModule - virtual DamageModuleInterface* getDamage() { return this; } + virtual DamageModuleInterface* getDamage() override { return this; } // DamageModuleInterface - virtual void onDamage( DamageInfo *damageInfo ); - virtual void onHealing( DamageInfo *damageInfo ){} - virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState); + virtual void onDamage( DamageInfo *damageInfo ) override; + virtual void onHealing( DamageInfo *damageInfo ) override{} + virtual void onBodyDamageStateChange(const DamageInfo* damageInfo, BodyDamageType oldState, BodyDamageType newState) override; // UpdateInterface - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: virtual void resetSelfHealSupression();// Reset our able to heal timer, as we took damage diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h index f6cb64b5462..6c970d1c33f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h @@ -57,18 +57,18 @@ class SupplyWarehouseDockUpdate : public DockUpdate public: - virtual DockUpdateInterface* getDockUpdateInterface() { return this; } + virtual DockUpdateInterface* getDockUpdateInterface() override { return this; } SupplyWarehouseDockUpdate( Thing *thing, const ModuleData* moduleData ); - virtual void setDockCrippled( Bool setting ); ///< Game Logic can set me as inoperative. I get to decide what that means. - virtual Bool action( Object* docker, Object *drone = nullptr ); ///m_upgradeMuxData.isTriggeredBy(upgrade); } protected: - virtual void processUpgradeRemoval() + virtual void processUpgradeRemoval() override { // I can't take it any more. Let the record show that I think the UpgradeMux multiple inheritance is CRAP. getUpgradeModuleData()->m_upgradeMuxData.muxDataProcessUpgradeRemoval(getObject()); } - virtual Bool requiresAllActivationUpgrades() const + virtual Bool requiresAllActivationUpgrades() const override { return getUpgradeModuleData()->m_upgradeMuxData.m_requiresAllTriggers; } - virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const + virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const override { getUpgradeModuleData()->m_upgradeMuxData.getUpgradeActivationMasks(activation, conflicting); } - virtual void performUpgradeFX() + virtual void performUpgradeFX() override { getUpgradeModuleData()->m_upgradeMuxData.performUpgradeFX(getObject()); } diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h index 12ba6570061..c11f8105e3d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h @@ -82,10 +82,10 @@ class VeterancyCrateCollide : public CrateCollide protected: /// This allows specific vetoes to certain types of crates and their data - virtual Bool isValidToExecute( const Object *other ) const; + virtual Bool isValidToExecute( const Object *other ) const override; /// This is the game logic execution function that all real CrateCollides will implement - virtual Bool executeCrateBehavior( Object *other ); + virtual Bool executeCrateBehavior( Object *other ) override; Int getLevelsToGain() const; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h index a1109532d34..7855e67f050 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h @@ -62,7 +62,7 @@ class VeterancyGainCreate : public CreateModule // virtual destructor prototype provided by memory pool declaration /// the create method - virtual void onCreate(); + virtual void onCreate() override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h index dbfa033d1e8..1d52c42b9f6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h @@ -47,7 +47,7 @@ class WanderAIUpdate : public AIUpdateInterface for an example.) */ - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; public: @@ -57,6 +57,6 @@ class WanderAIUpdate : public AIUpdateInterface protected: - virtual AIStateMachine* makeStateMachine(); + virtual AIStateMachine* makeStateMachine() override; }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h index 0e484de72a4..911e24567aa 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h @@ -77,7 +77,7 @@ class WaveGuideUpdate : public UpdateModule WaveGuideUpdate( Thing *thing, const ModuleData *moduleData ); // virtual destructor prototype provided by MemoryPoolObject - virtual UpdateSleepTime update(); ///< the update implementation + virtual UpdateSleepTime update() override; ///< the update implementation protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpdate.h index cafe10dc1a1..17fc2c94aef 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpdate.h @@ -91,7 +91,7 @@ class WeaponBonusUpdate : public UpdateModule WeaponBonusUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual UpdateSleepTime update(); + virtual UpdateSleepTime update() override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h index c8bc99561ea..f36ba756c3f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h @@ -75,8 +75,8 @@ class WeaponBonusUpgrade : public UpgradeModule // virtual destructor prototype defined by MemoryPoolObject protected: - virtual void upgradeImplementation( ); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation( ) override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h index 3604ce239b1..536b3815a38 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h @@ -50,7 +50,7 @@ class WeaponSetUpgrade : public UpgradeModule // virtual destructor prototype defined by MemoryPoolObject protected: - virtual void upgradeImplementation( ); ///< Here's the actual work of Upgrading - virtual Bool isSubObjectsUpgrade() { return false; } + virtual void upgradeImplementation( ) override; ///< Here's the actual work of Upgrading + virtual Bool isSubObjectsUpgrade() override { return false; } }; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h index 68d7f598360..e66a1636eed 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h @@ -50,9 +50,9 @@ class WorkerStateMachine : public StateMachine protected: // snapshot interface - 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; }; // ------------------------------------------------------------------------------------------------ @@ -126,93 +126,93 @@ class WorkerAIUpdate : public AIUpdateInterface, public DozerAIInterface, public WorkerAIUpdate( Thing *thing, const ModuleData* moduleData ); // virtual destructor prototype provided by memory pool declaration - virtual DozerAIInterface* getDozerAIInterface() {return this;} - virtual const DozerAIInterface* getDozerAIInterface() const {return this;} - virtual SupplyTruckAIInterface* getSupplyTruckAIInterface() {return this;} - virtual const SupplyTruckAIInterface* getSupplyTruckAIInterface() const {return this;} - virtual WorkerAIInterface* getWorkerAIInterface() { return this; } - virtual const WorkerAIInterface* getWorkerAIInterface() const { return this; } + virtual DozerAIInterface* getDozerAIInterface() override {return this;} + virtual const DozerAIInterface* getDozerAIInterface() const override {return this;} + virtual SupplyTruckAIInterface* getSupplyTruckAIInterface() override {return this;} + virtual const SupplyTruckAIInterface* getSupplyTruckAIInterface() const override {return this;} + virtual WorkerAIInterface* getWorkerAIInterface() override { return this; } + virtual const WorkerAIInterface* getWorkerAIInterface() const override { return this; } // Dozer side - virtual void onDelete(); + virtual void onDelete() override; - virtual Real getRepairHealthPerSecond() const; ///< get health to repair per second - virtual Real getBoredTime() const; ///< how long till we're bored - virtual Real getBoredRange() const; ///< when we're bored, we look this far away to do things + virtual Real getRepairHealthPerSecond() const override; ///< get health to repair per second + virtual Real getBoredTime() const override; ///< how long till we're bored + virtual Real getBoredRange() const override; ///< when we're bored, we look this far away to do things virtual Object *construct( const ThingTemplate *what, const Coord3D *pos, Real angle, Player *owningPlayer, - Bool isRebuild ); ///< construct a building + Bool isRebuild ) override; ///< construct a building // get task information - virtual DozerTask getMostRecentCommand(); ///< return task that was most recently issued - virtual Bool isTaskPending( DozerTask task ); ///< is there a desire to do the requested task - virtual ObjectID getTaskTarget( DozerTask task ); ///< get target of task - virtual Bool isAnyTaskPending(); ///< is there any dozer task pending - virtual DozerTask getCurrentTask() const { return m_currentTask; } ///< return the current task we're doing - virtual void setCurrentTask( DozerTask task ) { m_currentTask = task; } ///< set the current task of the dozer + virtual DozerTask getMostRecentCommand() override; ///< return task that was most recently issued + virtual Bool isTaskPending( DozerTask task ) override; ///< is there a desire to do the requested task + virtual ObjectID getTaskTarget( DozerTask task ) override; ///< get target of task + virtual Bool isAnyTaskPending() override; ///< is there any dozer task pending + virtual DozerTask getCurrentTask() const override { return m_currentTask; } ///< return the current task we're doing + virtual void setCurrentTask( DozerTask task ) override { m_currentTask = task; } ///< set the current task of the dozer - virtual Bool getIsRebuild() { return m_isRebuild; } ///< get whether or not our task is a rebuild. + virtual Bool getIsRebuild() override { return m_isRebuild; } ///< get whether or not our task is a rebuild. // task actions - virtual void newTask( DozerTask task, Object* target ); ///< set a desire to do the requested task - virtual void cancelTask( DozerTask task ); ///< cancel this task from the queue, if it's the current task the dozer will stop working on it - virtual void cancelAllTasks(); ///< cancel all tasks from the queue, if it's the current task the dozer will stop working on it - virtual void resumePreviousTask(); ///< resume the previous task if there was one + virtual void newTask( DozerTask task, Object* target ) override; ///< set a desire to do the requested task + virtual void cancelTask( DozerTask task ) override; ///< cancel this task from the queue, if it's the current task the dozer will stop working on it + virtual void cancelAllTasks() override; ///< cancel all tasks from the queue, if it's the current task the dozer will stop working on it + virtual void resumePreviousTask() override; ///< resume the previous task if there was one // internal methods to manage behavior from within the dozer state machine - virtual void internalTaskComplete( DozerTask task ); ///< set a dozer task as successfully completed - virtual void internalCancelTask( DozerTask task ); ///< cancel this task from the dozer - virtual void internalTaskCompleteOrCancelled( DozerTask task ); ///< this is called when tasks are cancelled or completed + virtual void internalTaskComplete( DozerTask task ) override; ///< set a dozer task as successfully completed + virtual void internalCancelTask( DozerTask task ) override; ///< cancel this task from the dozer + virtual void internalTaskCompleteOrCancelled( DozerTask task ) override; ///< this is called when tasks are cancelled or completed /** return a dock point for the action and task (if valid) ... note it can return nullptr if no point has been set for the combination of task and point */ - virtual const Coord3D* getDockPoint( DozerTask task, DozerDockPoint point ); + virtual const Coord3D* getDockPoint( DozerTask task, DozerDockPoint point ) override; - virtual void setBuildSubTask( DozerBuildSubTask subTask ) { m_buildSubTask = subTask; }; - virtual DozerBuildSubTask getBuildSubTask() { return m_buildSubTask; } + virtual void setBuildSubTask( DozerBuildSubTask subTask ) override { m_buildSubTask = subTask; }; + virtual DozerBuildSubTask getBuildSubTask() override { return m_buildSubTask; } // // the following methods must be overridden so that if a player issues a command the dozer // can exit the internal state machine and do whatever the player says // - virtual void aiDoCommand(const AICommandParms* parms); + virtual void aiDoCommand(const AICommandParms* parms) override; // Supply truck stuff - virtual Int getNumberBoxes() const { return m_numberBoxes; } - virtual Bool loseOneBox(); - virtual Bool gainOneBox( Int remainingStock ); + virtual Int getNumberBoxes() const override { return m_numberBoxes; } + virtual Bool loseOneBox() override; + virtual Bool gainOneBox( Int remainingStock ) override; - virtual Bool isAvailableForSupplying() const; - virtual Bool isCurrentlyFerryingSupplies() const; - virtual Real getWarehouseScanDistance() const; ///< How far can I look for a warehouse? + virtual Bool isAvailableForSupplying() const override; + virtual Bool isCurrentlyFerryingSupplies() const override; + virtual Real getWarehouseScanDistance() const override; ///< How far can I look for a warehouse? - virtual void setForceBusyState(Bool v) { m_forcedBusyPending = v; } - virtual Bool isForcedIntoBusyState() const { return m_forcedBusyPending; } + virtual void setForceBusyState(Bool v) override { m_forcedBusyPending = v; } + virtual Bool isForcedIntoBusyState() const override { return m_forcedBusyPending; } - virtual void setForceWantingState(Bool v){ m_forcePending = v; } - virtual Bool isForcedIntoWantingState() const { return m_forcePending; } - virtual ObjectID getPreferredDockID() const { return m_preferredDock; } - virtual UnsignedInt getActionDelayForDock( Object *dock ); + virtual void setForceWantingState(Bool v) override { m_forcePending = v; } + virtual Bool isForcedIntoWantingState() const override { return m_forcePending; } + virtual ObjectID getPreferredDockID() const override { return m_preferredDock; } + virtual UnsignedInt getActionDelayForDock( Object *dock ) override; // worker specific Bool isSupplyTruckBrainActiveAndBusy(); void resetSupplyTruckBrain(); void resetDozerBrain(); - virtual void exitingSupplyTruckState(); ///< This worker is leaving a supply truck task and should go back to Dozer mode. + virtual void exitingSupplyTruckState() override; ///< This worker is leaving a supply truck task and should go back to Dozer mode. - virtual UpdateSleepTime update(); ///< the update entry point + virtual UpdateSleepTime update() override; ///< the update entry point // repairing - virtual Bool canAcceptNewRepair( Object *obj ); - virtual void createBridgeScaffolding( Object *bridgeTower ); - virtual void removeBridgeScaffolding( Object *bridgeTower ); + virtual Bool canAcceptNewRepair( Object *obj ) override; + virtual void createBridgeScaffolding( Object *bridgeTower ) override; + virtual void removeBridgeScaffolding( Object *bridgeTower ) override; - virtual void startBuildingSound( const AudioEventRTS *sound, ObjectID constructionSiteID ); - virtual void finishBuildingSound(); + virtual void startBuildingSound( const AudioEventRTS *sound, ObjectID constructionSiteID ) override; + virtual void finishBuildingSound() override; - virtual Int getUpgradedSupplyBoost() const; + virtual Int getUpgradedSupplyBoost() const override; protected: @@ -264,10 +264,10 @@ class WorkerAIUpdate : public AIUpdateInterface, public DozerAIInterface, public AudioEventRTS m_buildingSound; ///< sound is pulled from the object we are building! protected: - virtual void privateRepair( Object *obj, CommandSourceType cmdSource ); ///< repair the target - virtual void privateResumeConstruction( Object *obj, CommandSourceType cmdSource ); ///< resume construction on obj - virtual void privateDock( Object *obj, CommandSourceType cmdSource ); - virtual void privateIdle(CommandSourceType cmdSource); ///< Enter idle state. + virtual void privateRepair( Object *obj, CommandSourceType cmdSource ) override; ///< repair the target + virtual void privateResumeConstruction( Object *obj, CommandSourceType cmdSource ) override; ///< resume construction on obj + virtual void privateDock( Object *obj, CommandSourceType cmdSource ) override; + virtual void privateIdle(CommandSourceType cmdSource) override; ///< Enter idle state. private: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h index df46434db72..bfdf333393f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h @@ -646,9 +646,9 @@ class Object : public Thing, public Snapshot // snapshot methods - void crc( Xfer *xfer ); - void xfer( Xfer *xfer ); - void loadPostProcess(); + virtual void crc( Xfer *xfer ) override; + virtual void xfer( Xfer *xfer ) override; + virtual void loadPostProcess() override; void handleShroud(); void handleValueMap(); @@ -662,10 +662,10 @@ class Object : public Thing, public Snapshot Bool didEnterOrExit() const; void setID( ObjectID id ); - virtual Object *asObjectMeth() { return this; } - virtual const Object *asObjectMeth() const { return this; } + virtual Object *asObjectMeth() override { return this; } + virtual const Object *asObjectMeth() const override { return this; } - virtual Real calculateHeightAboveTerrain() const; // Calculates the actual height above terrain. Doesn't use cache. + virtual Real calculateHeightAboveTerrain() const override; // Calculates the actual height above terrain. Doesn't use cache. void updateTriggerAreaFlags(); void setTriggerAreaFlagsForChangeInPosition(); @@ -683,7 +683,7 @@ class Object : public Thing, public Snapshot void addThreat(); void removeThreat(); - virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle); + virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle) override; private: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectCreationList.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectCreationList.h index dba9c293ba9..b156d47f517 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectCreationList.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectCreationList.h @@ -187,11 +187,11 @@ class ObjectCreationListStore : public SubsystemInterface public: ObjectCreationListStore(); - ~ObjectCreationListStore(); + virtual ~ObjectCreationListStore() override; - void init() { } - void reset() { } - void update() { } + virtual void init() override { } + virtual void reset() override { } + virtual void update() override { } /** return the ObjectCreationList with the given namekey. diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectIter.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectIter.h index 0e3fcd01849..cf41ba55d06 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectIter.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectIter.h @@ -121,8 +121,8 @@ class SimpleObjectIterator : public ObjectIterator public: SimpleObjectIterator(); //~SimpleObjectIterator(); // provided by MPO - Object *first() { return firstWithNumeric(nullptr); } - Object *next() { return nextWithNumeric(nullptr); } + virtual Object *first() override { return firstWithNumeric(nullptr); } + virtual Object *next() override { return nextWithNumeric(nullptr); } Object *firstWithNumeric(Real *num = nullptr) { reset(); return nextWithNumeric(num); } Object *nextWithNumeric(Real *num = nullptr); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectTypes.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectTypes.h index 1c7bf8e2b55..354fa09d3a0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectTypes.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectTypes.h @@ -50,9 +50,9 @@ class ObjectTypes : public MemoryPoolObject, 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; public: ObjectTypes(); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h index ac583cfd057..53d3f1b0f39 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h @@ -258,9 +258,9 @@ class SightingInfo : public MemoryPoolObject, public Snapshot protected: // snapshot method - 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; }; @@ -316,9 +316,9 @@ class PartitionCell : public Snapshot // not MPO: allocated in an array ~PartitionCell(); // --------------- inherited from Snapshot interface -------------- - void crc( Xfer *xfer ); - void xfer( Xfer *xfer ); - void loadPostProcess(); + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; Int getCoiCount() const { return m_coiCount; } ///< return number of COIs touching this cell. Int getCellX() const { return m_cellX; } @@ -610,7 +610,7 @@ class PartitionFilterIsFlying : public PartitionFilter { public: PartitionFilterIsFlying() { } - virtual Bool allow(Object *objOther); + virtual Bool allow(Object *objOther) override; #if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterIsFlying"; } #endif @@ -626,7 +626,7 @@ class PartitionFilterWouldCollide : public PartitionFilter Bool m_desiredCollisionResult; // collision must match this for allow to return true public: PartitionFilterWouldCollide(const Coord3D& pos, const GeometryInfo& geom, Real angle, Bool desired); - virtual Bool allow(Object *objOther); + virtual Bool allow(Object *objOther) override; #if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterWouldCollide"; } #endif @@ -642,7 +642,7 @@ class PartitionFilterSamePlayer : public PartitionFilter const Player *m_player; public: PartitionFilterSamePlayer(const Player *player) : m_player(player) { } - virtual Bool allow(Object *objOther); + virtual Bool allow(Object *objOther) override; #if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterSamePlayer"; } #endif @@ -668,7 +668,7 @@ class PartitionFilterRelationship : public PartitionFilter ALLOW_NEUTRAL = (1<xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; }; EMPTY_DTOR(TurretAIAimTurretState) @@ -173,14 +173,14 @@ class TurretAIRecenterTurretState : public TurretState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIRecenterTurretState, "TurretAIRecenterTurretState") public: TurretAIRecenterTurretState( TurretStateMachine* machine ) : TurretState( machine, "TurretAIRecenterTurretState" ) { } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: // snapshot interface STUBBED - no member vars to save. jba. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override{}; + virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override{}; }; EMPTY_DTOR(TurretAIRecenterTurretState) @@ -198,14 +198,14 @@ class TurretAIHoldTurretState : public TurretState { m_timestamp = 0; } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; + virtual StateReturnType update() override; protected: // snapshot interface - 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; }; EMPTY_DTOR(TurretAIHoldTurretState) @@ -286,7 +286,7 @@ class TurretAI : public MemoryPoolObject, public Snapshot, public NotifyWeaponFi Bool isOwnersCurWeaponOnTurret() const; Bool isWeaponSlotOnTurret(WeaponSlotType wslot) const; - Bool isAttackingObject() const { return m_target == TARGET_OBJECT; } + virtual Bool isAttackingObject() const override { return m_target == TARGET_OBJECT; } Bool isForceAttacking() const { return m_isForceAttacking; } // this will cause the turret to continuously track the given victim. @@ -307,10 +307,10 @@ class TurretAI : public MemoryPoolObject, public Snapshot, public NotifyWeaponFi UpdateSleepTime updateTurretAI(); ///< implement this module's behavior - virtual void notifyFired(); - virtual void notifyNewVictimChosen(Object* victim); - virtual const Coord3D* getOriginalVictimPos() const { return nullptr; } // yes, we return nullptr here - virtual Bool isWeaponSlotOkToFire(WeaponSlotType wslot) const; + virtual void notifyFired() override; + virtual void notifyNewVictimChosen(Object* victim) override; + virtual const Coord3D* getOriginalVictimPos() const override { return nullptr; } // yes, we return nullptr here + virtual Bool isWeaponSlotOkToFire(WeaponSlotType wslot) const override; // these are only for use by the state machines... don't call them otherwise, please Bool friend_turnTowardsAngle(Real desiredAngle, Real rateModifier, Real relThresh); @@ -332,9 +332,9 @@ class TurretAI : public MemoryPoolObject, public Snapshot, public NotifyWeaponFi protected: // snapshot interface - 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; private: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h index 418bb958f3c..26c2e0a5027 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h @@ -51,9 +51,9 @@ class VictoryConditionsInterface : public SubsystemInterface public: VictoryConditionsInterface() { m_victoryConditions = 0; } - virtual void init() = 0; - virtual void reset() = 0; - virtual void update() = 0; + virtual void init() override = 0; + virtual void reset() override = 0; + virtual void update() override = 0; void setVictoryConditions( Int victoryConditions ) { m_victoryConditions = victoryConditions; } Int getVictoryConditions() { return m_victoryConditions; } diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h index 63f25264591..753015dccea 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h @@ -585,9 +585,9 @@ class Weapon : public MemoryPoolObject, 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; public: @@ -829,12 +829,12 @@ class WeaponStore : public SubsystemInterface public: WeaponStore(); - ~WeaponStore(); + virtual ~WeaponStore() override; - void init() { }; - void postProcessLoad(); - void reset(); - void update(); + virtual void init() override { }; + virtual void postProcessLoad() override; + virtual void reset() override; + virtual void update() override; /** Find the WeaponTemplate with the given name. If no such WeaponTemplate exists, return null. diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h index 59ca425ddf1..0a1b9879f31 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h @@ -208,9 +208,9 @@ class WeaponSet : public Snapshot 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; public: diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp index 8db12d8d210..9e3c9318796 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp @@ -122,11 +122,11 @@ class DownloadManagerMunkee : public DownloadManager { public: DownloadManagerMunkee() {m_shouldQuitOnSuccess = true; m_shouldQuitOnSuccess = false;} - virtual HRESULT OnError( Int error ); - virtual HRESULT OnEnd(); - virtual HRESULT OnProgressUpdate( Int bytesread, Int totalsize, Int timetaken, Int timeleft ); - virtual HRESULT OnStatusUpdate( Int status ); - virtual HRESULT downloadFile( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume ); + virtual HRESULT OnError( Int error ) override; + virtual HRESULT OnEnd() override; + virtual HRESULT OnProgressUpdate( Int bytesread, Int totalsize, Int timetaken, Int timeleft ) override; + virtual HRESULT OnStatusUpdate( Int status ) override; + virtual HRESULT downloadFile( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume ) override; private: Bool m_shouldQuitOnSuccess; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp index df3c95a4d82..25d49d2daa2 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp @@ -88,12 +88,12 @@ class GameSpyLoginPreferences : public UserPreferences { public: GameSpyLoginPreferences(); - virtual ~GameSpyLoginPreferences(); + virtual ~GameSpyLoginPreferences() override; Bool loadFromIniFile(); - virtual Bool load(AsciiString fname); - virtual Bool write(); + virtual Bool load(AsciiString fname) override; + virtual Bool write() override; AsciiString getPasswordForEmail( AsciiString email ); AsciiString getDateForEmail( AsciiString email, AsciiString &month, AsciiString &date, AsciiString &year ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp index 855a3bdd532..24b9a999ef7 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp @@ -516,7 +516,7 @@ class PartitionFilterLiveMapEnemies : public PartitionFilter public: PartitionFilterLiveMapEnemies(const Object *obj) : m_obj(obj) { } - virtual Bool allow(Object *objOther) + virtual Bool allow(Object *objOther) override { // this is way fast (bit test) so do it first. if (objOther->isEffectivelyDead()) @@ -546,7 +546,7 @@ class PartitionFilterWithinAttackRange : public PartitionFilter public: PartitionFilterWithinAttackRange(const Object* obj) : m_obj(obj) { } - virtual Bool allow(Object* objOther) + virtual Bool allow(Object* objOther) override { for (Int i = 0; i < WEAPONSLOT_COUNT; i++ ) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp index c0d440ed277..ed72618ea52 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp @@ -1950,9 +1950,9 @@ class AIAttackMoveStateMachine : public StateMachine protected: // snapshot interface - 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; }; // ------------------------------------------------------------------------------------------------ @@ -5747,9 +5747,9 @@ class AIAttackThenIdleStateMachine : public StateMachine AIAttackThenIdleStateMachine( Object *owner, AsciiString name ); protected: // snapshot interface . - 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; }; // ------------------------------------------------------------------------------------------------ diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp index 82e7726fa79..d2b6940f11e 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp @@ -132,7 +132,7 @@ class FireWeaponNugget : public ObjectCreationNugget { } - virtual Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const + virtual Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const override { if (!primaryObj || !primary || !secondary) { @@ -179,7 +179,7 @@ class AttackNugget : public ObjectCreationNugget { } - virtual Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const + virtual Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const override { if (!primaryObj || !primary || !secondary) { @@ -261,12 +261,12 @@ class DeliverPayloadNugget : public ObjectCreationNugget m_transportName.clear(); } - virtual Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const + virtual Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const override { return create( primaryObj, primary, secondary, true, lifetimeFrames ); } - virtual Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Bool createOwner, UnsignedInt lifetimeFrames = 0 ) const + virtual Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Bool createOwner, UnsignedInt lifetimeFrames = 0 ) const override { if (!primaryObj || !primary || !secondary) { @@ -619,7 +619,7 @@ class ApplyRandomForceNugget : public ObjectCreationNugget { } - virtual Object* create( const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const + virtual Object* create( const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const override { if (primary) { @@ -650,7 +650,7 @@ class ApplyRandomForceNugget : public ObjectCreationNugget return nullptr; } - virtual Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const + virtual Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const override { DEBUG_CRASH(("You must call this effect with an object, not a location")); return nullptr; @@ -775,7 +775,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget m_offset.zero(); } - virtual Object* create(const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const + virtual Object* create(const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const override { if (primary) { @@ -791,7 +791,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget return nullptr; } - virtual Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const + virtual Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const override { if (primary) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp index ecad2ae66fd..24d7cb6e08c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp @@ -114,13 +114,13 @@ class ChinookEvacuateState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookEvacuateState, "ChinookEvacuateState") protected: // snapshot interface STUBBED - no member vars to save. jba. - 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 {}; public: ChinookEvacuateState( StateMachine *machine ) : State( machine, "ChinookEvacuateState" ) { } - StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* obj = getMachineOwner(); if( obj->getContain() ) @@ -131,7 +131,7 @@ class ChinookEvacuateState : public State return STATE_SUCCESS; } - virtual StateReturnType update() + virtual StateReturnType update() override { return STATE_SUCCESS; } @@ -145,13 +145,13 @@ class ChinookHeadOffMapState : public State //I'm outta here protected: // snapshot interface STUBBED - no member vars to save. jba. - 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 {}; public: ChinookHeadOffMapState( StateMachine *machine ) : State( machine, "ChinookHeadOffMapState" ) {} - StateReturnType onEnter() // Give move order out of town + virtual StateReturnType onEnter() override // Give move order out of town { Object *owner = getMachineOwner(); ChinookAIUpdate* ai = (ChinookAIUpdate*)owner->getAIUpdateInterface(); @@ -163,7 +163,7 @@ class ChinookHeadOffMapState : public State return STATE_CONTINUE; } - StateReturnType update() + virtual StateReturnType update() override { Object *owner = getMachineOwner(); @@ -196,12 +196,12 @@ class ChinookTakeoffOrLandingState : public State protected: // snapshot interface - virtual void crc( Xfer *xfer ) + virtual void crc( Xfer *xfer ) override { // empty } - virtual void xfer( Xfer *xfer ) + virtual void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -212,7 +212,7 @@ class ChinookTakeoffOrLandingState : public State xfer->xferBool(&m_landing); } - virtual void loadPostProcess() + virtual void loadPostProcess() override { // empty } @@ -223,7 +223,7 @@ class ChinookTakeoffOrLandingState : public State m_destLoc.zero(); } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* obj = getMachineOwner(); ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface(); @@ -280,7 +280,7 @@ class ChinookTakeoffOrLandingState : public State return STATE_CONTINUE; } - virtual StateReturnType update() + virtual StateReturnType update() override { Object* obj = getMachineOwner(); if (obj->isEffectivelyDead()) @@ -298,7 +298,7 @@ class ChinookTakeoffOrLandingState : public State return STATE_CONTINUE; } - virtual void onExit( StateExitType status ) + virtual void onExit( StateExitType status ) override { Object* obj = getMachineOwner(); ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface(); @@ -416,12 +416,12 @@ class ChinookCombatDropState : public State protected: // snapshot interface - virtual void crc( Xfer *xfer ) + virtual void crc( Xfer *xfer ) override { // empty } - virtual void xfer( Xfer *xfer ) + virtual void xfer( Xfer *xfer ) override { // version const XferVersion currentVersion = 2; @@ -468,7 +468,7 @@ class ChinookCombatDropState : public State } } - virtual void loadPostProcess() + virtual void loadPostProcess() override { for (std::vector::iterator it = m_ropes.begin(); it != m_ropes.end(); ++it) { @@ -482,7 +482,7 @@ class ChinookCombatDropState : public State ChinookCombatDropState( StateMachine *machine ): State( machine, "ChinookCombatDropState" ) { } // -------------- - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* obj = getMachineOwner(); Drawable* draw = obj->getDrawable(); @@ -548,7 +548,7 @@ class ChinookCombatDropState : public State } // -------------- - virtual StateReturnType update() + virtual StateReturnType update() override { Object* obj = getMachineOwner(); ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface(); @@ -640,7 +640,7 @@ class ChinookCombatDropState : public State } // -------------- - virtual void onExit( StateExitType status ) + virtual void onExit( StateExitType status ) override { Object* obj = getMachineOwner(); ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface(); @@ -698,12 +698,12 @@ class ChinookMoveToBldgState : public AIMoveToState Real m_destZ; protected: // snapshot interface - virtual void crc( Xfer *xfer ) + virtual void crc( Xfer *xfer ) override { // empty } - virtual void xfer( Xfer *xfer ) + virtual void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -715,7 +715,7 @@ class ChinookMoveToBldgState : public AIMoveToState xfer->xferReal(&m_destZ); } - virtual void loadPostProcess() + virtual void loadPostProcess() override { // empty } @@ -723,7 +723,7 @@ class ChinookMoveToBldgState : public AIMoveToState public: ChinookMoveToBldgState( StateMachine *machine ): AIMoveToState( machine ) { } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* obj = getMachineOwner(); ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface(); @@ -754,7 +754,7 @@ class ChinookMoveToBldgState : public AIMoveToState return AIMoveToState::onEnter(); } - virtual StateReturnType update() + virtual StateReturnType update() override { Object* obj = getMachineOwner(); @@ -768,7 +768,7 @@ class ChinookMoveToBldgState : public AIMoveToState return status; } - virtual void onExit( StateExitType status ) + virtual void onExit( StateExitType status ) override { Object* obj = getMachineOwner(); ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface(); @@ -790,12 +790,12 @@ class ChinookRecordCreationState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookRecordCreationState, "ChinookRecordCreationState") protected: // snapshot interface - virtual void crc( Xfer *xfer ) + virtual void crc( Xfer *xfer ) override { // empty } - virtual void xfer( Xfer *xfer ) + virtual void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -803,7 +803,7 @@ class ChinookRecordCreationState : public State xfer->xferVersion( &version, currentVersion ); } - virtual void loadPostProcess() + virtual void loadPostProcess() override { // empty } @@ -811,7 +811,7 @@ class ChinookRecordCreationState : public State public: ChinookRecordCreationState( StateMachine *machine ): State( machine, "ChinookRecordCreationState" ) { } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* obj = getMachineOwner(); ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface(); @@ -822,7 +822,7 @@ class ChinookRecordCreationState : public State return STATE_SUCCESS; } - virtual StateReturnType update() + virtual StateReturnType update() override { return STATE_SUCCESS; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp index 8d69f17e4b6..c4a0e29a919 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp @@ -86,13 +86,13 @@ class DozerActionPickActionPosState : public State public: DozerActionPickActionPosState( StateMachine *machine, DozerTask task ); - virtual StateReturnType update(); + virtual StateReturnType update() override; protected: // snapshot interface - 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: @@ -243,13 +243,13 @@ class DozerActionMoveToActionPosState : public State public: DozerActionMoveToActionPosState( StateMachine *machine, DozerTask task ) : State( machine, "DozerActionMoveToActionPosState" ) { m_task = task; } - virtual StateReturnType update(); + virtual StateReturnType update() override; protected: // snapshot interface - 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: @@ -386,15 +386,15 @@ class DozerActionDoActionState : public State m_task = task; m_enterFrame = 0; } - virtual StateReturnType update(); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ) { } + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override { } protected: // snapshot interface - 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: @@ -797,9 +797,9 @@ class DozerActionStateMachine : public StateMachine protected: // snapshot interface - 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: @@ -972,15 +972,15 @@ class DozerPrimaryIdleState : public State m_idlePlayerNumber = 0; m_isMarkedAsIdle = FALSE; } - virtual StateReturnType update(); - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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: @@ -1159,16 +1159,16 @@ class DozerActionState : public State Note that we DON'T use CONVERT_SLEEP_TO_CONTINUE; since we're not doing anything else interesting in update, we can sleep when this machine sleeps */ - virtual StateReturnType update() { return m_actionMachine->updateStateMachine(); } + virtual StateReturnType update() override { return m_actionMachine->updateStateMachine(); } - virtual StateReturnType onEnter(); - virtual void onExit( StateExitType status ); + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - 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: @@ -1258,14 +1258,14 @@ class DozerPrimaryGoingHomeState : public State protected: // snapshot interface STUBBED no member vars - 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 {}; public: DozerPrimaryGoingHomeState( StateMachine *machine ) : State( machine, "DozerPrimaryGoingHomeState" ) { } - virtual StateReturnType update() { return STATE_FAILURE; } + virtual StateReturnType update() override { return STATE_FAILURE; } }; EMPTY_DTOR(DozerPrimaryGoingHomeState) diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp index 2fc9c17fef8..a040dbeff87 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp @@ -152,7 +152,7 @@ class PartitionFilterHasParkingPlace : public PartitionFilter #if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterHasParkingPlace"; } #endif - virtual Bool allow(Object *objOther) + virtual Bool allow(Object *objOther) override { ParkingPlaceBehaviorInterface* pp = getPP(objOther->getID()); if (pp != nullptr && pp->reserveSpace(m_id, 0.0f, nullptr)) @@ -200,16 +200,16 @@ class JetAwaitingRunwayState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetAwaitingRunwayState, "JetAwaitingRunwayState") protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override {}; + virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override {}; private: const Bool m_landing; public: JetAwaitingRunwayState( StateMachine *machine, Bool landing ) : m_landing(landing), State( machine, "JetAwaitingRunwayState") { } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -222,7 +222,7 @@ class JetAwaitingRunwayState : public State return STATE_CONTINUE; } - virtual StateReturnType update() + virtual StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -287,7 +287,7 @@ class JetAwaitingRunwayState : public State return STATE_CONTINUE; } - virtual void onExit(StateExitType status) + virtual void onExit(StateExitType status) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -313,9 +313,9 @@ class JetOrHeliCirclingDeadAirfieldState : public State protected: // snapshot interface STUBBED. // The state will check immediately after a load game, but I think that's ok. jba. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override {}; + virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override {}; private: Int m_checkAirfield; @@ -331,7 +331,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State State( machine, "JetOrHeliCirclingDeadAirfieldState"), m_checkAirfield(0) { } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -362,7 +362,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State return STATE_CONTINUE; } - virtual StateReturnType update() + virtual StateReturnType update() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -418,7 +418,7 @@ class JetOrHeliReturningToDeadAirfieldState : public AIInternalMoveToState public: JetOrHeliReturningToDeadAirfieldState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturningToDeadAirfieldState") { } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -479,7 +479,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState public: JetOrHeliTaxiState( StateMachine *machine, TaxiType m ) : m_taxiMode(m), AIMoveOutOfTheWayState( machine ) { } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -640,7 +640,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState return ret; } - virtual StateReturnType update() + virtual StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -671,7 +671,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState return AIMoveOutOfTheWayState::update(); } - virtual void onExit( StateExitType status ) + virtual void onExit( StateExitType status ) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -712,7 +712,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState public: JetTakeoffOrLandingState( StateMachine *machine, Bool landing ) : m_landing(landing), AIFollowPathState( machine, "JetTakeoffOrLandingState" ) { } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -805,7 +805,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState return ret; } - virtual StateReturnType update() + virtual StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -882,7 +882,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState return ret; } - virtual void onExit( StateExitType status ) + virtual void onExit( StateExitType status ) override { AIFollowPathState::onExit(status); @@ -940,12 +940,12 @@ class HeliTakeoffOrLandingState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(HeliTakeoffOrLandingState, "HeliTakeoffOrLandingState") protected: // snapshot interface - virtual void crc( Xfer *xfer ) + virtual void crc( Xfer *xfer ) override { // empty. jba. } - virtual void xfer( Xfer *xfer ) + virtual void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -959,7 +959,7 @@ class HeliTakeoffOrLandingState : public State xfer->xferCoord3D(&m_parkingLoc); xfer->xferReal(&m_parkingOrientation); } - virtual void loadPostProcess() + virtual void loadPostProcess() override { // empty. jba. } @@ -977,7 +977,7 @@ class HeliTakeoffOrLandingState : public State m_parkingLoc.zero(); } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1043,7 +1043,7 @@ class HeliTakeoffOrLandingState : public State return STATE_CONTINUE; } - virtual StateReturnType update() + virtual StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -1105,7 +1105,7 @@ class HeliTakeoffOrLandingState : public State return STATE_CONTINUE; } - virtual void onExit( StateExitType status ) + virtual void onExit( StateExitType status ) override { // just in case. Object* jet = getMachineOwner(); @@ -1152,14 +1152,14 @@ class JetOrHeliParkOrientState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliParkOrientState, "JetOrHeliParkOrientState") protected: // snapshot interface STUBBED. - virtual void crc( Xfer *xfer ){}; - virtual void xfer( Xfer *xfer ){XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess(){}; + virtual void crc( Xfer *xfer ) override {}; + virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + virtual void loadPostProcess() override {}; public: JetOrHeliParkOrientState( StateMachine *machine ) : State( machine, "JetOrHeliParkOrientState") { } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1178,7 +1178,7 @@ class JetOrHeliParkOrientState : public State return STATE_CONTINUE; } - virtual StateReturnType update() + virtual StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -1218,7 +1218,7 @@ class JetOrHeliParkOrientState : public State return STATE_CONTINUE; } - virtual void onExit( StateExitType status ) + virtual void onExit( StateExitType status ) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1238,12 +1238,12 @@ class JetPauseBeforeTakeoffState : public AIFaceState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetPauseBeforeTakeoffState, "JetPauseBeforeTakeoffState") protected: // snapshot interface - virtual void crc( Xfer *xfer ) + virtual void crc( Xfer *xfer ) override { // empty. jba. } - virtual void xfer( Xfer *xfer ) + virtual void xfer( Xfer *xfer ) override { // version #if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE @@ -1277,7 +1277,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState xfer->xferObjectID(&m_waitedForTaxiID); } - virtual void loadPostProcess() + virtual void loadPostProcess() override { // empty. jba. } @@ -1369,7 +1369,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState // nothing } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1401,7 +1401,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState } #if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE - virtual StateReturnType update() + virtual StateReturnType update() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1455,7 +1455,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState #else // TheSuperHackers @bugfix Reimplements the update to wait for another Jet on another runway. // If this must work with more than 2 runways, then this logic needs another look. - virtual StateReturnType update() + virtual StateReturnType update() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1528,7 +1528,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState } #endif - virtual void onExit(StateExitType status) + virtual void onExit(StateExitType status) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1551,12 +1551,12 @@ class JetOrHeliReloadAmmoState : public State protected: // snapshot interface - virtual void crc( Xfer *xfer ) + virtual void crc( Xfer *xfer ) override { // empty. jba. } - virtual void xfer( Xfer *xfer ) + virtual void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -1567,7 +1567,7 @@ class JetOrHeliReloadAmmoState : public State xfer->xferUnsignedInt(&m_reloadTime); xfer->xferUnsignedInt(&m_reloadDoneFrame); } - virtual void loadPostProcess() + virtual void loadPostProcess() override { // empty. jba. } @@ -1575,7 +1575,7 @@ class JetOrHeliReloadAmmoState : public State public: JetOrHeliReloadAmmoState( StateMachine *machine ) : State( machine, "JetOrHeliReloadAmmoState") { } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1612,7 +1612,7 @@ class JetOrHeliReloadAmmoState : public State return STATE_CONTINUE; } - virtual StateReturnType update() + virtual StateReturnType update() override { Object* jet = getMachineOwner(); UnsignedInt now = TheGameLogic->getFrame(); @@ -1638,7 +1638,7 @@ class JetOrHeliReloadAmmoState : public State return STATE_CONTINUE; } - virtual void onExit(StateExitType status) + virtual void onExit(StateExitType status) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1660,7 +1660,7 @@ class JetOrHeliReturnForLandingState : public AIInternalMoveToState public: JetOrHeliReturnForLandingState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturnForLandingState") { } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp index e6cc69c04f9..19bdbdd01d7 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp @@ -906,7 +906,7 @@ class PartitionFilterIsValidCarriage : public PartitionFilter virtual const char* debugGetName() { return "PartitionFilterIsValidCarriage"; } #endif - virtual Bool allow(Object *objOther) + virtual Bool allow(Object *objOther) override { // must exist! diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp index d3dc5b0c0c6..17def78624e 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp @@ -293,13 +293,13 @@ class SupplyTruckBusyState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckBusyState, "SupplyTruckBusyState") protected: // snapshot interface STUBBED. - 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 {}; public: SupplyTruckBusyState( StateMachine *machine ) : State( machine, "SupplyTruckBusyState" ) { } - virtual StateReturnType onEnter() + virtual StateReturnType onEnter() override { if( getMachineOwner() && getMachineOwner()->getAI() ) { @@ -317,11 +317,11 @@ TheInGameUI->DEBUG_addFloatingText("entering busy state", getMachineOwner()->get #endif return STATE_CONTINUE; } - virtual StateReturnType update() + virtual StateReturnType update() override { return STATE_CONTINUE; } - virtual void onExit(StateExitType status) + virtual void onExit(StateExitType status) override { #ifdef DEBUG_SUPPLY_STATE TheInGameUI->DEBUG_addFloatingText("exiting busy state", getMachineOwner()->getPosition(), GameMakeColor(255, 0, 0, 255)); @@ -337,18 +337,18 @@ class SupplyTruckIdleState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckIdleState, "SupplyTruckIdleState") protected: // snapshot interface STUBBED. - 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 {}; public: SupplyTruckIdleState( StateMachine *machine ) : State( machine, "SupplyTruckIdleState" ) { } - virtual StateReturnType onEnter(); - virtual StateReturnType update() + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override { return STATE_CONTINUE; } - virtual void onExit(StateExitType status) + virtual void onExit(StateExitType status) override { #ifdef DEBUG_SUPPLY_STATE TheInGameUI->DEBUG_addFloatingText("exiting idle state", getMachineOwner()->getPosition(), GameMakeColor(255, 0, 0, 255)); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp index e97739801c7..173f2e095af 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp @@ -1162,14 +1162,14 @@ class ActAsDozerState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ActAsDozerState, "ActAsDozerState") protected: // snapshot interface STUBBED. - 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 {}; public: ActAsDozerState( StateMachine *machine ) :State( machine, "ActAsDozerState" ){} - virtual StateReturnType onEnter(); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; virtual StateReturnType onExit(); }; EMPTY_DTOR(ActAsDozerState) @@ -1181,14 +1181,14 @@ class ActAsSupplyTruckState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ActAsSupplyTruckState, "ActAsSupplyTruckState") protected: // snapshot interface STUBBED. - 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 {}; public: ActAsSupplyTruckState( StateMachine *machine ) :State( machine, "ActAsSupplyTruckState" ){} - virtual StateReturnType onEnter(); - virtual StateReturnType update(); + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override; virtual StateReturnType onExit(); }; EMPTY_DTOR(ActAsSupplyTruckState) diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp index c627c35da8e..ce710ac5188 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp @@ -50,7 +50,7 @@ class PartitionFilterFlammable : public PartitionFilter PartitionFilterFlammable(){ } - virtual Bool allow(Object *objOther); + virtual Bool allow(Object *objOther) override; #if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterFlammable"; } #endif diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp index 3421af63632..df7271bd39c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp @@ -78,7 +78,7 @@ class PartitionFilterHordeMember : public PartitionFilter virtual const char* debugGetName() { return "PartitionFilterHordeMember"; } #endif - virtual Bool allow(Object *objOther) + virtual Bool allow(Object *objOther) override { // must be exact same type as us (well, maybe) if (m_data->m_exactMatch && m_obj->getTemplate() != objOther->getTemplate()) diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp index f72d2ee6c3b..69c7b4988da 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp @@ -322,7 +322,7 @@ class PartitionFilterLiveMapEnemies : public PartitionFilter public: PartitionFilterLiveMapEnemies(const Object *obj) : m_obj(obj) { } - virtual Bool allow(Object *objOther) + virtual Bool allow(Object *objOther) override { // this is way fast (bit test) so do it first. if (objOther->isEffectivelyDead()) diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp index 76839230cf9..30821129b0c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp @@ -115,7 +115,7 @@ class PartitionFilterStealthedOrStealthGarrisoned : public PartitionFilter public: PartitionFilterStealthedOrStealthGarrisoned() { } - virtual Bool allow(Object *objOther); + virtual Bool allow(Object *objOther) override; #if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterStealthedOrStealthGarrisoned"; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp index a52ffd6e946..66ef8bc1598 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp @@ -74,7 +74,7 @@ class PartitionFilterTensileFormationMember : public PartitionFilter #if defined(RTS_DEBUG) virtual const char* debugGetName() { return "PartitionFilterTensileFormationMember"; } #endif - virtual Bool allow( Object *objOther ) + virtual Bool allow( Object *objOther ) override { return ( getTFU( objOther ) != nullptr ); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp index 3b199933d85..ef8d4be5102 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp @@ -77,21 +77,21 @@ class VictoryConditions : public VictoryConditionsInterface public: VictoryConditions(); - void init(); - void reset(); - void update(); + void init() override; + void reset() override; + void update() override; - Bool hasAchievedVictory(Player *player); ///< has a specific player and his allies won? - Bool hasBeenDefeated(Player *player); ///< has a specific player and his allies lost? - Bool hasSinglePlayerBeenDefeated(Player *player); ///< has a specific player lost? + virtual Bool hasAchievedVictory(Player *player) override; ///< has a specific player and his allies won? + virtual Bool hasBeenDefeated(Player *player) override; ///< has a specific player and his allies lost? + virtual Bool hasSinglePlayerBeenDefeated(Player *player) override; ///< has a specific player lost? - void cachePlayerPtrs(); ///< players have been created - cache the ones of interest + void cachePlayerPtrs() override; ///< players have been created - cache the ones of interest - Bool isLocalAlliedVictory(); ///< convenience function - Bool isLocalAlliedDefeat(); ///< convenience function - Bool isLocalDefeat(); ///< convenience function - Bool amIObserver() { return m_isObserver;} ///< Am I an observer?( need this for scripts ) - virtual UnsignedInt getEndFrame() { return m_endFrame; } ///< on which frame was the game effectively over? + Bool isLocalAlliedVictory() override; ///< convenience function + Bool isLocalAlliedDefeat() override; ///< convenience function + Bool isLocalDefeat() override; ///< convenience function + Bool amIObserver() override { return m_isObserver;} ///< Am I an observer?( need this for scripts ) + virtual UnsignedInt getEndFrame() override { return m_endFrame; } ///< on which frame was the game effectively over? private: Player* findFirstUndefeatedPlayer(); ///< Find the first player that has not been defeated. void markAllianceVictorious(Player* victoriousPlayer); ///< Mark the victorious player and his allies as victorious. diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h index a9fdf7d89d5..ed6826c3f9d 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h @@ -40,11 +40,11 @@ class W3DFunctionLexicon : public FunctionLexicon public: W3DFunctionLexicon(); - virtual ~W3DFunctionLexicon(); + virtual ~W3DFunctionLexicon() override; - virtual void init(); - virtual void reset(); - virtual void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; protected: diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h index dc5bfc4929d..6513e7b7f1a 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h @@ -43,6 +43,6 @@ class W3DModuleFactory : public ModuleFactory public: - virtual void init(); + virtual void init() override; }; diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h index a49aae8035b..6221a59f513 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h @@ -42,5 +42,5 @@ class W3DThingFactory : public ThingFactory public: W3DThingFactory(); - virtual ~W3DThingFactory(); + virtual ~W3DThingFactory() override; }; diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h index aa718a900b5..341e50a4a4f 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h @@ -54,12 +54,12 @@ class W3DAssetManager: public WW3DAssetManager { public: W3DAssetManager(); - virtual ~W3DAssetManager(); + virtual ~W3DAssetManager() override; - virtual RenderObjClass * Create_Render_Obj(const char * name); + virtual RenderObjClass * Create_Render_Obj(const char * name) override; // unique to W3DAssetManager - virtual HAnimClass * Get_HAnim(const char * name); - virtual bool Load_3D_Assets( const char * filename ); // This CANNOT be Bool, as it will not inherit properly if you make Bool == Int + virtual HAnimClass * Get_HAnim(const char * name) override; + virtual bool Load_3D_Assets( const char * filename ) override; // This CANNOT be Bool, as it will not inherit properly if you make Bool == Int virtual TextureClass * Get_Texture ( @@ -69,7 +69,7 @@ class W3DAssetManager: public WW3DAssetManager bool allow_compression=true, TextureBaseClass::TexAssetType type=TextureBaseClass::TEX_REGULAR, bool allow_reduction=true - ); + ) override; //'Generals' customizations void Report_Used_Assets(); diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h index 6313025c018..f69a5ef04a0 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h @@ -72,7 +72,7 @@ class W3DDebugDisplay : public DebugDisplay public: W3DDebugDisplay(); - virtual ~W3DDebugDisplay(); + virtual ~W3DDebugDisplay() override; void init(); ///< Initialized the display void setFont( GameFont *font ); ///< Set the font to render with @@ -86,7 +86,7 @@ class W3DDebugDisplay : public DebugDisplay Int m_fontHeight; DisplayString *m_displayString; - virtual void drawText( Int x, Int y, Char *text ); ///< Render null terminated string at current cursor position + virtual void drawText( Int x, Int y, Char *text ) override; ///< Render null terminated string at current cursor position }; diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h index 18a10ef8637..3eaff6ab0fc 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h @@ -56,87 +56,87 @@ class W3DDisplay : public Display public: W3DDisplay(); - ~W3DDisplay(); - - virtual void init(); ///< initialize or re-initialize the system - virtual void reset() ; ///< Reset system - - virtual void setWidth( UnsignedInt width ); - virtual void setHeight( UnsignedInt height ); - virtual Bool setDisplayMode( UnsignedInt xres, UnsignedInt yres, UnsignedInt bitdepth, Bool windowed ); - virtual Int getDisplayModeCount(); ///removeShadow(this);} ///removeShadow(this);} ///removeShadow(this);} ///removeShadow(this);} ///Class_ID(); } - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { deleteInstance(this); } + virtual const char* Get_Name() const override { return Name.str(); } + virtual int Get_Class_ID() const override { return Proto->Class_ID(); } + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { deleteInstance(this); } protected: //virtual ~W3DPrototypeClass(); diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp index d2be8e5fb1d..12700d3cc3c 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp @@ -68,9 +68,9 @@ class W3DRenderObjectSnapshot : public Snapshot protected: - 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; #ifdef DEBUG_FOG_MEMORY const char *m_robjName; ///HAnimManager ) { }; - virtual void First() { Iterator.First(); } - virtual void Next() { Iterator.Next(); } - virtual bool Is_Done() { return Iterator.Is_Done(); } - virtual const char * Current_Item_Name() { return Iterator.Get_Current_Anim()->Get_Name(); } + virtual void First() override { Iterator.First(); } + virtual void Next() override { Iterator.Next(); } + virtual bool Is_Done() override { return Iterator.Is_Done(); } + virtual const char * Current_Item_Name() override { return Iterator.Get_Current_Anim()->Get_Name(); } protected: HAnimManagerIterator Iterator; @@ -167,8 +167,8 @@ class HAnimIterator : public AssetIterator class HTreeIterator : public AssetIterator { public: - virtual bool Is_Done(); - virtual const char * Current_Item_Name(); + virtual bool Is_Done() override; + virtual const char * Current_Item_Name() override; protected: friend class WW3DAssetManager; }; @@ -177,10 +177,10 @@ class Font3DDataIterator : public AssetIterator { public: - virtual void First() { Node = WW3DAssetManager::Get_Instance()->Font3DDatas.Head(); } - virtual void Next() { Node = Node->Next(); } - virtual bool Is_Done() { return Node==nullptr; } - virtual const char * Current_Item_Name() { return Node->Data()->Name; } + virtual void First() override { Node = WW3DAssetManager::Get_Instance()->Font3DDatas.Head(); } + virtual void Next() override { Node = Node->Next(); } + virtual bool Is_Done() override { return Node==nullptr; } + virtual const char * Current_Item_Name() override { return Node->Data()->Name; } protected: diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h index 398b237c830..47cd00273a9 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h @@ -77,9 +77,9 @@ class BoxRenderObjClass : public RenderObjClass BoxRenderObjClass(const BoxRenderObjClass & src); BoxRenderObjClass & operator = (const BoxRenderObjClass &); - virtual int Get_Num_Polys() const; - virtual const char * Get_Name() const; - virtual void Set_Name(const char * name); + virtual int Get_Num_Polys() const override; + virtual const char * Get_Name() const override; + virtual void Set_Name(const char * name) override; void Set_Color(const Vector3 & color); void Set_Opacity(float opacity) { Opacity = opacity; } @@ -143,19 +143,19 @@ class AABoxRenderObjClass : public W3DMPO, public BoxRenderObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const; - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); - virtual bool Cast_Ray(RayCollisionTestClass & raytest); - virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest); - virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); - virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); - virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override; + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; + virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override; + virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override; + virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest) override; + virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest) override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // AABoxRenderObjClass Interface @@ -164,7 +164,7 @@ class AABoxRenderObjClass : public W3DMPO, public BoxRenderObjClass protected: - virtual void update_cached_box(); + virtual void update_cached_box() override; AABoxClass CachedBox; @@ -194,19 +194,19 @@ class OBBoxRenderObjClass : public W3DMPO, public BoxRenderObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const; - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); - virtual bool Cast_Ray(RayCollisionTestClass & raytest); - virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest); - virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); - virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); - virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override; + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; + virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override; + virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override; + virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest) override; + virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest) override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // OBBoxRenderObjClass Interface @@ -215,7 +215,7 @@ class OBBoxRenderObjClass : public W3DMPO, public BoxRenderObjClass protected: - virtual void update_cached_box(); + virtual void update_cached_box() override; OBBoxClass CachedBox; @@ -228,8 +228,8 @@ class OBBoxRenderObjClass : public W3DMPO, public BoxRenderObjClass class BoxLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type () { return W3D_CHUNK_BOX; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type () override { return W3D_CHUNK_BOX; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; @@ -242,10 +242,10 @@ class BoxPrototypeClass : public W3DMPO, public PrototypeClass W3DMPO_GLUE(BoxPrototypeClass) public: BoxPrototypeClass(W3dBoxStruct box); - virtual const char * Get_Name() const; - virtual int Get_Class_ID() const; - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override; + virtual int Get_Class_ID() const override; + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { delete this; } private: W3dBoxStruct Definition; }; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h index ed18badc1cf..6465fcd2a6d 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h @@ -120,28 +120,28 @@ class CameraClass : public RenderObjClass CameraClass(); CameraClass(const CameraClass & src); CameraClass & operator = (const CameraClass &); - virtual ~CameraClass(); - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_CAMERA; } + virtual ~CameraClass() override; + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_CAMERA; } ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Rendering, cameras don't "render" ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo) { } + virtual void Render(RenderInfoClass & rinfo) override { } ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - "Scene Graph" // Cameras cache their frustum description, this is invalidated whenever // the transform/position is changed ///////////////////////////////////////////////////////////////////////////// - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Bounding Volumes ///////////////////////////////////////////////////////////////////////////// - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; /////////////////////////////////////////////////////////////////////////// // Camera parameter control diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp index e37a774733a..90bf25bda7e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp @@ -1430,9 +1430,9 @@ void DazzleRenderObjClass::Special_Render(SpecialRenderInfoClass & rinfo) class DazzlePersistFactoryClass : public PersistFactoryClass { - virtual uint32 Chunk_ID() const; - virtual PersistClass * Load(ChunkLoadClass & cload) const; - virtual void Save(ChunkSaveClass & csave,PersistClass * obj) const; + virtual uint32 Chunk_ID() const override; + virtual PersistClass * Load(ChunkLoadClass & cload) const override; + virtual void Save(ChunkSaveClass & csave,PersistClass * obj) const override; enum { diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h index b2446d8ff85..4fdc4408672 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h @@ -271,15 +271,15 @@ class DazzleRenderObjClass : public RenderObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_DAZZLE; } + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_DAZZLE; } - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); - virtual void Set_Transform(const Matrix3D &m); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; - virtual void Scale(float scale) { current_scale*=scale; }; + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; + virtual void Scale(float scale) override { current_scale*=scale; }; void Set_Dazzle_Color(const Vector3& col) { dazzle_color=col; } void Set_Halo_Color(const Vector3& col) { halo_color=col; } @@ -300,7 +300,7 @@ class DazzleRenderObjClass : public RenderObjClass // Persistent object save-load interface // Dazzles save their "dazzle-type" and transform - virtual const PersistFactoryClass & Get_Factory () const; + virtual const PersistFactoryClass & Get_Factory () const override; // Set the static "current layer" variable. This variable is used in the // Render() call so that the dazzle knows which list to add itself to if @@ -359,10 +359,10 @@ class DazzlePrototypeClass : public W3DMPO, public PrototypeClass public: DazzlePrototypeClass() : DazzleType(0) { } - virtual const char * Get_Name() const { return Name; } - virtual int Get_Class_ID() const { return RenderObjClass::CLASSID_DAZZLE; } - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override { return Name; } + virtual int Get_Class_ID() const override { return RenderObjClass::CLASSID_DAZZLE; } + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { delete this; } WW3DErrorType Load_W3D(ChunkLoadClass & cload); @@ -384,8 +384,8 @@ class DazzleLoaderClass : public PrototypeLoaderClass DazzleLoaderClass() { } ~DazzleLoaderClass() { } - virtual int Chunk_Type() { return W3D_CHUNK_DAZZLE; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type() override { return W3D_CHUNK_DAZZLE; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; extern DazzleLoaderClass _DazzleLoader; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h index 53bd7a5e7b1..02a112a4448 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h @@ -55,7 +55,7 @@ class IndexBufferClass : public W3DMPO, public RefCountClass // nope, it's an ABC //W3DMPO_GLUE(IndexBufferClass) protected: - virtual ~IndexBufferClass(); + virtual ~IndexBufferClass() override; public: IndexBufferClass(unsigned type, unsigned short index_count); @@ -122,7 +122,7 @@ class DynamicIBAccessClass : public W3DMPO public: DynamicIBAccessClass(unsigned short type, unsigned short index_count); - ~DynamicIBAccessClass(); + virtual ~DynamicIBAccessClass() override; unsigned Get_Type() const { return Type; } unsigned short Get_Index_Count() const { return IndexCount; } @@ -168,7 +168,7 @@ class DX8IndexBufferClass : public IndexBufferClass }; DX8IndexBufferClass(unsigned short index_count,UsageType usage=USAGE_DEFAULT); - ~DX8IndexBufferClass(); + virtual ~DX8IndexBufferClass() override; void Copy(unsigned int* indices,unsigned start_index,unsigned index_count); void Copy(unsigned short* indices,unsigned start_index,unsigned index_count); @@ -192,7 +192,7 @@ class SortingIndexBufferClass : public IndexBufferClass friend DynamicIBAccessClass::WriteLockClass; public: SortingIndexBufferClass(unsigned short index_count); - ~SortingIndexBufferClass(); + virtual ~SortingIndexBufferClass() override; protected: unsigned short* index_buffer; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h index 166668552b7..1fa2fec326d 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h @@ -88,7 +88,7 @@ class DX8TextureCategoryClass : public MultiListObjectClass public: DX8TextureCategoryClass(DX8FVFCategoryContainer* container,TextureClass** textures, ShaderClass shd, VertexMaterialClass* mat,int pass); - ~DX8TextureCategoryClass(); + virtual ~DX8TextureCategoryClass() override; void Add_Render_Task(DX8PolygonRendererClass * p_renderer,MeshClass * p_mesh); @@ -178,7 +178,7 @@ class DX8FVFCategoryContainer : public MultiListObjectClass public: DX8FVFCategoryContainer(unsigned FVF,bool sorting); - virtual ~DX8FVFCategoryContainer(); + virtual ~DX8FVFCategoryContainer() override; static unsigned Define_FVF(MeshModelClass* mmc,bool enable_lighting); bool Is_Sorting() const { return sorting; } @@ -235,20 +235,20 @@ class DX8RigidFVFCategoryContainer : public DX8FVFCategoryContainer { public: DX8RigidFVFCategoryContainer(unsigned FVF,bool sorting); - ~DX8RigidFVFCategoryContainer(); + virtual ~DX8RigidFVFCategoryContainer() override; - void Add_Mesh(MeshModelClass* mmc); - void Log(bool only_visible); - bool Check_If_Mesh_Fits(MeshModelClass* mmc); + virtual void Add_Mesh(MeshModelClass* mmc) override; + virtual void Log(bool only_visible) override; + virtual bool Check_If_Mesh_Fits(MeshModelClass* mmc) override; - void Render(); // Generic render function + void Render() override; // Generic render function /* ** This method adds a material pass which must be rendered after all of the other rendering is complete. ** This is needed whenever a mesh turns off its base passes and renders a translucent pass on its geometry. */ - virtual void Add_Delayed_Visible_Material_Pass(MaterialPassClass * pass, MeshClass * mesh); - virtual void Render_Delayed_Procedural_Material_Passes(); + virtual void Add_Delayed_Visible_Material_Pass(MaterialPassClass * pass, MeshClass * mesh) override; + virtual void Render_Delayed_Procedural_Material_Passes() override; protected: @@ -270,12 +270,12 @@ class DX8SkinFVFCategoryContainer: public DX8FVFCategoryContainer { public: DX8SkinFVFCategoryContainer(bool sorting); - ~DX8SkinFVFCategoryContainer(); + virtual ~DX8SkinFVFCategoryContainer() override; - void Render(); - void Add_Mesh(MeshModelClass* mmc); - void Log(bool only_visible); - bool Check_If_Mesh_Fits(MeshModelClass* mmc); + void Render() override; + void Add_Mesh(MeshModelClass* mmc) override; + void Log(bool only_visible) override; + bool Check_If_Mesh_Fits(MeshModelClass* mmc) override; void Add_Visible_Skin(MeshClass * mesh); @@ -283,8 +283,8 @@ class DX8SkinFVFCategoryContainer: public DX8FVFCategoryContainer ** Since skins are already rendered after the rigid meshes, the Add_Delayed_Material_Pass function simply ** routes into the Add_Visible_Material_Pass method and no extra overhead is added. */ - virtual void Add_Delayed_Visible_Material_Pass(MaterialPassClass * pass, MeshClass * mesh) { Add_Visible_Material_Pass(pass,mesh); } - virtual void Render_Delayed_Procedural_Material_Passes() { } + virtual void Add_Delayed_Visible_Material_Pass(MaterialPassClass * pass, MeshClass * mesh) override { Add_Visible_Material_Pass(pass,mesh); } + virtual void Render_Delayed_Procedural_Material_Passes() override { } private: diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h index a5e502c4d6e..202a587bec6 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h @@ -80,7 +80,7 @@ class VertexBufferClass : public W3DMPO, public RefCountClass protected: VertexBufferClass(unsigned type, unsigned FVF, unsigned short VertexCount, unsigned vertex_size=0); - virtual ~VertexBufferClass(); + virtual ~VertexBufferClass() override; public: const FVFInfoClass& FVF_Info() const { return *fvf_info; } @@ -202,7 +202,7 @@ class DX8VertexBufferClass : public VertexBufferClass { W3DMPO_GLUE(DX8VertexBufferClass) protected: - ~DX8VertexBufferClass(); + virtual ~DX8VertexBufferClass() override; public: enum UsageType { USAGE_DEFAULT=0, @@ -250,7 +250,7 @@ class SortingVertexBufferClass : public VertexBufferClass VertexFormatXYZNDUV2* VertexBuffer; protected: - ~SortingVertexBufferClass(); + virtual ~SortingVertexBufferClass() override; public: SortingVertexBufferClass(unsigned short VertexCount); }; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h index ad4c88f9034..01352a78e55 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h @@ -53,9 +53,9 @@ class MissingAnimClass : public HashableClass { public: MissingAnimClass( const char * name ) : Name( name ) {} - virtual ~MissingAnimClass() {} + virtual ~MissingAnimClass() override {} - virtual const char * Get_Key() { return Name; } + virtual const char * Get_Key() override { return Name; } private: StringClass Name; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h index 5b516de3071..5a2d36bc67e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h @@ -70,14 +70,14 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass HLodClass(const HModelDefClass & def); HLodClass & operator = (const HLodClass &); - virtual ~HLodClass(); + virtual ~HLodClass() override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Cloning and Identification ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_HLOD; } - virtual int Get_Num_Polys() const; + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_HLOD; } + virtual int Get_Num_Polys() const override; ///////////////////////////////////////////////////////////////////////////// // HLod Interface - Editing and information @@ -108,102 +108,102 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Rendering ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - "Scene Graph" ///////////////////////////////////////////////////////////////////////////// - virtual void Set_Transform(const Matrix3D &m); - virtual void Set_Position(const Vector3 &v); + virtual void Set_Transform(const Matrix3D &m) override; + virtual void Set_Position(const Vector3 &v) override; - virtual void Notify_Added(SceneClass * scene); - virtual void Notify_Removed(SceneClass * scene); + virtual void Notify_Added(SceneClass * scene) override; + virtual void Notify_Removed(SceneClass * scene) override; - virtual int Get_Num_Sub_Objects() const; - virtual RenderObjClass * Get_Sub_Object(int index) const; - virtual int Add_Sub_Object(RenderObjClass * subobj); - virtual int Remove_Sub_Object(RenderObjClass * robj); + virtual int Get_Num_Sub_Objects() const override; + virtual RenderObjClass * Get_Sub_Object(int index) const override; + virtual int Add_Sub_Object(RenderObjClass * subobj) override; + virtual int Remove_Sub_Object(RenderObjClass * robj) override; - virtual int Get_Num_Sub_Objects_On_Bone(int boneindex) const; - virtual RenderObjClass * Get_Sub_Object_On_Bone(int index,int boneindex) const; - virtual int Get_Sub_Object_Bone_Index(RenderObjClass * subobj) const; - virtual int Get_Sub_Object_Bone_Index(int LodIndex, int ModelIndex) const; - virtual int Add_Sub_Object_To_Bone(RenderObjClass * subobj,int bone_index); + virtual int Get_Num_Sub_Objects_On_Bone(int boneindex) const override; + virtual RenderObjClass * Get_Sub_Object_On_Bone(int index,int boneindex) const override; + virtual int Get_Sub_Object_Bone_Index(RenderObjClass * subobj) const override; + virtual int Get_Sub_Object_Bone_Index(int LodIndex, int ModelIndex) const override; + virtual int Add_Sub_Object_To_Bone(RenderObjClass * subobj,int bone_index) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Hierarchical Animation ///////////////////////////////////////////////////////////////////////////// - virtual void Set_Animation(); + virtual void Set_Animation() override; virtual void Set_Animation( HAnimClass * motion, - float frame, int anim_mode = ANIM_MODE_MANUAL); + float frame, int anim_mode = ANIM_MODE_MANUAL) override; virtual void Set_Animation( HAnimClass * motion0, float frame0, HAnimClass * motion1, float frame1, - float percentage); - virtual void Set_Animation( HAnimComboClass * anim_combo); + float percentage) override; + virtual void Set_Animation( HAnimComboClass * anim_combo) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Collision Detection, Ray Tracing ///////////////////////////////////////////////////////////////////////////// - virtual bool Cast_Ray(RayCollisionTestClass & raytest); - virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest); - virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); - virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); - virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; + virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override; + virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override; + virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest) override; + virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Predictive LOD ///////////////////////////////////////////////////////////////////////////// - virtual void Prepare_LOD(CameraClass &camera); - virtual void Recalculate_Static_LOD_Factors(); - virtual void Increment_LOD(); - virtual void Decrement_LOD(); - virtual float Get_Cost() const; - virtual float Get_Value() const; - virtual float Get_Post_Increment_Value() const; - virtual void Set_LOD_Level(int lod); - virtual int Get_LOD_Level() const; - virtual int Get_LOD_Count() const; - virtual void Set_LOD_Bias(float bias); - virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const; - virtual RenderObjClass * Get_Current_LOD(); + virtual void Prepare_LOD(CameraClass &camera) override; + virtual void Recalculate_Static_LOD_Factors() override; + virtual void Increment_LOD() override; + virtual void Decrement_LOD() override; + virtual float Get_Cost() const override; + virtual float Get_Value() const override; + virtual float Get_Post_Increment_Value() const override; + virtual void Set_LOD_Level(int lod) override; + virtual int Get_LOD_Level() const override; + virtual int Get_LOD_Count() const override; + virtual void Set_LOD_Bias(float bias) override; + virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const override; + virtual RenderObjClass * Get_Current_LOD() override; /////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Render Object Interface - Bounding Volumes /////////////////////////////////////////////////////////////////////////////////////////////////////////////// - virtual const SphereClass & Get_Bounding_Sphere() const; - virtual const AABoxClass & Get_Bounding_Box() const; - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual const SphereClass & Get_Bounding_Sphere() const override; + virtual const AABoxClass & Get_Bounding_Box() const override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; /////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Render Object Interface - Decals /////////////////////////////////////////////////////////////////////////////////////////////////////////////// - virtual void Create_Decal(DecalGeneratorClass * generator); - virtual void Delete_Decal(uint32 decal_id); + virtual void Create_Decal(DecalGeneratorClass * generator) override; + virtual void Delete_Decal(uint32 decal_id) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Attributes, Options, Properties, etc ///////////////////////////////////////////////////////////////////////////// // virtual void Set_Texture_Reduction_Factor(float trf); - virtual void Scale(float scale); - virtual void Scale(float scalex, float scaley, float scalez) { } - virtual int Get_Num_Snap_Points(); - virtual void Get_Snap_Point(int index,Vector3 * set); - virtual void Set_Hidden(int onoff); + virtual void Scale(float scale) override; + virtual void Scale(float scalex, float scaley, float scalez) override { } + virtual int Get_Num_Snap_Points() override; + virtual void Get_Snap_Point(int index,Vector3 * set) override; + virtual void Set_Hidden(int onoff) override; // (gth) TESTING DYNAMICALLY SWAPPING SKELETONS! - virtual void Set_HTree(HTreeClass * htree); + virtual void Set_HTree(HTreeClass * htree) override; protected: HLodClass(); void Free(); - virtual void Update_Sub_Object_Transforms(); - virtual void Update_Obj_Space_Bounding_Volumes(); + virtual void Update_Sub_Object_Transforms() override; + virtual void Update_Obj_Space_Bounding_Volumes() override; protected: @@ -267,8 +267,8 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass class HLodLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type () { return W3D_CHUNK_HLOD; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type () override { return W3D_CHUNK_HLOD; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; @@ -284,7 +284,7 @@ class HLodDefClass : public W3DMPO HLodDefClass(); HLodDefClass(HLodClass &src_lod); - ~HLodDefClass(); + ~HLodDefClass() override; WW3DErrorType Load_W3D(ChunkLoadClass & cload); WW3DErrorType Save(ChunkSaveClass & csave); @@ -349,15 +349,15 @@ class HLodPrototypeClass : public W3DMPO, public PrototypeClass public: HLodPrototypeClass( HLodDefClass *def ) { Definition = def; } - virtual const char * Get_Name() const { return Definition->Get_Name(); } - virtual int Get_Class_ID() const { return RenderObjClass::CLASSID_HLOD; } - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override { return Definition->Get_Name(); } + virtual int Get_Class_ID() const override { return RenderObjClass::CLASSID_HLOD; } + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { delete this; } HLodDefClass * Get_Definition() const { return Definition; } protected: - virtual ~HLodPrototypeClass() { delete Definition; } + virtual ~HLodPrototypeClass() override { delete Definition; } private: HLodDefClass * Definition; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h index 34cdae93bae..55070619fcb 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h @@ -75,30 +75,30 @@ class HMorphAnimClass : public HAnimClass }; HMorphAnimClass(); - ~HMorphAnimClass(); + ~HMorphAnimClass() override; void Free_Morph(); int Create_New_Morph(const int channels, HAnimClass *anim[]); int Load_W3D(ChunkLoadClass & cload); int Save_W3D(ChunkSaveClass & csave); - const char * Get_Name() const { return Name; } - const char * Get_HName() const { return HierarchyName; } + const char * Get_Name() const override { return Name; } + const char * Get_HName() const override { return HierarchyName; } - int Get_Num_Frames() { return FrameCount; } - float Get_Frame_Rate() { return FrameRate; } - float Get_Total_Time() { return (float)FrameCount / FrameRate; } + int Get_Num_Frames() override { return FrameCount; } + float Get_Frame_Rate() override { return FrameRate; } + float Get_Total_Time() override { return (float)FrameCount / FrameRate; } - void Get_Translation(Vector3& translation, int pividx,float frame) const; - void Get_Orientation(Quaternion& orientation, int pividx,float frame) const; - void Get_Transform(Matrix3D& transform, int pividx,float frame) const; - bool Get_Visibility(int pividx,float frame) { return true; } + virtual void Get_Translation(Vector3& translation, int pividx,float frame) const override; + virtual void Get_Orientation(Quaternion& orientation, int pividx,float frame) const override; + virtual void Get_Transform(Matrix3D& transform, int pividx,float frame) const override; + virtual bool Get_Visibility(int pividx,float frame) override { return true; } void Insert_Morph_Key (const int channel, uint32 morph_frame, uint32 pose_frame); void Release_Keys (); - bool Is_Node_Motion_Present(int pividx) { return true; } - int Get_Num_Pivots() const { return NumNodes; } + bool Is_Node_Motion_Present(int pividx) override { return true; } + int Get_Num_Pivots() const override { return NumNodes; } void Set_Name(const char * name); void Set_HName(const char * hname); diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h index ce557423cd7..1e8c6643015 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h @@ -82,32 +82,32 @@ class HRawAnimClass : public HAnimClass }; HRawAnimClass(); - ~HRawAnimClass(); + ~HRawAnimClass() override; int Load_W3D(ChunkLoadClass & cload); - const char * Get_Name() const { return Name; } - const char * Get_HName() const { return HierarchyName; } - int Get_Num_Frames() { return NumFrames; } - float Get_Frame_Rate() { return FrameRate; } - float Get_Total_Time() { return (float)NumFrames / FrameRate; } + const char * Get_Name() const override { return Name; } + const char * Get_HName() const override { return HierarchyName; } + int Get_Num_Frames() override { return NumFrames; } + float Get_Frame_Rate() override { return FrameRate; } + float Get_Total_Time() override { return (float)NumFrames / FrameRate; } - void Get_Translation(Vector3& translation, int pividx,float frame) const; - void Get_Orientation(Quaternion& orientation, int pividx,float frame) const; - void Get_Transform(Matrix3D& transform, int pividx,float frame) const; - bool Get_Visibility(int pividx,float frame); + virtual void Get_Translation(Vector3& translation, int pividx,float frame) const override; + virtual void Get_Orientation(Quaternion& orientation, int pividx,float frame) const override; + virtual void Get_Transform(Matrix3D& transform, int pividx,float frame) const override; + virtual bool Get_Visibility(int pividx,float frame) override; - bool Is_Node_Motion_Present(int pividx); - int Get_Num_Pivots() const { return NumNodes; } + bool Is_Node_Motion_Present(int pividx) override; + int Get_Num_Pivots() const override { return NumNodes; } // Methods that test the presence of a certain motion channel. - bool Has_X_Translation (int pividx); - bool Has_Y_Translation (int pividx); - bool Has_Z_Translation (int pividx); - bool Has_Rotation (int pividx); - bool Has_Visibility (int pividx); + bool Has_X_Translation (int pividx) override; + bool Has_Y_Translation (int pividx) override; + bool Has_Z_Translation (int pividx) override; + bool Has_Rotation (int pividx) override; + bool Has_Visibility (int pividx) override; NodeMotionStruct *Get_Node_Motion_Array() {return NodeMotion;} - virtual int Class_ID() const { return CLASSID_HRAWANIM; } + virtual int Class_ID() const override { return CLASSID_HRAWANIM; } private: diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h index 12033bbd1ca..f98ff446056 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h @@ -68,30 +68,30 @@ class LightClass : public RenderObjClass LightClass(LightType type = POINT); LightClass(const LightClass & src); LightClass & operator = (const LightClass &); - virtual ~LightClass(); - RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_LIGHT; } + virtual ~LightClass() override; + RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_LIGHT; } ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Rendering // Lights do not "Render" but they are vertex processors. ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo) { } + virtual void Render(RenderInfoClass & rinfo) override { } virtual bool Is_Vertex_Processor() { return true; } ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - "Scene Graph" // Lights register themselves with the scene as VertexProcessors. ///////////////////////////////////////////////////////////////////////////// - virtual void Notify_Added(SceneClass * scene); - virtual void Notify_Removed(SceneClass * scene); + virtual void Notify_Added(SceneClass * scene) override; + virtual void Notify_Removed(SceneClass * scene) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Bounding Volumes // Bounding volume of a light extends to its attenuation radius ///////////////////////////////////////////////////////////////////////////// - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // LightClass Interface @@ -146,9 +146,9 @@ class LightClass : public RenderObjClass ///////////////////////////////////////////////////////////////////////////// // Persistent object save-load interface ///////////////////////////////////////////////////////////////////////////// - virtual const PersistFactoryClass & Get_Factory () const; - virtual bool Save (ChunkSaveClass &csave); - virtual bool Load (ChunkLoadClass &cload); + virtual const PersistFactoryClass & Get_Factory () const override; + virtual bool Save (ChunkSaveClass &csave) override; + virtual bool Load (ChunkLoadClass &cload) override; //bool isDonut() {return Donut; }; //void setDonut(bool donut) { Donut = donut; }; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h index 97e91f7c311..1b2c6d5047b 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h @@ -86,7 +86,7 @@ class TextureMapperClass : public W3DMPO, public RefCountClass TextureMapperClass(unsigned int stage=0); TextureMapperClass(const TextureMapperClass & src) : Stage(src.Stage) { } - virtual ~TextureMapperClass() { } + virtual ~TextureMapperClass() override { } virtual int Mapper_ID() const { return MAPPER_ID_UNKNOWN;} @@ -119,12 +119,12 @@ class ScaleTextureMapperClass : public TextureMapperClass ScaleTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); ScaleTextureMapperClass(const ScaleTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_SCALE;} + virtual int Mapper_ID() const override { return MAPPER_ID_SCALE;} - virtual TextureMapperClass *Clone() const { return NEW_REF( ScaleTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( ScaleTextureMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual void Apply(int uv_array_index) override; + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; protected: Vector2 Scale; // Scale @@ -143,14 +143,14 @@ class LinearOffsetTextureMapperClass : public ScaleTextureMapperClass LinearOffsetTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); LinearOffsetTextureMapperClass(const LinearOffsetTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_LINEAR_OFFSET;} + virtual int Mapper_ID() const override { return MAPPER_ID_LINEAR_OFFSET;} - virtual TextureMapperClass *Clone() const { return NEW_REF( LinearOffsetTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( LinearOffsetTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } + virtual bool Is_Time_Variant() override { return true; } - virtual void Reset(); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual void Reset() override; + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; void Set_Current_UV_Offset(const Vector2 &cur) { CurrentUVOffset = cur; @@ -185,14 +185,14 @@ class GridTextureMapperClass : public TextureMapperClass GridTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); GridTextureMapperClass(const GridTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_GRID;} + virtual int Mapper_ID() const override { return MAPPER_ID_GRID;} - virtual TextureMapperClass *Clone() const { return NEW_REF( GridTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( GridTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } - virtual void Apply(int uv_array_index); - virtual void Reset(); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual bool Is_Time_Variant() override { return true; } + virtual void Apply(int uv_array_index) override; + virtual void Reset() override; + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; void Set_Frame(unsigned int frame) { CurrentFrame=frame; } void Set_Frame_Per_Second(float fps); @@ -229,13 +229,13 @@ class RotateTextureMapperClass : public ScaleTextureMapperClass RotateTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); RotateTextureMapperClass(const RotateTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_ROTATE;} + virtual int Mapper_ID() const override { return MAPPER_ID_ROTATE;} - virtual TextureMapperClass *Clone() const { return NEW_REF( RotateTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( RotateTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } - virtual void Reset(); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual bool Is_Time_Variant() override { return true; } + virtual void Reset() override; + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; private: float CurrentAngle; @@ -256,13 +256,13 @@ class SineLinearOffsetTextureMapperClass : public ScaleTextureMapperClass SineLinearOffsetTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); SineLinearOffsetTextureMapperClass(const SineLinearOffsetTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_SINE_LINEAR_OFFSET;} + virtual int Mapper_ID() const override { return MAPPER_ID_SINE_LINEAR_OFFSET;} - virtual TextureMapperClass *Clone() const { return NEW_REF( SineLinearOffsetTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( SineLinearOffsetTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } - virtual void Reset(); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual bool Is_Time_Variant() override { return true; } + virtual void Reset() override; + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; private: Vector3 UAFP; // U Coordinate Amplitude frequency phase @@ -284,13 +284,13 @@ class StepLinearOffsetTextureMapperClass : public ScaleTextureMapperClass StepLinearOffsetTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); StepLinearOffsetTextureMapperClass(const StepLinearOffsetTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_STEP_LINEAR_OFFSET;} + virtual int Mapper_ID() const override { return MAPPER_ID_STEP_LINEAR_OFFSET;} - virtual TextureMapperClass *Clone() const { return NEW_REF( StepLinearOffsetTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( StepLinearOffsetTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } - virtual void Reset(); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual bool Is_Time_Variant() override { return true; } + virtual void Reset() override; + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; private: Vector2 Step; // Size of step @@ -313,13 +313,13 @@ class ZigZagLinearOffsetTextureMapperClass : public ScaleTextureMapperClass ZigZagLinearOffsetTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); ZigZagLinearOffsetTextureMapperClass(const ZigZagLinearOffsetTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_ZIGZAG_LINEAR_OFFSET;} + virtual int Mapper_ID() const override { return MAPPER_ID_ZIGZAG_LINEAR_OFFSET;} - virtual TextureMapperClass *Clone() const { return NEW_REF( ZigZagLinearOffsetTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( ZigZagLinearOffsetTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } - virtual void Reset(); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual bool Is_Time_Variant() override { return true; } + virtual void Reset() override; + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; private: Vector2 Speed; // Speed of zigzag in units per millisecond @@ -342,11 +342,11 @@ class ClassicEnvironmentMapperClass : public TextureMapperClass public: ClassicEnvironmentMapperClass(unsigned int stage) : TextureMapperClass(stage) { } ClassicEnvironmentMapperClass(const ClassicEnvironmentMapperClass & src) : TextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_CLASSIC_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( ClassicEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual bool Needs_Normals() { return true; } - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual int Mapper_ID() const override { return MAPPER_ID_CLASSIC_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( ClassicEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual bool Needs_Normals() override { return true; } + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; }; class EnvironmentMapperClass : public TextureMapperClass @@ -355,11 +355,11 @@ class EnvironmentMapperClass : public TextureMapperClass public: EnvironmentMapperClass(unsigned int stage) : TextureMapperClass(stage) { } EnvironmentMapperClass(const EnvironmentMapperClass & src) : TextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( EnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual bool Needs_Normals() { return true; } - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual int Mapper_ID() const override { return MAPPER_ID_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( EnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual bool Needs_Normals() override { return true; } + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; }; class EdgeMapperClass : public TextureMapperClass @@ -369,13 +369,13 @@ class EdgeMapperClass : public TextureMapperClass EdgeMapperClass(unsigned int stage); EdgeMapperClass(const INIClass &ini, const char *section, unsigned int stage); EdgeMapperClass(const EdgeMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_EDGE;} - virtual TextureMapperClass* Clone() const { return NEW_REF( EdgeMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual void Reset(); - virtual bool Is_Time_Variant() { return true; } - virtual bool Needs_Normals() { return true; } - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual int Mapper_ID() const override { return MAPPER_ID_EDGE;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( EdgeMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual void Reset() override; + virtual bool Is_Time_Variant() override { return true; } + virtual bool Needs_Normals() override { return true; } + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; protected: unsigned int LastUsedSyncTime; // Sync time last used to update offset @@ -390,8 +390,8 @@ class WSEnvMapperClass : public TextureMapperClass WSEnvMapperClass(AxisType axis, unsigned int stage) : TextureMapperClass(stage), Axis(axis) { } WSEnvMapperClass(const WSEnvMapperClass & src) : TextureMapperClass(src), Axis(src.Axis) { } WSEnvMapperClass(const INIClass &ini, const char *section, unsigned int stage); - virtual bool Needs_Normals() { return true; } - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual bool Needs_Normals() override { return true; } + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; protected: AxisType Axis; }; @@ -403,9 +403,9 @@ class WSClassicEnvironmentMapperClass : public WSEnvMapperClass WSClassicEnvironmentMapperClass(AxisType axis, unsigned int stage) : WSEnvMapperClass(axis, stage) { } WSClassicEnvironmentMapperClass(const WSClassicEnvironmentMapperClass & src) : WSEnvMapperClass(src) { } WSClassicEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage) : WSEnvMapperClass(ini, section, stage) { } - virtual int Mapper_ID() const { return MAPPER_ID_WS_CLASSIC_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( WSClassicEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); + virtual int Mapper_ID() const override { return MAPPER_ID_WS_CLASSIC_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( WSClassicEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; }; class WSEnvironmentMapperClass : public WSEnvMapperClass @@ -415,9 +415,9 @@ class WSEnvironmentMapperClass : public WSEnvMapperClass WSEnvironmentMapperClass(AxisType axis, unsigned int stage) : WSEnvMapperClass(axis, stage) { } WSEnvironmentMapperClass(const WSClassicEnvironmentMapperClass & src) : WSEnvMapperClass(src) { } WSEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage) : WSEnvMapperClass(ini, section, stage) { } - virtual int Mapper_ID() const { return MAPPER_ID_WS_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( WSEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); + virtual int Mapper_ID() const override { return MAPPER_ID_WS_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( WSEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; }; class GridClassicEnvironmentMapperClass : public GridTextureMapperClass @@ -427,11 +427,11 @@ class GridClassicEnvironmentMapperClass : public GridTextureMapperClass GridClassicEnvironmentMapperClass(float fps, unsigned int gridwidth_log2, unsigned int last_frame, unsigned int offset, unsigned int stage) : GridTextureMapperClass(fps, gridwidth_log2, last_frame, offset, stage) { } GridClassicEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage) : GridTextureMapperClass(ini, section, stage) { } GridClassicEnvironmentMapperClass(const GridTextureMapperClass & src) : GridTextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_GRID_CLASSIC_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( GridClassicEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual bool Needs_Normals() { return true; } - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual int Mapper_ID() const override { return MAPPER_ID_GRID_CLASSIC_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( GridClassicEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual bool Needs_Normals() override { return true; } + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; }; class GridEnvironmentMapperClass : public GridTextureMapperClass @@ -441,11 +441,11 @@ class GridEnvironmentMapperClass : public GridTextureMapperClass GridEnvironmentMapperClass(float fps, unsigned int gridwidth_log2, unsigned int last_frame, unsigned int offset, unsigned int stage) : GridTextureMapperClass(fps, gridwidth_log2, last_frame, offset, stage) { } GridEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage) : GridTextureMapperClass(ini, section, stage) { } GridEnvironmentMapperClass(const GridTextureMapperClass & src) : GridTextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_GRID_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( GridEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual bool Needs_Normals() { return true; } - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual int Mapper_ID() const override { return MAPPER_ID_GRID_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( GridEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual bool Needs_Normals() override { return true; } + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; }; // ---------------------------------------------------------------------------- @@ -462,10 +462,10 @@ class ScreenMapperClass : public LinearOffsetTextureMapperClass const Vector2 &scale, unsigned int stage) : LinearOffsetTextureMapperClass(offset_per_sec, start_offset, clamp_fix, scale, stage) { } ScreenMapperClass(const INIClass &ini, const char *section, unsigned int stage) : LinearOffsetTextureMapperClass(ini, section, stage) { } ScreenMapperClass(const ScreenMapperClass & src) : LinearOffsetTextureMapperClass(src) { } - virtual int Mapper_ID() const { return MAPPER_ID_SCREEN;} - virtual TextureMapperClass* Clone() const { return NEW_REF( ScreenMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual int Mapper_ID() const override { return MAPPER_ID_SCREEN;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( ScreenMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; }; /** @@ -480,13 +480,13 @@ class RandomTextureMapperClass : public ScaleTextureMapperClass RandomTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage); RandomTextureMapperClass(const RandomTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_RANDOM;} + virtual int Mapper_ID() const override { return MAPPER_ID_RANDOM;} - virtual TextureMapperClass *Clone() const { return NEW_REF( RandomTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( RandomTextureMapperClass, (*this)); } - virtual bool Is_Time_Variant() { return true; } - virtual void Reset(); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual bool Is_Time_Variant() override { return true; } + virtual void Reset() override; + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; protected: void randomize(); @@ -512,11 +512,11 @@ class BumpEnvTextureMapperClass : public LinearOffsetTextureMapperClass BumpEnvTextureMapperClass(INIClass &ini, const char *section, unsigned int stage); BumpEnvTextureMapperClass(const BumpEnvTextureMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_BUMPENV;} + virtual int Mapper_ID() const override { return MAPPER_ID_BUMPENV;} - virtual TextureMapperClass *Clone() const { return NEW_REF( BumpEnvTextureMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( BumpEnvTextureMapperClass, (*this)); } - virtual void Apply(int uv_array_index); + virtual void Apply(int uv_array_index) override; protected: @@ -533,8 +533,8 @@ class GridWSEnvMapperClass : public GridTextureMapperClass GridWSEnvMapperClass(float fps, unsigned int gridwidth_log2, unsigned int last_frame, unsigned int offset, AxisType axis, unsigned int stage); GridWSEnvMapperClass(const GridWSEnvMapperClass & src); GridWSEnvMapperClass(const INIClass &ini, const char *section, unsigned int stage); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); - virtual bool Needs_Normals() { return true; } + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; + virtual bool Needs_Normals() override { return true; } protected: AxisType Axis; }; @@ -545,9 +545,9 @@ class GridWSClassicEnvironmentMapperClass : public GridWSEnvMapperClass GridWSClassicEnvironmentMapperClass(float fps, unsigned int gridwidth_log2, unsigned int last_frame, unsigned int offset, AxisType axis, unsigned int stage); GridWSClassicEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage); GridWSClassicEnvironmentMapperClass(const GridWSEnvMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_GRID_WS_CLASSIC_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( GridWSClassicEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); + virtual int Mapper_ID() const override { return MAPPER_ID_GRID_WS_CLASSIC_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( GridWSClassicEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; }; class GridWSEnvironmentMapperClass : public GridWSEnvMapperClass @@ -556,9 +556,9 @@ class GridWSEnvironmentMapperClass : public GridWSEnvMapperClass GridWSEnvironmentMapperClass(float fps, unsigned int gridwidth_log2, unsigned int last_frame, unsigned int offset, AxisType axis, unsigned int stage); GridWSEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage); GridWSEnvironmentMapperClass(const GridWSEnvMapperClass & src); - virtual int Mapper_ID() const { return MAPPER_ID_GRID_WS_ENVIRONMENT;} - virtual TextureMapperClass* Clone() const { return NEW_REF( GridWSEnvironmentMapperClass, (*this)); } - virtual void Apply(int uv_array_index); + virtual int Mapper_ID() const override { return MAPPER_ID_GRID_WS_ENVIRONMENT;} + virtual TextureMapperClass* Clone() const override { return NEW_REF( GridWSEnvironmentMapperClass, (*this)); } + virtual void Apply(int uv_array_index) override; }; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h index 50031967d14..58d0148df4c 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h @@ -94,10 +94,10 @@ class MatrixMapperClass : public TextureMapperClass void Compute_Texture_Coordinate(const Vector3 & point,Vector3 * set_stq); - TextureMapperClass* Clone() const { WWASSERT(0); return nullptr; } + TextureMapperClass* Clone() const override { WWASSERT(0); return nullptr; } - virtual void Apply(int uv_array_index); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual void Apply(int uv_array_index) override; + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; protected: @@ -126,12 +126,12 @@ class CompositeMatrixMapperClass : public MatrixMapperClass CompositeMatrixMapperClass(TextureMapperClass *internal_mapper, unsigned int stage); CompositeMatrixMapperClass(const CompositeMatrixMapperClass & src); - virtual ~CompositeMatrixMapperClass(); + virtual ~CompositeMatrixMapperClass() override; - virtual TextureMapperClass *Clone() const { return NEW_REF( CompositeMatrixMapperClass, (*this)); } + virtual TextureMapperClass *Clone() const override { return NEW_REF( CompositeMatrixMapperClass, (*this)); } - virtual void Apply(int uv_array_index); - virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix); + virtual void Apply(int uv_array_index) override; + virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix) override; protected: diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h index b1109cad995..d248a1f9a6b 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h @@ -73,51 +73,51 @@ class MeshClass : public W3DMPO, public RenderObjClass MeshClass(); MeshClass(const MeshClass & src); MeshClass & operator = (const MeshClass &); - virtual ~MeshClass(); + virtual ~MeshClass() override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_MESH; } - virtual const char * Get_Name() const; - virtual void Set_Name(const char * name); - virtual int Get_Num_Polys() const; - virtual void Render(RenderInfoClass & rinfo); + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_MESH; } + virtual const char * Get_Name() const override; + virtual void Set_Name(const char * name) override; + virtual int Get_Num_Polys() const override; + virtual void Render(RenderInfoClass & rinfo) override; void Render_Material_Pass(MaterialPassClass * pass,IndexBufferClass * ib); - virtual void Special_Render(SpecialRenderInfoClass & rinfo); + virtual void Special_Render(SpecialRenderInfoClass & rinfo) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Collision Detection ///////////////////////////////////////////////////////////////////////////// - virtual bool Cast_Ray(RayCollisionTestClass & raytest); - virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest); - virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); - virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); - virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; + virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override; + virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override; + virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest) override; + virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Bounding Volumes ///////////////////////////////////////////////////////////////////////////// - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Attributes, Options, Properties, etc ///////////////////////////////////////////////////////////////////////////// - virtual void Scale(float scale); - virtual void Scale(float scalex, float scaley, float scalez); - virtual MaterialInfoClass * Get_Material_Info(); + virtual void Scale(float scale) override; + virtual void Scale(float scalex, float scaley, float scalez) override; + virtual MaterialInfoClass * Get_Material_Info() override; - virtual int Get_Sort_Level() const; - virtual void Set_Sort_Level(int level); + virtual int Get_Sort_Level() const override; + virtual void Set_Sort_Level(int level) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Decals ///////////////////////////////////////////////////////////////////////////// - virtual void Create_Decal(DecalGeneratorClass * generator); - virtual void Delete_Decal(uint32 decal_id); + virtual void Create_Decal(DecalGeneratorClass * generator) override; + virtual void Delete_Decal(uint32 decal_id) override; ///////////////////////////////////////////////////////////////////////////// // MeshClass Interface @@ -160,9 +160,9 @@ class MeshClass : public W3DMPO, public RenderObjClass protected: - virtual void Add_Dependencies_To_List (DynamicVectorClass &file_list, bool textures_only = false); + virtual void Add_Dependencies_To_List (DynamicVectorClass &file_list, bool textures_only = false) override; - virtual void Update_Cached_Bounding_Volumes() const; + virtual void Update_Cached_Bounding_Volumes() const override; void Free(); diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp index ece1bdd7515..7455905379f 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp @@ -103,7 +103,7 @@ class FaceHasherClass : public HashCalculatorClass { public: - virtual bool Items_Match(const MeshBuilderClass::FaceClass & a, const MeshBuilderClass::FaceClass & b) + virtual bool Items_Match(const MeshBuilderClass::FaceClass & a, const MeshBuilderClass::FaceClass & b) override { // Note: if we want this to detect duplicates that are "rotated", must change // both this function and the Compute_Hash function... @@ -115,7 +115,7 @@ class FaceHasherClass : public HashCalculatorClass ); } - virtual void Compute_Hash(const MeshBuilderClass::FaceClass & item) + virtual void Compute_Hash(const MeshBuilderClass::FaceClass & item) override { HashVal = (int)(item.VertIdx[0]*12345.6f + item.VertIdx[1]*1714.38484f + item.VertIdx[2]*27561.3f)&1023; } @@ -130,7 +130,7 @@ class FaceHasherClass : public HashCalculatorClass return 1; } - virtual int Get_Hash_Value(int /*index*/) + virtual int Get_Hash_Value(int /*index*/) override { return HashVal; } diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h index e6618216a69..37db2d915c7 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h @@ -91,7 +91,7 @@ class MeshGeometryClass : public W3DMPO, public RefCountClass, public MultiListO MeshGeometryClass(); MeshGeometryClass(const MeshGeometryClass & that); - virtual ~MeshGeometryClass(); + virtual ~MeshGeometryClass() override; MeshGeometryClass & operator = (const MeshGeometryClass & that); diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h index 687ed8989fd..b472b34e3a8 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h @@ -72,7 +72,7 @@ class MeshMatDescClass : public W3DMPO MeshMatDescClass(); MeshMatDescClass(const MeshMatDescClass & that); - ~MeshMatDescClass(); + ~MeshMatDescClass() override; void Reset(int polycount,int vertcount,int passcount); MeshMatDescClass & operator = (const MeshMatDescClass & that); @@ -234,7 +234,7 @@ class MatBufferClass : public ShareBufferClass < VertexMaterialClass * > public: MatBufferClass(int count, const char* msg) : ShareBufferClass(count, msg) { Clear(); } MatBufferClass(const MatBufferClass & that); - ~MatBufferClass(); + ~MatBufferClass() override; void Set_Element(int index,VertexMaterialClass * mat); VertexMaterialClass * Get_Element(int index); @@ -256,7 +256,7 @@ class TexBufferClass : public ShareBufferClass < TextureClass * > public: TexBufferClass(int count, const char* msg) : ShareBufferClass(count, msg) { Clear(); } TexBufferClass(const TexBufferClass & that); - ~TexBufferClass(); + ~TexBufferClass() override; void Set_Element(int index,TextureClass * mat); TextureClass * Get_Element(int index); diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h index e188bb38684..c87da0408bd 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h @@ -133,7 +133,7 @@ class GapFillerClass : public W3DMPO public: GapFillerClass(MeshModelClass* mmc); GapFillerClass(const GapFillerClass& that); - ~GapFillerClass(); + ~GapFillerClass() override; WWINLINE const TriIndex* Get_Polygon_Array() const { return PolygonArray; } WWINLINE unsigned Get_Polygon_Count() const { return PolygonCount; } @@ -153,7 +153,7 @@ class MeshModelClass : public MeshGeometryClass MeshModelClass(); MeshModelClass(const MeshModelClass & that); - ~MeshModelClass(); + ~MeshModelClass() override; MeshModelClass & operator = (const MeshModelClass & that); void Reset(int polycount,int vertcount,int passcount); @@ -223,7 +223,7 @@ class MeshModelClass : public MeshGeometryClass void Make_Color_Array_Unique(int array_index=0); // Load the w3d file format - WW3DErrorType Load_W3D(ChunkLoadClass & cload); + WW3DErrorType Load_W3D(ChunkLoadClass & cload) override; ///////////////////////////////////////////////////////////////////////////////////// // Decal interface diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp index f020efa16b8..9643e68bb38 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp @@ -114,7 +114,7 @@ class MeshLoadContextClass : public W3DMPO W3DMPO_GLUE(MeshLoadContextClass) private: MeshLoadContextClass(); - ~MeshLoadContextClass(); + ~MeshLoadContextClass() override; W3dTexCoordStruct * Get_Texcoord_Array(); diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h index 25182483f71..bdc169dc186 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h @@ -64,7 +64,7 @@ class MotionChannelClass : public W3DMPO void Get_Vector(int frame,float * setvec) const; MotionChannelClass(); - ~MotionChannelClass(); + ~MotionChannelClass() override; bool Load_W3D(ChunkLoadClass & cload); WWINLINE int Get_Type() const { return Type; } @@ -159,7 +159,7 @@ class BitChannelClass : public W3DMPO public: BitChannelClass(); - ~BitChannelClass(); + ~BitChannelClass() override; bool Load_W3D(ChunkLoadClass & cload); WWINLINE int Get_Type() const { return Type; } @@ -215,7 +215,7 @@ class TimeCodedMotionChannelClass : public W3DMPO public: TimeCodedMotionChannelClass(); - ~TimeCodedMotionChannelClass(); + ~TimeCodedMotionChannelClass() override; bool Load_W3D(ChunkLoadClass & cload); int Get_Type() { return Type; } @@ -253,7 +253,7 @@ class AdaptiveDeltaMotionChannelClass : public W3DMPO public: AdaptiveDeltaMotionChannelClass(); - ~AdaptiveDeltaMotionChannelClass(); + ~AdaptiveDeltaMotionChannelClass() override; bool Load_W3D(ChunkLoadClass & cload); int Get_Type() { return Type; } @@ -302,7 +302,7 @@ class TimeCodedBitChannelClass : public W3DMPO public: TimeCodedBitChannelClass(); - ~TimeCodedBitChannelClass(); + ~TimeCodedBitChannelClass() override; bool Load_W3D(ChunkLoadClass & cload); int Get_Type() { return Type; } diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h index 31362c645fa..fcd16c43eb1 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h @@ -47,12 +47,12 @@ class Null3DObjClass : public RenderObjClass Null3DObjClass(const Null3DObjClass & src); Null3DObjClass & operator = (const Null3DObjClass & that); - virtual int Class_ID() const; - virtual RenderObjClass * Clone() const; - virtual const char * Get_Name() const { return Name; } - virtual void Render(RenderInfoClass & rinfo); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual int Class_ID() const override; + virtual RenderObjClass * Clone() const override; + virtual const char * Get_Name() const override { return Name; } + virtual void Render(RenderInfoClass & rinfo) override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; protected: @@ -67,10 +67,10 @@ class NullPrototypeClass : public W3DMPO, public PrototypeClass NullPrototypeClass(); NullPrototypeClass(const W3dNullObjectStruct &null); - virtual const char * Get_Name() const { return Definition.Name; } - virtual int Get_Class_ID() const { return RenderObjClass::CLASSID_NULL; } - virtual RenderObjClass * Create() { return NEW_REF(Null3DObjClass,(Definition.Name)); } - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name() const override { return Definition.Name; } + virtual int Get_Class_ID() const override { return RenderObjClass::CLASSID_NULL; } + virtual RenderObjClass * Create() override { return NEW_REF(Null3DObjClass,(Definition.Name)); } + virtual void DeleteSelf() override { delete this; } protected: W3dNullObjectStruct Definition; @@ -80,8 +80,8 @@ class NullPrototypeClass : public W3DMPO, public PrototypeClass class NullLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type() { return W3D_CHUNK_NULL_OBJECT; } - virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload); + virtual int Chunk_Type() override { return W3D_CHUNK_NULL_OBJECT; } + virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override; }; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h index 66f21cd5fb6..aa5f1b7900e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h @@ -94,23 +94,23 @@ class ParticleBufferClass : public RenderObjClass ParticleBufferClass(const ParticleBufferClass & src); ParticleBufferClass & operator = (const ParticleBufferClass &); - virtual ~ParticleBufferClass(); + virtual ~ParticleBufferClass() override; /* ** RenderObjClass Interface: */ - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const { return CLASSID_PARTICLEBUFFER; } + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override { return CLASSID_PARTICLEBUFFER; } - virtual int Get_Num_Polys() const; + virtual int Get_Num_Polys() const override; int Get_Particle_Count() const; // Update particle state and draw the particles. - virtual void Render(RenderInfoClass & rinfo); + virtual void Render(RenderInfoClass & rinfo) override; // Scales the size of the individual particles but doesn't affect their // position (and therefore the size of the particle system as a whole) - virtual void Scale(float scale); + virtual void Scale(float scale) override; // The particle buffer never receives a Set_Transform/Position call, // even though its bounding volume changes. Since bounding volume @@ -118,29 +118,29 @@ class ParticleBufferClass : public RenderObjClass // the cached bounding volumes will not be invalidated unless we do // it elsewhere (such as here). We also need to call the particle // emitter's Emit() function (done here to avoid order dependence). - virtual void On_Frame_Update(); + virtual void On_Frame_Update() override; - virtual void Notify_Added(SceneClass * scene); - virtual void Notify_Removed(SceneClass * scene); + virtual void Notify_Added(SceneClass * scene) override; + virtual void Notify_Removed(SceneClass * scene) override; - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface - Predictive LOD ///////////////////////////////////////////////////////////////////////////// - virtual void Prepare_LOD(CameraClass &camera); - virtual void Increment_LOD(); - virtual void Decrement_LOD(); - virtual float Get_Cost() const; - virtual float Get_Value() const; - virtual float Get_Post_Increment_Value() const; - virtual void Set_LOD_Level(int lod); - virtual int Get_LOD_Level() const; - virtual int Get_LOD_Count() const; - virtual void Set_LOD_Bias(float bias) { LodBias = MAX(bias, 0.0f); } - virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const; + virtual void Prepare_LOD(CameraClass &camera) override; + virtual void Increment_LOD() override; + virtual void Decrement_LOD() override; + virtual float Get_Cost() const override; + virtual float Get_Value() const override; + virtual float Get_Post_Increment_Value() const override; + virtual void Set_LOD_Level(int lod) override; + virtual int Get_LOD_Level() const override; + virtual int Get_LOD_Count() const override; + virtual void Set_LOD_Bias(float bias) override { LodBias = MAX(bias, 0.0f); } + virtual int Calculate_Cost_Value_Arrays(float screen_area, float *values, float *costs) const override; /* ** These members are not part of the RenderObjClass Interface: @@ -163,7 +163,7 @@ class ParticleBufferClass : public RenderObjClass void Set_Emitter(ParticleEmitterClass *emitter); // from RenderObj... - virtual bool Is_Complete() { return IsEmitterDead && !NonNewNum && !NewNum; } + virtual bool Is_Complete() override { return IsEmitterDead && !NonNewNum && !NewNum; } // This adds an uninitialized NewParticleStuct to the new particle // buffer and returns its address so the particle emitter can @@ -232,7 +232,7 @@ class ParticleBufferClass : public RenderObjClass protected: - virtual void Update_Cached_Bounding_Volumes() const; + virtual void Update_Cached_Bounding_Volumes() const override; // render the particle system as a collection of particles void Render_Particles(RenderInfoClass & rinfo); diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h index 396b0226dfa..09f97eba971 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h @@ -121,42 +121,42 @@ class ParticleEmitterClass : public RenderObjClass ParticleEmitterClass(const ParticleEmitterClass & src); ParticleEmitterClass & operator = (const ParticleEmitterClass &); - virtual ~ParticleEmitterClass(); + virtual ~ParticleEmitterClass() override; // Creation/serialization methods - virtual RenderObjClass * Clone() const; + virtual RenderObjClass * Clone() const override; static ParticleEmitterClass * Create_From_Definition (const ParticleEmitterDefClass &definition); ParticleEmitterDefClass * Build_Definition () const; WW3DErrorType Save (ChunkSaveClass &chunk_save) const; // Identification methods - virtual int Class_ID () const { return CLASSID_PARTICLEEMITTER; } - virtual const char * Get_Name () const { return NameString; } - virtual void Set_Name (const char *pname); + virtual int Class_ID () const override { return CLASSID_PARTICLEEMITTER; } + virtual const char * Get_Name () const override { return NameString; } + virtual void Set_Name (const char *pname) override; - virtual void Notify_Added(SceneClass * scene); - virtual void Notify_Removed(SceneClass * scene); + virtual void Notify_Added(SceneClass * scene) override; + virtual void Notify_Removed(SceneClass * scene) override; // Update particle state and draw the particles. - virtual void Render(RenderInfoClass & rinfo) { } - virtual void Restart(); + virtual void Render(RenderInfoClass & rinfo) override { } + virtual void Restart() override; // Scales the size of all particles and effects positions/velocities of // particles emitted after the Scale() call (but not before) - virtual void Scale(float scale); + virtual void Scale(float scale) override; // Put particle buffer in scene if this is the first time (clunky code // - hopefully can be rewritten more cleanly in future)... - virtual void On_Frame_Update(); + virtual void On_Frame_Update() override; - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const { sphere.Center.Set(0,0,0); sphere.Radius = 0; } - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const { box.Center.Set(0,0,0); box.Extent.Set(0,0,0); } - virtual void Set_Hidden(int onoff) { RenderObjClass::Set_Hidden (onoff); Update_On_Visibility (); } - virtual void Set_Visible(int onoff) { RenderObjClass::Set_Visible (onoff); Update_On_Visibility (); } - virtual void Set_Animation_Hidden(int onoff) { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibility (); } - virtual void Set_Force_Visible(int onoff) { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibility (); } + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override { sphere.Center.Set(0,0,0); sphere.Radius = 0; } + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override { box.Center.Set(0,0,0); box.Extent.Set(0,0,0); } + virtual void Set_Hidden(int onoff) override { RenderObjClass::Set_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Visible(int onoff) override { RenderObjClass::Set_Visible (onoff); Update_On_Visibility (); } + virtual void Set_Animation_Hidden(int onoff) override { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Force_Visible(int onoff) override { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibility (); } - virtual void Set_LOD_Bias(float bias) { if (Buffer) Buffer->Set_LOD_Bias(bias); } + virtual void Set_LOD_Bias(float bias) override { if (Buffer) Buffer->Set_LOD_Bias(bias); } // These are not part of the renderobject interface: @@ -208,7 +208,7 @@ class ParticleEmitterClass : public RenderObjClass void Remove_Buffer_From_Scene () { Buffer->Remove (); FirstTime = true; BufferSceneNeeded = true; } // from RenderObj... - virtual bool Is_Complete() { return IsComplete; } + virtual bool Is_Complete() override { return IsComplete; } // Auto deletion behavior controls bool Is_Remove_On_Complete_Enabled() { return RemoveOnComplete; } @@ -281,7 +281,7 @@ class ParticleEmitterClass : public RenderObjClass protected: // Used to build a list of filenames this emitter is dependent on - virtual void Add_Dependencies_To_List (DynamicVectorClass &file_list, bool textures_only = false); + virtual void Add_Dependencies_To_List (DynamicVectorClass &file_list, bool textures_only = false) override; // This method is called each time the visibility state of the emitter changes. virtual void Update_On_Visibility (); @@ -291,7 +291,7 @@ class ParticleEmitterClass : public RenderObjClass // Collision sphere is a point - emitter emits also when not visible, // so this is only important to avoid affecting the collision spheres // of hierarchy objects into which the emitter is inserted. - virtual void Update_Cached_Bounding_Volumes() const; + virtual void Update_Cached_Bounding_Volumes() const override; // Create new particles and pass them to the particle buffer. Receives // the end-of-interval quaternion and origin and interpolates between diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h index b671bef6926..ee5ee16c56e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h @@ -332,14 +332,14 @@ class ParticleEmitterPrototypeClass : public W3DMPO, public PrototypeClass // // Public methods // - virtual const char * Get_Name () const { return m_pDefinition->Get_Name(); } - virtual int Get_Class_ID () const { return RenderObjClass::CLASSID_PARTICLEEMITTER; } - virtual RenderObjClass * Create (); - virtual void DeleteSelf() { delete this; } + virtual const char * Get_Name () const override { return m_pDefinition->Get_Name(); } + virtual int Get_Class_ID () const override { return RenderObjClass::CLASSID_PARTICLEEMITTER; } + virtual RenderObjClass * Create () override; + virtual void DeleteSelf() override { delete this; } virtual ParticleEmitterDefClass * Get_Definition () const { return m_pDefinition; } protected: - virtual ~ParticleEmitterPrototypeClass () { delete m_pDefinition; } + virtual ~ParticleEmitterPrototypeClass () override { delete m_pDefinition; } protected: /////////////////////////////////////////////////////////// @@ -358,8 +358,8 @@ class ParticleEmitterLoaderClass : public PrototypeLoaderClass { public: - virtual int Chunk_Type () { return W3D_CHUNK_EMITTER; } - virtual PrototypeClass * Load_W3D (ChunkLoadClass &chunk_load); + virtual int Chunk_Type () override { return W3D_CHUNK_EMITTER; } + virtual PrototypeClass * Load_W3D (ChunkLoadClass &chunk_load) override; }; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h index a96d904cad2..efafbef9043 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h @@ -96,7 +96,7 @@ class Render2DClass : public W3DMPO W3DMPO_GLUE(Render2DClass) public: Render2DClass( TextureClass* tex = nullptr ); - virtual ~Render2DClass(); + virtual ~Render2DClass() override; virtual void Reset(); void Render(); @@ -198,9 +198,9 @@ class Render2DClass : public W3DMPO class Render2DTextClass : public Render2DClass { public: Render2DTextClass(Font3DInstanceClass *font=nullptr); - ~Render2DTextClass(); + virtual ~Render2DTextClass() override; - virtual void Reset(); + virtual void Reset() override; Font3DInstanceClass * Peek_Font() { return Font; } void Set_Font( Font3DInstanceClass *font ); diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp index f4aeaf23aed..a45afeac30f 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp @@ -96,10 +96,10 @@ enum class SimpleSceneIterator : public SceneIterator { public: - virtual void First(); - virtual void Next(); - virtual bool Is_Done(); - virtual RenderObjClass * Current_Item(); + virtual void First() override; + virtual void Next() override; + virtual bool Is_Done() override; + virtual RenderObjClass * Current_Item() override; protected: diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h index 46afcd6ab24..47a54cdc993 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h @@ -88,7 +88,7 @@ class SceneClass : public RefCountClass { public: SceneClass(); - virtual ~SceneClass(); + virtual ~SceneClass() override; /////////////////////////////////////////////////////////////////////////////////// // RTTI information. @@ -218,20 +218,20 @@ class SimpleSceneClass : public SceneClass public: SimpleSceneClass(); - virtual ~SimpleSceneClass(); + virtual ~SimpleSceneClass() override; virtual int Get_Scene_ID() { return SCENE_ID_SIMPLE; } - virtual void Add_Render_Object(RenderObjClass * obj); - virtual void Remove_Render_Object(RenderObjClass * obj); + virtual void Add_Render_Object(RenderObjClass * obj) override; + virtual void Remove_Render_Object(RenderObjClass * obj) override; virtual void Remove_All_Render_Objects(); - virtual void Register(RenderObjClass * obj,RegType for_what); - virtual void Unregister(RenderObjClass * obj,RegType for_what); + virtual void Register(RenderObjClass * obj,RegType for_what) override; + virtual void Unregister(RenderObjClass * obj,RegType for_what) override; - virtual SceneIterator * Create_Iterator(bool onlyvisible = false); - virtual void Destroy_Iterator(SceneIterator * it); + virtual SceneIterator * Create_Iterator(bool onlyvisible = false) override; + virtual void Destroy_Iterator(SceneIterator * it) override; // Set visibility status for my render objects. If not called explicitly // beforehand, will be called inside Render(). @@ -241,7 +241,7 @@ class SimpleSceneClass : public SceneClass // Point visibility - used by DazzleRenderObj when no custom handler is installed /////////////////////////////////////////////////////////////////////////////////// virtual float Compute_Point_Visibility( RenderInfoClass & rinfo, - const Vector3 & point); + const Vector3 & point) override; protected: @@ -255,6 +255,6 @@ class SimpleSceneClass : public SceneClass friend class SimpleSceneIterator; - virtual void Customized_Render(RenderInfoClass & rinfo); - virtual void Post_Render_Processing(RenderInfoClass& rinfo); + virtual void Customized_Render(RenderInfoClass & rinfo) override; + virtual void Post_Render_Processing(RenderInfoClass& rinfo) override; }; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h index afe80876628..0c8e23fda06 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h @@ -101,7 +101,7 @@ class VertexMaterialClass : public W3DMPO, public RefCountClass VertexMaterialClass(); VertexMaterialClass(const VertexMaterialClass & src); - ~VertexMaterialClass(); + ~VertexMaterialClass() override; VertexMaterialClass & operator = (const VertexMaterialClass &src); VertexMaterialClass * Clone() { VertexMaterialClass * mat = NEW_REF (VertexMaterialClass,()); *mat = *this; return mat;} diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h index 19f2f4803eb..d3ffc841580 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h @@ -64,68 +64,68 @@ class GUIEditDisplay : public Display public: GUIEditDisplay( void ); - virtual ~GUIEditDisplay( void ); + virtual ~GUIEditDisplay( void ) override; - virtual void draw( void ) { }; + virtual void draw( void ) override { }; /// draw a line on the display in pixel coordinates with the specified color virtual void drawLine( Int startX, Int startY, Int endX, Int endY, - Real lineWidth, UnsignedInt lineColor ); + Real lineWidth, UnsignedInt lineColor ) override; virtual void drawLine( Int startX, Int startY, Int endX, Int endY, - Real lineWidth, UnsignedInt lineColor1, UnsignedInt lineColor2 ) { } + Real lineWidth, UnsignedInt lineColor1, UnsignedInt lineColor2 ) override { } /// draw a rect border on the display in pixel coordinates with the specified color virtual void drawOpenRect( Int startX, Int startY, Int width, Int height, - Real lineWidth, UnsignedInt lineColor ); + Real lineWidth, UnsignedInt lineColor ) override; /// draw a filled rect on the display in pixel coords with the specified color virtual void drawFillRect( Int startX, Int startY, Int width, Int height, - UnsignedInt color ); + UnsignedInt color ) override; /// Draw a percentage of a rectangle, much like a clock - virtual void drawRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) { } - virtual void drawRemainingRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) { } + virtual void drawRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) override { } + virtual void drawRemainingRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) override { } /// draw an image fit within the screen coordinates virtual void drawImage( const Image *image, Int startX, Int startY, - Int endX, Int endY, Color color = 0xFFFFFFFF, DrawImageMode mode=DRAW_IMAGE_ALPHA); + Int endX, Int endY, Color color = 0xFFFFFFFF, DrawImageMode mode=DRAW_IMAGE_ALPHA) override; /// image clipping support - virtual void setClipRegion( IRegion2D *region ); - virtual Bool isClippingEnabled( void ); - virtual void enableClipping( Bool onoff ); + virtual void setClipRegion( IRegion2D *region ) override; + virtual Bool isClippingEnabled( void ) override; + virtual void enableClipping( Bool onoff ) override; // These are stub functions to allow compilation: /// Create a video buffer that can be used for this display - virtual VideoBuffer* createVideoBuffer( void ) { return nullptr; } + virtual VideoBuffer* createVideoBuffer( void ) override { return nullptr; } /// draw a video buffer fit within the screen coordinates - virtual void drawScaledVideoBuffer( VideoBuffer *buffer, VideoStreamInterface *stream ) { } + virtual void drawScaledVideoBuffer( VideoBuffer *buffer, VideoStreamInterface *stream ) override { } virtual void drawVideoBuffer( VideoBuffer *buffer, Int startX, Int startY, - Int endX, Int endY ) { } - virtual void takeScreenShot(void){ } - virtual void toggleMovieCapture(void) {} + Int endX, Int endY ) override { } + virtual void takeScreenShot(void) override { } + virtual void toggleMovieCapture(void) override {} // methods that we need to stub - virtual void setTimeOfDay( TimeOfDay tod ) {} + virtual void setTimeOfDay( TimeOfDay tod ) override {} virtual void createLightPulse( const Coord3D *pos, const RGBColor *color, Real innerRadius, Real attenuationWidth, - UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime ) {} - virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting) {} - void setBorderShroudLevel(UnsignedByte level){} - virtual void clearShroud() {} - virtual void preloadModelAssets( AsciiString model ) {} - virtual void preloadTextureAssets( AsciiString texture ) {} - virtual void toggleLetterBox(void) {} - virtual void enableLetterBox(Bool enable) {} + UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime ) override {} + virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting) override {} + void setBorderShroudLevel(UnsignedByte level) override {} + virtual void clearShroud() override {} + virtual void preloadModelAssets( AsciiString model ) override {} + virtual void preloadTextureAssets( AsciiString texture ) override {} + virtual void toggleLetterBox(void) override {} + virtual void enableLetterBox(Bool enable) override {} #if defined(RTS_DEBUG) virtual void dumpModelAssets(const char *path) {} #endif - virtual void doSmartAssetPurgeAndPreload(const char* usageFileName) {} + virtual void doSmartAssetPurgeAndPreload(const char* usageFileName) override {} #if defined(RTS_DEBUG) virtual void dumpAssetUsage(const char* mapname) {} #endif - virtual Real getAverageFPS(void) { return 0; } - virtual Real getCurrentFPS(void) { return 0; } - virtual Int getLastFrameDrawCalls( void ) { return 0; } + virtual Real getAverageFPS(void) override { return 0; } + virtual Real getCurrentFPS(void) override { return 0; } + virtual Int getLastFrameDrawCalls( void ) override { return 0; } protected: diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h index bb140e534ca..b83666e6f5a 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h @@ -46,16 +46,16 @@ class GUIEditWindowManager : public W3DGameWindowManager public: GUIEditWindowManager( void ); - virtual ~GUIEditWindowManager( void ); + virtual ~GUIEditWindowManager( void ) override; - virtual void init( void ); ///< initialize system + virtual void init( void ) override; ///< initialize system - virtual Int winDestroy( GameWindow *window ); ///< destroy this window + virtual Int winDestroy( GameWindow *window ) override; ///< destroy this window /// create a new window by setting up parameters and callbacks virtual GameWindow *winCreate( GameWindow *parent, UnsignedInt status, Int x, Int y, Int width, Int height, GameWinSystemFunc system, - WinInstanceData *instData = nullptr ); + WinInstanceData *instData = nullptr ) override; // ************************************************************************** // GUIEdit specific methods ************************************************* diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h index c4a76c63e17..e18d1ba3d45 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h @@ -33,10 +33,10 @@ class AutoEdgeOutTool : public Tool { public: AutoEdgeOutTool(void); - ~AutoEdgeOutTool(void); + ~AutoEdgeOutTool(void) override; public: /// Perform tool on mouse down. - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void activate(); ///< Become the current tool. + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void activate() override; ///< Become the current tool. }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BaseBuildProps.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BaseBuildProps.h index 3616de46116..bbb9a65c9ea 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BaseBuildProps.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BaseBuildProps.h @@ -41,7 +41,7 @@ class BaseBuildProps : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(BaseBuildProps) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -49,8 +49,8 @@ class BaseBuildProps : public CDialog // Generated message map functions //{{AFX_MSG(BaseBuildProps) - virtual BOOL OnInitDialog(); - virtual void OnOK(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BlendEdgeTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BlendEdgeTool.h index d3a62b21218..5aa6996ebc7 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BlendEdgeTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BlendEdgeTool.h @@ -36,11 +36,11 @@ class BlendEdgeTool : public Tool public: BlendEdgeTool(void); - ~BlendEdgeTool(void); + ~BlendEdgeTool(void) override; public: /// Perform tool on mouse down. - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BlendMaterial.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BlendMaterial.h index 0bcf63f0589..ce0f0a1b919 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BlendMaterial.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BlendMaterial.h @@ -45,10 +45,10 @@ class BlendMaterial : public COptionsPanel // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(BlendMaterial) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnOK(){return;}; ///< Modeless dialogs don't OK, so eat this for modeless. - virtual void OnCancel(){return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless. - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void OnOK() override {return;}; ///< Modeless dialogs don't OK, so eat this for modeless. + virtual void OnCancel() override {return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless. + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -56,7 +56,7 @@ class BlendMaterial : public COptionsPanel enum {MIN_TILE_SIZE=2, MAX_TILE_SIZE = 100}; // Generated message map functions //{{AFX_MSG(BlendMaterial) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BorderTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BorderTool.h index 60721052bf9..b4f881a9012 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BorderTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BorderTool.h @@ -32,17 +32,17 @@ class BorderTool : public Tool public: BorderTool(); - ~BorderTool(); + ~BorderTool() override; Int getToolID(void) {return m_toolID;} - virtual void setCursor(void); + virtual void setCursor(void) override; - virtual void activate(); - virtual void deactivate(); + virtual void activate() override; + virtual void deactivate() override; - virtual Bool followsTerrain(void) { return false; } + virtual Bool followsTerrain(void) override { return false; } - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h index 7c767c82bba..569ba394dec 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h @@ -42,7 +42,7 @@ class BrushTool : public Tool public: BrushTool(void); - ~BrushTool(void); + ~BrushTool(void) override; public: static Int getWidth(void) {return m_brushWidth;}; ///loadSides();}; static void setSelectedBuildList(BuildListInfo *pInfo); - virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial); - virtual void PopSliderChanged(const long sliderID, long theVal); - virtual void PopSliderFinished(const long sliderID, long theVal); + virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial) override; + virtual void PopSliderChanged(const long sliderID, long theVal) override; + virtual void PopSliderFinished(const long sliderID, long theVal) override; }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BuildListTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BuildListTool.h index f764a82e14d..78caf8f1f11 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BuildListTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BuildListTool.h @@ -56,7 +56,7 @@ class BuildListTool : public Tool public: BuildListTool(void); - ~BuildListTool(void); + ~BuildListTool(void) override; private: void createWindow(void); @@ -68,10 +68,10 @@ class BuildListTool : public Tool public: /// Perform tool on mouse down. - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void setCursor(void); - virtual void activate(); ///< Become the current tool. - virtual void deactivate(); ///< Become not the current tool. + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void setCursor(void) override; + virtual void activate() override; ///< Become the current tool. + virtual void deactivate() override; ///< Become not the current tool. }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/CButtonShowColor.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CButtonShowColor.h index 3685c569525..04791e9acea 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/CButtonShowColor.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CButtonShowColor.h @@ -27,7 +27,7 @@ class CButtonShowColor : public CButton const RGBColor& getColor(void) const { return m_color; } void setColor(Int color) { m_color.setFromInt(color); } void setColor(const RGBColor& color) { m_color = color; } - ~CButtonShowColor(); + ~CButtonShowColor() override; static COLORREF RGBtoBGR(Int color); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/CFixTeamOwnerDialog.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CFixTeamOwnerDialog.h index 4a119cb0800..3ae1b6788ea 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/CFixTeamOwnerDialog.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CFixTeamOwnerDialog.h @@ -33,8 +33,8 @@ class CFixTeamOwnerDialog : public CDialog Bool pickedValidTeam() { return m_pickedValidTeam; } protected: - virtual BOOL OnInitDialog(); - afx_msg void OnOK(); + virtual BOOL OnInitDialog() override; + afx_msg void OnOK() override; DECLARE_MESSAGE_MAP() protected: diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h index 697292ee83c..3ea78a7393f 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h @@ -42,7 +42,7 @@ class Undoable : public RefCountClass public: Undoable(void); - ~Undoable(void); + ~Undoable(void) override; public: virtual void Do(void)=0; ///< pure virtual. @@ -77,10 +77,10 @@ class WBDocUndoable : public Undoable WBDocUndoable(CWorldBuilderDoc *pDoc, WorldHeightMapEdit *pNewHtMap, Coord3D *pObjOffset = nullptr); // destructor. - ~WBDocUndoable(void); - virtual void Do(void); - virtual void Undo(void); - virtual void Redo(void); + ~WBDocUndoable(void) override; + virtual void Do(void) override; + virtual void Undo(void) override; + virtual void Redo(void) override; }; @@ -99,9 +99,9 @@ class AddObjectUndoable : public Undoable AddObjectUndoable(CWorldBuilderDoc *pDoc, MapObject *pObjectToAdd); // destructor. - ~AddObjectUndoable(void); - virtual void Do(void); - virtual void Undo(void); + ~AddObjectUndoable(void) override; + virtual void Do(void) override; + virtual void Undo(void) override; }; @@ -146,11 +146,11 @@ class ModifyObjectUndoable : public Undoable public: ModifyObjectUndoable(CWorldBuilderDoc *pDoc); // destructor. - ~ModifyObjectUndoable(void); + ~ModifyObjectUndoable(void) override; - virtual void Do(void); - virtual void Undo(void); - virtual void Redo(void); + virtual void Do(void) override; + virtual void Undo(void) override; + virtual void Redo(void) override; void SetOffset(Real x, Real y); void SetZOffset(Real z); @@ -188,11 +188,11 @@ class ModifyFlagsUndoable : public Undoable public: ModifyFlagsUndoable(CWorldBuilderDoc *pDoc, Int flagMask, Int flagValue); // destructor. - ~ModifyFlagsUndoable(void); + ~ModifyFlagsUndoable(void) override; - virtual void Do(void); - virtual void Undo(void); - virtual void Redo(void); + virtual void Do(void) override; + virtual void Undo(void) override; + virtual void Redo(void) override; }; @@ -205,10 +205,10 @@ class SidesListUndoable : public Undoable public: SidesListUndoable(const SidesList& newSL, CWorldBuilderDoc *pDoc); - ~SidesListUndoable(void); + ~SidesListUndoable(void) override; - virtual void Do(void); - virtual void Undo(void); + virtual void Do(void) override; + virtual void Undo(void) override; }; @@ -231,10 +231,10 @@ class DictItemUndoable : public Undoable // if you want to substitute the entire contents of the new dict, pass NAMEKEY_INVALID. DictItemUndoable(Dict **d, Dict data, NameKeyType key, Int dictsToModify = 1, CWorldBuilderDoc *pDoc = nullptr, Bool inval = false); // destructor. - ~DictItemUndoable(void); + ~DictItemUndoable(void) override; - virtual void Do(void); - virtual void Undo(void); + virtual void Do(void) override; + virtual void Undo(void) override; }; @@ -267,9 +267,9 @@ class DeleteObjectUndoable : public Undoable DeleteObjectUndoable(CWorldBuilderDoc *pDoc); // destructor. - ~DeleteObjectUndoable(void); - virtual void Do(void); - virtual void Undo(void); + ~DeleteObjectUndoable(void) override; + virtual void Do(void) override; + virtual void Undo(void) override; }; /// AddPolygonUndoable @@ -282,9 +282,9 @@ class AddPolygonUndoable : public Undoable public: AddPolygonUndoable( PolygonTrigger *pTrig); // destructor. - ~AddPolygonUndoable(void); - virtual void Do(void); - virtual void Undo(void); + ~AddPolygonUndoable(void) override; + virtual void Do(void) override; + virtual void Undo(void) override; }; /// AddPolygonPointUndoable @@ -297,9 +297,9 @@ class AddPolygonPointUndoable : public Undoable public: AddPolygonPointUndoable(PolygonTrigger *pTrig, ICoord3D pt); // destructor. - ~AddPolygonPointUndoable(void); - virtual void Do(void); - virtual void Undo(void); + ~AddPolygonPointUndoable(void) override; + virtual void Do(void) override; + virtual void Undo(void) override; }; /// ModifyPolygonPointUndoable @@ -314,9 +314,9 @@ class ModifyPolygonPointUndoable : public Undoable public: ModifyPolygonPointUndoable(PolygonTrigger *pTrig, Int ndx); // destructor. - ~ModifyPolygonPointUndoable(void); - virtual void Do(void); - virtual void Undo(void); + ~ModifyPolygonPointUndoable(void) override; + virtual void Do(void) override; + virtual void Undo(void) override; }; /// MovePolygonUndoable @@ -330,9 +330,9 @@ class MovePolygonUndoable : public Undoable public: MovePolygonUndoable(PolygonTrigger *pTrig); // destructor. - ~MovePolygonUndoable(void); - virtual void Do(void); - virtual void Undo(void); + ~MovePolygonUndoable(void) override; + virtual void Do(void) override; + virtual void Undo(void) override; void SetOffset(const ICoord3D &offset); PolygonTrigger *getTrigger(void) {return m_trigger;} @@ -349,9 +349,9 @@ class InsertPolygonPointUndoable : public Undoable public: InsertPolygonPointUndoable(PolygonTrigger *pTrig, ICoord3D pt, Int ndx); // destructor. - ~InsertPolygonPointUndoable(void); - virtual void Do(void); - virtual void Undo(void); + ~InsertPolygonPointUndoable(void) override; + virtual void Do(void) override; + virtual void Undo(void) override; }; /// DeletePolygonPointUndoable @@ -365,9 +365,9 @@ class DeletePolygonPointUndoable : public Undoable public: DeletePolygonPointUndoable(PolygonTrigger *pTrig, Int ndx); // destructor. - ~DeletePolygonPointUndoable(void); - virtual void Do(void); - virtual void Undo(void); + ~DeletePolygonPointUndoable(void) override; + virtual void Do(void) override; + virtual void Undo(void) override; }; /// DeletePolygonUndoable @@ -380,9 +380,9 @@ class DeletePolygonUndoable : public Undoable public: DeletePolygonUndoable(PolygonTrigger *pTrig); // destructor. - ~DeletePolygonUndoable(void); - virtual void Do(void); - virtual void Undo(void); + ~DeletePolygonUndoable(void) override; + virtual void Do(void) override; + virtual void Undo(void) override; }; /// MultipleUndoable @@ -397,14 +397,14 @@ class MultipleUndoable : public Undoable public: MultipleUndoable(); // destructor. - ~MultipleUndoable(void); + ~MultipleUndoable(void) override; /** Add other undoables in the order you would want them UNdone; e.g. in the reverse order you want them done * The MultipleUndoable object will then own the pointers. */ void addUndoable( Undoable * undoable ); - virtual void Do(void); - virtual void Undo(void); - virtual void Redo(void); + virtual void Do(void) override; + virtual void Undo(void) override; + virtual void Redo(void) override; }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/CameraOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CameraOptions.h index f85a49b6497..655c197b44c 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/CameraOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CameraOptions.h @@ -44,7 +44,7 @@ class CameraOptions : public CDialog, public PopupSliderOwner // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CameraOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -56,7 +56,7 @@ class CameraOptions : public CDialog, public PopupSliderOwner afx_msg void OnDropWaypointButton(); afx_msg void OnCenterOnSelectedButton(); afx_msg void OnMove(int x, int y); - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnChangePitchEdit(); afx_msg void OnShowWindow(BOOL bShow, UINT nStatus); //}}AFX_MSG @@ -75,9 +75,9 @@ class CameraOptions : public CDialog, public PopupSliderOwner public: // popup slider interface. - virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial); - virtual void PopSliderChanged(const long sliderID, long theVal); - virtual void PopSliderFinished(const long sliderID, long theVal); + virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial) override; + virtual void PopSliderChanged(const long sliderID, long theVal) override; + virtual void PopSliderFinished(const long sliderID, long theVal) override; public: void update( void ); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h index bf3fd543efe..34ececd084b 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h @@ -42,8 +42,8 @@ class CellWidth : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CellWidth) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnOK(); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void OnOK() override; //}}AFX_VIRTUAL // Implementation @@ -54,7 +54,7 @@ class CellWidth : public CDialog // Generated message map functions //{{AFX_MSG(CellWidth) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ContourOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ContourOptions.h index 707beb4ca8b..ab501fb64d2 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ContourOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ContourOptions.h @@ -48,7 +48,7 @@ class ContourOptions : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(ContourOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -56,7 +56,7 @@ class ContourOptions : public CDialog // Generated message map functions //{{AFX_MSG(ContourOptions) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar); afx_msg void OnShowContours(); //}}AFX_MSG diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h b/GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h index 77ea5426b16..02944f911f1 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h @@ -48,26 +48,26 @@ class DrawObject : public RenderObjClass DrawObject(void); DrawObject(const DrawObject & src); DrawObject & operator = (const DrawObject &); - ~DrawObject(void); + ~DrawObject(void) override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone(void) const; - virtual int Class_ID(void) const; - virtual void Render(RenderInfoClass & rinfo); + virtual RenderObjClass * Clone(void) const override; + virtual int Class_ID(void) const override; + virtual void Render(RenderInfoClass & rinfo) override; // virtual void Special_Render(SpecialRenderInfoClass & rinfo); // virtual void Set_Transform(const Matrix3D &m); // virtual void Set_Position(const Vector3 &v); //TODO: MW: do these later - only needed for collision detection - virtual Bool Cast_Ray(RayCollisionTestClass & raytest); + virtual Bool Cast_Ray(RayCollisionTestClass & raytest) override; // virtual Bool Cast_AABox(AABoxCollisionTestClass & boxtest); // virtual Bool Cast_OBBox(OBBoxCollisionTestClass & boxtest); // virtual Bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); // virtual Bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const override; // virtual int Get_Num_Polys(void) const; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditAction.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditAction.h index 7f9ca36525a..2e64f151d05 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditAction.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditAction.h @@ -45,8 +45,8 @@ class EditAction : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(EditAction) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -68,7 +68,7 @@ class EditAction : public CDialog // Generated message map functions //{{AFX_MSG(EditAction) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnSelchangeScriptActionType(); afx_msg void OnTimer(UINT nIDEvent); //}}AFX_MSG diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditCondition.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditCondition.h index d15363517cf..90da61f7733 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditCondition.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditCondition.h @@ -28,7 +28,7 @@ class SidesList; class CMyTreeCtrl : public CTreeCtrl { public: - virtual LRESULT WindowProc( UINT message, WPARAM wParam, LPARAM lParam ); + virtual LRESULT WindowProc( UINT message, WPARAM wParam, LPARAM lParam ) override; }; ///////////////////////////////////////////////////////////////////////////// @@ -51,8 +51,8 @@ class EditCondition : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(EditCondition) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -74,7 +74,7 @@ class EditCondition : public CDialog // Generated message map functions //{{AFX_MSG(EditCondition) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnSelchangeConditionType(); afx_msg void OnTimer(UINT nIDEvent); //}}AFX_MSG diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditCoordParameter.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditCoordParameter.h index c4050f7e64e..9959dd1a379 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditCoordParameter.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditCoordParameter.h @@ -43,7 +43,7 @@ friend class EditParameter; // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(EditCoordParameter) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -59,9 +59,9 @@ friend class EditParameter; // Generated message map functions //{{AFX_MSG(EditCoordParameter) - virtual BOOL OnInitDialog(); - virtual void OnOK(); - virtual void OnCancel(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; + virtual void OnCancel() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditGroup.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditGroup.h index f0297ed6726..c4cdeb5bd62 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditGroup.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditGroup.h @@ -42,7 +42,7 @@ class EditGroup : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(EditGroup) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -53,8 +53,8 @@ class EditGroup : public CDialog // Generated message map functions //{{AFX_MSG(EditGroup) - virtual void OnOK(); - virtual BOOL OnInitDialog(); + virtual void OnOK() override; + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditObjectParameter.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditObjectParameter.h index 0544cf79dec..da951f252e4 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditObjectParameter.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditObjectParameter.h @@ -43,8 +43,8 @@ friend class EditParameter; // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(EditObjectParameter) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -63,9 +63,9 @@ friend class EditParameter; // Generated message map functions //{{AFX_MSG(EditObjectParameter) - virtual BOOL OnInitDialog(); - virtual void OnOK(); - virtual void OnCancel(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; + virtual void OnCancel() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditParameter.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditParameter.h index d5143cc538a..3220d9a1862 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditParameter.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditParameter.h @@ -44,7 +44,7 @@ class EditParameter : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(EditParameter) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -119,9 +119,9 @@ class EditParameter : public CDialog //{{AFX_MSG(EditParameter) afx_msg void OnChangeEdit(); afx_msg void OnEditchangeCombo(); - virtual BOOL OnInitDialog(); - virtual void OnOK(); - virtual void OnCancel(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; + virtual void OnCancel() override; afx_msg void OnPreviewSound(); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h index ae3d28a3fd5..5fc1df77669 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h @@ -41,7 +41,7 @@ class ExportScriptsOptions : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(ExportScriptsOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -63,8 +63,8 @@ class ExportScriptsOptions : public CDialog // Generated message map functions //{{AFX_MSG(ExportScriptsOptions) - virtual void OnOK(); - virtual BOOL OnInitDialog(); + virtual void OnOK() override; + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EyedropperTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EyedropperTool.h index 90b25177a47..f5598488908 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EyedropperTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EyedropperTool.h @@ -33,10 +33,10 @@ class EyedropperTool : public Tool { public: EyedropperTool(void); - ~EyedropperTool(void); + ~EyedropperTool(void) override; public: /// Perform tool on mouse down. - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void activate(); ///< Become the current tool. + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void activate() override; ///< Become the current tool. }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherOptions.h index 196a176daba..f50ccc3a3fe 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherOptions.h @@ -50,9 +50,9 @@ class FeatherOptions : public COptionsPanel , public PopupSliderOwner // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(FeatherOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnOK(){return;}; //!< Modeless dialogs don't OK, so eat this for modeless. - virtual void OnCancel(){return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void OnOK() override {return;}; //!< Modeless dialogs don't OK, so eat this for modeless. + virtual void OnCancel() override {return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. //}}AFX_VIRTUAL // Implementation @@ -60,7 +60,7 @@ class FeatherOptions : public COptionsPanel , public PopupSliderOwner // Generated message map functions //{{AFX_MSG(FeatherOptions) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnChangeSizeEdit(); //}}AFX_MSG DECLARE_MESSAGE_MAP() @@ -83,9 +83,9 @@ class FeatherOptions : public COptionsPanel , public PopupSliderOwner public: - virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial); - virtual void PopSliderChanged(const long sliderID, long theVal); - virtual void PopSliderFinished(const long sliderID, long theVal); + virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial) override; + virtual void PopSliderChanged(const long sliderID, long theVal) override; + virtual void PopSliderFinished(const long sliderID, long theVal) override; }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherTool.h index c0617139f97..5a53adbb897 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherTool.h @@ -41,15 +41,15 @@ class FeatherTool : public Tool static Int m_radius; public: FeatherTool(void); - ~FeatherTool(void); + ~FeatherTool(void) override; static void setFeather(Int feather); static void setRate(Int rate); static void setRadius(Int Radius); public: - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual WorldHeightMapEdit *getHeightMap(void) {return m_htMapEditCopy;}; - virtual void activate(); ///< Become the current tool. + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual WorldHeightMapEdit *getHeightMap(void) override {return m_htMapEditCopy;}; + virtual void activate() override; ///< Become the current tool. }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/FenceOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/FenceOptions.h index d15832745c5..1737f167988 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/FenceOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FenceOptions.h @@ -35,7 +35,7 @@ class FenceOptions : public COptionsPanel public: FenceOptions(CWnd* pParent = nullptr); ///< standard constructor - ~FenceOptions(void); ///< standard destructor + ~FenceOptions(void) override; ///< standard destructor enum { NAME_MAX_LEN = 64 }; // Dialog Data //{{AFX_DATA(FenceOptions) @@ -48,10 +48,10 @@ class FenceOptions : public COptionsPanel // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(FenceOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnOK(){return;}; ///< Modeless dialogs don't OK, so eat this for modeless. - virtual void OnCancel(){return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless. - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void OnOK() override {return;}; ///< Modeless dialogs don't OK, so eat this for modeless. + virtual void OnCancel() override {return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless. + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -59,7 +59,7 @@ class FenceOptions : public COptionsPanel // Generated message map functions //{{AFX_MSG(FenceOptions) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnChangeFenceSpacingEdit(); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/FenceTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/FenceTool.h index 2ea16a9e358..8d455f1b1da 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/FenceTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FenceTool.h @@ -42,15 +42,15 @@ class FenceTool : public Tool public: FenceTool(void); - ~FenceTool(void); + ~FenceTool(void) override; protected: void updateMapObjectList(Coord3D downPt, Coord3D curPt, WbView* pView, CWorldBuilderDoc *pDoc, Bool checkPlayers); public: - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void activate(); ///< Become the current tool. - virtual void deactivate(); ///< Become not the current tool. + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void activate() override; ///< Become the current tool. + virtual void deactivate() override; ///< Become not the current tool. }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/FloodFillTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/FloodFillTool.h index e33be6a5766..0f11dbcef42 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/FloodFillTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FloodFillTool.h @@ -32,7 +32,7 @@ class FloodFillTool : public Tool { public: FloodFillTool(void); - ~FloodFillTool(void); + ~FloodFillTool(void) override; protected: Int m_textureClassToDraw; ///< The texture to fill with. Foreground for mousedDown, background for mouseDownRt. @@ -40,9 +40,9 @@ class FloodFillTool : public Tool static Bool m_adjustCliffTextures; public: - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void activate(); ///< Become the current tool. - virtual void setCursor(void); + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void activate() override; ///< Become the current tool. + virtual void setCursor(void) override; Bool getAdjustCliffs(void) {return m_adjustCliffTextures;} void setAdjustCliffs(Bool val) {m_adjustCliffTextures = val;} diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/GlobalLightOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/GlobalLightOptions.h index 96e9297e56e..81a4a4b0f8c 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/GlobalLightOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/GlobalLightOptions.h @@ -53,7 +53,7 @@ class GlobalLightOptions : public CDialog , public PopupSliderOwner // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(GlobalLightOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -61,7 +61,7 @@ class GlobalLightOptions : public CDialog , public PopupSliderOwner // Generated message map functions //{{AFX_MSG(GlobalLightOptions) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnShowWindow(BOOL bShow, UINT nStatus); afx_msg void OnMove(int x, int y); afx_msg void OnChangeFrontBackEdit(); @@ -73,8 +73,8 @@ class GlobalLightOptions : public CDialog , public PopupSliderOwner afx_msg void OnColorPress(); afx_msg void OnResetLights(); afx_msg void OnClose(); - virtual void OnOK(){return;}; //!< Modeless dialogs don't OK, so eat this for modeless. - virtual void OnCancel(){return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. + virtual void OnOK() override {return;}; //!< Modeless dialogs don't OK, so eat this for modeless. + virtual void OnCancel() override {return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. //}}AFX_MSG DECLARE_MESSAGE_MAP() @@ -127,9 +127,9 @@ class GlobalLightOptions : public CDialog , public PopupSliderOwner void stuffValuesIntoFields(Int lightIndex = 0); public: - virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial); - virtual void PopSliderChanged(const long sliderID, long theVal); - virtual void PopSliderFinished(const long sliderID, long theVal); + virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial) override; + virtual void PopSliderChanged(const long sliderID, long theVal) override; + virtual void PopSliderFinished(const long sliderID, long theVal) override; }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/GroveOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/GroveOptions.h index d574ccea489..2ac8dd424e7 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/GroveOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/GroveOptions.h @@ -46,10 +46,10 @@ class GroveOptions : public COptionsPanel public: GroveOptions(CWnd* pParent = nullptr); - ~GroveOptions(); + ~GroveOptions() override; void makeMain(void); - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; int getNumTrees(void); int getNumType(int type); AsciiString getTypeName(int type); @@ -69,7 +69,7 @@ class GroveOptions : public COptionsPanel afx_msg void _updateGroveMakeup(void); afx_msg void _updatePlacementAllowed(void); - virtual void OnOK(); + virtual void OnOK() override; virtual void OnClose(); DECLARE_MESSAGE_MAP() }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/GroveTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/GroveTool.h index cd69ab6ecaa..fd50c503ccf 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/GroveTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/GroveTool.h @@ -46,15 +46,15 @@ class GroveTool : public Tool void _plantGroveInBox(CPoint tl, CPoint br, WbView* pView); void addObj(Coord3D *pos, AsciiString name); - void activate(); + void activate() override; public: GroveTool(void); - ~GroveTool(void); + ~GroveTool(void) override; public: /// Perform tool on mouse down. - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/HandScrollTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/HandScrollTool.h index fa47bbfa1ce..3b1b47ce700 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/HandScrollTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/HandScrollTool.h @@ -31,7 +31,7 @@ class HandScrollTool : public Tool { public: HandScrollTool(void); - ~HandScrollTool(void); + ~HandScrollTool(void) override; protected: enum {HYSTERESIS = 3}; @@ -42,11 +42,11 @@ class HandScrollTool : public Tool public: /// Start scrolling. - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; /// Scroll. - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; /// End scroll. - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void activate(); ///< Become the current tool. - virtual Bool followsTerrain(void) {return false;}; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void activate() override; ///< Become the current tool. + virtual Bool followsTerrain(void) override {return false;}; }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ImpassableOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ImpassableOptions.h index 1b86b2aee68..c0a70433005 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ImpassableOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ImpassableOptions.h @@ -25,7 +25,7 @@ class ImpassableOptions : public CDialog public: ImpassableOptions(CWnd* pParent = nullptr, Real defaultSlope = 45.0f); - virtual ~ImpassableOptions(); + virtual ~ImpassableOptions() override; Real GetSlopeToShow() const { return m_slopeToShow; } Real GetDefaultSlope() const { return m_defaultSlopeToShow; } void SetDefaultSlopeToShow(Real slopeToShow) { m_slopeToShow = slopeToShow; } @@ -38,7 +38,7 @@ class ImpassableOptions : public CDialog Bool ValidateSlope(); // Returns TRUE if it was valid, FALSE if it had to adjust it. protected: - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnAngleChange(); afx_msg void OnPreview(); DECLARE_MESSAGE_MAP() diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/LayersList.h b/GeneralsMD/Code/Tools/WorldBuilder/include/LayersList.h index 1cfa2c943e9..47e2781e7a8 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/LayersList.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/LayersList.h @@ -87,7 +87,7 @@ class LayersList : public CDialog public: enum { IDD = IDD_LAYERSLIST }; LayersList(UINT nIDTemplate = LayersList::IDD, CWnd *parentWnd = nullptr); - virtual ~LayersList(); + virtual ~LayersList() override; void resetLayers(); void addMapObjectToLayersList(IN MapObject *objToAdd, AsciiString layerToAddTo = AsciiString(TheDefaultLayerName.c_str())); @@ -162,9 +162,9 @@ class LayersList : public CDialog void updateTreeImages(); protected: - virtual void OnOK(); - virtual void OnCancel(); - virtual BOOL OnInitDialog(); + virtual void OnOK() override; + virtual void OnCancel() override; + virtual BOOL OnInitDialog() override; afx_msg void OnBeginEditLabel(NMHDR *pNotifyStruct, LRESULT* pResult); afx_msg void OnEndEditLabel(NMHDR *pNotifyStruct, LRESULT* pResult); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/LightOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/LightOptions.h index 2436707271c..e5d5220b483 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/LightOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/LightOptions.h @@ -44,9 +44,9 @@ class LightOptions : public COptionsPanel // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(LightOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnOK(){return;}; //!< Modeless dialogs don't OK, so eat this for modeless. - virtual void OnCancel(){return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void OnOK() override {return;}; //!< Modeless dialogs don't OK, so eat this for modeless. + virtual void OnCancel() override {return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. //}}AFX_VIRTUAL // Implementation @@ -54,7 +54,7 @@ class LightOptions : public COptionsPanel // Generated message map functions //{{AFX_MSG(LightOptions) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnChangeLightEdit(); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MainFrm.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MainFrm.h index e8081da8c49..14d0c172850 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MainFrm.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MainFrm.h @@ -69,12 +69,12 @@ class CMainFrame : public CFrameWnd // Overrides // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CMainFrame) - virtual BOOL PreCreateWindow(CREATESTRUCT& cs); + virtual BOOL PreCreateWindow(CREATESTRUCT& cs) override; //}}AFX_VIRTUAL // Implementation public: - virtual ~CMainFrame(); + virtual ~CMainFrame() override; #ifdef RTS_DEBUG virtual void AssertValid() const; virtual void Dump(CDumpContext& dc) const; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MapSettings.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MapSettings.h index 73b0ddad53e..d40335d3e49 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MapSettings.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MapSettings.h @@ -41,7 +41,7 @@ class MapSettings : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(MapSettings) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -51,8 +51,8 @@ class MapSettings : public CDialog //{{AFX_MSG(MapSettings) afx_msg void OnChangeMapTimeofday(); afx_msg void OnChangeMapWeather(); - virtual BOOL OnInitDialog(); - virtual void OnOK(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; afx_msg void OnChangeMapTitle(); afx_msg void OnChangeMapCompression(); //}}AFX_MSG diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldOptions.h index 623164d30e9..573317fd2ca 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldOptions.h @@ -50,11 +50,11 @@ class MeshMoldOptions : public COptionsPanel , public PopupSliderOwner // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(MeshMoldOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnInitDialog(); - virtual void OnOK(){return;}; //!< Modeless dialogs don't OK, so eat this for modeless. - virtual void OnCancel(){return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnInitDialog() override; + virtual void OnOK() override {return;}; //!< Modeless dialogs don't OK, so eat this for modeless. + virtual void OnCancel() override {return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -103,9 +103,9 @@ class MeshMoldOptions : public COptionsPanel , public PopupSliderOwner static AsciiString getModelName(void) {if (m_staticThis) return m_staticThis->m_meshModelName; return "";}; public: //PopupSliderOwner methods. - virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial); - virtual void PopSliderChanged(const long sliderID, long theVal); - virtual void PopSliderFinished(const long sliderID, long theVal); + virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial) override; + virtual void PopSliderChanged(const long sliderID, long theVal) override; + virtual void PopSliderFinished(const long sliderID, long theVal) override; }; //{{AFX_INSERT_LOCATION}} diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldTool.h index 66ed3e1c988..bac32a4eb6b 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldTool.h @@ -42,7 +42,7 @@ class MeshMoldTool : public Tool public: MeshMoldTool(void); - ~MeshMoldTool(void); + ~MeshMoldTool(void) override; protected: static void applyMesh(CWorldBuilderDoc *pDoc); ///< Apply the mesh to copy of terrain. @@ -50,13 +50,13 @@ class MeshMoldTool : public Tool static void apply(CWorldBuilderDoc *pDoc); ///< Apply the mesh to the terrain & execute undoable. public: //Tool methods. - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual WorldHeightMapEdit *getHeightMap(void) {return m_htMapEditCopy;}; - virtual void activate(); ///< Become the current tool. - virtual void deactivate(); ///< Become the current tool. - virtual Bool followsTerrain(void) {return false;}; + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual WorldHeightMapEdit *getHeightMap(void) override {return m_htMapEditCopy;}; + virtual void activate() override; ///< Become the current tool. + virtual void deactivate() override; ///< Become the current tool. + virtual Bool followsTerrain(void) override {return false;}; public: // Methods specific to MeshMoldTool. static void updateMeshLocation(Bool changePreview); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MoundOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MoundOptions.h index 19e2aed5cc5..8a6cda92ba1 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MoundOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MoundOptions.h @@ -54,9 +54,9 @@ class MoundOptions : public COptionsPanel , public PopupSliderOwner // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(MoundOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnOK(){return;}; //!< Modeless dialogs don't OK, so eat this for modeless. - virtual void OnCancel(){return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void OnOK() override {return;}; //!< Modeless dialogs don't OK, so eat this for modeless. + virtual void OnCancel() override {return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. //}}AFX_VIRTUAL // Implementation @@ -64,7 +64,7 @@ class MoundOptions : public COptionsPanel , public PopupSliderOwner // Generated message map functions //{{AFX_MSG(MoundOptions) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnChangeFeatherEdit(); afx_msg void OnChangeSizeEdit(); afx_msg void OnChangeHeightEdit(); @@ -89,9 +89,9 @@ class MoundOptions : public COptionsPanel , public PopupSliderOwner public: - virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial); - virtual void PopSliderChanged(const long sliderID, long theVal); - virtual void PopSliderFinished(const long sliderID, long theVal); + virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial) override; + virtual void PopSliderChanged(const long sliderID, long theVal) override; + virtual void PopSliderFinished(const long sliderID, long theVal) override; }; //{{AFX_INSERT_LOCATION}} diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MoundTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MoundTool.h index 5d28cfbf99b..dbf7b88911c 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MoundTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MoundTool.h @@ -42,7 +42,7 @@ class MoundTool : public Tool public: MoundTool(void); - ~MoundTool(void); + ~MoundTool(void) override; public: static Int getMoundHeight(void) {return m_moundHeight;}; @@ -53,11 +53,11 @@ class MoundTool : public Tool static void setFeather(Int feather); public: - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual WorldHeightMapEdit *getHeightMap(void) {return m_htMapEditCopy;}; - virtual void activate(); ///< Become the current tool. + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual WorldHeightMapEdit *getHeightMap(void) override {return m_htMapEditCopy;}; + virtual void activate() override; ///< Become the current tool. }; /************************************************************************* diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MyToolbar.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MyToolbar.h index ab80c805440..a8cc0a5d37a 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MyToolbar.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MyToolbar.h @@ -33,11 +33,11 @@ class CellSizeToolBar : public CDialogBar protected: afx_msg void OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar); - virtual LRESULT WindowProc( UINT message, WPARAM wParam, LPARAM lParam ); + virtual LRESULT WindowProc( UINT message, WPARAM wParam, LPARAM lParam ) override; DECLARE_MESSAGE_MAP() public: - ~CellSizeToolBar(void); + ~CellSizeToolBar(void) override; void SetupSlider(void); static void CellSizeChanged(Int cellSize); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/NewHeightMap.h b/GeneralsMD/Code/Tools/WorldBuilder/include/NewHeightMap.h index 42fa791d437..8ecf703dee3 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/NewHeightMap.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/NewHeightMap.h @@ -57,9 +57,9 @@ class CNewHeightMap : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CNewHeightMap) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnOK(); - virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void OnOK() override; + virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL // Implementation @@ -74,7 +74,7 @@ class CNewHeightMap : public CDialog // Generated message map functions //{{AFX_MSG(CNewHeightMap) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectOptions.h index b3061ad29b4..8b8629a3cae 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectOptions.h @@ -35,7 +35,7 @@ class ObjectOptions : public COptionsPanel public: ObjectOptions(CWnd* pParent = nullptr); ///< standard constructor - ~ObjectOptions(void); ///< standard destructor + ~ObjectOptions(void) override; ///< standard destructor enum { NAME_MAX_LEN = 64 }; // Dialog Data //{{AFX_DATA(ObjectOptions) @@ -48,10 +48,10 @@ class ObjectOptions : public COptionsPanel // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(ObjectOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnOK(){return;}; ///< Modeless dialogs don't OK, so eat this for modeless. - virtual void OnCancel(){return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless. - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void OnOK() override {return;}; ///< Modeless dialogs don't OK, so eat this for modeless. + virtual void OnCancel() override {return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless. + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -59,7 +59,7 @@ class ObjectOptions : public COptionsPanel // Generated message map functions //{{AFX_MSG(ObjectOptions) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnEditchangeOwningteam(); afx_msg void OnCloseupOwningteam(); afx_msg void OnSelchangeOwningteam(); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectPreview.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectPreview.h index 70b5262e5c1..9169b23dd48 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectPreview.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectPreview.h @@ -46,7 +46,7 @@ class ObjectPreview : public CWnd // Implementation public: - virtual ~ObjectPreview(); + virtual ~ObjectPreview() override; void SetThingTemplate(const ThingTemplate *tTempl); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectTool.h index 8e58449bbab..31e7d426999 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectTool.h @@ -37,16 +37,16 @@ class ObjectTool : public Tool public: ObjectTool(void); - ~ObjectTool(void); + ~ObjectTool(void) override; public: static Real calcAngle(Coord3D downPt, Coord3D curPt, WbView* pView); public: /// Perform tool on mouse down. - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void activate(); ///< Become the current tool. - virtual void deactivate(); ///< Become not the current tool. + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void activate() override; ///< Become the current tool. + virtual void deactivate() override; ///< Become not the current tool. }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/OpenMap.h b/GeneralsMD/Code/Tools/WorldBuilder/include/OpenMap.h index 6b5452038bc..02e0c48704d 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/OpenMap.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/OpenMap.h @@ -48,7 +48,7 @@ class OpenMap : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(OpenMap) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -63,8 +63,8 @@ class OpenMap : public CDialog afx_msg void OnBrowse(); afx_msg void OnSystemMaps(); afx_msg void OnUserMaps(); - virtual void OnOK(); - virtual BOOL OnInitDialog(); + virtual void OnOK() override; + virtual BOOL OnInitDialog() override; afx_msg void OnDblclkOpenList(); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/OptionsPanel.h b/GeneralsMD/Code/Tools/WorldBuilder/include/OptionsPanel.h index 5b7847e1ace..648b9795dbe 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/OptionsPanel.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/OptionsPanel.h @@ -45,7 +45,7 @@ class COptionsPanel : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(COptionsPanel) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/PickUnitDialog.h b/GeneralsMD/Code/Tools/WorldBuilder/include/PickUnitDialog.h index adc8c759f85..319a1306052 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/PickUnitDialog.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/PickUnitDialog.h @@ -48,7 +48,7 @@ class PickUnitDialog : public CDialog public: PickUnitDialog(CWnd* pParent = nullptr); // standard constructor PickUnitDialog(UINT id, CWnd* pParent = nullptr); // standard constructor - ~PickUnitDialog(void); ///< standard destructor + ~PickUnitDialog(void) override; ///< standard destructor // Dialog Data //{{AFX_DATA(PickUnitDialog) @@ -61,8 +61,8 @@ class PickUnitDialog : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(PickUnitDialog) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -70,7 +70,7 @@ class PickUnitDialog : public CDialog // Generated message map functions //{{AFX_MSG(PickUnitDialog) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnMove(int x, int y); //}}AFX_MSG DECLARE_MESSAGE_MAP() @@ -95,7 +95,7 @@ class ReplaceUnitDialog : public PickUnitDialog // Generated message map functions //{{AFX_MSG(ReplaceUnitDialog) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/PointerTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/PointerTool.h index 4dd8dd1876f..f6ae152913b 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/PointerTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/PointerTool.h @@ -58,17 +58,17 @@ class PointerTool : public PolygonTool public: PointerTool(void); - ~PointerTool(void); + ~PointerTool(void) override; public: /// Clear the selection on activate or deactivate. - virtual void activate(); - virtual void deactivate(); + virtual void activate() override; + virtual void deactivate() override; - virtual void setCursor(void); - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); + virtual void setCursor(void) override; + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; public: static void clearSelection(void); ///< Clears the selected objects selected flags. diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/PolygonTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/PolygonTool.h index 674709b8efd..8ea5510efc8 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/PolygonTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/PolygonTool.h @@ -36,7 +36,7 @@ class PolygonTool : public Tool { public: PolygonTool(void); - ~PolygonTool(void); + ~PolygonTool(void) override; protected: Coord3D m_poly_mouseDownPt; @@ -74,10 +74,10 @@ class PolygonTool : public Tool public: /// Perform tool on mouse down. - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void setCursor(void); - virtual void activate(); ///< Become the current tool. - virtual void deactivate(); ///< Become not the current tool. + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void setCursor(void) override; + virtual void activate() override; ///< Become the current tool. + virtual void deactivate() override; ///< Become not the current tool. }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RampOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RampOptions.h index 320ac87de1a..e9993d4c427 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RampOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RampOptions.h @@ -48,7 +48,7 @@ class RampOptions : public COptionsPanel public: enum { IDD = IDD_RAMP_OPTIONS }; RampOptions(CWnd* pParent = nullptr); - virtual ~RampOptions(); + virtual ~RampOptions() override; Bool shouldApplyTheRamp(); Real getRampWidth() { return m_rampWidth; } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RampTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RampTool.h index 41f979d6458..41c55134342 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RampTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RampTool.h @@ -49,14 +49,14 @@ class RampTool : public Tool public: RampTool(); - virtual void activate(); - virtual void deactivate(); ///< Become not the current tool. + virtual void activate() override; + virtual void deactivate() override; ///< Become not the current tool. - virtual Bool followsTerrain(void); + virtual Bool followsTerrain(void) override; - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; protected: void drawFeedback(Coord3D* endPoint); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RoadOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RoadOptions.h index c1444bd9248..c562ccfd477 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RoadOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RoadOptions.h @@ -35,7 +35,7 @@ class RoadOptions : public COptionsPanel public: RoadOptions(CWnd* pParent = nullptr); ///< standard constructor - ~RoadOptions(void); ///< standard destructor + ~RoadOptions(void) override; ///< standard destructor enum { NAME_MAX_LEN = 64 }; // Dialog Data //{{AFX_DATA(RoadOptions) @@ -48,10 +48,10 @@ class RoadOptions : public COptionsPanel // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(RoadOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnOK(){return;}; ///< Modeless dialogs don't OK, so eat this for modeless. - virtual void OnCancel(){return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless. - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void OnOK() override {return;}; ///< Modeless dialogs don't OK, so eat this for modeless. + virtual void OnCancel() override {return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless. + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -59,7 +59,7 @@ class RoadOptions : public COptionsPanel // Generated message map functions //{{AFX_MSG(RoadOptions) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnTightCurve(); afx_msg void OnAngled(); afx_msg void OnBroadCurve(); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RoadTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RoadTool.h index 1bae16e13dd..ad5608710c4 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RoadTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RoadTool.h @@ -43,15 +43,15 @@ class RoadTool : public Tool public: RoadTool(void); - ~RoadTool(void); + ~RoadTool(void) override; public: static Bool snap(Coord3D *pLoc, Bool skipLast); public: /// Perform tool on mouse down. - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void activate(); ///< Become the current tool. + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void activate() override; ///< Become the current tool. }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RulerOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RulerOptions.h index dd8dde7abba..ce6e8a0ec27 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RulerOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RulerOptions.h @@ -44,9 +44,9 @@ class RulerOptions : public COptionsPanel // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(RulerOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnOK(){return;}; //!< Modeless dialogs don't OK, so eat this for modeless. - virtual void OnCancel(){return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void OnOK() override {return;}; //!< Modeless dialogs don't OK, so eat this for modeless. + virtual void OnCancel() override {return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. //}}AFX_VIRTUAL // Implementation @@ -54,7 +54,7 @@ class RulerOptions : public COptionsPanel // Generated message map functions //{{AFX_MSG(RulerOptions) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnChangeWidthEdit(); afx_msg void OnChangeCheckRuler(); //}}AFX_MSG diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RulerTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RulerTool.h index 4d0ff121ec0..dd57fc57128 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RulerTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RulerTool.h @@ -35,17 +35,17 @@ class RulerTool : public Tool public: RulerTool(void); - ~RulerTool(void); + ~RulerTool(void) override; public: /// Clear the selection on activate or deactivate. - virtual void activate(); - virtual void deactivate(); + virtual void activate() override; + virtual void deactivate() override; - virtual void setCursor(void); - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual Bool followsTerrain(void) {return false;}; + virtual void setCursor(void) override; + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual Bool followsTerrain(void) override {return false;}; static void setLength(Real length); static Bool switchType(); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/SaveMap.h b/GeneralsMD/Code/Tools/WorldBuilder/include/SaveMap.h index 11c85a6e29d..09afb838d51 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/SaveMap.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/SaveMap.h @@ -49,7 +49,7 @@ class SaveMap : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(SaveMap) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -61,13 +61,13 @@ class SaveMap : public CDialog // Generated message map functions //{{AFX_MSG(SaveMap) - virtual void OnOK(); - virtual void OnCancel(); + virtual void OnOK() override; + virtual void OnCancel() override; afx_msg void OnBrowse(); afx_msg void OnSystemMaps(); afx_msg void OnUserMaps(); afx_msg void OnSelchangeSaveList(); - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchOptions.h index 998af495aa4..b0c303e21e7 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchOptions.h @@ -47,9 +47,9 @@ class ScorchOptions : public COptionsPanel, public PopupSliderOwner // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(ScorchOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnOK(){return;}; //!< Modeless dialogs don't OK, so eat this for modeless. - virtual void OnCancel(){return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void OnOK() override {return;}; //!< Modeless dialogs don't OK, so eat this for modeless. + virtual void OnCancel() override {return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless. //}}AFX_VIRTUAL // Implementation @@ -57,7 +57,7 @@ class ScorchOptions : public COptionsPanel, public PopupSliderOwner // Generated message map functions //{{AFX_MSG(ScorchOptions) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnChangeScorchtype(); afx_msg void OnChangeSizeEdit(); //}}AFX_MSG @@ -83,9 +83,9 @@ class ScorchOptions : public COptionsPanel, public PopupSliderOwner static Scorches getScorchType(void) {return m_scorchtype;} static Real getScorchSize(void) {return m_scorchsize;} - virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial); - virtual void PopSliderChanged(const long sliderID, long theVal); - virtual void PopSliderFinished(const long sliderID, long theVal); + virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial) override; + virtual void PopSliderChanged(const long sliderID, long theVal) override; + virtual void PopSliderFinished(const long sliderID, long theVal) override; }; //{{AFX_INSERT_LOCATION}} diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchTool.h index a644cc23436..c03eeffe9c0 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchTool.h @@ -32,7 +32,7 @@ class ScorchTool : public Tool { public: ScorchTool(void); - ~ScorchTool(void); + ~ScorchTool(void) override; protected: Coord3D m_mouseDownPt; @@ -42,9 +42,9 @@ class ScorchTool : public Tool public: /// Perform tool on mouse down. - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void activate(); ///< Become the current tool. - virtual void deactivate(); ///< Become not the current tool. + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void activate() override; ///< Become the current tool. + virtual void deactivate() override; ///< Become not the current tool. }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h index 284c6412db5..58094e8bc2c 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h @@ -33,7 +33,7 @@ class ScriptActionsFalse : public CPropertyPage // Construction public: ScriptActionsFalse(); - ~ScriptActionsFalse(); + ~ScriptActionsFalse() override; // Dialog Data //{{AFX_DATA(ScriptActionsFalse) @@ -47,7 +47,7 @@ class ScriptActionsFalse : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(ScriptActionsFalse) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -67,7 +67,7 @@ class ScriptActionsFalse : public CPropertyPage protected: // Generated message map functions //{{AFX_MSG(ScriptActionsFalse) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnEditAction(); afx_msg void OnSelchangeActionList(); afx_msg void OnDblclkActionList(); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h index f10b085569b..c1f7a2764ef 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h @@ -33,7 +33,7 @@ class ScriptActionsTrue : public CPropertyPage // Construction public: ScriptActionsTrue(); - ~ScriptActionsTrue(); + ~ScriptActionsTrue() override; // Dialog Data //{{AFX_DATA(ScriptActionsTrue) @@ -47,7 +47,7 @@ class ScriptActionsTrue : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(ScriptActionsTrue) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -67,7 +67,7 @@ class ScriptActionsTrue : public CPropertyPage protected: // Generated message map functions //{{AFX_MSG(ScriptActionsTrue) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnEditAction(); afx_msg void OnSelchangeActionList(); afx_msg void OnDblclkActionList(); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptConditions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptConditions.h index 7d8d9397ee4..11fe1fdfcea 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptConditions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptConditions.h @@ -34,7 +34,7 @@ class ScriptConditionsDlg : public CPropertyPage // Construction public: ScriptConditionsDlg(); - ~ScriptConditionsDlg(); + ~ScriptConditionsDlg() override; // Dialog Data //{{AFX_DATA(ScriptConditionsDlg) @@ -48,7 +48,7 @@ class ScriptConditionsDlg : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(ScriptConditionsDlg) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -71,7 +71,7 @@ class ScriptConditionsDlg : public CPropertyPage protected: // Generated message map functions //{{AFX_MSG(ScriptConditionsDlg) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnEditCondition(); afx_msg void OnSelchangeConditionList(); afx_msg void OnDblclkConditionList(); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptDialog.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptDialog.h index b18a6d978c0..a826bdffa84 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptDialog.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptDialog.h @@ -62,7 +62,7 @@ class ScriptDialog : public CDialog // Construction public: ScriptDialog(CWnd* pParent = nullptr); // standard constructor - ~ScriptDialog(); // destructor + ~ScriptDialog() override; // destructor // Dialog Data //{{AFX_DATA(ScriptDialog) @@ -75,7 +75,7 @@ class ScriptDialog : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(ScriptDialog) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -138,7 +138,7 @@ class ScriptDialog : public CDialog // Generated message map functions //{{AFX_MSG(ScriptDialog) afx_msg void OnSelchangedScriptTree(NMHDR* pNMHDR, LRESULT* pResult); - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnNewFolder(); afx_msg void OnNewScript(); afx_msg void OnEditScript(); @@ -150,8 +150,8 @@ class ScriptDialog : public CDialog afx_msg void OnSave(); afx_msg void OnLoad(); afx_msg void OnDblclkScriptTree(NMHDR* pNMHDR, LRESULT* pResult); - virtual void OnOK(); - virtual void OnCancel(); + virtual void OnOK() override; + virtual void OnCancel() override; afx_msg void OnBegindragScriptTree(NMHDR* pNMHDR, LRESULT* pResult); afx_msg void OnScriptActivate(); afx_msg void OnMouseMove(UINT nFlags, CPoint point); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptProperties.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptProperties.h index 49d0b001ded..81873673e4d 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptProperties.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptProperties.h @@ -31,7 +31,7 @@ class ScriptProperties : public CPropertyPage // Construction public: ScriptProperties(); - ~ScriptProperties(); + ~ScriptProperties() override; // Dialog Data //{{AFX_DATA(ScriptProperties) @@ -45,9 +45,9 @@ class ScriptProperties : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(ScriptProperties) public: - virtual BOOL OnSetActive(); + virtual BOOL OnSetActive() override; protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/SelectMacrotexture.h b/GeneralsMD/Code/Tools/WorldBuilder/include/SelectMacrotexture.h index e5383b6f01b..bd21f74fa36 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/SelectMacrotexture.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/SelectMacrotexture.h @@ -41,8 +41,8 @@ class SelectMacrotexture : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(SelectMacrotexture) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL protected: @@ -54,7 +54,7 @@ class SelectMacrotexture : public CDialog // Generated message map functions //{{AFX_MSG(SelectMacrotexture) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ShadowOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ShadowOptions.h index 25aa98d8294..31743aa15d4 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ShadowOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ShadowOptions.h @@ -41,7 +41,7 @@ class ShadowOptions : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(ShadowOptions) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -60,7 +60,7 @@ class ShadowOptions : public CDialog afx_msg void OnChangeBaEdit(); afx_msg void OnChangeGaEdit(); afx_msg void OnChangeRaEdit(); - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamBehavior.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamBehavior.h index 67134dedadf..bc553f79f50 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamBehavior.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamBehavior.h @@ -41,7 +41,7 @@ class TeamBehavior : public CPropertyPage // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(TeamBehavior) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -57,7 +57,7 @@ class TeamBehavior : public CPropertyPage // Generated message map functions //{{AFX_MSG(TeamBehavior) afx_msg void OnSelchangeOnCreateScript(); - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnTransportsReturn(); afx_msg void OnAvoidThreats(); afx_msg void OnSelchangeOnEnemySighted(); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamGeneric.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamGeneric.h index a180fa298d8..c8c79ac1b61 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamGeneric.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamGeneric.h @@ -40,7 +40,7 @@ class TeamGeneric : public CPropertyPage protected: // Windows Functions - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void _scriptsToDict(); afx_msg void OnScriptAdjust(); DECLARE_MESSAGE_MAP() diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamIdentity.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamIdentity.h index 2fee1ad6b69..a1ab9376eb6 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamIdentity.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamIdentity.h @@ -43,8 +43,8 @@ class TeamIdentity : public CPropertyPage // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(TeamIdentity) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL protected: @@ -64,7 +64,7 @@ class TeamIdentity : public CPropertyPage // Generated message map functions //{{AFX_MSG(TeamIdentity) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnAiRecruitable(); afx_msg void OnAutoReinforce(); afx_msg void OnBaseDefense(); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamObjectProperties.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamObjectProperties.h index a8d80c8dc6d..e0b8e04b185 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamObjectProperties.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamObjectProperties.h @@ -36,7 +36,7 @@ class TeamObjectProperties : public CPropertyPage // Construction public: TeamObjectProperties(Dict* dictToEdit = nullptr); - ~TeamObjectProperties(); + ~TeamObjectProperties() override; // Dialog Data //{{AFX_DATA(MapObjectProps) @@ -48,8 +48,8 @@ class TeamObjectProperties : public CPropertyPage // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(TeamObjectProperties) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL // Implementation diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamReinforcement.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamReinforcement.h index bdf0bc025ae..fde0bc9de5b 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamReinforcement.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamReinforcement.h @@ -41,7 +41,7 @@ class TeamReinforcement : public CPropertyPage // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(TeamReinforcement) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -59,7 +59,7 @@ class TeamReinforcement : public CPropertyPage afx_msg void OnTransportsExit(); afx_msg void OnSelchangeVeterancy(); afx_msg void OnSelchangeWaypointCombo(); - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainMaterial.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainMaterial.h index 9e92a4032dc..c9cf45d6736 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainMaterial.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainMaterial.h @@ -45,10 +45,10 @@ class TerrainMaterial : public COptionsPanel, public PopupSliderOwner // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(TerrainMaterial) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnOK(){return;}; ///< Modeless dialogs don't OK, so eat this for modeless. - virtual void OnCancel(){return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless. - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void OnOK() override {return;}; ///< Modeless dialogs don't OK, so eat this for modeless. + virtual void OnCancel() override {return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless. + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -56,7 +56,7 @@ class TerrainMaterial : public COptionsPanel, public PopupSliderOwner enum {MIN_TILE_SIZE=2, MAX_TILE_SIZE = 100}; // Generated message map functions //{{AFX_MSG(TerrainMaterial) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnSwapTextures(); afx_msg void OnChangeSizeEdit(); afx_msg void OnImpassable(); @@ -102,9 +102,9 @@ class TerrainMaterial : public COptionsPanel, public PopupSliderOwner Bool setTerrainTreeViewSelection(HTREEITEM parent, Int selection); // Popup slider interface. - virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial); - virtual void PopSliderChanged(const long sliderID, long theVal); - virtual void PopSliderFinished(const long sliderID, long theVal); + virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial) override; + virtual void PopSliderChanged(const long sliderID, long theVal) override; + virtual void PopSliderFinished(const long sliderID, long theVal) override; }; //{{AFX_INSERT_LOCATION}} diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainModal.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainModal.h index 0154e392786..f40e639d9fd 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainModal.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainModal.h @@ -44,8 +44,8 @@ class TerrainModal : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(TerrainModal) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -53,7 +53,7 @@ class TerrainModal : public CDialog // Generated message map functions //{{AFX_MSG(TerrainModal) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainSwatches.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainSwatches.h index d7174476e61..2c9e599882b 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainSwatches.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainSwatches.h @@ -44,7 +44,7 @@ class TerrainSwatches : public CWnd // Implementation public: - virtual ~TerrainSwatches(); + virtual ~TerrainSwatches() override; // Generated message map functions protected: diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TileTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TileTool.h index c42d23e415c..76db51720f9 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TileTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TileTool.h @@ -36,14 +36,14 @@ class TileTool : public Tool public: TileTool(void); - ~TileTool(void); + ~TileTool(void) override; public: - virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); - virtual WorldHeightMapEdit *getHeightMap(void) {return m_htMapEditCopy;}; - virtual void activate(); ///< Become the current tool. + virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; + virtual WorldHeightMapEdit *getHeightMap(void) override {return m_htMapEditCopy;}; + virtual void activate() override; ///< Become the current tool. virtual Int getWidth(void) {return 1;}; }; @@ -57,12 +57,12 @@ class BigTileTool : public TileTool static Int m_currentWidth; public: - virtual void activate(); ///< Become the current tool. + virtual void activate() override; ///< Become the current tool. public: BigTileTool(void); static void setWidth(Int width) ; - virtual Int getWidth(void) {return m_currentWidth;}; + virtual Int getWidth(void) override {return m_currentWidth;}; }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WBFrameWnd.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WBFrameWnd.h index 5933bc1e9b1..37d682543f6 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WBFrameWnd.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WBFrameWnd.h @@ -42,13 +42,13 @@ class CWBFrameWnd : public CFrameWnd virtual BOOL LoadFrame(UINT nIDResource, DWORD dwDefaultStyle = WS_OVERLAPPEDWINDOW | FWS_ADDTOTITLE, CWnd* pParentWnd = nullptr, - CCreateContext* pContext = nullptr); + CCreateContext* pContext = nullptr) override; // ClassWizard generated virtual function overrides //}}AFX_VIRTUAL // Implementation protected: - virtual ~CWBFrameWnd(); + virtual ~CWBFrameWnd() override; // Generated message map functions //{{AFX_MSG(CWBFrameWnd) @@ -71,14 +71,14 @@ class CWB3dFrameWnd : public CMainFrame virtual BOOL LoadFrame(UINT nIDResource, DWORD dwDefaultStyle = WS_OVERLAPPEDWINDOW | FWS_ADDTOTITLE, CWnd* pParentWnd = nullptr, - CCreateContext* pContext = nullptr); + CCreateContext* pContext = nullptr) override; // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CWB3dFrameWnd) public: //}}AFX_VIRTUAL // Implementation protected: - virtual ~CWB3dFrameWnd(); + virtual ~CWB3dFrameWnd() override; // Generated message map functions //{{AFX_MSG(CWB3dFrameWnd) afx_msg void OnMove(int x, int y); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h index e3dba63db72..8808131fb2b 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h @@ -34,8 +34,8 @@ class WBHeightMap : public HeightMapRenderObjClass ///////////////////////////////////////////////////////////////////////////// // Render Object Interface (W3D methods) ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo); - virtual Bool Cast_Ray(RayCollisionTestClass & raytest); + virtual void Render(RenderInfoClass & rinfo) override; + virtual Bool Cast_Ray(RayCollisionTestClass & raytest) override; virtual Real getHeightMapHeight(Real x, Real y, Coord3D* normal); ///Write(pData, numBytes); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp index 3e943fc699d..56581c15dc2 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp @@ -109,7 +109,7 @@ class WBGameFileClass : public GameFileClass public: WBGameFileClass(char const *filename):GameFileClass(filename){}; - virtual char const * Set_Name(char const *filename); + virtual char const * Set_Name(char const *filename) override; }; //------------------------------------------------------------------------------------------------- @@ -136,7 +136,7 @@ char const * WBGameFileClass::Set_Name( char const *filename ) // wb only data. jba. class WB_W3DFileSystem : public W3DFileSystem { - virtual FileClass * Get_File( char const *filename ); + virtual FileClass * Get_File( char const *filename ) override; }; //------------------------------------------------------------------------------------------------- @@ -588,7 +588,7 @@ class CAboutDlg : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CAboutDlg) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp index f05cf278bd8..478d075c511 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp @@ -160,7 +160,7 @@ class MFCFileOutputStream : public OutputStream CFile *m_file; public: MFCFileOutputStream(CFile *pFile):m_file(pFile) {}; - virtual Int write(const void *pData, Int numBytes) { + virtual Int write(const void *pData, Int numBytes) override { Int numBytesWritten = 0; try { m_file->Write(pData, numBytes); @@ -184,7 +184,7 @@ class CachedMFCFileOutputStream : public OutputStream Int m_totalBytes; public: CachedMFCFileOutputStream(CFile *pFile):m_file(pFile), m_totalBytes(0) {}; - virtual Int write(const void *pData, Int numBytes) { + virtual Int write(const void *pData, Int numBytes) override { UnsignedByte *tmp = new UnsignedByte[numBytes]; memcpy(tmp, pData, numBytes); CachedChunk c; @@ -218,7 +218,7 @@ class CompressedCachedMFCFileOutputStream : public OutputStream Int m_totalBytes; public: CompressedCachedMFCFileOutputStream(CFile *pFile):m_file(pFile), m_totalBytes(0) {}; - virtual Int write(const void *pData, Int numBytes) { + virtual Int write(const void *pData, Int numBytes) override { UnsignedByte *tmp = new UnsignedByte[numBytes]; memcpy(tmp, pData, numBytes); CachedChunk c; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp index 242597a55cd..55ec77a443f 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp @@ -160,42 +160,42 @@ class PlaceholderView : public View Int m_originX, m_originY; ///< Location of top/left view corner protected: - virtual View *prependViewToList( View *list ) {return nullptr;}; ///< Prepend this view to the given list, return the new list - virtual View *getNextView( void ) { return nullptr; } ///< Return next view in the set + virtual View *prependViewToList( View *list ) override {return nullptr;}; ///< Prepend this view to the given list, return the new list + virtual View *getNextView( void ) override { return nullptr; } ///< Return next view in the set public: - virtual void init( void ){}; + virtual void init( void ) override {}; - virtual UnsignedInt getID( void ) { return 1; } + virtual UnsignedInt getID( void ) override { return 1; } - virtual Drawable *pickDrawable( const ICoord2D *screen, Bool forceAttack, PickType pickType ){return nullptr;}; ///< pick drawable given the screen pixel coords + virtual Drawable *pickDrawable( const ICoord2D *screen, Bool forceAttack, PickType pickType ) override {return nullptr;}; ///< pick drawable given the screen pixel coords /// all drawables in the 2D screen region will call the 'callback' virtual Int iterateDrawablesInRegion( IRegion2D *screenRegion, Bool (*callback)( Drawable *draw, void *userData ), - void *userData ) {return 0;}; - virtual WorldToScreenReturn worldToScreenTriReturn( const Coord3D *w, ICoord2D *s ) { return WTS_INVALID; }; ///< Transform world coordinate "w" into screen coordinate "s" - virtual void screenToTerrain( const ICoord2D *screen, Coord3D *world ) {}; ///< transform screen coord to a point on the 3D terrain - virtual void screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z ) {}; ///< transform screen point to world point at the specified world Z value + void *userData ) override {return 0;}; + virtual WorldToScreenReturn worldToScreenTriReturn( const Coord3D *w, ICoord2D *s ) override { return WTS_INVALID; }; ///< Transform world coordinate "w" into screen coordinate "s" + virtual void screenToTerrain( const ICoord2D *screen, Coord3D *world ) override {}; ///< transform screen coord to a point on the 3D terrain + virtual void screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z ) override {}; ///< transform screen point to world point at the specified world Z value virtual void getScreenCornerWorldPointsAtZ( Coord3D *topLeft, Coord3D *topRight, Coord3D *bottomRight, Coord3D *bottomLeft, - Real z ){}; + Real z ) override {}; - virtual void drawView( void ) {}; ///< Render the world visible in this view. - virtual void updateView( void ) {}; ///< Render the world visible in this view. - virtual void stepView() {}; ///< Update view for every fixed time step + virtual void drawView( void ) override {}; ///< Render the world visible in this view. + virtual void updateView( void ) override {}; ///< Render the world visible in this view. + virtual void stepView() override {}; ///< Update view for every fixed time step - virtual void setZoomLimited( Bool limit ) {} ///< limit the zoom height - virtual Bool isZoomLimited( void ) { return TRUE; } ///< get status of zoom limit + virtual void setZoomLimited( Bool limit ) override {} ///< limit the zoom height + virtual Bool isZoomLimited( void ) const override { return TRUE; } ///< get status of zoom limit - virtual void setWidth( Int width ) { m_width = width; } - virtual Int getWidth( void ) { return m_width; } - virtual void setHeight( Int height ) { m_height = height; } - virtual Int getHeight( void ) { return m_height; } - virtual void setOrigin( Int x, Int y) { m_originX=x; m_originY=y;} ///< Sets location of top-left view corner on display - virtual void getOrigin( Int *x, Int *y) { *x=m_originX; *y=m_originY;} ///< Return location of top-left view corner on display + virtual void setWidth( Int width ) override { m_width = width; } + virtual Int getWidth( void ) override { return m_width; } + virtual void setHeight( Int height ) override { m_height = height; } + virtual Int getHeight( void ) override { return m_height; } + virtual void setOrigin( Int x, Int y) override { m_originX=x; m_originY=y;} ///< Sets location of top-left view corner on display + virtual void getOrigin( Int *x, Int *y) override { *x=m_originX; *y=m_originY;} ///< Return location of top-left view corner on display - virtual void forceRedraw() { } + virtual void forceRedraw() override { } virtual Bool isDoingScriptedCamera() { return false; } virtual void stopDoingScriptedCamera() {} @@ -204,84 +204,84 @@ class PlaceholderView : public View virtual void initHeightForMap( void ) {}; ///< Init the camera height for the map at the current position. virtual void scrollBy( Coord2D *delta ){}; ///< Shift the view by the given delta virtual void moveCameraTo(const Coord3D *o, Int frames, Int shutter, - Bool orient, Real easeIn, Real easeOut) {lookAt(o);}; + Bool orient, Real easeIn, Real easeOut) override {lookAt(o);}; virtual void moveCameraAlongWaypointPath(Waypoint *way, Int frames, Int shutter, - Bool orient, Real easeIn, Real easeOut) {}; - virtual Bool isCameraMovementFinished(void) {return true;}; - virtual void resetCamera(const Coord3D *location, Int frames, Real easeIn, Real easeOut) {}; ///< Move camera to location, and reset to default angle & zoom. - virtual void rotateCamera(Real rotations, Int frames, Real easeIn, Real easeOut) {}; ///< Rotate camera about current viewpoint. - virtual void rotateCameraTowardObject(ObjectID id, Int milliseconds, Int holdMilliseconds, Real easeIn, Real easeOut) {}; ///< Rotate camera to face an object, and hold on it - virtual void cameraModFinalZoom(Real finalZoom, Real easeIn, Real easeOut){}; ///< Final zoom for current camera movement. - virtual void cameraModRollingAverage(Int framesToAverage){}; ///< Number of frames to average movement for current camera movement. - virtual void cameraModFinalTimeMultiplier(Int finalMultiplier){}; ///< Final time multiplier for current camera movement. - virtual void cameraModFinalPitch(Real finalPitch, Real easeIn, Real easeOut){}; ///< Final pitch for current camera movement. - virtual void cameraModFreezeTime(void){} ///< Freezes time during the next camera movement. - virtual void cameraModFreezeAngle(void){} ///< Freezes time during the next camera movement. - virtual void cameraModLookToward(Coord3D *pLoc){} ///< Sets a look at point during camera movement. - virtual void cameraModFinalLookToward(Coord3D *pLoc){} ///< Sets a look at point during camera movement. - virtual void cameraModFinalMoveTo(Coord3D *pLoc){ }; ///< Sets a final move to. - virtual Bool isTimeFrozen(void){ return false;} ///< Freezes time during the next camera movement. - virtual Int getTimeMultiplier(void) {return 1;}; ///< Get the time multiplier. - virtual void setTimeMultiplier(Int multiple) {}; ///< Set the time multiplier. - virtual void setDefaultView(Real pitch, Real angle, Real maxHeight) {}; - virtual void zoomCamera( Real finalZoom, Int milliseconds, Real easeIn, Real easeOut ) {}; - virtual void pitchCamera( Real finalPitch, Int milliseconds, Real easeIn, Real easeOut ) {}; - - virtual void setAngle( Real angle ){}; ///< Rotate the view around the up axis to the given angle - virtual Real getAngle( void ) { return 0; } - virtual void setPitch( Real angle ){}; ///< Rotate the view around the horizontal axis to the given angle - virtual Real getPitch( void ) { return 0; } ///< Return current camera pitch - virtual void setAngleToDefault( void ) {} ///< Set the view angle back to default - virtual void setPitchToDefault( void ) {} ///< Set the view pitch back to default + Bool orient, Real easeIn, Real easeOut) override {}; + virtual Bool isCameraMovementFinished(void) override {return true;}; + virtual void resetCamera(const Coord3D *location, Int frames, Real easeIn, Real easeOut) override {}; ///< Move camera to location, and reset to default angle & zoom. + virtual void rotateCamera(Real rotations, Int frames, Real easeIn, Real easeOut) override {}; ///< Rotate camera about current viewpoint. + virtual void rotateCameraTowardObject(ObjectID id, Int milliseconds, Int holdMilliseconds, Real easeIn, Real easeOut) override {}; ///< Rotate camera to face an object, and hold on it + virtual void cameraModFinalZoom(Real finalZoom, Real easeIn, Real easeOut) override {}; ///< Final zoom for current camera movement. + virtual void cameraModRollingAverage(Int framesToAverage) override {}; ///< Number of frames to average movement for current camera movement. + virtual void cameraModFinalTimeMultiplier(Int finalMultiplier) override {}; ///< Final time multiplier for current camera movement. + virtual void cameraModFinalPitch(Real finalPitch, Real easeIn, Real easeOut) override {}; ///< Final pitch for current camera movement. + virtual void cameraModFreezeTime(void) override {} ///< Freezes time during the next camera movement. + virtual void cameraModFreezeAngle(void) override {} ///< Freezes time during the next camera movement. + virtual void cameraModLookToward(Coord3D *pLoc) override {} ///< Sets a look at point during camera movement. + virtual void cameraModFinalLookToward(Coord3D *pLoc) override {} ///< Sets a look at point during camera movement. + virtual void cameraModFinalMoveTo(Coord3D *pLoc) override { }; ///< Sets a final move to. + virtual Bool isTimeFrozen(void) override { return false;} ///< Freezes time during the next camera movement. + virtual Int getTimeMultiplier(void) override {return 1;}; ///< Get the time multiplier. + virtual void setTimeMultiplier(Int multiple) override {}; ///< Set the time multiplier. + virtual void setDefaultView(Real pitch, Real angle, Real maxHeight) override {}; + virtual void zoomCamera( Real finalZoom, Int milliseconds, Real easeIn, Real easeOut ) override {}; + virtual void pitchCamera( Real finalPitch, Int milliseconds, Real easeIn, Real easeOut ) override {}; + + virtual void setAngle( Real angle ) override {}; ///< Rotate the view around the up axis to the given angle + virtual Real getAngle( void ) override { return 0; } + virtual void setPitch( Real angle ) override {}; ///< Rotate the view around the horizontal axis to the given angle + virtual Real getPitch( void ) override { return 0; } ///< Return current camera pitch + virtual void setAngleToDefault( void ) override {} ///< Set the view angle back to default + virtual void setPitchToDefault( void ) override {} ///< Set the view pitch back to default virtual void getPosition(Coord3D *pos) {} ///< Return camera position - virtual Real getHeightAboveGround() { return 1; } - virtual void setHeightAboveGround(Real z) { } - virtual Real getZoom() { return 1; } - virtual void setZoom(Real z) { } + virtual Real getHeightAboveGround() override { return 1; } + virtual void setHeightAboveGround(Real z) override { } + virtual Real getZoom() override { return 1; } + virtual void setZoom(Real z) override { } virtual void zoomIn( void ) { } ///< Zoom in, closer to the ground, limit to min virtual void zoomOut( void ) { } ///< Zoom out, farther away from the ground, limit to max - virtual void setZoomToDefault( void ) { } ///< Set zoom to default value + virtual void setZoomToDefault( void ) override { } ///< Set zoom to default value virtual Real getMaxZoom( void ) { return 0.0f; } - virtual void setOkToAdjustHeight( Bool val ) { } ///< Set this to adjust camera height + virtual void setOkToAdjustHeight( Bool val ) override { } ///< Set this to adjust camera height - virtual Real getTerrainHeightAtPivot() { return 0.0f; } - virtual Real getCurrentHeightAboveGround() { return 0.0f; } + virtual Real getTerrainHeightAtPivot() override { return 0.0f; } + virtual Real getCurrentHeightAboveGround() override { return 0.0f; } - virtual void getLocation ( ViewLocation *location ) {}; ///< write the view's current location in to the view location object - virtual void setLocation ( const ViewLocation *location ){}; ///< set the view's current location from to the view location object + virtual void getLocation ( ViewLocation *location ) override {}; ///< write the view's current location in to the view location object + virtual void setLocation ( const ViewLocation *location ) override {}; ///< set the view's current location from to the view location object - virtual ObjectID getCameraLock() const { return INVALID_ID; } - virtual void setCameraLock(ObjectID id) { } - virtual void snapToCameraLock( void ) { } - virtual void setSnapMode( CameraLockType lockType, Real lockDist ) { } + virtual ObjectID getCameraLock() const override { return INVALID_ID; } + virtual void setCameraLock(ObjectID id) override { } + virtual void snapToCameraLock( void ) override { } + virtual void setSnapMode( CameraLockType lockType, Real lockDist ) override { } - virtual Drawable *getCameraLockDrawable() const { return nullptr; } - virtual void setCameraLockDrawable(Drawable *drawable) { } + virtual Drawable *getCameraLockDrawable() const override { return nullptr; } + virtual void setCameraLockDrawable(Drawable *drawable) override { } - virtual void setMouseLock( Bool mouseLocked ) {} ///< lock/unlock the mouse input to the tactical view - virtual Bool isMouseLocked( void ) { return FALSE; } ///< is the mouse input locked to the tactical view? + virtual void setMouseLock( Bool mouseLocked ) override {} ///< lock/unlock the mouse input to the tactical view + virtual Bool isMouseLocked( void ) override { return FALSE; } ///< is the mouse input locked to the tactical view? - virtual void setFieldOfView( Real angle ) {}; ///< Set the horizontal field of view angle - virtual Real getFieldOfView( void ) {return 0;}; ///< Get the horizontal field of view angle + virtual void setFieldOfView( Real angle ) override {}; ///< Set the horizontal field of view angle + virtual Real getFieldOfView( void ) override {return 0;}; ///< Get the horizontal field of view angle - virtual Bool setViewFilterMode(enum FilterModes) {return FALSE;} ///