manually clear out extra lines near where we removed comments

bobtista · bobtista · commit 318f061cbdee · 2025-11-18T15:54:01.000-05:00
diff --git 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
@@ -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
@@ -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
@@ -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; i<MAX_SLOTS; ++i)
 		{
 			m_playerNames[i] = "";
-
 			m_playerColors[i] = 0;
 			m_playerFactions[i] = 0;
 			m_playerLosses[i] = 0;
 			m_playerProfileID[i] = 0;
 			m_playerWins[i] = 0;
-
 		}
 	}
 
diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp
@@ -1107,7 +1107,6 @@ void PSPlayerStats::reset( void )
 	desyncsInARow = 0;
 	maxDesyncsInARow = 0;
 	lastLadderPort = 0;
-
 	maxQMwinsInARow = 0;
 	QMwinsInARow = 0;
 }
diff --git a/Core/GameEngine/Source/GameNetwork/NAT.cpp b/Core/GameEngine/Source/GameNetwork/NAT.cpp
@@ -162,7 +162,6 @@ NAT::NAT()
 	m_transport = NULL;
 	m_slotList = NULL;
 	m_roundTimeout = 0;
-
 	m_maxNumRetriesAllowed = 10;
 	m_packetID = 0x7f00;
 }
diff --git a/Core/GameEngine/Source/GameNetwork/NetCommandMsg.cpp b/Core/GameEngine/Source/GameNetwork/NetCommandMsg.cpp
@@ -38,7 +38,6 @@ NetCommandMsg::NetCommandMsg()
 	m_executionFrame = 0;
 	m_id = 0;
 	m_playerID = 0;
-
 	m_timestamp = 0;
 	m_referenceCount = 1; // start this off as 1.  This means that an "attach" is implied by creating a NetCommandMsg object.
 	m_commandType = NETCOMMANDTYPE_UNKNOWN;
