From 98ec5f3ff77a1a2b040b26b785a005ad3d784739 Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Mon, 17 Nov 2025 21:59:50 -0500 Subject: [PATCH 01/14] nit: remove nader comments --- .../Source/Common/Audio/GameAudio.cpp | 2 -- .../Source/Common/System/RAMFile.cpp | 3 --- .../Source/Common/System/XferCRC.cpp | 3 --- .../Source/GameNetwork/Connection.cpp | 3 --- .../Source/GameNetwork/DisconnectManager.cpp | 2 -- .../Source/GameNetwork/DownloadManager.cpp | 3 --- .../Source/GameNetwork/FirewallHelper.cpp | 3 --- .../Source/GameNetwork/FrameData.cpp | 3 --- .../Source/GameNetwork/FrameMetrics.cpp | 3 --- .../GameEngine/Source/GameNetwork/GameInfo.cpp | 3 --- .../Source/GameNetwork/GameSpy/PeerDefs.cpp | 3 --- .../GameSpy/StagingRoomGameInfo.cpp | 2 -- .../GameNetwork/GameSpy/Thread/PeerThread.cpp | 6 ------ .../GameSpy/Thread/PersistentStorageThread.cpp | 2 -- .../Source/GameNetwork/LANGameInfo.cpp | 3 --- Core/GameEngine/Source/GameNetwork/NAT.cpp | 3 --- .../Source/GameNetwork/NetCommandMsg.cpp | 9 --------- .../GameNetwork/NetCommandWrapperList.cpp | 3 --- Core/GameEngine/Source/GameNetwork/Network.cpp | 3 --- .../Code/GameEngine/Include/Common/Geometry.h | 3 --- Generals/Code/GameEngine/Include/Common/INI.h | 3 --- .../GameEngine/Include/GameClient/ControlBar.h | 3 --- .../Include/GameClient/SelectionXlat.h | 3 --- .../Code/GameEngine/Include/GameClient/View.h | 3 --- .../GameEngine/Include/GameLogic/AIGuard.h | 2 -- .../GameEngine/Include/GameLogic/AIPlayer.h | 3 --- .../GameEngine/Include/GameLogic/GameLogic.h | 3 --- .../Include/GameLogic/Module/CreateCrateDie.h | 2 -- .../GameLogic/Module/DeliverPayloadAIUpdate.h | 6 ------ .../GameLogic/Module/DeployStyleAIUpdate.h | 3 --- .../GameLogic/Module/HackInternetAIUpdate.h | 6 ------ .../GameLogic/Module/ObjectDefectionHelper.h | 3 --- .../Include/GameLogic/Module/SpawnBehavior.h | 3 --- .../Include/GameLogic/Module/StealthUpdate.h | 3 --- .../GameLogic/Module/StructureCollapseUpdate.h | 3 --- .../Include/GameLogic/PartitionManager.h | 3 --- .../Source/Common/Bezier/BezFwdIterator.cpp | 3 --- .../GameEngine/Source/Common/GlobalData.cpp | 11 +++-------- .../Source/Common/MultiplayerSettings.cpp | 4 ---- .../Source/Common/PartitionSolver.cpp | 3 --- .../GameEngine/Source/Common/PerfTimer.cpp | 5 ----- .../GameEngine/Source/Common/RTS/Player.cpp | 2 -- .../Common/RTS/ProductionPrerequisite.cpp | 4 ---- .../Source/Common/RTS/ScoreKeeper.cpp | 3 --- .../Code/GameEngine/Source/Common/RTS/Team.cpp | 3 --- .../Code/GameEngine/Source/Common/Recorder.cpp | 3 --- .../Source/Common/StatsCollector.cpp | 3 --- .../Source/Common/System/DataChunk.cpp | 3 --- .../Source/Common/System/Upgrade.cpp | 3 --- .../GameEngine/Source/GameClient/Display.cpp | 3 --- .../GameEngine/Source/GameClient/Drawable.cpp | 8 -------- .../GameClient/GUI/ControlBar/ControlBar.cpp | 6 ------ .../GUI/ControlBar/ControlBarScheme.cpp | 6 ------ .../GUICallbacks/Menus/LanGameOptionsMenu.cpp | 3 --- .../GUI/GUICallbacks/Menus/MainMenu.cpp | 7 ------- .../GUI/GUICallbacks/Menus/PopupSaveLoad.cpp | 9 ++------- .../GUI/GUICallbacks/Menus/QuitMenu.cpp | 9 --------- .../GUI/GUICallbacks/Menus/ScoreScreen.cpp | 3 --- .../Menus/SkirmishGameOptionsMenu.cpp | 4 ---- .../GUICallbacks/Menus/WOLGameSetupMenu.cpp | 3 --- .../Source/GameClient/GUI/GameWindow.cpp | 2 -- .../Source/GameClient/GUI/HeaderTemplate.cpp | 2 -- .../Source/GameClient/GUI/IMEManager.cpp | 3 --- .../Source/GameClient/GUI/LoadScreen.cpp | 18 ------------------ .../Source/GameClient/GUI/Shell/Shell.cpp | 3 --- .../Source/GameClient/GameClient.cpp | 3 --- .../GameEngine/Source/GameClient/GameText.cpp | 2 -- .../Source/GameClient/GlobalLanguage.cpp | 3 --- .../GameEngine/Source/GameClient/InGameUI.cpp | 5 ----- .../Source/GameClient/Input/Mouse.cpp | 7 ------- .../Source/GameClient/MessageStream/HotKey.cpp | 3 --- .../GameClient/MessageStream/LookAtXlat.cpp | 3 --- .../GameClient/MessageStream/SelectionXlat.cpp | 5 ----- .../Source/GameClient/RadiusDecal.cpp | 2 +- .../Source/GameClient/SelectionInfo.cpp | 3 --- .../Source/GameClient/System/Anim2D.cpp | 6 ------ .../Source/GameClient/System/ParticleSys.cpp | 18 ------------------ .../Code/GameEngine/Source/GameClient/View.cpp | 3 --- .../Code/GameEngine/Source/GameLogic/AI/AI.cpp | 3 --- .../Source/GameLogic/AI/AIPathfind.cpp | 4 ---- .../Source/GameLogic/AI/TurretAI.cpp | 6 ------ .../Source/GameLogic/Map/PolygonTrigger.cpp | 3 --- .../Source/GameLogic/Map/SidesList.cpp | 2 -- .../Source/GameLogic/Map/TerrainLogic.cpp | 3 --- .../Object/Behavior/ParkingPlaceBehavior.cpp | 3 --- .../Behavior/PropagandaTowerBehavior.cpp | 3 --- .../Object/Behavior/SpawnBehavior.cpp | 3 --- .../Collide/CrateCollide/CrateCollide.cpp | 3 --- .../GameLogic/Object/Contain/OpenContain.cpp | 3 --- .../Object/Contain/ParachuteContain.cpp | 3 --- .../GameLogic/Object/ExperienceTracker.cpp | 2 +- .../Source/GameLogic/Object/GhostObject.cpp | 2 -- .../Source/GameLogic/Object/Locomotor.cpp | 3 --- .../Source/GameLogic/Object/Object.cpp | 3 --- .../GameLogic/Object/ObjectCreationList.cpp | 14 ++++---------- .../GameLogic/Object/PartitionManager.cpp | 3 --- .../Update/AIUpdate/DeliverPayloadAIUpdate.cpp | 3 --- .../Object/Update/AIUpdate/DozerAIUpdate.cpp | 2 -- .../Object/Update/AIUpdate/JetAIUpdate.cpp | 3 --- .../Object/Update/AIUpdate/WorkerAIUpdate.cpp | 5 ----- .../Object/Update/BattlePlanUpdate.cpp | 4 ---- .../GameLogic/Object/Update/BoneFXUpdate.cpp | 1 - .../Object/Update/FlammableUpdate.cpp | 3 --- .../Update/HelicopterSlowDeathUpdate.cpp | 3 --- .../GameLogic/Object/Update/HordeUpdate.cpp | 3 --- .../GameLogic/Object/Update/LaserUpdate.cpp | 3 --- .../GameLogic/Object/Update/LifetimeUpdate.cpp | 3 --- .../Update/ParticleUplinkCannonUpdate.cpp | 3 --- .../DefaultProductionExitUpdate.cpp | 3 --- .../QueueProductionExitUpdate.cpp | 4 ---- .../Object/Update/ProductionUpdate.cpp | 3 --- .../Object/Update/SpecialAbilityUpdate.cpp | 3 --- .../GameLogic/Object/Update/StealthUpdate.cpp | 3 --- .../Object/Update/StickyBombUpdate.cpp | 3 --- .../Object/Update/StructureCollapseUpdate.cpp | 3 --- .../Object/Update/StructureToppleUpdate.cpp | 3 --- .../GameLogic/Object/Update/ToppleUpdate.cpp | 3 --- .../Object/Update/WaveGuideUpdate.cpp | 3 --- .../GameLogic/ScriptEngine/ScriptEngine.cpp | 3 --- .../Source/GameLogic/ScriptEngine/Scripts.cpp | 9 --------- .../Source/GameLogic/System/GameLogic.cpp | 6 ------ .../GameLogic/System/GameLogicDispatch.cpp | 3 --- .../Code/GameEngine/Include/Common/Geometry.h | 3 --- .../Code/GameEngine/Include/Common/INI.h | 3 --- .../GameEngine/Include/GameClient/ControlBar.h | 3 --- .../Include/GameClient/SelectionXlat.h | 3 --- .../Code/GameEngine/Include/GameClient/View.h | 3 --- .../GameEngine/Include/GameLogic/AIGuard.h | 2 -- .../Include/GameLogic/AIGuardRetaliate.h | 2 -- .../GameEngine/Include/GameLogic/AIPlayer.h | 3 --- .../GameEngine/Include/GameLogic/GameLogic.h | 3 --- .../Include/GameLogic/Module/CreateCrateDie.h | 2 -- .../GameLogic/Module/DeliverPayloadAIUpdate.h | 6 ------ .../GameLogic/Module/DeployStyleAIUpdate.h | 3 --- .../GameLogic/Module/HackInternetAIUpdate.h | 6 ------ .../GameLogic/Module/ObjectDefectionHelper.h | 3 --- .../Include/GameLogic/Module/SpawnBehavior.h | 3 --- .../GameLogic/Module/StructureCollapseUpdate.h | 3 --- .../Include/GameLogic/PartitionManager.h | 3 --- .../Source/Common/Bezier/BezFwdIterator.cpp | 3 --- .../GameEngine/Source/Common/GlobalData.cpp | 11 +++-------- .../Source/Common/PartitionSolver.cpp | 3 --- .../GameEngine/Source/Common/PerfTimer.cpp | 5 ----- .../GameEngine/Source/Common/RTS/Player.cpp | 2 -- .../Common/RTS/ProductionPrerequisite.cpp | 4 ---- .../Source/Common/RTS/ScoreKeeper.cpp | 3 --- .../Code/GameEngine/Source/Common/RTS/Team.cpp | 3 --- .../Code/GameEngine/Source/Common/Recorder.cpp | 3 --- .../Source/Common/StatsCollector.cpp | 3 --- .../Source/Common/System/DataChunk.cpp | 3 --- .../Source/Common/System/Upgrade.cpp | 3 --- .../GameEngine/Source/GameClient/Display.cpp | 3 --- .../GameEngine/Source/GameClient/Drawable.cpp | 7 ------- .../GameClient/GUI/ControlBar/ControlBar.cpp | 6 ------ .../GUI/ControlBar/ControlBarScheme.cpp | 6 ------ .../GUICallbacks/Menus/LanGameOptionsMenu.cpp | 3 --- .../GUI/GUICallbacks/Menus/MainMenu.cpp | 7 ------- .../GUI/GUICallbacks/Menus/PopupSaveLoad.cpp | 7 +------ .../GUI/GUICallbacks/Menus/QuitMenu.cpp | 9 --------- .../GUI/GUICallbacks/Menus/ScoreScreen.cpp | 3 --- .../Menus/SkirmishGameOptionsMenu.cpp | 4 ---- .../GUICallbacks/Menus/WOLGameSetupMenu.cpp | 3 --- .../Source/GameClient/GUI/GameWindow.cpp | 2 -- .../Source/GameClient/GUI/HeaderTemplate.cpp | 2 -- .../Source/GameClient/GUI/IMEManager.cpp | 3 --- .../Source/GameClient/GUI/LoadScreen.cpp | 18 ------------------ .../Source/GameClient/GUI/Shell/Shell.cpp | 3 --- .../Source/GameClient/GameClient.cpp | 3 --- .../GameEngine/Source/GameClient/GameText.cpp | 2 -- .../Source/GameClient/GlobalLanguage.cpp | 3 --- .../GameEngine/Source/GameClient/InGameUI.cpp | 5 ----- .../Source/GameClient/Input/Mouse.cpp | 7 ------- .../Source/GameClient/MessageStream/HotKey.cpp | 3 --- .../GameClient/MessageStream/LookAtXlat.cpp | 3 --- .../GameClient/MessageStream/SelectionXlat.cpp | 5 ----- .../Source/GameClient/RadiusDecal.cpp | 2 +- .../Source/GameClient/System/Anim2D.cpp | 6 ------ .../Source/GameClient/System/ParticleSys.cpp | 18 ------------------ .../Code/GameEngine/Source/GameClient/View.cpp | 3 --- .../Code/GameEngine/Source/GameLogic/AI/AI.cpp | 3 --- .../Source/GameLogic/AI/AIPathfind.cpp | 4 ---- .../Source/GameLogic/AI/TurretAI.cpp | 6 ------ .../Source/GameLogic/Map/PolygonTrigger.cpp | 3 --- .../Source/GameLogic/Map/SidesList.cpp | 2 -- .../Source/GameLogic/Map/TerrainLogic.cpp | 3 --- .../Object/Behavior/ParkingPlaceBehavior.cpp | 3 --- .../Behavior/PropagandaTowerBehavior.cpp | 3 --- .../Object/Behavior/SpawnBehavior.cpp | 3 --- .../Collide/CrateCollide/CrateCollide.cpp | 3 --- .../GameLogic/Object/Contain/OpenContain.cpp | 3 --- .../Object/Contain/ParachuteContain.cpp | 3 --- .../GameLogic/Object/ExperienceTracker.cpp | 2 +- .../Source/GameLogic/Object/GhostObject.cpp | 2 -- .../Source/GameLogic/Object/Locomotor.cpp | 3 --- .../Source/GameLogic/Object/Object.cpp | 3 --- .../GameLogic/Object/ObjectCreationList.cpp | 14 ++++---------- .../GameLogic/Object/PartitionManager.cpp | 3 --- .../GameLogic/Object/Update/AIUpdate.cpp | 4 ---- .../Update/AIUpdate/DeliverPayloadAIUpdate.cpp | 3 --- .../Object/Update/AIUpdate/DozerAIUpdate.cpp | 2 -- .../Object/Update/AIUpdate/JetAIUpdate.cpp | 3 --- .../Object/Update/AIUpdate/WorkerAIUpdate.cpp | 5 ----- .../Object/Update/BattlePlanUpdate.cpp | 4 ---- .../GameLogic/Object/Update/BoneFXUpdate.cpp | 1 - .../Object/Update/FlammableUpdate.cpp | 3 --- .../Update/HelicopterSlowDeathUpdate.cpp | 3 --- .../GameLogic/Object/Update/HordeUpdate.cpp | 3 --- .../GameLogic/Object/Update/LaserUpdate.cpp | 3 --- .../GameLogic/Object/Update/LifetimeUpdate.cpp | 3 --- .../Update/ParticleUplinkCannonUpdate.cpp | 3 --- .../DefaultProductionExitUpdate.cpp | 3 --- .../QueueProductionExitUpdate.cpp | 4 ---- .../Object/Update/ProductionUpdate.cpp | 3 --- .../Object/Update/SpecialAbilityUpdate.cpp | 3 --- .../GameLogic/Object/Update/StealthUpdate.cpp | 6 ------ .../Object/Update/StickyBombUpdate.cpp | 3 --- .../Object/Update/StructureCollapseUpdate.cpp | 3 --- .../Object/Update/StructureToppleUpdate.cpp | 3 --- .../GameLogic/Object/Update/ToppleUpdate.cpp | 3 --- .../Object/Update/WaveGuideUpdate.cpp | 3 --- .../GameLogic/ScriptEngine/ScriptEngine.cpp | 3 --- .../Source/GameLogic/ScriptEngine/Scripts.cpp | 9 --------- .../Source/GameLogic/System/GameLogic.cpp | 6 ------ .../GameLogic/System/GameLogicDispatch.cpp | 3 --- 224 files changed, 21 insertions(+), 859 deletions(-) diff --git a/Core/GameEngine/Source/Common/Audio/GameAudio.cpp b/Core/GameEngine/Source/Common/Audio/GameAudio.cpp index 99d2a649c9..703422ea63 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(); @@ -166,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/Common/System/RAMFile.cpp b/Core/GameEngine/Source/Common/System/RAMFile.cpp index a10b63f5e7..93d5994b45 100644 --- a/Core/GameEngine/Source/Common/System/RAMFile.cpp +++ b/Core/GameEngine/Source/Common/System/RAMFile.cpp @@ -104,10 +104,7 @@ 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..520cd2cc4f 100644 --- a/Core/GameEngine/Source/Common/System/XferCRC.cpp +++ b/Core/GameEngine/Source/Common/System/XferCRC.cpp @@ -42,10 +42,7 @@ 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..fe804e5ae8 100644 --- a/Core/GameEngine/Source/GameNetwork/Connection.cpp +++ b/Core/GameEngine/Source/GameNetwork/Connection.cpp @@ -43,15 +43,12 @@ 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; for(i = 0; i < CONNECTION_LATENCY_HISTORY_LENGTH; i++) { m_latencies[i] = 0.0f; } - // End Add } /** diff --git a/Core/GameEngine/Source/GameNetwork/DisconnectManager.cpp b/Core/GameEngine/Source/GameNetwork/DisconnectManager.cpp index 94268e6386..8bed24c8bc 100644 --- a/Core/GameEngine/Source/GameNetwork/DisconnectManager.cpp +++ b/Core/GameEngine/Source/GameNetwork/DisconnectManager.cpp @@ -38,8 +38,6 @@ DisconnectManager::DisconnectManager() { - // Added By Sadullah Nader - // 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 6bfe74911e..24b35721ba 100644 --- a/Core/GameEngine/Source/GameNetwork/DownloadManager.cpp +++ b/Core/GameEngine/Source/GameNetwork/DownloadManager.cpp @@ -38,12 +38,9 @@ DownloadManager::DownloadManager() m_download = NEW CDownload(this); m_wasError = m_sawEnd = false; - //Added By Sadullah Nader - //Initializations missing and needed m_queuedDownloads.clear(); - // m_statusString = TheGameText->fetch("FTP:StatusIdle"); diff --git a/Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp b/Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp index d8ffb64f34..3f9cfa0277 100644 --- a/Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp +++ b/Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp @@ -83,15 +83,12 @@ FirewallHelperClass * createFirewallHelper() FirewallHelperClass::FirewallHelperClass(void) { - //Added Sadullah Nader - //Initializations missing and needed m_currentTry = 0; m_numManglers = 0; m_numResponses = 0; 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/FrameData.cpp b/Core/GameEngine/Source/GameNetwork/FrameData.cpp index 78a96cd622..da5fef6e76 100644 --- a/Core/GameEngine/Source/GameNetwork/FrameData.cpp +++ b/Core/GameEngine/Source/GameNetwork/FrameData.cpp @@ -37,11 +37,8 @@ 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..a9a9aca66e 100644 --- a/Core/GameEngine/Source/GameNetwork/FrameMetrics.cpp +++ b/Core/GameEngine/Source/GameNetwork/FrameMetrics.cpp @@ -32,8 +32,6 @@ FrameMetrics::FrameMetrics() { - //Added By Sadullah Nader - //Initializations missing and needed m_averageFps = 0.0f; m_averageLatency = 0.0f; m_cushionIndex = 0; @@ -44,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 747d3ec083..ad72c6ad51 100644 --- a/Core/GameEngine/Source/GameNetwork/GameInfo.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameInfo.cpp @@ -307,8 +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. m_mapCRC = 0; @@ -316,7 +314,6 @@ void GameInfo::reset( void ) m_superweaponRestriction = 0; m_startingCash = TheGlobalData->m_defaultStartingCash; - // 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 160e41bd39..069e545c40 100644 --- a/Core/GameEngine/Source/GameNetwork/Network.cpp +++ b/Core/GameEngine/Source/GameNetwork/Network.cpp @@ -265,14 +265,11 @@ NetworkInterface *NetworkInterface::createNetwork() */ Network::Network() { - //Added By Sadullah Nader - //Initializations inserted m_checkCRCsThisFrame = FALSE; m_didSelfSlug = FALSE; m_frameDataReady = FALSE; m_isStalling = FALSE; m_sawCRCMismatch = FALSE; - // m_conMgr = NULL; m_messageWindow = NULL; 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 861f61f7e4..9dcd0352b5 100644 --- a/Generals/Code/GameEngine/Include/Common/INI.h +++ b/Generals/Code/GameEngine/Include/Common/INI.h @@ -138,11 +138,8 @@ 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..e99629bdfc 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h +++ b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h @@ -434,8 +434,6 @@ class SideSelectWindowData public: SideSelectWindowData(void) { - //Added By Sadullah Nader - //Initializations generalSpeak = NULL; m_currColor = 0; m_gereralsNameWin = NULL; @@ -459,7 +457,6 @@ class SideSelectWindowData m_upgradeLabel3Win = NULL; m_upgradeLabel4Win = NULL; sideWindow = NULL; - // } ~SideSelectWindowData(void); diff --git a/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h b/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h index c6df1833a8..846a6e8bbc 100644 --- a/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h +++ b/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h @@ -63,9 +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); void setLeftMouseButton(Bool state); }; diff --git a/Generals/Code/GameEngine/Include/GameClient/View.h b/Generals/Code/GameEngine/Include/GameClient/View.h index 9882babcc3..38f7ece95b 100644 --- a/Generals/Code/GameEngine/Include/GameClient/View.h +++ b/Generals/Code/GameEngine/Include/GameClient/View.h @@ -307,11 +307,8 @@ class ViewLocation ViewLocation() { m_valid = FALSE; - //Added By Sadullah Nader - //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 45d6863d69..9672c5668f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h @@ -78,8 +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..1e42be0603 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h @@ -113,11 +113,8 @@ 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 abfc552b96..0993841d0a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h +++ b/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h @@ -292,9 +292,6 @@ class GameLogic : public SubsystemInterface, public Snapshot std::map m_cachedCRCs; ///< CRCs we've seen this frame Bool m_shouldValidateCRCs; ///< Should we validate CRCs this frame? //----------------------------------------------------------------------------------------------- - - //Added By Sadullah Nader - //Used to for load scene Bool m_loadingScene; Bool m_isInUpdate; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h index 90dccafc31..4cbc1f77b1 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h @@ -46,8 +46,6 @@ class CreateCrateDieModuleData : public DieModuleData CreateCrateDieModuleData() { - // Added By Sadullah Nader - // 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 f82fd57a74..5135981b66 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h @@ -202,11 +202,8 @@ class DeliverPayloadAIUpdateModuleData : public AIUpdateModuleData m_dropOffset.zero(); m_dropVariance.zero(); m_deliveryDecalRadius = 0; - // Added By Sadullah Nader - // Initialization missing and needed m_putInContainerName.clear(); - // End Add } static void buildFieldParse(MultiIniFieldParse& p) @@ -293,14 +290,11 @@ class DeliverPayloadData m_visiblePayloadWeaponTemplate = NULL; m_selfDestructObject = FALSE; m_deliveryDecalRadius = 0; - // Added By Sadullah Nader - // Initialization missing and needed 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 19223d5057..74a90c299a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h @@ -58,10 +58,7 @@ class DeployStyleAIUpdateModuleData : public AIUpdateModuleData m_packTime = 0; m_resetTurretBeforePacking = false; m_turretsFunctionOnlyWhenDeployed = false; - // Added By Sadullah Nader - // Initialization necessary m_turretsMustCenterBeforePacking = FALSE; - // End Add } static void buildFieldParse(MultiIniFieldParse& p) diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h index 7c161b47fa..8599b393c5 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h @@ -46,10 +46,7 @@ class HackInternetState : public State public: HackInternetState( StateMachine *machine ) :State( machine, "HackInternetState" ) { - //Added By Sadullah Nader - //Initializations missing and needed m_framesRemaining = 0; - // } virtual StateReturnType update(); virtual StateReturnType onEnter(); @@ -73,10 +70,7 @@ class PackingState : public State public: PackingState( StateMachine *machine ) : State( machine, "PackingState" ) { - //Added By Sadullah Nader - //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 1037db0bf2..27a8ea53fe 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h @@ -61,13 +61,10 @@ 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; m_defectionDetectionStart = 0; m_doDefectorFX = FALSE; - // } // virtual destructor prototype provided by memory pool object diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h index 3f602420f0..debea0cc3e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h @@ -64,10 +64,7 @@ class SpawnBehaviorModuleData : public BehaviorModuleData { m_spawnNumberData = 0; m_spawnReplaceDelayData = 0; - //Added By Sadullah Nader - //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 87cf4908b3..649e36d359 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h @@ -85,11 +85,8 @@ class StealthUpdateModuleData : public UpdateModuleData StealthUpdateModuleData() { - //Added By Sadullah Nader - //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..13c1919e7f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h @@ -75,9 +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; m_collapseDamping = 0.0; m_bigBurstFrequency = 0; diff --git a/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h b/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h index f924fa3a0a..4b26a65620 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h +++ b/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h @@ -1109,10 +1109,7 @@ class PartitionFilterGarrisonable : public PartitionFilter public: PartitionFilterGarrisonable( Bool match ) : m_match(match) { - //Added By Sadullah Nader - //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..6f36736445 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,12 +37,10 @@ BezFwdIterator::BezFwdIterator(): mStep(0), mStepsDesired(0) //------------------------------------------------------------------------------------------------- BezFwdIterator::BezFwdIterator(Int stepsDesired, const BezierSegment *bezSeg) { - // Added by Sadullah Nader mCurrPoint.zero(); mDDDq.zero(); mDDq.zero(); mDq.zero(); - // mStepsDesired = stepsDesired; mBezSeg = (*bezSeg); diff --git a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp index 4b72223877..b524134369 100644 --- a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp +++ b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp @@ -574,13 +574,13 @@ GlobalData::GlobalData() m_debugVisibilityTileDuration = LOGICFRAMES_PER_SECOND; m_debugProjectilePath = FALSE; m_debugProjectileTileWidth = 10; - m_debugProjectileTileDuration = LOGICFRAMES_PER_SECOND; // Changed By Sadullah Nader + m_debugProjectileTileDuration = LOGICFRAMES_PER_SECOND; m_debugThreatMap = FALSE; m_maxDebugThreat = 5000; - m_debugThreatMapTileDuration = LOGICFRAMES_PER_SECOND; // Changed By Sadullah Nader + m_debugThreatMapTileDuration = LOGICFRAMES_PER_SECOND; m_debugCashValueMap = FALSE; m_maxDebugValue = 10000; - m_debugCashValueMapTileDuration = LOGICFRAMES_PER_SECOND; // Changed By Sadullah Nader + m_debugCashValueMapTileDuration = LOGICFRAMES_PER_SECOND; m_vTune = false; m_checkForLeaks = TRUE; m_benchmarkTimer = -1; @@ -684,8 +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,8 +795,6 @@ GlobalData::GlobalData() m_autoSmokeParticleLargeMax = 0; m_autoAflameParticleMax = 0; - // Added By Sadullah Nader - // Initializations missing and needed m_autoFireParticleSmallPrefix.clear(); m_autoFireParticleMediumPrefix.clear(); m_autoFireParticleLargePrefix.clear(); @@ -822,7 +818,6 @@ GlobalData::GlobalData() m_maxParticleCount = 0; m_maxFieldParticleCount = 30; - // End Add m_debugAI = AI_DEBUG_NONE; m_debugSupplyCenterPlacement = FALSE; diff --git a/Generals/Code/GameEngine/Source/Common/MultiplayerSettings.cpp b/Generals/Code/GameEngine/Source/Common/MultiplayerSettings.cpp index 9b410ab632..92dff9840b 100644 --- a/Generals/Code/GameEngine/Source/Common/MultiplayerSettings.cpp +++ b/Generals/Code/GameEngine/Source/Common/MultiplayerSettings.cpp @@ -75,12 +75,8 @@ 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 27de4d19df..f33969a3b7 100644 --- a/Generals/Code/GameEngine/Source/Common/PartitionSolver.cpp +++ b/Generals/Code/GameEngine/Source/Common/PartitionSolver.cpp @@ -63,10 +63,7 @@ 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; - // } void PartitionSolver::solve(void) diff --git a/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp b/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp index 41e5557df0..60c51fc2f0 100644 --- a/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp +++ b/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp @@ -232,10 +232,7 @@ PerfGather::PerfGather(const char *identifier) : m_next(0), m_prev(0) { - //Added By Sadullah Nader - //Initializations inserted m_ignore = FALSE; - // DEBUG_ASSERTCRASH(strchr(m_identifier, ',') == NULL, ("PerfGather names must not contain commas")); addToList(); } @@ -480,8 +477,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/Player.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp index 4803ccc2fd..50c8a7b590 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..bc70cbb12b 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp @@ -234,14 +234,10 @@ UnicodeString ProductionPrerequisite::getRequiresList(const Player *player) cons Int i; 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++) { 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/Common/RTS/ScoreKeeper.cpp b/Generals/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp index 8810dcfbd2..0056c1f7e0 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp @@ -102,10 +102,7 @@ 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; - // 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 2d75320064..0b2121a25c 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp @@ -1316,11 +1316,8 @@ Team::Team(TeamPrototype *proto, TeamID id ) : m_curUnits(0), m_wasIdle(false) { - //Added By Sadullah Nader - //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 04be1d230e..54be3c893a 100644 --- a/Generals/Code/GameEngine/Source/Common/Recorder.cpp +++ b/Generals/Code/GameEngine/Source/Common/Recorder.cpp @@ -368,13 +368,10 @@ RecorderClass::RecorderClass() m_file = NULL; m_fileName.clear(); m_currentFilePosition = 0; - //Added By Sadullah Nader - //Initializtion(s) inserted m_doingAnalysis = FALSE; m_archiveReplays = FALSE; m_nextFrame = 0; m_wasDesync = FALSE; - // init(); // just for the heck of it. } diff --git a/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp b/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp index cc05f9c297..c4bf0d3c89 100644 --- a/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp +++ b/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp @@ -76,13 +76,10 @@ static char statsDir[255] = "Stats\\"; //============================================================================= StatsCollector::StatsCollector( void ) { - //Added By Sadullah Nader - //Initialization(s) inserted m_isScrolling = FALSE; m_scrollBeginTime = 0; m_scrollTime = 0; - // m_timeCount = 0; m_buildCommands = 0; m_moveCommands = 0; diff --git a/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp b/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp index 6a775a5e90..0d10b5fad6 100644 --- a/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp @@ -237,11 +237,8 @@ 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 } DataChunkOutput::~DataChunkOutput() diff --git a/Generals/Code/GameEngine/Source/Common/System/Upgrade.cpp b/Generals/Code/GameEngine/Source/Common/System/Upgrade.cpp index 50064fc556..f3cbb377fe 100644 --- a/Generals/Code/GameEngine/Source/Common/System/Upgrade.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/Upgrade.cpp @@ -131,10 +131,7 @@ const FieldParse UpgradeTemplate::m_upgradeFieldParseTable[] = //------------------------------------------------------------------------------------------------- UpgradeTemplate::UpgradeTemplate( void ) { - //Added By Sadullah Nader - //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..e9acb876df 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Display.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/Display.cpp @@ -64,11 +64,8 @@ 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 eb1aadc85d..22641bd29a 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp @@ -316,11 +316,8 @@ 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; - // // 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 @@ -330,18 +327,13 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatusBits statu Int i; - // Added By Sadullah Nader - // Initialization missing and needed m_flashColor = 0; m_selected = '\0'; - // m_expirationDate = 0; // 0 == never expires m_lastConstructDisplayed = -1.0f; - //Added By Sadullah Nader - //Fix for the building percent m_constructDisplayString = TheDisplayStringManager->newDisplayString(); m_constructDisplayString->setFont(TheFontLibrary->getFont(TheInGameUI->getDrawableCaptionFontName(), TheGlobalLanguageData->adjustFontSize(TheInGameUI->getDrawableCaptionPointSize()), diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index b85f42dc61..f9b0dba991 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -570,8 +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(); m_cursorName.clear(); @@ -582,7 +580,6 @@ CommandButton::CommandButton( void ) m_purchasedLabel.clear(); m_textLabel.clear(); - // End Add m_window = NULL; m_commandButtonBorder = COMMAND_BUTTON_BORDER_NONE; @@ -869,8 +866,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; m_animateDownWin2Pos.x = m_animateDownWin2Pos.y = 0; @@ -890,7 +885,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/ControlBar/ControlBarScheme.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp index 46e14bb6a0..4bbe5a184b 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp @@ -188,13 +188,10 @@ ControlBarSchemeImage::~ControlBarSchemeImage( void ) ControlBarSchemeAnimation::ControlBarSchemeAnimation( void ) { - // Added by Sadullah Nader - // Initializations missing and needed m_animDuration = 0; m_finalPos.x = m_finalPos.y = 0; - // End Add m_name.clear(); m_animType = 0; m_animImage = NULL; @@ -302,12 +299,9 @@ ControlBarScheme::ControlBarScheme(void) m_optionsButtonPushed = NULL; m_optionsButtonDisabled = NULL; - // Added By Sadullah Nader - // Initializations needed 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 ac415e0229..895c568329 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp @@ -649,11 +649,8 @@ 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); - //End Add for (Int i = 0; i < MAX_SLOTS; i++) { 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..9f04230bed 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 ) @@ -681,8 +680,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. //////////////////////////////////////////////////////////////////////////// @@ -1435,9 +1432,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) { quitCallback(); @@ -1447,7 +1441,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/PopupSaveLoad.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp index 9668f2f69d..a77b9722e7 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp @@ -753,9 +753,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg, buttonFrame->winEnable( TRUE ); updateMenuActions(); - //Added By Sadullah Nader - //Fix for bug - // close save menuu + // close save menu closeSaveMenu( window ); // @@ -815,7 +813,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg, buttonFrame->winEnable( TRUE ); updateMenuActions(); - // close save menuu + // close save menu closeSaveMenu( window ); // get save filename @@ -879,9 +877,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 ); doLoadGame(); } 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..b4bb91847d 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp @@ -280,13 +280,9 @@ 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; - //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) { @@ -323,12 +319,9 @@ 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); quitConfirmationWindow = NULL; - // if ( !TheGameLogic->isInMultiplayerGame() ) TheGameLogic->setGamePaused(FALSE); @@ -352,8 +345,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 ce27b26372..1dbab024c7 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp @@ -767,12 +767,9 @@ void finishSinglePlayerInit( void ) } - //Added By Sadullah Nader - //Fix for the black screen text that appears after loading sequence TheInGameUI->freeMessageResources(); - // if (s_blankLayout) { s_blankLayout->destroyWindows(); 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..486199fefc 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp @@ -542,8 +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, UnsignedInt mouse) @@ -873,8 +871,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" UnicodeString temp; 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..50bf038340 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp @@ -1024,10 +1024,7 @@ 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); - // GameWindow *staticTextTitle = TheWindowManager->winGetWindowFromId( parentWOLGameSetup, staticTextTitleID ); if (staticTextTitle) diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp index e371f8ec70..3710e5d5be 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp @@ -1544,8 +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) { //stop drag selecting diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp index c974cbb59c..2f07686158 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp @@ -107,8 +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..72184bfbda 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp @@ -506,8 +506,6 @@ IMEManager::IMEManager() m_result(0), m_indexBase(1), - //Added By Sadullah Nader - //Initializations missing and needed m_compositionCharsDisplayed(0), m_candidateDownArrow(NULL), m_candidateTextArea(NULL), @@ -517,7 +515,6 @@ IMEManager::IMEManager() m_pageStart(0), m_selectedIndex(0), m_unicodeIME(FALSE) - // { } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp index 0c453dce3e..c9b70208a7 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp @@ -154,13 +154,10 @@ void LoadScreen::update( Int percent ) //----------------------------------------------------------------------------- SinglePlayerLoadScreen::SinglePlayerLoadScreen( void ) { - //Added By Sadullah Nader - //Initialization(s) inserted m_currentObjectiveLine = 0; m_currentObjectiveLineCharacter = 0; m_finishedObjectiveText = NULL; m_currentObjectiveWidthOffset = 0; - // m_progressBar = NULL; m_percent = NULL; m_videoStream = NULL; @@ -669,17 +666,11 @@ 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; - // m_progressBars[i] = NULL; m_playerNames[i] = NULL; m_playerSide[i]= NULL; @@ -892,19 +883,13 @@ void MultiPlayerLoadScreen::processProgress(Int playerId, Int percentage) GameSpyLoadScreen::GameSpyLoadScreen( 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; m_playerRank[i] = NULL; - // m_playerOfficerMedal[i] = NULL; m_progressBars[i] = NULL; @@ -1219,10 +1204,7 @@ void GameSpyLoadScreen::processProgress(Int playerId, Int percentage) //----------------------------------------------------------------------------- MapTransferLoadScreen::MapTransferLoadScreen( void ) { - //Added By Sadullah Nader - //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 1ce4500245..f4d82ffdf6 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp @@ -83,11 +83,8 @@ 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..8f3a55c29c 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GameClient.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GameClient.cpp @@ -98,10 +98,7 @@ GameClient::GameClient() m_numTranslators = 0; m_commandTranslator = NULL; - // Added By Sadullah Nader - // 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 a2437adf52..2ff1ad608f 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GameText.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GameText.cpp @@ -260,8 +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..887381c444 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp @@ -122,15 +122,12 @@ void INI::parseLanguageDefinition( INI *ini ) GlobalLanguage::GlobalLanguage() { m_unicodeFontName.clear(); - //Added By Sadullah Nader - //Initializations missing and needed m_unicodeFontFileName.clear(); m_unicodeFontName.clear(); m_militaryCaptionSpeed = 0; 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/InGameUI.cpp b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp index a9b536a612..55ccd82d19 100644 --- a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp @@ -946,8 +946,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; m_popupMessageData = NULL; @@ -5298,14 +5296,11 @@ void InGameUI::clearPopupMessageData( void ) //------------------------------------------------------------------------------------------------- FloatingTextData::FloatingTextData(void) { - // Added By Sadullah Nader - // Initializations missing and needed m_color = 0; m_frameCount = 0; 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 5cf797257e..916764a2ff 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp @@ -423,15 +423,12 @@ 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(); cursorTextColor.red = cursorTextColor.green = cursorTextColor.blue = 0; cursorTextDropColor.red = cursorTextDropColor.blue = cursorTextDropColor.green = 0; - // textureName.clear(); imageName.clear(); W3DModelName.clear(); @@ -458,13 +455,9 @@ Mouse::Mouse( void ) m_numAxes = 0; m_forceFeedback = FALSE; - //Added By Sadullah Nader - //Initializations missing and needed m_dragTolerance = 0; m_dragTolerance3D = 0; m_dragToleranceMS = 0; - // - //m_tooltipString.clear(); // redundant m_displayTooltip = FALSE; m_tooltipDisplayString = NULL; diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp index 707574dc17..355c037b5a 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp @@ -113,10 +113,7 @@ 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..1f0d4e7cc7 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp @@ -142,12 +142,9 @@ 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; m_originalAnchor.x = m_originalAnchor.y = 0; - // OptionPreferences prefs; m_screenEdgeScrollMode = prefs.getScreenEdgeScrollMode(); diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp index a8acd90d38..daf5d4bd42 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp @@ -265,11 +265,8 @@ 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; - // m_selectCountMap.clear(); TheSelectionTranslator = this; @@ -1242,8 +1239,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 203c37c22c..4cc29191ca 100644 --- a/Generals/Code/GameEngine/Source/GameClient/SelectionInfo.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/SelectionInfo.cpp @@ -63,10 +63,7 @@ SelectionInfo::SelectionInfo() : //------------------------------------------------------------------------------------------------- PickDrawableStruct::PickDrawableStruct() : drawableListToFill(NULL) { - //Added By Sadullah Nader - //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 66d3b6c1bb..580837cbf8 100644 --- a/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp @@ -299,13 +299,9 @@ Anim2D::Anim2D( Anim2DTemplate *animTemplate, Anim2DCollection *collectionSystem // sanity DEBUG_ASSERTCRASH( animTemplate != NULL, ("Anim2D::Anim2D - NULL template") ); - //Added By Sadullah Nader - //Initialization m_currentFrame = 0; - // - // set the template m_template = animTemplate; @@ -323,8 +319,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; m_collectionSystemPrev = NULL; diff --git a/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp b/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp index 4e890d00b9..3224f0f059 100644 --- a/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp @@ -68,8 +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; m_angularRateX = m_angularRateY = m_angularRateZ = 0.0f; @@ -87,7 +85,6 @@ ParticleInfo::ParticleInfo( void ) m_lifetime = 0; m_particleUpTowardsEmitter = FALSE; - // } // ------------------------------------------------------------------------------------------------ @@ -288,10 +285,7 @@ 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(); - // m_windRandomness = info->m_windRandomness; m_particleUpTowardsEmitter = info->m_particleUpTowardsEmitter; m_emitterPos = info->m_emitterPos; @@ -826,8 +820,6 @@ ParticleSystemInfo::ParticleSystemInfo() m_isEmitAboveGroundOnly = false; m_isParticleUpTowardsEmitter = false; - //Added By Sadullah Nader - //Initializations inserted m_driftVelocity.zero(); m_gravity = 0.0f; m_isEmissionVolumeHollow = FALSE; @@ -835,7 +827,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; @@ -1135,12 +1126,9 @@ ParticleSystem::ParticleSystem( const ParticleSystemTemplate *sysTemplate, m_template = sysTemplate; m_systemID = id; - //Added By Sadullah Nader - //Initializations inserted m_lastPos.zero(); m_pos.zero(); m_velCoeff.zero(); - // m_attachedToDrawableID = INVALID_DRAWABLE_ID; m_attachedToObjectID = INVALID_ID; @@ -2881,10 +2869,7 @@ 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,13 +2910,10 @@ ParticleSystemManager::ParticleSystemManager( void ) m_onScreenParticleCount = 0; m_localPlayerIndex = 0; - //Added By Sadullah Nader - //Initializations inserted m_lastLogicFrameUpdate = 0; m_particleCount = 0; m_fieldParticleCount = 0; m_particleSystemCount = 0; - // for( Int i = 0; i < NUM_PARTICLE_PRIORITIES; ++i ) { diff --git a/Generals/Code/GameEngine/Source/GameClient/View.cpp b/Generals/Code/GameEngine/Source/GameClient/View.cpp index 69b7600537..d0c6ca1cd9 100644 --- a/Generals/Code/GameEngine/Source/GameClient/View.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/View.cpp @@ -41,8 +41,6 @@ View *TheTacticalView = NULL; View::View( void ) { - //Added By Sadullah Nader - //Initialization(s) inserted m_viewLockedUntilFrame = 0u; m_currentHeightAboveGround = 0.0f; m_defaultAngle = 0.0f; @@ -58,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/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp index 5cfffbb6a3..72ba53e678 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp @@ -937,15 +937,12 @@ 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), m_structuresPoorMod(0.0f), m_teamWealthyMod(0.0f), m_aiDozerBoredRadiusModifier(2.0), m_aiCrushesInfantry(true) -// { } diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp index 7b344d538c..2b693ac950 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp @@ -2810,15 +2810,12 @@ 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), m_width(0), m_xOrigin(0), m_yOrigin(0), m_zone(0) -// { m_startCell.x = -1; m_startCell.y = -1; @@ -4984,7 +4981,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/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp index 8b55c09218..c9270e8904 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp @@ -280,15 +280,9 @@ 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; - // 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 50acb849db..4026e72869 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp @@ -48,11 +48,8 @@ m_numPoints(0), m_sizePoints(0), m_exportWithScripts(false), m_isWaterArea(false), -//Added By Sadullah Nader -//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..05a7d3adc6 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp @@ -917,8 +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; m_rallyPointOffset.y = 0.0f; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp b/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp index c14a6d30cc..2232756dd7 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp @@ -959,11 +959,8 @@ TerrainLogic::TerrainLogic() { Int i; - //Added By Sadullah Nader - //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 0c2ce6954d..45bd2e20f6 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp @@ -52,12 +52,9 @@ ParkingPlaceBehavior::ParkingPlaceBehavior( Thing *thing, const ModuleData* modu { m_gotInfo = false; - //Added By Sadullah Nader - //Initializations m_heliRallyPoint.zero(); - // m_heliRallyPointExists = FALSE; m_nextHealFrame = FOREVER; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp index 8b940b7d2a..3d0ee6d9b2 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp @@ -119,10 +119,7 @@ PropagandaTowerBehaviorModuleData::PropagandaTowerBehaviorModuleData( void ) PropagandaTowerBehavior::PropagandaTowerBehavior( Thing *thing, const ModuleData *modData ) : UpdateModule( thing, modData ) { - //Added By Sadullah Nader - //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 e7409a19b7..350e7f7866 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp @@ -67,10 +67,7 @@ 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; - // 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 cac8cd3c5a..b868befddd 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp @@ -53,12 +53,9 @@ CrateCollideModuleData::CrateCollideModuleData() m_executeFX = NULL; m_pickupScience = SCIENCE_INVALID; - // Added By Sadullah Nader - // Initializations missing and needed m_executionAnimationTemplate = AsciiString::TheEmptyString; - // End Add } //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp index 4e32ce205e..48a73f62f8 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp @@ -127,11 +127,8 @@ 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; - // 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 fa2e511341..2cb5300b4a 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp @@ -99,8 +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(); m_paraAttachOffset.zero(); @@ -111,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/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..2c7af51476 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp @@ -39,8 +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. // 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 6f010be3b9..19f5f61996 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp @@ -660,12 +660,9 @@ Locomotor::Locomotor(const LocomotorTemplate* tmpl) //------------------------------------------------------------------------------------------------- Locomotor::Locomotor(const Locomotor& that) { - //Added By Sadullah Nader - //Initializations 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/Object.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp index 60b5214dbc..b5a42df29a 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp @@ -213,11 +213,8 @@ 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(); - // 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 f935cc2685..741ccc7444 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp @@ -248,14 +248,10 @@ 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(); m_transportName.clear(); - // End Add } virtual Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, UnsignedInt lifetimeFrames = 0 ) const @@ -754,9 +750,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,10 +762,8 @@ 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 m_offset.zero(); } diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp index f12d71bf52..ce28b73cbe 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp @@ -1221,10 +1221,7 @@ void CellAndObjectIntersection::removeAllCoverage() //----------------------------------------------------------------------------- PartitionCell::PartitionCell() { - //Added By Sadullah Nader - //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 8f6331f8c4..2645681714 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp @@ -119,12 +119,9 @@ DeliverPayloadAIUpdate::DeliverPayloadAIUpdate( Thing *thing, const ModuleData* m_freeToExit = FALSE; m_acceptingCommands = TRUE; - // Added By Sadullah Nader - // Initialization missing and needed m_diveState = DIVESTATE_PREDIVE; - // End Add } //------------------------------------------------------------------------------------------------- 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 c509c0baf6..32aa3ece0f 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp @@ -384,8 +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; } 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 29034934a4..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,10 +1665,7 @@ 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(); - // 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 7b2dfd9eec..4721df43da 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp @@ -87,12 +87,7 @@ 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 - // - - //Added By Sadullah Nader - //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..0213a78492 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp @@ -155,10 +155,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/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/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 0bd22873dd..57057173a9 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp @@ -61,13 +61,10 @@ //------------------------------------------------------------------------------------------------- HelicopterSlowDeathBehaviorModuleData::HelicopterSlowDeathBehaviorModuleData( void ) { - //Added By Sadullah Nader - //Initializations missing and needed m_attachParticleBone.clear(); 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/HordeUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp index 73505c6863..9d1be6984d 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp @@ -157,10 +157,7 @@ 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; - // 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 3cebb0af7a..8b4a9b4ed7 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp @@ -82,12 +82,9 @@ 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(); 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/LifetimeUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp index f1147b5036..c56333c961 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp @@ -42,10 +42,7 @@ LifetimeUpdate::LifetimeUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData ) { const LifetimeUpdateModuleData* d = getLifetimeUpdateModuleData(); - // Added By Sadullah Nader - // 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 3ebe93f320..ad7614d1f1 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 bd137d1630..ffc97036c4 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp @@ -46,12 +46,9 @@ 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(); - // setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER); } 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..bfcab8950b 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp @@ -46,12 +46,8 @@ QueueProductionExitUpdate::QueueProductionExitUpdate( Thing *thing, const Module { m_currentDelay = 0; - //Added By Sadullah Nader - //Initializations inserted m_creationClearDistance = 0; m_rallyPoint.zero(); - // - // no rally point has been set m_rallyPointExists = false; m_currentBurstCount = 0; diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp index 909be605fb..179b61d139 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp @@ -158,11 +158,8 @@ 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 4dda51c050..7a1e167cbc 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp @@ -68,10 +68,7 @@ //------------------------------------------------------------------------------------------------- SpecialAbilityUpdate::SpecialAbilityUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData ) { - //Added By Sadullah Nader - //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 af3dc0064e..f4c6ab7069 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp @@ -99,10 +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; - //Added By Sadullah Nader - //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 2e71aa28f4..0b7ca86706 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp @@ -50,10 +50,7 @@ StickyBombUpdate::StickyBombUpdate( Thing *thing, const ModuleData *moduleData ) { m_targetID = INVALID_ID; m_dieFrame = 0; - //Added By Sadullah Nader - //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 62a4942333..7789f245f4 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp @@ -68,11 +68,8 @@ 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; - // 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 61470e9a32..967ac9feb6 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp @@ -56,12 +56,9 @@ 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; 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 497a4e0680..8eb909b880 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp @@ -104,12 +104,9 @@ 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; 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 0783293471..33737623cb 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp @@ -58,12 +58,9 @@ // ------------------------------------------------------------------------------------------------ WaveGuideUpdateModuleData::WaveGuideUpdateModuleData( void ) { - //Added By Sadullah Nader - //Initialization(s) inserted 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/ScriptEngine/ScriptEngine.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp index 8573b7b181..95b6957d5b 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp @@ -362,8 +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), m_curFadeValue(0.0f), @@ -378,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/ScriptEngine/Scripts.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp index 41b671c5fd..d34da9950e 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp @@ -632,10 +632,7 @@ m_firstScript(NULL), m_hasWarnings(false), m_isGroupActive(true), m_isGroupSubroutine(false), -//Added By Sadullah Nader -//Initializations inserted m_nextGroup(NULL) -// { m_groupName.format("Script Group %d", ScriptList::getNextID()); } @@ -906,11 +903,8 @@ 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,10 +2166,7 @@ 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..6114632ad1 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp @@ -207,8 +207,6 @@ void setFPMode( void ) // ------------------------------------------------------------------------------------------------ GameLogic::GameLogic( void ) { - //Added By Sadullah Nader - //Initializations missing and necessary m_background = NULL; m_CRC = 0; m_isInUpdate = FALSE; @@ -224,7 +222,6 @@ GameLogic::GameLogic( void ) m_shouldValidateCRCs = FALSE; m_startNewGame = FALSE; - // m_frame = 0; m_hasUpdated = FALSE; @@ -1157,7 +1154,6 @@ void GameLogic::startNewGame( Bool saveGame ) TheMouse->setVisibility(FALSE); m_loadScreen->init(game); - // updateLoadProgress( LOAD_PROGRESS_START ); } } @@ -2094,8 +2090,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..425703adc7 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp @@ -299,10 +299,7 @@ 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); - // TheScriptEngine->setGlobalDifficulty(diff); 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 957fd56bae..c4ea2124ca 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/INI.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/INI.h @@ -138,11 +138,8 @@ 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..d606452cf8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h @@ -448,8 +448,6 @@ class SideSelectWindowData public: SideSelectWindowData(void) { - //Added By Sadullah Nader - //Initializations generalSpeak = NULL; m_currColor = 0; m_gereralsNameWin = NULL; @@ -473,7 +471,6 @@ class SideSelectWindowData m_upgradeLabel3Win = NULL; m_upgradeLabel4Win = NULL; sideWindow = NULL; - // } ~SideSelectWindowData(void); diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h b/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h index f3bd0827b7..b400679e55 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h @@ -65,9 +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); void setLeftMouseButton(Bool state); diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/View.h b/GeneralsMD/Code/GameEngine/Include/GameClient/View.h index 1e0f72fbae..7debfe3fd2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/View.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/View.h @@ -311,11 +311,8 @@ class ViewLocation ViewLocation() { m_valid = FALSE; - //Added By Sadullah Nader - //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 a9f6a68501..c8b0597bff 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h @@ -78,8 +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..cc889280cd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h @@ -76,8 +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..c623b5aba3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h @@ -113,11 +113,8 @@ 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 49bbfffc9a..420142129b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h @@ -312,9 +312,6 @@ class GameLogic : public SubsystemInterface, public Snapshot std::map m_cachedCRCs; ///< CRCs we've seen this frame Bool m_shouldValidateCRCs; ///< Should we validate CRCs this frame? //----------------------------------------------------------------------------------------------- - - //Added By Sadullah Nader - //Used to for load scene //Bool m_loadingScene; Bool m_loadingMap; Bool m_loadingSave; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h index 2139b995cb..a5c9f2e21d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h @@ -46,8 +46,6 @@ class CreateCrateDieModuleData : public DieModuleData CreateCrateDieModuleData() { - // Added By Sadullah Nader - // 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 e92b964b6e..26fac5300b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h @@ -204,11 +204,8 @@ class DeliverPayloadAIUpdateModuleData : public AIUpdateModuleData m_dropOffset.zero(); m_dropVariance.zero(); m_deliveryDecalRadius = 0; - // Added By Sadullah Nader - // Initialization missing and needed m_putInContainerName.clear(); - // End Add } static void buildFieldParse(MultiIniFieldParse& p) @@ -295,14 +292,11 @@ class DeliverPayloadData m_visiblePayloadWeaponTemplate = NULL; m_selfDestructObject = FALSE; m_deliveryDecalRadius = 0; - // Added By Sadullah Nader - // Initialization missing and needed 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 d79bccd2f7..d50fc085f1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h @@ -59,10 +59,7 @@ class DeployStyleAIUpdateModuleData : public AIUpdateModuleData m_packTime = 0; m_resetTurretBeforePacking = false; m_turretsFunctionOnlyWhenDeployed = false; - // Added By Sadullah Nader - // Initialization necessary m_turretsMustCenterBeforePacking = FALSE; - // End Add m_manualDeployAnimations = FALSE; } diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h index 6b049d7372..48c3f44b91 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h @@ -46,10 +46,7 @@ class HackInternetState : public State public: HackInternetState( StateMachine *machine ) :State( machine, "HackInternetState" ) { - //Added By Sadullah Nader - //Initializations missing and needed m_framesRemaining = 0; - // } virtual StateReturnType update(); virtual StateReturnType onEnter(); @@ -73,10 +70,7 @@ class PackingState : public State public: PackingState( StateMachine *machine ) : State( machine, "PackingState" ) { - //Added By Sadullah Nader - //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 baa2c45508..8a3985e59a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h @@ -61,13 +61,10 @@ 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; m_defectionDetectionStart = 0; m_doDefectorFX = FALSE; - // } // virtual destructor prototype provided by memory pool object diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h index 131105a662..748355ff15 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h @@ -65,10 +65,7 @@ class SpawnBehaviorModuleData : public BehaviorModuleData { m_spawnNumberData = 0; m_spawnReplaceDelayData = 0; - //Added By Sadullah Nader - //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..aecbb73b41 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h @@ -75,9 +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; m_collapseDamping = 0.0; m_bigBurstFrequency = 0; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h index 978b04950f..00bf6486bd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h @@ -1146,10 +1146,7 @@ class PartitionFilterGarrisonable : public PartitionFilter public: PartitionFilterGarrisonable( Bool match ) : m_match(match) { - //Added By Sadullah Nader - //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..e0873b4186 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,12 +37,10 @@ BezFwdIterator::BezFwdIterator(): mStep(0), mStepsDesired(0) //------------------------------------------------------------------------------------------------- BezFwdIterator::BezFwdIterator(Int stepsDesired, const BezierSegment *bezSeg) { - // Added by Sadullah Nader mCurrPoint.zero(); mDDDq.zero(); mDDq.zero(); mDq.zero(); - // mStepsDesired = stepsDesired; mBezSeg = (*bezSeg); diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp index 071c5debeb..ee29983a34 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp @@ -576,13 +576,13 @@ GlobalData::GlobalData() m_debugVisibilityTileDuration = LOGICFRAMES_PER_SECOND; m_debugProjectilePath = FALSE; m_debugProjectileTileWidth = 10; - m_debugProjectileTileDuration = LOGICFRAMES_PER_SECOND; // Changed By Sadullah Nader + m_debugProjectileTileDuration = LOGICFRAMES_PER_SECOND; m_debugThreatMap = FALSE; m_maxDebugThreat = 5000; - m_debugThreatMapTileDuration = LOGICFRAMES_PER_SECOND; // Changed By Sadullah Nader + m_debugThreatMapTileDuration = LOGICFRAMES_PER_SECOND; m_debugCashValueMap = FALSE; m_maxDebugValue = 10000; - m_debugCashValueMapTileDuration = LOGICFRAMES_PER_SECOND; // Changed By Sadullah Nader + m_debugCashValueMapTileDuration = LOGICFRAMES_PER_SECOND; m_vTune = false; m_checkForLeaks = TRUE; m_benchmarkTimer = -1; @@ -690,8 +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,8 +801,6 @@ GlobalData::GlobalData() m_autoSmokeParticleLargeMax = 0; m_autoAflameParticleMax = 0; - // Added By Sadullah Nader - // Initializations missing and needed m_autoFireParticleSmallPrefix.clear(); m_autoFireParticleMediumPrefix.clear(); m_autoFireParticleLargePrefix.clear(); @@ -828,7 +824,6 @@ GlobalData::GlobalData() m_maxParticleCount = 0; m_maxFieldParticleCount = 30; - // End Add m_debugAI = AI_DEBUG_NONE; m_debugSupplyCenterPlacement = FALSE; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/PartitionSolver.cpp b/GeneralsMD/Code/GameEngine/Source/Common/PartitionSolver.cpp index 3b98cb556e..e51add0e21 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/PartitionSolver.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/PartitionSolver.cpp @@ -63,10 +63,7 @@ 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; - // } void PartitionSolver::solve(void) diff --git a/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp b/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp index e18d2c8eab..5f804ad308 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp @@ -312,10 +312,7 @@ PerfGather::PerfGather(const char *identifier) : m_next(0), m_prev(0) { - //Added By Sadullah Nader - //Initializations inserted m_ignore = FALSE; - // DEBUG_ASSERTCRASH(strchr(m_identifier, ',') == NULL, ("PerfGather names must not contain commas")); addToList(); } @@ -560,8 +557,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/Player.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp index 79f8392c89..c58fd45b18 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..61770bd035 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp @@ -237,14 +237,10 @@ UnicodeString ProductionPrerequisite::getRequiresList(const Player *player) cons Int i; 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++) { 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/Common/RTS/ScoreKeeper.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp index da01c71b0a..41e6d5ceaa 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp @@ -102,10 +102,7 @@ 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; - // 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 a1bb7375a1..b8445c6e3e 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp @@ -1316,11 +1316,8 @@ Team::Team(TeamPrototype *proto, TeamID id ) : m_curUnits(0), m_wasIdle(false) { - //Added By Sadullah Nader - //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 a9d064db43..fa7d13c35d 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp @@ -368,13 +368,10 @@ RecorderClass::RecorderClass() m_file = NULL; m_fileName.clear(); m_currentFilePosition = 0; - //Added By Sadullah Nader - //Initializtion(s) inserted m_doingAnalysis = FALSE; 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 a3395260a7..b223b53771 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp @@ -76,13 +76,10 @@ static char statsDir[255] = "Stats\\"; //============================================================================= StatsCollector::StatsCollector( void ) { - //Added By Sadullah Nader - //Initialization(s) inserted m_isScrolling = FALSE; m_scrollBeginTime = 0; m_scrollTime = 0; - // m_timeCount = 0; m_buildCommands = 0; m_moveCommands = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp index c1378ffeaf..8371459f38 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp @@ -237,11 +237,8 @@ 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 } DataChunkOutput::~DataChunkOutput() diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/Upgrade.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/Upgrade.cpp index 38a4566e30..b93fb4de03 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/Upgrade.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/Upgrade.cpp @@ -131,10 +131,7 @@ const FieldParse UpgradeTemplate::m_upgradeFieldParseTable[] = //------------------------------------------------------------------------------------------------- UpgradeTemplate::UpgradeTemplate( void ) { - //Added By Sadullah Nader - //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..1b75c62468 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp @@ -64,11 +64,8 @@ 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 be5d3cb1fc..967c10ee8a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp @@ -349,8 +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,18 +363,13 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatusBits statu Int i; - // Added By Sadullah Nader - // Initialization missing and needed m_flashColor = 0; m_selected = '\0'; - // m_expirationDate = 0; // 0 == never expires m_lastConstructDisplayed = -1.0f; - //Added By Sadullah Nader - //Fix for the building percent m_constructDisplayString = TheDisplayStringManager->newDisplayString(); m_constructDisplayString->setFont(TheFontLibrary->getFont(TheInGameUI->getDrawableCaptionFontName(), TheGlobalLanguageData->adjustFontSize(TheInGameUI->getDrawableCaptionPointSize()), diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index c357ad30c3..887cd0bcab 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -574,8 +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(); m_cursorName.clear(); @@ -586,7 +584,6 @@ CommandButton::CommandButton( void ) m_purchasedLabel.clear(); m_textLabel.clear(); - // End Add m_window = NULL; m_commandButtonBorder = COMMAND_BUTTON_BORDER_NONE; @@ -892,8 +889,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; m_animateDownWin2Pos.x = m_animateDownWin2Pos.y = 0; @@ -913,7 +908,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/ControlBar/ControlBarScheme.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp index 72018691d7..7235a27ad7 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp @@ -189,13 +189,10 @@ ControlBarSchemeImage::~ControlBarSchemeImage( void ) ControlBarSchemeAnimation::ControlBarSchemeAnimation( void ) { - // Added by Sadullah Nader - // Initializations missing and needed m_animDuration = 0; m_finalPos.x = m_finalPos.y = 0; - // End Add m_name.clear(); m_animType = 0; m_animImage = NULL; @@ -304,12 +301,9 @@ ControlBarScheme::ControlBarScheme(void) m_optionsButtonPushed = NULL; m_optionsButtonDisabled = NULL; - // Added By Sadullah Nader - // Initializations needed 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 62050e0c39..281d1a2902 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp @@ -719,11 +719,8 @@ 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); - //End Add for (Int i = 0; i < MAX_SLOTS; i++) { 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..d25593554e 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 ) @@ -718,8 +717,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. //////////////////////////////////////////////////////////////////////////// @@ -1519,9 +1516,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) { quitCallback(); @@ -1531,7 +1525,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/PopupSaveLoad.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp index 0ed1e4174e..3012c72206 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp @@ -769,9 +769,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg, buttonFrame->winEnable( TRUE ); updateMenuActions(); - //Added By Sadullah Nader - //Fix for bug - // close save menuu + // close save menu closeSaveMenu( window ); // @@ -895,9 +893,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 ); doLoadGame(); } 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..dd164a4c2f 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp @@ -280,13 +280,9 @@ 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; - //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) { @@ -323,12 +319,9 @@ 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); quitConfirmationWindow = NULL; - // if ( !TheGameLogic->isInMultiplayerGame() ) TheGameLogic->setGamePaused(FALSE); @@ -352,8 +345,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..a71f25c014 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp @@ -944,12 +944,9 @@ void finishSinglePlayerInit( void ) } - //Added By Sadullah Nader - //Fix for the black screen text that appears after loading sequence TheInGameUI->freeMessageResources(); - // if (s_blankLayout) { s_blankLayout->destroyWindows(); 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..917aa02862 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp @@ -553,8 +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, UnsignedInt mouse) @@ -885,8 +883,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" UnicodeString temp; 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..f02edac22f 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp @@ -1173,10 +1173,7 @@ void InitWOLGameGadgets( void ) TheWindowManager->winGetWindowFromId(parentWOLGameSetup, labelID)->winEnable( FALSE ); } - //Added By Sadullah Nader - //Tooltip Function set windowMap->winSetTooltipFunc(MapSelectorTooltip); - // GameWindow *staticTextTitle = TheWindowManager->winGetWindowFromId( parentWOLGameSetup, staticTextTitleID ); if (staticTextTitle) diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp index cb3f1a831d..49d7e6ee54 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp @@ -1544,8 +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) { //stop drag selecting diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp index f813d3048d..dfbd9e9c49 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp @@ -107,8 +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..06104fccee 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp @@ -506,8 +506,6 @@ IMEManager::IMEManager() m_result(0), m_indexBase(1), - //Added By Sadullah Nader - //Initializations missing and needed m_compositionCharsDisplayed(0), m_candidateDownArrow(NULL), m_candidateTextArea(NULL), @@ -517,7 +515,6 @@ IMEManager::IMEManager() m_pageStart(0), m_selectedIndex(0), m_unicodeIME(FALSE) - // { } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp index 2613bcf697..9e0629d5a4 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp @@ -175,13 +175,10 @@ void LoadScreen::update( Int percent ) //----------------------------------------------------------------------------- SinglePlayerLoadScreen::SinglePlayerLoadScreen( void ) { - //Added By Sadullah Nader - //Initialization(s) inserted m_currentObjectiveLine = 0; m_currentObjectiveLineCharacter = 0; m_finishedObjectiveText = NULL; m_currentObjectiveWidthOffset = 0; - // m_progressBar = NULL; m_percent = NULL; m_videoStream = NULL; @@ -1225,17 +1222,11 @@ 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; - // m_progressBars[i] = NULL; m_playerNames[i] = NULL; m_playerSide[i]= NULL; @@ -1491,19 +1482,13 @@ void MultiPlayerLoadScreen::processProgress(Int playerId, Int percentage) GameSpyLoadScreen::GameSpyLoadScreen( 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; m_playerRank[i] = NULL; - // m_playerOfficerMedal[i] = NULL; m_progressBars[i] = NULL; @@ -1858,10 +1843,7 @@ void GameSpyLoadScreen::processProgress(Int playerId, Int percentage) //----------------------------------------------------------------------------- MapTransferLoadScreen::MapTransferLoadScreen( void ) { - //Added By Sadullah Nader - //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 b12a9eb363..b9c575968e 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp @@ -85,11 +85,8 @@ 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..0c49c2a141 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp @@ -100,10 +100,7 @@ GameClient::GameClient() m_numTranslators = 0; m_commandTranslator = NULL; - // Added By Sadullah Nader - // 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 8df77e4708..34487b2123 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp @@ -260,8 +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..17c88e9480 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp @@ -123,8 +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(); m_militaryCaptionSpeed = 0; @@ -132,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/InGameUI.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp index 6c8858af9c..ffa5cfc336 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp @@ -977,8 +977,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; m_popupMessageData = NULL; @@ -5471,14 +5469,11 @@ void InGameUI::clearPopupMessageData( void ) //------------------------------------------------------------------------------------------------- FloatingTextData::FloatingTextData(void) { - // Added By Sadullah Nader - // Initializations missing and needed m_color = 0; m_frameCount = 0; 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 8321ab2469..84e1acc653 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp @@ -423,15 +423,12 @@ 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(); cursorTextColor.red = cursorTextColor.green = cursorTextColor.blue = 0; cursorTextDropColor.red = cursorTextDropColor.blue = cursorTextDropColor.green = 0; - // textureName.clear(); imageName.clear(); W3DModelName.clear(); @@ -458,13 +455,9 @@ Mouse::Mouse( void ) m_numAxes = 0; m_forceFeedback = FALSE; - //Added By Sadullah Nader - //Initializations missing and needed m_dragTolerance = 0; m_dragTolerance3D = 0; m_dragToleranceMS = 0; - // - //m_tooltipString.clear(); // redundant m_displayTooltip = FALSE; m_tooltipDisplayString = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp index 35ede1fdbf..e71399c7e8 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp @@ -113,10 +113,7 @@ 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..8d900a3636 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp @@ -142,12 +142,9 @@ 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; m_originalAnchor.x = m_originalAnchor.y = 0; - // OptionPreferences prefs; m_screenEdgeScrollMode = prefs.getScreenEdgeScrollMode(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp index 2dcfe187fe..501f23d244 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp @@ -270,11 +270,8 @@ 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; - // m_selectCountMap.clear(); TheSelectionTranslator = this; @@ -1338,8 +1335,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..1962006d86 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp @@ -299,13 +299,9 @@ Anim2D::Anim2D( Anim2DTemplate *animTemplate, Anim2DCollection *collectionSystem // sanity DEBUG_ASSERTCRASH( animTemplate != NULL, ("Anim2D::Anim2D - NULL template") ); - //Added By Sadullah Nader - //Initialization m_currentFrame = 0; - // - // set the template m_template = animTemplate; @@ -323,8 +319,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; m_collectionSystemPrev = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp index e3686a05a9..8df5c3d3a1 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp @@ -68,8 +68,6 @@ ParticleSystemManager *TheParticleSystemManager = NULL; // ------------------------------------------------------------------------------------------------ ParticleInfo::ParticleInfo( void ) { - //Added By Sadullah Nader - //Initializations inserted m_angleZ = 0.0f; m_angularDamping = 0.0f; m_angularRateZ = 0.0f; @@ -87,7 +85,6 @@ ParticleInfo::ParticleInfo( void ) m_lifetime = 0; m_particleUpTowardsEmitter = FALSE; - // } // ------------------------------------------------------------------------------------------------ @@ -262,10 +259,7 @@ Particle::Particle( ParticleSystem *system, const ParticleInfo *info ) m_angleZ = info->m_angleZ; - //Added By Sadullah Nader - //Initializations inserted m_lastPos.zero(); - // m_windRandomness = info->m_windRandomness; m_particleUpTowardsEmitter = info->m_particleUpTowardsEmitter; m_emitterPos = info->m_emitterPos; @@ -728,8 +722,6 @@ ParticleSystemInfo::ParticleSystemInfo() m_isEmitAboveGroundOnly = false; m_isParticleUpTowardsEmitter = false; - //Added By Sadullah Nader - //Initializations inserted m_driftVelocity.zero(); m_gravity = 0.0f; m_isEmissionVolumeHollow = FALSE; @@ -737,7 +729,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; @@ -1038,12 +1029,9 @@ ParticleSystem::ParticleSystem( const ParticleSystemTemplate *sysTemplate, m_template = sysTemplate; m_systemID = id; - //Added By Sadullah Nader - //Initializations inserted m_lastPos.zero(); m_pos.zero(); m_velCoeff.zero(); - // m_attachedToDrawableID = INVALID_DRAWABLE_ID; m_attachedToObjectID = INVALID_ID; @@ -2783,10 +2771,7 @@ 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,13 +2812,10 @@ ParticleSystemManager::ParticleSystemManager( void ) m_onScreenParticleCount = 0; m_localPlayerIndex = 0; - //Added By Sadullah Nader - //Initializations inserted m_lastLogicFrameUpdate = 0; 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 6e760b2dd3..9794560208 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/View.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/View.cpp @@ -41,8 +41,6 @@ View *TheTacticalView = NULL; View::View( void ) { - //Added By Sadullah Nader - //Initialization(s) inserted m_viewLockedUntilFrame = 0u; m_currentHeightAboveGround = 0.0f; m_defaultAngle = 0.0f; @@ -58,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/AI.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp index cd079dc035..fa9ad40747 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp @@ -941,8 +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), m_structuresPoorMod(0.0f), @@ -951,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/AI/AIPathfind.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp index 6d1aef8e23..e1b50033c2 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp @@ -3029,15 +3029,12 @@ 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), m_width(0), m_xOrigin(0), m_yOrigin(0), m_zone(0) -// { m_startCell.x = -1; m_startCell.y = -1; @@ -5267,7 +5264,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/AI/TurretAI.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp index 645b4edb7b..073f5b4fd0 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp @@ -280,15 +280,9 @@ 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; - // 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 6fbc415e91..6059e774ea 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp @@ -50,11 +50,8 @@ m_exportWithScripts(false), m_isWaterArea(false), m_shouldRender(true), m_selected(false), -//Added By Sadullah Nader -//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..8525df83f8 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp @@ -927,8 +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; m_rallyPointOffset.y = 0.0f; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp index 0d4cff7dc1..e27e302a8f 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp @@ -959,11 +959,8 @@ TerrainLogic::TerrainLogic() { Int i; - //Added By Sadullah Nader - //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 bf626b9f38..aef1e7497c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp @@ -52,12 +52,9 @@ ParkingPlaceBehavior::ParkingPlaceBehavior( Thing *thing, const ModuleData* modu { m_gotInfo = false; - //Added By Sadullah Nader - //Initializations m_heliRallyPoint.zero(); - // m_heliRallyPointExists = FALSE; m_nextHealFrame = FOREVER; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp index 67281f1612..0283d17197 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp @@ -121,10 +121,7 @@ PropagandaTowerBehaviorModuleData::PropagandaTowerBehaviorModuleData( void ) PropagandaTowerBehavior::PropagandaTowerBehavior( Thing *thing, const ModuleData *modData ) : UpdateModule( thing, modData ) { - //Added By Sadullah Nader - //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 b343f4c053..b645f454b1 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp @@ -68,10 +68,7 @@ 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; - // 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 7b05a6d1ec..a31b784fc1 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp @@ -56,12 +56,9 @@ CrateCollideModuleData::CrateCollideModuleData() m_executeFX = NULL; m_pickupScience = SCIENCE_INVALID; - // Added By Sadullah Nader - // Initializations missing and needed m_executionAnimationTemplate = AsciiString::TheEmptyString; - // End Add } //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp index 8e42cbc9f7..44c7af5f3c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp @@ -131,11 +131,8 @@ 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; - // 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 cb826a3be9..f7dbe00973 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp @@ -100,8 +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(); m_paraAttachOffset.zero(); @@ -112,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/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..7c8dd524d6 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp @@ -39,8 +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. // 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 ab92ee7307..40ff4732e3 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp @@ -672,12 +672,9 @@ Locomotor::Locomotor(const LocomotorTemplate* tmpl) //------------------------------------------------------------------------------------------------- Locomotor::Locomotor(const Locomotor& that) { - //Added By Sadullah Nader - //Initializations 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/Object.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp index f65afacd15..de8ac02cd1 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp @@ -232,11 +232,8 @@ 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(); - // 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 3e6d515983..5aea03fe83 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp @@ -257,14 +257,10 @@ 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(); m_transportName.clear(); - // End Add } virtual Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const @@ -764,9 +760,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,10 +772,8 @@ 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 m_offset.zero(); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp index 4c7ace116a..4eb90530ce 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp @@ -1225,10 +1225,7 @@ void CellAndObjectIntersection::removeAllCoverage() //----------------------------------------------------------------------------- PartitionCell::PartitionCell() { - //Added By Sadullah Nader - //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.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp index 2200bfd823..797879498b 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp @@ -2774,7 +2774,6 @@ void AIUpdateInterface::aiDoCommand(const AICommandParms* parms) { state->clear(); } - //end privateGuardPosition(&parms->m_pos, (GuardMode)parms->m_intValue, parms->m_cmdSource); break; @@ -2790,7 +2789,6 @@ void AIUpdateInterface::aiDoCommand(const AICommandParms* parms) { state->clear(); } - //end privateGuardObject(parms->m_obj, (GuardMode)parms->m_intValue, parms->m_cmdSource); break; @@ -2806,7 +2804,6 @@ void AIUpdateInterface::aiDoCommand(const AICommandParms* parms) { state->clear(); } - //end privateGuardTunnelNetwork((GuardMode)parms->m_intValue, parms->m_cmdSource); break; @@ -2822,7 +2819,6 @@ void AIUpdateInterface::aiDoCommand(const AICommandParms* parms) { state->clear(); } - //end privateGuardArea(parms->m_polygon, (GuardMode)parms->m_intValue, parms->m_cmdSource); break; 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..14899b5ef7 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp @@ -120,12 +120,9 @@ DeliverPayloadAIUpdate::DeliverPayloadAIUpdate( Thing *thing, const ModuleData* m_freeToExit = FALSE; m_acceptingCommands = TRUE; - // Added By Sadullah Nader - // Initialization missing and needed m_diveState = DIVESTATE_PREDIVE; - // End Add } //------------------------------------------------------------------------------------------------- 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 1bebdbe441..e901fd9df8 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp @@ -384,8 +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; } 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 cac797bc77..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,10 +1857,7 @@ 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(); - // 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 a3bdd0628a..f36a83f720 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp @@ -87,12 +87,7 @@ 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 - // - - //Added By Sadullah Nader - //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..55f304e088 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp @@ -155,10 +155,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/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/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 f7bdf06e20..03b7d9ed59 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp @@ -61,13 +61,10 @@ //------------------------------------------------------------------------------------------------- HelicopterSlowDeathBehaviorModuleData::HelicopterSlowDeathBehaviorModuleData( void ) { - //Added By Sadullah Nader - //Initializations missing and needed m_attachParticleBone.clear(); 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/HordeUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp index 8198bf0039..aac30b83c4 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp @@ -157,10 +157,7 @@ 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; - // 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 a4e85305f7..60d0baf30e 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp @@ -85,12 +85,9 @@ 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(); 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/LifetimeUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp index 976dbaab38..974d94bc21 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp @@ -42,10 +42,7 @@ LifetimeUpdate::LifetimeUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData ) { const LifetimeUpdateModuleData* d = getLifetimeUpdateModuleData(); - // Added By Sadullah Nader - // 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 514f6b1691..d2d1d07928 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 8166c4b44d..72a59b0f6a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp @@ -46,12 +46,9 @@ 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(); - // setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER); } 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..f7748360ca 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp @@ -46,12 +46,8 @@ QueueProductionExitUpdate::QueueProductionExitUpdate( Thing *thing, const Module { m_currentDelay = 0; - //Added By Sadullah Nader - //Initializations inserted m_creationClearDistance = 0; m_rallyPoint.zero(); - // - // no rally point has been set m_rallyPointExists = false; m_currentBurstCount = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp index 1f701859da..9eb841a70b 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp @@ -158,11 +158,8 @@ 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 d4b872f2fe..0d87c22f89 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp @@ -69,10 +69,7 @@ //------------------------------------------------------------------------------------------------- SpecialAbilityUpdate::SpecialAbilityUpdate( Thing *thing, const ModuleData* moduleData ) : SpecialPowerUpdateModule( thing, moduleData ) { - //Added By Sadullah Nader - //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 5c20cbfadc..a390bc943f 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp @@ -64,11 +64,8 @@ StealthUpdateModuleData::StealthUpdateModuleData() { - //Added By Sadullah Nader - //Initialization(s) inserted m_disguiseFX = NULL; m_disguiseRevealFX = NULL; - // m_stealthDelay = UINT_MAX; m_stealthLevel = 0; m_stealthSpeed = 0.0f; @@ -133,10 +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; - //Added By Sadullah Nader - //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 25e3803878..a94c348d04 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp @@ -56,10 +56,7 @@ StickyBombUpdate::StickyBombUpdate( Thing *thing, const ModuleData *moduleData ) { m_targetID = INVALID_ID; m_dieFrame = 0; - //Added By Sadullah Nader - //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 7ac2a0dab1..11128be257 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp @@ -68,11 +68,8 @@ 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; - // 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 dd25b7ecee..9f21794419 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp @@ -56,12 +56,9 @@ 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; 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 950734fc4b..7af9b83cfc 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp @@ -104,12 +104,9 @@ 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; 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 4a83ab7504..a628657312 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp @@ -58,12 +58,9 @@ // ------------------------------------------------------------------------------------------------ WaveGuideUpdateModuleData::WaveGuideUpdateModuleData( void ) { - //Added By Sadullah Nader - //Initialization(s) inserted 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/ScriptEngine/ScriptEngine.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp index 0f18c6f7b6..41b35abe0b 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp @@ -445,8 +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), m_curFadeValue(0.0f), @@ -461,7 +459,6 @@ m_numAttackInfo(0), m_shownMPLocalDefeatWindow(FALSE), m_objectsShouldReceiveDifficultyBonus(TRUE), m_ChooseVictimAlwaysUsesNormal(false) -// { st_CanAppCont = true; st_LastCurrentFrame = st_CurrentFrame = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp index b768794a4b..628b06e47a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp @@ -635,10 +635,7 @@ m_firstScript(NULL), m_hasWarnings(false), m_isGroupActive(true), m_isGroupSubroutine(false), -//Added By Sadullah Nader -//Initializations inserted m_nextGroup(NULL) -// { m_groupName.format("Script Group %d", ScriptList::getNextID()); } @@ -914,11 +911,8 @@ 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,10 +2241,7 @@ 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..7e65b7c43b 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp @@ -218,8 +218,6 @@ void setFPMode( void ) // ------------------------------------------------------------------------------------------------ GameLogic::GameLogic( void ) { - //Added By Sadullah Nader - //Initializations missing and necessary m_background = NULL; m_CRC = 0; m_isInUpdate = FALSE; @@ -235,7 +233,6 @@ GameLogic::GameLogic( void ) m_shouldValidateCRCs = FALSE; m_startNewGame = FALSE; - // m_frame = 0; m_hasUpdated = FALSE; @@ -1319,7 +1316,6 @@ void GameLogic::startNewGame( Bool loadingSaveGame ) TheMouse->setVisibility(FALSE); m_loadScreen->init(game); - // updateLoadProgress( LOAD_PROGRESS_START ); } } @@ -2396,8 +2392,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); setLoadingMap( FALSE ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp index 8b18e615d1..0c89c03b8e 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp @@ -306,9 +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 // nomenclature. Look for setLoadingMap() and setLoadingSave() //setGameLoading(TRUE); From 14a7ef054107820537d733796a0d7ea692fe6cfc Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Tue, 18 Nov 2025 10:06:39 -0500 Subject: [PATCH 02/14] nit: remove empty lines leftover after comment removal --- Core/GameEngine/Source/GameNetwork/DownloadManager.cpp | 4 ---- Core/GameEngine/Source/GameNetwork/GameInfo.cpp | 1 - Core/GameEngine/Source/GameNetwork/NetCommandWrapperList.cpp | 2 -- Generals/Code/GameEngine/Source/Common/GlobalData.cpp | 1 - Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp | 1 - .../Source/GameClient/GUI/ControlBar/ControlBar.cpp | 2 -- .../GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp | 3 --- .../Source/GameLogic/Object/Update/BattlePlanUpdate.cpp | 1 - GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp | 1 - .../Code/GameEngine/Source/Common/System/DataChunk.cpp | 1 - .../Source/GameClient/GUI/ControlBar/ControlBar.cpp | 2 -- .../GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp | 5 +---- .../Source/GameLogic/Object/Update/BattlePlanUpdate.cpp | 1 - 13 files changed, 1 insertion(+), 24 deletions(-) diff --git a/Core/GameEngine/Source/GameNetwork/DownloadManager.cpp b/Core/GameEngine/Source/GameNetwork/DownloadManager.cpp index 24b35721ba..b84abac918 100644 --- a/Core/GameEngine/Source/GameNetwork/DownloadManager.cpp +++ b/Core/GameEngine/Source/GameNetwork/DownloadManager.cpp @@ -37,11 +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/GameInfo.cpp b/Core/GameEngine/Source/GameNetwork/GameInfo.cpp index ad72c6ad51..5eebf76e2f 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; igetNumChunks(); m_chunksPresent = NEW Bool[m_numChunks]; // pool[]ify m_numChunksPresent = 0; diff --git a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp index b524134369..1485784e8a 100644 --- a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp +++ b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp @@ -818,7 +818,6 @@ GlobalData::GlobalData() m_maxParticleCount = 0; m_maxFieldParticleCount = 30; - m_debugAI = AI_DEBUG_NONE; m_debugSupplyCenterPlacement = FALSE; m_debugAIObstacles = FALSE; diff --git a/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp b/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp index 0d10b5fad6..bf5cebac7f 100644 --- a/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp @@ -238,7 +238,6 @@ m_pOut(pOut) tmpFileName.concat(TEMP_FILENAME); m_tmp_file = ::fopen( tmpFileName.str(), "wb" ); m_chunkStack = NULL; - } DataChunkOutput::~DataChunkOutput() diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index f9b0dba991..f7c225d781 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; - m_conflictingLabel.clear(); m_cursorName.clear(); m_descriptionLabel.clear(); @@ -580,7 +579,6 @@ CommandButton::CommandButton( void ) m_purchasedLabel.clear(); m_textLabel.clear(); - m_window = NULL; m_commandButtonBorder = COMMAND_BUTTON_BORDER_NONE; //m_prev = NULL; 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 a77b9722e7..6d7c3e661e 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp @@ -871,9 +871,6 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg, buttonFrame->winEnable( TRUE ); updateMenuActions(); - - - // do the load game if( controlID == buttonLoadConfirm ) { diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp index 0213a78492..8647e01008 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; m_specialPowerModule = NULL; - // } //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp index ee29983a34..4ca54799d3 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp @@ -824,7 +824,6 @@ GlobalData::GlobalData() m_maxParticleCount = 0; m_maxFieldParticleCount = 30; - m_debugAI = AI_DEBUG_NONE; m_debugSupplyCenterPlacement = FALSE; m_debugAIObstacles = FALSE; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp index 8371459f38..1c16e7f7b2 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp @@ -238,7 +238,6 @@ m_pOut(pOut) tmpFileName.concat(TEMP_FILENAME); m_tmp_file = ::fopen( tmpFileName.str(), "wb" ); m_chunkStack = NULL; - } DataChunkOutput::~DataChunkOutput() diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index 887cd0bcab..cb7545acd3 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; - m_conflictingLabel.clear(); m_cursorName.clear(); m_descriptionLabel.clear(); @@ -584,7 +583,6 @@ CommandButton::CommandButton( void ) m_purchasedLabel.clear(); m_textLabel.clear(); - m_window = NULL; m_commandButtonBorder = COMMAND_BUTTON_BORDER_NONE; //m_prev = NULL; 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 3012c72206..7f4d4b990a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp @@ -829,7 +829,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg, buttonFrame->winEnable( TRUE ); updateMenuActions(); - // close save menuu + // close save menu closeSaveMenu( window ); // get save filename @@ -887,9 +887,6 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg, buttonFrame->winEnable( TRUE ); updateMenuActions(); - - - // do the load game if( controlID == buttonLoadConfirm ) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp index 55f304e088..2cf23405c6 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; m_specialPowerModule = NULL; - // } //------------------------------------------------------------------------------------------------- From 318f061cbdeee9c925b466fc1a3a83b538bdc0bd Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Tue, 18 Nov 2025 15:54:01 -0500 Subject: [PATCH 03/14] manually clear out extra lines near where we removed comments --- Core/GameEngine/Source/Common/Audio/GameAudio.cpp | 1 - Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp | 1 - Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp | 5 ----- .../Source/GameNetwork/GameSpy/Thread/PeerThread.cpp | 4 +--- .../GameSpy/Thread/PersistentStorageThread.cpp | 1 - Core/GameEngine/Source/GameNetwork/NAT.cpp | 1 - Core/GameEngine/Source/GameNetwork/NetCommandMsg.cpp | 9 ++------- Core/GameEngine/Source/GameNetwork/Network.cpp | 1 - Generals/Code/GameEngine/Include/Common/Geometry.h | 1 - Generals/Code/GameEngine/Include/Common/INI.h | 1 - .../Include/GameLogic/Module/DeliverPayloadAIUpdate.h | 3 --- .../GameEngine/Source/Common/Bezier/BezFwdIterator.cpp | 1 - .../GameEngine/Source/Common/MultiplayerSettings.cpp | 3 --- Generals/Code/GameEngine/Source/Common/RTS/Team.cpp | 2 -- Generals/Code/GameEngine/Source/Common/Recorder.cpp | 1 - .../Code/GameEngine/Source/Common/StatsCollector.cpp | 3 --- .../Source/GameClient/GUI/ControlBar/ControlBar.cpp | 8 ++------ .../GameClient/GUI/ControlBar/ControlBarScheme.cpp | 4 ---- .../GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp | 1 - 19 files changed, 5 insertions(+), 46 deletions(-) diff --git a/Core/GameEngine/Source/Common/Audio/GameAudio.cpp b/Core/GameEngine/Source/Common/Audio/GameAudio.cpp index 703422ea63..fb2f7d65f8 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; m_audioSettings = NEW AudioSettings; diff --git a/Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp b/Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp index 3f9cfa0277..54c1662ec1 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; m_sourcePortAllocationDelta = 0; diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp index 93d576a176..5c9e661b59 100644 --- a/Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp @@ -88,7 +88,6 @@ void GameSpyInfo::reset( void ) m_localName = ""; m_localProfileID = 0; m_maxMessagesPerUpdate = 100; - m_disallowAsainText = FALSE; m_disallowNonAsianText = FALSE; m_disconReason = 0; @@ -98,14 +97,10 @@ void GameSpyInfo::reset( void ) m_pingString.clear(); m_rawConfig.clear(); m_rawMotd.clear(); - m_internalIP = m_externalIP = 0; - m_savedIgnoreMap.clear(); m_preorderPlayers.clear(); - m_cachedLocalPlayerStats.reset(); - m_additionalDisconnects = -1; } diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp index 51cf8c8c89..58bcae1184 100644 --- a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp @@ -180,7 +180,7 @@ class PeerThreadClass : public ThreadClass PeerThreadClass() : ThreadClass() { m_roomJoined = m_allowObservers = m_hasPassword = FALSE; - m_useStats = TRUE; + m_useStats = TRUE; m_exeCRC = m_iniCRC = 0; m_gameVersion = 0; m_ladderPort = 0; @@ -198,13 +198,11 @@ class PeerThreadClass : public ThreadClass for (Int i=0; igetFrame(); - } //Destructor //============================================================================= diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index f7c225d781..5d631da29b 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -569,7 +569,6 @@ CommandButton::CommandButton( void ) //m_pushedImage = NULL; m_flashCount = 0; - m_conflictingLabel.clear(); m_cursorName.clear(); m_descriptionLabel.clear(); @@ -578,7 +577,6 @@ CommandButton::CommandButton( void ) m_options = 0; m_purchasedLabel.clear(); m_textLabel.clear(); - m_window = NULL; m_commandButtonBorder = COMMAND_BUTTON_BORDER_NONE; //m_prev = NULL; @@ -863,12 +861,10 @@ ControlBar::ControlBar( void ) m_observedPlayer = NULL; m_buildToolTipLayout = NULL; m_showBuildToolTipLayout = FALSE; - m_animateDownWin1Pos.x = m_animateDownWin1Pos.y = 0; m_animateDownWin1Size.x = m_animateDownWin1Size.y = 0; m_animateDownWin2Pos.x = m_animateDownWin2Pos.y = 0; m_animateDownWin2Size.x = m_animateDownWin2Size.y = 0; - m_animateDownWindow = NULL; m_animTime = 0; @@ -880,10 +876,10 @@ ControlBar::ControlBar( void ) m_currContext = CB_CONTEXT_NONE; m_defaultControlBarPosition.x = m_defaultControlBarPosition.y = 0; m_genStarFlash = FALSE; - m_genStarOff = NULL; + m_genStarOff = NULL; m_genStarOn = NULL; m_UIDirty = FALSE; -// m_controlBarResizer = NULL; + // m_controlBarResizer = NULL; m_buildUpClockColor = GameMakeColor(0,0,0,100); m_commandBarBorderColor = GameMakeColor(0,0,0,100); for( i = 0; i < NUM_CONTEXT_PARENTS; i++ ) diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp index 4bbe5a184b..f3844529c2 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp @@ -188,10 +188,8 @@ ControlBarSchemeImage::~ControlBarSchemeImage( void ) ControlBarSchemeAnimation::ControlBarSchemeAnimation( void ) { - m_animDuration = 0; m_finalPos.x = m_finalPos.y = 0; - m_name.clear(); m_animType = 0; m_animImage = NULL; @@ -299,7 +297,6 @@ ControlBarScheme::ControlBarScheme(void) m_optionsButtonPushed = NULL; m_optionsButtonDisabled = NULL; - m_commandBarBorderColor = 0; m_idleWorkerButtonEnable = NULL; @@ -345,7 +342,6 @@ ControlBarScheme::ControlBarScheme(void) m_minMaxButtonHightlited = NULL; m_minMaxButtonPushed = NULL; - m_minMaxUL.x = 0; m_minMaxLR.x = 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 895c568329..c3b58e6813 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!")); - windowMap->winSetTooltipFunc(MapSelectorTooltip); for (Int i = 0; i < MAX_SLOTS; i++) From b90d98eb9e34cda0c810fcb1d62f9bedc37f8792 Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Tue, 18 Nov 2025 16:00:21 -0500 Subject: [PATCH 04/14] remove added by saad comments --- Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp | 3 --- Generals/Code/GameEngine/Include/GameClient/Display.h | 2 -- .../GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp | 1 - .../Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp | 3 --- .../Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp | 5 ----- .../Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp | 1 - GeneralsMD/Code/GameEngine/Include/GameClient/Display.h | 2 -- .../GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp | 1 - .../Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp | 3 --- .../Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp | 5 ----- 10 files changed, 26 deletions(-) diff --git a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp index 34a347c50b..e307f2e41f 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp @@ -785,7 +785,6 @@ void Render2DSentenceClass::Build_Sentence_Centered (const WCHAR *text, int *hkX if( ParseHotKey && (*word == L'&') && (*word+1 != 0) && (*word+1 > L' ') && (*word+1 != L'\n')) { int offset = 0; - //Added By Saad if (word_width != 0 ) { const WCHAR *word_back = word; @@ -796,7 +795,6 @@ void Render2DSentenceClass::Build_Sentence_Centered (const WCHAR *text, int *hkX offset =-1; } } - // *word++; calcHotKeyX = true; } @@ -853,7 +851,6 @@ void Render2DSentenceClass::Build_Sentence_Centered (const WCHAR *text, int *hkX // word_width = Font->Get_Char_Spacing (*word++); wordCount = 0; - //Added By Saad line_width += word_width; } // diff --git a/Generals/Code/GameEngine/Include/GameClient/Display.h b/Generals/Code/GameEngine/Include/GameClient/Display.h index 4d12e246e3..6afd353db7 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Display.h +++ b/Generals/Code/GameEngine/Include/GameClient/Display.h @@ -219,10 +219,8 @@ extern Display *TheDisplay; extern void StatDebugDisplay( DebugDisplayInterface *dd, void *, FILE *fp = NULL ); -//Added By Saad //Necessary for display resolution confirmation dialog box //Holds the previous and current display settings - typedef struct _DisplaySettings { Int xRes; //Resolution width 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 c3b58e6813..e42af78544 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp @@ -700,7 +700,6 @@ void InitLanGameGadgets( void ) buttonAcceptID[i] = TheNameKeyGenerator->nameToKey( tmpString ); buttonAccept[i] = TheWindowManager->winGetWindowFromId( parentLanGameOptions, buttonAcceptID[i] ); DEBUG_ASSERTCRASH(buttonAccept[i], ("Could not find the buttonAccept[%d]",i )); - //Added by Saad for the tooltips on the MultiPlayer icons buttonAccept[i]->winSetTooltipFunc(gameAcceptTooltip); // // tmpString.format("LanGameOptionsMenu.wnd:ButtonStartPosition%d", i); 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 9f04230bed..034aeff02b 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp @@ -71,8 +71,6 @@ #include "GameNetwork/GameSpy/MainMenuUtils.h" #include "GameClient/CDCheck.h" -//Added By Saad -//for accessing the InGameUI #include "GameClient/InGameUI.h" @@ -200,7 +198,6 @@ static Bool justEntered = FALSE; static Bool dontAllowTransitions = FALSE; -//Added by Saad const Int /*TIME_OUT = 15,*/ CORNER = 10; void AcceptResolution(); void DeclineResolution(); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp index 60ff6cbcee..42d1fa17b8 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp @@ -72,8 +72,6 @@ #include "GameLogic/GameLogic.h" #include "GameLogic/ScriptEngine.h" #include "WWDownload/Registry.h" -//added by saad -//used to access a messagebox that does "ok" and "cancel" #include "GameClient/MessageBox.h" #include "ww3d.h" @@ -201,13 +199,10 @@ static GameWindow * radioLow = NULL; */ -//Added By Saad for the resolution confirmation dialog box DisplaySettings oldDispSettings, newDispSettings; Bool dispChanged = FALSE; extern Int timer; extern void DoResolutionDialog(); -// - static Bool ignoreSelected = FALSE; WindowLayout *OptionsLayout = NULL; 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 1dbab024c7..ac86173d6b 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp @@ -95,7 +95,6 @@ #include "GameNetwork/GameSpyOverlay.h" #include "GameNetwork/GameSpy/BuddyThread.h" #include "GameNetwork/GameSpy/PersistentStorageThread.h" -//Added By Saad #include "GameClient/InGameUI.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h index 3f3a783946..7598fa3b62 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h @@ -220,10 +220,8 @@ extern Display *TheDisplay; extern void StatDebugDisplay( DebugDisplayInterface *dd, void *, FILE *fp = NULL ); -//Added By Saad //Necessary for display resolution confirmation dialog box //Holds the previous and current display settings - typedef struct _DisplaySettings { Int xRes; //Resolution width 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 281d1a2902..e05df74958 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp @@ -775,7 +775,6 @@ void InitLanGameGadgets( void ) buttonAcceptID[i] = TheNameKeyGenerator->nameToKey( tmpString ); buttonAccept[i] = TheWindowManager->winGetWindowFromId( parentLanGameOptions, buttonAcceptID[i] ); DEBUG_ASSERTCRASH(buttonAccept[i], ("Could not find the buttonAccept[%d]",i )); - //Added by Saad for the tooltips on the MultiPlayer icons buttonAccept[i]->winSetTooltipFunc(gameAcceptTooltip); // // tmpString.format("LanGameOptionsMenu.wnd:ButtonStartPosition%d", i); 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 d25593554e..74a1bff4a1 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp @@ -74,8 +74,6 @@ #include "GameNetwork/GameSpy/MainMenuUtils.h" #include "GameClient/CDCheck.h" -//Added By Saad -//for accessing the InGameUI #include "GameClient/InGameUI.h" @@ -208,7 +206,6 @@ static Bool launchChallengeMenu = FALSE; static Bool dontAllowTransitions = FALSE; -//Added by Saad const Int /*TIME_OUT = 15,*/ CORNER = 10; void AcceptResolution(); void DeclineResolution(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp index 180dad5cfb..43e0034f85 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp @@ -72,8 +72,6 @@ #include "GameLogic/GameLogic.h" #include "GameLogic/ScriptEngine.h" #include "WWDownload/Registry.h" -//added by saad -//used to access a messagebox that does "ok" and "cancel" #include "GameClient/MessageBox.h" #include "ww3d.h" @@ -210,13 +208,10 @@ static GameWindow * radioLow = NULL; */ -//Added By Saad for the resolution confirmation dialog box DisplaySettings oldDispSettings, newDispSettings; Bool dispChanged = FALSE; extern Int timer; extern void DoResolutionDialog(); -// - static Bool ignoreSelected = FALSE; WindowLayout *OptionsLayout = NULL; From 7f2be454922cd6f895525459e7053876ef68c3b2 Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Tue, 18 Nov 2025 16:12:25 -0500 Subject: [PATCH 05/14] replicate changes to some files to GeneralsMD --- Core/GameEngine/Source/GameNetwork/NetCommandMsg.cpp | 7 +++++-- .../Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp | 1 - GeneralsMD/Code/GameEngine/Include/Common/Geometry.h | 1 - GeneralsMD/Code/GameEngine/Include/Common/INI.h | 1 - .../Include/GameLogic/Module/DeliverPayloadAIUpdate.h | 3 --- .../GameEngine/Source/Common/Bezier/BezFwdIterator.cpp | 1 - .../Code/GameEngine/Source/Common/MultiplayerSettings.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 | 3 --- .../Source/GameClient/GUI/ControlBar/ControlBar.cpp | 2 -- .../Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp | 4 ---- .../GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp | 1 - .../Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp | 1 - 14 files changed, 5 insertions(+), 23 deletions(-) diff --git a/Core/GameEngine/Source/GameNetwork/NetCommandMsg.cpp b/Core/GameEngine/Source/GameNetwork/NetCommandMsg.cpp index da04d6d0dc..ea6d56b728 100644 --- a/Core/GameEngine/Source/GameNetwork/NetCommandMsg.cpp +++ b/Core/GameEngine/Source/GameNetwork/NetCommandMsg.cpp @@ -879,7 +879,9 @@ UnsignedInt NetWrapperCommandMsg::getTotalDataLength() { void NetWrapperCommandMsg::setTotalDataLength(UnsignedInt totalDataLength) { m_totalDataLength = totalDataLength; - return sizeof(NetPacketChatCommand) + sizeof(UnsignedByte) /* text length byte */ + m_text.getByteCount() +} + +UnsignedShort NetWrapperCommandMsg::getWrappedCommandID() { return m_wrappedCommandID; } @@ -888,7 +890,8 @@ void NetWrapperCommandMsg::setWrappedCommandID(UnsignedShort wrappedCommandID) { } //------------------------- - return sizeof(NetPacketDisconnectChatCommand) + sizeof(UnsignedByte) /* text length byte */ +// NetFileCommandMsg +//------------------------- NetFileCommandMsg::NetFileCommandMsg() : NetCommandMsg() { m_commandType = NETCOMMANDTYPE_FILE; m_data = NULL; 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 034aeff02b..57e22420ec 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp @@ -74,7 +74,6 @@ #include "GameClient/InGameUI.h" - // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// enum diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h b/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h index d15568c579..c5ce3cbff1 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h @@ -113,7 +113,6 @@ class GeometryInfo : public Snapshot { 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 c4ea2124ca..00321ac15a 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/INI.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/INI.h @@ -140,7 +140,6 @@ class MultiIniFieldParse { for(Int i = 0; i < MAX_MULTI_FIELDS; i++) m_extraOffset[i] = 0; - } void add(const FieldParse* f, UnsignedInt e = 0); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h index 26fac5300b..84e64d9f04 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; - m_putInContainerName.clear(); } @@ -292,11 +291,9 @@ class DeliverPayloadData m_visiblePayloadWeaponTemplate = NULL; m_selfDestructObject = FALSE; m_deliveryDecalRadius = 0; - m_visibleDropBoneName.clear(); m_visiblePayloadTemplateName.clear(); m_visibleSubObjectName.clear(); - } static const FieldParse* getFieldParse(); diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp index e0873b4186..976b119fc7 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/MultiplayerSettings.cpp b/GeneralsMD/Code/GameEngine/Source/Common/MultiplayerSettings.cpp index a0a36dc499..d23ec32b56 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/MultiplayerSettings.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/MultiplayerSettings.cpp @@ -80,7 +80,6 @@ MultiplayerSettings::MultiplayerSettings() m_showRandomPlayerTemplate = TRUE; m_showRandomStartPos = TRUE; m_showRandomColor = TRUE; - m_observerColor; m_randomColor; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp index b8445c6e3e..701debf163 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp @@ -1317,7 +1317,6 @@ Team::Team(TeamPrototype *proto, TeamID id ) : m_wasIdle(false) { 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 fa7d13c35d..113123acac 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 b223b53771..4289f2b201 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp @@ -79,7 +79,6 @@ StatsCollector::StatsCollector( void ) m_isScrolling = FALSE; m_scrollBeginTime = 0; m_scrollTime = 0; - m_timeCount = 0; m_buildCommands = 0; m_moveCommands = 0; @@ -87,10 +86,8 @@ StatsCollector::StatsCollector( void ) m_scrollMapCommands = 0; m_AIUnits = 0; m_playerUnits = 0; - m_lastUpdate = 0; m_startFrame = TheGameLogic->getFrame(); - } //Destructor //============================================================================= diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index cb7545acd3..0d5722ec53 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -573,7 +573,6 @@ CommandButton::CommandButton( void ) //m_pushedImage = NULL; m_flashCount = 0; - m_conflictingLabel.clear(); m_cursorName.clear(); m_descriptionLabel.clear(); @@ -582,7 +581,6 @@ CommandButton::CommandButton( void ) m_options = 0; m_purchasedLabel.clear(); m_textLabel.clear(); - m_window = NULL; m_commandButtonBorder = COMMAND_BUTTON_BORDER_NONE; //m_prev = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp index 7235a27ad7..88978c3a5c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp @@ -189,10 +189,8 @@ ControlBarSchemeImage::~ControlBarSchemeImage( void ) ControlBarSchemeAnimation::ControlBarSchemeAnimation( void ) { - m_animDuration = 0; m_finalPos.x = m_finalPos.y = 0; - m_name.clear(); m_animType = 0; m_animImage = NULL; @@ -301,7 +299,6 @@ ControlBarScheme::ControlBarScheme(void) m_optionsButtonPushed = NULL; m_optionsButtonDisabled = NULL; - m_commandBarBorderColor = 0; m_idleWorkerButtonEnable = NULL; @@ -348,7 +345,6 @@ ControlBarScheme::ControlBarScheme(void) m_minMaxButtonEnable = NULL; m_minMaxButtonHightlited = NULL; m_minMaxButtonPushed = NULL; - m_minMaxUL.x = 0; m_minMaxLR.x = 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 e05df74958..b0bac7aa21 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!")); - windowMap->winSetTooltipFunc(MapSelectorTooltip); for (Int i = 0; i < MAX_SLOTS; i++) 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 74a1bff4a1..f7c632c722 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp @@ -77,7 +77,6 @@ #include "GameClient/InGameUI.h" - // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// enum From a94c874d0696161e586fb5342aeed398330293f9 Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Wed, 19 Nov 2025 08:01:50 -0500 Subject: [PATCH 06/14] restored some comments, fixed an indent, more space removal, replicated to MD --- .../Source/GameNetwork/GameSpy/Thread/PeerThread.cpp | 2 +- Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h | 3 ++- Generals/Code/GameEngine/Source/Common/RTS/Player.cpp | 1 - Generals/Code/GameEngine/Source/GameClient/Drawable.cpp | 2 +- .../GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp | 1 + .../Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp | 4 ---- .../GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp | 3 --- .../Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp | 2 -- .../Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp | 4 ---- .../ProductionExitUpdate/DefaultProductionExitUpdate.cpp | 3 --- GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h | 3 ++- GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp | 1 - GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp | 2 +- .../GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp | 1 + .../Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp | 4 ---- .../GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp | 3 --- .../Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp | 2 -- .../Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp | 2 -- .../ProductionExitUpdate/DefaultProductionExitUpdate.cpp | 3 --- 19 files changed, 9 insertions(+), 37 deletions(-) diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp index 58bcae1184..cbc7f02b35 100644 --- a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp @@ -180,7 +180,7 @@ class PeerThreadClass : public ThreadClass PeerThreadClass() : ThreadClass() { m_roomJoined = m_allowObservers = m_hasPassword = FALSE; - m_useStats = TRUE; + m_useStats = TRUE; m_exeCRC = m_iniCRC = 0; m_gameVersion = 0; m_ladderPort = 0; diff --git a/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h b/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h index 846a6e8bbc..978ccfb1b6 100644 --- a/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h +++ b/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h @@ -62,7 +62,8 @@ class SelectionTranslator : public GameMessageTranslator SelectionTranslator(); ~SelectionTranslator(); virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); - + //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); void setLeftMouseButton(Bool state); }; diff --git a/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp index 50c8a7b590..30253ea90a 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp @@ -336,7 +336,6 @@ Player::Player( Int playerIndex ) { m_squads[i] = NULL; } - // for (i = 0; i < MAX_PLAYER_COUNT; ++i) { m_attackedBy[i] = false; diff --git a/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp b/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp index 22641bd29a..1d438db65a 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp @@ -333,7 +333,7 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatusBits statu m_expirationDate = 0; // 0 == never expires m_lastConstructDisplayed = -1.0f; - + //Fix for the building percent m_constructDisplayString = TheDisplayStringManager->newDisplayString(); m_constructDisplayString->setFont(TheFontLibrary->getFont(TheInGameUI->getDrawableCaptionFontName(), TheGlobalLanguageData->adjustFontSize(TheInGameUI->getDrawableCaptionPointSize()), 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 e42af78544..049a66cb0d 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp @@ -649,6 +649,7 @@ void InitLanGameGadgets( void ) Int localSlotNum = TheLAN->GetMyGame()->getLocalSlotNum(); DEBUG_ASSERTCRASH(localSlotNum >= 0, ("Bad slot number!")); + //Tooltip function is being set for techBuildings, and supplyDocks windowMap->winSetTooltipFunc(MapSelectorTooltip); for (Int i = 0; i < MAX_SLOTS; i++) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp index 45bd2e20f6..4105cf9600 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp @@ -51,11 +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 b868befddd..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,10 +52,7 @@ CrateCollideModuleData::CrateCollideModuleData() m_isHumanOnlyPickup = FALSE; m_executeFX = NULL; m_pickupScience = SCIENCE_INVALID; - - m_executionAnimationTemplate = AsciiString::TheEmptyString; - } //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp index 19f5f61996..06d42d780c 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp @@ -662,8 +662,6 @@ Locomotor::Locomotor(const Locomotor& that) { m_angleOffset = 0.0f; m_maintainPos.zero(); - - m_template = that.m_template; m_brakingFactor = that.m_brakingFactor; m_maxLift = that.m_maxLift; 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 2645681714..fb782a271d 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp @@ -115,13 +115,9 @@ DeliverPayloadAIUpdate::DeliverPayloadAIUpdate( Thing *thing, const ModuleData* m_visibleItemsDelivered = 0; m_deliveryDecal.clear(); m_previousDistanceSqr = 0; - m_freeToExit = FALSE; m_acceptingCommands = TRUE; - - m_diveState = DIVESTATE_PREDIVE; - } //------------------------------------------------------------------------------------------------- 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 ffc97036c4..9d559b0250 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp @@ -46,10 +46,7 @@ DefaultProductionExitUpdate::DefaultProductionExitUpdate( Thing *thing, const Mo { // no rally point has been set m_rallyPointExists = false; - m_rallyPoint.zero(); - - setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER); } diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h b/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h index b400679e55..a102bae2c8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h @@ -64,7 +64,8 @@ class SelectionTranslator : public GameMessageTranslator SelectionTranslator(); ~SelectionTranslator(); virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); - + //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); void setLeftMouseButton(Bool state); diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp index c58fd45b18..bd8102b57e 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/GameClient/Drawable.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp index 967c10ee8a..813dc1ee0c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp @@ -369,7 +369,7 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatusBits statu m_expirationDate = 0; // 0 == never expires m_lastConstructDisplayed = -1.0f; - + //Fix for the building percent m_constructDisplayString = TheDisplayStringManager->newDisplayString(); m_constructDisplayString->setFont(TheFontLibrary->getFont(TheInGameUI->getDrawableCaptionFontName(), TheGlobalLanguageData->adjustFontSize(TheInGameUI->getDrawableCaptionPointSize()), 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 b0bac7aa21..e908c7eb45 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp @@ -719,6 +719,7 @@ void InitLanGameGadgets( void ) Int localSlotNum = TheLAN->GetMyGame()->getLocalSlotNum(); DEBUG_ASSERTCRASH(localSlotNum >= 0, ("Bad slot number!")); + //Tooltip function is being set for techBuildings, and supplyDocks windowMap->winSetTooltipFunc(MapSelectorTooltip); for (Int i = 0; i < MAX_SLOTS; i++) diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp index aef1e7497c..ed1cfc4137 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp @@ -51,11 +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 a31b784fc1..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,10 +55,7 @@ CrateCollideModuleData::CrateCollideModuleData() m_isHumanOnlyPickup = FALSE; m_executeFX = NULL; m_pickupScience = SCIENCE_INVALID; - - m_executionAnimationTemplate = AsciiString::TheEmptyString; - } //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp index 40ff4732e3..9b2a9bba46 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp @@ -674,8 +674,6 @@ Locomotor::Locomotor(const Locomotor& that) { m_angleOffset = 0.0f; m_maintainPos.zero(); - - m_template = that.m_template; m_brakingFactor = that.m_brakingFactor; m_maxLift = that.m_maxLift; 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 14899b5ef7..3708a74ca3 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp @@ -119,8 +119,6 @@ DeliverPayloadAIUpdate::DeliverPayloadAIUpdate( Thing *thing, const ModuleData* m_freeToExit = FALSE; m_acceptingCommands = TRUE; - - m_diveState = DIVESTATE_PREDIVE; } 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 72a59b0f6a..b6b360bae8 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp @@ -46,10 +46,7 @@ DefaultProductionExitUpdate::DefaultProductionExitUpdate( Thing *thing, const Mo { // no rally point has been set m_rallyPointExists = false; - m_rallyPoint.zero(); - - setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER); } From d8e0c90ea06bdabacbcefe06f31d2bc1fc08e924 Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Wed, 19 Nov 2025 17:52:38 -0500 Subject: [PATCH 07/14] a few more empty lines --- .../Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp | 1 - .../Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp | 1 - Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp | 5 ----- .../Source/GameLogic/Object/ObjectCreationList.cpp | 2 -- .../Source/GameLogic/Object/Update/StructureToppleUpdate.cpp | 1 - 5 files changed, 10 deletions(-) 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 b4bb91847d..931719f0f9 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp @@ -279,7 +279,6 @@ void HideQuitMenu( void ) //------------------------------------------------------------------------------------------------- void ToggleQuitMenu() { - if (TheGameLogic->isIntroMoviePlaying() || TheGameLogic->isLoadingGame() ||TheScriptEngine->isGameEnding()) return; 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 ac86173d6b..3cb11f6b81 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp @@ -766,7 +766,6 @@ void finishSinglePlayerInit( void ) } - TheInGameUI->freeMessageResources(); if (s_blankLayout) diff --git a/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp b/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp index 580837cbf8..dc3cf08312 100644 --- a/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp @@ -295,11 +295,8 @@ const Image* Anim2DTemplate::getFrame( UnsignedShort frameNumber ) const // ------------------------------------------------------------------------------------------------ Anim2D::Anim2D( Anim2DTemplate *animTemplate, Anim2DCollection *collectionSystem ) { - // sanity DEBUG_ASSERTCRASH( animTemplate != NULL, ("Anim2D::Anim2D - NULL template") ); - - m_currentFrame = 0; // set the template @@ -329,8 +326,6 @@ Anim2D::Anim2D( Anim2DTemplate *animTemplate, Anim2DCollection *collectionSystem m_collectionSystem = collectionSystem; if( m_collectionSystem ) m_collectionSystem->registerAnimation( this ); - - } // ------------------------------------------------------------------------------------------------ diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp index 741ccc7444..93e792bb46 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp @@ -247,11 +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(); - } 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/StructureToppleUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp index 967ac9feb6..ec95774da6 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp @@ -55,7 +55,6 @@ const Int MAX_IDX = 32; //------------------------------------------------------------------------------------------------- StructureToppleUpdate::StructureToppleUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData ) { - m_delayBurstLocation.zero(); m_structuralIntegrity = 0.0f; m_toppleDirection.x = m_toppleDirection.y = 0; From 079c7cc5d6ff508e9bd56ba98c5756075da72b08 Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Wed, 19 Nov 2025 18:16:49 -0500 Subject: [PATCH 08/14] a few more in GeneralsMD, plus taipo fix --- Core/Tools/Autorun/GameText.cpp | 2 +- Generals/Code/GameEngine/Source/GameClient/GameText.cpp | 2 +- .../Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp | 1 - .../GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp | 1 - GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp | 3 +-- .../Code/GameEngine/Source/GameClient/System/Anim2D.cpp | 4 ---- .../Source/GameLogic/Object/Update/StructureToppleUpdate.cpp | 1 - 7 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Core/Tools/Autorun/GameText.cpp b/Core/Tools/Autorun/GameText.cpp index edde74bdfa..f961646d97 100644 --- a/Core/Tools/Autorun/GameText.cpp +++ b/Core/Tools/Autorun/GameText.cpp @@ -227,7 +227,7 @@ GameTextManager::GameTextManager() m_munkee(FALSE), m_noStringList(NULL), m_useStringFile(TRUE), - m_failed(L"***FATAL*** String Manager failed to initilaized properly") + m_failed(L"***FATAL*** String Manager failed to initialized properly") { } diff --git a/Generals/Code/GameEngine/Source/GameClient/GameText.cpp b/Generals/Code/GameEngine/Source/GameClient/GameText.cpp index 2ff1ad608f..1074f1dc29 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GameText.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GameText.cpp @@ -258,7 +258,7 @@ GameTextManager::GameTextManager() #endif m_mapStringInfo(NULL), m_mapStringLUT(NULL), - m_failed(L"***FATAL*** String Manager failed to initilaize properly") + m_failed(L"***FATAL*** String Manager failed to initialize properly") { for(Int i=0; i < MAX_UITEXT_LENGTH; i++) 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 a71f25c014..ffef5a56b1 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 ) } - TheInGameUI->freeMessageResources(); if (s_blankLayout) 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 f02edac22f..a7079e2038 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp @@ -1172,7 +1172,6 @@ void InitWOLGameGadgets( void ) NameKeyType labelID = TheNameKeyGenerator->nameToKey(AsciiString("GameSpyGameOptionsMenu.wnd:StartingCashLabel")); TheWindowManager->winGetWindowFromId(parentWOLGameSetup, labelID)->winEnable( FALSE ); } - windowMap->winSetTooltipFunc(MapSelectorTooltip); GameWindow *staticTextTitle = TheWindowManager->winGetWindowFromId( parentWOLGameSetup, staticTextTitleID ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp index 34487b2123..7492768036 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp @@ -258,9 +258,8 @@ GameTextManager::GameTextManager() #endif m_mapStringInfo(NULL), m_mapStringLUT(NULL), - m_failed(L"***FATAL*** String Manager failed to initilaize properly") + m_failed(L"***FATAL*** String Manager failed to initialize properly") { - for(Int i=0; i < MAX_UITEXT_LENGTH; i++) { m_buffer[i] = 0; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp index 1962006d86..cabff15a15 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp @@ -295,11 +295,9 @@ const Image* Anim2DTemplate::getFrame( UnsignedShort frameNumber ) const // ------------------------------------------------------------------------------------------------ Anim2D::Anim2D( Anim2DTemplate *animTemplate, Anim2DCollection *collectionSystem ) { - // sanity DEBUG_ASSERTCRASH( animTemplate != NULL, ("Anim2D::Anim2D - NULL template") ); - m_currentFrame = 0; // set the template @@ -329,8 +327,6 @@ Anim2D::Anim2D( Anim2DTemplate *animTemplate, Anim2DCollection *collectionSystem m_collectionSystem = collectionSystem; if( m_collectionSystem ) m_collectionSystem->registerAnimation( this ); - - } // ------------------------------------------------------------------------------------------------ diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp index 9f21794419..005fa4a8af 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp @@ -55,7 +55,6 @@ const Int MAX_IDX = 32; //------------------------------------------------------------------------------------------------- StructureToppleUpdate::StructureToppleUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData ) { - m_delayBurstLocation.zero(); m_structuralIntegrity = 0.0f; m_toppleDirection.x = m_toppleDirection.y = 0; From f2b9698d8be9cdcab0cf64ae94bfa28ff7d31e8b Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Fri, 28 Nov 2025 18:18:30 -0500 Subject: [PATCH 09/14] couple more nits --- Generals/Code/GameEngine/Source/GameClient/GameText.cpp | 2 -- GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp | 1 - 2 files changed, 3 deletions(-) diff --git a/Generals/Code/GameEngine/Source/GameClient/GameText.cpp b/Generals/Code/GameEngine/Source/GameClient/GameText.cpp index 1074f1dc29..8bbc840f2b 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GameText.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GameText.cpp @@ -260,14 +260,12 @@ GameTextManager::GameTextManager() m_mapStringLUT(NULL), m_failed(L"***FATAL*** String Manager failed to initialize properly") { - for(Int i=0; i < MAX_UITEXT_LENGTH; i++) { m_buffer[i] = 0; m_buffer2[i] = 0; m_buffer3[i] = 0; } - // } //============================================================================ diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp index 813dc1ee0c..e97849b9c7 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp @@ -351,7 +351,6 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatusBits statu m_nextDrawable = NULL; m_prevDrawable = NULL; - // m_customSoundAmbientInfo = NULL; From 6f89eef5dbb6fb58083b47045b2f94b22329a00b Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Sat, 29 Nov 2025 09:47:22 -0500 Subject: [PATCH 10/14] 6 more saad comments cleaned up --- .../Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp | 2 -- Generals/Code/GameEngine/Source/GameClient/LanguageFilter.cpp | 2 -- .../Source/W3DDevice/GameClient/GUI/Gadget/W3DProgressBar.cpp | 1 - .../Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp | 2 -- GeneralsMD/Code/GameEngine/Source/GameClient/LanguageFilter.cpp | 2 -- .../Source/W3DDevice/GameClient/GUI/Gadget/W3DProgressBar.cpp | 1 - 6 files changed, 10 deletions(-) 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 57e22420ec..1f5bb7932c 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp @@ -794,8 +794,6 @@ void MainMenuUpdate( WindowLayout *layout, void *userData ) DownloadMenuUpdate(layout, userData); } - // Added by Saad to the confirmation or decline of the resoluotion change - // dialog box. /* This is also commented for the same reason as the top if (dispChanged) { diff --git a/Generals/Code/GameEngine/Source/GameClient/LanguageFilter.cpp b/Generals/Code/GameEngine/Source/GameClient/LanguageFilter.cpp index 3b6d485e6b..1ea59b44f3 100644 --- a/Generals/Code/GameEngine/Source/GameClient/LanguageFilter.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/LanguageFilter.cpp @@ -35,8 +35,6 @@ LanguageFilter *TheLanguageFilter = NULL; LanguageFilter::LanguageFilter() { - //Modified by Saad - //Unnecessary //m_wordList.clear(); } diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DProgressBar.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DProgressBar.cpp index f6e4f252fb..e8a97d8105 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DProgressBar.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DProgressBar.cpp @@ -401,7 +401,6 @@ void W3DGadgetProgressBarImageDraw( GameWindow *window, WinInstanceData *instDat } start.x = origin.x + 10 + barCenter->getImageWidth() * pieces; //pieces = (size.x - barWindowSize.x -20) / barRight->getImageWidth(); - //Changed By Saad for flashing grey piece pieces = ((size.x - 20) / barCenter->getImageWidth()) - pieces; for( i = 0; i < pieces; i++ ) { 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 f7c632c722..fdb0f2f526 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp @@ -831,8 +831,6 @@ void MainMenuUpdate( WindowLayout *layout, void *userData ) DownloadMenuUpdate(layout, userData); } - // Added by Saad to the confirmation or decline of the resoluotion change - // dialog box. /* This is also commented for the same reason as the top if (dispChanged) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/LanguageFilter.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/LanguageFilter.cpp index 656bf74490..fffd5fd96a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/LanguageFilter.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/LanguageFilter.cpp @@ -35,8 +35,6 @@ LanguageFilter *TheLanguageFilter = NULL; LanguageFilter::LanguageFilter() { - //Modified by Saad - //Unnecessary //m_wordList.clear(); } diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DProgressBar.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DProgressBar.cpp index 22ed2957ee..23099a7226 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DProgressBar.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DProgressBar.cpp @@ -401,7 +401,6 @@ void W3DGadgetProgressBarImageDraw( GameWindow *window, WinInstanceData *instDat } start.x = origin.x + 10 + barCenter->getImageWidth() * pieces; //pieces = (size.x - barWindowSize.x -20) / barRight->getImageWidth(); - //Changed By Saad for flashing grey piece pieces = ((size.x - 20) / barCenter->getImageWidth()) - pieces; for( i = 0; i < pieces; i++ ) { From 32509cc29a79238a6de228a37b6b74990ea44013 Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Sat, 29 Nov 2025 13:00:51 -0500 Subject: [PATCH 11/14] nit: more consistency fixes --- .../Source/GameClient/GUI/ControlBar/ControlBar.cpp | 4 ++-- .../Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp | 1 - .../GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp | 1 - .../Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index 0d5722ec53..10ca890a30 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -901,10 +901,10 @@ ControlBar::ControlBar( void ) m_currContext = CB_CONTEXT_NONE; m_defaultControlBarPosition.x = m_defaultControlBarPosition.y = 0; m_genStarFlash = FALSE; - m_genStarOff = NULL; + m_genStarOff = NULL; m_genStarOn = NULL; m_UIDirty = FALSE; -// m_controlBarResizer = NULL; + // m_controlBarResizer = NULL; m_buildUpClockColor = GameMakeColor(0,0,0,100); m_commandBarBorderColor = GameMakeColor(0,0,0,100); for( i = 0; i < NUM_CONTEXT_PARENTS; i++ ) 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 dd164a4c2f..a67271485a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp @@ -279,7 +279,6 @@ void HideQuitMenu( void ) //------------------------------------------------------------------------------------------------- void ToggleQuitMenu() { - if (TheGameLogic->isIntroMoviePlaying() || TheGameLogic->isLoadingMap() ||TheScriptEngine->isGameEnding()) return; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp index 5aea03fe83..d2c8db2ca4 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp @@ -256,7 +256,6 @@ 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(); 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 3708a74ca3..faa2e6d1d3 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; m_diveState = DIVESTATE_PREDIVE; - } //------------------------------------------------------------------------------------------------- From a4ca6cbe755397229a7ab65491a4193b44b7d7d0 Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Sat, 29 Nov 2025 13:02:48 -0500 Subject: [PATCH 12/14] nit: remove comment --- Generals/Code/GameEngine/Source/GameClient/LanguageFilter.cpp | 1 - .../GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp | 1 + GeneralsMD/Code/GameEngine/Source/GameClient/LanguageFilter.cpp | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Generals/Code/GameEngine/Source/GameClient/LanguageFilter.cpp b/Generals/Code/GameEngine/Source/GameClient/LanguageFilter.cpp index 1ea59b44f3..0aa3abf688 100644 --- a/Generals/Code/GameEngine/Source/GameClient/LanguageFilter.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/LanguageFilter.cpp @@ -35,7 +35,6 @@ LanguageFilter *TheLanguageFilter = NULL; LanguageFilter::LanguageFilter() { - //m_wordList.clear(); } LanguageFilter::~LanguageFilter() { 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 a7079e2038..f02edac22f 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp @@ -1172,6 +1172,7 @@ void InitWOLGameGadgets( void ) NameKeyType labelID = TheNameKeyGenerator->nameToKey(AsciiString("GameSpyGameOptionsMenu.wnd:StartingCashLabel")); TheWindowManager->winGetWindowFromId(parentWOLGameSetup, labelID)->winEnable( FALSE ); } + windowMap->winSetTooltipFunc(MapSelectorTooltip); GameWindow *staticTextTitle = TheWindowManager->winGetWindowFromId( parentWOLGameSetup, staticTextTitleID ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/LanguageFilter.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/LanguageFilter.cpp index fffd5fd96a..1631d522fe 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/LanguageFilter.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/LanguageFilter.cpp @@ -35,7 +35,6 @@ LanguageFilter *TheLanguageFilter = NULL; LanguageFilter::LanguageFilter() { - //m_wordList.clear(); } LanguageFilter::~LanguageFilter() { From b52d6e9537eb5b0518c9e94f032101160f0020cc Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Sat, 29 Nov 2025 13:21:16 -0500 Subject: [PATCH 13/14] remove empty line --- .../GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp index d2c8db2ca4..78847445fc 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp @@ -259,7 +259,6 @@ class DeliverPayloadNugget : public ObjectCreationNugget m_payload.clear(); m_putInContainerName.clear(); m_transportName.clear(); - } virtual Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const From c43e0ae505aa6c7ece44a4001f3fa5a88bfd5945 Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Sat, 29 Nov 2025 13:30:25 -0500 Subject: [PATCH 14/14] more cleanup --- .../GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp | 1 - .../GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp | 2 -- 2 files changed, 3 deletions(-) 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 fb782a271d..51d2a7813e 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp @@ -124,7 +124,6 @@ DeliverPayloadAIUpdate::DeliverPayloadAIUpdate( Thing *thing, const ModuleData* DeliverPayloadAIUpdate::~DeliverPayloadAIUpdate( void ) { m_deliveryDecal.clear(); - deleteInstance(m_deliverPayloadStateMachine); } 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 faa2e6d1d3..63cf5c78cb 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp @@ -116,7 +116,6 @@ DeliverPayloadAIUpdate::DeliverPayloadAIUpdate( Thing *thing, const ModuleData* m_visibleItemsDelivered = 0; m_deliveryDecal.clear(); m_previousDistanceSqr = 0; - m_freeToExit = FALSE; m_acceptingCommands = TRUE; m_diveState = DIVESTATE_PREDIVE; @@ -126,7 +125,6 @@ DeliverPayloadAIUpdate::DeliverPayloadAIUpdate( Thing *thing, const ModuleData* DeliverPayloadAIUpdate::~DeliverPayloadAIUpdate( void ) { m_deliveryDecal.clear(); - deleteInstance(m_deliverPayloadStateMachine); }