From 1c371d87982c3ec4c278c9936a2e6e7a707c6aaf Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Mon, 23 Feb 2026 16:46:33 -0500 Subject: [PATCH 1/7] build: Add override and final keyword compatibility to CppMacros.h --- Dependencies/Utility/Utility/CppMacros.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dependencies/Utility/Utility/CppMacros.h b/Dependencies/Utility/Utility/CppMacros.h index d8f1bdddded..a30ff2ae6eb 100644 --- a/Dependencies/Utility/Utility/CppMacros.h +++ b/Dependencies/Utility/Utility/CppMacros.h @@ -33,6 +33,8 @@ #define constexpr #define noexcept #define nullptr 0 +#define override +#define final #endif #if __cplusplus >= 201703L From 0594fd283935ae3d21e64e00846be57fb79d63a3 Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Mon, 23 Feb 2026 16:46:39 -0500 Subject: [PATCH 2/7] refactor(GeneralsMD): Rename override and final identifiers for keyword compatibility --- .../Code/GameEngine/Include/Common/DrawModule.h | 2 +- GeneralsMD/Code/GameEngine/Include/Common/Override.h | 6 +++--- .../Include/GameLogic/Module/ParachuteContain.h | 2 +- .../Code/GameEngine/Source/Common/GlobalData.cpp | 10 +++++----- .../GUI/GUICallbacks/Menus/OptionsMenu.cpp | 12 ++++++------ .../GameLogic/Object/Contain/ParachuteContain.cpp | 4 ++-- .../GameEngine/Source/GameLogic/Object/Weapon.cpp | 4 ++-- .../GameEngine/Source/GameLogic/System/GameLogic.cpp | 6 +++--- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h b/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h index 22353ceee4b..d2595fc4954 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h @@ -123,7 +123,7 @@ class DebrisDrawInterface { public: virtual void setModelName(AsciiString name, Color color, ShadowType t) = 0; - virtual void setAnimNames(AsciiString initial, AsciiString flying, AsciiString final, const FXList* finalFX) = 0; + virtual void setAnimNames(AsciiString initial, AsciiString flying, AsciiString finalAnim, const FXList* finalFX) = 0; }; //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Override.h b/GeneralsMD/Code/GameEngine/Include/Common/Override.h index 106160c8212..e471bd83f84 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Override.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Override.h @@ -54,7 +54,7 @@ template class OVERRIDE // Copy constructor OVERRIDE(OVERRIDE &overridable); // Operator= for copying from another OVERRIDE and T* - __inline OVERRIDE &operator=( const OVERRIDE& override ); + __inline OVERRIDE &operator=( const OVERRIDE& other ); __inline OVERRIDE &operator=( const T* overridable ); // these are the methods which we can use to access data in a pointer. (Dereference*, ->, and cast @@ -88,9 +88,9 @@ OVERRIDE::OVERRIDE(OVERRIDE &overridable) //------------------------------------------------------------------------------------------------- template -OVERRIDE &OVERRIDE::operator=( const OVERRIDE& override ) +OVERRIDE &OVERRIDE::operator=( const OVERRIDE& other ) { - m_overridable = override.m_overridable; + m_overridable = other.m_overridable; return *this; } diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h index 9aa2b664c74..667afc6db3f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h @@ -76,7 +76,7 @@ class ParachuteContain : public OpenContain virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ); virtual void onDie( const DamageInfo * damageInfo ); - virtual void setOverrideDestination( const Coord3D *override ); ///< Instead of falling peacefully towards a clear spot, I will now aim here + virtual void setOverrideDestination( const Coord3D *dest ); ///< Instead of falling peacefully towards a clear spot, I will now aim here protected: diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp index e0a3bde39f6..8527e8a70cd 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp @@ -1114,23 +1114,23 @@ Bool GlobalData::setTimeOfDay( TimeOfDay tod ) GlobalData *GlobalData::newOverride() { // TheSuperHackers @info This copy is not implemented in VS6 builds - GlobalData *override = NEW GlobalData; + GlobalData *overrideData = NEW GlobalData; // copy the data from the latest override (TheWritableGlobalData) to the newly created instance DEBUG_ASSERTCRASH( TheWritableGlobalData, ("GlobalData::newOverride() - no existing data") ); - *override = *TheWritableGlobalData; + *overrideData = *TheWritableGlobalData; // // link the override to the previously created one, the link order is important here // for the reset function, if you change the way things are linked // for overrides make sure you update the reset function // - override->m_next = TheWritableGlobalData; + overrideData->m_next = TheWritableGlobalData; // set this new instance as the 'most current override' where we will access all data from - TheWritableGlobalData = override; + TheWritableGlobalData = overrideData; - return override; + return overrideData; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp index 2f6a6415799..2c26f935a9f 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp @@ -539,12 +539,12 @@ static void saveOptions() UnicodeString uStr = GadgetTextEntryGetText(textEntryFirewallPortOverride); AsciiString aStr; aStr.translate(uStr); - Int override = atoi(aStr.str()); - if (override < 0 || override > 65535) - override = 0; - if (TheGlobalData->m_firewallPortOverride != override) - { TheWritableGlobalData->m_firewallPortOverride = override; - aStr.format("%d", override); + Int portOverride = atoi(aStr.str()); + if (portOverride < 0 || portOverride > 65535) + portOverride = 0; + if (TheGlobalData->m_firewallPortOverride != portOverride) + { TheWritableGlobalData->m_firewallPortOverride = portOverride; + aStr.format("%d", portOverride); (*pref)["FirewallPortOverride"] = aStr; } } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp index d42f8416548..1432b5790d9 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp @@ -623,10 +623,10 @@ void ParachuteContain::positionContainedObjectsRelativeToContainer() } //------------------------------------------------------------------------------------------------- -void ParachuteContain::setOverrideDestination( const Coord3D *override ) +void ParachuteContain::setOverrideDestination( const Coord3D *dest ) { // Instead of trying to float straight down, I am going to nail this spot. - m_landingOverride = *override; + m_landingOverride = *dest; m_isLandingOverrideSet = TRUE; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp index 48f5e03fbd8..003a1c67c20 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp @@ -1729,9 +1729,9 @@ void WeaponStore::reset() WeaponTemplate *wt = m_weaponTemplateVector[i]; if (wt->isOverride()) { - WeaponTemplate *override = wt; + WeaponTemplate *overrideData = wt; wt = wt->friend_clearNextTemplate(); - deleteInstance(override); + deleteInstance(overrideData); } } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp index 21474009798..1d671f180f5 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp @@ -2800,10 +2800,10 @@ void GameLogic::eraseSleepyUpdate(Int i) // swap with the final item, toss the final item, then rebalance m_sleepyUpdates[i]->friend_setIndexInLogic(-1); - Int final = m_sleepyUpdates.size() - 1; - if (i < final) + Int last = m_sleepyUpdates.size() - 1; + if (i < last) { - m_sleepyUpdates[i] = m_sleepyUpdates[final]; + m_sleepyUpdates[i] = m_sleepyUpdates[last]; m_sleepyUpdates[i]->friend_setIndexInLogic(i); m_sleepyUpdates.pop_back(); rebalanceSleepyUpdate(i); From e0af35916d889cd7745a03e1b67665d931023c33 Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Mon, 23 Feb 2026 16:47:17 -0500 Subject: [PATCH 3/7] refactor(Generals): Rename override and final identifiers for keyword compatibility --- Generals/Code/GameEngine/Include/Common/DrawModule.h | 2 +- Generals/Code/GameEngine/Include/Common/Override.h | 6 +++--- .../Include/GameLogic/Module/ParachuteContain.h | 2 +- .../Code/GameEngine/Source/Common/GlobalData.cpp | 10 +++++----- .../GUI/GUICallbacks/Menus/OptionsMenu.cpp | 12 ++++++------ .../GameLogic/Object/Contain/ParachuteContain.cpp | 4 ++-- .../GameEngine/Source/GameLogic/Object/Weapon.cpp | 4 ++-- .../GameEngine/Source/GameLogic/System/GameLogic.cpp | 6 +++--- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Generals/Code/GameEngine/Include/Common/DrawModule.h b/Generals/Code/GameEngine/Include/Common/DrawModule.h index 63f3f9f8a1d..6646b80d55c 100644 --- a/Generals/Code/GameEngine/Include/Common/DrawModule.h +++ b/Generals/Code/GameEngine/Include/Common/DrawModule.h @@ -123,7 +123,7 @@ class DebrisDrawInterface { public: virtual void setModelName(AsciiString name, Color color, ShadowType t) = 0; - virtual void setAnimNames(AsciiString initial, AsciiString flying, AsciiString final, const FXList* finalFX) = 0; + virtual void setAnimNames(AsciiString initial, AsciiString flying, AsciiString finalAnim, const FXList* finalFX) = 0; }; //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/Common/Override.h b/Generals/Code/GameEngine/Include/Common/Override.h index d607ed4835c..2516a45a1e0 100644 --- a/Generals/Code/GameEngine/Include/Common/Override.h +++ b/Generals/Code/GameEngine/Include/Common/Override.h @@ -54,7 +54,7 @@ template class OVERRIDE // Copy constructor OVERRIDE(OVERRIDE &overridable); // Operator= for copying from another OVERRIDE and T* - __inline OVERRIDE &operator=( const OVERRIDE& override ); + __inline OVERRIDE &operator=( const OVERRIDE& other ); __inline OVERRIDE &operator=( const T* overridable ); // these are the methods which we can use to access data in a pointer. (Dereference*, ->, and cast @@ -88,9 +88,9 @@ OVERRIDE::OVERRIDE(OVERRIDE &overridable) //------------------------------------------------------------------------------------------------- template -OVERRIDE &OVERRIDE::operator=( const OVERRIDE& override ) +OVERRIDE &OVERRIDE::operator=( const OVERRIDE& other ) { - m_overridable = override.m_overridable; + m_overridable = other.m_overridable; return *this; } diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h index 6e4d652e77e..7d9e4065e15 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h @@ -76,7 +76,7 @@ class ParachuteContain : public OpenContain virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ); virtual void onDie( const DamageInfo * damageInfo ); - virtual void setOverrideDestination( const Coord3D *override ); ///< Instead of falling peacefully towards a clear spot, I will now aim here + virtual void setOverrideDestination( const Coord3D *dest ); ///< Instead of falling peacefully towards a clear spot, I will now aim here protected: diff --git a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp index b105179b711..a3cf9c0dac0 100644 --- a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp +++ b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp @@ -1082,23 +1082,23 @@ Bool GlobalData::setTimeOfDay( TimeOfDay tod ) GlobalData *GlobalData::newOverride() { // TheSuperHackers @info This copy is not implemented in VS6 builds - GlobalData *override = NEW GlobalData; + GlobalData *overrideData = NEW GlobalData; // copy the data from the latest override (TheWritableGlobalData) to the newly created instance DEBUG_ASSERTCRASH( TheWritableGlobalData, ("GlobalData::newOverride() - no existing data") ); - *override = *TheWritableGlobalData; + *overrideData = *TheWritableGlobalData; // // link the override to the previously created one, the link order is important here // for the reset function, if you change the way things are linked // for overrides make sure you update the reset function // - override->m_next = TheWritableGlobalData; + overrideData->m_next = TheWritableGlobalData; // set this new instance as the 'most current override' where we will access all data from - TheWritableGlobalData = override; + TheWritableGlobalData = overrideData; - return override; + return overrideData; } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp index 68910c16cd6..89e65f06f2f 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp @@ -520,12 +520,12 @@ static void saveOptions() UnicodeString uStr = GadgetTextEntryGetText(textEntryFirewallPortOverride); AsciiString aStr; aStr.translate(uStr); - Int override = atoi(aStr.str()); - if (override < 0 || override > 65535) - override = 0; - if (TheGlobalData->m_firewallPortOverride != override) - { TheWritableGlobalData->m_firewallPortOverride = override; - aStr.format("%d", override); + Int portOverride = atoi(aStr.str()); + if (portOverride < 0 || portOverride > 65535) + portOverride = 0; + if (TheGlobalData->m_firewallPortOverride != portOverride) + { TheWritableGlobalData->m_firewallPortOverride = portOverride; + aStr.format("%d", portOverride); (*pref)["FirewallPortOverride"] = aStr; } } diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp index dbb8d5ea384..8db80a05e89 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp @@ -569,10 +569,10 @@ void ParachuteContain::positionContainedObjectsRelativeToContainer() } //------------------------------------------------------------------------------------------------- -void ParachuteContain::setOverrideDestination( const Coord3D *override ) +void ParachuteContain::setOverrideDestination( const Coord3D *dest ) { // Instead of trying to float straight down, I am going to nail this spot. - m_landingOverride = *override; + m_landingOverride = *dest; m_isLandingOverrideSet = TRUE; } diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp index 6972b629a32..86f54c1081b 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp @@ -1583,9 +1583,9 @@ void WeaponStore::reset() WeaponTemplate *wt = m_weaponTemplateVector[i]; if (wt->isOverride()) { - WeaponTemplate *override = wt; + WeaponTemplate *overrideData = wt; wt = wt->friend_clearNextTemplate(); - deleteInstance(override); + deleteInstance(overrideData); } } diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp index 44a50e80917..d14956a9903 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp @@ -2474,10 +2474,10 @@ void GameLogic::eraseSleepyUpdate(Int i) // swap with the final item, toss the final item, then rebalance m_sleepyUpdates[i]->friend_setIndexInLogic(-1); - Int final = m_sleepyUpdates.size() - 1; - if (i < final) + Int last = m_sleepyUpdates.size() - 1; + if (i < last) { - m_sleepyUpdates[i] = m_sleepyUpdates[final]; + m_sleepyUpdates[i] = m_sleepyUpdates[last]; m_sleepyUpdates[i]->friend_setIndexInLogic(i); m_sleepyUpdates.pop_back(); rebalanceSleepyUpdate(i); From 2b9e381c2800f22df53c3da482ca3a7e6b657664 Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Mon, 23 Feb 2026 16:47:21 -0500 Subject: [PATCH 4/7] refactor(Core): Rename override and final identifiers for keyword compatibility --- Core/GameEngine/Source/Common/OptionPreferences.cpp | 8 ++++---- .../W3DDevice/GameClient/Module/W3DDebrisDraw.h | 2 +- .../GameClient/Drawable/Draw/W3DDebrisDraw.cpp | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Core/GameEngine/Source/Common/OptionPreferences.cpp b/Core/GameEngine/Source/Common/OptionPreferences.cpp index 063de6838d1..36df300ef8a 100644 --- a/Core/GameEngine/Source/Common/OptionPreferences.cpp +++ b/Core/GameEngine/Source/Common/OptionPreferences.cpp @@ -435,10 +435,10 @@ UnsignedShort OptionPreferences::getFirewallPortOverride() return TheGlobalData->m_firewallPortOverride; } - Int override = atoi(it->second.str()); - if (override < 0 || override > 65535) - override = 0; - return override; + Int portOverride = atoi(it->second.str()); + if (portOverride < 0 || portOverride > 65535) + portOverride = 0; + return portOverride; } Bool OptionPreferences::getFirewallNeedToRefresh() diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h index c2b28f4c7b3..dc6abee4f62 100644 --- a/Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h +++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h @@ -65,7 +65,7 @@ class W3DDebrisDraw : public DrawModule, public DebrisDrawInterface virtual void reactToGeometryChange() { } virtual void setModelName(AsciiString name, Color color, ShadowType t); - virtual void setAnimNames(AsciiString initial, AsciiString flying, AsciiString final, const FXList* finalFX); + virtual void setAnimNames(AsciiString initial, AsciiString flying, AsciiString finalAnim, const FXList* finalFX); virtual DebrisDrawInterface* getDebrisDrawInterface() { return this; } virtual const DebrisDrawInterface* getDebrisDrawInterface() const { return this; } diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp index bb91e632ed7..c7c1cc70667 100644 --- a/Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp +++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp @@ -148,7 +148,7 @@ void W3DDebrisDraw::setModelName(AsciiString name, Color color, ShadowType t) } //------------------------------------------------------------------------------------------------- -void W3DDebrisDraw::setAnimNames(AsciiString initial, AsciiString flying, AsciiString final, const FXList* finalFX) +void W3DDebrisDraw::setAnimNames(AsciiString initial, AsciiString flying, AsciiString finalAnim, const FXList* finalFX) { int i; for (i = 0; i < STATECOUNT; ++i) @@ -159,23 +159,23 @@ void W3DDebrisDraw::setAnimNames(AsciiString initial, AsciiString flying, AsciiS m_anims[INITIAL] = initial.isEmpty() ? nullptr : W3DDisplay::m_assetManager->Get_HAnim(initial.str()); m_anims[FLYING] = flying.isEmpty() ? nullptr : W3DDisplay::m_assetManager->Get_HAnim(flying.str()); - if (stricmp(final.str(), "STOP") == 0) + if (stricmp(finalAnim.str(), "STOP") == 0) { m_finalStop = true; - final = flying; + finalAnim = flying; } else { m_finalStop = false; } - m_anims[FINAL] = final.isEmpty() ? nullptr : W3DDisplay::m_assetManager->Get_HAnim(final.str()); + m_anims[FINAL] = finalAnim.isEmpty() ? nullptr : W3DDisplay::m_assetManager->Get_HAnim(finalAnim.str()); m_state = 0; m_frames = 0; m_fxFinal = finalFX; m_animInitial = initial; m_animFlying = flying; - m_animFinal = final; + m_animFinal = finalAnim; } From a71b8d050757d3e65519fa976b52c065d69ae017 Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Tue, 3 Mar 2026 18:31:27 -0500 Subject: [PATCH 5/7] refactor(GeneralsMD): Add override keyword to virtual function overrides in GameEngineDevice --- .../W3DDevice/Common/W3DFunctionLexicon.h | 8 +- .../W3DDevice/Common/W3DModuleFactory.h | 2 +- .../W3DDevice/Common/W3DThingFactory.h | 2 +- .../W3DDevice/GameClient/W3DAssetManager.h | 10 +-- .../W3DDevice/GameClient/W3DDebugDisplay.h | 4 +- .../Include/W3DDevice/GameClient/W3DDisplay.h | 86 +++++++++---------- .../W3DDevice/GameClient/W3DDisplayString.h | 20 ++--- .../GameClient/W3DDisplayStringManager.h | 14 +-- .../W3DDevice/GameClient/W3DDynamicLight.h | 4 +- .../W3DDevice/GameClient/W3DFileSystem.h | 36 ++++---- .../W3DDevice/GameClient/W3DGameClient.h | 44 +++++----- .../W3DDevice/GameClient/W3DGameFont.h | 6 +- .../W3DDevice/GameClient/W3DGameWindow.h | 6 +- .../GameClient/W3DGameWindowManager.h | 52 +++++------ .../W3DDevice/GameClient/W3DInGameUI.h | 12 +-- .../W3DDevice/GameClient/W3DParticleSys.h | 8 +- .../W3DDevice/GameClient/W3DProjectedShadow.h | 8 +- .../Include/W3DDevice/GameClient/W3DScene.h | 32 +++---- .../Include/W3DDevice/GameClient/W3DShroud.h | 8 +- .../W3DDevice/GameClient/W3DStatusCircle.h | 14 +-- .../GameClient/W3DVolumetricShadow.h | 2 +- .../W3DDevice/GameClient/W3DWebBrowser.h | 4 +- .../W3DDevice/GameLogic/W3DGameLogic.h | 4 +- .../W3DDevice/GameLogic/W3DGhostObject.h | 36 ++++---- .../W3DDevice/GameLogic/W3DTerrainLogic.h | 32 +++---- .../Win32Device/Common/Win32GameEngine.h | 32 +++---- .../GameClient/Shadow/W3DProjectedShadow.cpp | 8 +- .../GameClient/Shadow/W3DVolumetricShadow.cpp | 8 +- .../W3DDevice/GameClient/W3DAssetManager.cpp | 8 +- .../W3DDevice/GameLogic/W3DGhostObject.cpp | 6 +- 30 files changed, 258 insertions(+), 258 deletions(-) diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h index a9fdf7d89d5..ed6826c3f9d 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h @@ -40,11 +40,11 @@ class W3DFunctionLexicon : public FunctionLexicon public: W3DFunctionLexicon(); - virtual ~W3DFunctionLexicon(); + virtual ~W3DFunctionLexicon() override; - virtual void init(); - virtual void reset(); - virtual void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; protected: diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h index dc5bfc4929d..6513e7b7f1a 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h @@ -43,6 +43,6 @@ class W3DModuleFactory : public ModuleFactory public: - virtual void init(); + virtual void init() override; }; diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h index a49aae8035b..6221a59f513 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h @@ -42,5 +42,5 @@ class W3DThingFactory : public ThingFactory public: W3DThingFactory(); - virtual ~W3DThingFactory(); + virtual ~W3DThingFactory() override; }; diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h index aa718a900b5..341e50a4a4f 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h @@ -54,12 +54,12 @@ class W3DAssetManager: public WW3DAssetManager { public: W3DAssetManager(); - virtual ~W3DAssetManager(); + virtual ~W3DAssetManager() override; - virtual RenderObjClass * Create_Render_Obj(const char * name); + virtual RenderObjClass * Create_Render_Obj(const char * name) override; // unique to W3DAssetManager - virtual HAnimClass * Get_HAnim(const char * name); - virtual bool Load_3D_Assets( const char * filename ); // This CANNOT be Bool, as it will not inherit properly if you make Bool == Int + virtual HAnimClass * Get_HAnim(const char * name) override; + virtual bool Load_3D_Assets( const char * filename ) override; // This CANNOT be Bool, as it will not inherit properly if you make Bool == Int virtual TextureClass * Get_Texture ( @@ -69,7 +69,7 @@ class W3DAssetManager: public WW3DAssetManager bool allow_compression=true, TextureBaseClass::TexAssetType type=TextureBaseClass::TEX_REGULAR, bool allow_reduction=true - ); + ) override; //'Generals' customizations void Report_Used_Assets(); diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h index 6313025c018..f69a5ef04a0 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h @@ -72,7 +72,7 @@ class W3DDebugDisplay : public DebugDisplay public: W3DDebugDisplay(); - virtual ~W3DDebugDisplay(); + virtual ~W3DDebugDisplay() override; void init(); ///< Initialized the display void setFont( GameFont *font ); ///< Set the font to render with @@ -86,7 +86,7 @@ class W3DDebugDisplay : public DebugDisplay Int m_fontHeight; DisplayString *m_displayString; - virtual void drawText( Int x, Int y, Char *text ); ///< Render null terminated string at current cursor position + virtual void drawText( Int x, Int y, Char *text ) override; ///< Render null terminated string at current cursor position }; diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h index 18a10ef8637..3eaff6ab0fc 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h @@ -56,87 +56,87 @@ class W3DDisplay : public Display public: W3DDisplay(); - ~W3DDisplay(); - - virtual void init(); ///< initialize or re-initialize the system - virtual void reset() ; ///< Reset system - - virtual void setWidth( UnsignedInt width ); - virtual void setHeight( UnsignedInt height ); - virtual Bool setDisplayMode( UnsignedInt xres, UnsignedInt yres, UnsignedInt bitdepth, Bool windowed ); - virtual Int getDisplayModeCount(); ///removeShadow(this);} ///removeShadow(this);} ///removeShadow(this);} ///removeShadow(this);} ///Class_ID(); } - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { deleteInstance(this); } + virtual const char* Get_Name() const override { return Name.str(); } + virtual int Get_Class_ID() const override { return Proto->Class_ID(); } + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { deleteInstance(this); } protected: //virtual ~W3DPrototypeClass(); diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp index d2be8e5fb1d..12700d3cc3c 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp @@ -68,9 +68,9 @@ class W3DRenderObjectSnapshot : public Snapshot protected: - virtual void crc( Xfer *xfer ); - virtual void xfer( Xfer *xfer ); - virtual void loadPostProcess(); + virtual void crc( Xfer *xfer ) override; + virtual void xfer( Xfer *xfer ) override; + virtual void loadPostProcess() override; #ifdef DEBUG_FOG_MEMORY const char *m_robjName; /// Date: Tue, 3 Mar 2026 18:31:28 -0500 Subject: [PATCH 6/7] refactor(Generals): Add override keyword to virtual function overrides in GameEngineDevice --- .../W3DDevice/Common/W3DFunctionLexicon.h | 8 +- .../W3DDevice/Common/W3DModuleFactory.h | 2 +- .../W3DDevice/Common/W3DThingFactory.h | 2 +- .../W3DDevice/GameClient/W3DAssetManager.h | 8 +- .../W3DDevice/GameClient/W3DDebugDisplay.h | 4 +- .../Include/W3DDevice/GameClient/W3DDisplay.h | 86 +++++++++---------- .../W3DDevice/GameClient/W3DDisplayString.h | 20 ++--- .../GameClient/W3DDisplayStringManager.h | 14 +-- .../W3DDevice/GameClient/W3DDynamicLight.h | 4 +- .../W3DDevice/GameClient/W3DFileSystem.h | 36 ++++---- .../W3DDevice/GameClient/W3DGameClient.h | 40 ++++----- .../W3DDevice/GameClient/W3DGameFont.h | 6 +- .../W3DDevice/GameClient/W3DGameWindow.h | 6 +- .../GameClient/W3DGameWindowManager.h | 52 +++++------ .../W3DDevice/GameClient/W3DInGameUI.h | 12 +-- .../W3DDevice/GameClient/W3DParticleSys.h | 8 +- .../W3DDevice/GameClient/W3DProjectedShadow.h | 8 +- .../Include/W3DDevice/GameClient/W3DScene.h | 32 +++---- .../Include/W3DDevice/GameClient/W3DShroud.h | 8 +- .../W3DDevice/GameClient/W3DStatusCircle.h | 14 +-- .../GameClient/W3DVolumetricShadow.h | 2 +- .../W3DDevice/GameClient/W3DWebBrowser.h | 4 +- .../W3DDevice/GameLogic/W3DGameLogic.h | 4 +- .../W3DDevice/GameLogic/W3DGhostObject.h | 36 ++++---- .../W3DDevice/GameLogic/W3DTerrainLogic.h | 32 +++---- .../Win32Device/Common/Win32GameEngine.h | 32 +++---- .../GameClient/Shadow/W3DProjectedShadow.cpp | 8 +- .../GameClient/Shadow/W3DVolumetricShadow.cpp | 8 +- .../W3DDevice/GameClient/W3DAssetManager.cpp | 8 +- .../W3DDevice/GameLogic/W3DGhostObject.cpp | 6 +- 30 files changed, 255 insertions(+), 255 deletions(-) diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h index 0d59284fa03..cca4969ce3f 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h @@ -40,11 +40,11 @@ class W3DFunctionLexicon : public FunctionLexicon public: W3DFunctionLexicon(); - virtual ~W3DFunctionLexicon(); + virtual ~W3DFunctionLexicon() override; - virtual void init(); - virtual void reset(); - virtual void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; protected: diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h index 555ad5631e2..150d8667265 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h @@ -43,6 +43,6 @@ class W3DModuleFactory : public ModuleFactory public: - virtual void init(); + virtual void init() override; }; diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h index 2ec83c1cfd2..d21e02d4395 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h @@ -42,5 +42,5 @@ class W3DThingFactory : public ThingFactory public: W3DThingFactory(); - virtual ~W3DThingFactory(); + virtual ~W3DThingFactory() override; }; diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h index 47918cab361..82d95451060 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h @@ -54,12 +54,12 @@ class W3DAssetManager: public WW3DAssetManager { public: W3DAssetManager(); - virtual ~W3DAssetManager(); + virtual ~W3DAssetManager() override; - virtual RenderObjClass * Create_Render_Obj(const char * name); + virtual RenderObjClass * Create_Render_Obj(const char * name) override; // unique to W3DAssetManager - virtual HAnimClass * Get_HAnim(const char * name); - virtual bool Load_3D_Assets( const char * filename ); // This CANNOT be Bool, as it will not inherit properly if you make Bool == Int + virtual HAnimClass * Get_HAnim(const char * name) override; + virtual bool Load_3D_Assets( const char * filename ) override; // This CANNOT be Bool, as it will not inherit properly if you make Bool == Int virtual TextureClass * Get_Texture( const char * filename, MipCountType mip_level_count=MIP_LEVELS_ALL, diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h index 8ce846e22c5..cdf3c0e91e2 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h @@ -72,7 +72,7 @@ class W3DDebugDisplay : public DebugDisplay public: W3DDebugDisplay(); - virtual ~W3DDebugDisplay(); + virtual ~W3DDebugDisplay() override; void init(); ///< Initialized the display void setFont( GameFont *font ); ///< Set the font to render with @@ -86,7 +86,7 @@ class W3DDebugDisplay : public DebugDisplay Int m_fontHeight; DisplayString *m_displayString; - virtual void drawText( Int x, Int y, Char *text ); ///< Render null ternimated string at current cursor position + virtual void drawText( Int x, Int y, Char *text ) override; ///< Render null ternimated string at current cursor position }; diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h index 34b0c54a201..6239402321f 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h @@ -56,87 +56,87 @@ class W3DDisplay : public Display public: W3DDisplay(); - ~W3DDisplay(); - - virtual void init(); ///< initialize or re-initialize the sytsem - virtual void reset() ; ///< Reset system - - virtual void setWidth( UnsignedInt width ); - virtual void setHeight( UnsignedInt height ); - virtual Bool setDisplayMode( UnsignedInt xres, UnsignedInt yres, UnsignedInt bitdepth, Bool windowed ); - virtual Int getDisplayModeCount(); ///removeShadow(this);} ///removeShadow(this);} ///removeShadow(this);} ///removeShadow(this);} ///Class_ID(); } - virtual RenderObjClass * Create(); - virtual void DeleteSelf() { deleteInstance(this); } + virtual const char* Get_Name() const override { return Name.str(); } + virtual int Get_Class_ID() const override { return Proto->Class_ID(); } + virtual RenderObjClass * Create() override; + virtual void DeleteSelf() override { deleteInstance(this); } protected: //virtual ~W3DPrototypeClass(); diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp index 9ba4bd16acb..3770b3ce653 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp @@ -68,9 +68,9 @@ class W3DRenderObjectSnapshot : public Snapshot protected: - virtual void crc( Xfer *xfer ); - virtual void xfer( Xfer *xfer ); - virtual void loadPostProcess(); + virtual void crc( Xfer *xfer ) override; + virtual void xfer( Xfer *xfer ) override; + virtual void loadPostProcess() override; #ifdef DEBUG_FOG_MEMORY const char *m_robjName; /// Date: Tue, 3 Mar 2026 18:31:28 -0500 Subject: [PATCH 7/7] refactor(Core): Add override keyword to virtual function overrides in GameEngineDevice --- .../MilesAudioDevice/MilesAudioManager.h | 100 +++++++------- .../Include/StdDevice/Common/StdBIGFile.h | 18 +-- .../StdDevice/Common/StdBIGFileSystem.h | 20 +-- .../StdDevice/Common/StdLocalFileSystem.h | 20 +-- .../VideoDevice/Bink/BinkVideoPlayer.h | 42 +++--- .../Include/W3DDevice/Common/W3DRadar.h | 28 ++-- .../W3DDevice/GameClient/BaseHeightMap.h | 28 ++-- .../W3DDevice/GameClient/CameraShakeSystem.h | 2 +- .../W3DDevice/GameClient/FlatHeightMap.h | 28 ++-- .../Include/W3DDevice/GameClient/HeightMap.h | 30 ++-- .../GameClient/Module/W3DDebrisDraw.h | 22 +-- .../GameClient/Module/W3DDefaultDraw.h | 14 +- .../Module/W3DDependencyModelDraw.h | 8 +- .../GameClient/Module/W3DLaserDraw.h | 26 ++-- .../GameClient/Module/W3DModelDraw.h | 88 ++++++------ .../Module/W3DOverlordAircraftDraw.h | 6 +- .../GameClient/Module/W3DOverlordTankDraw.h | 6 +- .../GameClient/Module/W3DOverlordTruckDraw.h | 6 +- .../GameClient/Module/W3DPoliceCarDraw.h | 2 +- .../Module/W3DProjectileStreamDraw.h | 16 +-- .../W3DDevice/GameClient/Module/W3DPropDraw.h | 16 +-- .../W3DDevice/GameClient/Module/W3DRopeDraw.h | 28 ++-- .../GameClient/Module/W3DScienceModelDraw.h | 4 +- .../GameClient/Module/W3DSupplyDraw.h | 6 +- .../W3DDevice/GameClient/Module/W3DTankDraw.h | 10 +- .../GameClient/Module/W3DTankTruckDraw.h | 12 +- .../GameClient/Module/W3DTracerDraw.h | 20 +-- .../W3DDevice/GameClient/Module/W3DTreeDraw.h | 16 +-- .../GameClient/Module/W3DTruckDraw.h | 12 +- .../Include/W3DDevice/GameClient/TerrainTex.h | 12 +- .../Include/W3DDevice/GameClient/W3DMouse.h | 12 +- .../W3DDevice/GameClient/W3DPropBuffer.h | 6 +- .../W3DDevice/GameClient/W3DShaderManager.h | 56 ++++---- .../Include/W3DDevice/GameClient/W3DSmudge.h | 10 +- .../Include/W3DDevice/GameClient/W3DSnow.h | 10 +- .../W3DDevice/GameClient/W3DTerrainTracks.h | 12 +- .../W3DDevice/GameClient/W3DTerrainVisual.h | 74 +++++----- .../W3DDevice/GameClient/W3DTreeBuffer.h | 8 +- .../W3DDevice/GameClient/W3DVideoBuffer.h | 12 +- .../Include/W3DDevice/GameClient/W3DView.h | 130 +++++++++--------- .../Include/W3DDevice/GameClient/W3DWater.h | 22 +-- .../W3DDevice/GameClient/WorldHeightMap.h | 10 +- .../Include/Win32Device/Common/Win32BIGFile.h | 18 +-- .../Win32Device/Common/Win32BIGFileSystem.h | 20 +-- .../Win32Device/Common/Win32LocalFileSystem.h | 20 +-- .../Win32Device/GameClient/Win32DIKeyboard.h | 12 +- .../Win32Device/GameClient/Win32DIMouse.h | 20 +-- .../Win32Device/GameClient/Win32Mouse.h | 24 ++-- .../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 +- 53 files changed, 608 insertions(+), 608 deletions(-) diff --git a/Core/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h b/Core/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h index 49aed779a21..58f10bad314 100644 --- a/Core/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h +++ b/Core/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h @@ -142,70 +142,70 @@ class MilesAudioManager : public AudioManager #endif // from AudioDevice - virtual void init(); - virtual void postProcessLoad(); - virtual void reset(); - virtual void update(); + virtual void init() override; + virtual void postProcessLoad() override; + virtual void reset() override; + virtual void update() override; MilesAudioManager(); - virtual ~MilesAudioManager(); + virtual ~MilesAudioManager() override; - virtual void nextMusicTrack(); - virtual void prevMusicTrack(); - virtual Bool isMusicPlaying() const; - virtual Bool hasMusicTrackCompleted( const AsciiString& trackName, Int numberOfTimes ) const; - virtual AsciiString getMusicTrackName() const; + virtual void nextMusicTrack() override; + virtual void prevMusicTrack() override; + virtual Bool isMusicPlaying() const override; + virtual Bool hasMusicTrackCompleted( const AsciiString& trackName, Int numberOfTimes ) const override; + virtual AsciiString getMusicTrackName() const override; - virtual void openDevice(); - virtual void closeDevice(); - virtual void *getDevice() { return m_digitalHandle; } + virtual void openDevice() override; + virtual void closeDevice() override; + virtual void *getDevice() override { return m_digitalHandle; } - virtual void stopAudio( AudioAffect which ); - virtual void pauseAudio( AudioAffect which ); - virtual void resumeAudio( AudioAffect which ); - virtual void pauseAmbient( Bool shouldPause ); + virtual void stopAudio( AudioAffect which ) override; + virtual void pauseAudio( AudioAffect which ) override; + virtual void resumeAudio( AudioAffect which ) override; + virtual void pauseAmbient( Bool shouldPause ) override; - virtual void killAudioEventImmediately( AudioHandle audioEvent ); + virtual void killAudioEventImmediately( AudioHandle audioEvent ) override; ///< Return whether the current audio is playing or not. ///< NOTE NOTE NOTE !!DO NOT USE THIS IN FOR GAMELOGIC PURPOSES!! NOTE NOTE NOTE - virtual Bool isCurrentlyPlaying( AudioHandle handle ); + virtual Bool isCurrentlyPlaying( AudioHandle handle ) override; - virtual void notifyOfAudioCompletion( UnsignedInt audioCompleted, UnsignedInt flags ); + virtual void notifyOfAudioCompletion( UnsignedInt audioCompleted, UnsignedInt flags ) override; virtual PlayingAudio *findPlayingAudioFrom( UnsignedInt audioCompleted, UnsignedInt flags ); - virtual UnsignedInt getProviderCount() const; - virtual AsciiString getProviderName( UnsignedInt providerNum ) const; - virtual UnsignedInt getProviderIndex( AsciiString providerName ) const; - virtual void selectProvider( UnsignedInt providerNdx ); - virtual void unselectProvider(); - virtual UnsignedInt getSelectedProvider() const; - virtual void setSpeakerType( UnsignedInt speakerType ); - virtual UnsignedInt getSpeakerType(); + virtual UnsignedInt getProviderCount() const override; + virtual AsciiString getProviderName( UnsignedInt providerNum ) const override; + virtual UnsignedInt getProviderIndex( AsciiString providerName ) const override; + virtual void selectProvider( UnsignedInt providerNdx ) override; + virtual void unselectProvider() override; + virtual UnsignedInt getSelectedProvider() const override; + virtual void setSpeakerType( UnsignedInt speakerType ) override; + virtual UnsignedInt getSpeakerType() override; - virtual void *getHandleForBink(); - virtual void releaseHandleForBink(); + virtual void *getHandleForBink() override; + virtual void releaseHandleForBink() override; - virtual void friend_forcePlayAudioEventRTS(const AudioEventRTS* eventToPlay); + virtual void friend_forcePlayAudioEventRTS(const AudioEventRTS* eventToPlay) override; - virtual UnsignedInt getNum2DSamples() const; - virtual UnsignedInt getNum3DSamples() const; - virtual UnsignedInt getNumStreams() const; + virtual UnsignedInt getNum2DSamples() const override; + virtual UnsignedInt getNum3DSamples() const override; + virtual UnsignedInt getNumStreams() const override; - virtual Bool doesViolateLimit( AudioEventRTS *event ) const; - virtual Bool isPlayingLowerPriority( AudioEventRTS *event ) const; - virtual Bool isPlayingAlready( AudioEventRTS *event ) const; - virtual Bool isObjectPlayingVoice( UnsignedInt objID ) const; + virtual Bool doesViolateLimit( AudioEventRTS *event ) const override; + virtual Bool isPlayingLowerPriority( AudioEventRTS *event ) const override; + virtual Bool isPlayingAlready( AudioEventRTS *event ) const override; + virtual Bool isObjectPlayingVoice( UnsignedInt objID ) const override; Bool killLowestPrioritySoundImmediately( AudioEventRTS *event ); AudioEventRTS* findLowestPrioritySound( AudioEventRTS *event ); - virtual void adjustVolumeOfPlayingAudio(AsciiString eventName, Real newVolume); + virtual void adjustVolumeOfPlayingAudio(AsciiString eventName, Real newVolume) override; - virtual void removePlayingAudio( AsciiString eventName ); - virtual void removeAllDisabledAudio(); + virtual void removePlayingAudio( AsciiString eventName ) override; + virtual void removeAllDisabledAudio() override; - virtual void processRequestList(); + virtual void processRequestList() override; virtual void processPlayingList(); virtual void processFadingList(); virtual void processStoppedList(); @@ -214,23 +214,23 @@ class MilesAudioManager : public AudioManager void adjustRequest( AudioRequest *req ); Bool checkForSample( AudioRequest *req ); - virtual void setHardwareAccelerated(Bool accel); - virtual void setSpeakerSurround(Bool surround); + virtual void setHardwareAccelerated(Bool accel) override; + virtual void setSpeakerSurround(Bool surround) override; - virtual void setPreferredProvider(AsciiString provider) { m_pref3DProvider = provider; } - virtual void setPreferredSpeaker(AsciiString speakerType) { m_prefSpeaker = speakerType; } + virtual void setPreferredProvider(AsciiString provider) override { m_pref3DProvider = provider; } + virtual void setPreferredSpeaker(AsciiString speakerType) override { m_prefSpeaker = speakerType; } - virtual Real getFileLengthMS( AsciiString strToLoad ) const; + virtual Real getFileLengthMS( AsciiString strToLoad ) const override; - virtual void closeAnySamplesUsingFile( const void *fileToClose ); + virtual void closeAnySamplesUsingFile( const void *fileToClose ) override; - virtual Bool has3DSensitiveStreamsPlaying() const; + virtual Bool has3DSensitiveStreamsPlaying() const override; protected: // 3-D functions - virtual void setDeviceListenerPosition(); + virtual void setDeviceListenerPosition() override; const Coord3D *getCurrentPositionFromEvent( AudioEventRTS *event ); Bool isOnScreen( const Coord3D *pos ) const; Real getEffectiveVolume(AudioEventRTS *event) const; diff --git a/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h index a87ceb19ea6..36538853352 100644 --- a/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h +++ b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h @@ -36,15 +36,15 @@ class StdBIGFile : public ArchiveFile { public: StdBIGFile(AsciiString name, AsciiString path); - virtual ~StdBIGFile(); - - virtual Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const; ///< fill in the fileInfo struct with info about the requested file. - virtual File* openFile( const Char *filename, Int access = 0 );///< Open the specified file within the BIG file - virtual void closeAllFiles(); ///< Close all file opened in this BIG file - virtual AsciiString getName(); ///< Returns the name of the BIG file - virtual AsciiString getPath(); ///< Returns full path and name of BIG file - virtual void setSearchPriority( Int new_priority ); ///< Set this BIG file's search priority - virtual void close(); ///< Close this BIG file + virtual ~StdBIGFile() override; + + virtual Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const override; ///< fill in the fileInfo struct with info about the requested file. + virtual File* openFile( const Char *filename, Int access = 0 ) override;///< Open the specified file within the BIG file + virtual void closeAllFiles() override; ///< Close all file opened in this BIG file + virtual AsciiString getName() override; ///< Returns the name of the BIG file + virtual AsciiString getPath() override; ///< Returns full path and name of BIG file + virtual void setSearchPriority( Int new_priority ) override; ///< Set this BIG file's search priority + virtual void close() override; ///< Close this BIG file protected: diff --git a/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h index e248e4dee48..b8cb316ab7c 100644 --- a/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h +++ b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h @@ -34,22 +34,22 @@ class StdBIGFileSystem : public ArchiveFileSystem { public: StdBIGFileSystem(); - virtual ~StdBIGFileSystem(); + virtual ~StdBIGFileSystem() override; - virtual void init(); - virtual void update(); - virtual void reset(); - virtual void postProcessLoad(); + virtual void init() override; + virtual void update() override; + virtual void reset() override; + virtual void postProcessLoad() override; // ArchiveFile operations - virtual void closeAllArchiveFiles(); ///< Close all Archivefiles currently open + virtual void closeAllArchiveFiles() override; ///< Close all Archivefiles currently open // File operations - virtual ArchiveFile * openArchiveFile(const Char *filename); - virtual void closeArchiveFile(const Char *filename); - virtual void closeAllFiles(); ///< Close all files associated with ArchiveFiles + virtual ArchiveFile * openArchiveFile(const Char *filename) override; + virtual void closeArchiveFile(const Char *filename) override; + virtual void closeAllFiles() override; ///< Close all files associated with ArchiveFiles - virtual Bool loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite = FALSE); + virtual Bool loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite = FALSE) override; protected: }; diff --git a/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h b/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h index d2a32c2a84b..af3504ad0aa 100644 --- a/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h +++ b/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h @@ -34,20 +34,20 @@ class StdLocalFileSystem : public LocalFileSystem { public: StdLocalFileSystem(); - virtual ~StdLocalFileSystem(); + virtual ~StdLocalFileSystem() override; - virtual void init(); - virtual void reset(); - virtual void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; - virtual File * openFile(const Char *filename, Int access = File::NONE, size_t bufferSize = File::BUFFERSIZE); ///< open the given file. - virtual Bool doesFileExist(const Char *filename) const; ///< does the given file exist? + virtual File * openFile(const Char *filename, Int access = File::NONE, size_t bufferSize = File::BUFFERSIZE) override; ///< open the given file. + virtual Bool doesFileExist(const Char *filename) const override; ///< does the given file exist? - virtual void getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep). Possibly search subdirectories. - virtual Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const; + virtual void getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const override; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep). Possibly search subdirectories. + virtual Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const override; - virtual Bool createDirectory(AsciiString directory); - virtual AsciiString normalizePath(const AsciiString& filePath) const; + virtual Bool createDirectory(AsciiString directory) override; + virtual AsciiString normalizePath(const AsciiString& filePath) const override; protected: }; diff --git a/Core/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h b/Core/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h index 1db36eada80..38047636245 100644 --- a/Core/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h +++ b/Core/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h @@ -72,21 +72,21 @@ class BinkVideoStream : public VideoStream Char *m_memFile; ///< Pointer to memory resident file BinkVideoStream(); ///< only BinkVideoPlayer can create these - virtual ~BinkVideoStream(); + virtual ~BinkVideoStream() override; public: - virtual void update(); ///< Update bink stream + virtual void update() override; ///< Update bink stream - virtual Bool isFrameReady(); ///< Is the frame ready to be displayed - virtual void frameDecompress(); ///< Render current frame in to buffer - virtual void frameRender( VideoBuffer *buffer ); ///< Render current frame in to buffer - virtual void frameNext(); ///< Advance to next frame - virtual Int frameIndex(); ///< Returns zero based index of current frame - virtual Int frameCount(); ///< Returns the total number of frames in the stream - virtual void frameGoto( Int index ); ///< Go to the spcified frame index - virtual Int height(); ///< Return the height of the video - virtual Int width(); ///< Return the width of the video + virtual Bool isFrameReady() override; ///< Is the frame ready to be displayed + virtual void frameDecompress() override; ///< Render current frame in to buffer + virtual void frameRender( VideoBuffer *buffer ) override; ///< Render current frame in to buffer + virtual void frameNext() override; ///< Advance to next frame + virtual Int frameIndex() override; ///< Returns zero based index of current frame + virtual Int frameCount() override; ///< Returns the total number of frames in the stream + virtual void frameGoto( Int index ) override; ///< Go to the spcified frame index + virtual Int height() override; ///< Return the height of the video + virtual Int width() override; ///< Return the width of the video }; @@ -109,24 +109,24 @@ class BinkVideoPlayer : public VideoPlayer public: // subsytem requirements - virtual void init(); ///< Initialize video playback code - virtual void reset(); ///< Reset video playback - virtual void update(); ///< Services all audio tasks. Should be called frequently + virtual void init() override; ///< Initialize video playback code + virtual void reset() override; ///< Reset video playback + virtual void update() override; ///< Services all audio tasks. Should be called frequently - virtual void deinit(); ///< Close down player + virtual void deinit() override; ///< Close down player BinkVideoPlayer(); - ~BinkVideoPlayer(); + virtual ~BinkVideoPlayer() override; // service - virtual void loseFocus(); ///< Should be called when application loses focus - virtual void regainFocus(); ///< Should be called when application regains focus + virtual void loseFocus() override; ///< Should be called when application loses focus + virtual void regainFocus() override; ///< Should be called when application regains focus - virtual VideoStreamInterface* open( AsciiString movieTitle ); ///< Open video file for playback - virtual VideoStreamInterface* load( AsciiString movieTitle ); ///< Load video file in to memory for playback + virtual VideoStreamInterface* open( AsciiString movieTitle ) override; ///< Open video file for playback + virtual VideoStreamInterface* load( AsciiString movieTitle ) override; ///< Load video file in to memory for playback - virtual void notifyVideoPlayerOfNewProvider( Bool nowHasValid ); + virtual void notifyVideoPlayerOfNewProvider( Bool nowHasValid ) override; virtual void initializeBinkWithMiles(); }; diff --git a/Core/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h b/Core/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h index 3ce04d94cb2..a3380019cca 100644 --- a/Core/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h +++ b/Core/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h @@ -51,27 +51,27 @@ class W3DRadar : public Radar public: W3DRadar(); - ~W3DRadar(); + ~W3DRadar() override; - virtual void xfer( Xfer *xfer ); + virtual void xfer( Xfer *xfer ) override; - virtual void init(); ///< subsystem init - virtual void update(); ///< subsystem update - virtual void reset(); ///< subsystem reset + virtual void init() override; ///< subsystem init + virtual void update() override; ///< subsystem update + virtual void reset() override; ///< subsystem reset - virtual void newMap( TerrainLogic *terrain ); ///< reset radar for new map + virtual void newMap( TerrainLogic *terrain ) override; ///< reset radar for new map - virtual void draw( Int pixelX, Int pixelY, Int width, Int height ); ///< draw the radar + virtual void draw( Int pixelX, Int pixelY, Int width, Int height ) override; ///< draw the radar - virtual void clearShroud(); - virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting); ///< set the shroud level at shroud cell x,y - virtual void beginSetShroudLevel(); ///< call this once before multiple calls to setShroudLevel for better performance - virtual void endSetShroudLevel(); ///< call this once after beginSetShroudLevel and setShroudLevel + virtual void clearShroud() override; + virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting) override; ///< set the shroud level at shroud cell x,y + virtual void beginSetShroudLevel() override; ///< call this once before multiple calls to setShroudLevel for better performance + virtual void endSetShroudLevel() override; ///< call this once after beginSetShroudLevel and setShroudLevel - virtual void refreshTerrain( TerrainLogic *terrain ); - virtual void refreshObjects(); + virtual void refreshTerrain( TerrainLogic *terrain ) override; + virtual void refreshObjects() override; - virtual void notifyViewChanged(); ///< signals that the camera view has changed + virtual void notifyViewChanged() override; ///< signals that the camera view has changed protected: diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h index ec874699cde..0d836e56fa4 100644 --- a/Core/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h +++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h @@ -93,26 +93,26 @@ class BaseHeightMapRenderObjClass : public RenderObjClass, public DX8_CleanupHoo public: BaseHeightMapRenderObjClass(); - virtual ~BaseHeightMapRenderObjClass(); + virtual ~BaseHeightMapRenderObjClass() override; // DX8_CleanupHook methods - virtual void ReleaseResources(); ///< Release all dx8 resources so the device can be reset. - virtual void ReAcquireResources(); ///< Reacquire all resources after device reset. + virtual void ReleaseResources() override; ///< Release all dx8 resources so the device can be reset. + virtual void ReAcquireResources() override; ///< Reacquire all resources after device reset. ///////////////////////////////////////////////////////////////////////////// // Render Object Interface (W3D methods) ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const; - virtual void Render(RenderInfoClass & rinfo) = 0; - virtual bool Cast_Ray(RayCollisionTestClass & raytest); // This CANNOT be Bool, as it will not inherit properly if you make Bool == Int - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const; + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override; + virtual void Render(RenderInfoClass & rinfo) override = 0; + virtual bool Cast_Ray(RayCollisionTestClass & raytest) override; // This CANNOT be Bool, as it will not inherit properly if you make Bool == Int + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const override; - virtual void On_Frame_Update(); - virtual void Notify_Added(SceneClass * scene); + virtual void On_Frame_Update() override; + virtual void Notify_Added(SceneClass * scene) override; // Other VIRTUAL methods. [3/20/2003] @@ -229,9 +229,9 @@ class BaseHeightMapRenderObjClass : public RenderObjClass, public DX8_CleanupHoo protected: // snapshot methods - virtual void crc( Xfer *xfer ); - virtual void xfer( Xfer *xfer ); - virtual void loadPostProcess(); + virtual void crc( Xfer *xfer ) override; + virtual void xfer( Xfer *xfer ) override; + virtual void loadPostProcess() override; protected: Int m_x; ///< dimensions of heightmap diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/CameraShakeSystem.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/CameraShakeSystem.h index c2d3768c424..edae45aee1f 100644 --- a/Core/GameEngineDevice/Include/W3DDevice/GameClient/CameraShakeSystem.h +++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/CameraShakeSystem.h @@ -80,7 +80,7 @@ class CameraShakeSystemClass { public: CameraShakerClass(const Vector3 & position,float radius,float duration,float power); - ~CameraShakerClass(); + ~CameraShakerClass() override; void Timestep(float dt) { ElapsedTime += dt; } bool Is_Expired() { return (ElapsedTime >= Duration); } diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h index aa8e5e9da6e..3f1f7c923ee 100644 --- a/Core/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h +++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h @@ -50,29 +50,29 @@ class FlatHeightMapRenderObjClass : public BaseHeightMapRenderObjClass public: FlatHeightMapRenderObjClass(); - virtual ~FlatHeightMapRenderObjClass(); + virtual ~FlatHeightMapRenderObjClass() override; // DX8_CleanupHook methods - virtual void ReleaseResources(); ///< Release all dx8 resources so the device can be reset. - virtual void ReAcquireResources(); ///< Reacquire all resources after device reset. + virtual void ReleaseResources() override; ///< Release all dx8 resources so the device can be reset. + virtual void ReAcquireResources() override; ///< Reacquire all resources after device reset. ///////////////////////////////////////////////////////////////////////////// // Render Object Interface (W3D methods) ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo); - virtual void On_Frame_Update(); + virtual void Render(RenderInfoClass & rinfo) override; + virtual void On_Frame_Update() override; ///allocate resources needed to render heightmap - virtual int initHeightData(Int width, Int height, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator,Bool updateExtraPassTiles=TRUE); - virtual Int freeMapResources(); ///< free resources used to render heightmap - virtual void updateCenter(CameraClass *camera, RefRenderObjListIterator *pLightsIterator); - virtual void adjustTerrainLOD(Int adj); - virtual void reset(); - virtual void oversizeTerrain(Int tilesToOversize); - virtual void staticLightingChanged(); - virtual void doPartialUpdate(const IRegion2D &partialRange, WorldHeightMap *htMap, RefRenderObjListIterator *pLightsIterator); - virtual int updateBlock(Int x0, Int y0, Int x1, Int y1, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator){return 0;}; + virtual int initHeightData(Int width, Int height, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator,Bool updateExtraPassTiles=TRUE) override; + virtual Int freeMapResources() override; ///< free resources used to render heightmap + virtual void updateCenter(CameraClass *camera, RefRenderObjListIterator *pLightsIterator) override; + virtual void adjustTerrainLOD(Int adj) override; + virtual void reset() override; + virtual void oversizeTerrain(Int tilesToOversize) override; + virtual void staticLightingChanged() override; + virtual void doPartialUpdate(const IRegion2D &partialRange, WorldHeightMap *htMap, RefRenderObjListIterator *pLightsIterator) override; + virtual int updateBlock(Int x0, Int y0, Int x1, Int y1, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator) override {return 0;}; protected: W3DTerrainBackground *m_tiles; diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h index ec4648bf17e..951e2665d1b 100644 --- a/Core/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h +++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h @@ -57,32 +57,32 @@ class HeightMapRenderObjClass : public BaseHeightMapRenderObjClass public: HeightMapRenderObjClass(); - virtual ~HeightMapRenderObjClass(); + virtual ~HeightMapRenderObjClass() override; // DX8_CleanupHook methods - virtual void ReleaseResources(); ///< Release all dx8 resources so the device can be reset. - virtual void ReAcquireResources(); ///< Reacquire all resources after device reset. + virtual void ReleaseResources() override; ///< Release all dx8 resources so the device can be reset. + virtual void ReAcquireResources() override; ///< Reacquire all resources after device reset. ///////////////////////////////////////////////////////////////////////////// // Render Object Interface (W3D methods) ///////////////////////////////////////////////////////////////////////////// - virtual void Render(RenderInfoClass & rinfo); - virtual void On_Frame_Update(); + virtual void Render(RenderInfoClass & rinfo) override; + virtual void On_Frame_Update() override; ///allocate resources needed to render heightmap - virtual int initHeightData(Int width, Int height, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator, Bool updateExtraPassTiles=TRUE); - virtual Int freeMapResources(); ///< free resources used to render heightmap - virtual void updateCenter(CameraClass *camera, RefRenderObjListIterator *pLightsIterator); + virtual int initHeightData(Int width, Int height, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator, Bool updateExtraPassTiles=TRUE) override; + virtual Int freeMapResources() override; ///< free resources used to render heightmap + virtual void updateCenter(CameraClass *camera, RefRenderObjListIterator *pLightsIterator) override; - virtual void staticLightingChanged(); - virtual void adjustTerrainLOD(Int adj); - virtual void reset(); - virtual void doPartialUpdate(const IRegion2D &partialRange, WorldHeightMap *htMap, RefRenderObjListIterator *pLightsIterator); + virtual void staticLightingChanged() override; + virtual void adjustTerrainLOD(Int adj) override; + virtual void reset() override; + virtual void doPartialUpdate(const IRegion2D &partialRange, WorldHeightMap *htMap, RefRenderObjListIterator *pLightsIterator) override; - virtual void oversizeTerrain(Int tilesToOversize); + virtual void oversizeTerrain(Int tilesToOversize) override; - virtual int updateBlock(Int x0, Int y0, Int x1, Int y1, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator); + virtual int updateBlock(Int x0, Int y0, Int x1, Int y1, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator) override; protected: Int *m_extraBlendTilePositions; ///x; m_guardBandBias.y = gb->y; } + virtual void setGuardBandBias( const Coord2D *gb ) override { m_guardBandBias.x = gb->x; m_guardBandBias.y = gb->y; } private: diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h index 1549d461cb8..831083e8864 100644 --- a/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h +++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h @@ -73,14 +73,14 @@ class WaterRenderObjClass : public Snapshot, }; WaterRenderObjClass(); - ~WaterRenderObjClass(); + ~WaterRenderObjClass() override; ///////////////////////////////////////////////////////////////////////////// // Render Object Interface (W3D methods) ///////////////////////////////////////////////////////////////////////////// - virtual RenderObjClass * Clone() const; - virtual int Class_ID() const; - virtual void Render(RenderInfoClass & rinfo); + virtual RenderObjClass * Clone() const override; + virtual int Class_ID() const override; + virtual void Render(RenderInfoClass & rinfo) override; /// @todo: Add methods for collision detection with water surface // virtual Bool Cast_Ray(RayCollisionTestClass & raytest); // virtual Bool Cast_AABox(AABoxCollisionTestClass & boxtest); @@ -88,11 +88,11 @@ class WaterRenderObjClass : public Snapshot, // virtual Bool Intersect_AABox(AABoxIntersectionTestClass & boxtest); // virtual Bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const override; // Get and set static sort level - virtual int Get_Sort_Level() const { return m_sortLevel; } - virtual void Set_Sort_Level(int level) { m_sortLevel = level;} + virtual int Get_Sort_Level() const override { return m_sortLevel; } + virtual void Set_Sort_Level(int level) override { m_sortLevel = level;} ///allocate W3D resources needed to render water void renderWater(); ///m_width) m_drawWidthX = m_width;} void setDrawHeight(Int height) {m_drawHeightY = height; if (m_drawHeightY>m_height) m_drawHeightY = m_height;} - virtual Int getBorderSize() {return m_borderSize;} + virtual Int getBorderSize() override {return m_borderSize;} Int getBorderSizeInline() const { return m_borderSize; } /// Get height with the offset that HeightMapRenderObjClass uses built in. UnsignedByte getDisplayHeight(Int x, Int y) { return m_data[x+m_drawOriginX+m_width*(y+m_drawOriginY)];} @@ -296,10 +296,10 @@ class WorldHeightMap : public RefCountClass, Bool getSeismicUpdateFlag(Int xIndex, Int yIndex) const; void setSeismicUpdateFlag(Int xIndex, Int yIndex, Bool value); void clearSeismicUpdateFlags() ; - virtual Real getSeismicZVelocity(Int xIndex, Int yIndex) const; - virtual void setSeismicZVelocity(Int xIndex, Int yIndex, Real value); + virtual Real getSeismicZVelocity(Int xIndex, Int yIndex) const override; + virtual void setSeismicZVelocity(Int xIndex, Int yIndex, Real value) override; void fillSeismicZVelocities( Real value ); - virtual Real getBilinearSampleSeismicZVelocity( Int x, Int y); + virtual Real getBilinearSampleSeismicZVelocity( Int x, Int y) override; diff --git a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h b/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h index 5892dc9dbf6..093aadbcf4c 100644 --- a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h +++ b/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h @@ -36,15 +36,15 @@ class Win32BIGFile : public ArchiveFile { public: Win32BIGFile(AsciiString name, AsciiString path); - virtual ~Win32BIGFile(); - - virtual Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const; ///< fill in the fileInfo struct with info about the requested file. - virtual File* openFile( const Char *filename, Int access = 0 );///< Open the specified file within the BIG file - virtual void closeAllFiles(); ///< Close all file opened in this BIG file - virtual AsciiString getName(); ///< Returns the name of the BIG file - virtual AsciiString getPath(); ///< Returns full path and name of BIG file - virtual void setSearchPriority( Int new_priority ); ///< Set this BIG file's search priority - virtual void close(); ///< Close this BIG file + virtual ~Win32BIGFile() override; + + virtual Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const override; ///< fill in the fileInfo struct with info about the requested file. + virtual File* openFile( const Char *filename, Int access = 0 ) override;///< Open the specified file within the BIG file + virtual void closeAllFiles() override; ///< Close all file opened in this BIG file + virtual AsciiString getName() override; ///< Returns the name of the BIG file + virtual AsciiString getPath() override; ///< Returns full path and name of BIG file + virtual void setSearchPriority( Int new_priority ) override; ///< Set this BIG file's search priority + virtual void close() override; ///< Close this BIG file protected: diff --git a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h b/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h index 6f0047c5130..6819ba90577 100644 --- a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h +++ b/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h @@ -34,22 +34,22 @@ class Win32BIGFileSystem : public ArchiveFileSystem { public: Win32BIGFileSystem(); - virtual ~Win32BIGFileSystem(); + virtual ~Win32BIGFileSystem() override; - virtual void init(); - virtual void update(); - virtual void reset(); - virtual void postProcessLoad(); + virtual void init() override; + virtual void update() override; + virtual void reset() override; + virtual void postProcessLoad() override; // ArchiveFile operations - virtual void closeAllArchiveFiles(); ///< Close all Archivefiles currently open + virtual void closeAllArchiveFiles() override; ///< Close all Archivefiles currently open // File operations - virtual ArchiveFile * openArchiveFile(const Char *filename); - virtual void closeArchiveFile(const Char *filename); - virtual void closeAllFiles(); ///< Close all files associated with ArchiveFiles + virtual ArchiveFile * openArchiveFile(const Char *filename) override; + virtual void closeArchiveFile(const Char *filename) override; + virtual void closeAllFiles() override; ///< Close all files associated with ArchiveFiles - virtual Bool loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite = FALSE); + virtual Bool loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite = FALSE) override; protected: }; diff --git a/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h b/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h index 7adf424986b..32319364d75 100644 --- a/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h +++ b/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h @@ -34,20 +34,20 @@ class Win32LocalFileSystem : public LocalFileSystem { public: Win32LocalFileSystem(); - virtual ~Win32LocalFileSystem(); + virtual ~Win32LocalFileSystem() override; - virtual void init(); - virtual void reset(); - virtual void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; - virtual File * openFile(const Char *filename, Int access = File::NONE, size_t bufferSize = File::BUFFERSIZE); ///< open the given file. - virtual Bool doesFileExist(const Char *filename) const; ///< does the given file exist? + virtual File * openFile(const Char *filename, Int access = File::NONE, size_t bufferSize = File::BUFFERSIZE) override; ///< open the given file. + virtual Bool doesFileExist(const Char *filename) const override; ///< does the given file exist? - virtual void getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep). Possibly search subdirectories. - virtual Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const; + virtual void getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const override; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep). Possibly search subdirectories. + virtual Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const override; - virtual Bool createDirectory(AsciiString directory); - virtual AsciiString normalizePath(const AsciiString& filePath) const; + virtual Bool createDirectory(AsciiString directory) override; + virtual AsciiString normalizePath(const AsciiString& filePath) const override; protected: }; diff --git a/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h b/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h index a1bdbb4d16e..58f340e5d5b 100644 --- a/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h +++ b/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h @@ -70,18 +70,18 @@ class DirectInputKeyboard : public Keyboard public: DirectInputKeyboard(); - virtual ~DirectInputKeyboard(); + virtual ~DirectInputKeyboard() override; // extend methods from the base class - virtual void init(); ///< initialize the keyboard, extending init functionality - virtual void reset(); ///< Reset the keyboard system - virtual void update(); ///< update call, extending update functionality - virtual Bool getCapsState(); ///< get state of caps lock key, return TRUE if down + virtual void init() override; ///< initialize the keyboard, extending init functionality + virtual void reset() override; ///< Reset the keyboard system + virtual void update() override; ///< update call, extending update functionality + virtual Bool getCapsState() override; ///< get state of caps lock key, return TRUE if down protected: // extended methods from the base class - virtual void getKey( KeyboardIO *key ); ///< get a single key event + virtual void getKey( KeyboardIO *key ) override; ///< get a single key event //----------------------------------------------------------------------------------------------- diff --git a/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h b/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h index dd48226acf2..c17e6b68cd3 100644 --- a/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h +++ b/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h @@ -62,25 +62,25 @@ class DirectInputMouse : public Mouse public: DirectInputMouse(); - virtual ~DirectInputMouse(); + virtual ~DirectInputMouse() override; // extended methods from base class - virtual void init(); ///< initialize the direct input mouse, extending functionality - virtual void reset(); ///< reset system - virtual void update(); ///< update the mouse data, extending functionality - virtual void setPosition( Int x, Int y ); ///< set position for mouse + virtual void init() override; ///< initialize the direct input mouse, extending functionality + virtual void reset() override; ///< reset system + virtual void update() override; ///< update the mouse data, extending functionality + virtual void setPosition( Int x, Int y ) override; ///< set position for mouse - virtual void setMouseLimits(); ///< update the limit extents the mouse can move in + virtual void setMouseLimits() override; ///< update the limit extents the mouse can move in - virtual void setCursor( MouseCursor cursor ); ///< set mouse cursor + virtual void setCursor( MouseCursor cursor ) override; ///< set mouse cursor - virtual void capture(); ///< capture the mouse - virtual void releaseCapture(); ///< release mouse capture + virtual void capture() override; ///< capture the mouse + virtual void releaseCapture() override; ///< release mouse capture protected: /// device implementation to get mouse event - virtual UnsignedByte getMouseEvent( MouseIO *result, Bool flush ); + virtual UnsignedByte getMouseEvent( MouseIO *result, Bool flush ) override; // new internal methods for our direct input implementation void openMouse(); ///< create the direct input mouse diff --git a/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h b/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h index b626b36abb7..1191c1e0bc2 100644 --- a/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h +++ b/Core/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h @@ -63,30 +63,30 @@ class Win32Mouse : public Mouse public: Win32Mouse(); - virtual ~Win32Mouse(); + virtual ~Win32Mouse() override; - virtual void init(); ///< init mouse, extend this functionality, do not replace - virtual void reset(); ///< reset the system - virtual void update(); ///< update - virtual void initCursorResources(); ///< load windows resources needed for 2d cursors. + virtual void init() override; ///< init mouse, extend this functionality, do not replace + virtual void reset() override; ///< reset the system + virtual void update() override; ///< update + virtual void initCursorResources() override; ///< load windows resources needed for 2d cursors. - virtual void setCursor( MouseCursor cursor ); ///< set mouse cursor + virtual void setCursor( MouseCursor cursor ) override; ///< set mouse cursor - virtual void setVisibility(Bool visible); + virtual void setVisibility(Bool visible) override; - virtual void loseFocus(); - virtual void regainFocus(); + virtual void loseFocus() override; + virtual void regainFocus() override; /// add an event from a win32 window procedure void addWin32Event( UINT msg, WPARAM wParam, LPARAM lParam, DWORD time ); protected: - virtual void capture(); ///< capture the mouse - virtual void releaseCapture(); ///< release mouse capture + virtual void capture() override; ///< capture the mouse + virtual void releaseCapture() override; ///< release mouse capture /// get the next event available in the buffer - virtual UnsignedByte getMouseEvent( MouseIO *result, Bool flush ); + virtual UnsignedByte getMouseEvent( MouseIO *result, Bool flush ) override; /// translate a win32 mouse event to our own info void translateEvent( UnsignedInt eventIndex, MouseIO *result ); diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp index 7d5dab7344e..a3427a2cc2f 100644 --- a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp +++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp @@ -63,7 +63,7 @@ static class MouseThreadClass : public ThreadClass public: MouseThreadClass() : ThreadClass() {} - void Thread_Function(); + virtual void Thread_Function() override; } thread; diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp index 87fa12f5c29..b225e08775f 100644 --- a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp +++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp @@ -120,13 +120,13 @@ IDirect3DSurface8 *W3DShaderManager::m_oldDepthSurface=nullptr; ///read(pData, numBytes):0); }; }; diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp index b680fac32dc..57b5a7a9721 100644 --- a/Core/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp +++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp @@ -73,7 +73,7 @@ class GDIFileStream : public InputStream File* m_file; public: GDIFileStream(File* pFile):m_file(pFile) {}; - virtual Int read(void *pData, Int numBytes) { + virtual Int read(void *pData, Int numBytes) override { return(m_file->read(pData, numBytes)); }; };