@@ -89,7 +88,6 @@ Int NetCommandMsg::getSortNumber() {
 NetGameCommandMsg::NetGameCommandMsg() : NetCommandMsg() {
 	m_argSize = 0;
 	m_numArgs = 0;
-
 	m_type = (GameMessage::Type)0;
 	m_commandType = NETCOMMANDTYPE_GAMECOMMAND;
 	m_argList = NULL;
@@ -881,9 +879,7 @@ UnsignedInt NetWrapperCommandMsg::getTotalDataLength() {
 
 void NetWrapperCommandMsg::setTotalDataLength(UnsignedInt totalDataLength) {
 	m_totalDataLength = totalDataLength;
-}
-
-UnsignedShort NetWrapperCommandMsg::getWrappedCommandID() {
+	return sizeof(NetPacketChatCommand) + sizeof(UnsignedByte) /* text length byte */ + m_text.getByteCount()
 	return m_wrappedCommandID;
 }
 
@@ -892,8 +888,7 @@ void NetWrapperCommandMsg::setWrappedCommandID(UnsignedShort wrappedCommandID) {
 }
 
 //-------------------------
-// NetFileCommandMsg
-//-------------------------
+	return sizeof(NetPacketDisconnectChatCommand) + sizeof(UnsignedByte) /* text length byte */
 NetFileCommandMsg::NetFileCommandMsg() : NetCommandMsg() {
 	m_commandType = NETCOMMANDTYPE_FILE;
 	m_data = NULL;
diff --git a/Core/GameEngine/Source/GameNetwork/Network.cpp b/Core/GameEngine/Source/GameNetwork/Network.cpp
@@ -270,7 +270,6 @@ Network::Network()
 	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
@@ -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/Generals/Code/GameEngine/Include/Common/INI.h b/Generals/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/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h
@@ -202,7 +202,6 @@ class DeliverPayloadAIUpdateModuleData : public AIUpdateModuleData
 		m_dropOffset.zero();
 		m_dropVariance.zero();
 		m_deliveryDecalRadius = 0;
-
 		m_putInContainerName.clear();
 	}
 
@@ -290,11 +289,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/Generals/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp b/Generals/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/Generals/Code/GameEngine/Source/Common/MultiplayerSettings.cpp b/Generals/Code/GameEngine/Source/Common/MultiplayerSettings.cpp
@@ -74,17 +74,14 @@ const FieldParse MultiplayerSettings::m_multiplayerSettingsFieldParseTable[] =
 MultiplayerSettings::MultiplayerSettings()
 {
 	m_initialCreditsMin = 5000;
-
 	m_initialCreditsMax = 10000;
 	m_maxBeaconsPerPlayer = 3;
-
 	m_startCountdownTimerSeconds = 0;
 	m_numColors = 0;
 	m_isShroudInMultiplayer = TRUE;
 	m_showRandomPlayerTemplate = TRUE;
 	m_showRandomStartPos = TRUE;
 	m_showRandomColor = TRUE;
-
 	m_observerColor;
 	m_randomColor;
 }
diff --git a/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp
@@ -1317,9 +1317,7 @@ Team::Team(TeamPrototype *proto, TeamID id ) :
 	m_wasIdle(false)
 {
 	m_created = FALSE;
-
 	m_commonAttackTarget = INVALID_ID;
-
 	// allocate new relation map pools
 	m_playerRelations = newInstance(PlayerRelationMap);
 	m_teamRelations = newInstance(TeamRelationMap);
diff --git a/Generals/Code/GameEngine/Source/Common/Recorder.cpp b/Generals/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/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp b/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp
@@ -79,18 +79,15 @@ StatsCollector::StatsCollector( void )
 	m_isScrolling = FALSE;
 	m_scrollBeginTime = 0;
 	m_scrollTime = 0;
-
 	m_timeCount = 0;
 	m_buildCommands = 0;
 	m_moveCommands = 0;
 	m_attackCommands = 0;
 	m_scrollMapCommands = 0;
 	m_AIUnits = 0;
 	m_playerUnits = 0;
-
 	m_lastUpdate = 0;
 	m_startFrame = TheGameLogic->getFrame();
-
 }
 //Destructor
 //=============================================================================
diff --git 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
@@ -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
@@ -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++)

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ class PeerThreadClass : public ThreadClass`
`180`	`180`	`PeerThreadClass() : ThreadClass()`
`181`	`181`	`{`
`182`	`182`	`m_roomJoined = m_allowObservers = m_hasPassword = FALSE;`
`183`		`- m_useStats = TRUE;`
	`183`	`+ m_useStats = TRUE;`
`184`	`184`	`m_exeCRC = m_iniCRC = 0;`
`185`	`185`	`m_gameVersion = 0;`
`186`	`186`	`m_ladderPort = 0;`
`@@ -198,13 +198,11 @@ class PeerThreadClass : public ThreadClass`
`198`	`198`	`for (Int i=0; i<MAX_SLOTS; ++i)`
`199`	`199`	`{`
`200`	`200`	`m_playerNames[i] = "";`
`201`		`-`
`202`	`201`	`m_playerColors[i] = 0;`
`203`	`202`	`m_playerFactions[i] = 0;`
`204`	`203`	`m_playerLosses[i] = 0;`
`205`	`204`	`m_playerProfileID[i] = 0;`
`206`	`205`	`m_playerWins[i] = 0;`
`207`		`-`
`208`	`206`	`}`
`209`	`207`	`}`
`210`	`208`
Original file line number	Diff line number	Diff line change
`@@ -1107,7 +1107,6 @@ void PSPlayerStats::reset( void )`
`1107`	`1107`	`desyncsInARow = 0;`
`1108`	`1108`	`maxDesyncsInARow = 0;`
`1109`	`1109`	`lastLadderPort = 0;`
`1110`		`-`
`1111`	`1110`	`maxQMwinsInARow = 0;`
`1112`	`1111`	`QMwinsInARow = 0;`
`1113`	`1112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,6 @@ NAT::NAT()`
`162`	`162`	`m_transport = NULL;`
`163`	`163`	`m_slotList = NULL;`
`164`	`164`	`m_roundTimeout = 0;`
`165`		`-`
`166`	`165`	`m_maxNumRetriesAllowed = 10;`
`167`	`166`	`m_packetID = 0x7f00;`
`168`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,6 @@ class GeometryInfo : public Snapshot`
`113`	`113`	`{`
`114`	`114`	`m_boundingCircleRadius = 0.0f;`
`115`	`115`	`m_boundingSphereRadius = 0.0f;`
`116`		`-`
`117`	`116`	`set(type, isSmall, height, majorRadius, minorRadius);`
`118`	`117`	`}`
`119`	`118`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,6 @@ class MultiIniFieldParse`
`140`	`140`	`{`
`141`	`141`	`for(Int i = 0; i < MAX_MULTI_FIELDS; i++)`
`142`	`142`	`m_extraOffset[i] = 0;`
`143`		`-`
`144`	`143`	`}`
`145`	`144`
`146`	`145`	`void add(const FieldParse* f, UnsignedInt e = 0);`