From 4930f4373e53def5bfe2288b50acd3af07b57884 Mon Sep 17 00:00:00 2001 From: Jacob Ledbetter Date: Wed, 26 Aug 2026 15:29:19 -0600 Subject: [PATCH 1/2] refactor: Apply the modernize-use-override check with clang-tidy Mark overriding methods with override and drop redundant virtual so MSVC can catch signature mismatches. VC6 still erases override through CppMacros.h. Co-authored-by: Cursor --- Core/GameEngine/Source/GameClient/FXList.cpp | 24 +-- .../Source/GameClient/GUI/IMEManager.cpp | 46 ++--- .../GameEngine/Source/GameClient/GameText.cpp | 24 +-- .../Source/GameNetwork/GameSpy/GSConfig.cpp | 42 ++--- .../GameSpy/Thread/BuddyThread.cpp | 24 +-- .../GameSpy/Thread/GameResultsThread.cpp | 26 +-- .../GameNetwork/GameSpy/Thread/PeerThread.cpp | 24 +-- .../Thread/PersistentStorageThread.cpp | 22 +-- .../GameNetwork/GameSpy/Thread/PingThread.cpp | 26 +-- .../GameEngine/Source/GameNetwork/Network.cpp | 96 +++++----- .../Source/W3DDevice/GameClient/W3DMouse.cpp | 2 +- .../W3DDevice/GameClient/W3DShaderManager.cpp | 84 ++++----- .../W3DDevice/GameClient/W3DTerrainVisual.cpp | 4 +- .../W3DDevice/GameClient/W3DTreeBuffer.cpp | 2 +- .../W3DDevice/GameClient/WorldHeightMap.cpp | 2 +- .../Source/WWVegas/WW3D2/collect.cpp | 10 +- Core/Libraries/Source/WWVegas/WW3D2/proto.cpp | 10 +- .../Source/WWVegas/WW3D2/rendobj.cpp | 6 +- .../Source/WWVegas/WW3D2/textureloader.cpp | 2 +- .../Source/WWVegas/WWDebug/wwmemlog.cpp | 2 +- Core/Tools/W3DView/ViewerScene.cpp | 8 +- Core/Tools/W3DView/W3DView.cpp | 4 +- .../GUI/GUICallbacks/Menus/DownloadMenu.cpp | 10 +- .../GUI/GUICallbacks/Menus/WOLLoginMenu.cpp | 6 +- .../GameEngine/Source/GameLogic/AI/AI.cpp | 4 +- .../Source/GameLogic/AI/AIStates.cpp | 12 +- .../GameLogic/Object/ObjectCreationList.cpp | 16 +- .../Update/AIUpdate/ChinookAIUpdate.cpp | 56 +++--- .../Object/Update/AIUpdate/DozerAIUpdate.cpp | 66 +++---- .../Object/Update/AIUpdate/JetAIUpdate.cpp | 86 ++++----- .../Update/AIUpdate/RailroadGuideAIUpdate.cpp | 2 +- .../Update/AIUpdate/SupplyTruckAIUpdate.cpp | 24 +-- .../Object/Update/AIUpdate/WorkerAIUpdate.cpp | 20 +- .../Object/Update/FireSpreadUpdate.cpp | 2 +- .../GameLogic/Object/Update/HordeUpdate.cpp | 2 +- .../Object/Update/StealthDetectorUpdate.cpp | 2 +- .../Object/Update/TensileFormationUpdate.cpp | 2 +- .../ScriptEngine/VictoryConditions.cpp | 24 +-- .../GameClient/Shadow/W3DProjectedShadow.cpp | 8 +- .../GameClient/Shadow/W3DVolumetricShadow.cpp | 8 +- .../W3DDevice/GameClient/W3DAssetManager.cpp | 8 +- .../W3DDevice/GameLogic/W3DGhostObject.cpp | 6 +- .../Source/WWVegas/WW3D2/assetmgr.cpp | 26 +-- .../Libraries/Source/WWVegas/WW3D2/dazzle.cpp | 6 +- .../Source/WWVegas/WW3D2/meshbuild.cpp | 10 +- .../Libraries/Source/WWVegas/WW3D2/scene.cpp | 8 +- .../Tools/WorldBuilder/src/ScriptDialog.cpp | 2 +- .../Tools/WorldBuilder/src/WorldBuilder.cpp | 6 +- .../WorldBuilder/src/WorldBuilderDoc.cpp | 6 +- .../Code/Tools/WorldBuilder/src/wbview3d.cpp | 156 ++++++++-------- .../GUI/GUICallbacks/Menus/DownloadMenu.cpp | 10 +- .../GUI/GUICallbacks/Menus/WOLLoginMenu.cpp | 6 +- .../GameEngine/Source/GameLogic/AI/AI.cpp | 4 +- .../Source/GameLogic/AI/AIStates.cpp | 12 +- .../GameLogic/Object/ObjectCreationList.cpp | 16 +- .../Update/AIUpdate/ChinookAIUpdate.cpp | 66 +++---- .../Object/Update/AIUpdate/DozerAIUpdate.cpp | 66 +++---- .../Object/Update/AIUpdate/JetAIUpdate.cpp | 88 ++++----- .../Update/AIUpdate/RailroadGuideAIUpdate.cpp | 2 +- .../Update/AIUpdate/SupplyTruckAIUpdate.cpp | 24 +-- .../Object/Update/AIUpdate/WorkerAIUpdate.cpp | 20 +- .../Object/Update/FireSpreadUpdate.cpp | 2 +- .../GameLogic/Object/Update/HordeUpdate.cpp | 2 +- .../Object/Update/SpectreGunshipUpdate.cpp | 2 +- .../Object/Update/StealthDetectorUpdate.cpp | 2 +- .../Object/Update/TensileFormationUpdate.cpp | 2 +- .../ScriptEngine/VictoryConditions.cpp | 24 +-- .../GameClient/Shadow/W3DProjectedShadow.cpp | 8 +- .../GameClient/Shadow/W3DVolumetricShadow.cpp | 8 +- .../W3DDevice/GameClient/W3DAssetManager.cpp | 8 +- .../W3DDevice/GameLogic/W3DGhostObject.cpp | 6 +- .../Source/WWVegas/WW3D2/assetmgr.cpp | 26 +-- .../Libraries/Source/WWVegas/WW3D2/dazzle.cpp | 6 +- .../Source/WWVegas/WW3D2/meshbuild.cpp | 10 +- .../Libraries/Source/WWVegas/WW3D2/scene.cpp | 8 +- .../Tools/WorldBuilder/src/ScriptDialog.cpp | 2 +- .../Tools/WorldBuilder/src/WorldBuilder.cpp | 6 +- .../WorldBuilder/src/WorldBuilderDoc.cpp | 6 +- .../Code/Tools/WorldBuilder/src/wbview3d.cpp | 176 +++++++++--------- GeneralsMD/Code/Tools/wdump/wdump.cpp | 4 +- 80 files changed, 848 insertions(+), 848 deletions(-) diff --git a/Core/GameEngine/Source/GameClient/FXList.cpp b/Core/GameEngine/Source/GameClient/FXList.cpp index cf6a47995a0..83908bbc2ac 100644 --- a/Core/GameEngine/Source/GameClient/FXList.cpp +++ b/Core/GameEngine/Source/GameClient/FXList.cpp @@ -95,7 +95,7 @@ class SoundFXNugget : public FXNugget public: - virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override + void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override { AudioEventRTS sound(m_soundName); @@ -107,7 +107,7 @@ class SoundFXNugget : public FXNugget TheAudio->addAudioEvent(&sound); } - virtual void doFXObj(const Object* primary, const Object* secondary = nullptr) const override + 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 override + 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 override + 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 override + 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 override + 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 override + 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 override + 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 override + 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 override + void doFXObj(const Object* primary, const Object* secondary) const override { if (primary) { @@ -695,12 +695,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 override + 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 override + void doFXObj(const Object* primary, const Object* /*secondary*/) const override { if (primary) { diff --git a/Core/GameEngine/Source/GameClient/GUI/IMEManager.cpp b/Core/GameEngine/Source/GameClient/GUI/IMEManager.cpp index 5de6d1a5c54..6922515a8ce 100644 --- a/Core/GameEngine/Source/GameClient/GUI/IMEManager.cpp +++ b/Core/GameEngine/Source/GameClient/GUI/IMEManager.cpp @@ -90,38 +90,38 @@ class IMEManager : public IMEManagerInterface public: IMEManager(); - ~IMEManager(); + ~IMEManager() override; - virtual void init(); - virtual void reset(); - virtual void update(); + void init() override; + void reset() override; + void update() override; - virtual void attach( GameWindow *window ); ///< attach IME to specified window - virtual void detach(); ///< detach IME from current window - virtual void enable(); ///< Enable IME - virtual void disable(); ///< Disable IME - virtual Bool isEnabled(); ///< Is IME enabled - virtual Bool isAttachedTo( GameWindow *window ); ///< Is the manager attached toa window - virtual GameWindow* getWindow(); ///< Returns the window we are currently attached to - virtual Bool isComposing(); ///< Manager is currently composing new input string - virtual void getCompositionString( UnicodeString &string ); ///< Return the current composition string - virtual Int getCompositionCursorPosition(); ///< Returns the composition cursor position - virtual Int getIndexBase(); ///< Get index base for candidate list + void attach( GameWindow *window ) override; ///< attach IME to specified window + void detach() override; ///< detach IME from current window + void enable() override; ///< Enable IME + void disable() override; ///< Disable IME + Bool isEnabled() override; ///< Is IME enabled + Bool isAttachedTo( GameWindow *window ) override; ///< Is the manager attached toa window + GameWindow* getWindow() override; ///< Returns the window we are currently attached to + Bool isComposing() override; ///< Manager is currently composing new input string + void getCompositionString( UnicodeString &string ) override; ///< Return the current composition string + Int getCompositionCursorPosition() override; ///< Returns the composition cursor position + Int getIndexBase() override; ///< Get index base for candidate list - virtual Int getCandidateCount(); ///< Returns the total number of candidates - virtual const UnicodeString* getCandidate( Int index ); ///< Returns the candidate string - virtual Int getSelectedCandidateIndex(); ///< Returns the indexed of the currently selected candidate - virtual Int getCandidatePageSize(); ///< Returns the page size for the candidates list - virtual Int getCandidatePageStart(); ///< Returns the index of the first visibel candidate + Int getCandidateCount() override; ///< Returns the total number of candidates + const UnicodeString* getCandidate( Int index ) override; ///< Returns the candidate string + Int getSelectedCandidateIndex() override; ///< Returns the indexed of the currently selected candidate + Int getCandidatePageSize() override; ///< Returns the page size for the candidates list + Int getCandidatePageStart() override; ///< Returns the index of the first visibel candidate /// Checks for and services IME messages. Returns TRUE if message serviced - virtual Bool serviceIMEMessage( void *windowsHandle, + Bool serviceIMEMessage( void *windowsHandle, UnsignedInt message, Int wParam, - Int lParam ); - virtual Int result(); ///< result return value of last serviced IME message + Int lParam ) override; + Int result() override; ///< result return value of last serviced IME message protected: diff --git a/Core/GameEngine/Source/GameClient/GameText.cpp b/Core/GameEngine/Source/GameClient/GameText.cpp index ca4afba1d0e..951c9247af2 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() override; + ~GameTextManager() override; - virtual void init() override; ///< Initializes the text system + void init() override; ///< Initializes the text system virtual void deinit(); ///< Shuts down the text system - virtual void update() override {}; ///< update text manager - virtual void reset() override; ///< Resets the text system + void update() override {}; ///< update text manager + void reset() override; ///< Resets the text system - 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; + UnicodeString fetch( const Char *label, Bool *exists = nullptr ) override; ///< Returns the associated labeled unicode text + UnicodeString fetch( AsciiString label, Bool *exists = nullptr ) override; ///< Returns the associated labeled unicode text + UnicodeString fetchFormat( const Char *label, ... ) override; + UnicodeString fetchOrSubstitute( const Char *label, const WideChar *substituteText ) override; + UnicodeString fetchOrSubstituteFormat( const Char *label, const WideChar *substituteFormat, ... ) override; + UnicodeString fetchOrSubstituteFormatVA( const Char *label, const WideChar *substituteFormat, va_list args ) override; - virtual AsciiStringVec& getStringsWithLabelPrefix(AsciiString label) override; + AsciiStringVec& getStringsWithLabelPrefix(AsciiString label) override; - virtual void initMapStringFile( const AsciiString& filename ) override; + 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 4514c35a379..367a630d600 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 ); - virtual ~GameSpyConfig() override {} + ~GameSpyConfig() override {} // Pings - virtual std::list getPingServers() override { return m_pingServers; } - virtual Int getNumPingRepetitions() override { return m_pingReps; } - virtual Int getPingTimeoutInMs() override { return m_pingTimeout; } - virtual Int getPingCutoffGood() override { return m_pingCutoffGood; } - virtual Int getPingCutoffBad() override { return m_pingCutoffBad; } + std::list getPingServers() override { return m_pingServers; } + Int getNumPingRepetitions() override { return m_pingReps; } + Int getPingTimeoutInMs() override { return m_pingTimeout; } + Int getPingCutoffGood() override { return m_pingCutoffGood; } + Int getPingCutoffBad() override { return m_pingCutoffBad; } // QM - virtual std::list getQMMaps() override { return m_qmMaps; } - virtual Int getQMBotID() override { return m_qmBotID; } - virtual Int getQMChannel() override { return m_qmChannel; } - virtual void setQMChannel(Int channel) override { 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 - virtual Int getPointsForRank(Int rank) override; - virtual Bool isPlayerVIP(Int id) override; + Int getPointsForRank(Int rank) override; + Bool isPlayerVIP(Int id) override; - virtual Bool getManglerLocation(Int index, AsciiString& host, UnsignedShort& port) override; + Bool getManglerLocation(Int index, AsciiString& host, UnsignedShort& port) override; // Ladder / Any other external parsing - virtual AsciiString getLeftoverConfig() override { return m_leftoverConfig; } + AsciiString getLeftoverConfig() override { return m_leftoverConfig; } // NAT Timeouts - 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; } + Int getTimeBetweenRetries() override { return m_natRetryInterval; } + Int getMaxManglerRetries() override { return m_natMaxManglerRetries; } + time_t getRetryInterval() override { return m_natManglerRetryInterval; } + time_t getKeepaliveInterval() override { return m_natKeepaliveInterval; } + time_t getPortTimeout() override { return m_natPortTimeout; } + time_t getRoundTimeout() override { return m_natRoundTimeout; } // Custom match - virtual Bool restrictGamesToLobby() override { return m_restrictGamesToLobby; } + 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 fb8f1b88d08..7b3628bdb92 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() override; + ~GameSpyBuddyMessageQueue() override; GameSpyBuddyMessageQueue(); - virtual void startThread() override; - virtual void endThread() override; - virtual Bool isThreadRunning() override; - virtual Bool isConnected() override; - virtual Bool isConnecting() override; + void startThread() override; + void endThread() override; + Bool isThreadRunning() override; + Bool isConnected() override; + Bool isConnecting() override; - virtual void addRequest( const BuddyRequest& req ) override; - virtual Bool getRequest( BuddyRequest& req ) override; + void addRequest( const BuddyRequest& req ) override; + Bool getRequest( BuddyRequest& req ) override; - virtual void addResponse( const BuddyResponse& resp ) override; - virtual Bool getResponse( BuddyResponse& resp ) override; + void addResponse( const BuddyResponse& resp ) override; + Bool getResponse( BuddyResponse& resp ) override; - virtual GPProfile getLocalProfileID() override; + 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; } - virtual void Thread_Function() override; + 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 161db067202..011dd00ade7 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() override; + ~GameResultsQueue() override; GameResultsQueue(); - virtual void init() override {} - virtual void reset() override {} - virtual void update() override {} + void init() override {} + void reset() override {} + void update() override {} - virtual void startThreads() override; - virtual void endThreads() override; - virtual Bool areThreadsRunning() override; + void startThreads() override; + void endThreads() override; + Bool areThreadsRunning() override; - virtual void addRequest( const GameResultsRequest& req ) override; - virtual Bool getRequest( GameResultsRequest& resp ) override; + void addRequest( const GameResultsRequest& req ) override; + Bool getRequest( GameResultsRequest& resp ) override; - virtual void addResponse( const GameResultsResponse& resp ) override; - virtual Bool getResponse( GameResultsResponse& resp ) override; + void addResponse( const GameResultsResponse& resp ) override; + Bool getResponse( GameResultsResponse& resp ) override; - virtual Bool areGameResultsBeingSent() override; + Bool areGameResultsBeingSent() override; private: MutexClass m_requestMutex; @@ -92,7 +92,7 @@ class GameResultsThreadClass : public ThreadClass public: GameResultsThreadClass() : ThreadClass() {} - virtual void Thread_Function() override; + 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 178a1b1ad3c..1b08d17bcbc 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() override; + ~GameSpyPeerMessageQueue() override; GameSpyPeerMessageQueue(); - virtual void startThread() override; - virtual void endThread() override; - virtual Bool isThreadRunning() override; - virtual Bool isConnected() override; - virtual Bool isConnecting() override; + void startThread() override; + void endThread() override; + Bool isThreadRunning() override; + Bool isConnected() override; + Bool isConnecting() override; - virtual void addRequest( const PeerRequest& req ) override; - virtual Bool getRequest( PeerRequest& req ) override; + void addRequest( const PeerRequest& req ) override; + Bool getRequest( PeerRequest& req ) override; - virtual void addResponse( const PeerResponse& resp ) override; - virtual Bool getResponse( PeerResponse& resp ) override; + void addResponse( const PeerResponse& resp ) override; + Bool getResponse( PeerResponse& resp ) override; - virtual SerialAuthResult getSerialAuthResult() override { return m_serialAuth; } + SerialAuthResult getSerialAuthResult() override { return m_serialAuth; } void setSerialAuthResult( SerialAuthResult result ) { m_serialAuth = result; } PeerThreadClass* getThread(); @@ -206,7 +206,7 @@ class PeerThreadClass : public ThreadClass } } - virtual void Thread_Function() override; + 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 5636a1069dd..924585abc44 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() override; + ~GameSpyPSMessageQueue() override; GameSpyPSMessageQueue(); - virtual void startThread() override; - virtual void endThread() override; - virtual Bool isThreadRunning() override; + void startThread() override; + void endThread() override; + Bool isThreadRunning() override; - virtual void addRequest( const PSRequest& req ) override; - virtual Bool getRequest( PSRequest& req ) override; + void addRequest( const PSRequest& req ) override; + Bool getRequest( PSRequest& req ) override; - virtual void addResponse( const PSResponse& resp ) override; - virtual Bool getResponse( PSResponse& resp ) override; + void addResponse( const PSResponse& resp ) override; + Bool getResponse( PSResponse& resp ) override; - virtual void trackPlayerStats( PSPlayerStats stats ) override; - virtual PSPlayerStats findPlayerStatsByID( Int id ) override; + void trackPlayerStats( PSPlayerStats stats ) override; + PSPlayerStats findPlayerStatsByID( Int id ) override; PSThreadClass* getThread(); @@ -431,7 +431,7 @@ class PSThreadClass : public ThreadClass m_opCount = 0; } - virtual void Thread_Function() override; + 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 6040a0e2415..243f9177155 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() override; + ~Pinger() override; Pinger(); - virtual void startThreads() override; - virtual void endThreads() override; - virtual Bool areThreadsRunning() override; + void startThreads() override; + void endThreads() override; + Bool areThreadsRunning() override; - virtual void addRequest( const PingRequest& req ) override; - virtual Bool getRequest( PingRequest& resp ) override; + void addRequest( const PingRequest& req ) override; + Bool getRequest( PingRequest& resp ) override; - virtual void addResponse( const PingResponse& resp ) override; - virtual Bool getResponse( PingResponse& resp ) override; + void addResponse( const PingResponse& resp ) override; + Bool getResponse( PingResponse& resp ) override; - virtual Bool arePingsInProgress() override; - virtual Int getPing( AsciiString hostname ) override; + Bool arePingsInProgress() override; + Int getPing( AsciiString hostname ) override; - virtual void clearPingMap() override; - virtual AsciiString getPingString( Int timeout ) override; + void clearPingMap() override; + AsciiString getPingString( Int timeout ) override; private: MutexClass m_requestMutex; @@ -94,7 +94,7 @@ class PingThreadClass : public ThreadClass public: PingThreadClass() : ThreadClass() {} - virtual void Thread_Function() override; + 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 0a63bc02557..cca4a888076 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(); - virtual ~Network() override; - virtual void init() override; ///< Initialize or re-initialize the instance - virtual void reset() override; ///< Reinitialize the network - virtual void update() override; ///< Process command list - virtual void liteupdate() override; ///< 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 - virtual void setLocalAddress(UnsignedInt ip, UnsignedInt port) override; - virtual UnsignedInt getRunAhead() override { return m_runAhead; } - virtual UnsignedInt getFrameRate() override { return m_frameRate; } - virtual UnsignedInt getPacketArrivalCushion() override; ///< Returns the smallest packet arrival cushion since this was last called. - virtual Bool isFrameDataReady() override; - virtual Bool isStalling() override; - virtual void parseUserList( const GameInfo *game ) override; - virtual void startGame() override; ///< 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; + Bool isStalling() override; + void parseUserList( const GameInfo *game ) override; + void startGame() override; ///< Sets the network game frame counter to -1 - virtual void sendChat(UnicodeString text, Int playerMask) override; - virtual void sendDisconnectChat(UnicodeString text) override; + void sendChat(UnicodeString text, Int playerMask) override; + void sendDisconnectChat(UnicodeString text) override; - virtual void sendFile(AsciiString path, UnsignedByte playerMask, UnsignedShort commandID) override; - virtual UnsignedShort sendFileAnnounce(AsciiString path, UnsignedByte playerMask) override; - virtual Int getFileTransferProgress(Int playerID, AsciiString path) override; - virtual Bool areAllQueuesEmpty() override; + 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; - virtual void quitGame() override; - virtual void selfDestructPlayer(Int index) override; + void quitGame() override; + void selfDestructPlayer(Int index) override; - virtual void voteForPlayerDisconnect(Int slot) override; - virtual Bool isPacketRouter() override; + void voteForPlayerDisconnect(Int slot) override; + Bool isPacketRouter() override; // Bandwidth metrics - virtual Real getIncomingBytesPerSecond() override; - virtual Real getIncomingPacketsPerSecond() override; - virtual Real getOutgoingBytesPerSecond() override; - virtual Real getOutgoingPacketsPerSecond() override; - virtual Real getUnknownBytesPerSecond() override; - virtual Real getUnknownPacketsPerSecond() override; + Real getIncomingBytesPerSecond() override; + Real getIncomingPacketsPerSecond() override; + Real getOutgoingBytesPerSecond() override; + Real getOutgoingPacketsPerSecond() override; + Real getUnknownBytesPerSecond() override; + Real getUnknownPacketsPerSecond() override; // Multiplayer Load Progress Functions - virtual void updateLoadProgress( Int percent ) override; - virtual void loadProgressComplete() override; - virtual void sendTimeOutGameStart() override; + 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 - virtual UnsignedInt getLocalPlayerID() override; - virtual UnicodeString getPlayerName(Int playerNum) override; - virtual Int getNumPlayers() override; + UnsignedInt getLocalPlayerID() override; + UnicodeString getPlayerName(Int playerNum) override; + Int getNumPlayers() override; - virtual Int getAverageFPS() override { return m_conMgr->getAverageFPS(); } - virtual Int getSlotAverageFPS(Int slot) override; + Int getAverageFPS() override { return m_conMgr->getAverageFPS(); } + Int getSlotAverageFPS(Int slot) override; - virtual void attachTransport(Transport *transport) override; - virtual void initTransport() override; + void attachTransport(Transport *transport) override; + void initTransport() override; - virtual void setSawCRCMismatch() override; - virtual Bool sawCRCMismatch() override { return m_sawCRCMismatch; } - virtual Bool isPlayerConnected( Int playerID ) override; + void setSawCRCMismatch() override; + Bool sawCRCMismatch() override { return m_sawCRCMismatch; } + Bool isPlayerConnected( Int playerID ) override; - 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. + void notifyOthersOfCurrentFrame() override; ///< Tells all the other players what frame we are on. + void notifyOthersOfNewFrame(UnsignedInt frame) override; ///< Tells all the other players that we are on a new frame. - virtual Int getExecutionFrame() override; ///< Returns the next valid frame for simultaneous command execution. + Int getExecutionFrame() override; ///< Returns the next valid frame for simultaneous command execution. // For disconnect blame assignment - virtual UnsignedInt getPingFrame() override; - virtual Int getPingsSent() override; - virtual Int getPingsReceived() override; + UnsignedInt getPingFrame() override; + Int getPingsSent() override; + Int getPingsReceived() override; protected: void GetCommandsFromCommandList(); ///< Remove commands from TheCommandList and put them on the Network command list. diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp index 814bb83cce5..dd62b49011c 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() {} - virtual void Thread_Function() override; + void Thread_Function() override; } thread; diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp index e55fee5bde9..1271ed4ee90 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 a8d883e560d..30d095aeabf 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) override { + Int read(void *pData, Int numBytes) override { return(m_file->read(pData, numBytes)); }; }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp b/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp index de9f20afc2b..0f003fc5b41 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp @@ -123,15 +123,15 @@ class CollectionPrototypeClass : public PrototypeClass public: CollectionPrototypeClass(CollectionDefClass * def) { ColDef = def; WWASSERT(ColDef); } - 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; } + const char * Get_Name() const override { return ColDef->Get_Name(); } + int Get_Class_ID() const override { return RenderObjClass::CLASSID_COLLECTION; } + RenderObjClass * Create() override { return NEW_REF( CollectionClass, (*ColDef)); } + void DeleteSelf() override { delete this; } CollectionDefClass * ColDef; protected: - virtual ~CollectionPrototypeClass() override { delete ColDef; } + ~CollectionPrototypeClass() override { delete ColDef; } }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp b/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp index d8ef8aa5cd6..2bb1285a15f 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp @@ -92,15 +92,15 @@ class HModelPrototypeClass : public PrototypeClass public: HModelPrototypeClass(HModelDefClass * def) { HModelDef = def; assert(HModelDef); } - 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; } + const char * Get_Name() const override { return HModelDef->Get_Name(); } + int Get_Class_ID() const override { return RenderObjClass::CLASSID_HLOD; } + RenderObjClass * Create() override { return NEW_REF( HLodClass, (*HModelDef) ); } + void DeleteSelf() override { delete this; } HModelDefClass * HModelDef; protected: - virtual ~HModelPrototypeClass() override { delete HModelDef; } + ~HModelPrototypeClass() override { delete HModelDef; } }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp index 47954075d76..0de33206c35 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp @@ -1192,9 +1192,9 @@ void RenderObjClass::Add_Dependencies_To_List class RenderObjPersistFactoryClass : public PersistFactoryClass { - virtual uint32 Chunk_ID() const override; - virtual PersistClass * Load(ChunkLoadClass & cload) const override; - virtual void Save(ChunkSaveClass & csave,PersistClass * obj) const override; + uint32 Chunk_ID() const override; + PersistClass * Load(ChunkLoadClass & cload) const override; + void Save(ChunkSaveClass & csave,PersistClass * obj) const override; enum { diff --git a/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp index 4626a7d8fa9..6bf89d6bc18 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 - virtual void Thread_Function() override; + void Thread_Function() override; } _TextureLoadThread; diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.cpp b/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.cpp index 81f13b97e38..b5df8595aaa 100644 --- a/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.cpp +++ b/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.cpp @@ -162,7 +162,7 @@ class ActiveCategoryStackClass : public VectorClass // 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 - virtual ~ActiveCategoryStackClass() override { 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/Tools/W3DView/ViewerScene.cpp b/Core/Tools/W3DView/ViewerScene.cpp index ae9486a097d..b923c2c7846 100644 --- a/Core/Tools/W3DView/ViewerScene.cpp +++ b/Core/Tools/W3DView/ViewerScene.cpp @@ -53,10 +53,10 @@ class ViewerSceneIterator : public SceneIterator { public: - virtual void First(); - virtual void Next(); - virtual bool Is_Done(); - virtual RenderObjClass * Current_Item(); + void First() override; + void Next() override; + bool Is_Done() override; + RenderObjClass * Current_Item() override; protected: diff --git a/Core/Tools/W3DView/W3DView.cpp b/Core/Tools/W3DView/W3DView.cpp index 552740b4937..f50351a5a0a 100644 --- a/Core/Tools/W3DView/W3DView.cpp +++ b/Core/Tools/W3DView/W3DView.cpp @@ -275,13 +275,13 @@ class CAboutDlg : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CAboutDlg) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation protected: //{{AFX_MSG(CAboutDlg) - virtual BOOL OnInitDialog(); + BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() }; 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 497bcd95ede..d915da59f56 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 ) 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; + HRESULT OnError( Int error ) override; + HRESULT OnEnd() override; + HRESULT OnProgressUpdate( Int bytesread, Int totalsize, Int timetaken, Int timeleft ) override; + HRESULT OnStatusUpdate( Int status ) override; + 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 6edaba07101..c06a452d98f 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() override; + ~GameSpyLoginPreferences() override; Bool loadFromIniFile(); - virtual Bool load(AsciiString fname) override; - virtual Bool write() override; + Bool load(AsciiString fname) override; + 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 ad9493ccf4f..567d5128bea 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp @@ -519,7 +519,7 @@ class PartitionFilterLiveMapEnemies : public PartitionFilter public: PartitionFilterLiveMapEnemies(const Object *obj) : m_obj(obj) { } - virtual Bool allow(Object *objOther) override + Bool allow(Object *objOther) override { // this is way fast (bit test) so do it first. if (objOther->isEffectivelyDead()) @@ -549,7 +549,7 @@ class PartitionFilterWithinAttackRange : public PartitionFilter public: PartitionFilterWithinAttackRange(const Object* obj) : m_obj(obj) { } - virtual Bool allow(Object* objOther) override + 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 385ae65a089..eb9e40d5658 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp @@ -1913,9 +1913,9 @@ class AIAttackMoveStateMachine : public StateMachine protected: // snapshot interface - virtual void crc( Xfer *xfer ) override; - virtual void xfer( Xfer *xfer ) override; - virtual void loadPostProcess() override; + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; }; // ------------------------------------------------------------------------------------------------ @@ -5542,9 +5542,9 @@ class AIAttackThenIdleStateMachine : public StateMachine AIAttackThenIdleStateMachine( Object *owner, AsciiString name ); protected: // snapshot interface . - virtual void crc( Xfer *xfer ) override; - virtual void xfer( Xfer *xfer ) override; - virtual void loadPostProcess() override; + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; }; // ------------------------------------------------------------------------------------------------ diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp index a894d9331a2..1f045f59cfc 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 override + 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 override + 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 override + 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 override + 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 override + 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 override + 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 override + 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 override + 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 bf77558102c..7229505ef5c 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 ) override {}; - virtual void xfer( Xfer *xfer ) override {}; - virtual void loadPostProcess() override {}; + void crc( Xfer *xfer ) override {}; + void xfer( Xfer *xfer ) override {}; + void loadPostProcess() override {}; public: ChinookEvacuateState( StateMachine *machine ) : State( machine, "ChinookEvacuateState" ) { } - virtual StateReturnType onEnter() override + StateReturnType onEnter() override { Object* obj = getMachineOwner(); if( obj->getContain() ) @@ -127,7 +127,7 @@ class ChinookEvacuateState : public State return STATE_SUCCESS; } - virtual StateReturnType update() override + 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 ) override {}; - virtual void xfer( Xfer *xfer ) override {}; - virtual void loadPostProcess() override {}; + void crc( Xfer *xfer ) override {}; + void xfer( Xfer *xfer ) override {}; + void loadPostProcess() override {}; public: ChinookHeadOffMapState( StateMachine *machine ) : State( machine, "ChinookHeadOffMapState" ) {} - virtual StateReturnType onEnter() override // Give move order out of town + 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; } - virtual StateReturnType update() override + StateReturnType update() override { Object *owner = getMachineOwner(); @@ -197,12 +197,12 @@ class ChinookTakeoffOrLandingState : public State protected: // snapshot interface - virtual void crc( Xfer *xfer ) override + void crc( Xfer *xfer ) override { // empty } - virtual void xfer( Xfer *xfer ) override + void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -213,7 +213,7 @@ class ChinookTakeoffOrLandingState : public State xfer->xferBool(&m_landing); } - virtual void loadPostProcess() override + void loadPostProcess() override { // empty } @@ -224,7 +224,7 @@ class ChinookTakeoffOrLandingState : public State m_destLoc.zero(); } - virtual StateReturnType onEnter() override + 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() override + 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 ) override + 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 ) override + void crc( Xfer *xfer ) override { // empty } - virtual void xfer( Xfer *xfer ) override + void xfer( Xfer *xfer ) override { // version const XferVersion currentVersion = 2; @@ -467,7 +467,7 @@ class ChinookCombatDropState : public State } } - virtual void loadPostProcess() override + 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() override + StateReturnType onEnter() override { Object* obj = getMachineOwner(); Drawable* draw = obj->getDrawable(); @@ -547,7 +547,7 @@ class ChinookCombatDropState : public State } // -------------- - virtual StateReturnType update() override + StateReturnType update() override { Object* obj = getMachineOwner(); ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface(); @@ -639,7 +639,7 @@ class ChinookCombatDropState : public State } // -------------- - virtual void onExit( StateExitType status ) override + 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 ) override + void crc( Xfer *xfer ) override { // empty } - virtual void xfer( Xfer *xfer ) override + void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -714,7 +714,7 @@ class ChinookMoveToBldgState : public AIMoveToState xfer->xferReal(&m_destZ); } - virtual void loadPostProcess() override + void loadPostProcess() override { // empty } @@ -722,7 +722,7 @@ class ChinookMoveToBldgState : public AIMoveToState public: ChinookMoveToBldgState( StateMachine *machine ): AIMoveToState( machine ) { } - virtual StateReturnType onEnter() override + 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() override + StateReturnType update() override { Object* obj = getMachineOwner(); @@ -767,7 +767,7 @@ class ChinookMoveToBldgState : public AIMoveToState return status; } - virtual void onExit( StateExitType status ) override + 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 c5a3eb001f2..803ea8fd2a2 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() override; + StateReturnType update() override; protected: // snapshot interface - virtual void crc( Xfer *xfer ) override; - virtual void xfer( Xfer *xfer ) override; - virtual void loadPostProcess() override; + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + 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() override; + StateReturnType update() override; protected: // snapshot interface - virtual void crc( Xfer *xfer ) override; - virtual void xfer( Xfer *xfer ) override; - virtual void loadPostProcess() override; + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; protected: @@ -386,15 +386,15 @@ class DozerActionDoActionState : public State m_task = task; m_enterFrame = 0; } - virtual StateReturnType update() override; - virtual StateReturnType onEnter() override; - virtual void onExit( StateExitType status ) override { } + StateReturnType update() override; + StateReturnType onEnter() override; + void onExit( StateExitType status ) override { } protected: // snapshot interface - virtual void crc( Xfer *xfer ) override; - virtual void xfer( Xfer *xfer ) override; - virtual void loadPostProcess() override; + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; protected: @@ -792,9 +792,9 @@ class DozerActionStateMachine : public StateMachine protected: // snapshot interface - virtual void crc( Xfer *xfer ) override; - virtual void xfer( Xfer *xfer ) override; - virtual void loadPostProcess() override; + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; protected: @@ -982,15 +982,15 @@ class DozerPrimaryIdleState : public State m_idlePlayerNumber = 0; m_isMarkedAsIdle = FALSE; } - virtual StateReturnType update() override; - virtual StateReturnType onEnter() override; - virtual void onExit( StateExitType status ) override; + StateReturnType update() override; + StateReturnType onEnter() override; + void onExit( StateExitType status ) override; protected: // snapshot interface - virtual void crc( Xfer *xfer ) override; - virtual void xfer( Xfer *xfer ) override; - virtual void loadPostProcess() override; + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; protected: @@ -1169,16 +1169,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() override { return m_actionMachine->updateStateMachine(); } + StateReturnType update() override { return m_actionMachine->updateStateMachine(); } - virtual StateReturnType onEnter() override; - virtual void onExit( StateExitType status ) override; + StateReturnType onEnter() override; + void onExit( StateExitType status ) override; protected: // snapshot interface - virtual void crc( Xfer *xfer ) override; - virtual void xfer( Xfer *xfer ) override; - virtual void loadPostProcess() override; + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; protected: @@ -1268,14 +1268,14 @@ class DozerPrimaryGoingHomeState : public State protected: // snapshot interface STUBBED no member vars - virtual void crc( Xfer *xfer ) override {}; - virtual void xfer( Xfer *xfer ) override {}; - virtual void loadPostProcess() override {}; + void crc( Xfer *xfer ) override {}; + void xfer( Xfer *xfer ) override {}; + void loadPostProcess() override {}; public: DozerPrimaryGoingHomeState( StateMachine *machine ) : State( machine, "DozerPrimaryGoingHomeState" ) { } - virtual StateReturnType update() override { return STATE_FAILURE; } + 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 8aabf776799..6069365ebd7 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() override { return "PartitionFilterHasParkingPlace"; } #endif - virtual Bool allow(Object *objOther) override + 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 ) override {}; - virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess() override {}; + void crc( Xfer *xfer ) override {}; + void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + void loadPostProcess() override {}; private: const Bool m_landing; public: JetAwaitingRunwayState( StateMachine *machine, Bool landing ) : m_landing(landing), State( machine, "JetAwaitingRunwayState") { } - virtual StateReturnType onEnter() override + 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() override + StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -239,7 +239,7 @@ class JetAwaitingRunwayState : public State return STATE_CONTINUE; } - virtual void onExit(StateExitType status) override + void onExit(StateExitType status) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -265,9 +265,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 ) override {}; - virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess() override {}; + void crc( Xfer *xfer ) override {}; + void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + void loadPostProcess() override {}; private: Int m_checkAirfield; @@ -283,7 +283,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State State( machine, "JetOrHeliCirclingDeadAirfieldState"), m_checkAirfield(0) { } - virtual StateReturnType onEnter() override + StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -314,7 +314,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State return STATE_CONTINUE; } - virtual StateReturnType update() override + StateReturnType update() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -370,7 +370,7 @@ class JetOrHeliReturningToDeadAirfieldState : public AIInternalMoveToState public: JetOrHeliReturningToDeadAirfieldState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturningToDeadAirfieldState") { } - virtual StateReturnType onEnter() override + StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -431,7 +431,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState public: JetOrHeliTaxiState( StateMachine *machine, TaxiType m ) : m_taxiMode(m), AIMoveOutOfTheWayState( machine ) { } - virtual StateReturnType onEnter() override + StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -513,7 +513,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState return ret; } - virtual void onExit( StateExitType status ) override + void onExit( StateExitType status ) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -554,7 +554,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState public: JetTakeoffOrLandingState( StateMachine *machine, Bool landing ) : m_landing(landing), AIFollowPathState( machine, "JetTakeoffOrLandingState" ) { } - virtual StateReturnType onEnter() override + StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -641,7 +641,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState return ret; } - virtual StateReturnType update() override + StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -703,7 +703,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState return ret; } - virtual void onExit( StateExitType status ) override + void onExit( StateExitType status ) override { AIFollowPathState::onExit(status); @@ -761,12 +761,12 @@ class HeliTakeoffOrLandingState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(HeliTakeoffOrLandingState, "HeliTakeoffOrLandingState") protected: // snapshot interface - virtual void crc( Xfer *xfer ) override + void crc( Xfer *xfer ) override { // empty. jba. } - virtual void xfer( Xfer *xfer ) override + void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -780,7 +780,7 @@ class HeliTakeoffOrLandingState : public State xfer->xferCoord3D(&m_parkingLoc); xfer->xferReal(&m_parkingOrientation); } - virtual void loadPostProcess() override + void loadPostProcess() override { // empty. jba. } @@ -798,7 +798,7 @@ class HeliTakeoffOrLandingState : public State m_parkingLoc.zero(); } - virtual StateReturnType onEnter() override + StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -867,7 +867,7 @@ class HeliTakeoffOrLandingState : public State return STATE_CONTINUE; } - virtual StateReturnType update() override + StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -929,7 +929,7 @@ class HeliTakeoffOrLandingState : public State return STATE_CONTINUE; } - virtual void onExit( StateExitType status ) override + void onExit( StateExitType status ) override { // just in case. Object* jet = getMachineOwner(); @@ -976,14 +976,14 @@ class JetOrHeliParkOrientState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliParkOrientState, "JetOrHeliParkOrientState") protected: // snapshot interface STUBBED. - 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 {}; + void crc( Xfer *xfer ) override {}; + void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + void loadPostProcess() override {}; public: JetOrHeliParkOrientState( StateMachine *machine ) : State( machine, "JetOrHeliParkOrientState") { } - virtual StateReturnType onEnter() override + StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1002,7 +1002,7 @@ class JetOrHeliParkOrientState : public State return STATE_CONTINUE; } - virtual StateReturnType update() override + StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -1037,7 +1037,7 @@ class JetOrHeliParkOrientState : public State return STATE_CONTINUE; } - virtual void onExit( StateExitType status ) override + void onExit( StateExitType status ) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1057,12 +1057,12 @@ class JetPauseBeforeTakeoffState : public AIFaceState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetPauseBeforeTakeoffState, "JetPauseBeforeTakeoffState") protected: // snapshot interface - virtual void crc( Xfer *xfer ) override + void crc( Xfer *xfer ) override { // empty. jba. } - virtual void xfer( Xfer *xfer ) override + void xfer( Xfer *xfer ) override { // version #if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE @@ -1096,7 +1096,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState xfer->xferObjectID(&m_waitedForTaxiID); } - virtual void loadPostProcess() override + void loadPostProcess() override { // empty. jba. } @@ -1188,7 +1188,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState // nothing } - virtual StateReturnType onEnter() override + StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1220,7 +1220,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState } #if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE - virtual StateReturnType update() override + StateReturnType update() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1347,7 +1347,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState } #endif - virtual void onExit(StateExitType status) override + void onExit(StateExitType status) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1370,12 +1370,12 @@ class JetOrHeliReloadAmmoState : public State protected: // snapshot interface - virtual void crc( Xfer *xfer ) override + void crc( Xfer *xfer ) override { // empty. jba. } - virtual void xfer( Xfer *xfer ) override + void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -1386,7 +1386,7 @@ class JetOrHeliReloadAmmoState : public State xfer->xferUnsignedInt(&m_reloadTime); xfer->xferUnsignedInt(&m_reloadDoneFrame); } - virtual void loadPostProcess() override + void loadPostProcess() override { // empty. jba. } @@ -1394,7 +1394,7 @@ class JetOrHeliReloadAmmoState : public State public: JetOrHeliReloadAmmoState( StateMachine *machine ) : State( machine, "JetOrHeliReloadAmmoState") { } - virtual StateReturnType onEnter() override + StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1431,7 +1431,7 @@ class JetOrHeliReloadAmmoState : public State return STATE_CONTINUE; } - virtual StateReturnType update() override + StateReturnType update() override { Object* jet = getMachineOwner(); @@ -1464,7 +1464,7 @@ class JetOrHeliReloadAmmoState : public State return STATE_CONTINUE; } - virtual void onExit(StateExitType status) override + void onExit(StateExitType status) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1486,7 +1486,7 @@ class JetOrHeliReturnForLandingState : public AIInternalMoveToState public: JetOrHeliReturnForLandingState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturnForLandingState") { } - virtual StateReturnType onEnter() override + 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 24d9d6498ed..b6bc2bdeeba 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() override { return "PartitionFilterIsValidCarriage"; } #endif - virtual Bool allow(Object *objOther) override + 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 9d544810cfa..4e6c542bb30 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 ) override {}; - virtual void xfer( Xfer *xfer ) override {}; - virtual void loadPostProcess() override {}; + void crc( Xfer *xfer ) override {}; + void xfer( Xfer *xfer ) override {}; + void loadPostProcess() override {}; public: SupplyTruckBusyState( StateMachine *machine ) : State( machine, "SupplyTruckBusyState" ) { } - virtual StateReturnType onEnter() override + 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() override + StateReturnType update() override { return STATE_CONTINUE; } - virtual void onExit(StateExitType status) override + 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 ) override {}; - virtual void xfer( Xfer *xfer ) override {}; - virtual void loadPostProcess() override {}; + void crc( Xfer *xfer ) override {}; + void xfer( Xfer *xfer ) override {}; + void loadPostProcess() override {}; public: SupplyTruckIdleState( StateMachine *machine ) : State( machine, "SupplyTruckIdleState" ) { } - virtual StateReturnType onEnter() override; - virtual StateReturnType update() override + StateReturnType onEnter() override; + StateReturnType update() override { return STATE_CONTINUE; } - virtual void onExit(StateExitType status) override + 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 c6798af48f3..482f4635299 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 ) override {}; - virtual void xfer( Xfer *xfer ) override {}; - virtual void loadPostProcess() override {}; + void crc( Xfer *xfer ) override {}; + void xfer( Xfer *xfer ) override {}; + void loadPostProcess() override {}; public: ActAsDozerState( StateMachine *machine ) :State( machine, "ActAsDozerState" ){} - virtual StateReturnType onEnter() override; - virtual StateReturnType update() override; + StateReturnType onEnter() override; + 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 ) override {}; - virtual void xfer( Xfer *xfer ) override {}; - virtual void loadPostProcess() override {}; + void crc( Xfer *xfer ) override {}; + void xfer( Xfer *xfer ) override {}; + void loadPostProcess() override {}; public: ActAsSupplyTruckState( StateMachine *machine ) :State( machine, "ActAsSupplyTruckState" ){} - virtual StateReturnType onEnter() override; - virtual StateReturnType update() override; + StateReturnType onEnter() override; + 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 111c2c0b953..0ad4c3b7bbe 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) override; + Bool allow(Object *objOther) override; #if defined(RTS_DEBUG) virtual const char* debugGetName() override { 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 bb2c5c1d822..23de2ea75c3 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() override { return "PartitionFilterHordeMember"; } #endif - virtual Bool allow(Object *objOther) override + Bool allow(Object *objOther) override { #if !RETAIL_COMPATIBLE_CRC // TheSuperHackers @bugfix Stubbjax 07/08/2026 Prevent dead units from being considered for horde membership. diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp index 4f8fbbdef21..cd7dfbd59d2 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) override; + Bool allow(Object *objOther) override; #if defined(RTS_DEBUG) virtual const char* debugGetName() override { 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 30b216a4484..8e8f8dd9711 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() override { return "PartitionFilterTensileFormationMember"; } #endif - virtual Bool allow( Object *objOther ) override + 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 78f2101deed..a5b54540ca1 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(); - virtual void init() override; - virtual void reset() override; - virtual void update() override; + void init() override; + void reset() override; + void update() override; - 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? + Bool hasAchievedVictory(Player *player) override; ///< has a specific player and his allies won? + Bool hasBeenDefeated(Player *player) override; ///< has a specific player and his allies lost? + Bool hasSinglePlayerBeenDefeated(Player *player) override; ///< has a specific player lost? - virtual void cachePlayerPtrs() override; ///< players have been created - cache the ones of interest + void cachePlayerPtrs() override; ///< players have been created - cache the ones of interest - virtual Bool isLocalAlliedVictory() override; ///< convenience function - virtual Bool isLocalAlliedDefeat() override; ///< convenience function - virtual Bool isLocalDefeat() override; ///< convenience function - virtual 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? + 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 ) + 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/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp index d56d79c91d5..b5e4c937c44 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp @@ -151,9 +151,9 @@ class W3DShadowTexture : public RefCountClass, public HashableClass m_shadowUV[0].Set(1.0f,0.0f,0.0f); //u runs along world x axis m_shadowUV[1].Set(0.0f,-1.0f,0.0f); //v runs along world -y axis } - virtual ~W3DShadowTexture() override { REF_PTR_RELEASE(m_texture);} + ~W3DShadowTexture() override { REF_PTR_RELEASE(m_texture);} - virtual const char * Get_Key() override { return m_namebuf; } + const char * Get_Key() override { return m_namebuf; } Int init (RenderObjClass *robj); @@ -2376,9 +2376,9 @@ class MissingTextureClass : public HashableClass { public: MissingTextureClass( const char * name ) : Name( name ) {} - virtual ~MissingTextureClass() override {} + ~MissingTextureClass() override {} - virtual const char * Get_Key() override { return Name; } + const char * Get_Key() override { return Name; } private: StringClass Name; diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp index 6e26d71f8ac..dc7ec661ba7 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp @@ -569,9 +569,9 @@ class W3DShadowGeometry : public RefCountClass, public HashableClass public: W3DShadowGeometry() { }; - virtual ~W3DShadowGeometry() override { }; + ~W3DShadowGeometry() override { }; - virtual const char * Get_Key() override { return m_namebuf; } + const char * Get_Key() override { return m_namebuf; } Int init (RenderObjClass *robj); Int initFromHLOD (RenderObjClass *robj); ///Class_ID(); } - virtual RenderObjClass * Create() override; - virtual void DeleteSelf() override { deleteInstance(this); } + const char* Get_Name() const override { return Name.str(); } + int Get_Class_ID() const override { return Proto->Class_ID(); } + RenderObjClass * Create() override; + 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 9241822e932..1526f9531f6 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 ) override; - virtual void xfer( Xfer *xfer ) override; - virtual void loadPostProcess() override; + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; #ifdef DEBUG_FOG_MEMORY const char *m_robjName; ///HAnimManager ) { }; - 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(); } + void First() override { Iterator.First(); } + void Next() override { Iterator.Next(); } + bool Is_Done() override { return Iterator.Is_Done(); } + 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() override; - virtual const char * Current_Item_Name() override; + bool Is_Done() override; + const char * Current_Item_Name() override; protected: friend class WW3DAssetManager; }; @@ -174,10 +174,10 @@ class Font3DDataIterator : public AssetIterator { public: - 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; } + void First() override { Node = WW3DAssetManager::Get_Instance()->Font3DDatas.Head(); } + void Next() override { Node = Node->Next(); } + bool Is_Done() override { return Node==nullptr; } + const char * Current_Item_Name() override { return Node->Data()->Name; } protected: diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp index cd1416c0924..3f6e046fb2b 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp @@ -1321,9 +1321,9 @@ void DazzleRenderObjClass::Special_Render(SpecialRenderInfoClass & rinfo) class DazzlePersistFactoryClass : public PersistFactoryClass { - virtual uint32 Chunk_ID() const override; - virtual PersistClass * Load(ChunkLoadClass & cload) const override; - virtual void Save(ChunkSaveClass & csave,PersistClass * obj) const override; + uint32 Chunk_ID() const override; + PersistClass * Load(ChunkLoadClass & cload) const override; + void Save(ChunkSaveClass & csave,PersistClass * obj) const override; enum { diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp index 92726842e45..72002b51e5c 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) override + 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,22 +115,22 @@ class FaceHasherClass : public HashCalculatorClass ); } - virtual void Compute_Hash(const MeshBuilderClass::FaceClass & item) override + 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; } - virtual int Num_Hash_Bits() override + int Num_Hash_Bits() override { return 10; } - virtual int Num_Hash_Values() override + int Num_Hash_Values() override { return 1; } - virtual int Get_Hash_Value(int /*index*/) override + int Get_Hash_Value(int /*index*/) override { return HashVal; } diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp index ebcb5a667a0..c2ab46a18cf 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() override; - virtual void Next() override; - virtual bool Is_Done() override; - virtual RenderObjClass * Current_Item() override; + void First() override; + void Next() override; + bool Is_Done() override; + RenderObjClass * Current_Item() override; protected: diff --git a/Generals/Code/Tools/WorldBuilder/src/ScriptDialog.cpp b/Generals/Code/Tools/WorldBuilder/src/ScriptDialog.cpp index 0264bf1ae37..f9dca09952c 100644 --- a/Generals/Code/Tools/WorldBuilder/src/ScriptDialog.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/ScriptDialog.cpp @@ -965,7 +965,7 @@ class LocalMFCFileOutputStream : public OutputStream CFile *m_file; public: LocalMFCFileOutputStream(CFile *pFile):m_file(pFile) {}; - virtual Int write(const void *pData, Int numBytes) override { + Int write(const void *pData, Int numBytes) override { Int numBytesWritten = 0; try { m_file->Write(pData, numBytes); diff --git a/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp index c122151259d..dadfe8ff3ba 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) override; + 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 ) override; + FileClass * Get_File( char const *filename ) override; }; //------------------------------------------------------------------------------------------------- @@ -568,7 +568,7 @@ class CAboutDlg : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CAboutDlg) protected: - virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + 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 14032945d3b..08329063767 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) override { + 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) override { + 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) override { + 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 ba3fb4530e4..629f4d2020b 100644 --- a/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp @@ -159,126 +159,126 @@ class PlaceholderView : public View Int m_originX, m_originY; ///< Location of top/left view corner protected: - virtual View *prependViewToList( View *list ) override {return nullptr;}; ///< Prepend this view to the given list, return the new list - virtual View *getNextView() override { return nullptr; } ///< Return next view in the set + View *prependViewToList( View *list ) override {return nullptr;}; ///< Prepend this view to the given list, return the new list + View *getNextView() override { return nullptr; } ///< Return next view in the set public: - virtual void init() override {}; + void init() override {}; - virtual UnsignedInt getID() override { return 1; } + UnsignedInt getID() override { return 1; } - virtual Drawable *pickDrawable( const ICoord2D *screen, Bool forceAttack, PickType pickType ) override {return nullptr;}; ///< pick drawable given the screen pixel coords + 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, + Int iterateDrawablesInRegion( IRegion2D *screenRegion, Bool (*callback)( Drawable *draw, void *userData ), 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 Bool screenToTerrain( const ICoord2D *screen, Coord3D *world ) override { return false; } - virtual PlaneClass::IntersectionResType screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z ) override { return PlaneClass::NO_INTERSECTION; } - virtual PlaneClass::IntersectionResType getScreenCornerWorldPointsAtZ( Coord3D *topLeft, Coord3D *topRight, + WorldToScreenReturn worldToScreenTriReturn( const Coord3D *w, ICoord2D *s ) override { return WTS_INVALID; }; ///< Transform world coordinate "w" into screen coordinate "s" + Bool screenToTerrain( const ICoord2D *screen, Coord3D *world ) override { return false; } + PlaneClass::IntersectionResType screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z ) override { return PlaneClass::NO_INTERSECTION; } + PlaneClass::IntersectionResType getScreenCornerWorldPointsAtZ( Coord3D *topLeft, Coord3D *topRight, Coord3D *bottomRight, Coord3D *bottomLeft, Real z, ViewportClass viewPort = ViewportClass() ) override { return PlaneClass::NO_INTERSECTION; } - virtual void drawView() override {}; ///< Render the world visible in this view. - virtual void updateView() override {}; ///< Render the world visible in this view. - virtual void stepView() override {}; ///< Update view for every fixed time step + void drawView() override {}; ///< Render the world visible in this view. + void updateView() override {}; ///< Render the world visible in this view. + void stepView() override {}; ///< Update view for every fixed time step - virtual void setZoomLimited( Bool limit ) override {} ///< limit the zoom height - virtual Bool isZoomLimited() const override { return TRUE; } ///< get status of zoom limit + void setZoomLimited( Bool limit ) override {} ///< limit the zoom height + Bool isZoomLimited() const override { return TRUE; } ///< get status of zoom limit - virtual void setWidth( Int width ) override { m_width = width; } - virtual Int getWidth() override { return m_width; } - virtual void setHeight( Int height ) override { m_height = height; } - virtual Int getHeight() 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 + void setWidth( Int width ) override { m_width = width; } + Int getWidth() override { return m_width; } + void setHeight( Int height ) override { m_height = height; } + Int getHeight() override { return m_height; } + void setOrigin( Int x, Int y) override { m_originX=x; m_originY=y;} ///< Sets location of top-left view corner on display + 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() override { } + void forceRedraw() override { } - virtual Bool isDoingScriptedCamera() override { return false; } - virtual void stopDoingScriptedCamera() override {} + Bool isDoingScriptedCamera() override { return false; } + void stopDoingScriptedCamera() override {} - virtual void lookAt( const Coord3D *o ) override {}; ///< Center the view on the given coordinate - virtual void initHeightForMap() override {}; ///< Init the camera height for the map at the current position. + void lookAt( const Coord3D *o ) override {}; ///< Center the view on the given coordinate + void initHeightForMap() override {}; ///< 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) {lookAt(o);}; virtual void moveCameraAlongWaypointPath(Waypoint *way, Int frames, Int shutter, Bool orient) {}; - virtual Bool isCameraMovementFinished() override {return true;}; + Bool isCameraMovementFinished() 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) override {}; ///< Number of frames to average movement for current camera movement. - virtual void cameraModFinalTimeMultiplier(Int finalMultiplier) override {}; ///< Final time multiplier for current camera movement. + void cameraModRollingAverage(Int framesToAverage) override {}; ///< Number of frames to average movement for current camera movement. + 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() override {} ///< Freezes time during the next camera movement. - virtual void cameraModFreezeAngle() 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() override { return false;} ///< Freezes time during the next camera movement. - virtual Int getTimeMultiplier() 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 {}; + void cameraModFreezeTime() override {} ///< Freezes time during the next camera movement. + void cameraModFreezeAngle() override {} ///< Freezes time during the next camera movement. + void cameraModLookToward(Coord3D *pLoc) override {} ///< Sets a look at point during camera movement. + void cameraModFinalLookToward(Coord3D *pLoc) override {} ///< Sets a look at point during camera movement. + void cameraModFinalMoveTo(Coord3D *pLoc) override { }; ///< Sets a final move to. + Bool isTimeFrozen() override { return false;} ///< Freezes time during the next camera movement. + Int getTimeMultiplier() override {return 1;}; ///< Get the time multiplier. + void setTimeMultiplier(Int multiple) override {}; ///< Set the time multiplier. + 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 ) override {}; ///< Rotate the view around the up axis to the given angle - virtual Real getAngle() override { return 0; } - virtual void setPitch( Real angle ) override {}; ///< Rotate the view around the horizontal axis to the given angle - virtual Real getPitch() override { return 0; } ///< Return current camera pitch - virtual void setAngleToDefault() override {} ///< Set the view angle back to default - virtual void setPitchToDefault() override {} ///< Set the view pitch back to default + void setAngle( Real angle ) override {}; ///< Rotate the view around the up axis to the given angle + Real getAngle() override { return 0; } + void setPitch( Real angle ) override {}; ///< Rotate the view around the horizontal axis to the given angle + Real getPitch() override { return 0; } ///< Return current camera pitch + void setAngleToDefault() override {} ///< Set the view angle back to default + void setPitchToDefault() override {} ///< Set the view pitch back to default virtual void getPosition(Coord3D *pos) {} ///< Return camera position - virtual Real getHeightAboveGround() override { return 1; } - virtual void setHeightAboveGround(Real z) override { } - virtual Real getZoom() override { return 1; } - virtual void setZoom(Real z) override { } + Real getHeightAboveGround() override { return 1; } + void setHeightAboveGround(Real z) override { } + Real getZoom() override { return 1; } + void setZoom(Real z) override { } virtual void zoomIn() { } ///< Zoom in, closer to the ground, limit to min virtual void zoomOut() { } ///< Zoom out, farther away from the ground, limit to max - virtual void setZoomToDefault() override { } ///< Set zoom to default value + void setZoomToDefault() override { } ///< Set zoom to default value virtual Real getMaxZoom() { return 0.0f; } - virtual void setOkToAdjustHeight( Bool val ) override { } ///< Set this to adjust camera height + void setOkToAdjustHeight( Bool val ) override { } ///< Set this to adjust camera height - virtual Real getTerrainHeightAtPivot() override { return 0.0f; } - virtual Real getCurrentHeightAboveGround() override { return 0.0f; } + Real getTerrainHeightAtPivot() override { return 0.0f; } + Real getCurrentHeightAboveGround() override { return 0.0f; } - 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 + void getLocation ( ViewLocation *location ) override {}; ///< write the view's current location in to the view location object + void setLocation ( const ViewLocation *location ) override {}; ///< set the view's current location from to the view location object - virtual ObjectID getCameraLock() const override { return INVALID_ID; } - virtual void setCameraLock(ObjectID id) override { } - virtual void snapToCameraLock() override { } - virtual void setSnapMode( CameraLockType lockType, Real lockDist ) override { } + ObjectID getCameraLock() const override { return INVALID_ID; } + void setCameraLock(ObjectID id) override { } + void snapToCameraLock() override { } + void setSnapMode( CameraLockType lockType, Real lockDist ) override { } - virtual Drawable *getCameraLockDrawable() const override { return nullptr; } - virtual void setCameraLockDrawable(Drawable *drawable) override { } + Drawable *getCameraLockDrawable() const override { return nullptr; } + void setCameraLockDrawable(Drawable *drawable) override { } - virtual void setMouseLock( Bool mouseLocked ) override {} ///< lock/unlock the mouse input to the tactical view - virtual Bool isMouseLocked() override { return FALSE; } ///< is the mouse input locked to the tactical view? + void setMouseLock( Bool mouseLocked ) override {} ///< lock/unlock the mouse input to the tactical view + Bool isMouseLocked() override { return FALSE; } ///< is the mouse input locked to the tactical view? - virtual void setFieldOfView( Real angle ) override {}; ///< Set the horizontal field of view angle - virtual Real getFieldOfView() override {return 0;}; ///< Get the horizontal field of view angle + void setFieldOfView( Real angle ) override {}; ///< Set the horizontal field of view angle + Real getFieldOfView() override {return 0;}; ///< Get the horizontal field of view angle - virtual Bool setViewFilterMode(enum FilterModes) override {return FALSE;} ///isEffectivelyDead()) @@ -552,7 +552,7 @@ class PartitionFilterWithinAttackRange : public PartitionFilter public: PartitionFilterWithinAttackRange(const Object* obj) : m_obj(obj) { } - virtual Bool allow(Object* objOther) override + 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 93474df91f7..27516d9808b 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp @@ -1957,9 +1957,9 @@ class AIAttackMoveStateMachine : public StateMachine protected: // snapshot interface - virtual void crc( Xfer *xfer ) override; - virtual void xfer( Xfer *xfer ) override; - virtual void loadPostProcess() override; + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; }; // ------------------------------------------------------------------------------------------------ @@ -5754,9 +5754,9 @@ class AIAttackThenIdleStateMachine : public StateMachine AIAttackThenIdleStateMachine( Object *owner, AsciiString name ); protected: // snapshot interface . - virtual void crc( Xfer *xfer ) override; - virtual void xfer( Xfer *xfer ) override; - virtual void loadPostProcess() override; + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; }; // ------------------------------------------------------------------------------------------------ diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp index 9d9ffce18b1..b21567479ae 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 override + 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 override + 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 override + 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 override + 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 override + 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 override + 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 override + 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 override + 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 917ba12853a..00af60bb149 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 ) override {}; - virtual void xfer( Xfer *xfer ) override {}; - virtual void loadPostProcess() override {}; + void crc( Xfer *xfer ) override {}; + void xfer( Xfer *xfer ) override {}; + void loadPostProcess() override {}; public: ChinookEvacuateState( StateMachine *machine ) : State( machine, "ChinookEvacuateState" ) { } - virtual StateReturnType onEnter() override + StateReturnType onEnter() override { Object* obj = getMachineOwner(); if( obj->getContain() ) @@ -131,7 +131,7 @@ class ChinookEvacuateState : public State return STATE_SUCCESS; } - virtual StateReturnType update() override + 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 ) override {}; - virtual void xfer( Xfer *xfer ) override {}; - virtual void loadPostProcess() override {}; + void crc( Xfer *xfer ) override {}; + void xfer( Xfer *xfer ) override {}; + void loadPostProcess() override {}; public: ChinookHeadOffMapState( StateMachine *machine ) : State( machine, "ChinookHeadOffMapState" ) {} - virtual StateReturnType onEnter() override // Give move order out of town + 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; } - virtual StateReturnType update() override + StateReturnType update() override { Object *owner = getMachineOwner(); @@ -196,12 +196,12 @@ class ChinookTakeoffOrLandingState : public State protected: // snapshot interface - virtual void crc( Xfer *xfer ) override + void crc( Xfer *xfer ) override { // empty } - virtual void xfer( Xfer *xfer ) override + void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -212,7 +212,7 @@ class ChinookTakeoffOrLandingState : public State xfer->xferBool(&m_landing); } - virtual void loadPostProcess() override + void loadPostProcess() override { // empty } @@ -223,7 +223,7 @@ class ChinookTakeoffOrLandingState : public State m_destLoc.zero(); } - virtual StateReturnType onEnter() override + 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() override + 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 ) override + 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 ) override + void crc( Xfer *xfer ) override { // empty } - virtual void xfer( Xfer *xfer ) override + void xfer( Xfer *xfer ) override { // version const XferVersion currentVersion = 2; @@ -468,7 +468,7 @@ class ChinookCombatDropState : public State } } - virtual void loadPostProcess() override + 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() override + StateReturnType onEnter() override { Object* obj = getMachineOwner(); Drawable* draw = obj->getDrawable(); @@ -548,7 +548,7 @@ class ChinookCombatDropState : public State } // -------------- - virtual StateReturnType update() override + StateReturnType update() override { Object* obj = getMachineOwner(); ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface(); @@ -640,7 +640,7 @@ class ChinookCombatDropState : public State } // -------------- - virtual void onExit( StateExitType status ) override + 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 ) override + void crc( Xfer *xfer ) override { // empty } - virtual void xfer( Xfer *xfer ) override + void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -715,7 +715,7 @@ class ChinookMoveToBldgState : public AIMoveToState xfer->xferReal(&m_destZ); } - virtual void loadPostProcess() override + void loadPostProcess() override { // empty } @@ -723,7 +723,7 @@ class ChinookMoveToBldgState : public AIMoveToState public: ChinookMoveToBldgState( StateMachine *machine ): AIMoveToState( machine ) { } - virtual StateReturnType onEnter() override + 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() override + StateReturnType update() override { Object* obj = getMachineOwner(); @@ -768,7 +768,7 @@ class ChinookMoveToBldgState : public AIMoveToState return status; } - virtual void onExit( StateExitType status ) override + 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 ) override + void crc( Xfer *xfer ) override { // empty } - virtual void xfer( Xfer *xfer ) override + void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -803,7 +803,7 @@ class ChinookRecordCreationState : public State xfer->xferVersion( &version, currentVersion ); } - virtual void loadPostProcess() override + void loadPostProcess() override { // empty } @@ -811,7 +811,7 @@ class ChinookRecordCreationState : public State public: ChinookRecordCreationState( StateMachine *machine ): State( machine, "ChinookRecordCreationState" ) { } - virtual StateReturnType onEnter() override + 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() override + 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 2ccaaa00d38..2035520e234 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() override; + StateReturnType update() override; protected: // snapshot interface - virtual void crc( Xfer *xfer ) override; - virtual void xfer( Xfer *xfer ) override; - virtual void loadPostProcess() override; + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + 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() override; + StateReturnType update() override; protected: // snapshot interface - virtual void crc( Xfer *xfer ) override; - virtual void xfer( Xfer *xfer ) override; - virtual void loadPostProcess() override; + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; protected: @@ -386,15 +386,15 @@ class DozerActionDoActionState : public State m_task = task; m_enterFrame = 0; } - virtual StateReturnType update() override; - virtual StateReturnType onEnter() override; - virtual void onExit( StateExitType status ) override { } + StateReturnType update() override; + StateReturnType onEnter() override; + void onExit( StateExitType status ) override { } protected: // snapshot interface - virtual void crc( Xfer *xfer ) override; - virtual void xfer( Xfer *xfer ) override; - virtual void loadPostProcess() override; + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; protected: @@ -797,9 +797,9 @@ class DozerActionStateMachine : public StateMachine protected: // snapshot interface - virtual void crc( Xfer *xfer ) override; - virtual void xfer( Xfer *xfer ) override; - virtual void loadPostProcess() override; + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; protected: @@ -987,15 +987,15 @@ class DozerPrimaryIdleState : public State m_idlePlayerNumber = 0; m_isMarkedAsIdle = FALSE; } - virtual StateReturnType update() override; - virtual StateReturnType onEnter() override; - virtual void onExit( StateExitType status ) override; + StateReturnType update() override; + StateReturnType onEnter() override; + void onExit( StateExitType status ) override; protected: // snapshot interface - virtual void crc( Xfer *xfer ) override; - virtual void xfer( Xfer *xfer ) override; - virtual void loadPostProcess() override; + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; protected: @@ -1174,16 +1174,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() override { return m_actionMachine->updateStateMachine(); } + StateReturnType update() override { return m_actionMachine->updateStateMachine(); } - virtual StateReturnType onEnter() override; - virtual void onExit( StateExitType status ) override; + StateReturnType onEnter() override; + void onExit( StateExitType status ) override; protected: // snapshot interface - virtual void crc( Xfer *xfer ) override; - virtual void xfer( Xfer *xfer ) override; - virtual void loadPostProcess() override; + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; protected: @@ -1273,14 +1273,14 @@ class DozerPrimaryGoingHomeState : public State protected: // snapshot interface STUBBED no member vars - virtual void crc( Xfer *xfer ) override {}; - virtual void xfer( Xfer *xfer ) override {}; - virtual void loadPostProcess() override {}; + void crc( Xfer *xfer ) override {}; + void xfer( Xfer *xfer ) override {}; + void loadPostProcess() override {}; public: DozerPrimaryGoingHomeState( StateMachine *machine ) : State( machine, "DozerPrimaryGoingHomeState" ) { } - virtual StateReturnType update() override { return STATE_FAILURE; } + 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 998825c9648..1cd208800ec 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() override { return "PartitionFilterHasParkingPlace"; } #endif - virtual Bool allow(Object *objOther) override + 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 ) override {}; - virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess() override {}; + void crc( Xfer *xfer ) override {}; + void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + void loadPostProcess() override {}; private: const Bool m_landing; public: JetAwaitingRunwayState( StateMachine *machine, Bool landing ) : m_landing(landing), State( machine, "JetAwaitingRunwayState") { } - virtual StateReturnType onEnter() override + 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() override + StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -288,7 +288,7 @@ class JetAwaitingRunwayState : public State return STATE_CONTINUE; } - virtual void onExit(StateExitType status) override + void onExit(StateExitType status) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -314,9 +314,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 ) override {}; - virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - virtual void loadPostProcess() override {}; + void crc( Xfer *xfer ) override {}; + void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + void loadPostProcess() override {}; private: Int m_checkAirfield; @@ -332,7 +332,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State State( machine, "JetOrHeliCirclingDeadAirfieldState"), m_checkAirfield(0) { } - virtual StateReturnType onEnter() override + StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -363,7 +363,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State return STATE_CONTINUE; } - virtual StateReturnType update() override + StateReturnType update() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -419,7 +419,7 @@ class JetOrHeliReturningToDeadAirfieldState : public AIInternalMoveToState public: JetOrHeliReturningToDeadAirfieldState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturningToDeadAirfieldState") { } - virtual StateReturnType onEnter() override + StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -480,7 +480,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState public: JetOrHeliTaxiState( StateMachine *machine, TaxiType m ) : m_taxiMode(m), AIMoveOutOfTheWayState( machine ) { } - virtual StateReturnType onEnter() override + StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -644,7 +644,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState return ret; } - virtual StateReturnType update() override + StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -675,7 +675,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState return AIMoveOutOfTheWayState::update(); } - virtual void onExit( StateExitType status ) override + void onExit( StateExitType status ) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -716,7 +716,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState public: JetTakeoffOrLandingState( StateMachine *machine, Bool landing ) : m_landing(landing), AIFollowPathState( machine, "JetTakeoffOrLandingState" ) { } - virtual StateReturnType onEnter() override + StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -813,7 +813,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState return ret; } - virtual StateReturnType update() override + StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -890,7 +890,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState return ret; } - virtual void onExit( StateExitType status ) override + void onExit( StateExitType status ) override { AIFollowPathState::onExit(status); @@ -948,12 +948,12 @@ class HeliTakeoffOrLandingState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(HeliTakeoffOrLandingState, "HeliTakeoffOrLandingState") protected: // snapshot interface - virtual void crc( Xfer *xfer ) override + void crc( Xfer *xfer ) override { // empty. jba. } - virtual void xfer( Xfer *xfer ) override + void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -967,7 +967,7 @@ class HeliTakeoffOrLandingState : public State xfer->xferCoord3D(&m_parkingLoc); xfer->xferReal(&m_parkingOrientation); } - virtual void loadPostProcess() override + void loadPostProcess() override { // empty. jba. } @@ -985,7 +985,7 @@ class HeliTakeoffOrLandingState : public State m_parkingLoc.zero(); } - virtual StateReturnType onEnter() override + StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1054,7 +1054,7 @@ class HeliTakeoffOrLandingState : public State return STATE_CONTINUE; } - virtual StateReturnType update() override + StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -1116,7 +1116,7 @@ class HeliTakeoffOrLandingState : public State return STATE_CONTINUE; } - virtual void onExit( StateExitType status ) override + void onExit( StateExitType status ) override { // just in case. Object* jet = getMachineOwner(); @@ -1163,14 +1163,14 @@ class JetOrHeliParkOrientState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliParkOrientState, "JetOrHeliParkOrientState") protected: // snapshot interface STUBBED. - 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 {}; + void crc( Xfer *xfer ) override {}; + void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} + void loadPostProcess() override {}; public: JetOrHeliParkOrientState( StateMachine *machine ) : State( machine, "JetOrHeliParkOrientState") { } - virtual StateReturnType onEnter() override + StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1189,7 +1189,7 @@ class JetOrHeliParkOrientState : public State return STATE_CONTINUE; } - virtual StateReturnType update() override + StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -1229,7 +1229,7 @@ class JetOrHeliParkOrientState : public State return STATE_CONTINUE; } - virtual void onExit( StateExitType status ) override + void onExit( StateExitType status ) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1249,12 +1249,12 @@ class JetPauseBeforeTakeoffState : public AIFaceState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetPauseBeforeTakeoffState, "JetPauseBeforeTakeoffState") protected: // snapshot interface - virtual void crc( Xfer *xfer ) override + void crc( Xfer *xfer ) override { // empty. jba. } - virtual void xfer( Xfer *xfer ) override + void xfer( Xfer *xfer ) override { // version #if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE @@ -1288,7 +1288,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState xfer->xferObjectID(&m_waitedForTaxiID); } - virtual void loadPostProcess() override + void loadPostProcess() override { // empty. jba. } @@ -1380,7 +1380,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState // nothing } - virtual StateReturnType onEnter() override + StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1412,7 +1412,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState } #if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE - virtual StateReturnType update() override + StateReturnType update() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1539,7 +1539,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState } #endif - virtual void onExit(StateExitType status) override + void onExit(StateExitType status) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1562,12 +1562,12 @@ class JetOrHeliReloadAmmoState : public State protected: // snapshot interface - virtual void crc( Xfer *xfer ) override + void crc( Xfer *xfer ) override { // empty. jba. } - virtual void xfer( Xfer *xfer ) override + void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -1578,7 +1578,7 @@ class JetOrHeliReloadAmmoState : public State xfer->xferUnsignedInt(&m_reloadTime); xfer->xferUnsignedInt(&m_reloadDoneFrame); } - virtual void loadPostProcess() override + void loadPostProcess() override { // empty. jba. } @@ -1586,7 +1586,7 @@ class JetOrHeliReloadAmmoState : public State public: JetOrHeliReloadAmmoState( StateMachine *machine ) : State( machine, "JetOrHeliReloadAmmoState") { } - virtual StateReturnType onEnter() override + StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1623,7 +1623,7 @@ class JetOrHeliReloadAmmoState : public State return STATE_CONTINUE; } - virtual StateReturnType update() override + StateReturnType update() override { Object* jet = getMachineOwner(); @@ -1656,7 +1656,7 @@ class JetOrHeliReloadAmmoState : public State return STATE_CONTINUE; } - virtual void onExit(StateExitType status) override + void onExit(StateExitType status) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1678,7 +1678,7 @@ class JetOrHeliReturnForLandingState : public AIInternalMoveToState public: JetOrHeliReturnForLandingState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturnForLandingState") { } - virtual StateReturnType onEnter() override + 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 1ece8505529..9553469f875 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() override { return "PartitionFilterIsValidCarriage"; } #endif - virtual Bool allow(Object *objOther) override + 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 5e966094ef7..f27684aaa17 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 ) override {}; - virtual void xfer( Xfer *xfer ) override {}; - virtual void loadPostProcess() override {}; + void crc( Xfer *xfer ) override {}; + void xfer( Xfer *xfer ) override {}; + void loadPostProcess() override {}; public: SupplyTruckBusyState( StateMachine *machine ) : State( machine, "SupplyTruckBusyState" ) { } - virtual StateReturnType onEnter() override + 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() override + StateReturnType update() override { return STATE_CONTINUE; } - virtual void onExit(StateExitType status) override + 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 ) override {}; - virtual void xfer( Xfer *xfer ) override {}; - virtual void loadPostProcess() override {}; + void crc( Xfer *xfer ) override {}; + void xfer( Xfer *xfer ) override {}; + void loadPostProcess() override {}; public: SupplyTruckIdleState( StateMachine *machine ) : State( machine, "SupplyTruckIdleState" ) { } - virtual StateReturnType onEnter() override; - virtual StateReturnType update() override + StateReturnType onEnter() override; + StateReturnType update() override { return STATE_CONTINUE; } - virtual void onExit(StateExitType status) override + 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 ba7313535c5..345df18867c 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 ) override {}; - virtual void xfer( Xfer *xfer ) override {}; - virtual void loadPostProcess() override {}; + void crc( Xfer *xfer ) override {}; + void xfer( Xfer *xfer ) override {}; + void loadPostProcess() override {}; public: ActAsDozerState( StateMachine *machine ) :State( machine, "ActAsDozerState" ){} - virtual StateReturnType onEnter() override; - virtual StateReturnType update() override; + StateReturnType onEnter() override; + 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 ) override {}; - virtual void xfer( Xfer *xfer ) override {}; - virtual void loadPostProcess() override {}; + void crc( Xfer *xfer ) override {}; + void xfer( Xfer *xfer ) override {}; + void loadPostProcess() override {}; public: ActAsSupplyTruckState( StateMachine *machine ) :State( machine, "ActAsSupplyTruckState" ){} - virtual StateReturnType onEnter() override; - virtual StateReturnType update() override; + StateReturnType onEnter() override; + 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 b82a0e5f13a..180aadea24f 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) override; + Bool allow(Object *objOther) override; #if defined(RTS_DEBUG) virtual const char* debugGetName() override { 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 568820cbc07..741157e12a2 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() override { return "PartitionFilterHordeMember"; } #endif - virtual Bool allow(Object *objOther) override + Bool allow(Object *objOther) override { #if !RETAIL_COMPATIBLE_CRC // TheSuperHackers @bugfix Stubbjax 07/08/2026 Prevent dead units from being considered for horde membership. diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp index b2368da9f35..98cc8037a2d 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) override + 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 746730dc27d..6b85d14215b 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) override; + Bool allow(Object *objOther) override; #if defined(RTS_DEBUG) virtual const char* debugGetName() override { 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 08b1e976360..539acfe4587 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() override { return "PartitionFilterTensileFormationMember"; } #endif - virtual Bool allow( Object *objOther ) override + 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 ab34ddf756a..7aded0ae1d5 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(); - virtual void init() override; - virtual void reset() override; - virtual void update() override; + void init() override; + void reset() override; + void update() override; - 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? + Bool hasAchievedVictory(Player *player) override; ///< has a specific player and his allies won? + Bool hasBeenDefeated(Player *player) override; ///< has a specific player and his allies lost? + Bool hasSinglePlayerBeenDefeated(Player *player) override; ///< has a specific player lost? - virtual void cachePlayerPtrs() override; ///< players have been created - cache the ones of interest + void cachePlayerPtrs() override; ///< players have been created - cache the ones of interest - virtual Bool isLocalAlliedVictory() override; ///< convenience function - virtual Bool isLocalAlliedDefeat() override; ///< convenience function - virtual Bool isLocalDefeat() override; ///< convenience function - virtual 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? + 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 ) + 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/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp index 39eafb73785..53fe7692242 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp @@ -151,9 +151,9 @@ class W3DShadowTexture : public RefCountClass, public HashableClass m_shadowUV[0].Set(1.0f,0.0f,0.0f); //u runs along world x axis m_shadowUV[1].Set(0.0f,-1.0f,0.0f); //v runs along world -y axis } - virtual ~W3DShadowTexture() override { REF_PTR_RELEASE(m_texture);} + ~W3DShadowTexture() override { REF_PTR_RELEASE(m_texture);} - virtual const char * Get_Key() override { return m_namebuf; } + const char * Get_Key() override { return m_namebuf; } Int init (RenderObjClass *robj); @@ -2380,9 +2380,9 @@ class MissingTextureClass : public HashableClass { public: MissingTextureClass( const char * name ) : Name( name ) {} - virtual ~MissingTextureClass() override {} + ~MissingTextureClass() override {} - virtual const char * Get_Key() override { return Name; } + const char * Get_Key() override { return Name; } private: StringClass Name; diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp index 33b42a8c03e..e03945334f9 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp @@ -589,9 +589,9 @@ class W3DShadowGeometry : public RefCountClass, public HashableClass public: W3DShadowGeometry() { }; - virtual ~W3DShadowGeometry() override { }; + ~W3DShadowGeometry() override { }; - virtual const char * Get_Key() override { return m_namebuf; } + const char * Get_Key() override { return m_namebuf; } Int init (RenderObjClass *robj); Int initFromHLOD (RenderObjClass *robj); ///Class_ID(); } - virtual RenderObjClass * Create() override; - virtual void DeleteSelf() override { deleteInstance(this); } + const char* Get_Name() const override { return Name.str(); } + int Get_Class_ID() const override { return Proto->Class_ID(); } + RenderObjClass * Create() override; + 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 7884d96f18b..dcf745cffb8 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 ) override; - virtual void xfer( Xfer *xfer ) override; - virtual void loadPostProcess() override; + void crc( Xfer *xfer ) override; + void xfer( Xfer *xfer ) override; + void loadPostProcess() override; #ifdef DEBUG_FOG_MEMORY const char *m_robjName; ///HAnimManager ) { }; - 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(); } + void First() override { Iterator.First(); } + void Next() override { Iterator.Next(); } + bool Is_Done() override { return Iterator.Is_Done(); } + 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() override; - virtual const char * Current_Item_Name() override; + bool Is_Done() override; + const char * Current_Item_Name() override; protected: friend class WW3DAssetManager; }; @@ -177,10 +177,10 @@ class Font3DDataIterator : public AssetIterator { public: - 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; } + void First() override { Node = WW3DAssetManager::Get_Instance()->Font3DDatas.Head(); } + void Next() override { Node = Node->Next(); } + bool Is_Done() override { return Node==nullptr; } + const char * Current_Item_Name() override { return Node->Data()->Name; } protected: diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp index b242e9be09b..7143f484f71 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp @@ -1424,9 +1424,9 @@ void DazzleRenderObjClass::Special_Render(SpecialRenderInfoClass & rinfo) class DazzlePersistFactoryClass : public PersistFactoryClass { - virtual uint32 Chunk_ID() const override; - virtual PersistClass * Load(ChunkLoadClass & cload) const override; - virtual void Save(ChunkSaveClass & csave,PersistClass * obj) const override; + uint32 Chunk_ID() const override; + PersistClass * Load(ChunkLoadClass & cload) const override; + void Save(ChunkSaveClass & csave,PersistClass * obj) const override; enum { diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp index b9c7082abd5..b09ea059b15 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) override + 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,22 +115,22 @@ class FaceHasherClass : public HashCalculatorClass ); } - virtual void Compute_Hash(const MeshBuilderClass::FaceClass & item) override + 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; } - virtual int Num_Hash_Bits() override + int Num_Hash_Bits() override { return 10; } - virtual int Num_Hash_Values() override + int Num_Hash_Values() override { return 1; } - virtual int Get_Hash_Value(int /*index*/) override + int Get_Hash_Value(int /*index*/) override { return HashVal; } diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp index 6967adc959e..9a0029e5ca2 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() override; - virtual void Next() override; - virtual bool Is_Done() override; - virtual RenderObjClass * Current_Item() override; + void First() override; + void Next() override; + bool Is_Done() override; + RenderObjClass * Current_Item() override; protected: diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp index 27af92ec44a..f0b33441282 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp @@ -1117,7 +1117,7 @@ class LocalMFCFileOutputStream : public OutputStream CFile *m_file; public: LocalMFCFileOutputStream(CFile *pFile):m_file(pFile) {}; - virtual Int write(const void *pData, Int numBytes) override { + Int write(const void *pData, Int numBytes) override { Int numBytesWritten = 0; try { m_file->Write(pData, numBytes); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp index 5f19126638a..31118528549 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) override; + 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 ) override; + FileClass * Get_File( char const *filename ) override; }; //------------------------------------------------------------------------------------------------- @@ -585,7 +585,7 @@ class CAboutDlg : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CAboutDlg) protected: - virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + 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 185b81dd1b2..528dc3eef12 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) override { + 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) override { + 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) override { + 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 a1f39f2fb3f..1ef77feea43 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp @@ -160,126 +160,126 @@ class PlaceholderView : public View Int m_originX, m_originY; ///< Location of top/left view corner protected: - virtual View *prependViewToList( View *list ) override {return nullptr;}; ///< Prepend this view to the given list, return the new list - virtual View *getNextView() override { return nullptr; } ///< Return next view in the set + View *prependViewToList( View *list ) override {return nullptr;}; ///< Prepend this view to the given list, return the new list + View *getNextView() override { return nullptr; } ///< Return next view in the set public: - virtual void init() override {}; + void init() override {}; - virtual UnsignedInt getID() override { return 1; } + UnsignedInt getID() override { return 1; } - virtual Drawable *pickDrawable( const ICoord2D *screen, Bool forceAttack, PickType pickType ) override {return nullptr;}; ///< pick drawable given the screen pixel coords + 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, + Int iterateDrawablesInRegion( IRegion2D *screenRegion, Bool (*callback)( Drawable *draw, void *userData ), 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 Bool screenToTerrain( const ICoord2D *screen, Coord3D *world ) override { return false; } - virtual PlaneClass::IntersectionResType screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z ) override { return PlaneClass::NO_INTERSECTION; } - virtual PlaneClass::IntersectionResType getScreenCornerWorldPointsAtZ( Coord3D *topLeft, Coord3D *topRight, + WorldToScreenReturn worldToScreenTriReturn( const Coord3D *w, ICoord2D *s ) override { return WTS_INVALID; }; ///< Transform world coordinate "w" into screen coordinate "s" + Bool screenToTerrain( const ICoord2D *screen, Coord3D *world ) override { return false; } + PlaneClass::IntersectionResType screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z ) override { return PlaneClass::NO_INTERSECTION; } + PlaneClass::IntersectionResType getScreenCornerWorldPointsAtZ( Coord3D *topLeft, Coord3D *topRight, Coord3D *bottomRight, Coord3D *bottomLeft, Real z, ViewportClass viewPort = ViewportClass() ) override { return PlaneClass::NO_INTERSECTION; } - virtual void drawView() override {}; ///< Render the world visible in this view. - virtual void updateView() override {}; ///< Render the world visible in this view. - virtual void stepView() override {}; ///< Update view for every fixed time step + void drawView() override {}; ///< Render the world visible in this view. + void updateView() override {}; ///< Render the world visible in this view. + void stepView() override {}; ///< Update view for every fixed time step - virtual void setZoomLimited( Bool limit ) override {} ///< limit the zoom height - virtual Bool isZoomLimited() const override { return TRUE; } ///< get status of zoom limit + void setZoomLimited( Bool limit ) override {} ///< limit the zoom height + Bool isZoomLimited() const override { return TRUE; } ///< get status of zoom limit - virtual void setWidth( Int width ) override { m_width = width; } - virtual Int getWidth() override { return m_width; } - virtual void setHeight( Int height ) override { m_height = height; } - virtual Int getHeight() 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 + void setWidth( Int width ) override { m_width = width; } + Int getWidth() override { return m_width; } + void setHeight( Int height ) override { m_height = height; } + Int getHeight() override { return m_height; } + void setOrigin( Int x, Int y) override { m_originX=x; m_originY=y;} ///< Sets location of top-left view corner on display + 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() override { } + void forceRedraw() override { } - virtual Bool isDoingScriptedCamera() override { return false; } - virtual void stopDoingScriptedCamera() override {} + Bool isDoingScriptedCamera() override { return false; } + void stopDoingScriptedCamera() override {} - virtual void lookAt( const Coord3D *o ) override {}; ///< Center the view on the given coordinate - virtual void initHeightForMap() override {}; ///< Init the camera height for the map at the current position. + void lookAt( const Coord3D *o ) override {}; ///< Center the view on the given coordinate + void initHeightForMap() override {}; ///< 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, + void moveCameraTo(const Coord3D *o, Int frames, Int shutter, Bool orient, Real easeIn, Real easeOut) override {lookAt(o);}; - virtual void moveCameraAlongWaypointPath(Waypoint *way, Int frames, Int shutter, + void moveCameraAlongWaypointPath(Waypoint *way, Int frames, Int shutter, Bool orient, Real easeIn, Real easeOut) override {}; - virtual Bool isCameraMovementFinished() 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() override {} ///< Freezes time during the next camera movement. - virtual void cameraModFreezeAngle() 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() override { return false;} ///< Freezes time during the next camera movement. - virtual Int getTimeMultiplier() 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() override { return 0; } - virtual void setPitch( Real angle ) override {}; ///< Rotate the view around the horizontal axis to the given angle - virtual Real getPitch() override { return 0; } ///< Return current camera pitch - virtual void setAngleToDefault() override {} ///< Set the view angle back to default - virtual void setPitchToDefault() override {} ///< Set the view pitch back to default + Bool isCameraMovementFinished() override {return true;}; + void resetCamera(const Coord3D *location, Int frames, Real easeIn, Real easeOut) override {}; ///< Move camera to location, and reset to default angle & zoom. + void rotateCamera(Real rotations, Int frames, Real easeIn, Real easeOut) override {}; ///< Rotate camera about current viewpoint. + void rotateCameraTowardObject(ObjectID id, Int milliseconds, Int holdMilliseconds, Real easeIn, Real easeOut) override {}; ///< Rotate camera to face an object, and hold on it + void cameraModFinalZoom(Real finalZoom, Real easeIn, Real easeOut) override {}; ///< Final zoom for current camera movement. + void cameraModRollingAverage(Int framesToAverage) override {}; ///< Number of frames to average movement for current camera movement. + void cameraModFinalTimeMultiplier(Int finalMultiplier) override {}; ///< Final time multiplier for current camera movement. + void cameraModFinalPitch(Real finalPitch, Real easeIn, Real easeOut) override {}; ///< Final pitch for current camera movement. + void cameraModFreezeTime() override {} ///< Freezes time during the next camera movement. + void cameraModFreezeAngle() override {} ///< Freezes time during the next camera movement. + void cameraModLookToward(Coord3D *pLoc) override {} ///< Sets a look at point during camera movement. + void cameraModFinalLookToward(Coord3D *pLoc) override {} ///< Sets a look at point during camera movement. + void cameraModFinalMoveTo(Coord3D *pLoc) override { }; ///< Sets a final move to. + Bool isTimeFrozen() override { return false;} ///< Freezes time during the next camera movement. + Int getTimeMultiplier() override {return 1;}; ///< Get the time multiplier. + void setTimeMultiplier(Int multiple) override {}; ///< Set the time multiplier. + void setDefaultView(Real pitch, Real angle, Real maxHeight) override {}; + void zoomCamera( Real finalZoom, Int milliseconds, Real easeIn, Real easeOut ) override {}; + void pitchCamera( Real finalPitch, Int milliseconds, Real easeIn, Real easeOut ) override {}; + + void setAngle( Real angle ) override {}; ///< Rotate the view around the up axis to the given angle + Real getAngle() override { return 0; } + void setPitch( Real angle ) override {}; ///< Rotate the view around the horizontal axis to the given angle + Real getPitch() override { return 0; } ///< Return current camera pitch + void setAngleToDefault() override {} ///< Set the view angle back to default + void setPitchToDefault() override {} ///< Set the view pitch back to default virtual void getPosition(Coord3D *pos) {} ///< Return camera position - virtual Real getHeightAboveGround() override { return 1; } - virtual void setHeightAboveGround(Real z) override { } - virtual Real getZoom() override { return 1; } - virtual void setZoom(Real z) override { } + Real getHeightAboveGround() override { return 1; } + void setHeightAboveGround(Real z) override { } + Real getZoom() override { return 1; } + void setZoom(Real z) override { } virtual void zoomIn() { } ///< Zoom in, closer to the ground, limit to min virtual void zoomOut() { } ///< Zoom out, farther away from the ground, limit to max - virtual void setZoomToDefault() override { } ///< Set zoom to default value + void setZoomToDefault() override { } ///< Set zoom to default value virtual Real getMaxZoom() { return 0.0f; } - virtual void setOkToAdjustHeight( Bool val ) override { } ///< Set this to adjust camera height + void setOkToAdjustHeight( Bool val ) override { } ///< Set this to adjust camera height - virtual Real getTerrainHeightAtPivot() override { return 0.0f; } - virtual Real getCurrentHeightAboveGround() override { return 0.0f; } + Real getTerrainHeightAtPivot() override { return 0.0f; } + Real getCurrentHeightAboveGround() override { return 0.0f; } - 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 + void getLocation ( ViewLocation *location ) override {}; ///< write the view's current location in to the view location object + void setLocation ( const ViewLocation *location ) override {}; ///< set the view's current location from to the view location object - virtual ObjectID getCameraLock() const override { return INVALID_ID; } - virtual void setCameraLock(ObjectID id) override { } - virtual void snapToCameraLock() override { } - virtual void setSnapMode( CameraLockType lockType, Real lockDist ) override { } + ObjectID getCameraLock() const override { return INVALID_ID; } + void setCameraLock(ObjectID id) override { } + void snapToCameraLock() override { } + void setSnapMode( CameraLockType lockType, Real lockDist ) override { } - virtual Drawable *getCameraLockDrawable() const override { return nullptr; } - virtual void setCameraLockDrawable(Drawable *drawable) override { } + Drawable *getCameraLockDrawable() const override { return nullptr; } + void setCameraLockDrawable(Drawable *drawable) override { } - virtual void setMouseLock( Bool mouseLocked ) override {} ///< lock/unlock the mouse input to the tactical view - virtual Bool isMouseLocked() override { return FALSE; } ///< is the mouse input locked to the tactical view? + void setMouseLock( Bool mouseLocked ) override {} ///< lock/unlock the mouse input to the tactical view + Bool isMouseLocked() override { return FALSE; } ///< is the mouse input locked to the tactical view? - virtual void setFieldOfView( Real angle ) override {}; ///< Set the horizontal field of view angle - virtual Real getFieldOfView() override {return 0;}; ///< Get the horizontal field of view angle + void setFieldOfView( Real angle ) override {}; ///< Set the horizontal field of view angle + Real getFieldOfView() override {return 0;}; ///< Get the horizontal field of view angle - virtual Bool setViewFilterMode(enum FilterModes) override {return FALSE;} /// Date: Thu, 27 Aug 2026 12:28:54 -0600 Subject: [PATCH 2/2] refactor: Keep virtual and add missing override on headers Restore virtual on the earlier cpp pass and add override to header declarations that were missing it. Co-authored-by: Cursor --- Core/GameEngine/Source/GameClient/FXList.cpp | 24 +-- .../Source/GameClient/GUI/IMEManager.cpp | 46 ++--- .../GameEngine/Source/GameClient/GameText.cpp | 24 +-- .../Source/GameNetwork/GameSpy/GSConfig.cpp | 42 ++--- .../GameSpy/Thread/BuddyThread.cpp | 24 +-- .../GameSpy/Thread/GameResultsThread.cpp | 26 +-- .../GameNetwork/GameSpy/Thread/PeerThread.cpp | 24 +-- .../Thread/PersistentStorageThread.cpp | 22 +-- .../GameNetwork/GameSpy/Thread/PingThread.cpp | 26 +-- .../GameEngine/Source/GameNetwork/Network.cpp | 96 +++++----- .../Source/W3DDevice/GameClient/W3DMouse.cpp | 2 +- .../W3DDevice/GameClient/W3DShaderManager.cpp | 84 ++++----- .../W3DDevice/GameClient/W3DTerrainVisual.cpp | 4 +- .../W3DDevice/GameClient/W3DTreeBuffer.cpp | 2 +- .../W3DDevice/GameClient/WorldHeightMap.cpp | 2 +- .../Source/WWVegas/WW3D2/collect.cpp | 10 +- Core/Libraries/Source/WWVegas/WW3D2/proto.cpp | 10 +- .../Source/WWVegas/WW3D2/rendobj.cpp | 6 +- .../Source/WWVegas/WW3D2/textureloader.cpp | 2 +- .../Source/WWVegas/WWDebug/wwmemlog.cpp | 2 +- .../Source/WWVegas/WWLib/multilist.h | 4 +- Core/Libraries/Source/debug/internal.h | 4 +- Core/Libraries/Source/debug/internal_io.h | 46 ++--- Core/Libraries/Source/profile/internal_cmd.h | 4 +- Core/Tools/DebugWindow/DebugWindow.h | 2 +- Core/Tools/ParticleEditor/CButtonShowColor.h | 2 +- Core/Tools/ParticleEditor/MoreParmsDialog.h | 2 +- Core/Tools/ParticleEditor/ParticleEditor.h | 2 +- .../ParticleEditor/ParticleEditorDialog.h | 2 +- Core/Tools/W3DView/AdvancedAnimSheet.h | 2 +- Core/Tools/W3DView/AnimMixingPage.h | 2 +- Core/Tools/W3DView/AnimReportPage.h | 2 +- Core/Tools/W3DView/AnimationPropPage.h | 2 +- Core/Tools/W3DView/AssetPropertySheet.h | 2 +- Core/Tools/W3DView/ColorBar.h | 2 +- Core/Tools/W3DView/ColorPicker.h | 2 +- Core/Tools/W3DView/DialogToolbar.h | 2 +- Core/Tools/W3DView/EmitterColorPropPage.h | 2 +- Core/Tools/W3DView/EmitterFramePropPage.h | 2 +- Core/Tools/W3DView/EmitterGeneralPropPage.h | 2 +- Core/Tools/W3DView/EmitterInstanceList.h | 34 ++-- Core/Tools/W3DView/EmitterLineGroupPropPage.h | 2 +- Core/Tools/W3DView/EmitterLinePropPage.h | 2 +- Core/Tools/W3DView/EmitterParticlePropPage.h | 2 +- Core/Tools/W3DView/EmitterPhysicsPropPage.h | 2 +- Core/Tools/W3DView/EmitterPropertySheet.h | 4 +- Core/Tools/W3DView/EmitterRotationPropPage.h | 2 +- Core/Tools/W3DView/EmitterSizePropPage.h | 2 +- Core/Tools/W3DView/EmitterUserPropPage.h | 2 +- Core/Tools/W3DView/GammaDialog.h | 6 +- Core/Tools/W3DView/GraphicView.h | 2 +- Core/Tools/W3DView/HierarchyPropPage.h | 6 +- Core/Tools/W3DView/MeshPropPage.h | 6 +- Core/Tools/W3DView/OpacityVectorDialog.h | 10 +- .../Tools/W3DView/ParticleBlurTimeKeyDialog.h | 6 +- .../Tools/W3DView/ParticleRotationKeyDialog.h | 8 +- Core/Tools/W3DView/ParticleSizeDialog.h | 8 +- Core/Tools/W3DView/PlaySoundDialog.h | 6 +- Core/Tools/W3DView/ResolutionDialog.h | 6 +- Core/Tools/W3DView/RingColorPropPage.h | 12 +- Core/Tools/W3DView/RingGeneralPropPage.h | 12 +- Core/Tools/W3DView/RingPropertySheet.h | 4 +- Core/Tools/W3DView/RingSizePropPage.h | 14 +- Core/Tools/W3DView/SaveSettingsDialog.h | 8 +- Core/Tools/W3DView/ScaleDialog.h | 8 +- Core/Tools/W3DView/SceneLightDialog.h | 8 +- Core/Tools/W3DView/ScreenCursor.h | 20 +- Core/Tools/W3DView/SoundEditDialog.h | 10 +- Core/Tools/W3DView/SphereColorPropPage.h | 12 +- Core/Tools/W3DView/SphereGeneralPropPage.h | 12 +- Core/Tools/W3DView/SpherePropertySheet.h | 4 +- Core/Tools/W3DView/SphereSizePropPage.h | 14 +- Core/Tools/W3DView/TexturePathDialog.h | 6 +- Core/Tools/W3DView/Toolbar.h | 2 +- Core/Tools/W3DView/ViewerScene.cpp | 8 +- Core/Tools/W3DView/VolumeRandomDialog.h | 8 +- Core/Tools/W3DView/W3DView.cpp | 4 +- Core/Tools/W3DView/W3DViewDoc.h | 2 +- Core/Tools/W3DView/W3DViewView.h | 6 +- .../Include/Common/MapReaderWriterInfo.h | 2 +- .../Include/GameLogic/VictoryConditions.h | 6 +- .../GUI/GUICallbacks/Menus/DownloadMenu.cpp | 10 +- .../GUI/GUICallbacks/Menus/WOLLoginMenu.cpp | 6 +- .../GameEngine/Source/GameLogic/AI/AI.cpp | 4 +- .../Source/GameLogic/AI/AIStates.cpp | 12 +- .../GameLogic/Object/ObjectCreationList.cpp | 16 +- .../Update/AIUpdate/ChinookAIUpdate.cpp | 56 +++--- .../Object/Update/AIUpdate/DozerAIUpdate.cpp | 66 +++---- .../Object/Update/AIUpdate/JetAIUpdate.cpp | 86 ++++----- .../Update/AIUpdate/RailroadGuideAIUpdate.cpp | 2 +- .../Update/AIUpdate/SupplyTruckAIUpdate.cpp | 24 +-- .../Object/Update/AIUpdate/WorkerAIUpdate.cpp | 20 +- .../Object/Update/FireSpreadUpdate.cpp | 2 +- .../GameLogic/Object/Update/HordeUpdate.cpp | 2 +- .../Object/Update/StealthDetectorUpdate.cpp | 2 +- .../Object/Update/TensileFormationUpdate.cpp | 2 +- .../ScriptEngine/VictoryConditions.cpp | 24 +-- .../GameClient/Shadow/W3DProjectedShadow.cpp | 8 +- .../GameClient/Shadow/W3DVolumetricShadow.cpp | 8 +- .../W3DDevice/GameClient/W3DAssetManager.cpp | 8 +- .../W3DDevice/GameLogic/W3DGhostObject.cpp | 6 +- .../Source/WWVegas/WW3D2/assetmgr.cpp | 26 +-- .../Libraries/Source/WWVegas/WW3D2/dazzle.cpp | 6 +- .../Libraries/Source/WWVegas/WW3D2/decalmsh.h | 26 +-- .../Source/WWVegas/WW3D2/meshbuild.cpp | 10 +- .../Libraries/Source/WWVegas/WW3D2/scene.cpp | 8 +- .../Tools/WorldBuilder/src/ScriptDialog.cpp | 2 +- .../Tools/WorldBuilder/src/WorldBuilder.cpp | 6 +- .../WorldBuilder/src/WorldBuilderDoc.cpp | 6 +- .../Code/Tools/WorldBuilder/src/wbview3d.cpp | 156 ++++++++-------- .../Include/Common/MapReaderWriterInfo.h | 2 +- .../Include/GameLogic/VictoryConditions.h | 6 +- .../GUI/GUICallbacks/Menus/DownloadMenu.cpp | 10 +- .../GUI/GUICallbacks/Menus/WOLLoginMenu.cpp | 6 +- .../GameEngine/Source/GameLogic/AI/AI.cpp | 4 +- .../Source/GameLogic/AI/AIStates.cpp | 12 +- .../GameLogic/Object/ObjectCreationList.cpp | 16 +- .../Update/AIUpdate/ChinookAIUpdate.cpp | 66 +++---- .../Object/Update/AIUpdate/DozerAIUpdate.cpp | 66 +++---- .../Object/Update/AIUpdate/JetAIUpdate.cpp | 88 ++++----- .../Update/AIUpdate/RailroadGuideAIUpdate.cpp | 2 +- .../Update/AIUpdate/SupplyTruckAIUpdate.cpp | 24 +-- .../Object/Update/AIUpdate/WorkerAIUpdate.cpp | 20 +- .../Object/Update/FireSpreadUpdate.cpp | 2 +- .../GameLogic/Object/Update/HordeUpdate.cpp | 2 +- .../Object/Update/SpectreGunshipUpdate.cpp | 2 +- .../Object/Update/StealthDetectorUpdate.cpp | 2 +- .../Object/Update/TensileFormationUpdate.cpp | 2 +- .../ScriptEngine/VictoryConditions.cpp | 24 +-- .../GameClient/Shadow/W3DProjectedShadow.cpp | 8 +- .../GameClient/Shadow/W3DVolumetricShadow.cpp | 8 +- .../W3DDevice/GameClient/W3DAssetManager.cpp | 8 +- .../W3DDevice/GameLogic/W3DGhostObject.cpp | 6 +- .../Source/WWVegas/WW3D2/assetmgr.cpp | 26 +-- .../Libraries/Source/WWVegas/WW3D2/dazzle.cpp | 6 +- .../Libraries/Source/WWVegas/WW3D2/decalmsh.h | 26 +-- .../Source/WWVegas/WW3D2/meshbuild.cpp | 10 +- .../Libraries/Source/WWVegas/WW3D2/scene.cpp | 8 +- .../Tools/WorldBuilder/src/ScriptDialog.cpp | 2 +- .../Tools/WorldBuilder/src/WorldBuilder.cpp | 6 +- .../WorldBuilder/src/WorldBuilderDoc.cpp | 6 +- .../Code/Tools/WorldBuilder/src/wbview3d.cpp | 176 +++++++++--------- GeneralsMD/Code/Tools/wdump/mainfrm.h | 2 +- GeneralsMD/Code/Tools/wdump/rawfilem.h | 36 ++-- GeneralsMD/Code/Tools/wdump/wdeview.h | 2 +- GeneralsMD/Code/Tools/wdump/wdlview.h | 2 +- GeneralsMD/Code/Tools/wdump/wdtview.h | 2 +- GeneralsMD/Code/Tools/wdump/wdump.cpp | 4 +- GeneralsMD/Code/Tools/wdump/wdumpdoc.h | 2 +- GeneralsMD/Code/Tools/wdump/wdview.h | 2 +- 150 files changed, 1090 insertions(+), 1090 deletions(-) diff --git a/Core/GameEngine/Source/GameClient/FXList.cpp b/Core/GameEngine/Source/GameClient/FXList.cpp index 83908bbc2ac..cf6a47995a0 100644 --- a/Core/GameEngine/Source/GameClient/FXList.cpp +++ b/Core/GameEngine/Source/GameClient/FXList.cpp @@ -95,7 +95,7 @@ class SoundFXNugget : public FXNugget public: - void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override + virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override { AudioEventRTS sound(m_soundName); @@ -107,7 +107,7 @@ class SoundFXNugget : public FXNugget TheAudio->addAudioEvent(&sound); } - void doFXObj(const Object* primary, const Object* secondary = nullptr) const override + 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; } - void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real primarySpeed, const Coord3D *secondary, const Real /*overrideRadius*/ ) const override + 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; } - void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * secondary, const Real /*overrideRadius*/ ) const override + 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; } - void doFXObj(const Object* primary, const Object* /*secondary*/) const override + virtual void doFXObj(const Object* primary, const Object* /*secondary*/) const override { if (primary) { @@ -337,7 +337,7 @@ class LightPulseFXNugget : public FXNugget } } - void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override + 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 { } - void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override + 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 { } - void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override + 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; } - void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real overrideRadius ) const override + 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 } } - void doFXObj(const Object* primary, const Object* secondary) const override + virtual void doFXObj(const Object* primary, const Object* secondary) const override { if (primary) { @@ -695,12 +695,12 @@ class FXListAtBonePosFXNugget : public FXNugget m_orientToBone = true; } - void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const override + 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")); } - void doFXObj(const Object* primary, const Object* /*secondary*/) const override + virtual void doFXObj(const Object* primary, const Object* /*secondary*/) const override { if (primary) { diff --git a/Core/GameEngine/Source/GameClient/GUI/IMEManager.cpp b/Core/GameEngine/Source/GameClient/GUI/IMEManager.cpp index 6922515a8ce..e832f06c17e 100644 --- a/Core/GameEngine/Source/GameClient/GUI/IMEManager.cpp +++ b/Core/GameEngine/Source/GameClient/GUI/IMEManager.cpp @@ -92,36 +92,36 @@ class IMEManager : public IMEManagerInterface IMEManager(); ~IMEManager() override; - void init() override; - void reset() override; - void update() override; - - void attach( GameWindow *window ) override; ///< attach IME to specified window - void detach() override; ///< detach IME from current window - void enable() override; ///< Enable IME - void disable() override; ///< Disable IME - Bool isEnabled() override; ///< Is IME enabled - Bool isAttachedTo( GameWindow *window ) override; ///< Is the manager attached toa window - GameWindow* getWindow() override; ///< Returns the window we are currently attached to - Bool isComposing() override; ///< Manager is currently composing new input string - void getCompositionString( UnicodeString &string ) override; ///< Return the current composition string - Int getCompositionCursorPosition() override; ///< Returns the composition cursor position - Int getIndexBase() override; ///< Get index base for candidate list - - Int getCandidateCount() override; ///< Returns the total number of candidates - const UnicodeString* getCandidate( Int index ) override; ///< Returns the candidate string - Int getSelectedCandidateIndex() override; ///< Returns the indexed of the currently selected candidate - Int getCandidatePageSize() override; ///< Returns the page size for the candidates list - Int getCandidatePageStart() override; ///< Returns the index of the first visibel candidate + virtual void init() override; + virtual void reset() override; + virtual void update() override; + + virtual void attach( GameWindow *window ) override; ///< attach IME to specified window + virtual void detach() override; ///< detach IME from current window + virtual void enable() override; ///< Enable IME + virtual void disable() override; ///< Disable IME + virtual Bool isEnabled() override; ///< Is IME enabled + virtual Bool isAttachedTo( GameWindow *window ) override; ///< Is the manager attached toa window + virtual GameWindow* getWindow() override; ///< Returns the window we are currently attached to + virtual Bool isComposing() override; ///< Manager is currently composing new input string + virtual void getCompositionString( UnicodeString &string ) override; ///< Return the current composition string + virtual Int getCompositionCursorPosition() override; ///< Returns the composition cursor position + virtual Int getIndexBase() override; ///< Get index base for candidate list + + virtual Int getCandidateCount() override; ///< Returns the total number of candidates + virtual const UnicodeString* getCandidate( Int index ) override; ///< Returns the candidate string + virtual Int getSelectedCandidateIndex() override; ///< Returns the indexed of the currently selected candidate + virtual Int getCandidatePageSize() override; ///< Returns the page size for the candidates list + virtual Int getCandidatePageStart() override; ///< Returns the index of the first visibel candidate /// Checks for and services IME messages. Returns TRUE if message serviced - Bool serviceIMEMessage( void *windowsHandle, + virtual Bool serviceIMEMessage( void *windowsHandle, UnsignedInt message, Int wParam, Int lParam ) override; - Int result() override; ///< result return value of last serviced IME message + virtual Int result() override; ///< result return value of last serviced IME message protected: diff --git a/Core/GameEngine/Source/GameClient/GameText.cpp b/Core/GameEngine/Source/GameClient/GameText.cpp index 951c9247af2..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(); - ~GameTextManager() override; + virtual ~GameTextManager() override; - void init() override; ///< Initializes the text system + virtual void init() override; ///< Initializes the text system virtual void deinit(); ///< Shuts down the text system - void update() override {}; ///< update text manager - void reset() override; ///< Resets the text system + virtual void update() override {}; ///< update text manager + virtual void reset() override; ///< Resets the text system - UnicodeString fetch( const Char *label, Bool *exists = nullptr ) override; ///< Returns the associated labeled unicode text - UnicodeString fetch( AsciiString label, Bool *exists = nullptr ) override; ///< Returns the associated labeled unicode text - UnicodeString fetchFormat( const Char *label, ... ) override; - UnicodeString fetchOrSubstitute( const Char *label, const WideChar *substituteText ) override; - UnicodeString fetchOrSubstituteFormat( const Char *label, const WideChar *substituteFormat, ... ) override; - UnicodeString fetchOrSubstituteFormatVA( const Char *label, const WideChar *substituteFormat, va_list args ) override; + 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; - AsciiStringVec& getStringsWithLabelPrefix(AsciiString label) override; + virtual AsciiStringVec& getStringsWithLabelPrefix(AsciiString label) override; - void initMapStringFile( const AsciiString& filename ) override; + 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 367a630d600..4514c35a379 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() override {} + virtual ~GameSpyConfig() override {} // Pings - std::list getPingServers() override { return m_pingServers; } - Int getNumPingRepetitions() override { return m_pingReps; } - Int getPingTimeoutInMs() override { return m_pingTimeout; } - Int getPingCutoffGood() override { return m_pingCutoffGood; } - Int getPingCutoffBad() override { return m_pingCutoffBad; } + virtual std::list getPingServers() override { return m_pingServers; } + virtual Int getNumPingRepetitions() override { return m_pingReps; } + virtual Int getPingTimeoutInMs() override { return m_pingTimeout; } + virtual Int getPingCutoffGood() override { return m_pingCutoffGood; } + virtual Int getPingCutoffBad() override { return m_pingCutoffBad; } // QM - 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; } + virtual std::list getQMMaps() override { return m_qmMaps; } + virtual Int getQMBotID() override { return m_qmBotID; } + virtual Int getQMChannel() override { return m_qmChannel; } + virtual void setQMChannel(Int channel) override { m_qmChannel = channel; } // Player Info - Int getPointsForRank(Int rank) override; - Bool isPlayerVIP(Int id) override; + virtual Int getPointsForRank(Int rank) override; + virtual Bool isPlayerVIP(Int id) override; - Bool getManglerLocation(Int index, AsciiString& host, UnsignedShort& port) override; + virtual Bool getManglerLocation(Int index, AsciiString& host, UnsignedShort& port) override; // Ladder / Any other external parsing - AsciiString getLeftoverConfig() override { return m_leftoverConfig; } + virtual AsciiString getLeftoverConfig() override { return m_leftoverConfig; } // NAT Timeouts - Int getTimeBetweenRetries() override { return m_natRetryInterval; } - Int getMaxManglerRetries() override { return m_natMaxManglerRetries; } - time_t getRetryInterval() override { return m_natManglerRetryInterval; } - time_t getKeepaliveInterval() override { return m_natKeepaliveInterval; } - time_t getPortTimeout() override { return m_natPortTimeout; } - time_t getRoundTimeout() override { 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 - Bool restrictGamesToLobby() override { 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 7b3628bdb92..fb8f1b88d08 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: - ~GameSpyBuddyMessageQueue() override; + virtual ~GameSpyBuddyMessageQueue() override; GameSpyBuddyMessageQueue(); - void startThread() override; - void endThread() override; - Bool isThreadRunning() override; - Bool isConnected() override; - Bool isConnecting() override; + virtual void startThread() override; + virtual void endThread() override; + virtual Bool isThreadRunning() override; + virtual Bool isConnected() override; + virtual Bool isConnecting() override; - void addRequest( const BuddyRequest& req ) override; - Bool getRequest( BuddyRequest& req ) override; + virtual void addRequest( const BuddyRequest& req ) override; + virtual Bool getRequest( BuddyRequest& req ) override; - void addResponse( const BuddyResponse& resp ) override; - Bool getResponse( BuddyResponse& resp ) override; + virtual void addResponse( const BuddyResponse& resp ) override; + virtual Bool getResponse( BuddyResponse& resp ) override; - GPProfile getLocalProfileID() override; + 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() override; + 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 011dd00ade7..161db067202 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: - ~GameResultsQueue() override; + virtual ~GameResultsQueue() override; GameResultsQueue(); - void init() override {} - void reset() override {} - void update() override {} + virtual void init() override {} + virtual void reset() override {} + virtual void update() override {} - void startThreads() override; - void endThreads() override; - Bool areThreadsRunning() override; + virtual void startThreads() override; + virtual void endThreads() override; + virtual Bool areThreadsRunning() override; - void addRequest( const GameResultsRequest& req ) override; - Bool getRequest( GameResultsRequest& resp ) override; + virtual void addRequest( const GameResultsRequest& req ) override; + virtual Bool getRequest( GameResultsRequest& resp ) override; - void addResponse( const GameResultsResponse& resp ) override; - Bool getResponse( GameResultsResponse& resp ) override; + virtual void addResponse( const GameResultsResponse& resp ) override; + virtual Bool getResponse( GameResultsResponse& resp ) override; - Bool areGameResultsBeingSent() override; + virtual Bool areGameResultsBeingSent() override; private: MutexClass m_requestMutex; @@ -92,7 +92,7 @@ class GameResultsThreadClass : public ThreadClass public: GameResultsThreadClass() : ThreadClass() {} - void Thread_Function() override; + 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 1b08d17bcbc..178a1b1ad3c 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: - ~GameSpyPeerMessageQueue() override; + virtual ~GameSpyPeerMessageQueue() override; GameSpyPeerMessageQueue(); - void startThread() override; - void endThread() override; - Bool isThreadRunning() override; - Bool isConnected() override; - Bool isConnecting() override; + virtual void startThread() override; + virtual void endThread() override; + virtual Bool isThreadRunning() override; + virtual Bool isConnected() override; + virtual Bool isConnecting() override; - void addRequest( const PeerRequest& req ) override; - Bool getRequest( PeerRequest& req ) override; + virtual void addRequest( const PeerRequest& req ) override; + virtual Bool getRequest( PeerRequest& req ) override; - void addResponse( const PeerResponse& resp ) override; - Bool getResponse( PeerResponse& resp ) override; + virtual void addResponse( const PeerResponse& resp ) override; + virtual Bool getResponse( PeerResponse& resp ) override; - SerialAuthResult getSerialAuthResult() override { 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() override; + 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 924585abc44..5636a1069dd 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: - ~GameSpyPSMessageQueue() override; + virtual ~GameSpyPSMessageQueue() override; GameSpyPSMessageQueue(); - void startThread() override; - void endThread() override; - Bool isThreadRunning() override; + virtual void startThread() override; + virtual void endThread() override; + virtual Bool isThreadRunning() override; - void addRequest( const PSRequest& req ) override; - Bool getRequest( PSRequest& req ) override; + virtual void addRequest( const PSRequest& req ) override; + virtual Bool getRequest( PSRequest& req ) override; - void addResponse( const PSResponse& resp ) override; - Bool getResponse( PSResponse& resp ) override; + virtual void addResponse( const PSResponse& resp ) override; + virtual Bool getResponse( PSResponse& resp ) override; - void trackPlayerStats( PSPlayerStats stats ) override; - PSPlayerStats findPlayerStatsByID( Int id ) override; + 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() override; + 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 243f9177155..6040a0e2415 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: - ~Pinger() override; + virtual ~Pinger() override; Pinger(); - void startThreads() override; - void endThreads() override; - Bool areThreadsRunning() override; + virtual void startThreads() override; + virtual void endThreads() override; + virtual Bool areThreadsRunning() override; - void addRequest( const PingRequest& req ) override; - Bool getRequest( PingRequest& resp ) override; + virtual void addRequest( const PingRequest& req ) override; + virtual Bool getRequest( PingRequest& resp ) override; - void addResponse( const PingResponse& resp ) override; - Bool getResponse( PingResponse& resp ) override; + virtual void addResponse( const PingResponse& resp ) override; + virtual Bool getResponse( PingResponse& resp ) override; - Bool arePingsInProgress() override; - Int getPing( AsciiString hostname ) override; + virtual Bool arePingsInProgress() override; + virtual Int getPing( AsciiString hostname ) override; - void clearPingMap() override; - AsciiString getPingString( Int timeout ) override; + 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() override; + 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 cca4a888076..0a63bc02557 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() 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. + virtual ~Network() override; + virtual void init() override; ///< Initialize or re-initialize the instance + virtual void reset() override; ///< Reinitialize the network + virtual void update() override; ///< Process command list + virtual 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) 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; - Bool isStalling() override; - void parseUserList( const GameInfo *game ) override; - void startGame() override; ///< Sets the network game frame counter to -1 + virtual void setLocalAddress(UnsignedInt ip, UnsignedInt port) override; + virtual UnsignedInt getRunAhead() override { return m_runAhead; } + virtual UnsignedInt getFrameRate() override { return m_frameRate; } + virtual UnsignedInt getPacketArrivalCushion() override; ///< Returns the smallest packet arrival cushion since this was last called. + virtual Bool isFrameDataReady() override; + virtual Bool isStalling() override; + virtual void parseUserList( const GameInfo *game ) override; + virtual void startGame() override; ///< Sets the network game frame counter to -1 - void sendChat(UnicodeString text, Int playerMask) override; - void sendDisconnectChat(UnicodeString text) override; + virtual void sendChat(UnicodeString text, Int playerMask) override; + virtual void sendDisconnectChat(UnicodeString text) override; - 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; + virtual void sendFile(AsciiString path, UnsignedByte playerMask, UnsignedShort commandID) override; + virtual UnsignedShort sendFileAnnounce(AsciiString path, UnsignedByte playerMask) override; + virtual Int getFileTransferProgress(Int playerID, AsciiString path) override; + virtual Bool areAllQueuesEmpty() override; - void quitGame() override; - void selfDestructPlayer(Int index) override; + virtual void quitGame() override; + virtual void selfDestructPlayer(Int index) override; - void voteForPlayerDisconnect(Int slot) override; - Bool isPacketRouter() override; + virtual void voteForPlayerDisconnect(Int slot) override; + virtual Bool isPacketRouter() override; // Bandwidth metrics - Real getIncomingBytesPerSecond() override; - Real getIncomingPacketsPerSecond() override; - Real getOutgoingBytesPerSecond() override; - Real getOutgoingPacketsPerSecond() override; - Real getUnknownBytesPerSecond() override; - Real getUnknownPacketsPerSecond() override; + virtual Real getIncomingBytesPerSecond() override; + virtual Real getIncomingPacketsPerSecond() override; + virtual Real getOutgoingBytesPerSecond() override; + virtual Real getOutgoingPacketsPerSecond() override; + virtual Real getUnknownBytesPerSecond() override; + virtual Real getUnknownPacketsPerSecond() override; // Multiplayer Load Progress Functions - void updateLoadProgress( Int percent ) override; - void loadProgressComplete() override; - void sendTimeOutGameStart() override; + virtual void updateLoadProgress( Int percent ) override; + virtual void loadProgressComplete() override; + virtual 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() override; - UnicodeString getPlayerName(Int playerNum) override; - Int getNumPlayers() override; + virtual UnsignedInt getLocalPlayerID() override; + virtual UnicodeString getPlayerName(Int playerNum) override; + virtual Int getNumPlayers() override; - Int getAverageFPS() override { return m_conMgr->getAverageFPS(); } - Int getSlotAverageFPS(Int slot) override; + virtual Int getAverageFPS() override { return m_conMgr->getAverageFPS(); } + virtual Int getSlotAverageFPS(Int slot) override; - void attachTransport(Transport *transport) override; - void initTransport() override; + virtual void attachTransport(Transport *transport) override; + virtual void initTransport() override; - void setSawCRCMismatch() override; - Bool sawCRCMismatch() override { return m_sawCRCMismatch; } - Bool isPlayerConnected( Int playerID ) override; + virtual void setSawCRCMismatch() override; + virtual Bool sawCRCMismatch() override { return m_sawCRCMismatch; } + virtual Bool isPlayerConnected( Int playerID ) override; - void notifyOthersOfCurrentFrame() override; ///< Tells all the other players what frame we are on. - void notifyOthersOfNewFrame(UnsignedInt frame) override; ///< 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() override; ///< 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() override; - Int getPingsSent() override; - Int getPingsReceived() override; + 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/Source/W3DDevice/GameClient/W3DMouse.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp index dd62b49011c..814bb83cce5 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() override; + 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 1271ed4ee90..e55fee5bde9 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 30d095aeabf..a8d883e560d 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) {}; - Int read(void *pData, Int numBytes) override { + virtual Int read(void *pData, Int numBytes) override { return(m_file->read(pData, numBytes)); }; }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp b/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp index 0f003fc5b41..de9f20afc2b 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp @@ -123,15 +123,15 @@ class CollectionPrototypeClass : public PrototypeClass public: CollectionPrototypeClass(CollectionDefClass * def) { ColDef = def; WWASSERT(ColDef); } - const char * Get_Name() const override { return ColDef->Get_Name(); } - int Get_Class_ID() const override { return RenderObjClass::CLASSID_COLLECTION; } - RenderObjClass * Create() override { return NEW_REF( CollectionClass, (*ColDef)); } - void DeleteSelf() override { 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: - ~CollectionPrototypeClass() override { delete ColDef; } + virtual ~CollectionPrototypeClass() override { delete ColDef; } }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp b/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp index 2bb1285a15f..d8ef8aa5cd6 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp @@ -92,15 +92,15 @@ class HModelPrototypeClass : public PrototypeClass public: HModelPrototypeClass(HModelDefClass * def) { HModelDef = def; assert(HModelDef); } - const char * Get_Name() const override { return HModelDef->Get_Name(); } - int Get_Class_ID() const override { return RenderObjClass::CLASSID_HLOD; } - RenderObjClass * Create() override { return NEW_REF( HLodClass, (*HModelDef) ); } - void DeleteSelf() override { 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: - ~HModelPrototypeClass() override { delete HModelDef; } + virtual ~HModelPrototypeClass() override { delete HModelDef; } }; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp index 0de33206c35..47954075d76 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp @@ -1192,9 +1192,9 @@ void RenderObjClass::Add_Dependencies_To_List class RenderObjPersistFactoryClass : public PersistFactoryClass { - uint32 Chunk_ID() const override; - PersistClass * Load(ChunkLoadClass & cload) const override; - void Save(ChunkSaveClass & csave,PersistClass * obj) const override; + 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/textureloader.cpp b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp index 6bf89d6bc18..4626a7d8fa9 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() override; + virtual void Thread_Function() override; } _TextureLoadThread; diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.cpp b/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.cpp index b5df8595aaa..81f13b97e38 100644 --- a/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.cpp +++ b/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.cpp @@ -162,7 +162,7 @@ class ActiveCategoryStackClass : public VectorClass // 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() override { WWASSERT((ThreadID == -1 && Count == 0) || (ThreadID != -1 && Count == 1)); } + virtual ~ActiveCategoryStackClass() override { WWASSERT((ThreadID == -1 && Count == 0) || (ThreadID != -1 && Count == 1)); } ActiveCategoryStackClass & operator = (const ActiveCategoryStackClass & that); diff --git a/Core/Libraries/Source/WWVegas/WWLib/multilist.h b/Core/Libraries/Source/WWVegas/WWLib/multilist.h index eea610c3074..e2085838676 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/multilist.h +++ b/Core/Libraries/Source/WWVegas/WWLib/multilist.h @@ -218,7 +218,7 @@ class MultiListClass : public GenericMultiListClass MultiListClass() { } - virtual ~MultiListClass() + virtual ~MultiListClass() override { while (!Is_Empty()) { Remove_Head(); @@ -342,7 +342,7 @@ class RefMultiListClass : public GenericMultiListClass { public: - virtual ~RefMultiListClass() + virtual ~RefMultiListClass() override { while (!Is_Empty()) { Release_Head(); diff --git a/Core/Libraries/Source/debug/internal.h b/Core/Libraries/Source/debug/internal.h index 3b5b8efc163..8a7be5aaf2e 100644 --- a/Core/Libraries/Source/debug/internal.h +++ b/Core/Libraries/Source/debug/internal.h @@ -86,9 +86,9 @@ class DebugCmdInterfaceDebug: public DebugCmdInterface { public: virtual bool Execute(class Debug& dbg, const char *cmd, CommandMode cmdmode, - unsigned argn, const char * const * argv); + unsigned argn, const char * const * argv) override; - virtual void Delete() + virtual void Delete() override { this->~DebugCmdInterfaceDebug(); DebugFreeMemory(this); diff --git a/Core/Libraries/Source/debug/internal_io.h b/Core/Libraries/Source/debug/internal_io.h index b1ccef70f0f..1b550fab418 100644 --- a/Core/Libraries/Source/debug/internal_io.h +++ b/Core/Libraries/Source/debug/internal_io.h @@ -59,14 +59,14 @@ class DebugIOCon: public DebugIOInterface public: explicit DebugIOCon(); - virtual ~DebugIOCon(); - virtual int Read(char *buf, int maxchar); - virtual void Write(StringType type, const char *src, const char *str); - virtual void EmergencyFlush() {} + virtual ~DebugIOCon() override; + virtual int Read(char *buf, int maxchar) override; + virtual void Write(StringType type, const char *src, const char *str) override; + virtual void EmergencyFlush() override {} virtual void Execute(class Debug& dbg, const char *cmd, bool structuredCmd, - unsigned argn, const char * const * argv); + unsigned argn, const char * const * argv) override; static DebugIOInterface *Create(); - virtual void Delete(); + virtual void Delete() override; }; /// \internal \brief con flat I/O class @@ -210,14 +210,14 @@ class DebugIOFlat: public DebugIOInterface public: explicit DebugIOFlat(); - virtual ~DebugIOFlat(); - virtual int Read(char *buf, int maxchar) { return 0; } - virtual void Write(StringType type, const char *src, const char *str); - virtual void EmergencyFlush(); + virtual ~DebugIOFlat() override; + virtual int Read(char *buf, int maxchar) override { return 0; } + virtual void Write(StringType type, const char *src, const char *str) override; + virtual void EmergencyFlush() override; virtual void Execute(class Debug& dbg, const char *cmd, bool structuredCmd, - unsigned argn, const char * const * argv); + unsigned argn, const char * const * argv) override; static DebugIOInterface *Create(); - virtual void Delete(); + virtual void Delete() override; }; /// \internal \brief net debug I/O class @@ -228,14 +228,14 @@ class DebugIONet: public DebugIOInterface public: explicit DebugIONet(); - virtual ~DebugIONet(); - virtual int Read(char *buf, int maxchar); - virtual void Write(StringType type, const char *src, const char *str); - virtual void EmergencyFlush(); + virtual ~DebugIONet() override; + virtual int Read(char *buf, int maxchar) override; + virtual void Write(StringType type, const char *src, const char *str) override; + virtual void EmergencyFlush() override; virtual void Execute(class Debug& dbg, const char *cmd, bool structuredCmd, - unsigned argn, const char * const * argv); + unsigned argn, const char * const * argv) override; static DebugIOInterface *Create(); - virtual void Delete(); + virtual void Delete() override; }; /// \internal \brief ods debug I/O class @@ -243,11 +243,11 @@ class DebugIOOds: public DebugIOInterface { public: explicit DebugIOOds() {} - virtual int Read(char *buf, int maxchar) { return 0; } - virtual void Write(StringType type, const char *src, const char *str); - virtual void EmergencyFlush() {} + virtual int Read(char *buf, int maxchar) override { return 0; } + virtual void Write(StringType type, const char *src, const char *str) override; + virtual void EmergencyFlush() override {} virtual void Execute(class Debug& dbg, const char *cmd, bool structuredCmd, - unsigned argn, const char * const * argv) {} + unsigned argn, const char * const * argv) override {} static DebugIOInterface *Create(); - virtual void Delete(); + virtual void Delete() override; }; diff --git a/Core/Libraries/Source/profile/internal_cmd.h b/Core/Libraries/Source/profile/internal_cmd.h index a315fc6e2a9..a1d43bf0897 100644 --- a/Core/Libraries/Source/profile/internal_cmd.h +++ b/Core/Libraries/Source/profile/internal_cmd.h @@ -51,6 +51,6 @@ class ProfileCmdInterface: public DebugCmdInterface void RunResultFunctions(); virtual bool Execute(class Debug& dbg, const char *cmd, CommandMode cmdmode, - unsigned argn, const char * const * argv); - virtual void Delete() {} + unsigned argn, const char * const * argv) override; + virtual void Delete() override {} }; diff --git a/Core/Tools/DebugWindow/DebugWindow.h b/Core/Tools/DebugWindow/DebugWindow.h index fb9366810b6..9e11d6e047d 100644 --- a/Core/Tools/DebugWindow/DebugWindow.h +++ b/Core/Tools/DebugWindow/DebugWindow.h @@ -38,7 +38,7 @@ class CDebugWindowApp : public CWinApp { public: CDebugWindowApp(); - ~CDebugWindowApp(); + ~CDebugWindowApp() override; DebugWindowDialog* GetDialogWindow(); void SetDialogWindow(DebugWindowDialog* pWnd); diff --git a/Core/Tools/ParticleEditor/CButtonShowColor.h b/Core/Tools/ParticleEditor/CButtonShowColor.h index 64238d4585c..f570742769b 100644 --- a/Core/Tools/ParticleEditor/CButtonShowColor.h +++ b/Core/Tools/ParticleEditor/CButtonShowColor.h @@ -29,7 +29,7 @@ class CButtonShowColor : public CButton const RGBColor& getColor() 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/Core/Tools/ParticleEditor/MoreParmsDialog.h b/Core/Tools/ParticleEditor/MoreParmsDialog.h index 6e57198500d..2d1800b2588 100644 --- a/Core/Tools/ParticleEditor/MoreParmsDialog.h +++ b/Core/Tools/ParticleEditor/MoreParmsDialog.h @@ -46,7 +46,7 @@ class MoreParmsDialog : public CDialog public: enum { IDD = IDD_PSEd_EditMoreParms }; MoreParmsDialog(UINT nIDTemplate = MoreParmsDialog::IDD, CWnd* pParentWnd = nullptr); - virtual ~MoreParmsDialog(); + virtual ~MoreParmsDialog() override; void InitPanel(); diff --git a/Core/Tools/ParticleEditor/ParticleEditor.h b/Core/Tools/ParticleEditor/ParticleEditor.h index e498f903e5e..9099fa7a55c 100644 --- a/Core/Tools/ParticleEditor/ParticleEditor.h +++ b/Core/Tools/ParticleEditor/ParticleEditor.h @@ -38,7 +38,7 @@ class CDebugWindowApp : public CWinApp { public: CDebugWindowApp(); - ~CDebugWindowApp(); + ~CDebugWindowApp() override; DebugWindowDialog* GetDialogWindow(); void SetDialogWindow(DebugWindowDialog* pWnd); diff --git a/Core/Tools/ParticleEditor/ParticleEditorDialog.h b/Core/Tools/ParticleEditor/ParticleEditorDialog.h index 69203757a5c..e33ae65606b 100644 --- a/Core/Tools/ParticleEditor/ParticleEditorDialog.h +++ b/Core/Tools/ParticleEditor/ParticleEditorDialog.h @@ -55,7 +55,7 @@ class DebugWindowDialog : public CDialog public: enum {IDD = IDD_PSEd}; DebugWindowDialog(UINT nIDTemplate = DebugWindowDialog::IDD, CWnd* pParentWnd = nullptr); - virtual ~DebugWindowDialog(); + virtual ~DebugWindowDialog() override; void InitPanel(); HWND GetMainWndHWND(); diff --git a/Core/Tools/W3DView/AdvancedAnimSheet.h b/Core/Tools/W3DView/AdvancedAnimSheet.h index 42244a55901..345e3cee940 100644 --- a/Core/Tools/W3DView/AdvancedAnimSheet.h +++ b/Core/Tools/W3DView/AdvancedAnimSheet.h @@ -62,7 +62,7 @@ class CAdvancedAnimSheet : public CPropertySheet // Implementation public: - virtual ~CAdvancedAnimSheet(); + virtual ~CAdvancedAnimSheet() override; // Generated message map functions protected: diff --git a/Core/Tools/W3DView/AnimMixingPage.h b/Core/Tools/W3DView/AnimMixingPage.h index 0a917858dc8..df4314d8838 100644 --- a/Core/Tools/W3DView/AnimMixingPage.h +++ b/Core/Tools/W3DView/AnimMixingPage.h @@ -33,7 +33,7 @@ class CAnimMixingPage : public CPropertyPage // Construction public: CAnimMixingPage(CAdvancedAnimSheet *sheet = nullptr); - ~CAnimMixingPage(); + ~CAnimMixingPage() override; // Dialog Data //{{AFX_DATA(CAnimMixingPage) diff --git a/Core/Tools/W3DView/AnimReportPage.h b/Core/Tools/W3DView/AnimReportPage.h index 591aa82e269..8432b41aa8e 100644 --- a/Core/Tools/W3DView/AnimReportPage.h +++ b/Core/Tools/W3DView/AnimReportPage.h @@ -34,7 +34,7 @@ class CAnimReportPage : public CPropertyPage // Construction public: CAnimReportPage(CAdvancedAnimSheet *sheet = nullptr); - ~CAnimReportPage(); + ~CAnimReportPage() override; // Dialog Data //{{AFX_DATA(CAnimReportPage) diff --git a/Core/Tools/W3DView/AnimationPropPage.h b/Core/Tools/W3DView/AnimationPropPage.h index cd10d5cd399..f31d4e1ad6e 100644 --- a/Core/Tools/W3DView/AnimationPropPage.h +++ b/Core/Tools/W3DView/AnimationPropPage.h @@ -31,7 +31,7 @@ class CAnimationPropPage : public CPropertyPage // Construction public: CAnimationPropPage(); - ~CAnimationPropPage(); + ~CAnimationPropPage() override; // Dialog Data //{{AFX_DATA(CAnimationPropPage) diff --git a/Core/Tools/W3DView/AssetPropertySheet.h b/Core/Tools/W3DView/AssetPropertySheet.h index c770b2f5752..08bd1a295f5 100644 --- a/Core/Tools/W3DView/AssetPropertySheet.h +++ b/Core/Tools/W3DView/AssetPropertySheet.h @@ -45,7 +45,7 @@ class CAssetPropertySheet : public CPropertySheet // Implementation public: - virtual ~CAssetPropertySheet(); + virtual ~CAssetPropertySheet() override; // Generated message map functions protected: diff --git a/Core/Tools/W3DView/ColorBar.h b/Core/Tools/W3DView/ColorBar.h index a66c9a0af46..2c6410e7ba3 100644 --- a/Core/Tools/W3DView/ColorBar.h +++ b/Core/Tools/W3DView/ColorBar.h @@ -108,7 +108,7 @@ class ColorBarClass : public CWnd // Implementation public: - virtual ~ColorBarClass(); + virtual ~ColorBarClass() override; // Generated message map functions protected: diff --git a/Core/Tools/W3DView/ColorPicker.h b/Core/Tools/W3DView/ColorPicker.h index fa6d833158c..3339d11bec6 100644 --- a/Core/Tools/W3DView/ColorPicker.h +++ b/Core/Tools/W3DView/ColorPicker.h @@ -82,7 +82,7 @@ class ColorPickerClass : public CWnd // Implementation public: - virtual ~ColorPickerClass(); + virtual ~ColorPickerClass() override; // Generated message map functions protected: diff --git a/Core/Tools/W3DView/DialogToolbar.h b/Core/Tools/W3DView/DialogToolbar.h index c614a35d13a..e1812168d26 100644 --- a/Core/Tools/W3DView/DialogToolbar.h +++ b/Core/Tools/W3DView/DialogToolbar.h @@ -46,7 +46,7 @@ class DialogToolbarClass : public CToolBar { public: DialogToolbarClass (); - virtual ~DialogToolbarClass () {} + virtual ~DialogToolbarClass () override {} // Form Data public: diff --git a/Core/Tools/W3DView/EmitterColorPropPage.h b/Core/Tools/W3DView/EmitterColorPropPage.h index e928e421fd7..6e64455dd72 100644 --- a/Core/Tools/W3DView/EmitterColorPropPage.h +++ b/Core/Tools/W3DView/EmitterColorPropPage.h @@ -39,7 +39,7 @@ class EmitterColorPropPageClass : public CPropertyPage // Construction public: EmitterColorPropPageClass (EmitterInstanceListClass *pemitter_list = nullptr); - ~EmitterColorPropPageClass (); + ~EmitterColorPropPageClass () override; // Dialog Data //{{AFX_DATA(EmitterColorPropPageClass) diff --git a/Core/Tools/W3DView/EmitterFramePropPage.h b/Core/Tools/W3DView/EmitterFramePropPage.h index f2f80553da2..ace4125c05c 100644 --- a/Core/Tools/W3DView/EmitterFramePropPage.h +++ b/Core/Tools/W3DView/EmitterFramePropPage.h @@ -36,7 +36,7 @@ class EmitterFramePropPageClass : public CPropertyPage // Construction public: EmitterFramePropPageClass(); - ~EmitterFramePropPageClass(); + ~EmitterFramePropPageClass() override; // Dialog Data //{{AFX_DATA(EmitterFramePropPageClass) diff --git a/Core/Tools/W3DView/EmitterGeneralPropPage.h b/Core/Tools/W3DView/EmitterGeneralPropPage.h index 1096611b810..833de0ddb12 100644 --- a/Core/Tools/W3DView/EmitterGeneralPropPage.h +++ b/Core/Tools/W3DView/EmitterGeneralPropPage.h @@ -39,7 +39,7 @@ class EmitterGeneralPropPageClass : public CPropertyPage // Construction public: EmitterGeneralPropPageClass (EmitterInstanceListClass *pemitter_list = nullptr); - ~EmitterGeneralPropPageClass (); + ~EmitterGeneralPropPageClass () override; // Dialog Data //{{AFX_DATA(EmitterGeneralPropPageClass) diff --git a/Core/Tools/W3DView/EmitterInstanceList.h b/Core/Tools/W3DView/EmitterInstanceList.h index dd5453cd057..20cca34c371 100644 --- a/Core/Tools/W3DView/EmitterInstanceList.h +++ b/Core/Tools/W3DView/EmitterInstanceList.h @@ -53,7 +53,7 @@ class EmitterInstanceListClass : public ParticleEmitterDefClass EmitterInstanceListClass (const EmitterInstanceListClass &src) : ParticleEmitterDefClass (src) { } - virtual ~EmitterInstanceListClass (); + virtual ~EmitterInstanceListClass () override; /////////////////////////////////////////////////////// // Public methods @@ -71,30 +71,30 @@ class EmitterInstanceListClass : public ParticleEmitterDefClass // definition and can be used to create a new prototype loader. // - virtual void Set_Velocity (const Vector3 &value); - virtual void Set_Acceleration (const Vector3 &value); - virtual void Set_Burst_Size (unsigned int count); - virtual void Set_Outward_Vel (float value); - virtual void Set_Vel_Inherit (float value); + virtual void Set_Velocity (const Vector3 &value) override; + virtual void Set_Acceleration (const Vector3 &value) override; + virtual void Set_Burst_Size (unsigned int count) override; + virtual void Set_Outward_Vel (float value) override; + virtual void Set_Vel_Inherit (float value) override; // // Randomizer accessors // - virtual void Set_Velocity_Random (Vector3Randomizer *randomizer); + virtual void Set_Velocity_Random (Vector3Randomizer *randomizer) override; // // Keyframe accessors // - virtual void Set_Color_Keyframes (ParticlePropertyStruct &keyframes); - virtual void Set_Opacity_Keyframes (ParticlePropertyStruct &keyframes); - virtual void Set_Size_Keyframes (ParticlePropertyStruct &keyframes); - virtual void Set_Rotation_Keyframes (ParticlePropertyStruct &keyframes, float orient_rnd); - virtual void Set_Frame_Keyframes (ParticlePropertyStruct &keyframes); - virtual void Set_Blur_Time_Keyframes (ParticlePropertyStruct &keyframes); - - virtual void Get_Color_Keyframes (ParticlePropertyStruct &keyframes) const; - virtual void Get_Opacity_Keyframes (ParticlePropertyStruct &keyframes) const; - virtual void Get_Size_Keyframes (ParticlePropertyStruct &keyframes) const; + virtual void Set_Color_Keyframes (ParticlePropertyStruct &keyframes) override; + virtual void Set_Opacity_Keyframes (ParticlePropertyStruct &keyframes) override; + virtual void Set_Size_Keyframes (ParticlePropertyStruct &keyframes) override; + virtual void Set_Rotation_Keyframes (ParticlePropertyStruct &keyframes, float orient_rnd) override; + virtual void Set_Frame_Keyframes (ParticlePropertyStruct &keyframes) override; + virtual void Set_Blur_Time_Keyframes (ParticlePropertyStruct &keyframes) override; + + virtual void Get_Color_Keyframes (ParticlePropertyStruct &keyframes) const override; + virtual void Get_Opacity_Keyframes (ParticlePropertyStruct &keyframes) const override; + virtual void Get_Size_Keyframes (ParticlePropertyStruct &keyframes) const override; private: diff --git a/Core/Tools/W3DView/EmitterLineGroupPropPage.h b/Core/Tools/W3DView/EmitterLineGroupPropPage.h index fd502f7ab1f..637b2ca11dd 100644 --- a/Core/Tools/W3DView/EmitterLineGroupPropPage.h +++ b/Core/Tools/W3DView/EmitterLineGroupPropPage.h @@ -39,7 +39,7 @@ class EmitterLineGroupPropPageClass : public CPropertyPage // Construction public: EmitterLineGroupPropPageClass(); - ~EmitterLineGroupPropPageClass(); + ~EmitterLineGroupPropPageClass() override; // Dialog Data //{{AFX_DATA(EmitterLineGroupPropPageClass) diff --git a/Core/Tools/W3DView/EmitterLinePropPage.h b/Core/Tools/W3DView/EmitterLinePropPage.h index 8e6566b1c0e..e9ada2a5899 100644 --- a/Core/Tools/W3DView/EmitterLinePropPage.h +++ b/Core/Tools/W3DView/EmitterLinePropPage.h @@ -36,7 +36,7 @@ class EmitterLinePropPageClass : public CPropertyPage // Construction public: EmitterLinePropPageClass(); - ~EmitterLinePropPageClass(); + ~EmitterLinePropPageClass() override; // Dialog Data //{{AFX_DATA(EmitterLinePropPageClass) diff --git a/Core/Tools/W3DView/EmitterParticlePropPage.h b/Core/Tools/W3DView/EmitterParticlePropPage.h index b3a084d425c..a92acee4612 100644 --- a/Core/Tools/W3DView/EmitterParticlePropPage.h +++ b/Core/Tools/W3DView/EmitterParticlePropPage.h @@ -39,7 +39,7 @@ class EmitterParticlePropPageClass : public CPropertyPage // Construction public: EmitterParticlePropPageClass (EmitterInstanceListClass *pemitter_list = nullptr); - ~EmitterParticlePropPageClass (); + ~EmitterParticlePropPageClass () override; // Dialog Data //{{AFX_DATA(EmitterParticlePropPageClass) diff --git a/Core/Tools/W3DView/EmitterPhysicsPropPage.h b/Core/Tools/W3DView/EmitterPhysicsPropPage.h index c94a0c44501..3af0f56d21b 100644 --- a/Core/Tools/W3DView/EmitterPhysicsPropPage.h +++ b/Core/Tools/W3DView/EmitterPhysicsPropPage.h @@ -38,7 +38,7 @@ class EmitterPhysicsPropPageClass : public CPropertyPage // Construction public: EmitterPhysicsPropPageClass (EmitterInstanceListClass *pemitter_list = nullptr); - ~EmitterPhysicsPropPageClass (); + ~EmitterPhysicsPropPageClass () override; // Dialog Data //{{AFX_DATA(EmitterPhysicsPropPageClass) diff --git a/Core/Tools/W3DView/EmitterPropertySheet.h b/Core/Tools/W3DView/EmitterPropertySheet.h index 80a9bca7937..361d3e5b46e 100644 --- a/Core/Tools/W3DView/EmitterPropertySheet.h +++ b/Core/Tools/W3DView/EmitterPropertySheet.h @@ -61,12 +61,12 @@ class EmitterPropertySheetClass : public CPropertySheet // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(EmitterPropertySheetClass) protected: - virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam); + virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL // Implementation public: - virtual ~EmitterPropertySheetClass(); + virtual ~EmitterPropertySheetClass() override; // Generated message map functions protected: diff --git a/Core/Tools/W3DView/EmitterRotationPropPage.h b/Core/Tools/W3DView/EmitterRotationPropPage.h index 977561c66dc..9f2b6d47ac2 100644 --- a/Core/Tools/W3DView/EmitterRotationPropPage.h +++ b/Core/Tools/W3DView/EmitterRotationPropPage.h @@ -38,7 +38,7 @@ class EmitterRotationPropPageClass : public CPropertyPage // Construction public: EmitterRotationPropPageClass(); - ~EmitterRotationPropPageClass(); + ~EmitterRotationPropPageClass() override; // Dialog Data //{{AFX_DATA(EmitterRotationPropPageClass) diff --git a/Core/Tools/W3DView/EmitterSizePropPage.h b/Core/Tools/W3DView/EmitterSizePropPage.h index d53b5975dab..7f357de378d 100644 --- a/Core/Tools/W3DView/EmitterSizePropPage.h +++ b/Core/Tools/W3DView/EmitterSizePropPage.h @@ -39,7 +39,7 @@ class EmitterSizePropPageClass : public CPropertyPage // Construction public: EmitterSizePropPageClass(EmitterInstanceListClass *pemitter = nullptr); - ~EmitterSizePropPageClass(); + ~EmitterSizePropPageClass() override; // Dialog Data //{{AFX_DATA(EmitterSizePropPageClass) diff --git a/Core/Tools/W3DView/EmitterUserPropPage.h b/Core/Tools/W3DView/EmitterUserPropPage.h index accdb6e5324..66db288932f 100644 --- a/Core/Tools/W3DView/EmitterUserPropPage.h +++ b/Core/Tools/W3DView/EmitterUserPropPage.h @@ -36,7 +36,7 @@ class EmitterUserPropPageClass : public CPropertyPage // Construction public: EmitterUserPropPageClass (EmitterInstanceListClass *pemitter_list = nullptr); - ~EmitterUserPropPageClass (); + ~EmitterUserPropPageClass () override; // Dialog Data //{{AFX_DATA(EmitterUserPropPageClass) diff --git a/Core/Tools/W3DView/GammaDialog.h b/Core/Tools/W3DView/GammaDialog.h index 6252b3d024b..05bf15b0913 100644 --- a/Core/Tools/W3DView/GammaDialog.h +++ b/Core/Tools/W3DView/GammaDialog.h @@ -42,7 +42,7 @@ class GammaDialogClass : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(GammaDialogClass) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -50,8 +50,8 @@ class GammaDialogClass : public CDialog // Generated message map functions //{{AFX_MSG(GammaDialogClass) - virtual BOOL OnInitDialog(); - virtual void OnOK(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; afx_msg void OnReleasedcaptureGammaSlider(NMHDR* pNMHDR, LRESULT* pResult); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/GraphicView.h b/Core/Tools/W3DView/GraphicView.h index 7175327089c..6b3a2b4519a 100644 --- a/Core/Tools/W3DView/GraphicView.h +++ b/Core/Tools/W3DView/GraphicView.h @@ -66,7 +66,7 @@ class CGraphicView : public CView // Implementation protected: - virtual ~CGraphicView(); + virtual ~CGraphicView() override; #ifdef RTS_DEBUG virtual void AssertValid() const override; virtual void Dump(CDumpContext& dc) const override; diff --git a/Core/Tools/W3DView/HierarchyPropPage.h b/Core/Tools/W3DView/HierarchyPropPage.h index bd70b4f939e..a4776f9a4be 100644 --- a/Core/Tools/W3DView/HierarchyPropPage.h +++ b/Core/Tools/W3DView/HierarchyPropPage.h @@ -31,7 +31,7 @@ class CHierarchyPropPage : public CPropertyPage // Construction public: CHierarchyPropPage (const CString &stringHierarchyName); - ~CHierarchyPropPage (); + ~CHierarchyPropPage () override; // Dialog Data //{{AFX_DATA(CHierarchyPropPage) @@ -44,14 +44,14 @@ class CHierarchyPropPage : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(CHierarchyPropPage) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation protected: // Generated message map functions //{{AFX_MSG(CHierarchyPropPage) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnDblclkSubObjectList(NMHDR* pNMHDR, LRESULT* pResult); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/MeshPropPage.h b/Core/Tools/W3DView/MeshPropPage.h index 4286b4ea337..08ee399c5fa 100644 --- a/Core/Tools/W3DView/MeshPropPage.h +++ b/Core/Tools/W3DView/MeshPropPage.h @@ -31,7 +31,7 @@ class CMeshPropPage : public CPropertyPage // Construction public: CMeshPropPage (const CString &stringMeshName); - ~CMeshPropPage (); + ~CMeshPropPage () override; // Dialog Data //{{AFX_DATA(CMeshPropPage) @@ -45,14 +45,14 @@ class CMeshPropPage : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(CMeshPropPage) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation protected: // Generated message map functions //{{AFX_MSG(CMeshPropPage) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnClose(); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/OpacityVectorDialog.h b/Core/Tools/W3DView/OpacityVectorDialog.h index 0d1a41737aa..bb31b1beecf 100644 --- a/Core/Tools/W3DView/OpacityVectorDialog.h +++ b/Core/Tools/W3DView/OpacityVectorDialog.h @@ -48,8 +48,8 @@ class OpacityVectorDialogClass : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(OpacityVectorDialogClass) 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 @@ -57,9 +57,9 @@ class OpacityVectorDialogClass : public CDialog // Generated message map functions //{{AFX_MSG(OpacityVectorDialogClass) - virtual BOOL OnInitDialog(); - virtual void OnOK(); - virtual void OnCancel(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; + virtual void OnCancel() override; afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h b/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h index acdd78cbb61..db7c368359b 100644 --- a/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h +++ b/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h @@ -41,8 +41,8 @@ class ParticleBlurTimeKeyDialogClass : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(ParticleBlurTimeKeyDialogClass) 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 @@ -50,7 +50,7 @@ class ParticleBlurTimeKeyDialogClass : public CDialog // Generated message map functions //{{AFX_MSG(ParticleBlurTimeKeyDialogClass) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnOk2(); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/ParticleRotationKeyDialog.h b/Core/Tools/W3DView/ParticleRotationKeyDialog.h index d2fa14e3269..aebe5991a51 100644 --- a/Core/Tools/W3DView/ParticleRotationKeyDialog.h +++ b/Core/Tools/W3DView/ParticleRotationKeyDialog.h @@ -41,8 +41,8 @@ class ParticleRotationKeyDialogClass : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(ParticleRotationKeyDialogClass) 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 @@ -50,8 +50,8 @@ class ParticleRotationKeyDialogClass : public CDialog // Generated message map functions //{{AFX_MSG(ParticleRotationKeyDialogClass) - virtual BOOL OnInitDialog(); - virtual void OnOK(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/ParticleSizeDialog.h b/Core/Tools/W3DView/ParticleSizeDialog.h index 8303479c9c7..2cc06120008 100644 --- a/Core/Tools/W3DView/ParticleSizeDialog.h +++ b/Core/Tools/W3DView/ParticleSizeDialog.h @@ -41,8 +41,8 @@ class ParticleSizeDialogClass : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(ParticleSizeDialogClass) 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 @@ -50,8 +50,8 @@ class ParticleSizeDialogClass : public CDialog // Generated message map functions //{{AFX_MSG(ParticleSizeDialogClass) - virtual BOOL OnInitDialog(); - virtual void OnOK(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/PlaySoundDialog.h b/Core/Tools/W3DView/PlaySoundDialog.h index 1162955df3b..c0f2d16fe5a 100644 --- a/Core/Tools/W3DView/PlaySoundDialog.h +++ b/Core/Tools/W3DView/PlaySoundDialog.h @@ -44,7 +44,7 @@ class PlaySoundDialogClass : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(PlaySoundDialogClass) 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 PlaySoundDialogClass : public CDialog // Generated message map functions //{{AFX_MSG(PlaySoundDialogClass) afx_msg void OnPlaySoundEffect(); - virtual void OnCancel(); - virtual BOOL OnInitDialog(); + virtual void OnCancel() override; + virtual BOOL OnInitDialog() override; afx_msg void OnStopSoundEffect(); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/ResolutionDialog.h b/Core/Tools/W3DView/ResolutionDialog.h index ddb0be63a8f..2080596cbce 100644 --- a/Core/Tools/W3DView/ResolutionDialog.h +++ b/Core/Tools/W3DView/ResolutionDialog.h @@ -43,7 +43,7 @@ class ResolutionDialogClass : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(ResolutionDialogClass) 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 ResolutionDialogClass : public CDialog // Generated message map functions //{{AFX_MSG(ResolutionDialogClass) - virtual BOOL OnInitDialog(); - virtual void OnOK(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; afx_msg void OnDblclkResolutionListCtrl(NMHDR* pNMHDR, LRESULT* pResult); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/RingColorPropPage.h b/Core/Tools/W3DView/RingColorPropPage.h index 4d2d6f67a28..5775281ec53 100644 --- a/Core/Tools/W3DView/RingColorPropPage.h +++ b/Core/Tools/W3DView/RingColorPropPage.h @@ -37,7 +37,7 @@ class RingColorPropPageClass : public CPropertyPage // Construction public: RingColorPropPageClass (RingRenderObjClass *ring = nullptr); - ~RingColorPropPageClass (); + ~RingColorPropPageClass () override; // Dialog Data //{{AFX_DATA(RingColorPropPageClass) @@ -51,18 +51,18 @@ class RingColorPropPageClass : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(RingColorPropPageClass) public: - virtual BOOL OnApply(); - virtual void OnCancel(); + virtual BOOL OnApply() override; + virtual void OnCancel() override; 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 protected: // Generated message map functions //{{AFX_MSG(RingColorPropPageClass) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnDestroy(); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/RingGeneralPropPage.h b/Core/Tools/W3DView/RingGeneralPropPage.h index 66701ab910f..0d8c286075e 100644 --- a/Core/Tools/W3DView/RingGeneralPropPage.h +++ b/Core/Tools/W3DView/RingGeneralPropPage.h @@ -37,7 +37,7 @@ class RingGeneralPropPageClass : public CPropertyPage // Construction public: RingGeneralPropPageClass (RingRenderObjClass *ring = nullptr); - ~RingGeneralPropPageClass (); + ~RingGeneralPropPageClass () override; // Dialog Data //{{AFX_DATA(RingGeneralPropPageClass) @@ -51,18 +51,18 @@ class RingGeneralPropPageClass : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(RingGeneralPropPageClass) public: - virtual BOOL OnApply(); + virtual BOOL OnApply() override; protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); - virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; + virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL // Implementation protected: // Generated message map functions //{{AFX_MSG(RingGeneralPropPageClass) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnBrowseButton(); afx_msg void OnChangeFilenameEdit(); afx_msg void OnChangeNameEdit(); diff --git a/Core/Tools/W3DView/RingPropertySheet.h b/Core/Tools/W3DView/RingPropertySheet.h index 4e101da0baf..cd0bdf4e824 100644 --- a/Core/Tools/W3DView/RingPropertySheet.h +++ b/Core/Tools/W3DView/RingPropertySheet.h @@ -71,12 +71,12 @@ class RingPropertySheetClass : public CPropertySheet // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(RingPropertySheetClass) protected: - virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam); + virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL // Implementation public: - virtual ~RingPropertySheetClass(); + virtual ~RingPropertySheetClass() override; // Generated message map functions protected: diff --git a/Core/Tools/W3DView/RingSizePropPage.h b/Core/Tools/W3DView/RingSizePropPage.h index 820cd11e28d..cfb08a77cde 100644 --- a/Core/Tools/W3DView/RingSizePropPage.h +++ b/Core/Tools/W3DView/RingSizePropPage.h @@ -37,7 +37,7 @@ class RingSizePropPageClass : public CPropertyPage // Construction public: RingSizePropPageClass(RingRenderObjClass *ring = nullptr); - ~RingSizePropPageClass(); + ~RingSizePropPageClass() override; // Dialog Data //{{AFX_DATA(RingSizePropPageClass) @@ -53,19 +53,19 @@ class RingSizePropPageClass : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(RingSizePropPageClass) public: - virtual BOOL OnApply(); - virtual void OnCancel(); + virtual BOOL OnApply() override; + virtual void OnCancel() override; protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); - virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; + virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL // Implementation protected: // Generated message map functions //{{AFX_MSG(RingSizePropPageClass) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnDestroy(); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/SaveSettingsDialog.h b/Core/Tools/W3DView/SaveSettingsDialog.h index b3d9b8be186..8a8799bbe95 100644 --- a/Core/Tools/W3DView/SaveSettingsDialog.h +++ b/Core/Tools/W3DView/SaveSettingsDialog.h @@ -41,8 +41,8 @@ class CSaveSettingsDialog : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CSaveSettingsDialog) 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 @@ -50,10 +50,10 @@ class CSaveSettingsDialog : public CDialog // Generated message map functions //{{AFX_MSG(CSaveSettingsDialog) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnBrowseButton(); afx_msg void OnUpdateFilenameEdit(); - virtual void OnOK(); + virtual void OnOK() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/ScaleDialog.h b/Core/Tools/W3DView/ScaleDialog.h index 9872f26e191..207c15605dc 100644 --- a/Core/Tools/W3DView/ScaleDialog.h +++ b/Core/Tools/W3DView/ScaleDialog.h @@ -42,8 +42,8 @@ class ScaleDialogClass : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(ScaleDialogClass) 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 @@ -51,8 +51,8 @@ class ScaleDialogClass : public CDialog // Generated message map functions //{{AFX_MSG(ScaleDialogClass) - virtual BOOL OnInitDialog(); - virtual void OnOK(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/SceneLightDialog.h b/Core/Tools/W3DView/SceneLightDialog.h index c10dc4d535f..f14c1aba7e1 100644 --- a/Core/Tools/W3DView/SceneLightDialog.h +++ b/Core/Tools/W3DView/SceneLightDialog.h @@ -51,8 +51,8 @@ class CSceneLightDialog : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CSceneLightDialog) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL // Implementation @@ -60,9 +60,9 @@ class CSceneLightDialog : public CDialog // Generated message map functions //{{AFX_MSG(CSceneLightDialog) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar); - virtual void OnCancel(); + virtual void OnCancel() override; afx_msg void OnGrayscaleCheck(); afx_msg void OnChannelBothRadio(); afx_msg void OnChannelDiffuseRadio(); diff --git a/Core/Tools/W3DView/ScreenCursor.h b/Core/Tools/W3DView/ScreenCursor.h index 19f65a6f904..29000220b5b 100644 --- a/Core/Tools/W3DView/ScreenCursor.h +++ b/Core/Tools/W3DView/ScreenCursor.h @@ -53,7 +53,7 @@ class ScreenCursorClass : public RenderObjClass //////////////////////////////////////////////////////////////////////// ScreenCursorClass (); ScreenCursorClass (const ScreenCursorClass &src); - virtual ~ScreenCursorClass (); + virtual ~ScreenCursorClass () override; //////////////////////////////////////////////////////////////////////// // Public operators @@ -69,15 +69,15 @@ class ScreenCursorClass : public RenderObjClass //////////////////////////////////////////////////////////////////////// // Base class overrides //////////////////////////////////////////////////////////////////////// - RenderObjClass * Clone () const { return new ScreenCursorClass (*this); } - virtual int Class_ID() const { return CLASSID_LAST + 103L; } - virtual void Render (RenderInfoClass &rinfo); - virtual void On_Frame_Update (); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; - - virtual void Notify_Added(SceneClass * scene); - virtual void Notify_Removed(SceneClass * scene); + RenderObjClass * Clone () const override { return new ScreenCursorClass (*this); } + virtual int Class_ID() const override { return CLASSID_LAST + 103L; } + virtual void Render (RenderInfoClass &rinfo) override; + virtual void On_Frame_Update () 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 Notify_Added(SceneClass * scene) override; + virtual void Notify_Removed(SceneClass * scene) override; protected: diff --git a/Core/Tools/W3DView/SoundEditDialog.h b/Core/Tools/W3DView/SoundEditDialog.h index 6a962164c08..c757b2571bd 100644 --- a/Core/Tools/W3DView/SoundEditDialog.h +++ b/Core/Tools/W3DView/SoundEditDialog.h @@ -37,7 +37,7 @@ class SoundEditDialogClass : public CDialog { public: SoundEditDialogClass (CWnd *parent); - virtual ~SoundEditDialogClass (); + virtual ~SoundEditDialogClass () override; // Form Data public: @@ -57,7 +57,7 @@ class SoundEditDialogClass : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(SoundEditDialogClass) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -73,9 +73,9 @@ class SoundEditDialogClass : public CDialog afx_msg void On2DRadio(); afx_msg void On3DRadio(); afx_msg void OnPlay(); - 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/Core/Tools/W3DView/SphereColorPropPage.h b/Core/Tools/W3DView/SphereColorPropPage.h index b0df952f9ee..776f74ce391 100644 --- a/Core/Tools/W3DView/SphereColorPropPage.h +++ b/Core/Tools/W3DView/SphereColorPropPage.h @@ -37,7 +37,7 @@ class SphereColorPropPageClass : public CPropertyPage // Construction public: SphereColorPropPageClass (SphereRenderObjClass *sphere = nullptr); - ~SphereColorPropPageClass (); + ~SphereColorPropPageClass () override; // Dialog Data //{{AFX_DATA(SphereColorPropPageClass) @@ -51,18 +51,18 @@ class SphereColorPropPageClass : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(SphereColorPropPageClass) public: - virtual BOOL OnApply(); - virtual void OnCancel(); + virtual BOOL OnApply() override; + virtual void OnCancel() override; 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 protected: // Generated message map functions //{{AFX_MSG(SphereColorPropPageClass) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnDestroy(); afx_msg void OnOpacityVectorCheck(); afx_msg void OnInvertVectorCheck(); diff --git a/Core/Tools/W3DView/SphereGeneralPropPage.h b/Core/Tools/W3DView/SphereGeneralPropPage.h index 868f1975b2c..585260ccd37 100644 --- a/Core/Tools/W3DView/SphereGeneralPropPage.h +++ b/Core/Tools/W3DView/SphereGeneralPropPage.h @@ -37,7 +37,7 @@ class SphereGeneralPropPageClass : public CPropertyPage // Construction public: SphereGeneralPropPageClass (SphereRenderObjClass *sphere = nullptr); - ~SphereGeneralPropPageClass (); + ~SphereGeneralPropPageClass () override; // Dialog Data //{{AFX_DATA(SphereGeneralPropPageClass) @@ -50,18 +50,18 @@ class SphereGeneralPropPageClass : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(SphereGeneralPropPageClass) public: - virtual BOOL OnApply(); + virtual BOOL OnApply() override; protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); - virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; + virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL // Implementation protected: // Generated message map functions //{{AFX_MSG(SphereGeneralPropPageClass) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnBrowseButton(); afx_msg void OnChangeFilenameEdit(); afx_msg void OnChangeNameEdit(); diff --git a/Core/Tools/W3DView/SpherePropertySheet.h b/Core/Tools/W3DView/SpherePropertySheet.h index 2589687b2a3..a34d4723314 100644 --- a/Core/Tools/W3DView/SpherePropertySheet.h +++ b/Core/Tools/W3DView/SpherePropertySheet.h @@ -71,12 +71,12 @@ class SpherePropertySheetClass : public CPropertySheet // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(SpherePropertySheetClass) protected: - virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam); + virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL // Implementation public: - virtual ~SpherePropertySheetClass(); + virtual ~SpherePropertySheetClass() override; // Generated message map functions protected: diff --git a/Core/Tools/W3DView/SphereSizePropPage.h b/Core/Tools/W3DView/SphereSizePropPage.h index 3bbbe4123b2..7f6eb2bd18c 100644 --- a/Core/Tools/W3DView/SphereSizePropPage.h +++ b/Core/Tools/W3DView/SphereSizePropPage.h @@ -37,7 +37,7 @@ class SphereSizePropPageClass : public CPropertyPage // Construction public: SphereSizePropPageClass(SphereRenderObjClass *sphere = nullptr); - ~SphereSizePropPageClass(); + ~SphereSizePropPageClass() override; // Dialog Data //{{AFX_DATA(SphereSizePropPageClass) @@ -52,19 +52,19 @@ class SphereSizePropPageClass : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(SphereSizePropPageClass) public: - virtual BOOL OnApply(); - virtual void OnCancel(); + virtual BOOL OnApply() override; + virtual void OnCancel() override; protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); - virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; + virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL // Implementation protected: // Generated message map functions //{{AFX_MSG(SphereSizePropPageClass) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnDestroy(); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/TexturePathDialog.h b/Core/Tools/W3DView/TexturePathDialog.h index 58082664864..960a79d6629 100644 --- a/Core/Tools/W3DView/TexturePathDialog.h +++ b/Core/Tools/W3DView/TexturePathDialog.h @@ -41,7 +41,7 @@ class TexturePathDialogClass : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(TexturePathDialogClass) 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 TexturePathDialogClass : public CDialog // Generated message map functions //{{AFX_MSG(TexturePathDialogClass) - virtual BOOL OnInitDialog(); - virtual void OnOK(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; afx_msg void OnBrowse1(); afx_msg void OnBrowse2(); //}}AFX_MSG diff --git a/Core/Tools/W3DView/Toolbar.h b/Core/Tools/W3DView/Toolbar.h index fbab2af7cb9..d79da687ca9 100644 --- a/Core/Tools/W3DView/Toolbar.h +++ b/Core/Tools/W3DView/Toolbar.h @@ -82,7 +82,7 @@ class CFancyToolbar : public CControlBar // Public Contructors // CFancyToolbar (); - virtual ~CFancyToolbar (); + virtual ~CFancyToolbar () override; //////////////////////////////////////////////////////// diff --git a/Core/Tools/W3DView/ViewerScene.cpp b/Core/Tools/W3DView/ViewerScene.cpp index b923c2c7846..911aaed1de1 100644 --- a/Core/Tools/W3DView/ViewerScene.cpp +++ b/Core/Tools/W3DView/ViewerScene.cpp @@ -53,10 +53,10 @@ class ViewerSceneIterator : public SceneIterator { public: - void First() override; - void Next() override; - bool Is_Done() override; - RenderObjClass * Current_Item() override; + virtual void First() override; + virtual void Next() override; + virtual bool Is_Done() override; + virtual RenderObjClass * Current_Item() override; protected: diff --git a/Core/Tools/W3DView/VolumeRandomDialog.h b/Core/Tools/W3DView/VolumeRandomDialog.h index 7ff8c1e96f1..b69915cd0e7 100644 --- a/Core/Tools/W3DView/VolumeRandomDialog.h +++ b/Core/Tools/W3DView/VolumeRandomDialog.h @@ -51,8 +51,8 @@ class VolumeRandomDialogClass : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(VolumeRandomDialogClass) 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 @@ -60,8 +60,8 @@ class VolumeRandomDialogClass : public CDialog // Generated message map functions //{{AFX_MSG(VolumeRandomDialogClass) - virtual void OnOK(); - virtual BOOL OnInitDialog(); + virtual void OnOK() override; + virtual BOOL OnInitDialog() override; afx_msg void OnBoxRadio(); afx_msg void OnCylinderRadio(); afx_msg void OnSphereRadio(); diff --git a/Core/Tools/W3DView/W3DView.cpp b/Core/Tools/W3DView/W3DView.cpp index f50351a5a0a..a4384115689 100644 --- a/Core/Tools/W3DView/W3DView.cpp +++ b/Core/Tools/W3DView/W3DView.cpp @@ -275,13 +275,13 @@ class CAboutDlg : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CAboutDlg) protected: - void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation protected: //{{AFX_MSG(CAboutDlg) - BOOL OnInitDialog() override; + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/Core/Tools/W3DView/W3DViewDoc.h b/Core/Tools/W3DView/W3DViewDoc.h index 768af4f6480..28297114cfe 100644 --- a/Core/Tools/W3DView/W3DViewDoc.h +++ b/Core/Tools/W3DView/W3DViewDoc.h @@ -88,7 +88,7 @@ class CW3DViewDoc : public CDocument // Implementation public: - virtual ~CW3DViewDoc(); + virtual ~CW3DViewDoc() override; #ifdef RTS_DEBUG virtual void AssertValid() const override; virtual void Dump(CDumpContext& dc) const override; diff --git a/Core/Tools/W3DView/W3DViewView.h b/Core/Tools/W3DView/W3DViewView.h index c69d133494d..08e1cfda240 100644 --- a/Core/Tools/W3DView/W3DViewView.h +++ b/Core/Tools/W3DView/W3DViewView.h @@ -39,14 +39,14 @@ class CW3DViewView : public CView // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CW3DViewView) public: - virtual void OnDraw(CDC* pDC); // overridden to draw this view - virtual BOOL PreCreateWindow(CREATESTRUCT& cs); + virtual void OnDraw(CDC* pDC) override; // overridden to draw this view + virtual BOOL PreCreateWindow(CREATESTRUCT& cs) override; protected: //}}AFX_VIRTUAL // Implementation public: - virtual ~CW3DViewView(); + virtual ~CW3DViewView() override; #ifdef RTS_DEBUG virtual void AssertValid() const override; virtual void Dump(CDumpContext& dc) const override; diff --git a/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h b/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h index c370ac5b3c0..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; 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/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp index d915da59f56..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;} - HRESULT OnError( Int error ) override; - HRESULT OnEnd() override; - HRESULT OnProgressUpdate( Int bytesread, Int totalsize, Int timetaken, Int timeleft ) override; - HRESULT OnStatusUpdate( Int status ) override; - HRESULT downloadFile( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume ) override; + 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 c06a452d98f..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(); - ~GameSpyLoginPreferences() override; + virtual ~GameSpyLoginPreferences() override; Bool loadFromIniFile(); - Bool load(AsciiString fname) override; - Bool write() override; + 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 567d5128bea..ad9493ccf4f 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp @@ -519,7 +519,7 @@ class PartitionFilterLiveMapEnemies : public PartitionFilter public: PartitionFilterLiveMapEnemies(const Object *obj) : m_obj(obj) { } - Bool allow(Object *objOther) override + virtual Bool allow(Object *objOther) override { // this is way fast (bit test) so do it first. if (objOther->isEffectivelyDead()) @@ -549,7 +549,7 @@ class PartitionFilterWithinAttackRange : public PartitionFilter public: PartitionFilterWithinAttackRange(const Object* obj) : m_obj(obj) { } - Bool allow(Object* objOther) override + 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 eb9e40d5658..385ae65a089 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp @@ -1913,9 +1913,9 @@ class AIAttackMoveStateMachine : public StateMachine protected: // snapshot interface - void crc( Xfer *xfer ) override; - void xfer( Xfer *xfer ) override; - void loadPostProcess() override; + virtual void crc( Xfer *xfer ) override; + virtual void xfer( Xfer *xfer ) override; + virtual void loadPostProcess() override; }; // ------------------------------------------------------------------------------------------------ @@ -5542,9 +5542,9 @@ class AIAttackThenIdleStateMachine : public StateMachine AIAttackThenIdleStateMachine( Object *owner, AsciiString name ); protected: // snapshot interface . - void crc( Xfer *xfer ) override; - void xfer( Xfer *xfer ) override; - void loadPostProcess() override; + 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 1f045f59cfc..a894d9331a2 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 { } - Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const override + 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 { } - Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const override + 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(); } - Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, UnsignedInt lifetimeFrames = 0 ) const override + virtual Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, UnsignedInt lifetimeFrames = 0 ) const override { return create( primaryObj, primary, secondary, true, lifetimeFrames ); } - Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Bool createOwner, UnsignedInt lifetimeFrames = 0 ) const override + 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 { } - Object* create( const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const override + 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; } - Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const override + 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(); } - Object* create(const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const override + 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; } - Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const override + 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 7229505ef5c..bf77558102c 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. - void crc( Xfer *xfer ) override {}; - void xfer( Xfer *xfer ) override {}; - void loadPostProcess() override {}; + 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() override + virtual StateReturnType onEnter() override { Object* obj = getMachineOwner(); if( obj->getContain() ) @@ -127,7 +127,7 @@ class ChinookEvacuateState : public State return STATE_SUCCESS; } - StateReturnType update() override + 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. - void crc( Xfer *xfer ) override {}; - void xfer( Xfer *xfer ) override {}; - void loadPostProcess() override {}; + 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() override // 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() override + virtual StateReturnType update() override { Object *owner = getMachineOwner(); @@ -197,12 +197,12 @@ class ChinookTakeoffOrLandingState : public State protected: // snapshot interface - void crc( Xfer *xfer ) override + virtual void crc( Xfer *xfer ) override { // empty } - void xfer( Xfer *xfer ) override + virtual void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -213,7 +213,7 @@ class ChinookTakeoffOrLandingState : public State xfer->xferBool(&m_landing); } - void loadPostProcess() override + virtual void loadPostProcess() override { // empty } @@ -224,7 +224,7 @@ class ChinookTakeoffOrLandingState : public State m_destLoc.zero(); } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* obj = getMachineOwner(); ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface(); @@ -281,7 +281,7 @@ class ChinookTakeoffOrLandingState : public State return STATE_CONTINUE; } - StateReturnType update() override + virtual StateReturnType update() override { Object* obj = getMachineOwner(); if (obj->isEffectivelyDead()) @@ -299,7 +299,7 @@ class ChinookTakeoffOrLandingState : public State return STATE_CONTINUE; } - void onExit( StateExitType status ) override + 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 - void crc( Xfer *xfer ) override + virtual void crc( Xfer *xfer ) override { // empty } - void xfer( Xfer *xfer ) override + virtual void xfer( Xfer *xfer ) override { // version const XferVersion currentVersion = 2; @@ -467,7 +467,7 @@ class ChinookCombatDropState : public State } } - void loadPostProcess() override + 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" ) { } // -------------- - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* obj = getMachineOwner(); Drawable* draw = obj->getDrawable(); @@ -547,7 +547,7 @@ class ChinookCombatDropState : public State } // -------------- - StateReturnType update() override + virtual StateReturnType update() override { Object* obj = getMachineOwner(); ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface(); @@ -639,7 +639,7 @@ class ChinookCombatDropState : public State } // -------------- - void onExit( StateExitType status ) override + 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 - void crc( Xfer *xfer ) override + virtual void crc( Xfer *xfer ) override { // empty } - void xfer( Xfer *xfer ) override + virtual void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -714,7 +714,7 @@ class ChinookMoveToBldgState : public AIMoveToState xfer->xferReal(&m_destZ); } - void loadPostProcess() override + virtual void loadPostProcess() override { // empty } @@ -722,7 +722,7 @@ class ChinookMoveToBldgState : public AIMoveToState public: ChinookMoveToBldgState( StateMachine *machine ): AIMoveToState( machine ) { } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* obj = getMachineOwner(); ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface(); @@ -753,7 +753,7 @@ class ChinookMoveToBldgState : public AIMoveToState return AIMoveToState::onEnter(); } - StateReturnType update() override + virtual StateReturnType update() override { Object* obj = getMachineOwner(); @@ -767,7 +767,7 @@ class ChinookMoveToBldgState : public AIMoveToState return status; } - void onExit( StateExitType status ) override + 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 803ea8fd2a2..c5a3eb001f2 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 ); - StateReturnType update() override; + virtual StateReturnType update() override; protected: // snapshot interface - void crc( Xfer *xfer ) override; - void xfer( Xfer *xfer ) override; - void loadPostProcess() override; + 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; } - StateReturnType update() override; + virtual StateReturnType update() override; protected: // snapshot interface - void crc( Xfer *xfer ) override; - void xfer( Xfer *xfer ) override; - void loadPostProcess() override; + 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; } - StateReturnType update() override; - StateReturnType onEnter() override; - void onExit( StateExitType status ) override { } + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override { } protected: // snapshot interface - void crc( Xfer *xfer ) override; - void xfer( Xfer *xfer ) override; - void loadPostProcess() override; + 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 - void crc( Xfer *xfer ) override; - void xfer( Xfer *xfer ) override; - void loadPostProcess() override; + virtual void crc( Xfer *xfer ) override; + virtual void xfer( Xfer *xfer ) override; + virtual void loadPostProcess() override; protected: @@ -982,15 +982,15 @@ class DozerPrimaryIdleState : public State m_idlePlayerNumber = 0; m_isMarkedAsIdle = FALSE; } - StateReturnType update() override; - StateReturnType onEnter() override; - void onExit( StateExitType status ) override; + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - void crc( Xfer *xfer ) override; - void xfer( Xfer *xfer ) override; - void loadPostProcess() override; + virtual void crc( Xfer *xfer ) override; + virtual void xfer( Xfer *xfer ) override; + virtual void loadPostProcess() override; protected: @@ -1169,16 +1169,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 */ - StateReturnType update() override { return m_actionMachine->updateStateMachine(); } + virtual StateReturnType update() override { return m_actionMachine->updateStateMachine(); } - StateReturnType onEnter() override; - void onExit( StateExitType status ) override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - void crc( Xfer *xfer ) override; - void xfer( Xfer *xfer ) override; - void loadPostProcess() override; + virtual void crc( Xfer *xfer ) override; + virtual void xfer( Xfer *xfer ) override; + virtual void loadPostProcess() override; protected: @@ -1268,14 +1268,14 @@ class DozerPrimaryGoingHomeState : public State protected: // snapshot interface STUBBED no member vars - void crc( Xfer *xfer ) override {}; - void xfer( Xfer *xfer ) override {}; - void loadPostProcess() override {}; + virtual void crc( Xfer *xfer ) override {}; + virtual void xfer( Xfer *xfer ) override {}; + virtual void loadPostProcess() override {}; public: DozerPrimaryGoingHomeState( StateMachine *machine ) : State( machine, "DozerPrimaryGoingHomeState" ) { } - StateReturnType update() override { 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 6069365ebd7..8aabf776799 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() override { return "PartitionFilterHasParkingPlace"; } #endif - Bool allow(Object *objOther) override + 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. - void crc( Xfer *xfer ) override {}; - void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - void loadPostProcess() override {}; + 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") { } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -204,7 +204,7 @@ class JetAwaitingRunwayState : public State return STATE_CONTINUE; } - StateReturnType update() override + virtual StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -239,7 +239,7 @@ class JetAwaitingRunwayState : public State return STATE_CONTINUE; } - void onExit(StateExitType status) override + virtual void onExit(StateExitType status) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -265,9 +265,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. - void crc( Xfer *xfer ) override {}; - void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - void loadPostProcess() override {}; + 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; @@ -283,7 +283,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State State( machine, "JetOrHeliCirclingDeadAirfieldState"), m_checkAirfield(0) { } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -314,7 +314,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State return STATE_CONTINUE; } - StateReturnType update() override + virtual StateReturnType update() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -370,7 +370,7 @@ class JetOrHeliReturningToDeadAirfieldState : public AIInternalMoveToState public: JetOrHeliReturningToDeadAirfieldState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturningToDeadAirfieldState") { } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -431,7 +431,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState public: JetOrHeliTaxiState( StateMachine *machine, TaxiType m ) : m_taxiMode(m), AIMoveOutOfTheWayState( machine ) { } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -513,7 +513,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState return ret; } - void onExit( StateExitType status ) override + virtual void onExit( StateExitType status ) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -554,7 +554,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState public: JetTakeoffOrLandingState( StateMachine *machine, Bool landing ) : m_landing(landing), AIFollowPathState( machine, "JetTakeoffOrLandingState" ) { } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -641,7 +641,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState return ret; } - StateReturnType update() override + virtual StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -703,7 +703,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState return ret; } - void onExit( StateExitType status ) override + virtual void onExit( StateExitType status ) override { AIFollowPathState::onExit(status); @@ -761,12 +761,12 @@ class HeliTakeoffOrLandingState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(HeliTakeoffOrLandingState, "HeliTakeoffOrLandingState") protected: // snapshot interface - void crc( Xfer *xfer ) override + virtual void crc( Xfer *xfer ) override { // empty. jba. } - void xfer( Xfer *xfer ) override + virtual void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -780,7 +780,7 @@ class HeliTakeoffOrLandingState : public State xfer->xferCoord3D(&m_parkingLoc); xfer->xferReal(&m_parkingOrientation); } - void loadPostProcess() override + virtual void loadPostProcess() override { // empty. jba. } @@ -798,7 +798,7 @@ class HeliTakeoffOrLandingState : public State m_parkingLoc.zero(); } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -867,7 +867,7 @@ class HeliTakeoffOrLandingState : public State return STATE_CONTINUE; } - StateReturnType update() override + virtual StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -929,7 +929,7 @@ class HeliTakeoffOrLandingState : public State return STATE_CONTINUE; } - void onExit( StateExitType status ) override + virtual void onExit( StateExitType status ) override { // just in case. Object* jet = getMachineOwner(); @@ -976,14 +976,14 @@ class JetOrHeliParkOrientState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliParkOrientState, "JetOrHeliParkOrientState") protected: // snapshot interface STUBBED. - void crc( Xfer *xfer ) override {}; - void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - void loadPostProcess() override {}; + 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") { } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1002,7 +1002,7 @@ class JetOrHeliParkOrientState : public State return STATE_CONTINUE; } - StateReturnType update() override + virtual StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -1037,7 +1037,7 @@ class JetOrHeliParkOrientState : public State return STATE_CONTINUE; } - void onExit( StateExitType status ) override + virtual void onExit( StateExitType status ) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1057,12 +1057,12 @@ class JetPauseBeforeTakeoffState : public AIFaceState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetPauseBeforeTakeoffState, "JetPauseBeforeTakeoffState") protected: // snapshot interface - void crc( Xfer *xfer ) override + virtual void crc( Xfer *xfer ) override { // empty. jba. } - void xfer( Xfer *xfer ) override + virtual void xfer( Xfer *xfer ) override { // version #if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE @@ -1096,7 +1096,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState xfer->xferObjectID(&m_waitedForTaxiID); } - void loadPostProcess() override + virtual void loadPostProcess() override { // empty. jba. } @@ -1188,7 +1188,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState // nothing } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1220,7 +1220,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState } #if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE - StateReturnType update() override + virtual StateReturnType update() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1347,7 +1347,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState } #endif - void onExit(StateExitType status) override + virtual void onExit(StateExitType status) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1370,12 +1370,12 @@ class JetOrHeliReloadAmmoState : public State protected: // snapshot interface - void crc( Xfer *xfer ) override + virtual void crc( Xfer *xfer ) override { // empty. jba. } - void xfer( Xfer *xfer ) override + virtual void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -1386,7 +1386,7 @@ class JetOrHeliReloadAmmoState : public State xfer->xferUnsignedInt(&m_reloadTime); xfer->xferUnsignedInt(&m_reloadDoneFrame); } - void loadPostProcess() override + virtual void loadPostProcess() override { // empty. jba. } @@ -1394,7 +1394,7 @@ class JetOrHeliReloadAmmoState : public State public: JetOrHeliReloadAmmoState( StateMachine *machine ) : State( machine, "JetOrHeliReloadAmmoState") { } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1431,7 +1431,7 @@ class JetOrHeliReloadAmmoState : public State return STATE_CONTINUE; } - StateReturnType update() override + virtual StateReturnType update() override { Object* jet = getMachineOwner(); @@ -1464,7 +1464,7 @@ class JetOrHeliReloadAmmoState : public State return STATE_CONTINUE; } - void onExit(StateExitType status) override + virtual void onExit(StateExitType status) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1486,7 +1486,7 @@ class JetOrHeliReturnForLandingState : public AIInternalMoveToState public: JetOrHeliReturnForLandingState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturnForLandingState") { } - StateReturnType onEnter() override + 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 b6bc2bdeeba..24d9d6498ed 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() override { return "PartitionFilterIsValidCarriage"; } #endif - Bool allow(Object *objOther) override + 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 4e6c542bb30..9d544810cfa 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. - void crc( Xfer *xfer ) override {}; - void xfer( Xfer *xfer ) override {}; - void loadPostProcess() override {}; + virtual void crc( Xfer *xfer ) override {}; + virtual void xfer( Xfer *xfer ) override {}; + virtual void loadPostProcess() override {}; public: SupplyTruckBusyState( StateMachine *machine ) : State( machine, "SupplyTruckBusyState" ) { } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { if( getMachineOwner() && getMachineOwner()->getAI() ) { @@ -311,11 +311,11 @@ TheInGameUI->DEBUG_addFloatingText("entering busy state", getMachineOwner()->get #endif return STATE_CONTINUE; } - StateReturnType update() override + virtual StateReturnType update() override { return STATE_CONTINUE; } - void onExit(StateExitType status) override + 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. - void crc( Xfer *xfer ) override {}; - void xfer( Xfer *xfer ) override {}; - void loadPostProcess() override {}; + virtual void crc( Xfer *xfer ) override {}; + virtual void xfer( Xfer *xfer ) override {}; + virtual void loadPostProcess() override {}; public: SupplyTruckIdleState( StateMachine *machine ) : State( machine, "SupplyTruckIdleState" ) { } - StateReturnType onEnter() override; - StateReturnType update() override + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override { return STATE_CONTINUE; } - void onExit(StateExitType status) override + 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 482f4635299..c6798af48f3 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. - void crc( Xfer *xfer ) override {}; - void xfer( Xfer *xfer ) override {}; - void loadPostProcess() override {}; + virtual void crc( Xfer *xfer ) override {}; + virtual void xfer( Xfer *xfer ) override {}; + virtual void loadPostProcess() override {}; public: ActAsDozerState( StateMachine *machine ) :State( machine, "ActAsDozerState" ){} - StateReturnType onEnter() override; - StateReturnType update() override; + 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. - void crc( Xfer *xfer ) override {}; - void xfer( Xfer *xfer ) override {}; - void loadPostProcess() override {}; + virtual void crc( Xfer *xfer ) override {}; + virtual void xfer( Xfer *xfer ) override {}; + virtual void loadPostProcess() override {}; public: ActAsSupplyTruckState( StateMachine *machine ) :State( machine, "ActAsSupplyTruckState" ){} - StateReturnType onEnter() override; - StateReturnType update() override; + 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 0ad4c3b7bbe..111c2c0b953 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(){ } - Bool allow(Object *objOther) override; + virtual Bool allow(Object *objOther) override; #if defined(RTS_DEBUG) virtual const char* debugGetName() override { 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 23de2ea75c3..bb2c5c1d822 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() override { return "PartitionFilterHordeMember"; } #endif - Bool allow(Object *objOther) override + virtual Bool allow(Object *objOther) override { #if !RETAIL_COMPATIBLE_CRC // TheSuperHackers @bugfix Stubbjax 07/08/2026 Prevent dead units from being considered for horde membership. diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp index cd7dfbd59d2..4f8fbbdef21 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() { } - Bool allow(Object *objOther) override; + virtual Bool allow(Object *objOther) override; #if defined(RTS_DEBUG) virtual const char* debugGetName() override { 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 8e8f8dd9711..30b216a4484 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() override { return "PartitionFilterTensileFormationMember"; } #endif - Bool allow( Object *objOther ) override + 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 a5b54540ca1..78f2101deed 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() override; - void reset() override; - void update() override; + virtual void init() override; + virtual void reset() override; + virtual void update() override; - Bool hasAchievedVictory(Player *player) override; ///< has a specific player and his allies won? - Bool hasBeenDefeated(Player *player) override; ///< has a specific player and his allies lost? - Bool hasSinglePlayerBeenDefeated(Player *player) override; ///< 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() override; ///< players have been created - cache the ones of interest + virtual void cachePlayerPtrs() override; ///< players have been created - cache the ones of interest - 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 ) - UnsignedInt getEndFrame() override { return m_endFrame; } ///< on which frame was the game effectively over? + virtual Bool isLocalAlliedVictory() override; ///< convenience function + virtual Bool isLocalAlliedDefeat() override; ///< convenience function + virtual Bool isLocalDefeat() override; ///< convenience function + virtual 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/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp index b5e4c937c44..d56d79c91d5 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp @@ -151,9 +151,9 @@ class W3DShadowTexture : public RefCountClass, public HashableClass m_shadowUV[0].Set(1.0f,0.0f,0.0f); //u runs along world x axis m_shadowUV[1].Set(0.0f,-1.0f,0.0f); //v runs along world -y axis } - ~W3DShadowTexture() override { REF_PTR_RELEASE(m_texture);} + virtual ~W3DShadowTexture() override { REF_PTR_RELEASE(m_texture);} - const char * Get_Key() override { return m_namebuf; } + virtual const char * Get_Key() override { return m_namebuf; } Int init (RenderObjClass *robj); @@ -2376,9 +2376,9 @@ class MissingTextureClass : public HashableClass { public: MissingTextureClass( const char * name ) : Name( name ) {} - ~MissingTextureClass() override {} + virtual ~MissingTextureClass() override {} - const char * Get_Key() override { return Name; } + virtual const char * Get_Key() override { return Name; } private: StringClass Name; diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp index dc7ec661ba7..6e26d71f8ac 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp @@ -569,9 +569,9 @@ class W3DShadowGeometry : public RefCountClass, public HashableClass public: W3DShadowGeometry() { }; - ~W3DShadowGeometry() override { }; + virtual ~W3DShadowGeometry() override { }; - const char * Get_Key() override { return m_namebuf; } + virtual const char * Get_Key() override { return m_namebuf; } Int init (RenderObjClass *robj); Int initFromHLOD (RenderObjClass *robj); ///Class_ID(); } - RenderObjClass * Create() override; - void DeleteSelf() override { 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 1526f9531f6..9241822e932 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: - void crc( Xfer *xfer ) override; - void xfer( Xfer *xfer ) override; - void loadPostProcess() override; + 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 ) { }; - void First() override { Iterator.First(); } - void Next() override { Iterator.Next(); } - bool Is_Done() override { return Iterator.Is_Done(); } - const char * Current_Item_Name() override { 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: - bool Is_Done() override; - const char * Current_Item_Name() override; + 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: - void First() override { Node = WW3DAssetManager::Get_Instance()->Font3DDatas.Head(); } - void Next() override { Node = Node->Next(); } - bool Is_Done() override { return Node==nullptr; } - const char * Current_Item_Name() override { 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/dazzle.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp index 3f6e046fb2b..cd1416c0924 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp @@ -1321,9 +1321,9 @@ void DazzleRenderObjClass::Special_Render(SpecialRenderInfoClass & rinfo) class DazzlePersistFactoryClass : public PersistFactoryClass { - uint32 Chunk_ID() const override; - PersistClass * Load(ChunkLoadClass & cload) const override; - void Save(ChunkSaveClass & csave,PersistClass * obj) const override; + 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/decalmsh.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h index ce5afef9731..114bacf508a 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h @@ -76,7 +76,7 @@ class DecalMeshClass : public RefCountClass public: DecalMeshClass(MeshClass * parent,DecalSystemClass * system); - virtual ~DecalMeshClass(); + virtual ~DecalMeshClass() override; // world_vertex_locs and world_vertex_norms are dynamically updated worldspace vertex data // which are used by some decal types which cannot use static object geometry (such as decals @@ -121,21 +121,21 @@ class RigidDecalMeshClass : public DecalMeshClass public: RigidDecalMeshClass(MeshClass * parent,DecalSystemClass * system); - virtual ~RigidDecalMeshClass(); + virtual ~RigidDecalMeshClass() override; // Rigid decal meshes have static geometry so they do not use world_vertex_locs/norms - virtual void Render(); + virtual void Render() override; virtual bool Create_Decal( DecalGeneratorClass * generator, const OBBoxClass & localbox, SimpleDynVecClass & apt, - const DynamicVectorClass * world_vertex_locs = 0); + const DynamicVectorClass * world_vertex_locs = 0) override; - virtual bool Delete_Decal(uint32 id); + virtual bool Delete_Decal(uint32 id) override; - int Decal_Count(); - uint32 Get_Decal_ID(int decal_index); + int Decal_Count() override; + uint32 Get_Decal_ID(int decal_index) override; protected: @@ -186,21 +186,21 @@ class SkinDecalMeshClass : public DecalMeshClass public: SkinDecalMeshClass(MeshClass * parent,DecalSystemClass * system); - virtual ~SkinDecalMeshClass(); + virtual ~SkinDecalMeshClass() override; // Skin decals use world_vertex_locs/norms since they cannot use static geometry - virtual void Render(); + virtual void Render() override; virtual bool Create_Decal( DecalGeneratorClass * generator, const OBBoxClass & localbox, SimpleDynVecClass & apt, - const DynamicVectorClass * world_vertex_locs); + const DynamicVectorClass * world_vertex_locs) override; - virtual bool Delete_Decal(uint32 id); + virtual bool Delete_Decal(uint32 id) override; - int Decal_Count(); - uint32 Get_Decal_ID(int decal_index); + int Decal_Count() override; + uint32 Get_Decal_ID(int decal_index) override; protected: diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp index 72002b51e5c..92726842e45 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: - bool Items_Match(const MeshBuilderClass::FaceClass & a, const MeshBuilderClass::FaceClass & b) override + 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,22 +115,22 @@ class FaceHasherClass : public HashCalculatorClass ); } - void Compute_Hash(const MeshBuilderClass::FaceClass & item) override + 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; } - int Num_Hash_Bits() override + virtual int Num_Hash_Bits() override { return 10; } - int Num_Hash_Values() override + virtual int Num_Hash_Values() override { return 1; } - int Get_Hash_Value(int /*index*/) override + virtual int Get_Hash_Value(int /*index*/) override { return HashVal; } diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp index c2ab46a18cf..ebcb5a667a0 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: - void First() override; - void Next() override; - bool Is_Done() override; - RenderObjClass * Current_Item() override; + virtual void First() override; + virtual void Next() override; + virtual bool Is_Done() override; + virtual RenderObjClass * Current_Item() override; protected: diff --git a/Generals/Code/Tools/WorldBuilder/src/ScriptDialog.cpp b/Generals/Code/Tools/WorldBuilder/src/ScriptDialog.cpp index f9dca09952c..0264bf1ae37 100644 --- a/Generals/Code/Tools/WorldBuilder/src/ScriptDialog.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/ScriptDialog.cpp @@ -965,7 +965,7 @@ class LocalMFCFileOutputStream : public OutputStream CFile *m_file; public: LocalMFCFileOutputStream(CFile *pFile):m_file(pFile) {}; - Int write(const void *pData, Int numBytes) override { + virtual Int write(const void *pData, Int numBytes) override { Int numBytesWritten = 0; try { m_file->Write(pData, numBytes); diff --git a/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp index dadfe8ff3ba..c122151259d 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){}; - char const * Set_Name(char const *filename) override; + 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 { - FileClass * Get_File( char const *filename ) override; + virtual FileClass * Get_File( char const *filename ) override; }; //------------------------------------------------------------------------------------------------- @@ -568,7 +568,7 @@ class CAboutDlg : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CAboutDlg) protected: - void DoDataExchange(CDataExchange* pDX) override; // 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 08329063767..14032945d3b 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) {}; - Int write(const void *pData, Int numBytes) override { + 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) {}; - Int write(const void *pData, Int numBytes) override { + 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) {}; - Int write(const void *pData, Int numBytes) override { + 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 629f4d2020b..ba3fb4530e4 100644 --- a/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp @@ -159,126 +159,126 @@ class PlaceholderView : public View Int m_originX, m_originY; ///< Location of top/left view corner protected: - View *prependViewToList( View *list ) override {return nullptr;}; ///< Prepend this view to the given list, return the new list - View *getNextView() override { 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() override { return nullptr; } ///< Return next view in the set public: - void init() override {}; + virtual void init() override {}; - UnsignedInt getID() override { return 1; } + virtual UnsignedInt getID() override { return 1; } - Drawable *pickDrawable( const ICoord2D *screen, Bool forceAttack, PickType pickType ) override {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' - Int iterateDrawablesInRegion( IRegion2D *screenRegion, + virtual Int iterateDrawablesInRegion( IRegion2D *screenRegion, Bool (*callback)( Drawable *draw, void *userData ), void *userData ) override {return 0;}; - WorldToScreenReturn worldToScreenTriReturn( const Coord3D *w, ICoord2D *s ) override { return WTS_INVALID; }; ///< Transform world coordinate "w" into screen coordinate "s" - Bool screenToTerrain( const ICoord2D *screen, Coord3D *world ) override { return false; } - PlaneClass::IntersectionResType screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z ) override { return PlaneClass::NO_INTERSECTION; } - PlaneClass::IntersectionResType getScreenCornerWorldPointsAtZ( Coord3D *topLeft, Coord3D *topRight, + virtual WorldToScreenReturn worldToScreenTriReturn( const Coord3D *w, ICoord2D *s ) override { return WTS_INVALID; }; ///< Transform world coordinate "w" into screen coordinate "s" + virtual Bool screenToTerrain( const ICoord2D *screen, Coord3D *world ) override { return false; } + virtual PlaneClass::IntersectionResType screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z ) override { return PlaneClass::NO_INTERSECTION; } + virtual PlaneClass::IntersectionResType getScreenCornerWorldPointsAtZ( Coord3D *topLeft, Coord3D *topRight, Coord3D *bottomRight, Coord3D *bottomLeft, Real z, ViewportClass viewPort = ViewportClass() ) override { return PlaneClass::NO_INTERSECTION; } - void drawView() override {}; ///< Render the world visible in this view. - void updateView() override {}; ///< Render the world visible in this view. - void stepView() override {}; ///< Update view for every fixed time step + virtual void drawView() override {}; ///< Render the world visible in this view. + virtual void updateView() override {}; ///< Render the world visible in this view. + virtual void stepView() override {}; ///< Update view for every fixed time step - void setZoomLimited( Bool limit ) override {} ///< limit the zoom height - Bool isZoomLimited() const override { return TRUE; } ///< get status of zoom limit + virtual void setZoomLimited( Bool limit ) override {} ///< limit the zoom height + virtual Bool isZoomLimited() const override { return TRUE; } ///< get status of zoom limit - void setWidth( Int width ) override { m_width = width; } - Int getWidth() override { return m_width; } - void setHeight( Int height ) override { m_height = height; } - Int getHeight() override { return m_height; } - void setOrigin( Int x, Int y) override { m_originX=x; m_originY=y;} ///< Sets location of top-left view corner on display - void getOrigin( Int *x, Int *y) override { *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() override { return m_width; } + virtual void setHeight( Int height ) override { m_height = height; } + virtual Int getHeight() 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 - void forceRedraw() override { } + virtual void forceRedraw() override { } - Bool isDoingScriptedCamera() override { return false; } - void stopDoingScriptedCamera() override {} + virtual Bool isDoingScriptedCamera() override { return false; } + virtual void stopDoingScriptedCamera() override {} - void lookAt( const Coord3D *o ) override {}; ///< Center the view on the given coordinate - void initHeightForMap() override {}; ///< Init the camera height for the map at the current position. + virtual void lookAt( const Coord3D *o ) override {}; ///< Center the view on the given coordinate + virtual void initHeightForMap() override {}; ///< 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) {lookAt(o);}; virtual void moveCameraAlongWaypointPath(Waypoint *way, Int frames, Int shutter, Bool orient) {}; - Bool isCameraMovementFinished() override {return true;}; + virtual Bool isCameraMovementFinished() 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. - void cameraModRollingAverage(Int framesToAverage) override {}; ///< Number of frames to average movement for current camera movement. - void cameraModFinalTimeMultiplier(Int finalMultiplier) override {}; ///< 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. - void cameraModFreezeTime() override {} ///< Freezes time during the next camera movement. - void cameraModFreezeAngle() override {} ///< Freezes time during the next camera movement. - void cameraModLookToward(Coord3D *pLoc) override {} ///< Sets a look at point during camera movement. - void cameraModFinalLookToward(Coord3D *pLoc) override {} ///< Sets a look at point during camera movement. - void cameraModFinalMoveTo(Coord3D *pLoc) override { }; ///< Sets a final move to. - Bool isTimeFrozen() override { return false;} ///< Freezes time during the next camera movement. - Int getTimeMultiplier() override {return 1;}; ///< Get the time multiplier. - void setTimeMultiplier(Int multiple) override {}; ///< Set the time multiplier. - void setDefaultView(Real pitch, Real angle, Real maxHeight) override {}; + virtual void cameraModFreezeTime() override {} ///< Freezes time during the next camera movement. + virtual void cameraModFreezeAngle() 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() override { return false;} ///< Freezes time during the next camera movement. + virtual Int getTimeMultiplier() 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 ) {}; - void setAngle( Real angle ) override {}; ///< Rotate the view around the up axis to the given angle - Real getAngle() override { return 0; } - void setPitch( Real angle ) override {}; ///< Rotate the view around the horizontal axis to the given angle - Real getPitch() override { return 0; } ///< Return current camera pitch - void setAngleToDefault() override {} ///< Set the view angle back to default - void setPitchToDefault() override {} ///< 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() override { return 0; } + virtual void setPitch( Real angle ) override {}; ///< Rotate the view around the horizontal axis to the given angle + virtual Real getPitch() override { return 0; } ///< Return current camera pitch + virtual void setAngleToDefault() override {} ///< Set the view angle back to default + virtual void setPitchToDefault() override {} ///< Set the view pitch back to default virtual void getPosition(Coord3D *pos) {} ///< Return camera position - Real getHeightAboveGround() override { return 1; } - void setHeightAboveGround(Real z) override { } - Real getZoom() override { return 1; } - void setZoom(Real z) override { } + 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() { } ///< Zoom in, closer to the ground, limit to min virtual void zoomOut() { } ///< Zoom out, farther away from the ground, limit to max - void setZoomToDefault() override { } ///< Set zoom to default value + virtual void setZoomToDefault() override { } ///< Set zoom to default value virtual Real getMaxZoom() { return 0.0f; } - void setOkToAdjustHeight( Bool val ) override { } ///< Set this to adjust camera height + virtual void setOkToAdjustHeight( Bool val ) override { } ///< Set this to adjust camera height - Real getTerrainHeightAtPivot() override { return 0.0f; } - Real getCurrentHeightAboveGround() override { return 0.0f; } + virtual Real getTerrainHeightAtPivot() override { return 0.0f; } + virtual Real getCurrentHeightAboveGround() override { return 0.0f; } - void getLocation ( ViewLocation *location ) override {}; ///< write the view's current location in to the view location object - void setLocation ( const ViewLocation *location ) override {}; ///< 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 - ObjectID getCameraLock() const override { return INVALID_ID; } - void setCameraLock(ObjectID id) override { } - void snapToCameraLock() override { } - void setSnapMode( CameraLockType lockType, Real lockDist ) override { } + virtual ObjectID getCameraLock() const override { return INVALID_ID; } + virtual void setCameraLock(ObjectID id) override { } + virtual void snapToCameraLock() override { } + virtual void setSnapMode( CameraLockType lockType, Real lockDist ) override { } - Drawable *getCameraLockDrawable() const override { return nullptr; } - void setCameraLockDrawable(Drawable *drawable) override { } + virtual Drawable *getCameraLockDrawable() const override { return nullptr; } + virtual void setCameraLockDrawable(Drawable *drawable) override { } - void setMouseLock( Bool mouseLocked ) override {} ///< lock/unlock the mouse input to the tactical view - Bool isMouseLocked() override { 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() override { return FALSE; } ///< is the mouse input locked to the tactical view? - void setFieldOfView( Real angle ) override {}; ///< Set the horizontal field of view angle - Real getFieldOfView() override {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() override {return 0;}; ///< Get the horizontal field of view angle - Bool setViewFilterMode(enum FilterModes) override {return FALSE;} ///isEffectivelyDead()) @@ -552,7 +552,7 @@ class PartitionFilterWithinAttackRange : public PartitionFilter public: PartitionFilterWithinAttackRange(const Object* obj) : m_obj(obj) { } - Bool allow(Object* objOther) override + 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 27516d9808b..93474df91f7 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp @@ -1957,9 +1957,9 @@ class AIAttackMoveStateMachine : public StateMachine protected: // snapshot interface - void crc( Xfer *xfer ) override; - void xfer( Xfer *xfer ) override; - void loadPostProcess() override; + virtual void crc( Xfer *xfer ) override; + virtual void xfer( Xfer *xfer ) override; + virtual void loadPostProcess() override; }; // ------------------------------------------------------------------------------------------------ @@ -5754,9 +5754,9 @@ class AIAttackThenIdleStateMachine : public StateMachine AIAttackThenIdleStateMachine( Object *owner, AsciiString name ); protected: // snapshot interface . - void crc( Xfer *xfer ) override; - void xfer( Xfer *xfer ) override; - void loadPostProcess() override; + 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 b21567479ae..9d9ffce18b1 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 { } - Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const override + 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 { } - Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const override + 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(); } - Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const override + 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 ); } - Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Bool createOwner, UnsignedInt lifetimeFrames = 0 ) const override + 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 { } - Object* create( const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const override + 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; } - Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const override + 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(); } - Object* create(const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const override + 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; } - Object* create(const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const override + 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 00af60bb149..917ba12853a 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. - void crc( Xfer *xfer ) override {}; - void xfer( Xfer *xfer ) override {}; - void loadPostProcess() override {}; + 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() override + virtual StateReturnType onEnter() override { Object* obj = getMachineOwner(); if( obj->getContain() ) @@ -131,7 +131,7 @@ class ChinookEvacuateState : public State return STATE_SUCCESS; } - StateReturnType update() override + 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. - void crc( Xfer *xfer ) override {}; - void xfer( Xfer *xfer ) override {}; - void loadPostProcess() override {}; + 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() override // 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() override + virtual StateReturnType update() override { Object *owner = getMachineOwner(); @@ -196,12 +196,12 @@ class ChinookTakeoffOrLandingState : public State protected: // snapshot interface - void crc( Xfer *xfer ) override + virtual void crc( Xfer *xfer ) override { // empty } - void xfer( Xfer *xfer ) override + virtual void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -212,7 +212,7 @@ class ChinookTakeoffOrLandingState : public State xfer->xferBool(&m_landing); } - void loadPostProcess() override + virtual void loadPostProcess() override { // empty } @@ -223,7 +223,7 @@ class ChinookTakeoffOrLandingState : public State m_destLoc.zero(); } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* obj = getMachineOwner(); ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface(); @@ -280,7 +280,7 @@ class ChinookTakeoffOrLandingState : public State return STATE_CONTINUE; } - StateReturnType update() override + virtual StateReturnType update() override { Object* obj = getMachineOwner(); if (obj->isEffectivelyDead()) @@ -298,7 +298,7 @@ class ChinookTakeoffOrLandingState : public State return STATE_CONTINUE; } - void onExit( StateExitType status ) override + 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 - void crc( Xfer *xfer ) override + virtual void crc( Xfer *xfer ) override { // empty } - void xfer( Xfer *xfer ) override + virtual void xfer( Xfer *xfer ) override { // version const XferVersion currentVersion = 2; @@ -468,7 +468,7 @@ class ChinookCombatDropState : public State } } - void loadPostProcess() override + 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" ) { } // -------------- - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* obj = getMachineOwner(); Drawable* draw = obj->getDrawable(); @@ -548,7 +548,7 @@ class ChinookCombatDropState : public State } // -------------- - StateReturnType update() override + virtual StateReturnType update() override { Object* obj = getMachineOwner(); ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface(); @@ -640,7 +640,7 @@ class ChinookCombatDropState : public State } // -------------- - void onExit( StateExitType status ) override + 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 - void crc( Xfer *xfer ) override + virtual void crc( Xfer *xfer ) override { // empty } - void xfer( Xfer *xfer ) override + virtual void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -715,7 +715,7 @@ class ChinookMoveToBldgState : public AIMoveToState xfer->xferReal(&m_destZ); } - void loadPostProcess() override + virtual void loadPostProcess() override { // empty } @@ -723,7 +723,7 @@ class ChinookMoveToBldgState : public AIMoveToState public: ChinookMoveToBldgState( StateMachine *machine ): AIMoveToState( machine ) { } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* obj = getMachineOwner(); ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface(); @@ -754,7 +754,7 @@ class ChinookMoveToBldgState : public AIMoveToState return AIMoveToState::onEnter(); } - StateReturnType update() override + virtual StateReturnType update() override { Object* obj = getMachineOwner(); @@ -768,7 +768,7 @@ class ChinookMoveToBldgState : public AIMoveToState return status; } - void onExit( StateExitType status ) override + 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 - void crc( Xfer *xfer ) override + virtual void crc( Xfer *xfer ) override { // empty } - void xfer( Xfer *xfer ) override + virtual void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -803,7 +803,7 @@ class ChinookRecordCreationState : public State xfer->xferVersion( &version, currentVersion ); } - void loadPostProcess() override + virtual void loadPostProcess() override { // empty } @@ -811,7 +811,7 @@ class ChinookRecordCreationState : public State public: ChinookRecordCreationState( StateMachine *machine ): State( machine, "ChinookRecordCreationState" ) { } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* obj = getMachineOwner(); ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface(); @@ -822,7 +822,7 @@ class ChinookRecordCreationState : public State return STATE_SUCCESS; } - StateReturnType update() override + 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 2035520e234..2ccaaa00d38 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 ); - StateReturnType update() override; + virtual StateReturnType update() override; protected: // snapshot interface - void crc( Xfer *xfer ) override; - void xfer( Xfer *xfer ) override; - void loadPostProcess() override; + 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; } - StateReturnType update() override; + virtual StateReturnType update() override; protected: // snapshot interface - void crc( Xfer *xfer ) override; - void xfer( Xfer *xfer ) override; - void loadPostProcess() override; + 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; } - StateReturnType update() override; - StateReturnType onEnter() override; - void onExit( StateExitType status ) override { } + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override { } protected: // snapshot interface - void crc( Xfer *xfer ) override; - void xfer( Xfer *xfer ) override; - void loadPostProcess() override; + 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 - void crc( Xfer *xfer ) override; - void xfer( Xfer *xfer ) override; - void loadPostProcess() override; + virtual void crc( Xfer *xfer ) override; + virtual void xfer( Xfer *xfer ) override; + virtual void loadPostProcess() override; protected: @@ -987,15 +987,15 @@ class DozerPrimaryIdleState : public State m_idlePlayerNumber = 0; m_isMarkedAsIdle = FALSE; } - StateReturnType update() override; - StateReturnType onEnter() override; - void onExit( StateExitType status ) override; + virtual StateReturnType update() override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - void crc( Xfer *xfer ) override; - void xfer( Xfer *xfer ) override; - void loadPostProcess() override; + virtual void crc( Xfer *xfer ) override; + virtual void xfer( Xfer *xfer ) override; + virtual void loadPostProcess() override; protected: @@ -1174,16 +1174,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 */ - StateReturnType update() override { return m_actionMachine->updateStateMachine(); } + virtual StateReturnType update() override { return m_actionMachine->updateStateMachine(); } - StateReturnType onEnter() override; - void onExit( StateExitType status ) override; + virtual StateReturnType onEnter() override; + virtual void onExit( StateExitType status ) override; protected: // snapshot interface - void crc( Xfer *xfer ) override; - void xfer( Xfer *xfer ) override; - void loadPostProcess() override; + virtual void crc( Xfer *xfer ) override; + virtual void xfer( Xfer *xfer ) override; + virtual void loadPostProcess() override; protected: @@ -1273,14 +1273,14 @@ class DozerPrimaryGoingHomeState : public State protected: // snapshot interface STUBBED no member vars - void crc( Xfer *xfer ) override {}; - void xfer( Xfer *xfer ) override {}; - void loadPostProcess() override {}; + virtual void crc( Xfer *xfer ) override {}; + virtual void xfer( Xfer *xfer ) override {}; + virtual void loadPostProcess() override {}; public: DozerPrimaryGoingHomeState( StateMachine *machine ) : State( machine, "DozerPrimaryGoingHomeState" ) { } - StateReturnType update() override { 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 1cd208800ec..998825c9648 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() override { return "PartitionFilterHasParkingPlace"; } #endif - Bool allow(Object *objOther) override + 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. - void crc( Xfer *xfer ) override {}; - void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - void loadPostProcess() override {}; + 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") { } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -222,7 +222,7 @@ class JetAwaitingRunwayState : public State return STATE_CONTINUE; } - StateReturnType update() override + virtual StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -288,7 +288,7 @@ class JetAwaitingRunwayState : public State return STATE_CONTINUE; } - void onExit(StateExitType status) override + virtual void onExit(StateExitType status) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -314,9 +314,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. - void crc( Xfer *xfer ) override {}; - void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - void loadPostProcess() override {}; + 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; @@ -332,7 +332,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State State( machine, "JetOrHeliCirclingDeadAirfieldState"), m_checkAirfield(0) { } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -363,7 +363,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State return STATE_CONTINUE; } - StateReturnType update() override + virtual StateReturnType update() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -419,7 +419,7 @@ class JetOrHeliReturningToDeadAirfieldState : public AIInternalMoveToState public: JetOrHeliReturningToDeadAirfieldState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturningToDeadAirfieldState") { } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -480,7 +480,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState public: JetOrHeliTaxiState( StateMachine *machine, TaxiType m ) : m_taxiMode(m), AIMoveOutOfTheWayState( machine ) { } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -644,7 +644,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState return ret; } - StateReturnType update() override + virtual StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -675,7 +675,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState return AIMoveOutOfTheWayState::update(); } - void onExit( StateExitType status ) override + virtual void onExit( StateExitType status ) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -716,7 +716,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState public: JetTakeoffOrLandingState( StateMachine *machine, Bool landing ) : m_landing(landing), AIFollowPathState( machine, "JetTakeoffOrLandingState" ) { } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -813,7 +813,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState return ret; } - StateReturnType update() override + virtual StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -890,7 +890,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState return ret; } - void onExit( StateExitType status ) override + virtual void onExit( StateExitType status ) override { AIFollowPathState::onExit(status); @@ -948,12 +948,12 @@ class HeliTakeoffOrLandingState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(HeliTakeoffOrLandingState, "HeliTakeoffOrLandingState") protected: // snapshot interface - void crc( Xfer *xfer ) override + virtual void crc( Xfer *xfer ) override { // empty. jba. } - void xfer( Xfer *xfer ) override + virtual void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -967,7 +967,7 @@ class HeliTakeoffOrLandingState : public State xfer->xferCoord3D(&m_parkingLoc); xfer->xferReal(&m_parkingOrientation); } - void loadPostProcess() override + virtual void loadPostProcess() override { // empty. jba. } @@ -985,7 +985,7 @@ class HeliTakeoffOrLandingState : public State m_parkingLoc.zero(); } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1054,7 +1054,7 @@ class HeliTakeoffOrLandingState : public State return STATE_CONTINUE; } - StateReturnType update() override + virtual StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -1116,7 +1116,7 @@ class HeliTakeoffOrLandingState : public State return STATE_CONTINUE; } - void onExit( StateExitType status ) override + virtual void onExit( StateExitType status ) override { // just in case. Object* jet = getMachineOwner(); @@ -1163,14 +1163,14 @@ class JetOrHeliParkOrientState : public State MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliParkOrientState, "JetOrHeliParkOrientState") protected: // snapshot interface STUBBED. - void crc( Xfer *xfer ) override {}; - void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );} - void loadPostProcess() override {}; + 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") { } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1189,7 +1189,7 @@ class JetOrHeliParkOrientState : public State return STATE_CONTINUE; } - StateReturnType update() override + virtual StateReturnType update() override { Object* jet = getMachineOwner(); if (jet->isEffectivelyDead()) @@ -1229,7 +1229,7 @@ class JetOrHeliParkOrientState : public State return STATE_CONTINUE; } - void onExit( StateExitType status ) override + virtual void onExit( StateExitType status ) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1249,12 +1249,12 @@ class JetPauseBeforeTakeoffState : public AIFaceState MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetPauseBeforeTakeoffState, "JetPauseBeforeTakeoffState") protected: // snapshot interface - void crc( Xfer *xfer ) override + virtual void crc( Xfer *xfer ) override { // empty. jba. } - void xfer( Xfer *xfer ) override + virtual void xfer( Xfer *xfer ) override { // version #if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE @@ -1288,7 +1288,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState xfer->xferObjectID(&m_waitedForTaxiID); } - void loadPostProcess() override + virtual void loadPostProcess() override { // empty. jba. } @@ -1380,7 +1380,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState // nothing } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1412,7 +1412,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState } #if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE - StateReturnType update() override + virtual StateReturnType update() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1539,7 +1539,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState } #endif - void onExit(StateExitType status) override + virtual void onExit(StateExitType status) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1562,12 +1562,12 @@ class JetOrHeliReloadAmmoState : public State protected: // snapshot interface - void crc( Xfer *xfer ) override + virtual void crc( Xfer *xfer ) override { // empty. jba. } - void xfer( Xfer *xfer ) override + virtual void xfer( Xfer *xfer ) override { // version XferVersion currentVersion = 1; @@ -1578,7 +1578,7 @@ class JetOrHeliReloadAmmoState : public State xfer->xferUnsignedInt(&m_reloadTime); xfer->xferUnsignedInt(&m_reloadDoneFrame); } - void loadPostProcess() override + virtual void loadPostProcess() override { // empty. jba. } @@ -1586,7 +1586,7 @@ class JetOrHeliReloadAmmoState : public State public: JetOrHeliReloadAmmoState( StateMachine *machine ) : State( machine, "JetOrHeliReloadAmmoState") { } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1623,7 +1623,7 @@ class JetOrHeliReloadAmmoState : public State return STATE_CONTINUE; } - StateReturnType update() override + virtual StateReturnType update() override { Object* jet = getMachineOwner(); @@ -1656,7 +1656,7 @@ class JetOrHeliReloadAmmoState : public State return STATE_CONTINUE; } - void onExit(StateExitType status) override + virtual void onExit(StateExitType status) override { Object* jet = getMachineOwner(); JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface(); @@ -1678,7 +1678,7 @@ class JetOrHeliReturnForLandingState : public AIInternalMoveToState public: JetOrHeliReturnForLandingState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturnForLandingState") { } - StateReturnType onEnter() override + 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 9553469f875..1ece8505529 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() override { return "PartitionFilterIsValidCarriage"; } #endif - Bool allow(Object *objOther) override + 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 f27684aaa17..5e966094ef7 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. - void crc( Xfer *xfer ) override {}; - void xfer( Xfer *xfer ) override {}; - void loadPostProcess() override {}; + virtual void crc( Xfer *xfer ) override {}; + virtual void xfer( Xfer *xfer ) override {}; + virtual void loadPostProcess() override {}; public: SupplyTruckBusyState( StateMachine *machine ) : State( machine, "SupplyTruckBusyState" ) { } - StateReturnType onEnter() override + virtual StateReturnType onEnter() override { if( getMachineOwner() && getMachineOwner()->getAI() ) { @@ -317,11 +317,11 @@ TheInGameUI->DEBUG_addFloatingText("entering busy state", getMachineOwner()->get #endif return STATE_CONTINUE; } - StateReturnType update() override + virtual StateReturnType update() override { return STATE_CONTINUE; } - void onExit(StateExitType status) override + 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. - void crc( Xfer *xfer ) override {}; - void xfer( Xfer *xfer ) override {}; - void loadPostProcess() override {}; + virtual void crc( Xfer *xfer ) override {}; + virtual void xfer( Xfer *xfer ) override {}; + virtual void loadPostProcess() override {}; public: SupplyTruckIdleState( StateMachine *machine ) : State( machine, "SupplyTruckIdleState" ) { } - StateReturnType onEnter() override; - StateReturnType update() override + virtual StateReturnType onEnter() override; + virtual StateReturnType update() override { return STATE_CONTINUE; } - void onExit(StateExitType status) override + 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 345df18867c..ba7313535c5 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. - void crc( Xfer *xfer ) override {}; - void xfer( Xfer *xfer ) override {}; - void loadPostProcess() override {}; + virtual void crc( Xfer *xfer ) override {}; + virtual void xfer( Xfer *xfer ) override {}; + virtual void loadPostProcess() override {}; public: ActAsDozerState( StateMachine *machine ) :State( machine, "ActAsDozerState" ){} - StateReturnType onEnter() override; - StateReturnType update() override; + 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. - void crc( Xfer *xfer ) override {}; - void xfer( Xfer *xfer ) override {}; - void loadPostProcess() override {}; + virtual void crc( Xfer *xfer ) override {}; + virtual void xfer( Xfer *xfer ) override {}; + virtual void loadPostProcess() override {}; public: ActAsSupplyTruckState( StateMachine *machine ) :State( machine, "ActAsSupplyTruckState" ){} - StateReturnType onEnter() override; - StateReturnType update() override; + 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 180aadea24f..b82a0e5f13a 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(){ } - Bool allow(Object *objOther) override; + virtual Bool allow(Object *objOther) override; #if defined(RTS_DEBUG) virtual const char* debugGetName() override { 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 741157e12a2..568820cbc07 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() override { return "PartitionFilterHordeMember"; } #endif - Bool allow(Object *objOther) override + virtual Bool allow(Object *objOther) override { #if !RETAIL_COMPATIBLE_CRC // TheSuperHackers @bugfix Stubbjax 07/08/2026 Prevent dead units from being considered for horde membership. diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp index 98cc8037a2d..b2368da9f35 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) { } - Bool allow(Object *objOther) override + 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 6b85d14215b..746730dc27d 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() { } - Bool allow(Object *objOther) override; + virtual Bool allow(Object *objOther) override; #if defined(RTS_DEBUG) virtual const char* debugGetName() override { 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 539acfe4587..08b1e976360 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() override { return "PartitionFilterTensileFormationMember"; } #endif - Bool allow( Object *objOther ) override + 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 7aded0ae1d5..ab34ddf756a 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() override; - void reset() override; - void update() override; + virtual void init() override; + virtual void reset() override; + virtual void update() override; - Bool hasAchievedVictory(Player *player) override; ///< has a specific player and his allies won? - Bool hasBeenDefeated(Player *player) override; ///< has a specific player and his allies lost? - Bool hasSinglePlayerBeenDefeated(Player *player) override; ///< 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() override; ///< players have been created - cache the ones of interest + virtual void cachePlayerPtrs() override; ///< players have been created - cache the ones of interest - 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 ) - UnsignedInt getEndFrame() override { return m_endFrame; } ///< on which frame was the game effectively over? + virtual Bool isLocalAlliedVictory() override; ///< convenience function + virtual Bool isLocalAlliedDefeat() override; ///< convenience function + virtual Bool isLocalDefeat() override; ///< convenience function + virtual 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/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp index 53fe7692242..39eafb73785 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp @@ -151,9 +151,9 @@ class W3DShadowTexture : public RefCountClass, public HashableClass m_shadowUV[0].Set(1.0f,0.0f,0.0f); //u runs along world x axis m_shadowUV[1].Set(0.0f,-1.0f,0.0f); //v runs along world -y axis } - ~W3DShadowTexture() override { REF_PTR_RELEASE(m_texture);} + virtual ~W3DShadowTexture() override { REF_PTR_RELEASE(m_texture);} - const char * Get_Key() override { return m_namebuf; } + virtual const char * Get_Key() override { return m_namebuf; } Int init (RenderObjClass *robj); @@ -2380,9 +2380,9 @@ class MissingTextureClass : public HashableClass { public: MissingTextureClass( const char * name ) : Name( name ) {} - ~MissingTextureClass() override {} + virtual ~MissingTextureClass() override {} - const char * Get_Key() override { return Name; } + virtual const char * Get_Key() override { return Name; } private: StringClass Name; diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp index e03945334f9..33b42a8c03e 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp @@ -589,9 +589,9 @@ class W3DShadowGeometry : public RefCountClass, public HashableClass public: W3DShadowGeometry() { }; - ~W3DShadowGeometry() override { }; + virtual ~W3DShadowGeometry() override { }; - const char * Get_Key() override { return m_namebuf; } + virtual const char * Get_Key() override { return m_namebuf; } Int init (RenderObjClass *robj); Int initFromHLOD (RenderObjClass *robj); ///Class_ID(); } - RenderObjClass * Create() override; - void DeleteSelf() override { 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 dcf745cffb8..7884d96f18b 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: - void crc( Xfer *xfer ) override; - void xfer( Xfer *xfer ) override; - void loadPostProcess() override; + 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 ) { }; - void First() override { Iterator.First(); } - void Next() override { Iterator.Next(); } - bool Is_Done() override { return Iterator.Is_Done(); } - const char * Current_Item_Name() override { 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: - bool Is_Done() override; - const char * Current_Item_Name() override; + 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: - void First() override { Node = WW3DAssetManager::Get_Instance()->Font3DDatas.Head(); } - void Next() override { Node = Node->Next(); } - bool Is_Done() override { return Node==nullptr; } - const char * Current_Item_Name() override { 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/dazzle.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp index 7143f484f71..b242e9be09b 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp @@ -1424,9 +1424,9 @@ void DazzleRenderObjClass::Special_Render(SpecialRenderInfoClass & rinfo) class DazzlePersistFactoryClass : public PersistFactoryClass { - uint32 Chunk_ID() const override; - PersistClass * Load(ChunkLoadClass & cload) const override; - void Save(ChunkSaveClass & csave,PersistClass * obj) const override; + 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/decalmsh.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h index 76721adebe0..93f8de36e52 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h @@ -76,7 +76,7 @@ class DecalMeshClass : public RefCountClass public: DecalMeshClass(MeshClass * parent,DecalSystemClass * system); - virtual ~DecalMeshClass(); + virtual ~DecalMeshClass() override; // world_vertex_locs and world_vertex_norms are dynamically updated worldspace vertex data // which are used by some decal types which cannot use static object geometry (such as decals @@ -121,21 +121,21 @@ class RigidDecalMeshClass : public DecalMeshClass public: RigidDecalMeshClass(MeshClass * parent,DecalSystemClass * system); - virtual ~RigidDecalMeshClass(); + virtual ~RigidDecalMeshClass() override; // Rigid decal meshes have static geometry so they do not use world_vertex_locs/norms - virtual void Render(); + virtual void Render() override; virtual bool Create_Decal( DecalGeneratorClass * generator, const OBBoxClass & localbox, SimpleDynVecClass & apt, - const DynamicVectorClass * world_vertex_locs = 0); + const DynamicVectorClass * world_vertex_locs = 0) override; - virtual bool Delete_Decal(uint32 id); + virtual bool Delete_Decal(uint32 id) override; - int Decal_Count(); - uint32 Get_Decal_ID(int decal_index); + int Decal_Count() override; + uint32 Get_Decal_ID(int decal_index) override; protected: @@ -186,21 +186,21 @@ class SkinDecalMeshClass : public DecalMeshClass public: SkinDecalMeshClass(MeshClass * parent,DecalSystemClass * system); - virtual ~SkinDecalMeshClass(); + virtual ~SkinDecalMeshClass() override; // Skin decals use world_vertex_locs/norms since they cannot use static geometry - virtual void Render(); + virtual void Render() override; virtual bool Create_Decal( DecalGeneratorClass * generator, const OBBoxClass & localbox, SimpleDynVecClass & apt, - const DynamicVectorClass * world_vertex_locs); + const DynamicVectorClass * world_vertex_locs) override; - virtual bool Delete_Decal(uint32 id); + virtual bool Delete_Decal(uint32 id) override; - int Decal_Count(); - uint32 Get_Decal_ID(int decal_index); + int Decal_Count() override; + uint32 Get_Decal_ID(int decal_index) override; protected: diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp index b09ea059b15..b9c7082abd5 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: - bool Items_Match(const MeshBuilderClass::FaceClass & a, const MeshBuilderClass::FaceClass & b) override + 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,22 +115,22 @@ class FaceHasherClass : public HashCalculatorClass ); } - void Compute_Hash(const MeshBuilderClass::FaceClass & item) override + 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; } - int Num_Hash_Bits() override + virtual int Num_Hash_Bits() override { return 10; } - int Num_Hash_Values() override + virtual int Num_Hash_Values() override { return 1; } - int Get_Hash_Value(int /*index*/) override + virtual int Get_Hash_Value(int /*index*/) override { return HashVal; } diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp index 9a0029e5ca2..6967adc959e 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: - void First() override; - void Next() override; - bool Is_Done() override; - RenderObjClass * Current_Item() override; + virtual void First() override; + virtual void Next() override; + virtual bool Is_Done() override; + virtual RenderObjClass * Current_Item() override; protected: diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp index f0b33441282..27af92ec44a 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp @@ -1117,7 +1117,7 @@ class LocalMFCFileOutputStream : public OutputStream CFile *m_file; public: LocalMFCFileOutputStream(CFile *pFile):m_file(pFile) {}; - Int write(const void *pData, Int numBytes) override { + virtual Int write(const void *pData, Int numBytes) override { Int numBytesWritten = 0; try { m_file->Write(pData, numBytes); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp index 31118528549..5f19126638a 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){}; - char const * Set_Name(char const *filename) override; + 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 { - FileClass * Get_File( char const *filename ) override; + virtual FileClass * Get_File( char const *filename ) override; }; //------------------------------------------------------------------------------------------------- @@ -585,7 +585,7 @@ class CAboutDlg : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CAboutDlg) protected: - void DoDataExchange(CDataExchange* pDX) override; // 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 528dc3eef12..185b81dd1b2 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) {}; - Int write(const void *pData, Int numBytes) override { + 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) {}; - Int write(const void *pData, Int numBytes) override { + 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) {}; - Int write(const void *pData, Int numBytes) override { + 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 1ef77feea43..a1f39f2fb3f 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp @@ -160,126 +160,126 @@ class PlaceholderView : public View Int m_originX, m_originY; ///< Location of top/left view corner protected: - View *prependViewToList( View *list ) override {return nullptr;}; ///< Prepend this view to the given list, return the new list - View *getNextView() override { 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() override { return nullptr; } ///< Return next view in the set public: - void init() override {}; + virtual void init() override {}; - UnsignedInt getID() override { return 1; } + virtual UnsignedInt getID() override { return 1; } - Drawable *pickDrawable( const ICoord2D *screen, Bool forceAttack, PickType pickType ) override {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' - Int iterateDrawablesInRegion( IRegion2D *screenRegion, + virtual Int iterateDrawablesInRegion( IRegion2D *screenRegion, Bool (*callback)( Drawable *draw, void *userData ), void *userData ) override {return 0;}; - WorldToScreenReturn worldToScreenTriReturn( const Coord3D *w, ICoord2D *s ) override { return WTS_INVALID; }; ///< Transform world coordinate "w" into screen coordinate "s" - Bool screenToTerrain( const ICoord2D *screen, Coord3D *world ) override { return false; } - PlaneClass::IntersectionResType screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z ) override { return PlaneClass::NO_INTERSECTION; } - PlaneClass::IntersectionResType getScreenCornerWorldPointsAtZ( Coord3D *topLeft, Coord3D *topRight, + virtual WorldToScreenReturn worldToScreenTriReturn( const Coord3D *w, ICoord2D *s ) override { return WTS_INVALID; }; ///< Transform world coordinate "w" into screen coordinate "s" + virtual Bool screenToTerrain( const ICoord2D *screen, Coord3D *world ) override { return false; } + virtual PlaneClass::IntersectionResType screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z ) override { return PlaneClass::NO_INTERSECTION; } + virtual PlaneClass::IntersectionResType getScreenCornerWorldPointsAtZ( Coord3D *topLeft, Coord3D *topRight, Coord3D *bottomRight, Coord3D *bottomLeft, Real z, ViewportClass viewPort = ViewportClass() ) override { return PlaneClass::NO_INTERSECTION; } - void drawView() override {}; ///< Render the world visible in this view. - void updateView() override {}; ///< Render the world visible in this view. - void stepView() override {}; ///< Update view for every fixed time step + virtual void drawView() override {}; ///< Render the world visible in this view. + virtual void updateView() override {}; ///< Render the world visible in this view. + virtual void stepView() override {}; ///< Update view for every fixed time step - void setZoomLimited( Bool limit ) override {} ///< limit the zoom height - Bool isZoomLimited() const override { return TRUE; } ///< get status of zoom limit + virtual void setZoomLimited( Bool limit ) override {} ///< limit the zoom height + virtual Bool isZoomLimited() const override { return TRUE; } ///< get status of zoom limit - void setWidth( Int width ) override { m_width = width; } - Int getWidth() override { return m_width; } - void setHeight( Int height ) override { m_height = height; } - Int getHeight() override { return m_height; } - void setOrigin( Int x, Int y) override { m_originX=x; m_originY=y;} ///< Sets location of top-left view corner on display - void getOrigin( Int *x, Int *y) override { *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() override { return m_width; } + virtual void setHeight( Int height ) override { m_height = height; } + virtual Int getHeight() 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 - void forceRedraw() override { } + virtual void forceRedraw() override { } - Bool isDoingScriptedCamera() override { return false; } - void stopDoingScriptedCamera() override {} + virtual Bool isDoingScriptedCamera() override { return false; } + virtual void stopDoingScriptedCamera() override {} - void lookAt( const Coord3D *o ) override {}; ///< Center the view on the given coordinate - void initHeightForMap() override {}; ///< Init the camera height for the map at the current position. + virtual void lookAt( const Coord3D *o ) override {}; ///< Center the view on the given coordinate + virtual void initHeightForMap() override {}; ///< Init the camera height for the map at the current position. virtual void scrollBy( Coord2D *delta ){}; ///< Shift the view by the given delta - void moveCameraTo(const Coord3D *o, Int frames, Int shutter, + virtual void moveCameraTo(const Coord3D *o, Int frames, Int shutter, Bool orient, Real easeIn, Real easeOut) override {lookAt(o);}; - void moveCameraAlongWaypointPath(Waypoint *way, Int frames, Int shutter, + virtual void moveCameraAlongWaypointPath(Waypoint *way, Int frames, Int shutter, Bool orient, Real easeIn, Real easeOut) override {}; - Bool isCameraMovementFinished() override {return true;}; - void resetCamera(const Coord3D *location, Int frames, Real easeIn, Real easeOut) override {}; ///< Move camera to location, and reset to default angle & zoom. - void rotateCamera(Real rotations, Int frames, Real easeIn, Real easeOut) override {}; ///< Rotate camera about current viewpoint. - void rotateCameraTowardObject(ObjectID id, Int milliseconds, Int holdMilliseconds, Real easeIn, Real easeOut) override {}; ///< Rotate camera to face an object, and hold on it - void cameraModFinalZoom(Real finalZoom, Real easeIn, Real easeOut) override {}; ///< Final zoom for current camera movement. - void cameraModRollingAverage(Int framesToAverage) override {}; ///< Number of frames to average movement for current camera movement. - void cameraModFinalTimeMultiplier(Int finalMultiplier) override {}; ///< Final time multiplier for current camera movement. - void cameraModFinalPitch(Real finalPitch, Real easeIn, Real easeOut) override {}; ///< Final pitch for current camera movement. - void cameraModFreezeTime() override {} ///< Freezes time during the next camera movement. - void cameraModFreezeAngle() override {} ///< Freezes time during the next camera movement. - void cameraModLookToward(Coord3D *pLoc) override {} ///< Sets a look at point during camera movement. - void cameraModFinalLookToward(Coord3D *pLoc) override {} ///< Sets a look at point during camera movement. - void cameraModFinalMoveTo(Coord3D *pLoc) override { }; ///< Sets a final move to. - Bool isTimeFrozen() override { return false;} ///< Freezes time during the next camera movement. - Int getTimeMultiplier() override {return 1;}; ///< Get the time multiplier. - void setTimeMultiplier(Int multiple) override {}; ///< Set the time multiplier. - void setDefaultView(Real pitch, Real angle, Real maxHeight) override {}; - void zoomCamera( Real finalZoom, Int milliseconds, Real easeIn, Real easeOut ) override {}; - void pitchCamera( Real finalPitch, Int milliseconds, Real easeIn, Real easeOut ) override {}; - - void setAngle( Real angle ) override {}; ///< Rotate the view around the up axis to the given angle - Real getAngle() override { return 0; } - void setPitch( Real angle ) override {}; ///< Rotate the view around the horizontal axis to the given angle - Real getPitch() override { return 0; } ///< Return current camera pitch - void setAngleToDefault() override {} ///< Set the view angle back to default - void setPitchToDefault() override {} ///< Set the view pitch back to default + virtual Bool isCameraMovementFinished() 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() override {} ///< Freezes time during the next camera movement. + virtual void cameraModFreezeAngle() 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() override { return false;} ///< Freezes time during the next camera movement. + virtual Int getTimeMultiplier() 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() override { return 0; } + virtual void setPitch( Real angle ) override {}; ///< Rotate the view around the horizontal axis to the given angle + virtual Real getPitch() override { return 0; } ///< Return current camera pitch + virtual void setAngleToDefault() override {} ///< Set the view angle back to default + virtual void setPitchToDefault() override {} ///< Set the view pitch back to default virtual void getPosition(Coord3D *pos) {} ///< Return camera position - Real getHeightAboveGround() override { return 1; } - void setHeightAboveGround(Real z) override { } - Real getZoom() override { return 1; } - void setZoom(Real z) override { } + 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() { } ///< Zoom in, closer to the ground, limit to min virtual void zoomOut() { } ///< Zoom out, farther away from the ground, limit to max - void setZoomToDefault() override { } ///< Set zoom to default value + virtual void setZoomToDefault() override { } ///< Set zoom to default value virtual Real getMaxZoom() { return 0.0f; } - void setOkToAdjustHeight( Bool val ) override { } ///< Set this to adjust camera height + virtual void setOkToAdjustHeight( Bool val ) override { } ///< Set this to adjust camera height - Real getTerrainHeightAtPivot() override { return 0.0f; } - Real getCurrentHeightAboveGround() override { return 0.0f; } + virtual Real getTerrainHeightAtPivot() override { return 0.0f; } + virtual Real getCurrentHeightAboveGround() override { return 0.0f; } - void getLocation ( ViewLocation *location ) override {}; ///< write the view's current location in to the view location object - void setLocation ( const ViewLocation *location ) override {}; ///< 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 - ObjectID getCameraLock() const override { return INVALID_ID; } - void setCameraLock(ObjectID id) override { } - void snapToCameraLock() override { } - void setSnapMode( CameraLockType lockType, Real lockDist ) override { } + virtual ObjectID getCameraLock() const override { return INVALID_ID; } + virtual void setCameraLock(ObjectID id) override { } + virtual void snapToCameraLock() override { } + virtual void setSnapMode( CameraLockType lockType, Real lockDist ) override { } - Drawable *getCameraLockDrawable() const override { return nullptr; } - void setCameraLockDrawable(Drawable *drawable) override { } + virtual Drawable *getCameraLockDrawable() const override { return nullptr; } + virtual void setCameraLockDrawable(Drawable *drawable) override { } - void setMouseLock( Bool mouseLocked ) override {} ///< lock/unlock the mouse input to the tactical view - Bool isMouseLocked() override { 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() override { return FALSE; } ///< is the mouse input locked to the tactical view? - void setFieldOfView( Real angle ) override {}; ///< Set the horizontal field of view angle - Real getFieldOfView() override {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() override {return 0;}; ///< Get the horizontal field of view angle - Bool setViewFilterMode(enum FilterModes) override {return FALSE;} ///