From 9c6b5f69ead73d3c2c6ee417376350363e87bb7f Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Tue, 11 Nov 2025 17:44:54 -0500 Subject: [PATCH 1/5] refactor: remove repetitive author attribution comments --- Core/GameEngine/Source/Common/System/RAMFile.cpp | 1 - Core/GameEngine/Source/Common/System/XferCRC.cpp | 1 - Core/GameEngine/Source/GameNetwork/Connection.cpp | 1 - Core/GameEngine/Source/GameNetwork/DisconnectManager.cpp | 1 - Core/GameEngine/Source/GameNetwork/DownloadManager.cpp | 1 - Core/GameEngine/Source/GameNetwork/FrameData.cpp | 1 - Core/GameEngine/Source/GameNetwork/FrameMetrics.cpp | 1 - Core/GameEngine/Source/GameNetwork/GameInfo.cpp | 1 - Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp | 1 - .../Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp | 1 - .../Source/GameNetwork/GameSpy/Thread/PeerThread.cpp | 1 - .../GameSpy/Thread/PersistentStorageThread.cpp | 1 - Core/GameEngine/Source/GameNetwork/LANGameInfo.cpp | 1 - Core/GameEngine/Source/GameNetwork/NAT.cpp | 1 - Core/GameEngine/Source/GameNetwork/NetCommandMsg.cpp | 2 -- .../Source/GameNetwork/NetCommandWrapperList.cpp | 1 - Core/GameEngine/Source/GameNetwork/Network.cpp | 1 - Generals/Code/GameEngine/Include/Common/INI.h | 1 - Generals/Code/GameEngine/Include/GameClient/ControlBar.h | 1 - .../Code/GameEngine/Include/GameClient/SelectionXlat.h | 1 - Generals/Code/GameEngine/Include/GameClient/View.h | 1 - Generals/Code/GameEngine/Include/GameLogic/AIGuard.h | 1 - Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h | 1 - Generals/Code/GameEngine/Include/GameLogic/GameLogic.h | 1 - .../GameEngine/Include/GameLogic/Module/CreateCrateDie.h | 1 - .../Include/GameLogic/Module/DeliverPayloadAIUpdate.h | 2 -- .../Include/GameLogic/Module/DeployStyleAIUpdate.h | 1 - .../Include/GameLogic/Module/HackInternetAIUpdate.h | 2 -- .../Include/GameLogic/Module/ObjectDefectionHelper.h | 1 - .../GameEngine/Include/GameLogic/Module/SpawnBehavior.h | 1 - .../GameEngine/Include/GameLogic/Module/StealthUpdate.h | 1 - .../Code/GameEngine/Include/GameLogic/PartitionManager.h | 1 - Generals/Code/GameEngine/Source/Common/GlobalData.cpp | 2 -- .../Code/GameEngine/Source/Common/PartitionSolver.cpp | 1 - Generals/Code/GameEngine/Source/Common/PerfTimer.cpp | 2 -- .../Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp | 1 - Generals/Code/GameEngine/Source/Common/RTS/Team.cpp | 1 - Generals/Code/GameEngine/Source/Common/Recorder.cpp | 1 - Generals/Code/GameEngine/Source/Common/StatsCollector.cpp | 1 - Generals/Code/GameEngine/Source/Common/System/Upgrade.cpp | 1 - Generals/Code/GameEngine/Source/GameClient/Drawable.cpp | 3 --- .../Source/GameClient/GUI/ControlBar/ControlBar.cpp | 1 - .../Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp | 1 - .../GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp | 1 - .../Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp | 2 -- .../GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp | 1 - .../Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp | 3 --- .../GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp | 1 - .../GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp | 1 - .../GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp | 1 - .../Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp | 1 - .../GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp | 1 - .../Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp | 1 - .../Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp | 6 ------ .../Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp | 1 - Generals/Code/GameEngine/Source/GameClient/GameClient.cpp | 1 - Generals/Code/GameEngine/Source/GameClient/GameText.cpp | 1 - .../Code/GameEngine/Source/GameClient/GlobalLanguage.cpp | 1 - Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp | 2 -- .../Code/GameEngine/Source/GameClient/Input/Mouse.cpp | 1 - .../GameEngine/Source/GameClient/MessageStream/HotKey.cpp | 1 - .../Source/GameClient/MessageStream/LookAtXlat.cpp | 1 - .../Source/GameClient/MessageStream/SelectionXlat.cpp | 2 -- .../Code/GameEngine/Source/GameClient/RadiusDecal.cpp | 2 +- .../Code/GameEngine/Source/GameClient/SelectionInfo.cpp | 1 - .../Code/GameEngine/Source/GameClient/System/Anim2D.cpp | 1 - .../GameEngine/Source/GameClient/System/ParticleSys.cpp | 6 ------ Generals/Code/GameEngine/Source/GameClient/View.cpp | 1 - Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp | 1 - .../Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp | 1 - Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp | 2 -- .../GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp | 1 - .../Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp | 1 - .../GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp | 1 - .../GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp | 1 - .../Source/GameLogic/Object/Behavior/SpawnBehavior.cpp | 1 - .../Object/Collide/CrateCollide/CrateCollide.cpp | 1 - .../Source/GameLogic/Object/Contain/OpenContain.cpp | 1 - .../Source/GameLogic/Object/Contain/ParachuteContain.cpp | 1 - .../Source/GameLogic/Object/ExperienceTracker.cpp | 2 +- .../GameEngine/Source/GameLogic/Object/GhostObject.cpp | 1 - .../Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp | 1 - .../Code/GameEngine/Source/GameLogic/Object/Object.cpp | 1 - .../Source/GameLogic/Object/ObjectCreationList.cpp | 8 ++++---- .../Source/GameLogic/Object/PartitionManager.cpp | 1 - .../Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp | 1 - .../GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp | 1 - .../GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp | 1 - .../GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/BoneFXUpdate.cpp | 1 - .../GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/HordeUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/LaserUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/LifetimeUpdate.cpp | 1 - .../ProductionExitUpdate/DefaultProductionExitUpdate.cpp | 1 - .../ProductionExitUpdate/QueueProductionExitUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/ProductionUpdate.cpp | 1 - .../GameLogic/Object/Update/SpecialAbilityUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/StealthUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/StickyBombUpdate.cpp | 1 - .../GameLogic/Object/Update/StructureCollapseUpdate.cpp | 1 - .../GameLogic/Object/Update/StructureToppleUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/ToppleUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/WaveGuideUpdate.cpp | 1 - .../Source/GameLogic/ScriptEngine/ScriptEngine.cpp | 1 - .../GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp | 3 --- .../Code/GameEngine/Source/GameLogic/System/GameLogic.cpp | 2 -- .../Source/GameLogic/System/GameLogicDispatch.cpp | 1 - GeneralsMD/Code/GameEngine/Include/Common/INI.h | 1 - .../Code/GameEngine/Include/GameClient/ControlBar.h | 1 - .../Code/GameEngine/Include/GameClient/SelectionXlat.h | 1 - GeneralsMD/Code/GameEngine/Include/GameClient/View.h | 1 - GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h | 1 - .../Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h | 1 - GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h | 1 - GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h | 1 - .../GameEngine/Include/GameLogic/Module/CreateCrateDie.h | 1 - .../Include/GameLogic/Module/DeliverPayloadAIUpdate.h | 2 -- .../Include/GameLogic/Module/DeployStyleAIUpdate.h | 1 - .../Include/GameLogic/Module/HackInternetAIUpdate.h | 2 -- .../Include/GameLogic/Module/ObjectDefectionHelper.h | 1 - .../GameEngine/Include/GameLogic/Module/SpawnBehavior.h | 1 - .../Code/GameEngine/Include/GameLogic/PartitionManager.h | 1 - GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp | 2 -- .../Code/GameEngine/Source/Common/PartitionSolver.cpp | 1 - GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp | 2 -- .../Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp | 1 - GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp | 1 - GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp | 1 - .../Code/GameEngine/Source/Common/StatsCollector.cpp | 1 - .../Code/GameEngine/Source/Common/System/Upgrade.cpp | 1 - GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp | 3 --- .../Source/GameClient/GUI/ControlBar/ControlBar.cpp | 1 - .../Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp | 1 - .../GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp | 1 - .../Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp | 2 -- .../GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp | 1 - .../Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp | 3 --- .../GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp | 1 - .../GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp | 1 - .../GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp | 1 - .../Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp | 1 - .../GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp | 1 - .../Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp | 1 - .../Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp | 6 ------ .../Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp | 1 - .../Code/GameEngine/Source/GameClient/GameClient.cpp | 1 - GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp | 1 - .../Code/GameEngine/Source/GameClient/GlobalLanguage.cpp | 1 - GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp | 2 -- .../Code/GameEngine/Source/GameClient/Input/Mouse.cpp | 1 - .../GameEngine/Source/GameClient/MessageStream/HotKey.cpp | 1 - .../Source/GameClient/MessageStream/LookAtXlat.cpp | 1 - .../Source/GameClient/MessageStream/SelectionXlat.cpp | 2 -- .../Code/GameEngine/Source/GameClient/RadiusDecal.cpp | 2 +- .../Code/GameEngine/Source/GameClient/System/Anim2D.cpp | 1 - .../GameEngine/Source/GameClient/System/ParticleSys.cpp | 6 ------ GeneralsMD/Code/GameEngine/Source/GameClient/View.cpp | 1 - GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp | 1 - .../Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp | 1 - .../Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp | 2 -- .../GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp | 1 - .../Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp | 1 - .../GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp | 1 - .../GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp | 1 - .../Source/GameLogic/Object/Behavior/SpawnBehavior.cpp | 1 - .../Object/Collide/CrateCollide/CrateCollide.cpp | 1 - .../Source/GameLogic/Object/Contain/OpenContain.cpp | 1 - .../Source/GameLogic/Object/Contain/ParachuteContain.cpp | 1 - .../Source/GameLogic/Object/ExperienceTracker.cpp | 2 +- .../GameEngine/Source/GameLogic/Object/GhostObject.cpp | 1 - .../Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp | 1 - .../Code/GameEngine/Source/GameLogic/Object/Object.cpp | 1 - .../Source/GameLogic/Object/ObjectCreationList.cpp | 8 ++++---- .../Source/GameLogic/Object/PartitionManager.cpp | 1 - .../Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp | 1 - .../GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp | 1 - .../GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp | 1 - .../GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/BoneFXUpdate.cpp | 1 - .../GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/HordeUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/LaserUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/LifetimeUpdate.cpp | 1 - .../ProductionExitUpdate/DefaultProductionExitUpdate.cpp | 1 - .../ProductionExitUpdate/QueueProductionExitUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/ProductionUpdate.cpp | 1 - .../GameLogic/Object/Update/SpecialAbilityUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/StealthUpdate.cpp | 2 -- .../Source/GameLogic/Object/Update/StickyBombUpdate.cpp | 1 - .../GameLogic/Object/Update/StructureCollapseUpdate.cpp | 1 - .../GameLogic/Object/Update/StructureToppleUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/ToppleUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/WaveGuideUpdate.cpp | 1 - .../Source/GameLogic/ScriptEngine/ScriptEngine.cpp | 1 - .../GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp | 3 --- .../Code/GameEngine/Source/GameLogic/System/GameLogic.cpp | 2 -- .../Source/GameLogic/System/GameLogicDispatch.cpp | 1 - 198 files changed, 12 insertions(+), 256 deletions(-) diff --git a/Core/GameEngine/Source/Common/System/RAMFile.cpp b/Core/GameEngine/Source/Common/System/RAMFile.cpp index a10b63f5e7..f317392cc9 100644 --- a/Core/GameEngine/Source/Common/System/RAMFile.cpp +++ b/Core/GameEngine/Source/Common/System/RAMFile.cpp @@ -104,7 +104,6 @@ RAMFile::RAMFile() : m_size(0), m_data(NULL), -//Added By Sadullah Nader //Initializtion(s) inserted m_pos(0) // diff --git a/Core/GameEngine/Source/Common/System/XferCRC.cpp b/Core/GameEngine/Source/Common/System/XferCRC.cpp index 087d0cb95a..0cf9d77ff6 100644 --- a/Core/GameEngine/Source/Common/System/XferCRC.cpp +++ b/Core/GameEngine/Source/Common/System/XferCRC.cpp @@ -42,7 +42,6 @@ XferCRC::XferCRC( void ) { m_xferMode = XFER_CRC; - //Added By Sadullah Nader //Initialization(s) inserted m_crc = 0; // diff --git a/Core/GameEngine/Source/GameNetwork/Connection.cpp b/Core/GameEngine/Source/GameNetwork/Connection.cpp index 0e2419ded5..18c56e5f39 100644 --- a/Core/GameEngine/Source/GameNetwork/Connection.cpp +++ b/Core/GameEngine/Source/GameNetwork/Connection.cpp @@ -43,7 +43,6 @@ Connection::Connection() { m_frameGrouping = 1; m_isQuitting = false; m_quitTime = 0; - // Added By Sadullah Nader // clearing out the latency tracker m_averageLatency = 0.0f; Int i; diff --git a/Core/GameEngine/Source/GameNetwork/DisconnectManager.cpp b/Core/GameEngine/Source/GameNetwork/DisconnectManager.cpp index 94268e6386..418ff5a365 100644 --- a/Core/GameEngine/Source/GameNetwork/DisconnectManager.cpp +++ b/Core/GameEngine/Source/GameNetwork/DisconnectManager.cpp @@ -38,7 +38,6 @@ DisconnectManager::DisconnectManager() { - // Added By Sadullah Nader // Initializations missing and needed Int i; m_currentPacketRouterIndex = 0; diff --git a/Core/GameEngine/Source/GameNetwork/DownloadManager.cpp b/Core/GameEngine/Source/GameNetwork/DownloadManager.cpp index 6bfe74911e..0c51726824 100644 --- a/Core/GameEngine/Source/GameNetwork/DownloadManager.cpp +++ b/Core/GameEngine/Source/GameNetwork/DownloadManager.cpp @@ -38,7 +38,6 @@ DownloadManager::DownloadManager() m_download = NEW CDownload(this); m_wasError = m_sawEnd = false; - //Added By Sadullah Nader //Initializations missing and needed m_queuedDownloads.clear(); diff --git a/Core/GameEngine/Source/GameNetwork/FrameData.cpp b/Core/GameEngine/Source/GameNetwork/FrameData.cpp index 78a96cd622..f26dfa60af 100644 --- a/Core/GameEngine/Source/GameNetwork/FrameData.cpp +++ b/Core/GameEngine/Source/GameNetwork/FrameData.cpp @@ -37,7 +37,6 @@ FrameData::FrameData() m_commandList = NULL; m_commandCount = 0; m_frameCommandCount = -1; - //Added By Sadullah Nader //Initializations missing and needed m_lastFailedCC = 0; m_lastFailedFrameCC = 0; diff --git a/Core/GameEngine/Source/GameNetwork/FrameMetrics.cpp b/Core/GameEngine/Source/GameNetwork/FrameMetrics.cpp index a524a7e216..194d2e4b22 100644 --- a/Core/GameEngine/Source/GameNetwork/FrameMetrics.cpp +++ b/Core/GameEngine/Source/GameNetwork/FrameMetrics.cpp @@ -32,7 +32,6 @@ FrameMetrics::FrameMetrics() { - //Added By Sadullah Nader //Initializations missing and needed m_averageFps = 0.0f; m_averageLatency = 0.0f; diff --git a/Core/GameEngine/Source/GameNetwork/GameInfo.cpp b/Core/GameEngine/Source/GameNetwork/GameInfo.cpp index 747d3ec083..94758d4e7a 100644 --- a/Core/GameEngine/Source/GameNetwork/GameInfo.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameInfo.cpp @@ -307,7 +307,6 @@ void GameInfo::reset( void ) m_useStats = TRUE; m_surrendered = FALSE; m_oldFactionsOnly = FALSE; - // Added By Sadullah Nader // Initializations missing and needed // m_localIP = 0; // BGC - actually we don't want this to be reset since the m_localIP is // set properly in the constructor of LANGameInfo which uses this as a base class. diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp index b8ed86371a..23c7991d91 100644 --- a/Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp @@ -89,7 +89,6 @@ void GameSpyInfo::reset( void ) m_localProfileID = 0; m_maxMessagesPerUpdate = 100; - // Added By Sadullah Nader // Initialization missing and needed m_disallowAsainText = FALSE; m_disallowNonAsianText = FALSE; diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp index 4b2ef617e4..8cb1858b08 100644 --- a/Core/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp @@ -62,7 +62,6 @@ GameSpyGameSlot::GameSpyGameSlot() m_rankPoints = 0; m_favoriteSide = 0; m_pingInt = 0; - // Added By Sadullah Nader // Initializations missing and needed m_profileID = 0; m_pingStr.clear(); diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp index 37bd03ee87..ff053eac98 100644 --- a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp @@ -179,7 +179,6 @@ class PeerThreadClass : public ThreadClass public: PeerThreadClass() : ThreadClass() { - //Added By Sadullah Nader //Initializations inserted m_roomJoined = m_allowObservers = m_hasPassword = FALSE; m_useStats = TRUE; diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp index 6aa7dc4979..7724193ebf 100644 --- a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp @@ -1108,7 +1108,6 @@ void PSPlayerStats::reset( void ) maxDesyncsInARow = 0; lastLadderPort = 0; - //Added By Sadullah Nader maxQMwinsInARow = 0; QMwinsInARow = 0; // diff --git a/Core/GameEngine/Source/GameNetwork/LANGameInfo.cpp b/Core/GameEngine/Source/GameNetwork/LANGameInfo.cpp index 055482fc14..33c795106c 100644 --- a/Core/GameEngine/Source/GameNetwork/LANGameInfo.cpp +++ b/Core/GameEngine/Source/GameNetwork/LANGameInfo.cpp @@ -88,7 +88,6 @@ Bool LANGameSlot::isLocalPlayer( void ) const LANGameInfo::LANGameInfo() { - //Added By Sadullah Nader //Initializtions missing and needed m_lastHeard = 0; m_next = NULL; diff --git a/Core/GameEngine/Source/GameNetwork/NAT.cpp b/Core/GameEngine/Source/GameNetwork/NAT.cpp index 94823cc52a..6fcfbf2e42 100644 --- a/Core/GameEngine/Source/GameNetwork/NAT.cpp +++ b/Core/GameEngine/Source/GameNetwork/NAT.cpp @@ -144,7 +144,6 @@ NAT *TheNAT = NULL; NAT::NAT() { - //Added By Sadullah Nader //Initializations inserted m_beenProbed = FALSE; m_connectionPairIndex = 0; diff --git a/Core/GameEngine/Source/GameNetwork/NetCommandMsg.cpp b/Core/GameEngine/Source/GameNetwork/NetCommandMsg.cpp index 8b96dc3cc7..634d41ed0a 100644 --- a/Core/GameEngine/Source/GameNetwork/NetCommandMsg.cpp +++ b/Core/GameEngine/Source/GameNetwork/NetCommandMsg.cpp @@ -35,7 +35,6 @@ */ NetCommandMsg::NetCommandMsg() { - //Added By Sadullah Nader //Initializations inserted m_executionFrame = 0; m_id = 0; @@ -90,7 +89,6 @@ Int NetCommandMsg::getSortNumber() { * Constructor with no argument, sets everything to default values. */ NetGameCommandMsg::NetGameCommandMsg() : NetCommandMsg() { - //Added By Sadullah Nader //Initializations inserted m_argSize = 0; m_numArgs = 0; diff --git a/Core/GameEngine/Source/GameNetwork/NetCommandWrapperList.cpp b/Core/GameEngine/Source/GameNetwork/NetCommandWrapperList.cpp index de034fff15..90e79a0468 100644 --- a/Core/GameEngine/Source/GameNetwork/NetCommandWrapperList.cpp +++ b/Core/GameEngine/Source/GameNetwork/NetCommandWrapperList.cpp @@ -36,7 +36,6 @@ NetCommandWrapperListNode::NetCommandWrapperListNode(NetWrapperCommandMsg *msg) { - //Added By Sadullah Nader //Initializations inserted m_next = NULL; diff --git a/Core/GameEngine/Source/GameNetwork/Network.cpp b/Core/GameEngine/Source/GameNetwork/Network.cpp index 160e41bd39..f1c5e89b5f 100644 --- a/Core/GameEngine/Source/GameNetwork/Network.cpp +++ b/Core/GameEngine/Source/GameNetwork/Network.cpp @@ -265,7 +265,6 @@ NetworkInterface *NetworkInterface::createNetwork() */ Network::Network() { - //Added By Sadullah Nader //Initializations inserted m_checkCRCsThisFrame = FALSE; m_didSelfSlug = FALSE; diff --git a/Generals/Code/GameEngine/Include/Common/INI.h b/Generals/Code/GameEngine/Include/Common/INI.h index 861f61f7e4..ec77d59b2e 100644 --- a/Generals/Code/GameEngine/Include/Common/INI.h +++ b/Generals/Code/GameEngine/Include/Common/INI.h @@ -138,7 +138,6 @@ class MultiIniFieldParse public: MultiIniFieldParse() : m_count(0) { - //Added By Sadullah Nader //Initializations missing and needed for(Int i = 0; i < MAX_MULTI_FIELDS; i++) m_extraOffset[i] = 0; diff --git a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h index c8b686550b..0dba5d0291 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h +++ b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h @@ -434,7 +434,6 @@ class SideSelectWindowData public: SideSelectWindowData(void) { - //Added By Sadullah Nader //Initializations generalSpeak = NULL; m_currColor = 0; diff --git a/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h b/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h index c6df1833a8..e273d62db3 100644 --- a/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h +++ b/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h @@ -63,7 +63,6 @@ class SelectionTranslator : public GameMessageTranslator ~SelectionTranslator(); virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); - //Added By Sadullah Nader //added for fix to the drag selection when entering control bar //changes the mode of drag selecting to it's opposite void setDragSelecting(Bool dragSelect); diff --git a/Generals/Code/GameEngine/Include/GameClient/View.h b/Generals/Code/GameEngine/Include/GameClient/View.h index 9882babcc3..8d40b91fe2 100644 --- a/Generals/Code/GameEngine/Include/GameClient/View.h +++ b/Generals/Code/GameEngine/Include/GameClient/View.h @@ -307,7 +307,6 @@ class ViewLocation ViewLocation() { m_valid = FALSE; - //Added By Sadullah Nader //Initialization(s) inserted m_pos.zero(); m_angle = m_pitch = m_zoom = 0.0; diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h b/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h index 45d6863d69..0b9b43678f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h @@ -78,7 +78,6 @@ class ExitConditions : public AttackExitConditionsInterface ExitConditions() : m_attackGiveUpFrame(0), m_conditionsToConsider(0), m_radiusSqr(0.0f) { - //Added By Sadullah Nader // Initializations missing and needed m_center.zero(); } diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h b/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h index e4a8ab352b..d748dfc030 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h @@ -113,7 +113,6 @@ class TeamInQueue : public MemoryPoolObject, m_reinforcement(false), m_stopQueueing(false), m_reinforcementID(INVALID_ID), - //Added By Sadullah Nader //Initialization(s) inserted m_frameStarted(0), m_priorityBuild(FALSE) diff --git a/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h b/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h index c08589f493..425ea8d3f8 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h +++ b/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h @@ -294,7 +294,6 @@ class GameLogic : public SubsystemInterface, public Snapshot Bool m_shouldValidateCRCs; ///< Should we validate CRCs this frame? //----------------------------------------------------------------------------------------------- - //Added By Sadullah Nader //Used to for load scene Bool m_loadingScene; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h index 90dccafc31..b4b21a4eaa 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h @@ -46,7 +46,6 @@ class CreateCrateDieModuleData : public DieModuleData CreateCrateDieModuleData() { - // Added By Sadullah Nader // Initializations missing and needed m_crateNameList.clear(); } diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h index f82fd57a74..92a88ac77d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h @@ -202,7 +202,6 @@ class DeliverPayloadAIUpdateModuleData : public AIUpdateModuleData m_dropOffset.zero(); m_dropVariance.zero(); m_deliveryDecalRadius = 0; - // Added By Sadullah Nader // Initialization missing and needed m_putInContainerName.clear(); @@ -293,7 +292,6 @@ class DeliverPayloadData m_visiblePayloadWeaponTemplate = NULL; m_selfDestructObject = FALSE; m_deliveryDecalRadius = 0; - // Added By Sadullah Nader // Initialization missing and needed m_visibleDropBoneName.clear(); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h index 19223d5057..de411fa918 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h @@ -58,7 +58,6 @@ class DeployStyleAIUpdateModuleData : public AIUpdateModuleData m_packTime = 0; m_resetTurretBeforePacking = false; m_turretsFunctionOnlyWhenDeployed = false; - // Added By Sadullah Nader // Initialization necessary m_turretsMustCenterBeforePacking = FALSE; // End Add diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h index 7c161b47fa..12a6c35d45 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h @@ -46,7 +46,6 @@ class HackInternetState : public State public: HackInternetState( StateMachine *machine ) :State( machine, "HackInternetState" ) { - //Added By Sadullah Nader //Initializations missing and needed m_framesRemaining = 0; // @@ -73,7 +72,6 @@ class PackingState : public State public: PackingState( StateMachine *machine ) : State( machine, "PackingState" ) { - //Added By Sadullah Nader //Initializations inserted m_framesRemaining = 0; // diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h index 1037db0bf2..3c667e145a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h @@ -61,7 +61,6 @@ class ObjectDefectionHelper : public ObjectHelper ObjectDefectionHelper( Thing *thing, const ModuleData *modData ) : ObjectHelper( thing, modData ) { - //Added By Sadullah Nader //Initializations inserted m_defectionDetectionEnd = 0; m_defectionDetectionFlashPhase = FALSE; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h index 3f602420f0..5df76f43f1 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h @@ -64,7 +64,6 @@ class SpawnBehaviorModuleData : public BehaviorModuleData { m_spawnNumberData = 0; m_spawnReplaceDelayData = 0; - //Added By Sadullah Nader //Initialization(s) inserted m_spawnStartNumberData = 0; // diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h index 87cf4908b3..3e963bdaa7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h @@ -85,7 +85,6 @@ class StealthUpdateModuleData : public UpdateModuleData StealthUpdateModuleData() { - //Added By Sadullah Nader //Initialization(s) inserted m_disguiseFX = NULL; m_disguiseRevealFX = NULL; diff --git a/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h b/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h index f924fa3a0a..5345713e05 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h +++ b/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h @@ -1109,7 +1109,6 @@ class PartitionFilterGarrisonable : public PartitionFilter public: PartitionFilterGarrisonable( Bool match ) : m_match(match) { - //Added By Sadullah Nader //Initializations m_player = NULL; // diff --git a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp index 4b72223877..85cc3c0a72 100644 --- a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp +++ b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp @@ -684,7 +684,6 @@ GlobalData::GlobalData() m_vertexWaterAttenuationB[ i ] = 0.0f; m_vertexWaterAttenuationC[ i ] = 0.0f; m_vertexWaterAttenuationRange[ i ] = 0.0f; - //Added By Sadullah Nader //Initializations missing and needed m_vertexWaterAvailableMaps[i].clear(); } @@ -797,7 +796,6 @@ GlobalData::GlobalData() m_autoSmokeParticleLargeMax = 0; m_autoAflameParticleMax = 0; - // Added By Sadullah Nader // Initializations missing and needed m_autoFireParticleSmallPrefix.clear(); m_autoFireParticleMediumPrefix.clear(); diff --git a/Generals/Code/GameEngine/Source/Common/PartitionSolver.cpp b/Generals/Code/GameEngine/Source/Common/PartitionSolver.cpp index 27de4d19df..6089e061a2 100644 --- a/Generals/Code/GameEngine/Source/Common/PartitionSolver.cpp +++ b/Generals/Code/GameEngine/Source/Common/PartitionSolver.cpp @@ -63,7 +63,6 @@ PartitionSolver::PartitionSolver(const EntriesVec& elements, const SpacesVec& sp m_data = elements; m_spacesForData = spaces; m_howToSolve = solveHow; - //Added By Sadullah Nader //Initializations inserted m_currentSolutionLeftovers = 0; // diff --git a/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp b/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp index 41e5557df0..86e47ca118 100644 --- a/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp +++ b/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp @@ -232,7 +232,6 @@ PerfGather::PerfGather(const char *identifier) : m_next(0), m_prev(0) { - //Added By Sadullah Nader //Initializations inserted m_ignore = FALSE; // @@ -480,7 +479,6 @@ PerfTimer::PerfTimer( const char *identifier, Bool crashWithInfo, Int startFrame m_callCount(0), m_runningTime(0), m_outputInfo(true), - //Added By Sadullah Nader //Intializations inserted m_lastFrame(-1) { diff --git a/Generals/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp b/Generals/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp index 8810dcfbd2..eb9fc779f2 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp @@ -102,7 +102,6 @@ void ScoreKeeper::reset( Int playerIdx ) m_totalMoneyEarned = m_totalMoneySpent = 0; m_totalUnitsLost = m_totalUnitsBuilt = 0; m_totalBuildingsLost = m_totalBuildingsBuilt = 0; - //Added By Sadullah Nader //Initializtion(s) inserted m_totalFactionBuildingsCaptured = m_totalTechBuildingsCaptured = 0; // diff --git a/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp index 2d75320064..e702dcbee2 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp @@ -1316,7 +1316,6 @@ Team::Team(TeamPrototype *proto, TeamID id ) : m_curUnits(0), m_wasIdle(false) { - //Added By Sadullah Nader //Initialization(s) inserted m_created = FALSE; diff --git a/Generals/Code/GameEngine/Source/Common/Recorder.cpp b/Generals/Code/GameEngine/Source/Common/Recorder.cpp index 04be1d230e..07260082e2 100644 --- a/Generals/Code/GameEngine/Source/Common/Recorder.cpp +++ b/Generals/Code/GameEngine/Source/Common/Recorder.cpp @@ -368,7 +368,6 @@ RecorderClass::RecorderClass() m_file = NULL; m_fileName.clear(); m_currentFilePosition = 0; - //Added By Sadullah Nader //Initializtion(s) inserted m_doingAnalysis = FALSE; m_archiveReplays = FALSE; diff --git a/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp b/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp index cc05f9c297..063376e08f 100644 --- a/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp +++ b/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp @@ -76,7 +76,6 @@ static char statsDir[255] = "Stats\\"; //============================================================================= StatsCollector::StatsCollector( void ) { - //Added By Sadullah Nader //Initialization(s) inserted m_isScrolling = FALSE; m_scrollBeginTime = 0; diff --git a/Generals/Code/GameEngine/Source/Common/System/Upgrade.cpp b/Generals/Code/GameEngine/Source/Common/System/Upgrade.cpp index 50064fc556..7fda9515dc 100644 --- a/Generals/Code/GameEngine/Source/Common/System/Upgrade.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/Upgrade.cpp @@ -131,7 +131,6 @@ const FieldParse UpgradeTemplate::m_upgradeFieldParseTable[] = //------------------------------------------------------------------------------------------------- UpgradeTemplate::UpgradeTemplate( void ) { - //Added By Sadullah Nader //Initialization(s) inserted m_cost = 0; // diff --git a/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp b/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp index eb1aadc85d..0dc4fbb9fa 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp @@ -316,7 +316,6 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatusBits statu // assign status bits before anything else can be done m_status = statusBits; - // Added By Sadullah Nader // Initialization missing and needed m_nextDrawable = NULL; m_prevDrawable = NULL; @@ -330,7 +329,6 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatusBits statu Int i; - // Added By Sadullah Nader // Initialization missing and needed m_flashColor = 0; m_selected = '\0'; @@ -340,7 +338,6 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatusBits statu m_lastConstructDisplayed = -1.0f; - //Added By Sadullah Nader //Fix for the building percent m_constructDisplayString = TheDisplayStringManager->newDisplayString(); m_constructDisplayString->setFont(TheFontLibrary->getFont(TheInGameUI->getDrawableCaptionFontName(), diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index b85f42dc61..fa9b61868b 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -869,7 +869,6 @@ ControlBar::ControlBar( void ) m_buildToolTipLayout = NULL; m_showBuildToolTipLayout = FALSE; - // Added By Sadullah Nader // initializing vars to zero m_animateDownWin1Pos.x = m_animateDownWin1Pos.y = 0; m_animateDownWin1Size.x = m_animateDownWin1Size.y = 0; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp index 46e14bb6a0..12abdc7e35 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp @@ -302,7 +302,6 @@ ControlBarScheme::ControlBarScheme(void) m_optionsButtonPushed = NULL; m_optionsButtonDisabled = NULL; - // Added By Sadullah Nader // Initializations needed m_commandBarBorderColor = 0; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp index ac415e0229..ae0b45daaa 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp @@ -649,7 +649,6 @@ void InitLanGameGadgets( void ) Int localSlotNum = TheLAN->GetMyGame()->getLocalSlotNum(); DEBUG_ASSERTCRASH(localSlotNum >= 0, ("Bad slot number!")); - //Added By Sadullah Nader //Tooltip function is being set for techBuildings, and supplyDocks windowMap->winSetTooltipFunc(MapSelectorTooltip); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp index c6df2bd82e..ad07027605 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp @@ -681,7 +681,6 @@ void MainMenuShutdown( WindowLayout *layout, void *userData ) extern Bool DontShowMainMenu; //////////////////////////////////////////////////////////////////////////// -//Added By Sadullah Nader //Added as a fix to the resolution change //Allows the user to confirm the change, goes back to the previous mode //if the time to change expires. @@ -1436,7 +1435,6 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, // If we ever want to add a dialog before we exit out of the game, uncomment this line and kill the quitCallback() line below. //#if defined(RTS_DEBUG) - //Added By Sadullah Nader //Changed the preprocessing code to normal code if (TheGlobalData->m_windowed) { diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp index 9668f2f69d..de8ab623e6 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp @@ -753,7 +753,6 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg, buttonFrame->winEnable( TRUE ); updateMenuActions(); - //Added By Sadullah Nader //Fix for bug // close save menuu closeSaveMenu( window ); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp index 3fffa9d000..5e67834560 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp @@ -280,7 +280,6 @@ void HideQuitMenu( void ) void ToggleQuitMenu() { - //Added By Sadullah Nader //Added a check to see if we're not in game yet if (TheGameLogic->isIntroMoviePlaying() || TheGameLogic->isLoadingGame() ||TheScriptEngine->isGameEnding()) return; @@ -323,7 +322,6 @@ void ToggleQuitMenu() isVisible = FALSE; - //Added By Sadullah Nader //Bug: When Toggling the quit menu off, the quit confirmation should also go away if (quitConfirmationWindow) TheWindowManager->winDestroy(quitConfirmationWindow); @@ -352,7 +350,6 @@ void ToggleQuitMenu() } else { - //Added By Sadullah Nader //Added to compensate for the quit confirmation window pop-up TheMouse->setCursor( Mouse::ARROW ); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp index 00cbb473b5..78feb17029 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp @@ -768,7 +768,6 @@ void finishSinglePlayerInit( void ) } - //Added By Sadullah Nader //Fix for the black screen text that appears after loading sequence TheInGameUI->freeMessageResources(); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp index cd1a137a76..0d7ad64d63 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp @@ -873,7 +873,6 @@ void updateMapStartSpots( GameInfo *myGame, GameWindow *buttonMapStartPositions[ AsciiString displayNumber; displayNumber.format("NUMBER:%d",i + 1); GadgetButtonSetText(buttonMapStartPositions[gs->getStartPos()], TheGameText->fetch(displayNumber)); - //Added By Sadullah Nader //Fix for no tooltips at start positions //added start position tooltip //Fixed again to show the right number , ie "i + 1" diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp index ab56b66268..f9e3fcf9a5 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp @@ -1024,7 +1024,6 @@ void InitWOLGameGadgets( void ) windowMap = TheWindowManager->winGetWindowFromId( parentWOLGameSetup,windowMapID ); DEBUG_ASSERTCRASH(windowMap, ("Could not find the parentWOLGameSetup.wnd:MapWindow" )); - //Added By Sadullah Nader //Tooltip Function set windowMap->winSetTooltipFunc(MapSelectorTooltip); // diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp index e371f8ec70..ad71e496a3 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp @@ -1544,7 +1544,6 @@ WindowMsgHandledType GameWinBlockInput( GameWindow *window, UnsignedInt msg, if (msg == GWM_CHAR || msg == GWM_MOUSE_POS) return MSG_IGNORED; - //Added By Sadullah Nader //Fix for drag selecting in the control bar if (msg == GWM_LEFT_UP )//|| msg == GWM_LEFT_DRAG) { diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp index c974cbb59c..c3509d6976 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp @@ -107,7 +107,6 @@ m_font(NULL), m_point(0), m_bold(FALSE) { - //Added By Sadullah Nader //Initializations missing and needed m_fontName.clear(); m_name.clear(); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp index 4aa40eb645..c22db3e5d3 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp @@ -506,7 +506,6 @@ IMEManager::IMEManager() m_result(0), m_indexBase(1), - //Added By Sadullah Nader //Initializations missing and needed m_compositionCharsDisplayed(0), m_candidateDownArrow(NULL), diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp index 0c453dce3e..1f8757d0cc 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp @@ -154,7 +154,6 @@ void LoadScreen::update( Int percent ) //----------------------------------------------------------------------------- SinglePlayerLoadScreen::SinglePlayerLoadScreen( void ) { - //Added By Sadullah Nader //Initialization(s) inserted m_currentObjectiveLine = 0; m_currentObjectiveLineCharacter = 0; @@ -669,14 +668,12 @@ void ShellGameLoadScreen::update( Int percent ) //----------------------------------------------------------------------------- MultiPlayerLoadScreen::MultiPlayerLoadScreen( void ) { - //Added By Sadullah Nader //Initializations missing and needed m_mapPreview = NULL; // for(Int i = 0; i < MAX_SLOTS; ++i) { - //Added By Sadullah Nader //Initializations missing and needed m_buttonMapStartPosition[i] = NULL; // @@ -892,7 +889,6 @@ void MultiPlayerLoadScreen::processProgress(Int playerId, Int percentage) GameSpyLoadScreen::GameSpyLoadScreen( void ) { - // Added By Sadullah Nader // Initializations missing and needed m_mapPreview = NULL; // @@ -900,7 +896,6 @@ GameSpyLoadScreen::GameSpyLoadScreen( void ) for(Int i = 0; i < MAX_SLOTS; ++i) { - // Added By Sadullah Nader // Initializations missing and needed m_buttonMapStartPosition[i] = NULL; m_playerRank[i] = NULL; @@ -1219,7 +1214,6 @@ void GameSpyLoadScreen::processProgress(Int playerId, Int percentage) //----------------------------------------------------------------------------- MapTransferLoadScreen::MapTransferLoadScreen( void ) { - //Added By Sadullah Nader //Initializations missing and needed m_oldTimeout = 0; // diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp index 1ce4500245..1c25f14d81 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp @@ -83,7 +83,6 @@ void Shell::construct( void ) m_schemeManager = NEW ShellMenuSchemeManager; m_saveLoadMenuLayout = NULL; m_popupReplayLayout = NULL; - //Added By Sadullah Nader //Initializations m_optionsLayout = NULL; m_screenCount = 0; diff --git a/Generals/Code/GameEngine/Source/GameClient/GameClient.cpp b/Generals/Code/GameEngine/Source/GameClient/GameClient.cpp index aa6b7c0bc9..d79514aad9 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GameClient.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GameClient.cpp @@ -98,7 +98,6 @@ GameClient::GameClient() m_numTranslators = 0; m_commandTranslator = NULL; - // Added By Sadullah Nader // Initializations missing and needed m_drawableTOC.clear(); // diff --git a/Generals/Code/GameEngine/Source/GameClient/GameText.cpp b/Generals/Code/GameEngine/Source/GameClient/GameText.cpp index 5b617b793c..51cb593580 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GameText.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GameText.cpp @@ -260,7 +260,6 @@ GameTextManager::GameTextManager() m_mapStringLUT(NULL), m_failed(L"***FATAL*** String Manager failed to initilaize properly") { - // Added By Sadullah Nader // Initializations missing and needed for(Int i=0; i < MAX_UITEXT_LENGTH; i++) diff --git a/Generals/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp b/Generals/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp index d41cae4064..e90f0535ef 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp @@ -122,7 +122,6 @@ void INI::parseLanguageDefinition( INI *ini ) GlobalLanguage::GlobalLanguage() { m_unicodeFontName.clear(); - //Added By Sadullah Nader //Initializations missing and needed m_unicodeFontFileName.clear(); m_unicodeFontName.clear(); diff --git a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp index bd9b5c51aa..e671220ef7 100644 --- a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp @@ -947,7 +947,6 @@ InGameUI::InGameUI() m_mouseModeCursor = Mouse::ARROW; m_mousedOverDrawableID = INVALID_DRAWABLE_ID; - //Added By Sadullah Nader //Initializations missing and needed m_currentlyPlayingMovie.clear(); m_militarySubtitle = NULL; @@ -5299,7 +5298,6 @@ void InGameUI::clearPopupMessageData( void ) //------------------------------------------------------------------------------------------------- FloatingTextData::FloatingTextData(void) { - // Added By Sadullah Nader // Initializations missing and needed m_color = 0; m_frameCount = 0; diff --git a/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp b/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp index 5cf797257e..15ce088bad 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp @@ -458,7 +458,6 @@ Mouse::Mouse( void ) m_numAxes = 0; m_forceFeedback = FALSE; - //Added By Sadullah Nader //Initializations missing and needed m_dragTolerance = 0; m_dragTolerance3D = 0; diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp index 707574dc17..a69a12a443 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp @@ -113,7 +113,6 @@ GameMessageDisposition HotKeyTranslator::translateGameMessage(const GameMessage HotKey::HotKey() { m_win = NULL; - //Added By Sadullah Nader //Initializations missing and needed m_key.clear(); // diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp index c77e045a11..c839d2b06d 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp @@ -142,7 +142,6 @@ LookAtTranslator::LookAtTranslator() : m_lastMouseMoveFrame(0), m_scrollType(SCROLL_NONE) { - //Added By Sadullah Nader //Initializations missing and needed m_anchor.x = m_anchor.y = 0; m_currentPos.x = m_currentPos.y = 0; diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp index a8acd90d38..97fcb287eb 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp @@ -265,7 +265,6 @@ SelectionTranslator::SelectionTranslator() m_deselectFeedbackAnchor.x = 0; m_deselectFeedbackAnchor.y = 0; m_lastClick = 0; - //Added By Sadullah Nader //Initializtion(s) inserted m_deselectDownCameraPosition.zero(); m_displayedMaxWarning = FALSE; @@ -1242,7 +1241,6 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa } -//Added By Sadullah Nader //setDragSelecting(Bool dragSelect) //Added to fix the drag selection problem in control bar diff --git a/Generals/Code/GameEngine/Source/GameClient/RadiusDecal.cpp b/Generals/Code/GameEngine/Source/GameClient/RadiusDecal.cpp index 350e981e19..28b20813bb 100644 --- a/Generals/Code/GameEngine/Source/GameClient/RadiusDecal.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/RadiusDecal.cpp @@ -45,7 +45,7 @@ RadiusDecalTemplate::RadiusDecalTemplate() : m_opacityThrobTime(LOGICFRAMES_PER_SECOND), m_color(0), m_onlyVisibleToOwningPlayer(true), - m_name(AsciiString::TheEmptyString) // Added By Sadullah Nader for Init purposes + m_name(AsciiString::TheEmptyString) { } diff --git a/Generals/Code/GameEngine/Source/GameClient/SelectionInfo.cpp b/Generals/Code/GameEngine/Source/GameClient/SelectionInfo.cpp index e6d8e35d79..02918e6d26 100644 --- a/Generals/Code/GameEngine/Source/GameClient/SelectionInfo.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/SelectionInfo.cpp @@ -63,7 +63,6 @@ SelectionInfo::SelectionInfo() : //------------------------------------------------------------------------------------------------- PickDrawableStruct::PickDrawableStruct() : drawableListToFill(NULL) { - //Added By Sadullah Nader //Initializations inserted drawableListToFill = FALSE; // diff --git a/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp b/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp index 66d3b6c1bb..0506778a1a 100644 --- a/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp @@ -299,7 +299,6 @@ Anim2D::Anim2D( Anim2DTemplate *animTemplate, Anim2DCollection *collectionSystem // sanity DEBUG_ASSERTCRASH( animTemplate != NULL, ("Anim2D::Anim2D - NULL template") ); - //Added By Sadullah Nader //Initialization m_currentFrame = 0; diff --git a/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp b/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp index 4e890d00b9..0d4694d403 100644 --- a/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp @@ -68,7 +68,6 @@ ParticleSystemManager *TheParticleSystemManager = NULL; // ------------------------------------------------------------------------------------------------ ParticleInfo::ParticleInfo( void ) { - //Added By Sadullah Nader //Initializations inserted m_angleX = m_angleY = m_angleZ = 0.0f; m_angularDamping = 0.0f; @@ -288,7 +287,6 @@ Particle::Particle( ParticleSystem *system, const ParticleInfo *info ) m_angleY = info->m_angleY; m_angleZ = info->m_angleZ; - //Added By Sadullah Nader //Initializations inserted m_lastPos.zero(); // @@ -826,7 +824,6 @@ ParticleSystemInfo::ParticleSystemInfo() m_isEmitAboveGroundOnly = false; m_isParticleUpTowardsEmitter = false; - //Added By Sadullah Nader //Initializations inserted m_driftVelocity.zero(); m_gravity = 0.0f; @@ -1135,7 +1132,6 @@ ParticleSystem::ParticleSystem( const ParticleSystemTemplate *sysTemplate, m_template = sysTemplate; m_systemID = id; - //Added By Sadullah Nader //Initializations inserted m_lastPos.zero(); m_pos.zero(); @@ -2881,7 +2877,6 @@ void ParticleSystemTemplate::parseRandomRGBColor( INI* ini, void *instance, ParticleSystemTemplate::ParticleSystemTemplate( const AsciiString &name ) : m_name(name) { - //Added By Sadullah Nader //Initializations inserted m_slaveTemplate = NULL; // @@ -2925,7 +2920,6 @@ ParticleSystemManager::ParticleSystemManager( void ) m_onScreenParticleCount = 0; m_localPlayerIndex = 0; - //Added By Sadullah Nader //Initializations inserted m_lastLogicFrameUpdate = 0; m_particleCount = 0; diff --git a/Generals/Code/GameEngine/Source/GameClient/View.cpp b/Generals/Code/GameEngine/Source/GameClient/View.cpp index 69b7600537..1b522c9c22 100644 --- a/Generals/Code/GameEngine/Source/GameClient/View.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/View.cpp @@ -41,7 +41,6 @@ View *TheTacticalView = NULL; View::View( void ) { - //Added By Sadullah Nader //Initialization(s) inserted m_viewLockedUntilFrame = 0u; m_currentHeightAboveGround = 0.0f; diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp index 5cfffbb6a3..e8bc6bf918 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp @@ -937,7 +937,6 @@ m_infantryPathfindDiameter(6), m_vehiclePathfindDiameter(6), m_supplyCenterSafeRadius(250), m_rebuildDelaySeconds(10), -//Added By Sadullah Nader //Initialization(s) inserted m_distanceRequiresGroup(0.0f), m_sideBuildLists(NULL), diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp index 408e182f5d..c811b411c2 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp @@ -2811,7 +2811,6 @@ zoneStorageType PathfindZoneManager::getEffectiveZone( LocomotorSurfaceTypeMask } //-------------------- PathfindLayer ---------------------------------------- PathfindLayer::PathfindLayer() : m_blockOfMapCells(NULL), m_layerCells(NULL), m_bridge(NULL), -// Added By Sadullah Nader // Initializations inserted m_destroyed(FALSE), m_height(0), diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp index 8b55c09218..833096423d 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp @@ -280,12 +280,10 @@ TurretAI::TurretAI(Object* owner, const TurretAIData* data, WhichTurretType tur) m_enabled(!data->m_initiallyDisabled), m_firesWhileTurning(data->m_firesWhileTurning), m_isForceAttacking(false), - //Added By Sadullah Nader //Initialization(s) inserted m_victimInitialTeam(NULL) // { - //Added By Sadullah Nader //Initialization(s) inserted m_continuousFireExpirationFrame = -1; // diff --git a/Generals/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp b/Generals/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp index 50acb849db..5a0e80dac4 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp @@ -48,7 +48,6 @@ m_numPoints(0), m_sizePoints(0), m_exportWithScripts(false), m_isWaterArea(false), -//Added By Sadullah Nader //Initializations inserted m_isRiver(FALSE), m_riverStart(0) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp b/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp index c14a6d30cc..a48456cc91 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp @@ -959,7 +959,6 @@ TerrainLogic::TerrainLogic() { Int i; - //Added By Sadullah Nader //Initialization(s) inserted m_activeBoundary = 0; m_waterGridEnabled = FALSE; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp index 0c2ce6954d..e04d2c59d7 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp @@ -52,7 +52,6 @@ ParkingPlaceBehavior::ParkingPlaceBehavior( Thing *thing, const ModuleData* modu { m_gotInfo = false; - //Added By Sadullah Nader //Initializations m_heliRallyPoint.zero(); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp index 8b940b7d2a..1f20e46ff6 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp @@ -119,7 +119,6 @@ PropagandaTowerBehaviorModuleData::PropagandaTowerBehaviorModuleData( void ) PropagandaTowerBehavior::PropagandaTowerBehavior( Thing *thing, const ModuleData *modData ) : UpdateModule( thing, modData ) { - //Added By Sadullah Nader //Initializations inserted m_lastScanFrame = 0; // diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp index 5562102e18..d2d73b84fb 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp @@ -67,7 +67,6 @@ SpawnBehavior::SpawnBehavior( Thing *thing, const ModuleData* moduleData ) //looping back to the beginning m_framesToWait = 0; - //Added By Sadullah Nader //Initialization(s) inserted m_firstBatchCount = 0; // diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp index cac8cd3c5a..63271a1d03 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp @@ -53,7 +53,6 @@ CrateCollideModuleData::CrateCollideModuleData() m_executeFX = NULL; m_pickupScience = SCIENCE_INVALID; - // Added By Sadullah Nader // Initializations missing and needed m_executionAnimationTemplate = AsciiString::TheEmptyString; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp index 4e32ce205e..655ea5feac 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp @@ -127,7 +127,6 @@ OpenContain::OpenContain( Thing *thing, const ModuleData* moduleData ) : UpdateM m_stealthUnitsContained = 0; m_doorCloseCountdown = 0; - //Added By Sadullah Nader //Initializations inserted m_rallyPoint.zero(); m_rallyPointExists = FALSE; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp index fa2e511341..4261cb74be 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp @@ -99,7 +99,6 @@ ParachuteContain::ParachuteContain( Thing *thing, const ModuleData *moduleData ) m_isLandingOverrideSet = FALSE; m_startZ = NO_START_Z; - //Added By Sadullah Nader //Initializations m_landingOverride.zero(); m_paraAttachBone.zero(); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/ExperienceTracker.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/ExperienceTracker.cpp index ca1facc47b..f6a1b05032 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/ExperienceTracker.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/ExperienceTracker.cpp @@ -43,7 +43,7 @@ ExperienceTracker::ExperienceTracker(Object *parent) : m_currentLevel(LEVEL_REGULAR), m_experienceSink(INVALID_ID), m_experienceScalar( 1.0f ), - m_currentExperience(0) // Added By Sadullah Nader + m_currentExperience(0) { } diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp index 2b48f3396f..427cf2a03d 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp @@ -39,7 +39,6 @@ GhostObjectManager *TheGhostObjectManager = NULL; //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- GhostObject::GhostObject(void): -//Added By Sadullah Nader //Initializations missing and needed m_parentAngle(0.0f), // TheSuperHackers @bugfix tomsons26 26/04/2025 Change initialization of m_parentGeometryIsSmall from 0.0f. diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp index 6f010be3b9..f7a0cbf866 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp @@ -660,7 +660,6 @@ Locomotor::Locomotor(const LocomotorTemplate* tmpl) //------------------------------------------------------------------------------------------------- Locomotor::Locomotor(const Locomotor& that) { - //Added By Sadullah Nader //Initializations m_angleOffset = 0.0f; m_maintainPos.zero(); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp index a4d8e4a15c..e8811e826d 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp @@ -212,7 +212,6 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu Int i, modIdx; AsciiString modName; - //Added By Sadullah Nader //Initializations inserted m_formationOffset.x = m_formationOffset.y = 0.0f; m_iPos.zero(); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp index 2afdf0e21a..27341739aa 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp @@ -754,9 +754,9 @@ class GenericObjectCreationNugget : public ObjectCreationNugget m_fadeIn(false), m_fadeOut(false), m_fadeFrames(0), - m_fadeSoundName(AsciiString::TheEmptyString), // Added By Sadullah Nader - m_particleSysName(AsciiString::TheEmptyString), // Added By Sadullah Nader - m_putInContainer(AsciiString::TheEmptyString), // Added By Sadullah Nader + m_fadeSoundName(AsciiString::TheEmptyString), + m_particleSysName(AsciiString::TheEmptyString), + m_putInContainer(AsciiString::TheEmptyString), m_minMag(0.0f), m_maxMag(0.0f), m_minPitch(0.0f), @@ -766,7 +766,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget m_shadowType(SHADOW_NONE), m_fxFinal(NULL), m_preserveLayer(true), - m_objectCount(0) // Added By Sadullah Nader + m_objectCount(0) { // Change Made by Sadullah Nader // for init purposes, easier to read diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp index c048361e10..a010dbecea 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp @@ -1222,7 +1222,6 @@ void CellAndObjectIntersection::removeAllCoverage() //----------------------------------------------------------------------------- PartitionCell::PartitionCell() { - //Added By Sadullah Nader //Initializations inserted m_cellX = m_cellY = 0; // diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp index 8f6331f8c4..be33e558e5 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp @@ -119,7 +119,6 @@ DeliverPayloadAIUpdate::DeliverPayloadAIUpdate( Thing *thing, const ModuleData* m_freeToExit = FALSE; m_acceptingCommands = TRUE; - // Added By Sadullah Nader // Initialization missing and needed m_diveState = DIVESTATE_PREDIVE; 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 d5371bd9a3..e4ff4daf2f 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp @@ -384,7 +384,6 @@ class DozerActionDoActionState : public State DozerActionDoActionState( StateMachine *machine, DozerTask task ) : State( machine, "DozerActionDoActionState" ) { m_task = task; - //Added By Sadullah Nader // Initializations missing and needed m_enterFrame = 0; } 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 29034934a4..1b308d3697 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp @@ -1665,7 +1665,6 @@ JetAIUpdate::JetAIUpdate( Thing *thing, const ModuleData* moduleData ) : AIUpdat m_lockonDrawable = NULL; m_landingPosForHelipadStuff.zero(); - //Added By Sadullah Nader //Initializations missing and needed m_producerLocation.zero(); // 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 7b2dfd9eec..018b698fdd 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp @@ -89,7 +89,6 @@ WorkerAIUpdate::WorkerAIUpdate( Thing *thing, const ModuleData* moduleData ) : // implementation because at this point we don't have the object all setup // - //Added By Sadullah Nader //Initialization(s) inserted m_isRebuild = FALSE; // diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BoneFXUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BoneFXUpdate.cpp index 6e25783247..92dc1c839d 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BoneFXUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BoneFXUpdate.cpp @@ -88,7 +88,6 @@ BoneFXUpdate::BoneFXUpdate( Thing *thing, const ModuleData* moduleData ) : Updat m_particleSystemIDs.clear(); m_active = FALSE; - //Added By Sadullah Nader m_curBodyState = BODY_PRISTINE; } diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp index 0bd22873dd..5d522251e8 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp @@ -61,7 +61,6 @@ //------------------------------------------------------------------------------------------------- HelicopterSlowDeathBehaviorModuleData::HelicopterSlowDeathBehaviorModuleData( void ) { - //Added By Sadullah Nader //Initializations missing and needed m_attachParticleBone.clear(); m_bladeBone.clear(); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp index 73505c6863..2ef0e4e534 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp @@ -157,7 +157,6 @@ HordeUpdate::HordeUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateM m_inHorde = FALSE; m_hasFlag = FALSE; m_lastHordeRefreshFrame = TheGameLogic->getFrame(); - // Added By Sadullah Nader // Initializations missing and needed m_trueHordeMember = FALSE; // diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp index 3cebb0af7a..6b1dd4a4c4 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp @@ -82,7 +82,6 @@ LaserRadiusUpdate::LaserRadiusUpdate() //------------------------------------------------------------------------------------------------- LaserUpdate::LaserUpdate( Thing *thing, const ModuleData* moduleData ) : ClientUpdateModule( thing, moduleData ) { - //Added By Sadullah Nader //Initialization missing and needed m_dirty = FALSE; m_endPos.zero(); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp index f1147b5036..b561d134a2 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp @@ -42,7 +42,6 @@ LifetimeUpdate::LifetimeUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData ) { const LifetimeUpdateModuleData* d = getLifetimeUpdateModuleData(); - // Added By Sadullah Nader // Initializations needed m_dieFrame = 0; // diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp index bd137d1630..5bc8ea7b3e 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp @@ -46,7 +46,6 @@ DefaultProductionExitUpdate::DefaultProductionExitUpdate( Thing *thing, const Mo { // no rally point has been set m_rallyPointExists = false; - // Added By Sadullah Nader // Initialization missing and needed m_rallyPoint.zero(); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp index 6e7124a877..79e4e07e34 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp @@ -46,7 +46,6 @@ QueueProductionExitUpdate::QueueProductionExitUpdate( Thing *thing, const Module { m_currentDelay = 0; - //Added By Sadullah Nader //Initializations inserted m_creationClearDistance = 0; m_rallyPoint.zero(); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp index cd81b573ce..4db6c42830 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp @@ -158,7 +158,6 @@ ProductionEntry::ProductionEntry( void ) m_framesUnderConstruction = 0; m_next = NULL; m_prev = NULL; - //Added By Sadullah Nader //Initializations inserted m_productionQuantityProduced = 0; m_productionQuantityTotal = 0; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp index 39d4be44ea..bd76c0121a 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp @@ -68,7 +68,6 @@ //------------------------------------------------------------------------------------------------- SpecialAbilityUpdate::SpecialAbilityUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData ) { - //Added By Sadullah Nader //Initialization(s) inserted m_captureFlashPhase = 0.0f; // diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp index af3dc0064e..4db89867b0 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp @@ -99,7 +99,6 @@ StealthUpdate::StealthUpdate( Thing *thing, const ModuleData* moduleData ) : Upd //Must be enabled manually if using disguise system (bomb truck uses) m_enabled = !data->m_teamDisguised; - //Added By Sadullah Nader //Initialization(s) inserted m_detectionExpiresFrame = 0; // diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp index 2e71aa28f4..f9469a8582 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp @@ -50,7 +50,6 @@ StickyBombUpdate::StickyBombUpdate( Thing *thing, const ModuleData *moduleData ) { m_targetID = INVALID_ID; m_dieFrame = 0; - //Added By Sadullah Nader //Initialization(s) inserted m_nextPingFrame = 0; // diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp index 62a4942333..4471c28fd9 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp @@ -68,7 +68,6 @@ StructureCollapseUpdate::StructureCollapseUpdate( Thing *thing, const ModuleData m_collapseFrame = 0; m_collapseState = COLLAPSESTATE_STANDING; m_collapseVelocity = 0.0f; - //Added By Sadullah Nader //Initialization(s) inserted m_burstFrame = 0; m_currentHeight = 0.0f; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp index 61470e9a32..6dd3eb2696 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp @@ -56,7 +56,6 @@ const Int MAX_IDX = 32; StructureToppleUpdate::StructureToppleUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData ) { - //Added By Sadullah Nader //Initialization(s) inserted m_delayBurstLocation.zero(); m_structuralIntegrity = 0.0f; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp index 497a4e0680..1b377796d7 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp @@ -104,7 +104,6 @@ void ToppleUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) //------------------------------------------------------------------------------------------------- ToppleUpdate::ToppleUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData ) { - //Added By Sadullah Nader //Initialization(s) inserted m_angleDeltaX = 0.0f; m_doBounceFX = FALSE; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp index 0783293471..ad48db9e84 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp @@ -58,7 +58,6 @@ // ------------------------------------------------------------------------------------------------ WaveGuideUpdateModuleData::WaveGuideUpdateModuleData( void ) { - //Added By Sadullah Nader //Initialization(s) inserted m_bridgeParticleAngleFudge = 0.0f; m_randomSplashSoundFrequency = 0; diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp index 8573b7b181..9b2d9456a2 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp @@ -362,7 +362,6 @@ m_skirmishHumanPlayer(NULL), m_fade(FADE_NONE), m_freezeByScript(FALSE), m_frameObjectCountChanged(0), -//Added By Sadullah Nader //Initializations inserted m_closeWindowTimer(0), m_curFadeFrame(0), diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp index 41b671c5fd..d6a170e160 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp @@ -632,7 +632,6 @@ m_firstScript(NULL), m_hasWarnings(false), m_isGroupActive(true), m_isGroupSubroutine(false), -//Added By Sadullah Nader //Initializations inserted m_nextGroup(NULL) // @@ -906,7 +905,6 @@ m_hasWarnings(false), m_nextScript(NULL), m_condition(NULL), m_action(NULL), -//Added By Sadullah Nader //Initializations inserted m_actionFalse(NULL), m_curTime(0.0f) @@ -2172,7 +2170,6 @@ ScriptAction::ScriptAction(): m_actionType(NO_OP), m_hasWarnings(false), m_numParms(0), -//Added By Sadullah Nader //Initializations inserted m_nextAction(NULL) // diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp index 44f527814d..9e475bdf92 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp @@ -207,7 +207,6 @@ void setFPMode( void ) // ------------------------------------------------------------------------------------------------ GameLogic::GameLogic( void ) { - //Added By Sadullah Nader //Initializations missing and necessary m_background = NULL; m_CRC = 0; @@ -2094,7 +2093,6 @@ void GameLogic::startNewGame( Bool saveGame ) TheGameSpyBuddyMessageQueue->addRequest(req); } - //Added By Sadullah Nader //Added to fix the quit menu //ReAllows quit menu to work during loading scene setGameLoading(FALSE); diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp index 6c58b9aa53..21cf65104f 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp @@ -299,7 +299,6 @@ void GameLogic::clearGameData( Bool showScoreScreen ) // ------------------------------------------------------------------------------------------------ void GameLogic::prepareNewGame( GameMode gameMode, GameDifficulty diff, Int rankPoints ) { - //Added By Sadullah Nader //Fix for loading game scene setGameLoading(TRUE); // diff --git a/GeneralsMD/Code/GameEngine/Include/Common/INI.h b/GeneralsMD/Code/GameEngine/Include/Common/INI.h index 957fd56bae..ead5e913f6 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/INI.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/INI.h @@ -138,7 +138,6 @@ class MultiIniFieldParse public: MultiIniFieldParse() : m_count(0) { - //Added By Sadullah Nader //Initializations missing and needed for(Int i = 0; i < MAX_MULTI_FIELDS; i++) m_extraOffset[i] = 0; diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h index e15b68975c..50cd1f3b85 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h @@ -448,7 +448,6 @@ class SideSelectWindowData public: SideSelectWindowData(void) { - //Added By Sadullah Nader //Initializations generalSpeak = NULL; m_currColor = 0; diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h b/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h index f3bd0827b7..27dd388351 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h @@ -65,7 +65,6 @@ class SelectionTranslator : public GameMessageTranslator ~SelectionTranslator(); virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); - //Added By Sadullah Nader //added for fix to the drag selection when entering control bar //changes the mode of drag selecting to it's opposite void setDragSelecting(Bool dragSelect); diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/View.h b/GeneralsMD/Code/GameEngine/Include/GameClient/View.h index 1e0f72fbae..80dc6143a2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/View.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/View.h @@ -311,7 +311,6 @@ class ViewLocation ViewLocation() { m_valid = FALSE; - //Added By Sadullah Nader //Initialization(s) inserted m_pos.zero(); m_angle = m_pitch = m_zoom = 0.0; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h index a9f6a68501..72bc9f8705 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h @@ -78,7 +78,6 @@ class ExitConditions : public AttackExitConditionsInterface ExitConditions() : m_attackGiveUpFrame(0), m_conditionsToConsider(0), m_radiusSqr(0.0f) { - //Added By Sadullah Nader // Initializations missing and needed m_center.zero(); } diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h index ba9eb252ea..eaf0bcd70a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h @@ -76,7 +76,6 @@ class GuardRetaliateExitConditions : public AttackExitConditionsInterface GuardRetaliateExitConditions() : m_attackGiveUpFrame(0), m_conditionsToConsider(0), m_radiusSqr(0.0f) { - //Added By Sadullah Nader // Initializations missing and needed m_center.zero(); } diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h index 84aedef91d..087d6c90a1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h @@ -113,7 +113,6 @@ class TeamInQueue : public MemoryPoolObject, m_reinforcement(false), m_stopQueueing(false), m_reinforcementID(INVALID_ID), - //Added By Sadullah Nader //Initialization(s) inserted m_frameStarted(0), m_priorityBuild(FALSE) diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h index 9f5fa504ae..71a6683dab 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h @@ -314,7 +314,6 @@ class GameLogic : public SubsystemInterface, public Snapshot Bool m_shouldValidateCRCs; ///< Should we validate CRCs this frame? //----------------------------------------------------------------------------------------------- - //Added By Sadullah Nader //Used to for load scene //Bool m_loadingScene; Bool m_loadingMap; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h index 2139b995cb..4b453f11fc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h @@ -46,7 +46,6 @@ class CreateCrateDieModuleData : public DieModuleData CreateCrateDieModuleData() { - // Added By Sadullah Nader // Initializations missing and needed m_crateNameList.clear(); } diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h index e92b964b6e..4b62b50a0d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h @@ -204,7 +204,6 @@ class DeliverPayloadAIUpdateModuleData : public AIUpdateModuleData m_dropOffset.zero(); m_dropVariance.zero(); m_deliveryDecalRadius = 0; - // Added By Sadullah Nader // Initialization missing and needed m_putInContainerName.clear(); @@ -295,7 +294,6 @@ class DeliverPayloadData m_visiblePayloadWeaponTemplate = NULL; m_selfDestructObject = FALSE; m_deliveryDecalRadius = 0; - // Added By Sadullah Nader // Initialization missing and needed m_visibleDropBoneName.clear(); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h index d79bccd2f7..c02b0e71ed 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h @@ -59,7 +59,6 @@ class DeployStyleAIUpdateModuleData : public AIUpdateModuleData m_packTime = 0; m_resetTurretBeforePacking = false; m_turretsFunctionOnlyWhenDeployed = false; - // Added By Sadullah Nader // Initialization necessary m_turretsMustCenterBeforePacking = FALSE; // End Add diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h index 6b049d7372..44d36538a7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h @@ -46,7 +46,6 @@ class HackInternetState : public State public: HackInternetState( StateMachine *machine ) :State( machine, "HackInternetState" ) { - //Added By Sadullah Nader //Initializations missing and needed m_framesRemaining = 0; // @@ -73,7 +72,6 @@ class PackingState : public State public: PackingState( StateMachine *machine ) : State( machine, "PackingState" ) { - //Added By Sadullah Nader //Initializations inserted m_framesRemaining = 0; // diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h index baa2c45508..3a0e8fd973 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h @@ -61,7 +61,6 @@ class ObjectDefectionHelper : public ObjectHelper ObjectDefectionHelper( Thing *thing, const ModuleData *modData ) : ObjectHelper( thing, modData ) { - //Added By Sadullah Nader //Initializations inserted m_defectionDetectionEnd = 0; m_defectionDetectionFlashPhase = FALSE; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h index 131105a662..bba40b1ce0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h @@ -65,7 +65,6 @@ class SpawnBehaviorModuleData : public BehaviorModuleData { m_spawnNumberData = 0; m_spawnReplaceDelayData = 0; - //Added By Sadullah Nader //Initialization(s) inserted m_spawnStartNumberData = 0; // diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h index 978b04950f..bd0d4fa3aa 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h @@ -1146,7 +1146,6 @@ class PartitionFilterGarrisonable : public PartitionFilter public: PartitionFilterGarrisonable( Bool match ) : m_match(match) { - //Added By Sadullah Nader //Initializations m_player = NULL; // diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp index 071c5debeb..c77db7a92d 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp @@ -690,7 +690,6 @@ GlobalData::GlobalData() m_vertexWaterAttenuationB[ i ] = 0.0f; m_vertexWaterAttenuationC[ i ] = 0.0f; m_vertexWaterAttenuationRange[ i ] = 0.0f; - //Added By Sadullah Nader //Initializations missing and needed m_vertexWaterAvailableMaps[i].clear(); } @@ -803,7 +802,6 @@ GlobalData::GlobalData() m_autoSmokeParticleLargeMax = 0; m_autoAflameParticleMax = 0; - // Added By Sadullah Nader // Initializations missing and needed m_autoFireParticleSmallPrefix.clear(); m_autoFireParticleMediumPrefix.clear(); diff --git a/GeneralsMD/Code/GameEngine/Source/Common/PartitionSolver.cpp b/GeneralsMD/Code/GameEngine/Source/Common/PartitionSolver.cpp index 3b98cb556e..26206f18ae 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/PartitionSolver.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/PartitionSolver.cpp @@ -63,7 +63,6 @@ PartitionSolver::PartitionSolver(const EntriesVec& elements, const SpacesVec& sp m_data = elements; m_spacesForData = spaces; m_howToSolve = solveHow; - //Added By Sadullah Nader //Initializations inserted m_currentSolutionLeftovers = 0; // diff --git a/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp b/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp index e18d2c8eab..f346ef48f0 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp @@ -312,7 +312,6 @@ PerfGather::PerfGather(const char *identifier) : m_next(0), m_prev(0) { - //Added By Sadullah Nader //Initializations inserted m_ignore = FALSE; // @@ -560,7 +559,6 @@ PerfTimer::PerfTimer( const char *identifier, Bool crashWithInfo, Int startFrame m_callCount(0), m_runningTime(0), m_outputInfo(true), - //Added By Sadullah Nader //Intializations inserted m_lastFrame(-1) { diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp index da01c71b0a..66c8a156ec 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp @@ -102,7 +102,6 @@ void ScoreKeeper::reset( Int playerIdx ) m_totalMoneyEarned = m_totalMoneySpent = 0; m_totalUnitsLost = m_totalUnitsBuilt = 0; m_totalBuildingsLost = m_totalBuildingsBuilt = 0; - //Added By Sadullah Nader //Initializtion(s) inserted m_totalFactionBuildingsCaptured = m_totalTechBuildingsCaptured = 0; // diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp index a1bb7375a1..2bea6e2693 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp @@ -1316,7 +1316,6 @@ Team::Team(TeamPrototype *proto, TeamID id ) : m_curUnits(0), m_wasIdle(false) { - //Added By Sadullah Nader //Initialization(s) inserted m_created = FALSE; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp index a9d064db43..9a1da0a7ba 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp @@ -368,7 +368,6 @@ RecorderClass::RecorderClass() m_file = NULL; m_fileName.clear(); m_currentFilePosition = 0; - //Added By Sadullah Nader //Initializtion(s) inserted m_doingAnalysis = FALSE; m_archiveReplays = FALSE; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp b/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp index a3395260a7..43aa25e6fa 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp @@ -76,7 +76,6 @@ static char statsDir[255] = "Stats\\"; //============================================================================= StatsCollector::StatsCollector( void ) { - //Added By Sadullah Nader //Initialization(s) inserted m_isScrolling = FALSE; m_scrollBeginTime = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/Upgrade.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/Upgrade.cpp index 38a4566e30..00c5166753 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/Upgrade.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/Upgrade.cpp @@ -131,7 +131,6 @@ const FieldParse UpgradeTemplate::m_upgradeFieldParseTable[] = //------------------------------------------------------------------------------------------------- UpgradeTemplate::UpgradeTemplate( void ) { - //Added By Sadullah Nader //Initialization(s) inserted m_cost = 0; // diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp index be5d3cb1fc..6a44379386 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp @@ -349,7 +349,6 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatusBits statu // assign status bits before anything else can be done m_status = statusBits; - // Added By Sadullah Nader // Initialization missing and needed m_nextDrawable = NULL; m_prevDrawable = NULL; @@ -365,7 +364,6 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatusBits statu Int i; - // Added By Sadullah Nader // Initialization missing and needed m_flashColor = 0; m_selected = '\0'; @@ -375,7 +373,6 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatusBits statu m_lastConstructDisplayed = -1.0f; - //Added By Sadullah Nader //Fix for the building percent m_constructDisplayString = TheDisplayStringManager->newDisplayString(); m_constructDisplayString->setFont(TheFontLibrary->getFont(TheInGameUI->getDrawableCaptionFontName(), diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index c357ad30c3..0ffba4ba0b 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -892,7 +892,6 @@ ControlBar::ControlBar( void ) m_buildToolTipLayout = NULL; m_showBuildToolTipLayout = FALSE; - // Added By Sadullah Nader // initializing vars to zero m_animateDownWin1Pos.x = m_animateDownWin1Pos.y = 0; m_animateDownWin1Size.x = m_animateDownWin1Size.y = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp index 72018691d7..a886627db7 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp @@ -304,7 +304,6 @@ ControlBarScheme::ControlBarScheme(void) m_optionsButtonPushed = NULL; m_optionsButtonDisabled = NULL; - // Added By Sadullah Nader // Initializations needed m_commandBarBorderColor = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp index 62050e0c39..87ae45c402 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp @@ -719,7 +719,6 @@ void InitLanGameGadgets( void ) Int localSlotNum = TheLAN->GetMyGame()->getLocalSlotNum(); DEBUG_ASSERTCRASH(localSlotNum >= 0, ("Bad slot number!")); - //Added By Sadullah Nader //Tooltip function is being set for techBuildings, and supplyDocks windowMap->winSetTooltipFunc(MapSelectorTooltip); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp index da3359cc1c..ed5c922389 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp @@ -718,7 +718,6 @@ void MainMenuShutdown( WindowLayout *layout, void *userData ) extern Bool DontShowMainMenu; //////////////////////////////////////////////////////////////////////////// -//Added By Sadullah Nader //Added as a fix to the resolution change //Allows the user to confirm the change, goes back to the previous mode //if the time to change expires. @@ -1520,7 +1519,6 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, // If we ever want to add a dialog before we exit out of the game, uncomment this line and kill the quitCallback() line below. //#if defined(RTS_DEBUG) - //Added By Sadullah Nader //Changed the preprocessing code to normal code if (TheGlobalData->m_windowed) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp index 0ed1e4174e..7f14f339ec 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp @@ -769,7 +769,6 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg, buttonFrame->winEnable( TRUE ); updateMenuActions(); - //Added By Sadullah Nader //Fix for bug // close save menuu closeSaveMenu( window ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp index 2458fd2dfe..2d4baa25c1 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp @@ -280,7 +280,6 @@ void HideQuitMenu( void ) void ToggleQuitMenu() { - //Added By Sadullah Nader //Added a check to see if we're not in game yet if (TheGameLogic->isIntroMoviePlaying() || TheGameLogic->isLoadingMap() ||TheScriptEngine->isGameEnding()) return; @@ -323,7 +322,6 @@ void ToggleQuitMenu() isVisible = FALSE; - //Added By Sadullah Nader //Bug: When Toggling the quit menu off, the quit confirmation should also go away if (quitConfirmationWindow) TheWindowManager->winDestroy(quitConfirmationWindow); @@ -352,7 +350,6 @@ void ToggleQuitMenu() } else { - //Added By Sadullah Nader //Added to compensate for the quit confirmation window pop-up TheMouse->setCursor( Mouse::ARROW ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp index 0387b8fcbb..dd4193685f 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp @@ -944,7 +944,6 @@ void finishSinglePlayerInit( void ) } - //Added By Sadullah Nader //Fix for the black screen text that appears after loading sequence TheInGameUI->freeMessageResources(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp index 7c658c1766..01450d2494 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp @@ -885,7 +885,6 @@ void updateMapStartSpots( GameInfo *myGame, GameWindow *buttonMapStartPositions[ AsciiString displayNumber; displayNumber.format("NUMBER:%d",i + 1); GadgetButtonSetText(buttonMapStartPositions[gs->getStartPos()], TheGameText->fetch(displayNumber)); - //Added By Sadullah Nader //Fix for no tooltips at start positions //added start position tooltip //Fixed again to show the right number , ie "i + 1" diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp index f8ded6ae93..1dd720d19c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp @@ -1173,7 +1173,6 @@ void InitWOLGameGadgets( void ) TheWindowManager->winGetWindowFromId(parentWOLGameSetup, labelID)->winEnable( FALSE ); } - //Added By Sadullah Nader //Tooltip Function set windowMap->winSetTooltipFunc(MapSelectorTooltip); // diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp index cb3f1a831d..24b0b0186a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp @@ -1544,7 +1544,6 @@ WindowMsgHandledType GameWinBlockInput( GameWindow *window, UnsignedInt msg, if (msg == GWM_CHAR || msg == GWM_MOUSE_POS) return MSG_IGNORED; - //Added By Sadullah Nader //Fix for drag selecting in the control bar if (msg == GWM_LEFT_UP )//|| msg == GWM_LEFT_DRAG) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp index f813d3048d..493d88ea3e 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp @@ -107,7 +107,6 @@ m_font(NULL), m_point(0), m_bold(FALSE) { - //Added By Sadullah Nader //Initializations missing and needed m_fontName.clear(); m_name.clear(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp index 748f1aa41c..56d4a8dd38 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp @@ -506,7 +506,6 @@ IMEManager::IMEManager() m_result(0), m_indexBase(1), - //Added By Sadullah Nader //Initializations missing and needed m_compositionCharsDisplayed(0), m_candidateDownArrow(NULL), diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp index 2613bcf697..fa31422bad 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp @@ -175,7 +175,6 @@ void LoadScreen::update( Int percent ) //----------------------------------------------------------------------------- SinglePlayerLoadScreen::SinglePlayerLoadScreen( void ) { - //Added By Sadullah Nader //Initialization(s) inserted m_currentObjectiveLine = 0; m_currentObjectiveLineCharacter = 0; @@ -1225,14 +1224,12 @@ void ShellGameLoadScreen::update( Int percent ) //----------------------------------------------------------------------------- MultiPlayerLoadScreen::MultiPlayerLoadScreen( void ) { - //Added By Sadullah Nader //Initializations missing and needed m_mapPreview = NULL; // for(Int i = 0; i < MAX_SLOTS; ++i) { - //Added By Sadullah Nader //Initializations missing and needed m_buttonMapStartPosition[i] = NULL; // @@ -1491,7 +1488,6 @@ void MultiPlayerLoadScreen::processProgress(Int playerId, Int percentage) GameSpyLoadScreen::GameSpyLoadScreen( void ) { - // Added By Sadullah Nader // Initializations missing and needed m_mapPreview = NULL; // @@ -1499,7 +1495,6 @@ GameSpyLoadScreen::GameSpyLoadScreen( void ) for(Int i = 0; i < MAX_SLOTS; ++i) { - // Added By Sadullah Nader // Initializations missing and needed m_buttonMapStartPosition[i] = NULL; m_playerRank[i] = NULL; @@ -1858,7 +1853,6 @@ void GameSpyLoadScreen::processProgress(Int playerId, Int percentage) //----------------------------------------------------------------------------- MapTransferLoadScreen::MapTransferLoadScreen( void ) { - //Added By Sadullah Nader //Initializations missing and needed m_oldTimeout = 0; // diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp index b12a9eb363..49474af5cd 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp @@ -85,7 +85,6 @@ void Shell::construct( void ) m_schemeManager = NEW ShellMenuSchemeManager; m_saveLoadMenuLayout = NULL; m_popupReplayLayout = NULL; - //Added By Sadullah Nader //Initializations m_optionsLayout = NULL; m_screenCount = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp index a0de88a9ae..f29ca249ab 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp @@ -100,7 +100,6 @@ GameClient::GameClient() m_numTranslators = 0; m_commandTranslator = NULL; - // Added By Sadullah Nader // Initializations missing and needed m_drawableTOC.clear(); // diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp index 012f01250e..dc78547961 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp @@ -260,7 +260,6 @@ GameTextManager::GameTextManager() m_mapStringLUT(NULL), m_failed(L"***FATAL*** String Manager failed to initilaize properly") { - // Added By Sadullah Nader // Initializations missing and needed for(Int i=0; i < MAX_UITEXT_LENGTH; i++) diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp index 2b279e0c56..03ba4a9c93 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp @@ -123,7 +123,6 @@ void INI::parseLanguageDefinition( INI *ini ) GlobalLanguage::GlobalLanguage() { m_unicodeFontName.clear(); - //Added By Sadullah Nader //Initializations missing and needed m_unicodeFontFileName.clear(); m_unicodeFontName.clear(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp index ed8d6e0cc2..000b32ccb9 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp @@ -978,7 +978,6 @@ InGameUI::InGameUI() m_mouseModeCursor = Mouse::ARROW; m_mousedOverDrawableID = INVALID_DRAWABLE_ID; - //Added By Sadullah Nader //Initializations missing and needed m_currentlyPlayingMovie.clear(); m_militarySubtitle = NULL; @@ -5472,7 +5471,6 @@ void InGameUI::clearPopupMessageData( void ) //------------------------------------------------------------------------------------------------- FloatingTextData::FloatingTextData(void) { - // Added By Sadullah Nader // Initializations missing and needed m_color = 0; m_frameCount = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp index 8321ab2469..9b148eb808 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp @@ -458,7 +458,6 @@ Mouse::Mouse( void ) m_numAxes = 0; m_forceFeedback = FALSE; - //Added By Sadullah Nader //Initializations missing and needed m_dragTolerance = 0; m_dragTolerance3D = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp index 35ede1fdbf..95c455a126 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp @@ -113,7 +113,6 @@ GameMessageDisposition HotKeyTranslator::translateGameMessage(const GameMessage HotKey::HotKey() { m_win = NULL; - //Added By Sadullah Nader //Initializations missing and needed m_key.clear(); // diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp index b9990857de..baf2b1a00f 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp @@ -142,7 +142,6 @@ LookAtTranslator::LookAtTranslator() : m_lastMouseMoveFrame(0), m_scrollType(SCROLL_NONE) { - //Added By Sadullah Nader //Initializations missing and needed m_anchor.x = m_anchor.y = 0; m_currentPos.x = m_currentPos.y = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp index 2dcfe187fe..ad14fef279 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp @@ -270,7 +270,6 @@ SelectionTranslator::SelectionTranslator() m_deselectFeedbackAnchor.x = 0; m_deselectFeedbackAnchor.y = 0; m_lastClick = 0; - //Added By Sadullah Nader //Initializtion(s) inserted m_deselectDownCameraPosition.zero(); m_displayedMaxWarning = FALSE; @@ -1338,7 +1337,6 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa } -//Added By Sadullah Nader //setDragSelecting(Bool dragSelect) //Added to fix the drag selection problem in control bar diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/RadiusDecal.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/RadiusDecal.cpp index e6558f637b..0bc882eae4 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/RadiusDecal.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/RadiusDecal.cpp @@ -45,7 +45,7 @@ RadiusDecalTemplate::RadiusDecalTemplate() : m_opacityThrobTime(LOGICFRAMES_PER_SECOND), m_color(0), m_onlyVisibleToOwningPlayer(true), - m_name(AsciiString::TheEmptyString) // Added By Sadullah Nader for Init purposes + m_name(AsciiString::TheEmptyString) { } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp index 9ec84290db..abf82e45fc 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp @@ -299,7 +299,6 @@ Anim2D::Anim2D( Anim2DTemplate *animTemplate, Anim2DCollection *collectionSystem // sanity DEBUG_ASSERTCRASH( animTemplate != NULL, ("Anim2D::Anim2D - NULL template") ); - //Added By Sadullah Nader //Initialization m_currentFrame = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp index e3686a05a9..b2d2620671 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp @@ -68,7 +68,6 @@ ParticleSystemManager *TheParticleSystemManager = NULL; // ------------------------------------------------------------------------------------------------ ParticleInfo::ParticleInfo( void ) { - //Added By Sadullah Nader //Initializations inserted m_angleZ = 0.0f; m_angularDamping = 0.0f; @@ -262,7 +261,6 @@ Particle::Particle( ParticleSystem *system, const ParticleInfo *info ) m_angleZ = info->m_angleZ; - //Added By Sadullah Nader //Initializations inserted m_lastPos.zero(); // @@ -728,7 +726,6 @@ ParticleSystemInfo::ParticleSystemInfo() m_isEmitAboveGroundOnly = false; m_isParticleUpTowardsEmitter = false; - //Added By Sadullah Nader //Initializations inserted m_driftVelocity.zero(); m_gravity = 0.0f; @@ -1038,7 +1035,6 @@ ParticleSystem::ParticleSystem( const ParticleSystemTemplate *sysTemplate, m_template = sysTemplate; m_systemID = id; - //Added By Sadullah Nader //Initializations inserted m_lastPos.zero(); m_pos.zero(); @@ -2783,7 +2779,6 @@ void ParticleSystemTemplate::parseRandomRGBColor( INI* ini, void *instance, ParticleSystemTemplate::ParticleSystemTemplate( const AsciiString &name ) : m_name(name) { - //Added By Sadullah Nader //Initializations inserted m_slaveTemplate = NULL; // @@ -2827,7 +2822,6 @@ ParticleSystemManager::ParticleSystemManager( void ) m_onScreenParticleCount = 0; m_localPlayerIndex = 0; - //Added By Sadullah Nader //Initializations inserted m_lastLogicFrameUpdate = 0; m_particleCount = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/View.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/View.cpp index 6e760b2dd3..bed9719120 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/View.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/View.cpp @@ -41,7 +41,6 @@ View *TheTacticalView = NULL; View::View( void ) { - //Added By Sadullah Nader //Initialization(s) inserted m_viewLockedUntilFrame = 0u; m_currentHeightAboveGround = 0.0f; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp index cd079dc035..95b1f6fb6f 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp @@ -941,7 +941,6 @@ m_infantryPathfindDiameter(6), m_vehiclePathfindDiameter(6), m_supplyCenterSafeRadius(250), m_rebuildDelaySeconds(10), -//Added By Sadullah Nader //Initialization(s) inserted m_distanceRequiresGroup(0.0f), m_sideBuildLists(NULL), diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp index 1b44f5dec5..bece6e43c6 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp @@ -3030,7 +3030,6 @@ zoneStorageType PathfindZoneManager::getEffectiveZone( LocomotorSurfaceTypeMask } //-------------------- PathfindLayer ---------------------------------------- PathfindLayer::PathfindLayer() : m_blockOfMapCells(NULL), m_layerCells(NULL), m_bridge(NULL), -// Added By Sadullah Nader // Initializations inserted m_destroyed(FALSE), m_height(0), diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp index 645b4edb7b..2914915c73 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp @@ -280,12 +280,10 @@ TurretAI::TurretAI(Object* owner, const TurretAIData* data, WhichTurretType tur) m_enabled(!data->m_initiallyDisabled), m_firesWhileTurning(data->m_firesWhileTurning), m_isForceAttacking(false), - //Added By Sadullah Nader //Initialization(s) inserted m_victimInitialTeam(NULL) // { - //Added By Sadullah Nader //Initialization(s) inserted m_continuousFireExpirationFrame = -1; // diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp index 6fbc415e91..cc79ea61b5 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp @@ -50,7 +50,6 @@ m_exportWithScripts(false), m_isWaterArea(false), m_shouldRender(true), m_selected(false), -//Added By Sadullah Nader //Initializations inserted m_isRiver(FALSE), m_riverStart(0) diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp index 0d4cff7dc1..20119a2e0a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp @@ -959,7 +959,6 @@ TerrainLogic::TerrainLogic() { Int i; - //Added By Sadullah Nader //Initialization(s) inserted m_activeBoundary = 0; m_waterGridEnabled = FALSE; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp index bf626b9f38..4420259c3f 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp @@ -52,7 +52,6 @@ ParkingPlaceBehavior::ParkingPlaceBehavior( Thing *thing, const ModuleData* modu { m_gotInfo = false; - //Added By Sadullah Nader //Initializations m_heliRallyPoint.zero(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp index 67281f1612..0bffd3eb1e 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp @@ -121,7 +121,6 @@ PropagandaTowerBehaviorModuleData::PropagandaTowerBehaviorModuleData( void ) PropagandaTowerBehavior::PropagandaTowerBehavior( Thing *thing, const ModuleData *modData ) : UpdateModule( thing, modData ) { - //Added By Sadullah Nader //Initializations inserted m_lastScanFrame = 0; // diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp index 437e521e68..a0c78001a7 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp @@ -68,7 +68,6 @@ SpawnBehavior::SpawnBehavior( Thing *thing, const ModuleData* moduleData ) //looping back to the beginning m_framesToWait = 0; - //Added By Sadullah Nader //Initialization(s) inserted m_firstBatchCount = 0; // diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp index 7b05a6d1ec..f2bc2d5e07 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp @@ -56,7 +56,6 @@ CrateCollideModuleData::CrateCollideModuleData() m_executeFX = NULL; m_pickupScience = SCIENCE_INVALID; - // Added By Sadullah Nader // Initializations missing and needed m_executionAnimationTemplate = AsciiString::TheEmptyString; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp index 8e42cbc9f7..d5f001957b 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp @@ -131,7 +131,6 @@ OpenContain::OpenContain( Thing *thing, const ModuleData* moduleData ) : UpdateM m_stealthUnitsContained = 0; m_doorCloseCountdown = 0; - //Added By Sadullah Nader //Initializations inserted m_rallyPoint.zero(); m_rallyPointExists = FALSE; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp index cb826a3be9..4fbb3c9dde 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp @@ -100,7 +100,6 @@ ParachuteContain::ParachuteContain( Thing *thing, const ModuleData *moduleData ) m_isLandingOverrideSet = FALSE; m_startZ = NO_START_Z; - //Added By Sadullah Nader //Initializations m_landingOverride.zero(); m_paraAttachBone.zero(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ExperienceTracker.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ExperienceTracker.cpp index 776a5b0e50..d589e30d33 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ExperienceTracker.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ExperienceTracker.cpp @@ -43,7 +43,7 @@ ExperienceTracker::ExperienceTracker(Object *parent) : m_currentLevel(LEVEL_REGULAR), m_experienceSink(INVALID_ID), m_experienceScalar( 1.0f ), - m_currentExperience(0) // Added By Sadullah Nader + m_currentExperience(0) { } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp index b5e8f177f3..0ac49ce212 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp @@ -39,7 +39,6 @@ GhostObjectManager *TheGhostObjectManager = NULL; //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- GhostObject::GhostObject(void): -//Added By Sadullah Nader //Initializations missing and needed m_parentAngle(0.0f), // TheSuperHackers @bugfix tomsons26 26/04/2025 Change initialization of m_parentGeometryIsSmall from 0.0f. diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp index ab92ee7307..00295615cf 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp @@ -672,7 +672,6 @@ Locomotor::Locomotor(const LocomotorTemplate* tmpl) //------------------------------------------------------------------------------------------------- Locomotor::Locomotor(const Locomotor& that) { - //Added By Sadullah Nader //Initializations m_angleOffset = 0.0f; m_maintainPos.zero(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp index df4f4c66a2..b28e8387ea 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp @@ -231,7 +231,6 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu Int i, modIdx; AsciiString modName; - //Added By Sadullah Nader //Initializations inserted m_formationOffset.x = m_formationOffset.y = 0.0f; m_iPos.zero(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp index ff6c741778..5d05bb77ca 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp @@ -764,9 +764,9 @@ class GenericObjectCreationNugget : public ObjectCreationNugget m_fadeIn(false), m_fadeOut(false), m_fadeFrames(0), - m_fadeSoundName(AsciiString::TheEmptyString), // Added By Sadullah Nader - m_particleSysName(AsciiString::TheEmptyString), // Added By Sadullah Nader - m_putInContainer(AsciiString::TheEmptyString), // Added By Sadullah Nader + m_fadeSoundName(AsciiString::TheEmptyString), + m_particleSysName(AsciiString::TheEmptyString), + m_putInContainer(AsciiString::TheEmptyString), m_minMag(0.0f), m_maxMag(0.0f), m_minPitch(0.0f), @@ -776,7 +776,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget m_shadowType(SHADOW_NONE), m_fxFinal(NULL), m_preserveLayer(true), - m_objectCount(0) // Added By Sadullah Nader + m_objectCount(0) { // Change Made by Sadullah Nader // for init purposes, easier to read diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp index 30b710aade..af1a49ffcc 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp @@ -1226,7 +1226,6 @@ void CellAndObjectIntersection::removeAllCoverage() //----------------------------------------------------------------------------- PartitionCell::PartitionCell() { - //Added By Sadullah Nader //Initializations inserted m_cellX = m_cellY = 0; // diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp index ed8a8937a7..ea63bc9a0b 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp @@ -120,7 +120,6 @@ DeliverPayloadAIUpdate::DeliverPayloadAIUpdate( Thing *thing, const ModuleData* m_freeToExit = FALSE; m_acceptingCommands = TRUE; - // Added By Sadullah Nader // Initialization missing and needed m_diveState = DIVESTATE_PREDIVE; 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 ea9d64c9a2..65307b94df 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp @@ -384,7 +384,6 @@ class DozerActionDoActionState : public State DozerActionDoActionState( StateMachine *machine, DozerTask task ) : State( machine, "DozerActionDoActionState" ) { m_task = task; - //Added By Sadullah Nader // Initializations missing and needed m_enterFrame = 0; } 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 cac797bc77..087fc34ad9 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp @@ -1857,7 +1857,6 @@ JetAIUpdate::JetAIUpdate( Thing *thing, const ModuleData* moduleData ) : AIUpdat m_lockonDrawable = NULL; m_landingPosForHelipadStuff.zero(); - //Added By Sadullah Nader //Initializations missing and needed m_producerLocation.zero(); // 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 a3bdd0628a..abf6257c7b 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp @@ -89,7 +89,6 @@ WorkerAIUpdate::WorkerAIUpdate( Thing *thing, const ModuleData* moduleData ) : // implementation because at this point we don't have the object all setup // - //Added By Sadullah Nader //Initialization(s) inserted m_isRebuild = FALSE; // diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BoneFXUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BoneFXUpdate.cpp index e6c315e6e2..d2bd3ef3d1 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BoneFXUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BoneFXUpdate.cpp @@ -91,7 +91,6 @@ BoneFXUpdate::BoneFXUpdate( Thing *thing, const ModuleData* moduleData ) : Updat m_particleSystemIDs.clear(); m_active = FALSE; - //Added By Sadullah Nader m_curBodyState = BODY_PRISTINE; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp index f7bdf06e20..c5c2d8853c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp @@ -61,7 +61,6 @@ //------------------------------------------------------------------------------------------------- HelicopterSlowDeathBehaviorModuleData::HelicopterSlowDeathBehaviorModuleData( void ) { - //Added By Sadullah Nader //Initializations missing and needed m_attachParticleBone.clear(); m_bladeBone.clear(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp index 8198bf0039..322c3ad641 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp @@ -157,7 +157,6 @@ HordeUpdate::HordeUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateM m_inHorde = FALSE; m_hasFlag = FALSE; m_lastHordeRefreshFrame = TheGameLogic->getFrame(); - // Added By Sadullah Nader // Initializations missing and needed m_trueHordeMember = FALSE; // diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp index a4e85305f7..8ea2208359 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp @@ -85,7 +85,6 @@ LaserRadiusUpdate::LaserRadiusUpdate() //------------------------------------------------------------------------------------------------- LaserUpdate::LaserUpdate( Thing *thing, const ModuleData* moduleData ) : ClientUpdateModule( thing, moduleData ) { - //Added By Sadullah Nader //Initialization missing and needed m_dirty = FALSE; m_endPos.zero(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp index 976dbaab38..e783330ff9 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp @@ -42,7 +42,6 @@ LifetimeUpdate::LifetimeUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData ) { const LifetimeUpdateModuleData* d = getLifetimeUpdateModuleData(); - // Added By Sadullah Nader // Initializations needed m_dieFrame = 0; // diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp index 8166c4b44d..4a1efbef7f 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp @@ -46,7 +46,6 @@ DefaultProductionExitUpdate::DefaultProductionExitUpdate( Thing *thing, const Mo { // no rally point has been set m_rallyPointExists = false; - // Added By Sadullah Nader // Initialization missing and needed m_rallyPoint.zero(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp index 68ef05211f..248e74ef3c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp @@ -46,7 +46,6 @@ QueueProductionExitUpdate::QueueProductionExitUpdate( Thing *thing, const Module { m_currentDelay = 0; - //Added By Sadullah Nader //Initializations inserted m_creationClearDistance = 0; m_rallyPoint.zero(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp index 38e5080916..a7f9621607 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp @@ -158,7 +158,6 @@ ProductionEntry::ProductionEntry( void ) m_framesUnderConstruction = 0; m_next = NULL; m_prev = NULL; - //Added By Sadullah Nader //Initializations inserted m_productionQuantityProduced = 0; m_productionQuantityTotal = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp index d0e5403716..861dd1ef4f 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp @@ -69,7 +69,6 @@ //------------------------------------------------------------------------------------------------- SpecialAbilityUpdate::SpecialAbilityUpdate( Thing *thing, const ModuleData* moduleData ) : SpecialPowerUpdateModule( thing, moduleData ) { - //Added By Sadullah Nader //Initialization(s) inserted m_captureFlashPhase = 0.0f; // diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp index 1f3af121ea..48ec0d4637 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp @@ -64,7 +64,6 @@ StealthUpdateModuleData::StealthUpdateModuleData() { - //Added By Sadullah Nader //Initialization(s) inserted m_disguiseFX = NULL; m_disguiseRevealFX = NULL; @@ -133,7 +132,6 @@ StealthUpdate::StealthUpdate( Thing *thing, const ModuleData* moduleData ) : Upd //Must be enabled manually if using disguise system (bomb truck uses) m_enabled = !data->m_teamDisguised; - //Added By Sadullah Nader //Initialization(s) inserted m_detectionExpiresFrame = 0; // diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp index 25e3803878..ba7b4c5caa 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp @@ -56,7 +56,6 @@ StickyBombUpdate::StickyBombUpdate( Thing *thing, const ModuleData *moduleData ) { m_targetID = INVALID_ID; m_dieFrame = 0; - //Added By Sadullah Nader //Initialization(s) inserted m_nextPingFrame = 0; // diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp index 7ac2a0dab1..c55dd463bc 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp @@ -68,7 +68,6 @@ StructureCollapseUpdate::StructureCollapseUpdate( Thing *thing, const ModuleData m_collapseFrame = 0; m_collapseState = COLLAPSESTATE_STANDING; m_collapseVelocity = 0.0f; - //Added By Sadullah Nader //Initialization(s) inserted m_burstFrame = 0; m_currentHeight = 0.0f; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp index dd25b7ecee..59603b58a2 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp @@ -56,7 +56,6 @@ const Int MAX_IDX = 32; StructureToppleUpdate::StructureToppleUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData ) { - //Added By Sadullah Nader //Initialization(s) inserted m_delayBurstLocation.zero(); m_structuralIntegrity = 0.0f; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp index 950734fc4b..73ae0e3698 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp @@ -104,7 +104,6 @@ void ToppleUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) //------------------------------------------------------------------------------------------------- ToppleUpdate::ToppleUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData ) { - //Added By Sadullah Nader //Initialization(s) inserted m_angleDeltaX = 0.0f; m_doBounceFX = FALSE; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp index 4a83ab7504..d6eb788e64 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp @@ -58,7 +58,6 @@ // ------------------------------------------------------------------------------------------------ WaveGuideUpdateModuleData::WaveGuideUpdateModuleData( void ) { - //Added By Sadullah Nader //Initialization(s) inserted m_bridgeParticleAngleFudge = 0.0f; m_randomSplashSoundFrequency = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp index 0f18c6f7b6..f814df0578 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp @@ -445,7 +445,6 @@ m_skirmishHumanPlayer(NULL), m_fade(FADE_NONE), m_freezeByScript(FALSE), m_frameObjectCountChanged(0), -//Added By Sadullah Nader //Initializations inserted m_closeWindowTimer(0), m_curFadeFrame(0), diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp index b768794a4b..7ee2276e18 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp @@ -635,7 +635,6 @@ m_firstScript(NULL), m_hasWarnings(false), m_isGroupActive(true), m_isGroupSubroutine(false), -//Added By Sadullah Nader //Initializations inserted m_nextGroup(NULL) // @@ -914,7 +913,6 @@ m_hasWarnings(false), m_nextScript(NULL), m_condition(NULL), m_action(NULL), -//Added By Sadullah Nader //Initializations inserted m_actionFalse(NULL), m_curTime(0.0f) @@ -2247,7 +2245,6 @@ ScriptAction::ScriptAction(): m_actionType(NO_OP), m_hasWarnings(false), m_numParms(0), -//Added By Sadullah Nader //Initializations inserted m_nextAction(NULL) // diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp index 1275f07557..e08b908958 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp @@ -218,7 +218,6 @@ void setFPMode( void ) // ------------------------------------------------------------------------------------------------ GameLogic::GameLogic( void ) { - //Added By Sadullah Nader //Initializations missing and necessary m_background = NULL; m_CRC = 0; @@ -2396,7 +2395,6 @@ void GameLogic::startNewGame( Bool loadingSaveGame ) } } - //Added By Sadullah Nader //Added to fix the quit menu //ReAllows quit menu to work during loading scene //setGameLoading(FALSE); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp index 8b18e615d1..c8d429225a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp @@ -306,7 +306,6 @@ void GameLogic::clearGameData( Bool showScoreScreen ) // ------------------------------------------------------------------------------------------------ void GameLogic::prepareNewGame( GameMode gameMode, GameDifficulty diff, Int rankPoints ) { - //Added By Sadullah Nader //Fix for loading game scene //Kris: Commented this out, but leaving it around incase it bites us later. I cleaned up the From b6f858c5c8b4837fdc6e9ec1045cd0fa3d273574 Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Sat, 15 Nov 2025 02:22:47 -0500 Subject: [PATCH 2/5] nit: clean up more Sadullah Nader comments --- Core/GameEngine/Source/Common/Audio/GameAudio.cpp | 1 - Core/GameEngine/Source/Common/System/RAMFile.cpp | 2 -- Core/GameEngine/Source/Common/System/XferCRC.cpp | 2 -- .../Source/GameNetwork/DisconnectManager.cpp | 1 - .../GameEngine/Source/GameNetwork/DownloadManager.cpp | 1 - Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp | 2 -- Core/GameEngine/Source/GameNetwork/FrameData.cpp | 2 -- Core/GameEngine/Source/GameNetwork/FrameMetrics.cpp | 1 - Core/GameEngine/Source/GameNetwork/GameInfo.cpp | 1 - .../Source/GameNetwork/GameSpy/PeerDefs.cpp | 1 - .../GameNetwork/GameSpy/StagingRoomGameInfo.cpp | 1 - .../Source/GameNetwork/GameSpy/Thread/PeerThread.cpp | 7 ------- Core/GameEngine/Source/GameNetwork/LANGameInfo.cpp | 2 -- Core/GameEngine/Source/GameNetwork/NAT.cpp | 1 - Core/GameEngine/Source/GameNetwork/NetCommandMsg.cpp | 6 ------ .../Source/GameNetwork/NetCommandWrapperList.cpp | 2 -- Core/GameEngine/Source/GameNetwork/Network.cpp | 1 - Generals/Code/GameEngine/Include/Common/Geometry.h | 3 --- Generals/Code/GameEngine/Include/Common/INI.h | 2 -- .../Code/GameEngine/Include/GameClient/ControlBar.h | 1 - Generals/Code/GameEngine/Include/GameClient/View.h | 2 -- Generals/Code/GameEngine/Include/GameLogic/AIGuard.h | 1 - Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h | 2 -- .../Include/GameLogic/Module/CreateCrateDie.h | 1 - .../Include/GameLogic/Module/DeliverPayloadAIUpdate.h | 2 -- .../Include/GameLogic/Module/HackInternetAIUpdate.h | 4 ---- .../Include/GameLogic/Module/ObjectDefectionHelper.h | 1 - .../Include/GameLogic/Module/SpawnBehavior.h | 2 -- .../Include/GameLogic/Module/StealthUpdate.h | 2 -- .../GameLogic/Module/StructureCollapseUpdate.h | 1 - .../GameEngine/Include/GameLogic/PartitionManager.h | 2 -- .../Source/Common/Bezier/BezFwdIterator.cpp | 2 -- Generals/Code/GameEngine/Source/Common/GlobalData.cpp | 5 ----- .../GameEngine/Source/Common/MultiplayerSettings.cpp | 3 --- .../Code/GameEngine/Source/Common/PartitionSolver.cpp | 2 -- Generals/Code/GameEngine/Source/Common/PerfTimer.cpp | 2 -- Generals/Code/GameEngine/Source/Common/RTS/Player.cpp | 2 -- .../Source/Common/RTS/ProductionPrerequisite.cpp | 1 - .../Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp | 2 -- Generals/Code/GameEngine/Source/Common/RTS/Team.cpp | 2 -- Generals/Code/GameEngine/Source/Common/Recorder.cpp | 1 - .../Code/GameEngine/Source/Common/StatsCollector.cpp | 1 - .../GameEngine/Source/Common/System/DataChunk.cpp | 2 -- .../Code/GameEngine/Source/Common/System/Upgrade.cpp | 2 -- .../Code/GameEngine/Source/GameClient/Display.cpp | 2 -- .../Code/GameEngine/Source/GameClient/Drawable.cpp | 4 ---- .../Source/GameClient/GUI/ControlBar/ControlBar.cpp | 1 - .../GameClient/GUI/ControlBar/ControlBarScheme.cpp | 3 --- .../GUI/GUICallbacks/Menus/PopupSaveLoad.cpp | 1 - .../GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp | 1 - .../Source/GameClient/GUI/HeaderTemplate.cpp | 1 - .../GameEngine/Source/GameClient/GUI/IMEManager.cpp | 1 - .../GameEngine/Source/GameClient/GUI/LoadScreen.cpp | 11 ----------- .../GameEngine/Source/GameClient/GUI/Shell/Shell.cpp | 2 -- .../Code/GameEngine/Source/GameClient/GameClient.cpp | 2 -- .../Code/GameEngine/Source/GameClient/GameText.cpp | 1 - .../GameEngine/Source/GameClient/GlobalLanguage.cpp | 1 - .../Code/GameEngine/Source/GameClient/InGameUI.cpp | 2 -- .../Code/GameEngine/Source/GameClient/Input/Mouse.cpp | 3 --- .../Source/GameClient/MessageStream/HotKey.cpp | 2 -- .../Source/GameClient/MessageStream/LookAtXlat.cpp | 1 - .../Source/GameClient/MessageStream/SelectionXlat.cpp | 2 -- .../GameEngine/Source/GameClient/SelectionInfo.cpp | 2 -- .../GameEngine/Source/GameClient/System/Anim2D.cpp | 1 - .../Source/GameClient/System/ParticleSys.cpp | 8 -------- Generals/Code/GameEngine/Source/GameClient/View.cpp | 1 - Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp | 1 - .../GameEngine/Source/GameLogic/AI/AIPathfind.cpp | 1 - .../Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp | 4 ---- .../Source/GameLogic/Map/PolygonTrigger.cpp | 2 -- .../GameEngine/Source/GameLogic/Map/SidesList.cpp | 1 - .../GameEngine/Source/GameLogic/Map/TerrainLogic.cpp | 2 -- .../Object/Behavior/ParkingPlaceBehavior.cpp | 1 - .../Object/Behavior/PropagandaTowerBehavior.cpp | 2 -- .../GameLogic/Object/Behavior/SpawnBehavior.cpp | 2 -- .../Object/Collide/CrateCollide/CrateCollide.cpp | 1 - .../Source/GameLogic/Object/Contain/OpenContain.cpp | 2 -- .../GameLogic/Object/Contain/ParachuteContain.cpp | 1 - .../Source/GameLogic/Object/GhostObject.cpp | 1 - .../GameEngine/Source/GameLogic/Object/Locomotor.cpp | 1 - .../GameEngine/Source/GameLogic/Object/Object.cpp | 2 -- .../Source/GameLogic/Object/ObjectCreationList.cpp | 3 --- .../Source/GameLogic/Object/PartitionManager.cpp | 2 -- .../Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp | 1 - .../Object/Update/AIUpdate/DozerAIUpdate.cpp | 1 - .../GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp | 2 -- .../Object/Update/AIUpdate/WorkerAIUpdate.cpp | 3 --- .../GameLogic/Object/Update/BattlePlanUpdate.cpp | 1 - .../GameLogic/Object/Update/FlammableUpdate.cpp | 3 --- .../Object/Update/HelicopterSlowDeathUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/HordeUpdate.cpp | 2 -- .../Source/GameLogic/Object/Update/LaserUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/LifetimeUpdate.cpp | 2 -- .../Object/Update/ParticleUplinkCannonUpdate.cpp | 3 --- .../DefaultProductionExitUpdate.cpp | 1 - .../QueueProductionExitUpdate.cpp | 2 -- .../GameLogic/Object/Update/ProductionUpdate.cpp | 2 -- .../GameLogic/Object/Update/SpecialAbilityUpdate.cpp | 2 -- .../Source/GameLogic/Object/Update/StealthUpdate.cpp | 2 -- .../GameLogic/Object/Update/StickyBombUpdate.cpp | 2 -- .../Object/Update/StructureCollapseUpdate.cpp | 2 -- .../GameLogic/Object/Update/StructureToppleUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/ToppleUpdate.cpp | 1 - .../GameLogic/Object/Update/WaveGuideUpdate.cpp | 1 - .../Source/GameLogic/ScriptEngine/ScriptEngine.cpp | 1 - .../Source/GameLogic/ScriptEngine/Scripts.cpp | 6 ------ .../GameEngine/Source/GameLogic/System/GameLogic.cpp | 4 ---- GeneralsMD/Code/GameEngine/Include/Common/Geometry.h | 3 --- GeneralsMD/Code/GameEngine/Include/Common/INI.h | 2 -- .../Code/GameEngine/Include/GameClient/ControlBar.h | 1 - GeneralsMD/Code/GameEngine/Include/GameClient/View.h | 2 -- .../Code/GameEngine/Include/GameLogic/AIGuard.h | 1 - .../GameEngine/Include/GameLogic/AIGuardRetaliate.h | 1 - .../Code/GameEngine/Include/GameLogic/AIPlayer.h | 2 -- .../Include/GameLogic/Module/CreateCrateDie.h | 1 - .../Include/GameLogic/Module/DeliverPayloadAIUpdate.h | 2 -- .../Include/GameLogic/Module/HackInternetAIUpdate.h | 4 ---- .../Include/GameLogic/Module/ObjectDefectionHelper.h | 1 - .../Include/GameLogic/Module/SpawnBehavior.h | 2 -- .../GameLogic/Module/StructureCollapseUpdate.h | 1 - .../GameEngine/Include/GameLogic/PartitionManager.h | 2 -- .../Source/Common/Bezier/BezFwdIterator.cpp | 2 -- .../Code/GameEngine/Source/Common/GlobalData.cpp | 5 ----- .../Code/GameEngine/Source/Common/PartitionSolver.cpp | 2 -- .../Code/GameEngine/Source/Common/PerfTimer.cpp | 2 -- .../Code/GameEngine/Source/Common/RTS/Player.cpp | 2 -- .../Source/Common/RTS/ProductionPrerequisite.cpp | 1 - .../Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp | 2 -- GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp | 2 -- GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp | 1 - .../Code/GameEngine/Source/Common/StatsCollector.cpp | 1 - .../GameEngine/Source/Common/System/DataChunk.cpp | 2 -- .../Code/GameEngine/Source/Common/System/Upgrade.cpp | 2 -- .../Code/GameEngine/Source/GameClient/Display.cpp | 2 -- .../Code/GameEngine/Source/GameClient/Drawable.cpp | 4 ---- .../Source/GameClient/GUI/ControlBar/ControlBar.cpp | 1 - .../GameClient/GUI/ControlBar/ControlBarScheme.cpp | 3 --- .../GUI/GUICallbacks/Menus/PopupSaveLoad.cpp | 1 - .../GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp | 1 - .../Source/GameClient/GUI/HeaderTemplate.cpp | 1 - .../GameEngine/Source/GameClient/GUI/IMEManager.cpp | 1 - .../GameEngine/Source/GameClient/GUI/LoadScreen.cpp | 11 ----------- .../GameEngine/Source/GameClient/GUI/Shell/Shell.cpp | 2 -- .../Code/GameEngine/Source/GameClient/GameClient.cpp | 2 -- .../Code/GameEngine/Source/GameClient/GameText.cpp | 1 - .../GameEngine/Source/GameClient/GlobalLanguage.cpp | 1 - .../Code/GameEngine/Source/GameClient/InGameUI.cpp | 2 -- .../Code/GameEngine/Source/GameClient/Input/Mouse.cpp | 3 --- .../Source/GameClient/MessageStream/HotKey.cpp | 2 -- .../Source/GameClient/MessageStream/LookAtXlat.cpp | 1 - .../Source/GameClient/MessageStream/SelectionXlat.cpp | 2 -- .../GameEngine/Source/GameClient/System/Anim2D.cpp | 1 - .../Source/GameClient/System/ParticleSys.cpp | 8 -------- GeneralsMD/Code/GameEngine/Source/GameClient/View.cpp | 1 - GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp | 1 - .../GameEngine/Source/GameLogic/AI/AIPathfind.cpp | 1 - .../Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp | 4 ---- .../Source/GameLogic/Map/PolygonTrigger.cpp | 2 -- .../GameEngine/Source/GameLogic/Map/SidesList.cpp | 1 - .../GameEngine/Source/GameLogic/Map/TerrainLogic.cpp | 2 -- .../Object/Behavior/ParkingPlaceBehavior.cpp | 1 - .../Object/Behavior/PropagandaTowerBehavior.cpp | 2 -- .../GameLogic/Object/Behavior/SpawnBehavior.cpp | 2 -- .../Object/Collide/CrateCollide/CrateCollide.cpp | 1 - .../Source/GameLogic/Object/Contain/OpenContain.cpp | 2 -- .../GameLogic/Object/Contain/ParachuteContain.cpp | 1 - .../Source/GameLogic/Object/GhostObject.cpp | 1 - .../GameEngine/Source/GameLogic/Object/Locomotor.cpp | 1 - .../GameEngine/Source/GameLogic/Object/Object.cpp | 2 -- .../Source/GameLogic/Object/ObjectCreationList.cpp | 3 --- .../Source/GameLogic/Object/PartitionManager.cpp | 2 -- .../Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp | 1 - .../Object/Update/AIUpdate/DozerAIUpdate.cpp | 1 - .../GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp | 2 -- .../Object/Update/AIUpdate/WorkerAIUpdate.cpp | 3 --- .../GameLogic/Object/Update/BattlePlanUpdate.cpp | 1 - .../GameLogic/Object/Update/FlammableUpdate.cpp | 3 --- .../Object/Update/HelicopterSlowDeathUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/HordeUpdate.cpp | 2 -- .../Source/GameLogic/Object/Update/LaserUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/LifetimeUpdate.cpp | 2 -- .../Object/Update/ParticleUplinkCannonUpdate.cpp | 3 --- .../DefaultProductionExitUpdate.cpp | 1 - .../QueueProductionExitUpdate.cpp | 2 -- .../GameLogic/Object/Update/ProductionUpdate.cpp | 2 -- .../GameLogic/Object/Update/SpecialAbilityUpdate.cpp | 2 -- .../Source/GameLogic/Object/Update/StealthUpdate.cpp | 4 ---- .../GameLogic/Object/Update/StickyBombUpdate.cpp | 2 -- .../Object/Update/StructureCollapseUpdate.cpp | 2 -- .../GameLogic/Object/Update/StructureToppleUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/ToppleUpdate.cpp | 1 - .../GameLogic/Object/Update/WaveGuideUpdate.cpp | 1 - .../Source/GameLogic/ScriptEngine/ScriptEngine.cpp | 1 - .../Source/GameLogic/ScriptEngine/Scripts.cpp | 6 ------ .../GameEngine/Source/GameLogic/System/GameLogic.cpp | 5 ----- 195 files changed, 395 deletions(-) diff --git a/Core/GameEngine/Source/Common/Audio/GameAudio.cpp b/Core/GameEngine/Source/Common/Audio/GameAudio.cpp index 99d2a649c9..32a684560d 100644 --- a/Core/GameEngine/Source/Common/Audio/GameAudio.cpp +++ b/Core/GameEngine/Source/Common/Audio/GameAudio.cpp @@ -152,7 +152,6 @@ AudioManager::AudioManager() : m_hardwareAccel(FALSE), m_musicPlayingFromCD(FALSE) { - // Added by Sadullah Nader m_adjustedVolumes.clear(); m_audioRequests.clear(); m_listenerPosition.zero(); diff --git a/Core/GameEngine/Source/Common/System/RAMFile.cpp b/Core/GameEngine/Source/Common/System/RAMFile.cpp index f317392cc9..93d5994b45 100644 --- a/Core/GameEngine/Source/Common/System/RAMFile.cpp +++ b/Core/GameEngine/Source/Common/System/RAMFile.cpp @@ -104,9 +104,7 @@ RAMFile::RAMFile() : m_size(0), m_data(NULL), -//Initializtion(s) inserted m_pos(0) -// { } diff --git a/Core/GameEngine/Source/Common/System/XferCRC.cpp b/Core/GameEngine/Source/Common/System/XferCRC.cpp index 0cf9d77ff6..520cd2cc4f 100644 --- a/Core/GameEngine/Source/Common/System/XferCRC.cpp +++ b/Core/GameEngine/Source/Common/System/XferCRC.cpp @@ -42,9 +42,7 @@ XferCRC::XferCRC( void ) { m_xferMode = XFER_CRC; - //Initialization(s) inserted m_crc = 0; - // } //------------------------------------------------------------------------------------------------- diff --git a/Core/GameEngine/Source/GameNetwork/DisconnectManager.cpp b/Core/GameEngine/Source/GameNetwork/DisconnectManager.cpp index 418ff5a365..8bed24c8bc 100644 --- a/Core/GameEngine/Source/GameNetwork/DisconnectManager.cpp +++ b/Core/GameEngine/Source/GameNetwork/DisconnectManager.cpp @@ -38,7 +38,6 @@ DisconnectManager::DisconnectManager() { - // Initializations missing and needed Int i; m_currentPacketRouterIndex = 0; m_lastFrame = 0; diff --git a/Core/GameEngine/Source/GameNetwork/DownloadManager.cpp b/Core/GameEngine/Source/GameNetwork/DownloadManager.cpp index 0c51726824..3b8bf2aea7 100644 --- a/Core/GameEngine/Source/GameNetwork/DownloadManager.cpp +++ b/Core/GameEngine/Source/GameNetwork/DownloadManager.cpp @@ -38,7 +38,6 @@ DownloadManager::DownloadManager() m_download = NEW CDownload(this); m_wasError = m_sawEnd = false; - //Initializations missing and needed m_queuedDownloads.clear(); diff --git a/Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp b/Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp index d8ffb64f34..504deb14c6 100644 --- a/Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp +++ b/Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp @@ -83,8 +83,6 @@ FirewallHelperClass * createFirewallHelper() FirewallHelperClass::FirewallHelperClass(void) { - //Added Sadullah Nader - //Initializations missing and needed m_currentTry = 0; m_numManglers = 0; m_numResponses = 0; diff --git a/Core/GameEngine/Source/GameNetwork/FrameData.cpp b/Core/GameEngine/Source/GameNetwork/FrameData.cpp index f26dfa60af..da5fef6e76 100644 --- a/Core/GameEngine/Source/GameNetwork/FrameData.cpp +++ b/Core/GameEngine/Source/GameNetwork/FrameData.cpp @@ -37,10 +37,8 @@ FrameData::FrameData() m_commandList = NULL; m_commandCount = 0; m_frameCommandCount = -1; - //Initializations missing and needed m_lastFailedCC = 0; m_lastFailedFrameCC = 0; - // } /** diff --git a/Core/GameEngine/Source/GameNetwork/FrameMetrics.cpp b/Core/GameEngine/Source/GameNetwork/FrameMetrics.cpp index 194d2e4b22..324bdebb97 100644 --- a/Core/GameEngine/Source/GameNetwork/FrameMetrics.cpp +++ b/Core/GameEngine/Source/GameNetwork/FrameMetrics.cpp @@ -32,7 +32,6 @@ FrameMetrics::FrameMetrics() { - //Initializations missing and needed m_averageFps = 0.0f; m_averageLatency = 0.0f; m_cushionIndex = 0; diff --git a/Core/GameEngine/Source/GameNetwork/GameInfo.cpp b/Core/GameEngine/Source/GameNetwork/GameInfo.cpp index 94758d4e7a..fce239a698 100644 --- a/Core/GameEngine/Source/GameNetwork/GameInfo.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameInfo.cpp @@ -307,7 +307,6 @@ void GameInfo::reset( void ) m_useStats = TRUE; m_surrendered = FALSE; m_oldFactionsOnly = FALSE; - // Initializations missing and needed // m_localIP = 0; // BGC - actually we don't want this to be reset since the m_localIP is // set properly in the constructor of LANGameInfo which uses this as a base class. m_mapCRC = 0; diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp index 23c7991d91..7802f89ae8 100644 --- a/Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp @@ -89,7 +89,6 @@ void GameSpyInfo::reset( void ) m_localProfileID = 0; m_maxMessagesPerUpdate = 100; - // Initialization missing and needed m_disallowAsainText = FALSE; m_disallowNonAsianText = FALSE; m_disconReason = 0; diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp index 8cb1858b08..dc0aea8b3f 100644 --- a/Core/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp @@ -62,7 +62,6 @@ GameSpyGameSlot::GameSpyGameSlot() m_rankPoints = 0; m_favoriteSide = 0; m_pingInt = 0; - // Initializations missing and needed m_profileID = 0; m_pingStr.clear(); } diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp index ff053eac98..9f7f0715b9 100644 --- a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp @@ -179,7 +179,6 @@ class PeerThreadClass : public ThreadClass public: PeerThreadClass() : ThreadClass() { - //Initializations inserted m_roomJoined = m_allowObservers = m_hasPassword = FALSE; m_useStats = TRUE; m_exeCRC = m_iniCRC = 0; @@ -192,7 +191,6 @@ class PeerThreadClass : public ThreadClass m_qmGroupRoom = 0; m_sawEndOfEnumPlayers = m_sawMatchbot = FALSE; m_sawCompleteGameList = FALSE; - // m_isConnecting = m_isConnected = false; m_groupRoomID = m_profileID = 0; m_nextStagingServer = 1; m_stagingServers.clear(); @@ -200,16 +198,11 @@ class PeerThreadClass : public ThreadClass for (Int i=0; igetNumChunks(); m_chunksPresent = NEW Bool[m_numChunks]; // pool[]ify diff --git a/Core/GameEngine/Source/GameNetwork/Network.cpp b/Core/GameEngine/Source/GameNetwork/Network.cpp index f1c5e89b5f..306b4e8cb9 100644 --- a/Core/GameEngine/Source/GameNetwork/Network.cpp +++ b/Core/GameEngine/Source/GameNetwork/Network.cpp @@ -265,7 +265,6 @@ NetworkInterface *NetworkInterface::createNetwork() */ Network::Network() { - //Initializations inserted m_checkCRCsThisFrame = FALSE; m_didSelfSlug = FALSE; m_frameDataReady = FALSE; diff --git a/Generals/Code/GameEngine/Include/Common/Geometry.h b/Generals/Code/GameEngine/Include/Common/Geometry.h index 9501c2c9d4..d56b75ae65 100644 --- a/Generals/Code/GameEngine/Include/Common/Geometry.h +++ b/Generals/Code/GameEngine/Include/Common/Geometry.h @@ -111,11 +111,8 @@ class GeometryInfo : public Snapshot GeometryInfo(GeometryType type, Bool isSmall, Real height, Real majorRadius, Real minorRadius) { - // Added by Sadullah Nader - // Initializations missing and needed m_boundingCircleRadius = 0.0f; m_boundingSphereRadius = 0.0f; - // set(type, isSmall, height, majorRadius, minorRadius); } diff --git a/Generals/Code/GameEngine/Include/Common/INI.h b/Generals/Code/GameEngine/Include/Common/INI.h index ec77d59b2e..9dcd0352b5 100644 --- a/Generals/Code/GameEngine/Include/Common/INI.h +++ b/Generals/Code/GameEngine/Include/Common/INI.h @@ -138,10 +138,8 @@ class MultiIniFieldParse public: MultiIniFieldParse() : m_count(0) { - //Initializations missing and needed for(Int i = 0; i < MAX_MULTI_FIELDS; i++) m_extraOffset[i] = 0; - // } diff --git a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h index 0dba5d0291..0594062809 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h +++ b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h @@ -434,7 +434,6 @@ class SideSelectWindowData public: SideSelectWindowData(void) { - //Initializations generalSpeak = NULL; m_currColor = 0; m_gereralsNameWin = NULL; diff --git a/Generals/Code/GameEngine/Include/GameClient/View.h b/Generals/Code/GameEngine/Include/GameClient/View.h index 8d40b91fe2..38f7ece95b 100644 --- a/Generals/Code/GameEngine/Include/GameClient/View.h +++ b/Generals/Code/GameEngine/Include/GameClient/View.h @@ -307,10 +307,8 @@ class ViewLocation ViewLocation() { m_valid = FALSE; - //Initialization(s) inserted m_pos.zero(); m_angle = m_pitch = m_zoom = 0.0; - // } const Coord3D& getPosition() const { return m_pos; } diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h b/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h index 0b9b43678f..9672c5668f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h @@ -78,7 +78,6 @@ class ExitConditions : public AttackExitConditionsInterface ExitConditions() : m_attackGiveUpFrame(0), m_conditionsToConsider(0), m_radiusSqr(0.0f) { - // Initializations missing and needed m_center.zero(); } diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h b/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h index d748dfc030..1e42be0603 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h @@ -113,10 +113,8 @@ class TeamInQueue : public MemoryPoolObject, m_reinforcement(false), m_stopQueueing(false), m_reinforcementID(INVALID_ID), - //Initialization(s) inserted m_frameStarted(0), m_priorityBuild(FALSE) - // { } diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h index b4b21a4eaa..4cbc1f77b1 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h @@ -46,7 +46,6 @@ class CreateCrateDieModuleData : public DieModuleData CreateCrateDieModuleData() { - // Initializations missing and needed m_crateNameList.clear(); } ~CreateCrateDieModuleData() diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h index 92a88ac77d..3fe51f4e6e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h @@ -202,7 +202,6 @@ class DeliverPayloadAIUpdateModuleData : public AIUpdateModuleData m_dropOffset.zero(); m_dropVariance.zero(); m_deliveryDecalRadius = 0; - // Initialization missing and needed m_putInContainerName.clear(); // End Add @@ -292,7 +291,6 @@ class DeliverPayloadData m_visiblePayloadWeaponTemplate = NULL; m_selfDestructObject = FALSE; m_deliveryDecalRadius = 0; - // Initialization missing and needed m_visibleDropBoneName.clear(); m_visiblePayloadTemplateName.clear(); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h index 12a6c35d45..8599b393c5 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h @@ -46,9 +46,7 @@ class HackInternetState : public State public: HackInternetState( StateMachine *machine ) :State( machine, "HackInternetState" ) { - //Initializations missing and needed m_framesRemaining = 0; - // } virtual StateReturnType update(); virtual StateReturnType onEnter(); @@ -72,9 +70,7 @@ class PackingState : public State public: PackingState( StateMachine *machine ) : State( machine, "PackingState" ) { - //Initializations inserted m_framesRemaining = 0; - // } virtual StateReturnType update(); virtual StateReturnType onEnter(); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h index 3c667e145a..b2ff1d80b7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h @@ -61,7 +61,6 @@ class ObjectDefectionHelper : public ObjectHelper ObjectDefectionHelper( Thing *thing, const ModuleData *modData ) : ObjectHelper( thing, modData ) { - //Initializations inserted m_defectionDetectionEnd = 0; m_defectionDetectionFlashPhase = FALSE; m_defectionDetectionStart = 0; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h index 5df76f43f1..debea0cc3e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h @@ -64,9 +64,7 @@ class SpawnBehaviorModuleData : public BehaviorModuleData { m_spawnNumberData = 0; m_spawnReplaceDelayData = 0; - //Initialization(s) inserted m_spawnStartNumberData = 0; - // m_initialBurst = 0; m_isOneShotData = FALSE; m_canReclaimOrphans = FALSE; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h index 3e963bdaa7..649e36d359 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h @@ -85,10 +85,8 @@ class StealthUpdateModuleData : public UpdateModuleData StealthUpdateModuleData() { - //Initialization(s) inserted m_disguiseFX = NULL; m_disguiseRevealFX = NULL; - // m_stealthDelay = UINT_MAX; m_stealthLevel = 0; m_stealthSpeed = 0.0f; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h index 3c21400835..0da208f453 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h @@ -75,7 +75,6 @@ class StructureCollapseUpdateModuleData : public UpdateModuleData m_minCollapseDelay = 0; m_maxCollapseDelay = 0; m_minBurstDelay = 9999; - //Removed by Sadullah Nader //Redundancy from above //m_minBurstDelay = 9999; m_maxShudder = 0; diff --git a/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h b/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h index 5345713e05..4b26a65620 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h +++ b/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h @@ -1109,9 +1109,7 @@ class PartitionFilterGarrisonable : public PartitionFilter public: PartitionFilterGarrisonable( Bool match ) : m_match(match) { - //Initializations m_player = NULL; - // } protected: virtual Bool allow( Object *other ); diff --git a/Generals/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp b/Generals/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp index b7fdb96ab6..c5023f44b8 100644 --- a/Generals/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp +++ b/Generals/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp @@ -28,7 +28,6 @@ //------------------------------------------------------------------------------------------------- BezFwdIterator::BezFwdIterator(): mStep(0), mStepsDesired(0) { - // Added by Sadullah Nader mCurrPoint.zero(); mDDDq.zero(); mDDq.zero(); @@ -38,7 +37,6 @@ BezFwdIterator::BezFwdIterator(): mStep(0), mStepsDesired(0) //------------------------------------------------------------------------------------------------- BezFwdIterator::BezFwdIterator(Int stepsDesired, const BezierSegment *bezSeg) { - // Added by Sadullah Nader mCurrPoint.zero(); mDDDq.zero(); mDDq.zero(); diff --git a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp index 85cc3c0a72..ab00c4628a 100644 --- a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp +++ b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp @@ -574,13 +574,10 @@ GlobalData::GlobalData() m_debugVisibilityTileDuration = LOGICFRAMES_PER_SECOND; m_debugProjectilePath = FALSE; m_debugProjectileTileWidth = 10; - m_debugProjectileTileDuration = LOGICFRAMES_PER_SECOND; // Changed By Sadullah Nader m_debugThreatMap = FALSE; m_maxDebugThreat = 5000; - m_debugThreatMapTileDuration = LOGICFRAMES_PER_SECOND; // Changed By Sadullah Nader m_debugCashValueMap = FALSE; m_maxDebugValue = 10000; - m_debugCashValueMapTileDuration = LOGICFRAMES_PER_SECOND; // Changed By Sadullah Nader m_vTune = false; m_checkForLeaks = TRUE; m_benchmarkTimer = -1; @@ -684,7 +681,6 @@ GlobalData::GlobalData() m_vertexWaterAttenuationB[ i ] = 0.0f; m_vertexWaterAttenuationC[ i ] = 0.0f; m_vertexWaterAttenuationRange[ i ] = 0.0f; - //Initializations missing and needed m_vertexWaterAvailableMaps[i].clear(); } @@ -796,7 +792,6 @@ GlobalData::GlobalData() m_autoSmokeParticleLargeMax = 0; m_autoAflameParticleMax = 0; - // Initializations missing and needed m_autoFireParticleSmallPrefix.clear(); m_autoFireParticleMediumPrefix.clear(); m_autoFireParticleLargePrefix.clear(); diff --git a/Generals/Code/GameEngine/Source/Common/MultiplayerSettings.cpp b/Generals/Code/GameEngine/Source/Common/MultiplayerSettings.cpp index 9b410ab632..d63ee3c605 100644 --- a/Generals/Code/GameEngine/Source/Common/MultiplayerSettings.cpp +++ b/Generals/Code/GameEngine/Source/Common/MultiplayerSettings.cpp @@ -75,12 +75,9 @@ MultiplayerSettings::MultiplayerSettings() { m_initialCreditsMin = 5000; - //Fixed And Added Code By Sadullah Nader //DID U MEAN m_initialCreditsMax = 10000;? - //Initializations inserted m_initialCreditsMax = 10000; m_maxBeaconsPerPlayer = 3; - // m_startCountdownTimerSeconds = 0; m_numColors = 0; diff --git a/Generals/Code/GameEngine/Source/Common/PartitionSolver.cpp b/Generals/Code/GameEngine/Source/Common/PartitionSolver.cpp index 6089e061a2..f33969a3b7 100644 --- a/Generals/Code/GameEngine/Source/Common/PartitionSolver.cpp +++ b/Generals/Code/GameEngine/Source/Common/PartitionSolver.cpp @@ -63,9 +63,7 @@ PartitionSolver::PartitionSolver(const EntriesVec& elements, const SpacesVec& sp m_data = elements; m_spacesForData = spaces; m_howToSolve = solveHow; - //Initializations inserted m_currentSolutionLeftovers = 0; - // } void PartitionSolver::solve(void) diff --git a/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp b/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp index 86e47ca118..77a9da349d 100644 --- a/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp +++ b/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp @@ -232,9 +232,7 @@ PerfGather::PerfGather(const char *identifier) : m_next(0), m_prev(0) { - //Initializations inserted m_ignore = FALSE; - // DEBUG_ASSERTCRASH(strchr(m_identifier, ',') == NULL, ("PerfGather names must not contain commas")); addToList(); } diff --git a/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp index 0c098e793f..bf07e9ff03 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp @@ -321,8 +321,6 @@ Player::Player( Int playerIndex ) m_visionSpiedMask = PLAYERMASK_NONE; m_battlePlanBonuses = NULL; m_skillPointsModifier = 1.0f; - //Added By Sadullah - //Initializations inserted m_canBuildUnits = TRUE; m_canBuildBase = TRUE; m_cashBountyPercent = 0.0f; diff --git a/Generals/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp b/Generals/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp index 63a6b33e6c..0d51375428 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp @@ -235,7 +235,6 @@ UnicodeString ProductionPrerequisite::getRequiresList(const Player *player) cons Bool orRequirements[MAX_PREREQ]; //Added for fix below in getRequiresList - //By Sadullah Nader //Initializes the OR_WITH_PREV structures for (i = 0; i < MAX_PREREQ; i++) { diff --git a/Generals/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp b/Generals/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp index eb9fc779f2..0056c1f7e0 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp @@ -102,9 +102,7 @@ void ScoreKeeper::reset( Int playerIdx ) m_totalMoneyEarned = m_totalMoneySpent = 0; m_totalUnitsLost = m_totalUnitsBuilt = 0; m_totalBuildingsLost = m_totalBuildingsBuilt = 0; - //Initializtion(s) inserted m_totalFactionBuildingsCaptured = m_totalTechBuildingsCaptured = 0; - // m_currentScore = 0; m_objectsBuilt.clear(); m_objectsCaptured.clear(); diff --git a/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp index e702dcbee2..0b2121a25c 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp @@ -1316,10 +1316,8 @@ Team::Team(TeamPrototype *proto, TeamID id ) : m_curUnits(0), m_wasIdle(false) { - //Initialization(s) inserted m_created = FALSE; - // m_commonAttackTarget = INVALID_ID; // allocate new relation map pools diff --git a/Generals/Code/GameEngine/Source/Common/Recorder.cpp b/Generals/Code/GameEngine/Source/Common/Recorder.cpp index 07260082e2..ccbd982d35 100644 --- a/Generals/Code/GameEngine/Source/Common/Recorder.cpp +++ b/Generals/Code/GameEngine/Source/Common/Recorder.cpp @@ -368,7 +368,6 @@ RecorderClass::RecorderClass() m_file = NULL; m_fileName.clear(); m_currentFilePosition = 0; - //Initializtion(s) inserted m_doingAnalysis = FALSE; m_archiveReplays = FALSE; m_nextFrame = 0; diff --git a/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp b/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp index 063376e08f..a85215a673 100644 --- a/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp +++ b/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp @@ -76,7 +76,6 @@ static char statsDir[255] = "Stats\\"; //============================================================================= StatsCollector::StatsCollector( void ) { - //Initialization(s) inserted m_isScrolling = FALSE; m_scrollBeginTime = 0; m_scrollTime = 0; diff --git a/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp b/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp index 6a775a5e90..cab07499fd 100644 --- a/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp @@ -237,8 +237,6 @@ m_pOut(pOut) AsciiString tmpFileName = TheGlobalData->getPath_UserData(); tmpFileName.concat(TEMP_FILENAME); m_tmp_file = ::fopen( tmpFileName.str(), "wb" ); - // Added Sadullah Nader - // Initializations missing and needed m_chunkStack = NULL; // End Add diff --git a/Generals/Code/GameEngine/Source/Common/System/Upgrade.cpp b/Generals/Code/GameEngine/Source/Common/System/Upgrade.cpp index 7fda9515dc..f3cbb377fe 100644 --- a/Generals/Code/GameEngine/Source/Common/System/Upgrade.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/Upgrade.cpp @@ -131,9 +131,7 @@ const FieldParse UpgradeTemplate::m_upgradeFieldParseTable[] = //------------------------------------------------------------------------------------------------- UpgradeTemplate::UpgradeTemplate( void ) { - //Initialization(s) inserted m_cost = 0; - // m_type = UPGRADE_TYPE_PLAYER; m_nameKey = NAMEKEY_INVALID; m_buildTime = 0.0f; diff --git a/Generals/Code/GameEngine/Source/GameClient/Display.cpp b/Generals/Code/GameEngine/Source/GameClient/Display.cpp index 9d80db8ca1..0744dc6196 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Display.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/Display.cpp @@ -64,8 +64,6 @@ Display::Display() m_elapsedCopywriteTime = 0; m_copyrightDisplayString = NULL; - // Added by Sadullah Nader - // Initializations missing and needed m_currentlyPlayingMovie.clear(); m_letterBoxFadeStartTime = 0; // End Add diff --git a/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp b/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp index 0dc4fbb9fa..4dad10a258 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp @@ -316,10 +316,8 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatusBits statu // assign status bits before anything else can be done m_status = statusBits; - // Initialization missing and needed m_nextDrawable = NULL; m_prevDrawable = NULL; - // // register drawable with the GameClient ... do this first before we start doing anything // complex that uses any of the drawable data so that we have and ID!! It's ok to initialize @@ -329,10 +327,8 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatusBits statu Int i; - // Initialization missing and needed m_flashColor = 0; m_selected = '\0'; - // m_expirationDate = 0; // 0 == never expires diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index fa9b61868b..85ffc2f698 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -570,7 +570,6 @@ CommandButton::CommandButton( void ) m_flashCount = 0; - // Added by Sadullah Nader // The purpose is to initialize these variable to values that are zero or empty m_conflictingLabel.clear(); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp index 12abdc7e35..cc09ce47bc 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp @@ -188,8 +188,6 @@ ControlBarSchemeImage::~ControlBarSchemeImage( void ) ControlBarSchemeAnimation::ControlBarSchemeAnimation( void ) { - // Added by Sadullah Nader - // Initializations missing and needed m_animDuration = 0; m_finalPos.x = m_finalPos.y = 0; @@ -302,7 +300,6 @@ ControlBarScheme::ControlBarScheme(void) m_optionsButtonPushed = NULL; m_optionsButtonDisabled = NULL; - // Initializations needed m_commandBarBorderColor = 0; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp index de8ab623e6..94e4da5327 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp @@ -878,7 +878,6 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg, // do the load game if( controlID == buttonLoadConfirm ) { - //Moved by Sadullah Nader //moved to fix the // close save/load layout menu closeSaveMenu( window ); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp index 0d7ad64d63..b52d15b632 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp @@ -542,7 +542,6 @@ static void startPressed(void) ///////////////////////////////////////////////////// // MapSelectorTooltip - shows tooltips for the tech buildings // and supply depots -// Added By : Sadullah Nader ///////////////////////////////////////////////////// void MapSelectorTooltip(GameWindow *window, WinInstanceData *instData, diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp index c3509d6976..2f07686158 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp @@ -107,7 +107,6 @@ m_font(NULL), m_point(0), m_bold(FALSE) { - //Initializations missing and needed m_fontName.clear(); m_name.clear(); } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp index c22db3e5d3..f8aa0a85f5 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp @@ -506,7 +506,6 @@ IMEManager::IMEManager() m_result(0), m_indexBase(1), - //Initializations missing and needed m_compositionCharsDisplayed(0), m_candidateDownArrow(NULL), m_candidateTextArea(NULL), diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp index 1f8757d0cc..6cd10e2808 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp @@ -154,7 +154,6 @@ void LoadScreen::update( Int percent ) //----------------------------------------------------------------------------- SinglePlayerLoadScreen::SinglePlayerLoadScreen( void ) { - //Initialization(s) inserted m_currentObjectiveLine = 0; m_currentObjectiveLineCharacter = 0; m_finishedObjectiveText = NULL; @@ -668,15 +667,11 @@ void ShellGameLoadScreen::update( Int percent ) //----------------------------------------------------------------------------- MultiPlayerLoadScreen::MultiPlayerLoadScreen( void ) { - //Initializations missing and needed m_mapPreview = NULL; - // for(Int i = 0; i < MAX_SLOTS; ++i) { - //Initializations missing and needed m_buttonMapStartPosition[i] = NULL; - // m_progressBars[i] = NULL; m_playerNames[i] = NULL; m_playerSide[i]= NULL; @@ -889,17 +884,13 @@ void MultiPlayerLoadScreen::processProgress(Int playerId, Int percentage) GameSpyLoadScreen::GameSpyLoadScreen( void ) { - // Initializations missing and needed m_mapPreview = NULL; - // for(Int i = 0; i < MAX_SLOTS; ++i) { - // Initializations missing and needed m_buttonMapStartPosition[i] = NULL; m_playerRank[i] = NULL; - // m_playerOfficerMedal[i] = NULL; m_progressBars[i] = NULL; @@ -1214,9 +1205,7 @@ void GameSpyLoadScreen::processProgress(Int playerId, Int percentage) //----------------------------------------------------------------------------- MapTransferLoadScreen::MapTransferLoadScreen( void ) { - //Initializations missing and needed m_oldTimeout = 0; - // for(Int i = 0; i < MAX_SLOTS; ++i) { m_progressBars[i] = NULL; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp index 1c25f14d81..f4d82ffdf6 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp @@ -83,10 +83,8 @@ void Shell::construct( void ) m_schemeManager = NEW ShellMenuSchemeManager; m_saveLoadMenuLayout = NULL; m_popupReplayLayout = NULL; - //Initializations m_optionsLayout = NULL; m_screenCount = 0; - // } //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameClient/GameClient.cpp b/Generals/Code/GameEngine/Source/GameClient/GameClient.cpp index d79514aad9..8f3a55c29c 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GameClient.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GameClient.cpp @@ -98,9 +98,7 @@ GameClient::GameClient() m_numTranslators = 0; m_commandTranslator = NULL; - // Initializations missing and needed m_drawableTOC.clear(); - // m_textBearingDrawableList.clear(); m_frame = 0; diff --git a/Generals/Code/GameEngine/Source/GameClient/GameText.cpp b/Generals/Code/GameEngine/Source/GameClient/GameText.cpp index 51cb593580..5f011a9ae5 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GameText.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GameText.cpp @@ -260,7 +260,6 @@ GameTextManager::GameTextManager() m_mapStringLUT(NULL), m_failed(L"***FATAL*** String Manager failed to initilaize properly") { - // Initializations missing and needed for(Int i=0; i < MAX_UITEXT_LENGTH; i++) { diff --git a/Generals/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp b/Generals/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp index e90f0535ef..14251f8e2d 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp @@ -122,7 +122,6 @@ void INI::parseLanguageDefinition( INI *ini ) GlobalLanguage::GlobalLanguage() { m_unicodeFontName.clear(); - //Initializations missing and needed m_unicodeFontFileName.clear(); m_unicodeFontName.clear(); m_militaryCaptionSpeed = 0; diff --git a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp index e671220ef7..eb876d4c35 100644 --- a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp @@ -947,7 +947,6 @@ InGameUI::InGameUI() m_mouseModeCursor = Mouse::ARROW; m_mousedOverDrawableID = INVALID_DRAWABLE_ID; - //Initializations missing and needed m_currentlyPlayingMovie.clear(); m_militarySubtitle = NULL; m_popupMessageData = NULL; @@ -5298,7 +5297,6 @@ void InGameUI::clearPopupMessageData( void ) //------------------------------------------------------------------------------------------------- FloatingTextData::FloatingTextData(void) { - // Initializations missing and needed m_color = 0; m_frameCount = 0; m_frameTimeOut = 0; diff --git a/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp b/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp index 15ce088bad..e09597809f 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp @@ -423,8 +423,6 @@ Bool Mouse::isClick(const ICoord2D *anchor, const ICoord2D *dest, UnsignedInt pr //------------------------------------------------------------------------------------------------- CursorInfo::CursorInfo( void ) { - // Added Sadullah Nader - // Initializations missing and needed cursorName.clear(); cursorText.clear(); @@ -458,7 +456,6 @@ Mouse::Mouse( void ) m_numAxes = 0; m_forceFeedback = FALSE; - //Initializations missing and needed m_dragTolerance = 0; m_dragTolerance3D = 0; m_dragToleranceMS = 0; diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp index a69a12a443..355c037b5a 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp @@ -113,9 +113,7 @@ GameMessageDisposition HotKeyTranslator::translateGameMessage(const GameMessage HotKey::HotKey() { m_win = NULL; - //Initializations missing and needed m_key.clear(); - // } //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp index c839d2b06d..d75ef9d824 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp @@ -142,7 +142,6 @@ LookAtTranslator::LookAtTranslator() : m_lastMouseMoveFrame(0), m_scrollType(SCROLL_NONE) { - //Initializations missing and needed m_anchor.x = m_anchor.y = 0; m_currentPos.x = m_currentPos.y = 0; m_originalAnchor.x = m_originalAnchor.y = 0; diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp index 97fcb287eb..0f07ba78bd 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp @@ -265,10 +265,8 @@ SelectionTranslator::SelectionTranslator() m_deselectFeedbackAnchor.x = 0; m_deselectFeedbackAnchor.y = 0; m_lastClick = 0; - //Initializtion(s) inserted m_deselectDownCameraPosition.zero(); m_displayedMaxWarning = FALSE; - // m_selectCountMap.clear(); TheSelectionTranslator = this; diff --git a/Generals/Code/GameEngine/Source/GameClient/SelectionInfo.cpp b/Generals/Code/GameEngine/Source/GameClient/SelectionInfo.cpp index 02918e6d26..f0887acebf 100644 --- a/Generals/Code/GameEngine/Source/GameClient/SelectionInfo.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/SelectionInfo.cpp @@ -63,9 +63,7 @@ SelectionInfo::SelectionInfo() : //------------------------------------------------------------------------------------------------- PickDrawableStruct::PickDrawableStruct() : drawableListToFill(NULL) { - //Initializations inserted drawableListToFill = FALSE; - // forceAttackMode = TheInGameUI->isInForceAttackMode(); UnsignedInt pickType = getPickTypesForContext(forceAttackMode); translatePickTypesToKindof(pickType, kindofsToMatch); diff --git a/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp b/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp index 0506778a1a..f337fe3ea7 100644 --- a/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp @@ -322,7 +322,6 @@ Anim2D::Anim2D( Anim2DTemplate *animTemplate, Anim2DCollection *collectionSystem m_maxFrame = m_template->getNumFrames() - 1; m_framesBetweenUpdates = m_template->getNumFramesBetweenUpdates(); - //added by Sadullah Nader // initializing pointers to NULL, and clearing Frame counters before // we register ourselves to the System m_collectionSystemNext = NULL; diff --git a/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp b/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp index 0d4694d403..c16524ea4c 100644 --- a/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp @@ -68,7 +68,6 @@ ParticleSystemManager *TheParticleSystemManager = NULL; // ------------------------------------------------------------------------------------------------ ParticleInfo::ParticleInfo( void ) { - //Initializations inserted m_angleX = m_angleY = m_angleZ = 0.0f; m_angularDamping = 0.0f; m_angularRateX = m_angularRateY = m_angularRateZ = 0.0f; @@ -287,9 +286,7 @@ Particle::Particle( ParticleSystem *system, const ParticleInfo *info ) m_angleY = info->m_angleY; m_angleZ = info->m_angleZ; - //Initializations inserted m_lastPos.zero(); - // m_windRandomness = info->m_windRandomness; m_particleUpTowardsEmitter = info->m_particleUpTowardsEmitter; m_emitterPos = info->m_emitterPos; @@ -824,7 +821,6 @@ ParticleSystemInfo::ParticleSystemInfo() m_isEmitAboveGroundOnly = false; m_isParticleUpTowardsEmitter = false; - //Initializations inserted m_driftVelocity.zero(); m_gravity = 0.0f; m_isEmissionVolumeHollow = FALSE; @@ -1132,7 +1128,6 @@ ParticleSystem::ParticleSystem( const ParticleSystemTemplate *sysTemplate, m_template = sysTemplate; m_systemID = id; - //Initializations inserted m_lastPos.zero(); m_pos.zero(); m_velCoeff.zero(); @@ -2877,9 +2872,7 @@ void ParticleSystemTemplate::parseRandomRGBColor( INI* ini, void *instance, ParticleSystemTemplate::ParticleSystemTemplate( const AsciiString &name ) : m_name(name) { - //Initializations inserted m_slaveTemplate = NULL; - // } // ------------------------------------------------------------------------------------------------ @@ -2920,7 +2913,6 @@ ParticleSystemManager::ParticleSystemManager( void ) m_onScreenParticleCount = 0; m_localPlayerIndex = 0; - //Initializations inserted m_lastLogicFrameUpdate = 0; m_particleCount = 0; m_fieldParticleCount = 0; diff --git a/Generals/Code/GameEngine/Source/GameClient/View.cpp b/Generals/Code/GameEngine/Source/GameClient/View.cpp index 1b522c9c22..5255d72d71 100644 --- a/Generals/Code/GameEngine/Source/GameClient/View.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/View.cpp @@ -41,7 +41,6 @@ View *TheTacticalView = NULL; View::View( void ) { - //Initialization(s) inserted m_viewLockedUntilFrame = 0u; m_currentHeightAboveGround = 0.0f; m_defaultAngle = 0.0f; diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp index e8bc6bf918..fd7dc76204 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp @@ -937,7 +937,6 @@ m_infantryPathfindDiameter(6), m_vehiclePathfindDiameter(6), m_supplyCenterSafeRadius(250), m_rebuildDelaySeconds(10), -//Initialization(s) inserted m_distanceRequiresGroup(0.0f), m_sideBuildLists(NULL), m_structuresPoorMod(0.0f), diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp index c811b411c2..df61a77455 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp @@ -2811,7 +2811,6 @@ zoneStorageType PathfindZoneManager::getEffectiveZone( LocomotorSurfaceTypeMask } //-------------------- PathfindLayer ---------------------------------------- PathfindLayer::PathfindLayer() : m_blockOfMapCells(NULL), m_layerCells(NULL), m_bridge(NULL), -// Initializations inserted m_destroyed(FALSE), m_height(0), m_width(0), diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp index 833096423d..c9270e8904 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp @@ -280,13 +280,9 @@ TurretAI::TurretAI(Object* owner, const TurretAIData* data, WhichTurretType tur) m_enabled(!data->m_initiallyDisabled), m_firesWhileTurning(data->m_firesWhileTurning), m_isForceAttacking(false), - //Initialization(s) inserted m_victimInitialTeam(NULL) - // { - //Initialization(s) inserted m_continuousFireExpirationFrame = -1; - // if (!m_data) { DEBUG_CRASH(("TurretAI MUST have ModuleData")); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp b/Generals/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp index 5a0e80dac4..4026e72869 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp @@ -48,10 +48,8 @@ m_numPoints(0), m_sizePoints(0), m_exportWithScripts(false), m_isWaterArea(false), -//Initializations inserted m_isRiver(FALSE), m_riverStart(0) -// { if (initialAllocation < 2) initialAllocation = 2; m_points = NEW ICoord3D[initialAllocation]; // pool[]ify diff --git a/Generals/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp b/Generals/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp index 1743e25613..afd24b4394 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp @@ -917,7 +917,6 @@ m_automaticallyBuild(true), m_priorityBuild(false), m_buildingName(AsciiString::TheEmptyString) { - // Added by Sadullah Nader // these initialized values are necessary!!! m_location.zero(); m_rallyPointOffset.x = 0.0f; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp b/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp index a48456cc91..2232756dd7 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp @@ -959,10 +959,8 @@ TerrainLogic::TerrainLogic() { Int i; - //Initialization(s) inserted m_activeBoundary = 0; m_waterGridEnabled = FALSE; - // for( i = 0; i < MAX_DYNAMIC_WATER; ++i ) { diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp index e04d2c59d7..f9a71e54eb 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp @@ -52,7 +52,6 @@ ParkingPlaceBehavior::ParkingPlaceBehavior( Thing *thing, const ModuleData* modu { m_gotInfo = false; - //Initializations m_heliRallyPoint.zero(); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp index 1f20e46ff6..3d0ee6d9b2 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp @@ -119,9 +119,7 @@ PropagandaTowerBehaviorModuleData::PropagandaTowerBehaviorModuleData( void ) PropagandaTowerBehavior::PropagandaTowerBehavior( Thing *thing, const ModuleData *modData ) : UpdateModule( thing, modData ) { - //Initializations inserted m_lastScanFrame = 0; - // m_insideList = NULL; setWakeFrame( getObject(), UPDATE_SLEEP_NONE ); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp index d2d73b84fb..daa1e0f365 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp @@ -67,9 +67,7 @@ SpawnBehavior::SpawnBehavior( Thing *thing, const ModuleData* moduleData ) //looping back to the beginning m_framesToWait = 0; - //Initialization(s) inserted m_firstBatchCount = 0; - // if( md->m_isOneShotData ) m_oneShotCountdown = md->m_spawnNumberData; else diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp index 63271a1d03..dd9f9ccc6e 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp @@ -53,7 +53,6 @@ CrateCollideModuleData::CrateCollideModuleData() m_executeFX = NULL; m_pickupScience = SCIENCE_INVALID; - // Initializations missing and needed m_executionAnimationTemplate = AsciiString::TheEmptyString; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp index 655ea5feac..48a73f62f8 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp @@ -127,10 +127,8 @@ OpenContain::OpenContain( Thing *thing, const ModuleData* moduleData ) : UpdateM m_stealthUnitsContained = 0; m_doorCloseCountdown = 0; - //Initializations inserted m_rallyPoint.zero(); m_rallyPointExists = FALSE; - // m_conditionState.clear(); m_firePointStart = -1; m_firePointNext = 0; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp index 4261cb74be..719170d341 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp @@ -99,7 +99,6 @@ ParachuteContain::ParachuteContain( Thing *thing, const ModuleData *moduleData ) m_isLandingOverrideSet = FALSE; m_startZ = NO_START_Z; - //Initializations m_landingOverride.zero(); m_paraAttachBone.zero(); m_paraAttachOffset.zero(); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp index 427cf2a03d..2c7af51476 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp @@ -39,7 +39,6 @@ GhostObjectManager *TheGhostObjectManager = NULL; //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- GhostObject::GhostObject(void): -//Initializations missing and needed m_parentAngle(0.0f), // TheSuperHackers @bugfix tomsons26 26/04/2025 Change initialization of m_parentGeometryIsSmall from 0.0f. // Assigning a float to a bool results in the compiler using a random 1 byte value to assign to the bool. diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp index f7a0cbf866..98f058289f 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp @@ -660,7 +660,6 @@ Locomotor::Locomotor(const LocomotorTemplate* tmpl) //------------------------------------------------------------------------------------------------- Locomotor::Locomotor(const Locomotor& that) { - //Initializations m_angleOffset = 0.0f; m_maintainPos.zero(); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp index e8811e826d..afe22ffade 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp @@ -212,10 +212,8 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu Int i, modIdx; AsciiString modName; - //Initializations inserted m_formationOffset.x = m_formationOffset.y = 0.0f; m_iPos.zero(); - // for( i = 0; i < DISABLED_COUNT; i++ ) { m_disabledTillFrame[ i ] = NEVER; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp index 27341739aa..898e1ef4af 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp @@ -248,8 +248,6 @@ class DeliverPayloadNugget : public ObjectCreationNugget { //Note: m_data is constructed with default values. - // Added by Sadullah Nader - // Initialization missing and needed m_payload.clear(); m_putInContainerName.clear(); @@ -768,7 +766,6 @@ class GenericObjectCreationNugget : public ObjectCreationNugget m_preserveLayer(true), m_objectCount(0) { - // Change Made by Sadullah Nader // for init purposes, easier to read m_offset.zero(); } diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp index a010dbecea..4b2fd65a2c 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp @@ -1222,9 +1222,7 @@ void CellAndObjectIntersection::removeAllCoverage() //----------------------------------------------------------------------------- PartitionCell::PartitionCell() { - //Initializations inserted m_cellX = m_cellY = 0; - // m_firstCoiInCell = NULL; m_coiCount = 0; #ifdef PM_CACHE_TERRAIN_HEIGHT diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp index be33e558e5..ad1905fefa 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp @@ -119,7 +119,6 @@ DeliverPayloadAIUpdate::DeliverPayloadAIUpdate( Thing *thing, const ModuleData* m_freeToExit = FALSE; m_acceptingCommands = TRUE; - // Initialization missing and needed m_diveState = DIVESTATE_PREDIVE; 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 e4ff4daf2f..22b41b1fc1 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp @@ -384,7 +384,6 @@ class DozerActionDoActionState : public State DozerActionDoActionState( StateMachine *machine, DozerTask task ) : State( machine, "DozerActionDoActionState" ) { m_task = task; - // Initializations missing and needed m_enterFrame = 0; } virtual StateReturnType update( void ); 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 1b308d3697..f264228618 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp @@ -1665,9 +1665,7 @@ JetAIUpdate::JetAIUpdate( Thing *thing, const ModuleData* moduleData ) : AIUpdat m_lockonDrawable = NULL; m_landingPosForHelipadStuff.zero(); - //Initializations missing and needed m_producerLocation.zero(); - // m_enginesOn = TRUE; } 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 018b698fdd..efd4799659 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp @@ -87,11 +87,8 @@ WorkerAIUpdate::WorkerAIUpdate( Thing *thing, const ModuleData* moduleData ) : // // initialize the dozer machine to NULL, we want to do this and create it during the update // implementation because at this point we don't have the object all setup - // - //Initialization(s) inserted m_isRebuild = FALSE; - // m_dozerMachine = NULL; for( Int i = 0; i < DOZER_NUM_TASKS; i++ ) { diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp index 5b50aa12c3..be1787c394 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp @@ -156,7 +156,6 @@ BattlePlanUpdate::BattlePlanUpdate( Thing *thing, const ModuleData* moduleData ) m_visionObjectID = INVALID_ID; //------------------------// - // Added by Sadullah Nader// //------------------------// m_specialPowerModule = NULL; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FlammableUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FlammableUpdate.cpp index 1598557952..e8e8f750e7 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FlammableUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FlammableUpdate.cpp @@ -47,10 +47,7 @@ FlammableUpdateModuleData::FlammableUpdateModuleData() m_aflameDuration = 0; m_aflameDamageDelay = 0; m_aflameDamageAmount = 0; - // Enabled By Sadullah Nader - // Initialization needed m_burningSoundName.clear(); - // m_flameDamageLimitData = 20.0f; m_flameDamageExpirationDelay = LOGICFRAMES_PER_SECOND * 2; } diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp index 5d522251e8..47f5e4acd3 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp @@ -61,7 +61,6 @@ //------------------------------------------------------------------------------------------------- HelicopterSlowDeathBehaviorModuleData::HelicopterSlowDeathBehaviorModuleData( void ) { - //Initializations missing and needed m_attachParticleBone.clear(); m_bladeBone.clear(); m_bladeObjectName.clear(); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp index 2ef0e4e534..9d1be6984d 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp @@ -157,9 +157,7 @@ HordeUpdate::HordeUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateM m_inHorde = FALSE; m_hasFlag = FALSE; m_lastHordeRefreshFrame = TheGameLogic->getFrame(); - // Initializations missing and needed m_trueHordeMember = FALSE; - // UnsignedInt delay = getHordeUpdateModuleData()->m_updateRate; setWakeFrame(getObject(), UPDATE_SLEEP(GameLogicRandomValue(1, delay))); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp index 6b1dd4a4c4..37ef32f29b 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp @@ -82,7 +82,6 @@ LaserRadiusUpdate::LaserRadiusUpdate() //------------------------------------------------------------------------------------------------- LaserUpdate::LaserUpdate( Thing *thing, const ModuleData* moduleData ) : ClientUpdateModule( thing, moduleData ) { - //Initialization missing and needed m_dirty = FALSE; m_endPos.zero(); m_startPos.zero(); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp index b561d134a2..c56333c961 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp @@ -42,9 +42,7 @@ LifetimeUpdate::LifetimeUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData ) { const LifetimeUpdateModuleData* d = getLifetimeUpdateModuleData(); - // Initializations needed m_dieFrame = 0; - // UnsignedInt delay; if( getObject()->isKindOf( KINDOF_HULK ) && TheGameLogic->getHulkMaxLifetimeOverride() != -1 ) { diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp index 4e1a344342..84560fc6fb 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp @@ -87,11 +87,8 @@ ParticleUplinkCannonUpdateModuleData::ParticleUplinkCannonUpdateModuleData() m_manualDrivingSpeed = 0.0f; m_manualFastDrivingSpeed = 0.0f; m_doubleClickToFastDriveDelay = 500; - //Added by Sadullah Nader - //Initializations inserted m_swathOfDeathAmplitude = 0.0f; m_swathOfDeathDistance = 0.0f; - // } //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp index 5bc8ea7b3e..4258cd1e80 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp @@ -46,7 +46,6 @@ DefaultProductionExitUpdate::DefaultProductionExitUpdate( Thing *thing, const Mo { // no rally point has been set m_rallyPointExists = false; - // Initialization missing and needed m_rallyPoint.zero(); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp index 79e4e07e34..402443e960 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp @@ -46,10 +46,8 @@ QueueProductionExitUpdate::QueueProductionExitUpdate( Thing *thing, const Module { m_currentDelay = 0; - //Initializations inserted m_creationClearDistance = 0; m_rallyPoint.zero(); - // // no rally point has been set m_rallyPointExists = false; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp index 4db6c42830..e99ccfff76 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp @@ -158,10 +158,8 @@ ProductionEntry::ProductionEntry( void ) m_framesUnderConstruction = 0; m_next = NULL; m_prev = NULL; - //Initializations inserted m_productionQuantityProduced = 0; m_productionQuantityTotal = 0; - // } //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp index bd76c0121a..95ff77e9f0 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp @@ -68,9 +68,7 @@ //------------------------------------------------------------------------------------------------- SpecialAbilityUpdate::SpecialAbilityUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData ) { - //Initialization(s) inserted m_captureFlashPhase = 0.0f; - // m_active = false; m_prepFrames = 0; m_animFrames = 0; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp index 4db89867b0..f4c6ab7069 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp @@ -99,9 +99,7 @@ StealthUpdate::StealthUpdate( Thing *thing, const ModuleData* moduleData ) : Upd //Must be enabled manually if using disguise system (bomb truck uses) m_enabled = !data->m_teamDisguised; - //Initialization(s) inserted m_detectionExpiresFrame = 0; - // m_pulsePhaseRate = 0.2f; m_pulsePhase = GameClientRandomValueReal(0, PI); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp index f9469a8582..0b7ca86706 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp @@ -50,9 +50,7 @@ StickyBombUpdate::StickyBombUpdate( Thing *thing, const ModuleData *moduleData ) { m_targetID = INVALID_ID; m_dieFrame = 0; - //Initialization(s) inserted m_nextPingFrame = 0; - // setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER); } diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp index 4471c28fd9..7789f245f4 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp @@ -68,10 +68,8 @@ StructureCollapseUpdate::StructureCollapseUpdate( Thing *thing, const ModuleData m_collapseFrame = 0; m_collapseState = COLLAPSESTATE_STANDING; m_collapseVelocity = 0.0f; - //Initialization(s) inserted m_burstFrame = 0; m_currentHeight = 0.0f; - // setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER); } diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp index 6dd3eb2696..361b75fa1c 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp @@ -56,7 +56,6 @@ const Int MAX_IDX = 32; StructureToppleUpdate::StructureToppleUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData ) { - //Initialization(s) inserted m_delayBurstLocation.zero(); m_structuralIntegrity = 0.0f; m_toppleDirection.x = m_toppleDirection.y = 0; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp index 1b377796d7..d873e5f3ff 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp @@ -104,7 +104,6 @@ void ToppleUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) //------------------------------------------------------------------------------------------------- ToppleUpdate::ToppleUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData ) { - //Initialization(s) inserted m_angleDeltaX = 0.0f; m_doBounceFX = FALSE; m_numAngleDeltaX = 0; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp index ad48db9e84..99f9d520d7 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp @@ -58,7 +58,6 @@ // ------------------------------------------------------------------------------------------------ WaveGuideUpdateModuleData::WaveGuideUpdateModuleData( void ) { - //Initialization(s) inserted m_bridgeParticleAngleFudge = 0.0f; m_randomSplashSoundFrequency = 0; m_waveDelay = 0.0f; diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp index 9b2d9456a2..0729634893 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp @@ -362,7 +362,6 @@ m_skirmishHumanPlayer(NULL), m_fade(FADE_NONE), m_freezeByScript(FALSE), m_frameObjectCountChanged(0), -//Initializations inserted m_closeWindowTimer(0), m_curFadeFrame(0), m_curFadeValue(0.0f), diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp index d6a170e160..d34da9950e 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp @@ -632,9 +632,7 @@ m_firstScript(NULL), m_hasWarnings(false), m_isGroupActive(true), m_isGroupSubroutine(false), -//Initializations inserted m_nextGroup(NULL) -// { m_groupName.format("Script Group %d", ScriptList::getNextID()); } @@ -905,10 +903,8 @@ m_hasWarnings(false), m_nextScript(NULL), m_condition(NULL), m_action(NULL), -//Initializations inserted m_actionFalse(NULL), m_curTime(0.0f) -// { } @@ -2170,9 +2166,7 @@ ScriptAction::ScriptAction(): m_actionType(NO_OP), m_hasWarnings(false), m_numParms(0), -//Initializations inserted m_nextAction(NULL) -// { } diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp index 9e475bdf92..f479c0e408 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp @@ -207,7 +207,6 @@ void setFPMode( void ) // ------------------------------------------------------------------------------------------------ GameLogic::GameLogic( void ) { - //Initializations missing and necessary m_background = NULL; m_CRC = 0; m_isInUpdate = FALSE; @@ -223,7 +222,6 @@ GameLogic::GameLogic( void ) m_shouldValidateCRCs = FALSE; m_startNewGame = FALSE; - // m_frame = 0; m_hasUpdated = FALSE; @@ -2093,8 +2091,6 @@ void GameLogic::startNewGame( Bool saveGame ) TheGameSpyBuddyMessageQueue->addRequest(req); } - //Added to fix the quit menu - //ReAllows quit menu to work during loading scene setGameLoading(FALSE); #ifdef DUMP_PERF_STATS diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h b/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h index 1efebfb6a8..d15568c579 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h @@ -111,11 +111,8 @@ class GeometryInfo : public Snapshot GeometryInfo(GeometryType type, Bool isSmall, Real height, Real majorRadius, Real minorRadius) { - // Added by Sadullah Nader - // Initializations missing and needed m_boundingCircleRadius = 0.0f; m_boundingSphereRadius = 0.0f; - // set(type, isSmall, height, majorRadius, minorRadius); } diff --git a/GeneralsMD/Code/GameEngine/Include/Common/INI.h b/GeneralsMD/Code/GameEngine/Include/Common/INI.h index ead5e913f6..c4ea2124ca 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/INI.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/INI.h @@ -138,10 +138,8 @@ class MultiIniFieldParse public: MultiIniFieldParse() : m_count(0) { - //Initializations missing and needed for(Int i = 0; i < MAX_MULTI_FIELDS; i++) m_extraOffset[i] = 0; - // } diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h index 50cd1f3b85..497f7b6cdd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h @@ -448,7 +448,6 @@ class SideSelectWindowData public: SideSelectWindowData(void) { - //Initializations generalSpeak = NULL; m_currColor = 0; m_gereralsNameWin = NULL; diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/View.h b/GeneralsMD/Code/GameEngine/Include/GameClient/View.h index 80dc6143a2..7debfe3fd2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/View.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/View.h @@ -311,10 +311,8 @@ class ViewLocation ViewLocation() { m_valid = FALSE; - //Initialization(s) inserted m_pos.zero(); m_angle = m_pitch = m_zoom = 0.0; - // } const Coord3D& getPosition() const { return m_pos; } diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h index 72bc9f8705..c8b0597bff 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h @@ -78,7 +78,6 @@ class ExitConditions : public AttackExitConditionsInterface ExitConditions() : m_attackGiveUpFrame(0), m_conditionsToConsider(0), m_radiusSqr(0.0f) { - // Initializations missing and needed m_center.zero(); } diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h index eaf0bcd70a..cc889280cd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h @@ -76,7 +76,6 @@ class GuardRetaliateExitConditions : public AttackExitConditionsInterface GuardRetaliateExitConditions() : m_attackGiveUpFrame(0), m_conditionsToConsider(0), m_radiusSqr(0.0f) { - // Initializations missing and needed m_center.zero(); } diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h index 087d6c90a1..c623b5aba3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h @@ -113,10 +113,8 @@ class TeamInQueue : public MemoryPoolObject, m_reinforcement(false), m_stopQueueing(false), m_reinforcementID(INVALID_ID), - //Initialization(s) inserted m_frameStarted(0), m_priorityBuild(FALSE) - // { } diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h index 4b453f11fc..a5c9f2e21d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h @@ -46,7 +46,6 @@ class CreateCrateDieModuleData : public DieModuleData CreateCrateDieModuleData() { - // Initializations missing and needed m_crateNameList.clear(); } ~CreateCrateDieModuleData() diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h index 4b62b50a0d..921e7cc2b7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h @@ -204,7 +204,6 @@ class DeliverPayloadAIUpdateModuleData : public AIUpdateModuleData m_dropOffset.zero(); m_dropVariance.zero(); m_deliveryDecalRadius = 0; - // Initialization missing and needed m_putInContainerName.clear(); // End Add @@ -294,7 +293,6 @@ class DeliverPayloadData m_visiblePayloadWeaponTemplate = NULL; m_selfDestructObject = FALSE; m_deliveryDecalRadius = 0; - // Initialization missing and needed m_visibleDropBoneName.clear(); m_visiblePayloadTemplateName.clear(); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h index 44d36538a7..48c3f44b91 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h @@ -46,9 +46,7 @@ class HackInternetState : public State public: HackInternetState( StateMachine *machine ) :State( machine, "HackInternetState" ) { - //Initializations missing and needed m_framesRemaining = 0; - // } virtual StateReturnType update(); virtual StateReturnType onEnter(); @@ -72,9 +70,7 @@ class PackingState : public State public: PackingState( StateMachine *machine ) : State( machine, "PackingState" ) { - //Initializations inserted m_framesRemaining = 0; - // } virtual StateReturnType update(); virtual StateReturnType onEnter(); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h index 3a0e8fd973..8de174af6f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h @@ -61,7 +61,6 @@ class ObjectDefectionHelper : public ObjectHelper ObjectDefectionHelper( Thing *thing, const ModuleData *modData ) : ObjectHelper( thing, modData ) { - //Initializations inserted m_defectionDetectionEnd = 0; m_defectionDetectionFlashPhase = FALSE; m_defectionDetectionStart = 0; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h index bba40b1ce0..748355ff15 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h @@ -65,9 +65,7 @@ class SpawnBehaviorModuleData : public BehaviorModuleData { m_spawnNumberData = 0; m_spawnReplaceDelayData = 0; - //Initialization(s) inserted m_spawnStartNumberData = 0; - // m_initialBurst = 0; m_isOneShotData = FALSE; m_canReclaimOrphans = FALSE; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h index ca645c3004..4a15af7fdc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h @@ -75,7 +75,6 @@ class StructureCollapseUpdateModuleData : public UpdateModuleData m_minCollapseDelay = 0; m_maxCollapseDelay = 0; m_minBurstDelay = 9999; - //Removed by Sadullah Nader //Redundancy from above //m_minBurstDelay = 9999; m_maxShudder = 0; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h index bd0d4fa3aa..00bf6486bd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h @@ -1146,9 +1146,7 @@ class PartitionFilterGarrisonable : public PartitionFilter public: PartitionFilterGarrisonable( Bool match ) : m_match(match) { - //Initializations m_player = NULL; - // } protected: virtual Bool allow( Object *other ); diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp index 71d0401bce..72f550b5e0 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp @@ -28,7 +28,6 @@ //------------------------------------------------------------------------------------------------- BezFwdIterator::BezFwdIterator(): mStep(0), mStepsDesired(0) { - // Added by Sadullah Nader mCurrPoint.zero(); mDDDq.zero(); mDDq.zero(); @@ -38,7 +37,6 @@ BezFwdIterator::BezFwdIterator(): mStep(0), mStepsDesired(0) //------------------------------------------------------------------------------------------------- BezFwdIterator::BezFwdIterator(Int stepsDesired, const BezierSegment *bezSeg) { - // Added by Sadullah Nader mCurrPoint.zero(); mDDDq.zero(); mDDq.zero(); diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp index c77db7a92d..7bf91ac42d 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp @@ -576,13 +576,10 @@ GlobalData::GlobalData() m_debugVisibilityTileDuration = LOGICFRAMES_PER_SECOND; m_debugProjectilePath = FALSE; m_debugProjectileTileWidth = 10; - m_debugProjectileTileDuration = LOGICFRAMES_PER_SECOND; // Changed By Sadullah Nader m_debugThreatMap = FALSE; m_maxDebugThreat = 5000; - m_debugThreatMapTileDuration = LOGICFRAMES_PER_SECOND; // Changed By Sadullah Nader m_debugCashValueMap = FALSE; m_maxDebugValue = 10000; - m_debugCashValueMapTileDuration = LOGICFRAMES_PER_SECOND; // Changed By Sadullah Nader m_vTune = false; m_checkForLeaks = TRUE; m_benchmarkTimer = -1; @@ -690,7 +687,6 @@ GlobalData::GlobalData() m_vertexWaterAttenuationB[ i ] = 0.0f; m_vertexWaterAttenuationC[ i ] = 0.0f; m_vertexWaterAttenuationRange[ i ] = 0.0f; - //Initializations missing and needed m_vertexWaterAvailableMaps[i].clear(); } @@ -802,7 +798,6 @@ GlobalData::GlobalData() m_autoSmokeParticleLargeMax = 0; m_autoAflameParticleMax = 0; - // Initializations missing and needed m_autoFireParticleSmallPrefix.clear(); m_autoFireParticleMediumPrefix.clear(); m_autoFireParticleLargePrefix.clear(); diff --git a/GeneralsMD/Code/GameEngine/Source/Common/PartitionSolver.cpp b/GeneralsMD/Code/GameEngine/Source/Common/PartitionSolver.cpp index 26206f18ae..e51add0e21 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/PartitionSolver.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/PartitionSolver.cpp @@ -63,9 +63,7 @@ PartitionSolver::PartitionSolver(const EntriesVec& elements, const SpacesVec& sp m_data = elements; m_spacesForData = spaces; m_howToSolve = solveHow; - //Initializations inserted m_currentSolutionLeftovers = 0; - // } void PartitionSolver::solve(void) diff --git a/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp b/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp index f346ef48f0..3b155fd5ab 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp @@ -312,9 +312,7 @@ PerfGather::PerfGather(const char *identifier) : m_next(0), m_prev(0) { - //Initializations inserted m_ignore = FALSE; - // DEBUG_ASSERTCRASH(strchr(m_identifier, ',') == NULL, ("PerfGather names must not contain commas")); addToList(); } diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp index 9aae3bb315..2fda307052 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp @@ -321,8 +321,6 @@ Player::Player( Int playerIndex ) m_playerTemplate = NULL; m_battlePlanBonuses = NULL; m_skillPointsModifier = 1.0f; - //Added By Sadullah - //Initializations inserted m_canBuildUnits = TRUE; m_canBuildBase = TRUE; m_cashBountyPercent = 0.0f; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp index 3e87bdb391..968ede750b 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp @@ -238,7 +238,6 @@ UnicodeString ProductionPrerequisite::getRequiresList(const Player *player) cons Bool orRequirements[MAX_PREREQ]; //Added for fix below in getRequiresList - //By Sadullah Nader //Initializes the OR_WITH_PREV structures for (i = 0; i < MAX_PREREQ; i++) { diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp index 66c8a156ec..41e6d5ceaa 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp @@ -102,9 +102,7 @@ void ScoreKeeper::reset( Int playerIdx ) m_totalMoneyEarned = m_totalMoneySpent = 0; m_totalUnitsLost = m_totalUnitsBuilt = 0; m_totalBuildingsLost = m_totalBuildingsBuilt = 0; - //Initializtion(s) inserted m_totalFactionBuildingsCaptured = m_totalTechBuildingsCaptured = 0; - // m_currentScore = 0; m_objectsBuilt.clear(); m_objectsCaptured.clear(); diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp index 2bea6e2693..b8445c6e3e 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp @@ -1316,10 +1316,8 @@ Team::Team(TeamPrototype *proto, TeamID id ) : m_curUnits(0), m_wasIdle(false) { - //Initialization(s) inserted m_created = FALSE; - // m_commonAttackTarget = INVALID_ID; // allocate new relation map pools diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp index 9a1da0a7ba..643476d74e 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp @@ -368,7 +368,6 @@ RecorderClass::RecorderClass() m_file = NULL; m_fileName.clear(); m_currentFilePosition = 0; - //Initializtion(s) inserted m_doingAnalysis = FALSE; m_archiveReplays = FALSE; m_nextFrame = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp b/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp index 43aa25e6fa..3a33079000 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp @@ -76,7 +76,6 @@ static char statsDir[255] = "Stats\\"; //============================================================================= StatsCollector::StatsCollector( void ) { - //Initialization(s) inserted m_isScrolling = FALSE; m_scrollBeginTime = 0; m_scrollTime = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp index c1378ffeaf..91159df221 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp @@ -237,8 +237,6 @@ m_pOut(pOut) AsciiString tmpFileName = TheGlobalData->getPath_UserData(); tmpFileName.concat(TEMP_FILENAME); m_tmp_file = ::fopen( tmpFileName.str(), "wb" ); - // Added Sadullah Nader - // Initializations missing and needed m_chunkStack = NULL; // End Add diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/Upgrade.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/Upgrade.cpp index 00c5166753..b93fb4de03 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/Upgrade.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/Upgrade.cpp @@ -131,9 +131,7 @@ const FieldParse UpgradeTemplate::m_upgradeFieldParseTable[] = //------------------------------------------------------------------------------------------------- UpgradeTemplate::UpgradeTemplate( void ) { - //Initialization(s) inserted m_cost = 0; - // m_type = UPGRADE_TYPE_PLAYER; m_nameKey = NAMEKEY_INVALID; m_buildTime = 0.0f; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp index d8a70c0be9..7d516c8c61 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp @@ -64,8 +64,6 @@ Display::Display() m_elapsedCopywriteTime = 0; m_copyrightDisplayString = NULL; - // Added by Sadullah Nader - // Initializations missing and needed m_currentlyPlayingMovie.clear(); m_letterBoxFadeStartTime = 0; // End Add diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp index 6a44379386..3384f80822 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp @@ -349,10 +349,8 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatusBits statu // assign status bits before anything else can be done m_status = statusBits; - // Initialization missing and needed m_nextDrawable = NULL; m_prevDrawable = NULL; - // m_customSoundAmbientInfo = NULL; @@ -364,10 +362,8 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatusBits statu Int i; - // Initialization missing and needed m_flashColor = 0; m_selected = '\0'; - // m_expirationDate = 0; // 0 == never expires diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index 0ffba4ba0b..297e303833 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -574,7 +574,6 @@ CommandButton::CommandButton( void ) m_flashCount = 0; - // Added by Sadullah Nader // The purpose is to initialize these variable to values that are zero or empty m_conflictingLabel.clear(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp index a886627db7..815a240b36 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp @@ -189,8 +189,6 @@ ControlBarSchemeImage::~ControlBarSchemeImage( void ) ControlBarSchemeAnimation::ControlBarSchemeAnimation( void ) { - // Added by Sadullah Nader - // Initializations missing and needed m_animDuration = 0; m_finalPos.x = m_finalPos.y = 0; @@ -304,7 +302,6 @@ ControlBarScheme::ControlBarScheme(void) m_optionsButtonPushed = NULL; m_optionsButtonDisabled = NULL; - // Initializations needed m_commandBarBorderColor = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp index 7f14f339ec..bc9cb63b1a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp @@ -894,7 +894,6 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg, // do the load game if( controlID == buttonLoadConfirm ) { - //Moved by Sadullah Nader //moved to fix the // close save/load layout menu closeSaveMenu( window ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp index 01450d2494..8f8eec0120 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp @@ -553,7 +553,6 @@ static void startPressed(void) ///////////////////////////////////////////////////// // MapSelectorTooltip - shows tooltips for the tech buildings // and supply depots -// Added By : Sadullah Nader ///////////////////////////////////////////////////// void MapSelectorTooltip(GameWindow *window, WinInstanceData *instData, diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp index 493d88ea3e..dfbd9e9c49 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp @@ -107,7 +107,6 @@ m_font(NULL), m_point(0), m_bold(FALSE) { - //Initializations missing and needed m_fontName.clear(); m_name.clear(); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp index 56d4a8dd38..05046a2706 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp @@ -506,7 +506,6 @@ IMEManager::IMEManager() m_result(0), m_indexBase(1), - //Initializations missing and needed m_compositionCharsDisplayed(0), m_candidateDownArrow(NULL), m_candidateTextArea(NULL), diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp index fa31422bad..5bf07a9019 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp @@ -175,7 +175,6 @@ void LoadScreen::update( Int percent ) //----------------------------------------------------------------------------- SinglePlayerLoadScreen::SinglePlayerLoadScreen( void ) { - //Initialization(s) inserted m_currentObjectiveLine = 0; m_currentObjectiveLineCharacter = 0; m_finishedObjectiveText = NULL; @@ -1224,15 +1223,11 @@ void ShellGameLoadScreen::update( Int percent ) //----------------------------------------------------------------------------- MultiPlayerLoadScreen::MultiPlayerLoadScreen( void ) { - //Initializations missing and needed m_mapPreview = NULL; - // for(Int i = 0; i < MAX_SLOTS; ++i) { - //Initializations missing and needed m_buttonMapStartPosition[i] = NULL; - // m_progressBars[i] = NULL; m_playerNames[i] = NULL; m_playerSide[i]= NULL; @@ -1488,17 +1483,13 @@ void MultiPlayerLoadScreen::processProgress(Int playerId, Int percentage) GameSpyLoadScreen::GameSpyLoadScreen( void ) { - // Initializations missing and needed m_mapPreview = NULL; - // for(Int i = 0; i < MAX_SLOTS; ++i) { - // Initializations missing and needed m_buttonMapStartPosition[i] = NULL; m_playerRank[i] = NULL; - // m_playerOfficerMedal[i] = NULL; m_progressBars[i] = NULL; @@ -1853,9 +1844,7 @@ void GameSpyLoadScreen::processProgress(Int playerId, Int percentage) //----------------------------------------------------------------------------- MapTransferLoadScreen::MapTransferLoadScreen( void ) { - //Initializations missing and needed m_oldTimeout = 0; - // for(Int i = 0; i < MAX_SLOTS; ++i) { m_progressBars[i] = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp index 49474af5cd..b9c575968e 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp @@ -85,10 +85,8 @@ void Shell::construct( void ) m_schemeManager = NEW ShellMenuSchemeManager; m_saveLoadMenuLayout = NULL; m_popupReplayLayout = NULL; - //Initializations m_optionsLayout = NULL; m_screenCount = 0; - // } //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp index f29ca249ab..0c49c2a141 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp @@ -100,9 +100,7 @@ GameClient::GameClient() m_numTranslators = 0; m_commandTranslator = NULL; - // Initializations missing and needed m_drawableTOC.clear(); - // m_textBearingDrawableList.clear(); m_frame = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp index dc78547961..6a95e712d3 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp @@ -260,7 +260,6 @@ GameTextManager::GameTextManager() m_mapStringLUT(NULL), m_failed(L"***FATAL*** String Manager failed to initilaize properly") { - // Initializations missing and needed for(Int i=0; i < MAX_UITEXT_LENGTH; i++) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp index 03ba4a9c93..2f9708ff82 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp @@ -123,7 +123,6 @@ void INI::parseLanguageDefinition( INI *ini ) GlobalLanguage::GlobalLanguage() { m_unicodeFontName.clear(); - //Initializations missing and needed m_unicodeFontFileName.clear(); m_unicodeFontName.clear(); m_militaryCaptionSpeed = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp index 000b32ccb9..7e511ba0db 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp @@ -978,7 +978,6 @@ InGameUI::InGameUI() m_mouseModeCursor = Mouse::ARROW; m_mousedOverDrawableID = INVALID_DRAWABLE_ID; - //Initializations missing and needed m_currentlyPlayingMovie.clear(); m_militarySubtitle = NULL; m_popupMessageData = NULL; @@ -5471,7 +5470,6 @@ void InGameUI::clearPopupMessageData( void ) //------------------------------------------------------------------------------------------------- FloatingTextData::FloatingTextData(void) { - // Initializations missing and needed m_color = 0; m_frameCount = 0; m_frameTimeOut = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp index 9b148eb808..af25ac032a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp @@ -423,8 +423,6 @@ Bool Mouse::isClick(const ICoord2D *anchor, const ICoord2D *dest, UnsignedInt pr //------------------------------------------------------------------------------------------------- CursorInfo::CursorInfo( void ) { - // Added Sadullah Nader - // Initializations missing and needed cursorName.clear(); cursorText.clear(); @@ -458,7 +456,6 @@ Mouse::Mouse( void ) m_numAxes = 0; m_forceFeedback = FALSE; - //Initializations missing and needed m_dragTolerance = 0; m_dragTolerance3D = 0; m_dragToleranceMS = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp index 95c455a126..e71399c7e8 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp @@ -113,9 +113,7 @@ GameMessageDisposition HotKeyTranslator::translateGameMessage(const GameMessage HotKey::HotKey() { m_win = NULL; - //Initializations missing and needed m_key.clear(); - // } //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp index baf2b1a00f..69b3489888 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp @@ -142,7 +142,6 @@ LookAtTranslator::LookAtTranslator() : m_lastMouseMoveFrame(0), m_scrollType(SCROLL_NONE) { - //Initializations missing and needed m_anchor.x = m_anchor.y = 0; m_currentPos.x = m_currentPos.y = 0; m_originalAnchor.x = m_originalAnchor.y = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp index ad14fef279..1c53cb8ce7 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp @@ -270,10 +270,8 @@ SelectionTranslator::SelectionTranslator() m_deselectFeedbackAnchor.x = 0; m_deselectFeedbackAnchor.y = 0; m_lastClick = 0; - //Initializtion(s) inserted m_deselectDownCameraPosition.zero(); m_displayedMaxWarning = FALSE; - // m_selectCountMap.clear(); TheSelectionTranslator = this; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp index abf82e45fc..bc0b4e050a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp @@ -322,7 +322,6 @@ Anim2D::Anim2D( Anim2DTemplate *animTemplate, Anim2DCollection *collectionSystem m_maxFrame = m_template->getNumFrames() - 1; m_framesBetweenUpdates = m_template->getNumFramesBetweenUpdates(); - //added by Sadullah Nader // initializing pointers to NULL, and clearing Frame counters before // we register ourselves to the System m_collectionSystemNext = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp index b2d2620671..fa2909de91 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp @@ -68,7 +68,6 @@ ParticleSystemManager *TheParticleSystemManager = NULL; // ------------------------------------------------------------------------------------------------ ParticleInfo::ParticleInfo( void ) { - //Initializations inserted m_angleZ = 0.0f; m_angularDamping = 0.0f; m_angularRateZ = 0.0f; @@ -261,9 +260,7 @@ Particle::Particle( ParticleSystem *system, const ParticleInfo *info ) m_angleZ = info->m_angleZ; - //Initializations inserted m_lastPos.zero(); - // m_windRandomness = info->m_windRandomness; m_particleUpTowardsEmitter = info->m_particleUpTowardsEmitter; m_emitterPos = info->m_emitterPos; @@ -726,7 +723,6 @@ ParticleSystemInfo::ParticleSystemInfo() m_isEmitAboveGroundOnly = false; m_isParticleUpTowardsEmitter = false; - //Initializations inserted m_driftVelocity.zero(); m_gravity = 0.0f; m_isEmissionVolumeHollow = FALSE; @@ -1035,7 +1031,6 @@ ParticleSystem::ParticleSystem( const ParticleSystemTemplate *sysTemplate, m_template = sysTemplate; m_systemID = id; - //Initializations inserted m_lastPos.zero(); m_pos.zero(); m_velCoeff.zero(); @@ -2779,9 +2774,7 @@ void ParticleSystemTemplate::parseRandomRGBColor( INI* ini, void *instance, ParticleSystemTemplate::ParticleSystemTemplate( const AsciiString &name ) : m_name(name) { - //Initializations inserted m_slaveTemplate = NULL; - // } // ------------------------------------------------------------------------------------------------ @@ -2822,7 +2815,6 @@ ParticleSystemManager::ParticleSystemManager( void ) m_onScreenParticleCount = 0; m_localPlayerIndex = 0; - //Initializations inserted m_lastLogicFrameUpdate = 0; m_particleCount = 0; m_fieldParticleCount = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/View.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/View.cpp index bed9719120..2b48d0abef 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/View.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/View.cpp @@ -41,7 +41,6 @@ View *TheTacticalView = NULL; View::View( void ) { - //Initialization(s) inserted m_viewLockedUntilFrame = 0u; m_currentHeightAboveGround = 0.0f; m_defaultAngle = 0.0f; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp index 95b1f6fb6f..04a346fa8e 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp @@ -941,7 +941,6 @@ m_infantryPathfindDiameter(6), m_vehiclePathfindDiameter(6), m_supplyCenterSafeRadius(250), m_rebuildDelaySeconds(10), -//Initialization(s) inserted m_distanceRequiresGroup(0.0f), m_sideBuildLists(NULL), m_structuresPoorMod(0.0f), diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp index bece6e43c6..89e57071d7 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp @@ -3030,7 +3030,6 @@ zoneStorageType PathfindZoneManager::getEffectiveZone( LocomotorSurfaceTypeMask } //-------------------- PathfindLayer ---------------------------------------- PathfindLayer::PathfindLayer() : m_blockOfMapCells(NULL), m_layerCells(NULL), m_bridge(NULL), -// Initializations inserted m_destroyed(FALSE), m_height(0), m_width(0), diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp index 2914915c73..073f5b4fd0 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp @@ -280,13 +280,9 @@ TurretAI::TurretAI(Object* owner, const TurretAIData* data, WhichTurretType tur) m_enabled(!data->m_initiallyDisabled), m_firesWhileTurning(data->m_firesWhileTurning), m_isForceAttacking(false), - //Initialization(s) inserted m_victimInitialTeam(NULL) - // { - //Initialization(s) inserted m_continuousFireExpirationFrame = -1; - // if (!m_data) { DEBUG_CRASH(("TurretAI MUST have ModuleData")); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp index cc79ea61b5..6059e774ea 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp @@ -50,10 +50,8 @@ m_exportWithScripts(false), m_isWaterArea(false), m_shouldRender(true), m_selected(false), -//Initializations inserted m_isRiver(FALSE), m_riverStart(0) -// { if (initialAllocation < 2) initialAllocation = 2; m_points = NEW ICoord3D[initialAllocation]; // pool[]ify diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp index 99be0c2193..912cf656cf 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp @@ -927,7 +927,6 @@ m_automaticallyBuild(true), m_priorityBuild(false), m_buildingName(AsciiString::TheEmptyString) { - // Added by Sadullah Nader // these initialized values are necessary!!! m_location.zero(); m_rallyPointOffset.x = 0.0f; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp index 20119a2e0a..e27e302a8f 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp @@ -959,10 +959,8 @@ TerrainLogic::TerrainLogic() { Int i; - //Initialization(s) inserted m_activeBoundary = 0; m_waterGridEnabled = FALSE; - // for( i = 0; i < MAX_DYNAMIC_WATER; ++i ) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp index 4420259c3f..9608352816 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp @@ -52,7 +52,6 @@ ParkingPlaceBehavior::ParkingPlaceBehavior( Thing *thing, const ModuleData* modu { m_gotInfo = false; - //Initializations m_heliRallyPoint.zero(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp index 0bffd3eb1e..0283d17197 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp @@ -121,9 +121,7 @@ PropagandaTowerBehaviorModuleData::PropagandaTowerBehaviorModuleData( void ) PropagandaTowerBehavior::PropagandaTowerBehavior( Thing *thing, const ModuleData *modData ) : UpdateModule( thing, modData ) { - //Initializations inserted m_lastScanFrame = 0; - // m_insideList = NULL; setWakeFrame( getObject(), UPDATE_SLEEP_NONE ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp index a0c78001a7..ceade049b3 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp @@ -68,9 +68,7 @@ SpawnBehavior::SpawnBehavior( Thing *thing, const ModuleData* moduleData ) //looping back to the beginning m_framesToWait = 0; - //Initialization(s) inserted m_firstBatchCount = 0; - // if( md->m_isOneShotData ) m_oneShotCountdown = md->m_spawnNumberData; else diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp index f2bc2d5e07..1fa7150283 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp @@ -56,7 +56,6 @@ CrateCollideModuleData::CrateCollideModuleData() m_executeFX = NULL; m_pickupScience = SCIENCE_INVALID; - // Initializations missing and needed m_executionAnimationTemplate = AsciiString::TheEmptyString; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp index d5f001957b..44c7af5f3c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp @@ -131,10 +131,8 @@ OpenContain::OpenContain( Thing *thing, const ModuleData* moduleData ) : UpdateM m_stealthUnitsContained = 0; m_doorCloseCountdown = 0; - //Initializations inserted m_rallyPoint.zero(); m_rallyPointExists = FALSE; - // m_conditionState.clear(); m_firePointStart = -1; m_firePointNext = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp index 4fbb3c9dde..65c56698bb 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp @@ -100,7 +100,6 @@ ParachuteContain::ParachuteContain( Thing *thing, const ModuleData *moduleData ) m_isLandingOverrideSet = FALSE; m_startZ = NO_START_Z; - //Initializations m_landingOverride.zero(); m_paraAttachBone.zero(); m_paraAttachOffset.zero(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp index 0ac49ce212..7c8dd524d6 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp @@ -39,7 +39,6 @@ GhostObjectManager *TheGhostObjectManager = NULL; //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- GhostObject::GhostObject(void): -//Initializations missing and needed m_parentAngle(0.0f), // TheSuperHackers @bugfix tomsons26 26/04/2025 Change initialization of m_parentGeometryIsSmall from 0.0f. // Assigning a float to a bool results in the compiler using a random 1 byte value to assign to the bool. diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp index 00295615cf..2b7b96b974 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp @@ -672,7 +672,6 @@ Locomotor::Locomotor(const LocomotorTemplate* tmpl) //------------------------------------------------------------------------------------------------- Locomotor::Locomotor(const Locomotor& that) { - //Initializations m_angleOffset = 0.0f; m_maintainPos.zero(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp index b28e8387ea..4d6967e68d 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp @@ -231,10 +231,8 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu Int i, modIdx; AsciiString modName; - //Initializations inserted m_formationOffset.x = m_formationOffset.y = 0.0f; m_iPos.zero(); - // for (i = 0; i < MAX_PLAYER_COUNT; ++i) { m_visionSpiedBy[i] = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp index 5d05bb77ca..e300702eb7 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp @@ -257,8 +257,6 @@ class DeliverPayloadNugget : public ObjectCreationNugget { //Note: m_data is constructed with default values. - // Added by Sadullah Nader - // Initialization missing and needed m_payload.clear(); m_putInContainerName.clear(); @@ -778,7 +776,6 @@ class GenericObjectCreationNugget : public ObjectCreationNugget m_preserveLayer(true), m_objectCount(0) { - // Change Made by Sadullah Nader // for init purposes, easier to read m_offset.zero(); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp index af1a49ffcc..26dbfab45a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp @@ -1226,9 +1226,7 @@ void CellAndObjectIntersection::removeAllCoverage() //----------------------------------------------------------------------------- PartitionCell::PartitionCell() { - //Initializations inserted m_cellX = m_cellY = 0; - // m_firstCoiInCell = NULL; m_coiCount = 0; #ifdef PM_CACHE_TERRAIN_HEIGHT diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp index ea63bc9a0b..bed1f886bb 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp @@ -120,7 +120,6 @@ DeliverPayloadAIUpdate::DeliverPayloadAIUpdate( Thing *thing, const ModuleData* m_freeToExit = FALSE; m_acceptingCommands = TRUE; - // Initialization missing and needed m_diveState = DIVESTATE_PREDIVE; 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 65307b94df..1fa9bc5618 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp @@ -384,7 +384,6 @@ class DozerActionDoActionState : public State DozerActionDoActionState( StateMachine *machine, DozerTask task ) : State( machine, "DozerActionDoActionState" ) { m_task = task; - // Initializations missing and needed m_enterFrame = 0; } virtual StateReturnType update( void ); 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 087fc34ad9..4e3b24a426 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp @@ -1857,9 +1857,7 @@ JetAIUpdate::JetAIUpdate( Thing *thing, const ModuleData* moduleData ) : AIUpdat m_lockonDrawable = NULL; m_landingPosForHelipadStuff.zero(); - //Initializations missing and needed m_producerLocation.zero(); - // m_enginesOn = TRUE; } 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 abf6257c7b..c55df5bd96 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp @@ -87,11 +87,8 @@ WorkerAIUpdate::WorkerAIUpdate( Thing *thing, const ModuleData* moduleData ) : // // initialize the dozer machine to NULL, we want to do this and create it during the update // implementation because at this point we don't have the object all setup - // - //Initialization(s) inserted m_isRebuild = FALSE; - // m_dozerMachine = NULL; for( Int i = 0; i < DOZER_NUM_TASKS; i++ ) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp index d97f23d63d..32eecb2716 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp @@ -156,7 +156,6 @@ BattlePlanUpdate::BattlePlanUpdate( Thing *thing, const ModuleData* moduleData ) m_visionObjectID = INVALID_ID; //------------------------// - // Added by Sadullah Nader// //------------------------// m_specialPowerModule = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FlammableUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FlammableUpdate.cpp index 06387187ef..a665abaaa4 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FlammableUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FlammableUpdate.cpp @@ -47,10 +47,7 @@ FlammableUpdateModuleData::FlammableUpdateModuleData() m_aflameDuration = 0; m_aflameDamageDelay = 0; m_aflameDamageAmount = 0; - // Enabled By Sadullah Nader - // Initialization needed m_burningSoundName.clear(); - // m_flameDamageLimitData = 20.0f; m_flameDamageExpirationDelay = LOGICFRAMES_PER_SECOND * 2; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp index c5c2d8853c..89e0dcc82c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp @@ -61,7 +61,6 @@ //------------------------------------------------------------------------------------------------- HelicopterSlowDeathBehaviorModuleData::HelicopterSlowDeathBehaviorModuleData( void ) { - //Initializations missing and needed m_attachParticleBone.clear(); m_bladeBone.clear(); m_bladeObjectName.clear(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp index 322c3ad641..aac30b83c4 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp @@ -157,9 +157,7 @@ HordeUpdate::HordeUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateM m_inHorde = FALSE; m_hasFlag = FALSE; m_lastHordeRefreshFrame = TheGameLogic->getFrame(); - // Initializations missing and needed m_trueHordeMember = FALSE; - // UnsignedInt delay = getHordeUpdateModuleData()->m_updateRate; setWakeFrame(getObject(), UPDATE_SLEEP(GameLogicRandomValue(1, delay))); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp index 8ea2208359..95057d747f 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp @@ -85,7 +85,6 @@ LaserRadiusUpdate::LaserRadiusUpdate() //------------------------------------------------------------------------------------------------- LaserUpdate::LaserUpdate( Thing *thing, const ModuleData* moduleData ) : ClientUpdateModule( thing, moduleData ) { - //Initialization missing and needed m_dirty = FALSE; m_endPos.zero(); m_startPos.zero(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp index e783330ff9..974d94bc21 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp @@ -42,9 +42,7 @@ LifetimeUpdate::LifetimeUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData ) { const LifetimeUpdateModuleData* d = getLifetimeUpdateModuleData(); - // Initializations needed m_dieFrame = 0; - // UnsignedInt delay; if( getObject()->isKindOf( KINDOF_HULK ) && TheGameLogic->getHulkMaxLifetimeOverride() != -1 ) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp index abf32ccdfa..bffb2e3094 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp @@ -86,11 +86,8 @@ ParticleUplinkCannonUpdateModuleData::ParticleUplinkCannonUpdateModuleData() m_manualDrivingSpeed = 0.0f; m_manualFastDrivingSpeed = 0.0f; m_doubleClickToFastDriveDelay = 500; - //Added by Sadullah Nader - //Initializations inserted m_swathOfDeathAmplitude = 0.0f; m_swathOfDeathDistance = 0.0f; - // } //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp index 4a1efbef7f..47d303b1d9 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp @@ -46,7 +46,6 @@ DefaultProductionExitUpdate::DefaultProductionExitUpdate( Thing *thing, const Mo { // no rally point has been set m_rallyPointExists = false; - // Initialization missing and needed m_rallyPoint.zero(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp index 248e74ef3c..ace1f471ba 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp @@ -46,10 +46,8 @@ QueueProductionExitUpdate::QueueProductionExitUpdate( Thing *thing, const Module { m_currentDelay = 0; - //Initializations inserted m_creationClearDistance = 0; m_rallyPoint.zero(); - // // no rally point has been set m_rallyPointExists = false; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp index a7f9621607..feb1650aad 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp @@ -158,10 +158,8 @@ ProductionEntry::ProductionEntry( void ) m_framesUnderConstruction = 0; m_next = NULL; m_prev = NULL; - //Initializations inserted m_productionQuantityProduced = 0; m_productionQuantityTotal = 0; - // } //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp index 861dd1ef4f..49bf1f45e5 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp @@ -69,9 +69,7 @@ //------------------------------------------------------------------------------------------------- SpecialAbilityUpdate::SpecialAbilityUpdate( Thing *thing, const ModuleData* moduleData ) : SpecialPowerUpdateModule( thing, moduleData ) { - //Initialization(s) inserted m_captureFlashPhase = 0.0f; - // m_active = false; m_prepFrames = 0; m_animFrames = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp index 48ec0d4637..b397d811ad 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp @@ -64,10 +64,8 @@ StealthUpdateModuleData::StealthUpdateModuleData() { - //Initialization(s) inserted m_disguiseFX = NULL; m_disguiseRevealFX = NULL; - // m_stealthDelay = UINT_MAX; m_stealthLevel = 0; m_stealthSpeed = 0.0f; @@ -132,9 +130,7 @@ StealthUpdate::StealthUpdate( Thing *thing, const ModuleData* moduleData ) : Upd //Must be enabled manually if using disguise system (bomb truck uses) m_enabled = !data->m_teamDisguised; - //Initialization(s) inserted m_detectionExpiresFrame = 0; - // m_pulsePhaseRate = 0.2f; m_pulsePhase = GameClientRandomValueReal(0, PI); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp index ba7b4c5caa..a94c348d04 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp @@ -56,9 +56,7 @@ StickyBombUpdate::StickyBombUpdate( Thing *thing, const ModuleData *moduleData ) { m_targetID = INVALID_ID; m_dieFrame = 0; - //Initialization(s) inserted m_nextPingFrame = 0; - // setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp index c55dd463bc..11128be257 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp @@ -68,10 +68,8 @@ StructureCollapseUpdate::StructureCollapseUpdate( Thing *thing, const ModuleData m_collapseFrame = 0; m_collapseState = COLLAPSESTATE_STANDING; m_collapseVelocity = 0.0f; - //Initialization(s) inserted m_burstFrame = 0; m_currentHeight = 0.0f; - // setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp index 59603b58a2..f9687f73d7 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp @@ -56,7 +56,6 @@ const Int MAX_IDX = 32; StructureToppleUpdate::StructureToppleUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData ) { - //Initialization(s) inserted m_delayBurstLocation.zero(); m_structuralIntegrity = 0.0f; m_toppleDirection.x = m_toppleDirection.y = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp index 73ae0e3698..7213de9ceb 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp @@ -104,7 +104,6 @@ void ToppleUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) //------------------------------------------------------------------------------------------------- ToppleUpdate::ToppleUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData ) { - //Initialization(s) inserted m_angleDeltaX = 0.0f; m_doBounceFX = FALSE; m_numAngleDeltaX = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp index d6eb788e64..0953261418 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp @@ -58,7 +58,6 @@ // ------------------------------------------------------------------------------------------------ WaveGuideUpdateModuleData::WaveGuideUpdateModuleData( void ) { - //Initialization(s) inserted m_bridgeParticleAngleFudge = 0.0f; m_randomSplashSoundFrequency = 0; m_waveDelay = 0.0f; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp index f814df0578..8dddcb31dd 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp @@ -445,7 +445,6 @@ m_skirmishHumanPlayer(NULL), m_fade(FADE_NONE), m_freezeByScript(FALSE), m_frameObjectCountChanged(0), -//Initializations inserted m_closeWindowTimer(0), m_curFadeFrame(0), m_curFadeValue(0.0f), diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp index 7ee2276e18..628b06e47a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp @@ -635,9 +635,7 @@ m_firstScript(NULL), m_hasWarnings(false), m_isGroupActive(true), m_isGroupSubroutine(false), -//Initializations inserted m_nextGroup(NULL) -// { m_groupName.format("Script Group %d", ScriptList::getNextID()); } @@ -913,10 +911,8 @@ m_hasWarnings(false), m_nextScript(NULL), m_condition(NULL), m_action(NULL), -//Initializations inserted m_actionFalse(NULL), m_curTime(0.0f) -// { } @@ -2245,9 +2241,7 @@ ScriptAction::ScriptAction(): m_actionType(NO_OP), m_hasWarnings(false), m_numParms(0), -//Initializations inserted m_nextAction(NULL) -// { } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp index e08b908958..4a994b2580 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp @@ -218,7 +218,6 @@ void setFPMode( void ) // ------------------------------------------------------------------------------------------------ GameLogic::GameLogic( void ) { - //Initializations missing and necessary m_background = NULL; m_CRC = 0; m_isInUpdate = FALSE; @@ -234,7 +233,6 @@ GameLogic::GameLogic( void ) m_shouldValidateCRCs = FALSE; m_startNewGame = FALSE; - // m_frame = 0; m_hasUpdated = FALSE; @@ -2395,9 +2393,6 @@ void GameLogic::startNewGame( Bool loadingSaveGame ) } } - //Added to fix the quit menu - //ReAllows quit menu to work during loading scene - //setGameLoading(FALSE); setLoadingMap( FALSE ); #ifdef DUMP_PERF_STATS From 875acd250ba35a392f52e50d84864defea78383b Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Mon, 17 Nov 2025 15:55:26 -0500 Subject: [PATCH 3/5] another pass --- Core/GameEngine/Source/GameNetwork/Connection.cpp | 2 -- Core/GameEngine/Source/GameNetwork/DownloadManager.cpp | 5 ----- Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp | 1 - .../Source/GameNetwork/NetCommandWrapperList.cpp | 2 -- Generals/Code/GameEngine/Include/GameLogic/GameLogic.h | 1 - .../Include/GameLogic/Module/DeliverPayloadAIUpdate.h | 3 --- .../Include/GameLogic/Module/DeployStyleAIUpdate.h | 2 -- Generals/Code/GameEngine/Source/Common/GlobalData.cpp | 3 --- .../Code/GameEngine/Source/Common/MultiplayerSettings.cpp | 1 - Generals/Code/GameEngine/Source/Common/PerfTimer.cpp | 1 - .../Source/Common/RTS/ProductionPrerequisite.cpp | 1 - .../Code/GameEngine/Source/Common/System/DataChunk.cpp | 2 -- Generals/Code/GameEngine/Source/GameClient/Display.cpp | 1 - .../Source/GameClient/GUI/ControlBar/ControlBar.cpp | 8 -------- .../Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp | 5 ----- .../GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp | 1 - .../GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp | 2 +- .../Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp | 2 -- .../Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp | 2 -- .../Code/GameEngine/Source/GameClient/GlobalLanguage.cpp | 2 -- .../Source/GameClient/MessageStream/SelectionXlat.cpp | 2 -- .../Code/GameEngine/Source/GameClient/System/Anim2D.cpp | 4 ---- .../GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp | 5 ----- .../Object/Collide/CrateCollide/CrateCollide.cpp | 4 ---- .../Source/GameLogic/Object/ObjectCreationList.cpp | 4 ---- .../Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp | 4 ---- .../Source/GameLogic/Object/Update/BattlePlanUpdate.cpp | 5 ----- GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h | 1 - .../Include/GameLogic/Module/DeliverPayloadAIUpdate.h | 3 --- .../Include/GameLogic/Module/DeployStyleAIUpdate.h | 2 -- GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp | 3 --- GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp | 1 - .../Source/Common/RTS/ProductionPrerequisite.cpp | 1 - .../Code/GameEngine/Source/Common/System/DataChunk.cpp | 2 -- GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp | 1 - .../Source/GameClient/GUI/ControlBar/ControlBar.cpp | 8 -------- .../Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp | 5 ----- .../GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp | 1 - .../GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp | 2 +- .../Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp | 2 -- .../Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp | 2 -- .../Code/GameEngine/Source/GameClient/GlobalLanguage.cpp | 1 - .../Code/GameEngine/Source/GameClient/System/Anim2D.cpp | 4 ---- .../GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp | 5 ----- .../Object/Collide/CrateCollide/CrateCollide.cpp | 4 ---- .../Source/GameLogic/Object/ObjectCreationList.cpp | 4 ---- .../Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp | 4 ---- .../Source/GameLogic/Object/Update/BattlePlanUpdate.cpp | 5 ----- 48 files changed, 2 insertions(+), 134 deletions(-) diff --git a/Core/GameEngine/Source/GameNetwork/Connection.cpp b/Core/GameEngine/Source/GameNetwork/Connection.cpp index 18c56e5f39..fe804e5ae8 100644 --- a/Core/GameEngine/Source/GameNetwork/Connection.cpp +++ b/Core/GameEngine/Source/GameNetwork/Connection.cpp @@ -43,14 +43,12 @@ Connection::Connection() { m_frameGrouping = 1; m_isQuitting = false; m_quitTime = 0; - // clearing out the latency tracker m_averageLatency = 0.0f; Int i; for(i = 0; i < CONNECTION_LATENCY_HISTORY_LENGTH; i++) { m_latencies[i] = 0.0f; } - // End Add } /** diff --git a/Core/GameEngine/Source/GameNetwork/DownloadManager.cpp b/Core/GameEngine/Source/GameNetwork/DownloadManager.cpp index 3b8bf2aea7..b84abac918 100644 --- a/Core/GameEngine/Source/GameNetwork/DownloadManager.cpp +++ b/Core/GameEngine/Source/GameNetwork/DownloadManager.cpp @@ -37,12 +37,7 @@ DownloadManager::DownloadManager() { m_download = NEW CDownload(this); m_wasError = m_sawEnd = false; - - m_queuedDownloads.clear(); - - // - m_statusString = TheGameText->fetch("FTP:StatusIdle"); // ----- Initialize Winsock ----- diff --git a/Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp b/Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp index 504deb14c6..3f9cfa0277 100644 --- a/Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp +++ b/Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp @@ -89,7 +89,6 @@ FirewallHelperClass::FirewallHelperClass(void) m_packetID = 0; m_timeoutLength = 0; m_timeoutStart = 0; - // m_behavior = FIREWALL_TYPE_UNKNOWN; m_lastBehavior = FIREWALL_TYPE_UNKNOWN; diff --git a/Core/GameEngine/Source/GameNetwork/NetCommandWrapperList.cpp b/Core/GameEngine/Source/GameNetwork/NetCommandWrapperList.cpp index bb3693c67a..698a6b3334 100644 --- a/Core/GameEngine/Source/GameNetwork/NetCommandWrapperList.cpp +++ b/Core/GameEngine/Source/GameNetwork/NetCommandWrapperList.cpp @@ -37,8 +37,6 @@ NetCommandWrapperListNode::NetCommandWrapperListNode(NetWrapperCommandMsg *msg) { m_next = NULL; - - m_numChunks = msg->getNumChunks(); m_chunksPresent = NEW Bool[m_numChunks]; // pool[]ify m_numChunksPresent = 0; diff --git a/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h b/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h index 425ea8d3f8..3be65aa4e5 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h +++ b/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h @@ -294,7 +294,6 @@ class GameLogic : public SubsystemInterface, public Snapshot Bool m_shouldValidateCRCs; ///< Should we validate CRCs this frame? //----------------------------------------------------------------------------------------------- - //Used to for load scene Bool m_loadingScene; Bool m_isInUpdate; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h index 3fe51f4e6e..71210ccbbc 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h @@ -204,7 +204,6 @@ class DeliverPayloadAIUpdateModuleData : public AIUpdateModuleData m_deliveryDecalRadius = 0; m_putInContainerName.clear(); - // End Add } static void buildFieldParse(MultiIniFieldParse& p) @@ -295,8 +294,6 @@ class DeliverPayloadData m_visibleDropBoneName.clear(); m_visiblePayloadTemplateName.clear(); m_visibleSubObjectName.clear(); - - // End Add } static const FieldParse* getFieldParse(); diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h index de411fa918..74a90c299a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h @@ -58,9 +58,7 @@ class DeployStyleAIUpdateModuleData : public AIUpdateModuleData m_packTime = 0; m_resetTurretBeforePacking = false; m_turretsFunctionOnlyWhenDeployed = false; - // Initialization necessary m_turretsMustCenterBeforePacking = FALSE; - // End Add } static void buildFieldParse(MultiIniFieldParse& p) diff --git a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp index ab00c4628a..85c7ed2f61 100644 --- a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp +++ b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp @@ -814,9 +814,6 @@ GlobalData::GlobalData() m_drawEntireTerrain = FALSE; m_maxParticleCount = 0; m_maxFieldParticleCount = 30; - - // End Add - m_debugAI = AI_DEBUG_NONE; m_debugSupplyCenterPlacement = FALSE; m_debugAIObstacles = FALSE; diff --git a/Generals/Code/GameEngine/Source/Common/MultiplayerSettings.cpp b/Generals/Code/GameEngine/Source/Common/MultiplayerSettings.cpp index d63ee3c605..92dff9840b 100644 --- a/Generals/Code/GameEngine/Source/Common/MultiplayerSettings.cpp +++ b/Generals/Code/GameEngine/Source/Common/MultiplayerSettings.cpp @@ -75,7 +75,6 @@ MultiplayerSettings::MultiplayerSettings() { m_initialCreditsMin = 5000; - //DID U MEAN m_initialCreditsMax = 10000;? m_initialCreditsMax = 10000; m_maxBeaconsPerPlayer = 3; diff --git a/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp b/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp index 77a9da349d..60c51fc2f0 100644 --- a/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp +++ b/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp @@ -477,7 +477,6 @@ PerfTimer::PerfTimer( const char *identifier, Bool crashWithInfo, Int startFrame m_callCount(0), m_runningTime(0), m_outputInfo(true), - //Intializations inserted m_lastFrame(-1) { } diff --git a/Generals/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp b/Generals/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp index 0d51375428..a5bac329ea 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp @@ -234,7 +234,6 @@ UnicodeString ProductionPrerequisite::getRequiresList(const Player *player) cons Int i; Bool orRequirements[MAX_PREREQ]; - //Added for fix below in getRequiresList //Initializes the OR_WITH_PREV structures for (i = 0; i < MAX_PREREQ; i++) { diff --git a/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp b/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp index cab07499fd..bf5cebac7f 100644 --- a/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp @@ -238,8 +238,6 @@ m_pOut(pOut) tmpFileName.concat(TEMP_FILENAME); m_tmp_file = ::fopen( tmpFileName.str(), "wb" ); m_chunkStack = NULL; - - // End Add } DataChunkOutput::~DataChunkOutput() diff --git a/Generals/Code/GameEngine/Source/GameClient/Display.cpp b/Generals/Code/GameEngine/Source/GameClient/Display.cpp index 0744dc6196..e9acb876df 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Display.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/Display.cpp @@ -66,7 +66,6 @@ Display::Display() m_currentlyPlayingMovie.clear(); m_letterBoxFadeStartTime = 0; - // End Add } /** diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index 85ffc2f698..077e59597c 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -569,9 +569,6 @@ CommandButton::CommandButton( void ) //m_pushedImage = NULL; m_flashCount = 0; - - // The purpose is to initialize these variable to values that are zero or empty - m_conflictingLabel.clear(); m_cursorName.clear(); m_descriptionLabel.clear(); @@ -580,9 +577,6 @@ CommandButton::CommandButton( void ) m_options = 0; m_purchasedLabel.clear(); m_textLabel.clear(); - - // End Add - m_window = NULL; m_commandButtonBorder = COMMAND_BUTTON_BORDER_NONE; //m_prev = NULL; @@ -867,8 +861,6 @@ ControlBar::ControlBar( void ) m_observedPlayer = NULL; m_buildToolTipLayout = NULL; m_showBuildToolTipLayout = FALSE; - - // initializing vars to zero m_animateDownWin1Pos.x = m_animateDownWin1Pos.y = 0; m_animateDownWin1Size.x = m_animateDownWin1Size.y = 0; m_animateDownWin2Pos.x = m_animateDownWin2Pos.y = 0; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp index cc09ce47bc..4f30ab327a 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp @@ -188,11 +188,8 @@ ControlBarSchemeImage::~ControlBarSchemeImage( void ) ControlBarSchemeAnimation::ControlBarSchemeAnimation( void ) { - m_animDuration = 0; m_finalPos.x = m_finalPos.y = 0; - - // End Add m_name.clear(); m_animType = 0; m_animImage = NULL; @@ -300,10 +297,8 @@ ControlBarScheme::ControlBarScheme(void) m_optionsButtonPushed = NULL; m_optionsButtonDisabled = NULL; - m_commandBarBorderColor = 0; - // m_idleWorkerButtonEnable = NULL; m_idleWorkerButtonHightlited = NULL; m_idleWorkerButtonPushed = NULL; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp index ae0b45daaa..1c74082c17 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp @@ -652,7 +652,6 @@ void InitLanGameGadgets( void ) //Tooltip function is being set for techBuildings, and supplyDocks windowMap->winSetTooltipFunc(MapSelectorTooltip); - //End Add for (Int i = 0; i < MAX_SLOTS; i++) { diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp index 94e4da5327..ef209b097c 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp @@ -754,7 +754,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg, updateMenuActions(); //Fix for bug - // close save menuu + // close save menu closeSaveMenu( window ); // diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp index 5e67834560..99fec6d65c 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp @@ -284,8 +284,6 @@ void ToggleQuitMenu() if (TheGameLogic->isIntroMoviePlaying() || TheGameLogic->isLoadingGame() ||TheScriptEngine->isGameEnding()) return; - //End Add - // BGC- If we are currently in the disconnect screen, don't let the quit menu come up. if (TheDisconnectMenu != NULL) { if (TheDisconnectMenu->isScreenVisible() == TRUE) { diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp index 6cd10e2808..2e53294d81 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp @@ -883,9 +883,7 @@ void MultiPlayerLoadScreen::processProgress(Int playerId, Int percentage) //----------------------------------------------------------------------------- GameSpyLoadScreen::GameSpyLoadScreen( void ) { - m_mapPreview = NULL; - for(Int i = 0; i < MAX_SLOTS; ++i) { diff --git a/Generals/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp b/Generals/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp index 14251f8e2d..588028a9d5 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp @@ -128,8 +128,6 @@ GlobalLanguage::GlobalLanguage() m_useHardWrap = FALSE; m_resolutionFontSizeAdjustment = 0.7f; m_resolutionFontSizeMethod = ResolutionFontSizeMethod_Default; - //End Add - m_userResolutionFontSizeAdjustment = -1.0f; } diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp index 0f07ba78bd..58397e0f5d 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp @@ -1238,8 +1238,6 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa return disp; } - - //setDragSelecting(Bool dragSelect) //Added to fix the drag selection problem in control bar //////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp b/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp index f337fe3ea7..3876af68a2 100644 --- a/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp @@ -299,8 +299,6 @@ Anim2D::Anim2D( Anim2DTemplate *animTemplate, Anim2DCollection *collectionSystem // sanity DEBUG_ASSERTCRASH( animTemplate != NULL, ("Anim2D::Anim2D - NULL template") ); - //Initialization - m_currentFrame = 0; // @@ -322,8 +320,6 @@ Anim2D::Anim2D( Anim2DTemplate *animTemplate, Anim2DCollection *collectionSystem m_maxFrame = m_template->getNumFrames() - 1; m_framesBetweenUpdates = m_template->getNumFramesBetweenUpdates(); - // initializing pointers to NULL, and clearing Frame counters before - // we register ourselves to the System m_collectionSystemNext = NULL; m_collectionSystemPrev = NULL; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp index f9a71e54eb..4105cf9600 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp @@ -51,12 +51,7 @@ ParkingPlaceBehavior::ParkingPlaceBehavior( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData ) { m_gotInfo = false; - - m_heliRallyPoint.zero(); - - // - m_heliRallyPointExists = FALSE; m_nextHealFrame = FOREVER; setWakeFrame(getObject(), UPDATE_SLEEP_NONE); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp index dd9f9ccc6e..8d8e7d5081 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp @@ -52,11 +52,7 @@ CrateCollideModuleData::CrateCollideModuleData() m_isHumanOnlyPickup = FALSE; m_executeFX = NULL; m_pickupScience = SCIENCE_INVALID; - - m_executionAnimationTemplate = AsciiString::TheEmptyString; - - // End Add } //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp index 898e1ef4af..d6baeaf124 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp @@ -247,13 +247,9 @@ class DeliverPayloadNugget : public ObjectCreationNugget m_convergenceFactor( 0.0f ) { //Note: m_data is constructed with default values. - - m_payload.clear(); m_putInContainerName.clear(); m_transportName.clear(); - - // End Add } virtual Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, UnsignedInt lifetimeFrames = 0 ) const diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp index ad1905fefa..5dc1dbc7d1 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp @@ -118,11 +118,7 @@ DeliverPayloadAIUpdate::DeliverPayloadAIUpdate( Thing *thing, const ModuleData* m_freeToExit = FALSE; m_acceptingCommands = TRUE; - - m_diveState = DIVESTATE_PREDIVE; - - // End Add } //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp index be1787c394..272d66d77c 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp @@ -154,12 +154,7 @@ BattlePlanUpdate::BattlePlanUpdate( Thing *thing, const ModuleData* moduleData ) m_bonuses->m_invalidKindOf = data->m_invalidMemberKindOf; m_visionObjectID = INVALID_ID; - - //------------------------// - //------------------------// - m_specialPowerModule = NULL; - // } //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h index 71a6683dab..078d331c99 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h @@ -314,7 +314,6 @@ class GameLogic : public SubsystemInterface, public Snapshot Bool m_shouldValidateCRCs; ///< Should we validate CRCs this frame? //----------------------------------------------------------------------------------------------- - //Used to for load scene //Bool m_loadingScene; Bool m_loadingMap; Bool m_loadingSave; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h index 921e7cc2b7..655f889798 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h @@ -206,7 +206,6 @@ class DeliverPayloadAIUpdateModuleData : public AIUpdateModuleData m_deliveryDecalRadius = 0; m_putInContainerName.clear(); - // End Add } static void buildFieldParse(MultiIniFieldParse& p) @@ -297,8 +296,6 @@ class DeliverPayloadData m_visibleDropBoneName.clear(); m_visiblePayloadTemplateName.clear(); m_visibleSubObjectName.clear(); - - // End Add } static const FieldParse* getFieldParse(); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h index c02b0e71ed..d50fc085f1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h @@ -59,9 +59,7 @@ class DeployStyleAIUpdateModuleData : public AIUpdateModuleData m_packTime = 0; m_resetTurretBeforePacking = false; m_turretsFunctionOnlyWhenDeployed = false; - // Initialization necessary m_turretsMustCenterBeforePacking = FALSE; - // End Add m_manualDeployAnimations = FALSE; } diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp index 7bf91ac42d..01a1e71ade 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp @@ -820,9 +820,6 @@ GlobalData::GlobalData() m_drawEntireTerrain = FALSE; m_maxParticleCount = 0; m_maxFieldParticleCount = 30; - - // End Add - m_debugAI = AI_DEBUG_NONE; m_debugSupplyCenterPlacement = FALSE; m_debugAIObstacles = FALSE; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp b/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp index 3b155fd5ab..5f804ad308 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp @@ -557,7 +557,6 @@ PerfTimer::PerfTimer( const char *identifier, Bool crashWithInfo, Int startFrame m_callCount(0), m_runningTime(0), m_outputInfo(true), - //Intializations inserted m_lastFrame(-1) { } diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp index 968ede750b..1c719bf6dc 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp @@ -237,7 +237,6 @@ UnicodeString ProductionPrerequisite::getRequiresList(const Player *player) cons Int i; Bool orRequirements[MAX_PREREQ]; - //Added for fix below in getRequiresList //Initializes the OR_WITH_PREV structures for (i = 0; i < MAX_PREREQ; i++) { diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp index 91159df221..1c16e7f7b2 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp @@ -238,8 +238,6 @@ m_pOut(pOut) tmpFileName.concat(TEMP_FILENAME); m_tmp_file = ::fopen( tmpFileName.str(), "wb" ); m_chunkStack = NULL; - - // End Add } DataChunkOutput::~DataChunkOutput() diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp index 7d516c8c61..1b75c62468 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp @@ -66,7 +66,6 @@ Display::Display() m_currentlyPlayingMovie.clear(); m_letterBoxFadeStartTime = 0; - // End Add } /** diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index 297e303833..001ccf54a0 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -573,9 +573,6 @@ CommandButton::CommandButton( void ) //m_pushedImage = NULL; m_flashCount = 0; - - // The purpose is to initialize these variable to values that are zero or empty - m_conflictingLabel.clear(); m_cursorName.clear(); m_descriptionLabel.clear(); @@ -584,9 +581,6 @@ CommandButton::CommandButton( void ) m_options = 0; m_purchasedLabel.clear(); m_textLabel.clear(); - - // End Add - m_window = NULL; m_commandButtonBorder = COMMAND_BUTTON_BORDER_NONE; //m_prev = NULL; @@ -890,8 +884,6 @@ ControlBar::ControlBar( void ) m_observedPlayer = NULL; m_buildToolTipLayout = NULL; m_showBuildToolTipLayout = FALSE; - - // initializing vars to zero m_animateDownWin1Pos.x = m_animateDownWin1Pos.y = 0; m_animateDownWin1Size.x = m_animateDownWin1Size.y = 0; m_animateDownWin2Pos.x = m_animateDownWin2Pos.y = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp index 815a240b36..dea8303f44 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp @@ -189,11 +189,8 @@ ControlBarSchemeImage::~ControlBarSchemeImage( void ) ControlBarSchemeAnimation::ControlBarSchemeAnimation( void ) { - m_animDuration = 0; m_finalPos.x = m_finalPos.y = 0; - - // End Add m_name.clear(); m_animType = 0; m_animImage = NULL; @@ -302,10 +299,8 @@ ControlBarScheme::ControlBarScheme(void) m_optionsButtonPushed = NULL; m_optionsButtonDisabled = NULL; - m_commandBarBorderColor = 0; - // m_idleWorkerButtonEnable = NULL; m_idleWorkerButtonHightlited = NULL; m_idleWorkerButtonPushed = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp index 87ae45c402..060836452e 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp @@ -722,7 +722,6 @@ void InitLanGameGadgets( void ) //Tooltip function is being set for techBuildings, and supplyDocks windowMap->winSetTooltipFunc(MapSelectorTooltip); - //End Add for (Int i = 0; i < MAX_SLOTS; i++) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp index bc9cb63b1a..d1ce41830a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp @@ -770,7 +770,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg, updateMenuActions(); //Fix for bug - // close save menuu + // close save menu closeSaveMenu( window ); // diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp index 2d4baa25c1..8a4b1f9cf2 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp @@ -284,8 +284,6 @@ void ToggleQuitMenu() if (TheGameLogic->isIntroMoviePlaying() || TheGameLogic->isLoadingMap() ||TheScriptEngine->isGameEnding()) return; - //End Add - // BGC- If we are currently in the disconnect screen, don't let the quit menu come up. if (TheDisconnectMenu != NULL) { if (TheDisconnectMenu->isScreenVisible() == TRUE) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp index 5bf07a9019..80bbdb98e3 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp @@ -1482,9 +1482,7 @@ void MultiPlayerLoadScreen::processProgress(Int playerId, Int percentage) //----------------------------------------------------------------------------- GameSpyLoadScreen::GameSpyLoadScreen( void ) { - m_mapPreview = NULL; - for(Int i = 0; i < MAX_SLOTS; ++i) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp index 2f9708ff82..17c88e9480 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp @@ -130,7 +130,6 @@ GlobalLanguage::GlobalLanguage() m_resolutionFontSizeAdjustment = 0.7f; m_resolutionFontSizeMethod = ResolutionFontSizeMethod_Default; m_militaryCaptionDelayMS = 750; - //End Add m_userResolutionFontSizeAdjustment = -1.0f; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp index bc0b4e050a..6b258ee7bb 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp @@ -299,8 +299,6 @@ Anim2D::Anim2D( Anim2DTemplate *animTemplate, Anim2DCollection *collectionSystem // sanity DEBUG_ASSERTCRASH( animTemplate != NULL, ("Anim2D::Anim2D - NULL template") ); - //Initialization - m_currentFrame = 0; // @@ -322,8 +320,6 @@ Anim2D::Anim2D( Anim2DTemplate *animTemplate, Anim2DCollection *collectionSystem m_maxFrame = m_template->getNumFrames() - 1; m_framesBetweenUpdates = m_template->getNumFramesBetweenUpdates(); - // initializing pointers to NULL, and clearing Frame counters before - // we register ourselves to the System m_collectionSystemNext = NULL; m_collectionSystemPrev = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp index 9608352816..ed1cfc4137 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp @@ -51,12 +51,7 @@ ParkingPlaceBehavior::ParkingPlaceBehavior( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData ) { m_gotInfo = false; - - m_heliRallyPoint.zero(); - - // - m_heliRallyPointExists = FALSE; m_nextHealFrame = FOREVER; setWakeFrame(getObject(), UPDATE_SLEEP_NONE); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp index 1fa7150283..6e4cbf8d39 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp @@ -55,11 +55,7 @@ CrateCollideModuleData::CrateCollideModuleData() m_isHumanOnlyPickup = FALSE; m_executeFX = NULL; m_pickupScience = SCIENCE_INVALID; - - m_executionAnimationTemplate = AsciiString::TheEmptyString; - - // End Add } //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp index e300702eb7..274d5cd05f 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp @@ -256,13 +256,9 @@ class DeliverPayloadNugget : public ObjectCreationNugget m_convergenceFactor( 0.0f ) { //Note: m_data is constructed with default values. - - m_payload.clear(); m_putInContainerName.clear(); m_transportName.clear(); - - // End Add } virtual Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp index bed1f886bb..faa2e6d1d3 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp @@ -119,11 +119,7 @@ DeliverPayloadAIUpdate::DeliverPayloadAIUpdate( Thing *thing, const ModuleData* m_freeToExit = FALSE; m_acceptingCommands = TRUE; - - m_diveState = DIVESTATE_PREDIVE; - - // End Add } //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp index 32eecb2716..c2364b6a52 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp @@ -154,12 +154,7 @@ BattlePlanUpdate::BattlePlanUpdate( Thing *thing, const ModuleData* moduleData ) m_bonuses->m_invalidKindOf = data->m_invalidMemberKindOf; m_visionObjectID = INVALID_ID; - - //------------------------// - //------------------------// - m_specialPowerModule = NULL; - // } //------------------------------------------------------------------------------------------------- From 01a4a7faee5d9cdf28e407ba212543a2a2c7d22e Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Mon, 17 Nov 2025 16:30:44 -0500 Subject: [PATCH 4/5] remove more empty line //s --- Core/GameEngine/Source/Common/Audio/GameAudio.cpp | 1 - Core/GameEngine/Source/GameNetwork/FrameMetrics.cpp | 1 - Core/GameEngine/Source/GameNetwork/GameInfo.cpp | 1 - Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp | 1 - Core/GameEngine/Source/GameNetwork/NAT.cpp | 1 - Core/GameEngine/Source/GameNetwork/NetCommandMsg.cpp | 1 - Core/GameEngine/Source/GameNetwork/Network.cpp | 1 - Generals/Code/GameEngine/Include/GameClient/ControlBar.h | 1 - .../Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp | 1 - Generals/Code/GameEngine/Source/Common/RTS/Player.cpp | 1 - Generals/Code/GameEngine/Source/Common/Recorder.cpp | 1 - Generals/Code/GameEngine/Source/Common/StatsCollector.cpp | 1 - Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp | 1 - Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp | 1 - .../GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp | 1 - .../Code/GameEngine/Source/GameClient/System/ParticleSys.cpp | 2 -- Generals/Code/GameEngine/Source/GameClient/View.cpp | 1 - Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp | 2 -- .../Source/GameLogic/Object/Contain/ParachuteContain.cpp | 1 - Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp | 1 - .../GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/StructureToppleUpdate.cpp | 1 - .../GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/WaveGuideUpdate.cpp | 1 - Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp | 1 - GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h | 1 - .../Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp | 1 - GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp | 1 - GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp | 1 - GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp | 1 - GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp | 1 - GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp | 1 - .../GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp | 1 - .../Code/GameEngine/Source/GameClient/System/ParticleSys.cpp | 2 -- GeneralsMD/Code/GameEngine/Source/GameClient/View.cpp | 1 - GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp | 2 -- .../Source/GameLogic/Object/Contain/ParachuteContain.cpp | 1 - .../Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp | 1 - .../GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp | 1 - .../GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/StructureToppleUpdate.cpp | 1 - .../GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp | 1 - .../Source/GameLogic/Object/Update/WaveGuideUpdate.cpp | 1 - .../Code/GameEngine/Source/GameLogic/System/GameLogic.cpp | 1 - 44 files changed, 48 deletions(-) diff --git a/Core/GameEngine/Source/Common/Audio/GameAudio.cpp b/Core/GameEngine/Source/Common/Audio/GameAudio.cpp index 32a684560d..703422ea63 100644 --- a/Core/GameEngine/Source/Common/Audio/GameAudio.cpp +++ b/Core/GameEngine/Source/Common/Audio/GameAudio.cpp @@ -165,7 +165,6 @@ AudioManager::AudioManager() : m_systemSoundVolume = 0.0f; m_systemSpeechVolume = 0.0f; m_volumeHasChanged = FALSE; - // m_listenerOrientation.set(0.0, 1.0, 0.0); theAudioHandlePool = AHSV_FirstHandle; diff --git a/Core/GameEngine/Source/GameNetwork/FrameMetrics.cpp b/Core/GameEngine/Source/GameNetwork/FrameMetrics.cpp index 324bdebb97..a9a9aca66e 100644 --- a/Core/GameEngine/Source/GameNetwork/FrameMetrics.cpp +++ b/Core/GameEngine/Source/GameNetwork/FrameMetrics.cpp @@ -42,7 +42,6 @@ FrameMetrics::FrameMetrics() m_pendingLatencies = NEW time_t[MAX_FRAMES_AHEAD]; for(Int i = 0; i < MAX_FRAMES_AHEAD; i++) m_pendingLatencies[i] = 0; - // m_fpsList = NEW Real[TheGlobalData->m_networkFPSHistoryLength]; m_latencyList = NEW Real[TheGlobalData->m_networkLatencyHistoryLength]; } diff --git a/Core/GameEngine/Source/GameNetwork/GameInfo.cpp b/Core/GameEngine/Source/GameNetwork/GameInfo.cpp index fce239a698..ad72c6ad51 100644 --- a/Core/GameEngine/Source/GameNetwork/GameInfo.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameInfo.cpp @@ -314,7 +314,6 @@ void GameInfo::reset( void ) m_superweaponRestriction = 0; m_startingCash = TheGlobalData->m_defaultStartingCash; - // for (Int i=0; igetCrusherLevel() > 0 : false; zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), isCrusher, parentCell->getZone()); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp index 719170d341..2cb5300b4a 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp @@ -109,7 +109,6 @@ ParachuteContain::ParachuteContain( Thing *thing, const ModuleData *moduleData ) m_riderSwayBone.zero(); m_riderSwayOffset.zero(); - // const ParachuteContainModuleData* d = getParachuteContainModuleData(); if (d) { diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp index 98f058289f..19f5f61996 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp @@ -663,7 +663,6 @@ Locomotor::Locomotor(const Locomotor& that) m_angleOffset = 0.0f; m_maintainPos.zero(); - // m_template = that.m_template; m_brakingFactor = that.m_brakingFactor; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp index 47f5e4acd3..57057173a9 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp @@ -65,7 +65,6 @@ HelicopterSlowDeathBehaviorModuleData::HelicopterSlowDeathBehaviorModuleData( vo m_bladeBone.clear(); m_bladeObjectName.clear(); m_finalRubbleObject.clear(); - // m_spiralOrbitTurnRate = 0.0f; m_spiralOrbitForwardSpeed = 0.0f; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp index 361b75fa1c..967ac9feb6 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp @@ -59,7 +59,6 @@ StructureToppleUpdate::StructureToppleUpdate( Thing *thing, const ModuleData* mo m_delayBurstLocation.zero(); m_structuralIntegrity = 0.0f; m_toppleDirection.x = m_toppleDirection.y = 0; - // m_toppleFrame = 0; m_toppleState = TOPPLESTATE_STANDING; m_toppleVelocity = 0.0f; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp index d873e5f3ff..8eb909b880 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp @@ -107,7 +107,6 @@ ToppleUpdate::ToppleUpdate( Thing *thing, const ModuleData* moduleData ) : Updat m_angleDeltaX = 0.0f; m_doBounceFX = FALSE; m_numAngleDeltaX = 0; - // m_angularVelocity = 0; m_angularAccumulation = 0; m_angularAcceleration = 0; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp index 99f9d520d7..33737623cb 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp @@ -61,7 +61,6 @@ WaveGuideUpdateModuleData::WaveGuideUpdateModuleData( void ) m_bridgeParticleAngleFudge = 0.0f; m_randomSplashSoundFrequency = 0; m_waveDelay = 0.0f; - // m_ySize = 0.0f; m_linearWaveSpacing = 0.0f; m_waveBendMagnitude = 0.0f; diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp index f479c0e408..f4d267d917 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp @@ -1154,7 +1154,6 @@ void GameLogic::startNewGame( Bool saveGame ) TheMouse->setVisibility(FALSE); m_loadScreen->init(game); - // updateLoadProgress( LOAD_PROGRESS_START ); } } diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h index 497f7b6cdd..d606452cf8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h @@ -471,7 +471,6 @@ class SideSelectWindowData m_upgradeLabel3Win = NULL; m_upgradeLabel4Win = NULL; sideWindow = NULL; - // } ~SideSelectWindowData(void); diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp index 72f550b5e0..e0873b4186 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp @@ -41,7 +41,6 @@ BezFwdIterator::BezFwdIterator(Int stepsDesired, const BezierSegment *bezSeg) mDDDq.zero(); mDDq.zero(); mDq.zero(); - // mStepsDesired = stepsDesired; mBezSeg = (*bezSeg); diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp index 2fda307052..12aa244928 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp @@ -337,7 +337,6 @@ Player::Player( Int playerIndex ) { m_squads[i] = NULL; } - // for (i = 0; i < MAX_PLAYER_COUNT; ++i) { m_attackedBy[i] = false; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp index 643476d74e..fa7d13c35d 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp @@ -372,7 +372,6 @@ RecorderClass::RecorderClass() m_archiveReplays = FALSE; m_nextFrame = 0; m_wasDesync = FALSE; - // init(); // just for the heck of it. } diff --git a/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp b/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp index 3a33079000..b223b53771 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp @@ -80,7 +80,6 @@ StatsCollector::StatsCollector( void ) m_scrollBeginTime = 0; m_scrollTime = 0; - // m_timeCount = 0; m_buildCommands = 0; m_moveCommands = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp index 80bbdb98e3..2f75253223 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp @@ -179,7 +179,6 @@ SinglePlayerLoadScreen::SinglePlayerLoadScreen( void ) m_currentObjectiveLineCharacter = 0; m_finishedObjectiveText = NULL; m_currentObjectiveWidthOffset = 0; - // m_progressBar = NULL; m_percent = NULL; m_videoStream = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp index af25ac032a..f0991a50e2 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp @@ -429,7 +429,6 @@ CursorInfo::CursorInfo( void ) cursorTextColor.red = cursorTextColor.green = cursorTextColor.blue = 0; cursorTextDropColor.red = cursorTextDropColor.blue = cursorTextDropColor.green = 0; - // textureName.clear(); imageName.clear(); W3DModelName.clear(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp index 69b3489888..8d900a3636 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp @@ -145,7 +145,6 @@ LookAtTranslator::LookAtTranslator() : m_anchor.x = m_anchor.y = 0; m_currentPos.x = m_currentPos.y = 0; m_originalAnchor.x = m_originalAnchor.y = 0; - // OptionPreferences prefs; m_screenEdgeScrollMode = prefs.getScreenEdgeScrollMode(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp index fa2909de91..8fe79a70ad 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp @@ -1034,7 +1034,6 @@ ParticleSystem::ParticleSystem( const ParticleSystemTemplate *sysTemplate, m_lastPos.zero(); m_pos.zero(); m_velCoeff.zero(); - // m_attachedToDrawableID = INVALID_DRAWABLE_ID; m_attachedToObjectID = INVALID_ID; @@ -2819,7 +2818,6 @@ ParticleSystemManager::ParticleSystemManager( void ) m_particleCount = 0; m_fieldParticleCount = 0; m_particleSystemCount = 0; - // for( Int i = 0; i < NUM_PARTICLE_PRIORITIES; ++i ) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/View.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/View.cpp index 2b48d0abef..9794560208 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/View.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/View.cpp @@ -56,7 +56,6 @@ View::View( void ) m_snapImmediate = FALSE; m_terrainHeightUnderCamera = 0.0f; m_zoom = 0.0f; - // m_pos.x = 0; m_pos.y = 0; m_width = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp index 89e57071d7..810008b54c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp @@ -3036,7 +3036,6 @@ m_width(0), m_xOrigin(0), m_yOrigin(0), m_zone(0) -// { m_startCell.x = -1; m_startCell.y = -1; @@ -5266,7 +5265,6 @@ Bool Pathfinder::adjustToPossibleDestination(Object *obj, const LocomotorSet& lo return false; } - // Int zone1, zone2; Bool isCrusher = obj ? obj->getCrusherLevel() > 0 : false; zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), isCrusher, parentCell->getZone()); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp index 65c56698bb..f7dbe00973 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp @@ -110,7 +110,6 @@ ParachuteContain::ParachuteContain( Thing *thing, const ModuleData *moduleData ) m_riderSwayBone.zero(); m_riderSwayOffset.zero(); - // const ParachuteContainModuleData* d = getParachuteContainModuleData(); if (d) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp index 2b7b96b974..40ff4732e3 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp @@ -675,7 +675,6 @@ Locomotor::Locomotor(const Locomotor& that) m_angleOffset = 0.0f; m_maintainPos.zero(); - // m_template = that.m_template; m_brakingFactor = that.m_brakingFactor; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp index 89e0dcc82c..03b7d9ed59 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp @@ -65,7 +65,6 @@ HelicopterSlowDeathBehaviorModuleData::HelicopterSlowDeathBehaviorModuleData( vo m_bladeBone.clear(); m_bladeObjectName.clear(); m_finalRubbleObject.clear(); - // m_spiralOrbitTurnRate = 0.0f; m_spiralOrbitForwardSpeed = 0.0f; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp index 95057d747f..60d0baf30e 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp @@ -88,7 +88,6 @@ LaserUpdate::LaserUpdate( Thing *thing, const ModuleData* moduleData ) : ClientU m_dirty = FALSE; m_endPos.zero(); m_startPos.zero(); - // m_particleSystemID = INVALID_PARTICLE_SYSTEM_ID; m_targetParticleSystemID = INVALID_PARTICLE_SYSTEM_ID; m_parentID = INVALID_DRAWABLE_ID; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp index f9687f73d7..9f21794419 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp @@ -59,7 +59,6 @@ StructureToppleUpdate::StructureToppleUpdate( Thing *thing, const ModuleData* mo m_delayBurstLocation.zero(); m_structuralIntegrity = 0.0f; m_toppleDirection.x = m_toppleDirection.y = 0; - // m_toppleFrame = 0; m_toppleState = TOPPLESTATE_STANDING; m_toppleVelocity = 0.0f; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp index 7213de9ceb..7af9b83cfc 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp @@ -107,7 +107,6 @@ ToppleUpdate::ToppleUpdate( Thing *thing, const ModuleData* moduleData ) : Updat m_angleDeltaX = 0.0f; m_doBounceFX = FALSE; m_numAngleDeltaX = 0; - // m_angularVelocity = 0; m_angularAccumulation = 0; m_angularAcceleration = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp index 0953261418..a628657312 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp @@ -61,7 +61,6 @@ WaveGuideUpdateModuleData::WaveGuideUpdateModuleData( void ) m_bridgeParticleAngleFudge = 0.0f; m_randomSplashSoundFrequency = 0; m_waveDelay = 0.0f; - // m_ySize = 0.0f; m_linearWaveSpacing = 0.0f; m_waveBendMagnitude = 0.0f; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp index 4a994b2580..6010601504 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp @@ -1316,7 +1316,6 @@ void GameLogic::startNewGame( Bool loadingSaveGame ) TheMouse->setVisibility(FALSE); m_loadScreen->init(game); - // updateLoadProgress( LOAD_PROGRESS_START ); } } From b4eb3646d99c9758f0f2ce6fae783de745d86e4a Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Mon, 17 Nov 2025 17:10:00 -0500 Subject: [PATCH 5/5] more // --- .../GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp | 1 - .../Include/GameLogic/Module/ObjectDefectionHelper.h | 1 - .../Include/GameLogic/Module/StructureCollapseUpdate.h | 2 -- Generals/Code/GameEngine/Source/Common/GlobalData.cpp | 3 +++ .../GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp | 1 - .../GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp | 1 - .../Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp | 2 -- .../Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp | 1 - .../Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp | 1 - .../GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp | 1 - Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp | 1 - Generals/Code/GameEngine/Source/GameClient/GameText.cpp | 1 - Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp | 1 - Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp | 1 - .../Code/GameEngine/Source/GameClient/System/ParticleSys.cpp | 3 --- Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp | 1 - .../GameEngine/Source/GameLogic/Object/PartitionManager.cpp | 1 - .../Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp | 2 -- .../GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp | 1 - .../ProductionExitUpdate/DefaultProductionExitUpdate.cpp | 1 - .../GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp | 1 - .../GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp | 1 - .../GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp | 1 - .../Include/GameLogic/Module/ObjectDefectionHelper.h | 1 - .../Include/GameLogic/Module/StructureCollapseUpdate.h | 2 -- GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp | 3 +++ .../GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp | 1 - .../GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp | 1 - .../Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp | 2 -- .../Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp | 1 - .../Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp | 1 - .../GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp | 1 - .../Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp | 1 - GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp | 1 - GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp | 1 - GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp | 1 - .../Code/GameEngine/Source/GameClient/System/ParticleSys.cpp | 3 --- GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp | 1 - .../GameEngine/Source/GameLogic/Object/PartitionManager.cpp | 1 - .../Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp | 2 -- .../ProductionExitUpdate/DefaultProductionExitUpdate.cpp | 1 - .../GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp | 1 - .../GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp | 1 - 43 files changed, 6 insertions(+), 51 deletions(-) diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp index 7724193ebf..4033b3738d 100644 --- a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp @@ -1110,7 +1110,6 @@ void PSPlayerStats::reset( void ) maxQMwinsInARow = 0; QMwinsInARow = 0; - // } //------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h index b2ff1d80b7..27a8ea53fe 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h @@ -65,7 +65,6 @@ class ObjectDefectionHelper : public ObjectHelper m_defectionDetectionFlashPhase = FALSE; m_defectionDetectionStart = 0; m_doDefectorFX = FALSE; - // } // virtual destructor prototype provided by memory pool object diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h index 0da208f453..13c1919e7f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h @@ -75,8 +75,6 @@ class StructureCollapseUpdateModuleData : public UpdateModuleData m_minCollapseDelay = 0; m_maxCollapseDelay = 0; m_minBurstDelay = 9999; - //Redundancy from above - //m_minBurstDelay = 9999; m_maxShudder = 0; m_collapseDamping = 0.0; m_bigBurstFrequency = 0; diff --git a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp index 85c7ed2f61..e7301789f8 100644 --- a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp +++ b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp @@ -574,10 +574,13 @@ GlobalData::GlobalData() m_debugVisibilityTileDuration = LOGICFRAMES_PER_SECOND; m_debugProjectilePath = FALSE; m_debugProjectileTileWidth = 10; + m_debugProjectileTileDuration = LOGICFRAMES_PER_SECOND; m_debugThreatMap = FALSE; m_maxDebugThreat = 5000; + m_debugThreatMapTileDuration = LOGICFRAMES_PER_SECOND; m_debugCashValueMap = FALSE; m_maxDebugValue = 10000; + m_debugCashValueMapTileDuration = LOGICFRAMES_PER_SECOND; m_vTune = false; m_checkForLeaks = TRUE; m_benchmarkTimer = -1; diff --git a/Generals/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp b/Generals/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp index a5bac329ea..a517404274 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp @@ -239,7 +239,6 @@ UnicodeString ProductionPrerequisite::getRequiresList(const Player *player) cons { orRequirements[i] = FALSE; } - // // account for the "or" unit cases, start for loop at 1 for (i = 1; i < cnt; i++) { diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index 077e59597c..8207226b44 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -880,7 +880,6 @@ ControlBar::ControlBar( void ) m_genStarOff = NULL; m_genStarOn = NULL; m_UIDirty = FALSE; - // // m_controlBarResizer = NULL; m_buildUpClockColor = GameMakeColor(0,0,0,100); m_commandBarBorderColor = GameMakeColor(0,0,0,100); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp index ad07027605..3a7a00b9b0 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp @@ -208,7 +208,6 @@ GameWindow *resAcceptMenu = NULL; extern DisplaySettings oldDispSettings, newDispSettings; extern Bool dispChanged; //static time_t timeStarted = 0, currentTime = 0; -// void diffReverseSide( void ); void HandleCanceledDownload( Bool resetDropDown ) @@ -1445,7 +1444,6 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, { QuitMessageBoxYesNo(TheGameText->fetch("GUI:QuitPopupTitle"), TheGameText->fetch("GUI:QuitPopupMessage"),quitCallback,NULL); } - // //#endif } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp index 99fec6d65c..dfd0ac127a 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp @@ -324,7 +324,6 @@ void ToggleQuitMenu() if (quitConfirmationWindow) TheWindowManager->winDestroy(quitConfirmationWindow); quitConfirmationWindow = NULL; - // if ( !TheGameLogic->isInMultiplayerGame() ) TheGameLogic->setGamePaused(FALSE); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp index 78feb17029..481c276985 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp @@ -772,7 +772,6 @@ void finishSinglePlayerInit( void ) TheInGameUI->freeMessageResources(); - // if (s_blankLayout) { s_blankLayout->destroyWindows(); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp index f9e3fcf9a5..aa4d86630e 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp @@ -1026,7 +1026,6 @@ void InitWOLGameGadgets( void ) //Tooltip Function set windowMap->winSetTooltipFunc(MapSelectorTooltip); - // GameWindow *staticTextTitle = TheWindowManager->winGetWindowFromId( parentWOLGameSetup, staticTextTitleID ); if (staticTextTitle) diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp index f8aa0a85f5..72184bfbda 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp @@ -515,7 +515,6 @@ IMEManager::IMEManager() m_pageStart(0), m_selectedIndex(0), m_unicodeIME(FALSE) - // { } diff --git a/Generals/Code/GameEngine/Source/GameClient/GameText.cpp b/Generals/Code/GameEngine/Source/GameClient/GameText.cpp index 5f011a9ae5..a16f3312b6 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GameText.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GameText.cpp @@ -267,7 +267,6 @@ GameTextManager::GameTextManager() m_buffer2[i] = 0; m_buffer3[i] = 0; } - // } //============================================================================ diff --git a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp index eb876d4c35..abe1001bcc 100644 --- a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp @@ -5302,7 +5302,6 @@ FloatingTextData::FloatingTextData(void) m_frameTimeOut = 0; m_pos3D.zero(); m_text.clear(); - // m_dString = TheDisplayStringManager->newDisplayString(); } diff --git a/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp b/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp index 4b03595056..165dd29417 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp @@ -458,7 +458,6 @@ Mouse::Mouse( void ) m_dragTolerance = 0; m_dragTolerance3D = 0; m_dragToleranceMS = 0; - // //m_tooltipString.clear(); // redundant m_displayTooltip = FALSE; diff --git a/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp b/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp index 6d5775851f..832bb538cd 100644 --- a/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp @@ -84,8 +84,6 @@ ParticleInfo::ParticleInfo( void ) m_lifetime = 0; m_particleUpTowardsEmitter = FALSE; - - // } // ------------------------------------------------------------------------------------------------ @@ -828,7 +826,6 @@ ParticleSystemInfo::ParticleSystemInfo() m_slavePosOffset.zero(); m_systemLifetime = 0; - // // some default values for the wind motion values m_windMotion = WIND_MOTION_NOT_USED; m_windAngle = 0.0f; diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp index fd7dc76204..72ba53e678 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp @@ -943,7 +943,6 @@ m_structuresPoorMod(0.0f), m_teamWealthyMod(0.0f), m_aiDozerBoredRadiusModifier(2.0), m_aiCrushesInfantry(true) -// { } diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp index 4b2fd65a2c..8a6fe408f2 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp @@ -3741,7 +3741,6 @@ Bool PartitionManager::tryPosition( const Coord3D *center, // srj sez: // we don't usually find positions on impassable areas. // someday, add bit options for this, like for water. - // { Int cellX = REAL_TO_INT_FLOOR(pos.x / PATHFIND_CELL_SIZE); Int cellY = REAL_TO_INT_FLOOR(pos.y / PATHFIND_CELL_SIZE); 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 22b41b1fc1..597b235a7f 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp @@ -1118,8 +1118,6 @@ StateReturnType DozerPrimaryIdleState::update( void ) // // in theory we would need to "interrupt" whatever it is the Dozer is doing now, but // we know we're in the idle state doing nothing so we don't really need to - // - } else { getMachineOwner()->setWeaponSetFlag(WEAPONSET_MINE_CLEARING_DETAIL);//maybe go clear some mines, if I feel like it Object *mine = findMine(dozer); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp index 37ef32f29b..8b4a9b4ed7 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp @@ -85,7 +85,6 @@ LaserUpdate::LaserUpdate( Thing *thing, const ModuleData* moduleData ) : ClientU m_dirty = FALSE; m_endPos.zero(); m_startPos.zero(); - // m_particleSystemID = INVALID_PARTICLE_SYSTEM_ID; m_targetParticleSystemID = INVALID_PARTICLE_SYSTEM_ID; } diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp index 4258cd1e80..ffc97036c4 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp @@ -49,7 +49,6 @@ DefaultProductionExitUpdate::DefaultProductionExitUpdate( Thing *thing, const Mo m_rallyPoint.zero(); - // setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER); } diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp index 8eb909b880..02a9a6f81c 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp @@ -363,7 +363,6 @@ UpdateSleepTime ToppleUpdate::update() void ToppleUpdate::onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ) { // Note that other == null means "collide with ground" - // if (other == NULL) return; diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp index 0729634893..95b6957d5b 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp @@ -376,7 +376,6 @@ m_numAttackInfo(0), m_shownMPLocalDefeatWindow(FALSE), m_objectsShouldReceiveDifficultyBonus(TRUE), m_ChooseVictimAlwaysUsesNormal(false) -// { st_CanAppCont = true; st_LastCurrentFrame = st_CurrentFrame = 0; diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp index 21cf65104f..d269b3332a 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp @@ -301,7 +301,6 @@ void GameLogic::prepareNewGame( GameMode gameMode, GameDifficulty diff, Int rank { //Fix for loading game scene setGameLoading(TRUE); - // TheScriptEngine->setGlobalDifficulty(diff); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h index 8de174af6f..8a3985e59a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h @@ -65,7 +65,6 @@ class ObjectDefectionHelper : public ObjectHelper m_defectionDetectionFlashPhase = FALSE; m_defectionDetectionStart = 0; m_doDefectorFX = FALSE; - // } // virtual destructor prototype provided by memory pool object diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h index 4a15af7fdc..aecbb73b41 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h @@ -75,8 +75,6 @@ class StructureCollapseUpdateModuleData : public UpdateModuleData m_minCollapseDelay = 0; m_maxCollapseDelay = 0; m_minBurstDelay = 9999; - //Redundancy from above - //m_minBurstDelay = 9999; m_maxShudder = 0; m_collapseDamping = 0.0; m_bigBurstFrequency = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp index 01a1e71ade..eedbd50362 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp @@ -576,10 +576,13 @@ GlobalData::GlobalData() m_debugVisibilityTileDuration = LOGICFRAMES_PER_SECOND; m_debugProjectilePath = FALSE; m_debugProjectileTileWidth = 10; + m_debugProjectileTileDuration = LOGICFRAMES_PER_SECOND; m_debugThreatMap = FALSE; m_maxDebugThreat = 5000; + m_debugThreatMapTileDuration = LOGICFRAMES_PER_SECOND; m_debugCashValueMap = FALSE; m_maxDebugValue = 10000; + m_debugCashValueMapTileDuration = LOGICFRAMES_PER_SECOND; m_vTune = false; m_checkForLeaks = TRUE; m_benchmarkTimer = -1; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp index 1c719bf6dc..f7480d83e4 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp @@ -242,7 +242,6 @@ UnicodeString ProductionPrerequisite::getRequiresList(const Player *player) cons { orRequirements[i] = FALSE; } - // // account for the "or" unit cases, start for loop at 1 for (i = 1; i < cnt; i++) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index 001ccf54a0..b24a08c3b5 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -903,7 +903,6 @@ ControlBar::ControlBar( void ) m_genStarOff = NULL; m_genStarOn = NULL; m_UIDirty = FALSE; - // // m_controlBarResizer = NULL; m_buildUpClockColor = GameMakeColor(0,0,0,100); m_commandBarBorderColor = GameMakeColor(0,0,0,100); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp index ed5c922389..255b5e88b7 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp @@ -216,7 +216,6 @@ GameWindow *resAcceptMenu = NULL; extern DisplaySettings oldDispSettings, newDispSettings; extern Bool dispChanged; //static time_t timeStarted = 0, currentTime = 0; -// void diffReverseSide( void ); void HandleCanceledDownload( Bool resetDropDown ) @@ -1529,7 +1528,6 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, { QuitMessageBoxYesNo(TheGameText->fetch("GUI:QuitPopupTitle"), TheGameText->fetch("GUI:QuitPopupMessage"),quitCallback,NULL); } - // //#endif } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp index 8a4b1f9cf2..48be48a09c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp @@ -324,7 +324,6 @@ void ToggleQuitMenu() if (quitConfirmationWindow) TheWindowManager->winDestroy(quitConfirmationWindow); quitConfirmationWindow = NULL; - // if ( !TheGameLogic->isInMultiplayerGame() ) TheGameLogic->setGamePaused(FALSE); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp index dd4193685f..7dea9139b9 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp @@ -948,7 +948,6 @@ void finishSinglePlayerInit( void ) TheInGameUI->freeMessageResources(); - // if (s_blankLayout) { s_blankLayout->destroyWindows(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp index 1dd720d19c..a2ae4aac68 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp @@ -1175,7 +1175,6 @@ void InitWOLGameGadgets( void ) //Tooltip Function set windowMap->winSetTooltipFunc(MapSelectorTooltip); - // GameWindow *staticTextTitle = TheWindowManager->winGetWindowFromId( parentWOLGameSetup, staticTextTitleID ); if (staticTextTitle) diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp index 05046a2706..06104fccee 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp @@ -515,7 +515,6 @@ IMEManager::IMEManager() m_pageStart(0), m_selectedIndex(0), m_unicodeIME(FALSE) - // { } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp index 6a95e712d3..9ad7db1c8a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp @@ -267,7 +267,6 @@ GameTextManager::GameTextManager() m_buffer2[i] = 0; m_buffer3[i] = 0; } - // } //============================================================================ diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp index 7e511ba0db..f77fb4e6d9 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp @@ -5475,7 +5475,6 @@ FloatingTextData::FloatingTextData(void) m_frameTimeOut = 0; m_pos3D.zero(); m_text.clear(); - // m_dString = TheDisplayStringManager->newDisplayString(); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp index f0991a50e2..d8433b8a05 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp @@ -458,7 +458,6 @@ Mouse::Mouse( void ) m_dragTolerance = 0; m_dragTolerance3D = 0; m_dragToleranceMS = 0; - // //m_tooltipString.clear(); // redundant m_displayTooltip = FALSE; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp index 8fe79a70ad..5c139ed7a9 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp @@ -84,8 +84,6 @@ ParticleInfo::ParticleInfo( void ) m_lifetime = 0; m_particleUpTowardsEmitter = FALSE; - - // } // ------------------------------------------------------------------------------------------------ @@ -730,7 +728,6 @@ ParticleSystemInfo::ParticleSystemInfo() m_slavePosOffset.zero(); m_systemLifetime = 0; - // // some default values for the wind motion values m_windMotion = WIND_MOTION_NOT_USED; m_windAngle = 0.0f; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp index 04a346fa8e..fa9ad40747 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp @@ -949,7 +949,6 @@ m_aiDozerBoredRadiusModifier(2.0), m_aiCrushesInfantry(true), m_maxRetaliateDistance(210.0f), m_retaliateFriendsRadius(120.0f) -// { } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp index 26dbfab45a..e102810b45 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp @@ -3774,7 +3774,6 @@ Bool PartitionManager::tryPosition( const Coord3D *center, // srj sez: // we don't usually find positions on impassable areas. // someday, add bit options for this, like for water. - // { Int cellX = REAL_TO_INT_FLOOR(pos.x / PATHFIND_CELL_SIZE); Int cellY = REAL_TO_INT_FLOOR(pos.y / PATHFIND_CELL_SIZE); 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 1fa9bc5618..cae8da0421 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp @@ -1123,8 +1123,6 @@ StateReturnType DozerPrimaryIdleState::update( void ) // // in theory we would need to "interrupt" whatever it is the Dozer is doing now, but // we know we're in the idle state doing nothing so we don't really need to - // - } else { getMachineOwner()->setWeaponSetFlag(WEAPONSET_MINE_CLEARING_DETAIL);//maybe go clear some mines, if I feel like it Object *mine = findMine(dozer); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp index 47d303b1d9..72a59b0f6a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp @@ -49,7 +49,6 @@ DefaultProductionExitUpdate::DefaultProductionExitUpdate( Thing *thing, const Mo m_rallyPoint.zero(); - // setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp index 7af9b83cfc..16e705458e 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp @@ -363,7 +363,6 @@ UpdateSleepTime ToppleUpdate::update() void ToppleUpdate::onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ) { // Note that other == null means "collide with ground" - // if (other == NULL) return; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp index 8dddcb31dd..41b35abe0b 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp @@ -459,7 +459,6 @@ m_numAttackInfo(0), m_shownMPLocalDefeatWindow(FALSE), m_objectsShouldReceiveDifficultyBonus(TRUE), m_ChooseVictimAlwaysUsesNormal(false) -// { st_CanAppCont = true; st_LastCurrentFrame = st_CurrentFrame = 0;