another pass

bobtista · bobtista · commit bc31db40fdf3 · 2025-11-17T16:00:23.000-05:00
diff --git a/Core/GameEngine/Source/GameNetwork/Connection.cpp b/Core/GameEngine/Source/GameNetwork/Connection.cpp
@@ -43,14 +43,12 @@ Connection::Connection() {
 	m_frameGrouping = 1;
 	m_isQuitting = false;
 	m_quitTime = 0;
-	// clearing out the latency tracker
 	m_averageLatency = 0.0f;
 	Int i;
 	for(i = 0; i < CONNECTION_LATENCY_HISTORY_LENGTH; i++)
 	{
 		m_latencies[i] = 0.0f;
 	}
-	// End Add
 }
 
 /**
diff --git a/Core/GameEngine/Source/GameNetwork/DownloadManager.cpp b/Core/GameEngine/Source/GameNetwork/DownloadManager.cpp
@@ -37,12 +37,7 @@ DownloadManager::DownloadManager()
 {
 	m_download = NEW CDownload(this);
 	m_wasError = m_sawEnd = false;
-
-
 	m_queuedDownloads.clear();
-
-	//
-
 	m_statusString = TheGameText->fetch("FTP:StatusIdle");
 
 	// ----- Initialize Winsock -----
diff --git a/Core/GameEngine/Source/GameNetwork/NetCommandWrapperList.cpp b/Core/GameEngine/Source/GameNetwork/NetCommandWrapperList.cpp
@@ -37,8 +37,6 @@
 NetCommandWrapperListNode::NetCommandWrapperListNode(NetWrapperCommandMsg *msg)
 {
 	m_next = NULL;
-
-
 	m_numChunks = msg->getNumChunks();
 	m_chunksPresent = NEW Bool[m_numChunks];	// pool[]ify
 	m_numChunksPresent = 0;
diff --git a/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h b/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h
@@ -294,7 +294,6 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	Bool m_shouldValidateCRCs;															///< Should we validate CRCs this frame?
 	//-----------------------------------------------------------------------------------------------
 
-	//Used to for load scene
 	Bool m_loadingScene;
 
 	Bool m_isInUpdate;
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h
@@ -204,7 +204,6 @@ class DeliverPayloadAIUpdateModuleData : public AIUpdateModuleData
 		m_deliveryDecalRadius = 0;
 
 		m_putInContainerName.clear();
-		// End Add
 	}
 
 	static void buildFieldParse(MultiIniFieldParse& p)
@@ -295,8 +294,6 @@ class DeliverPayloadData
 		m_visibleDropBoneName.clear();
 		m_visiblePayloadTemplateName.clear();
 		m_visibleSubObjectName.clear();
-
-		// End Add
 	}
 
 	static const FieldParse* getFieldParse();
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h
@@ -58,9 +58,7 @@ class DeployStyleAIUpdateModuleData : public AIUpdateModuleData
 		m_packTime = 0;
 		m_resetTurretBeforePacking = false;
 		m_turretsFunctionOnlyWhenDeployed = false;
-		// Initialization necessary
 		m_turretsMustCenterBeforePacking = FALSE;
-		// End Add
 	}
 
 	static void buildFieldParse(MultiIniFieldParse& p)
diff --git a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp
@@ -814,9 +814,6 @@ GlobalData::GlobalData()
 	m_drawEntireTerrain = FALSE;
 	m_maxParticleCount = 0;
 	m_maxFieldParticleCount = 30;
-
-	// End Add
-
 	m_debugAI = AI_DEBUG_NONE;
 	m_debugSupplyCenterPlacement = FALSE;
 	m_debugAIObstacles = FALSE;
diff --git a/Generals/Code/GameEngine/Source/Common/MultiplayerSettings.cpp b/Generals/Code/GameEngine/Source/Common/MultiplayerSettings.cpp
@@ -75,7 +75,6 @@ MultiplayerSettings::MultiplayerSettings()
 {
 	m_initialCreditsMin = 5000;
 
-	//DID U MEAN m_initialCreditsMax = 10000;?
 	m_initialCreditsMax = 10000;
 	m_maxBeaconsPerPlayer = 3;
 
diff --git a/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp b/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp
@@ -238,8 +238,6 @@ m_pOut(pOut)
 	tmpFileName.concat(TEMP_FILENAME);
 	m_tmp_file = ::fopen( tmpFileName.str(), "wb" );
 	m_chunkStack = NULL;
-
-	// End Add
 }
 
 DataChunkOutput::~DataChunkOutput()
diff --git a/Generals/Code/GameEngine/Source/GameClient/Display.cpp b/Generals/Code/GameEngine/Source/GameClient/Display.cpp
@@ -66,7 +66,6 @@ Display::Display()
 
 	m_currentlyPlayingMovie.clear();
 	m_letterBoxFadeStartTime = 0;
-	// End Add
 }
 
 /**
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp
@@ -580,9 +580,6 @@ CommandButton::CommandButton( void )
 	m_options = 0;
 	m_purchasedLabel.clear();
 	m_textLabel.clear();
-
-	// End Add
-
 	m_window = NULL;
 	m_commandButtonBorder = COMMAND_BUTTON_BORDER_NONE;
 	//m_prev = NULL;
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp
@@ -191,8 +191,6 @@ ControlBarSchemeAnimation::ControlBarSchemeAnimation( void )
 
 	m_animDuration = 0;
 	m_finalPos.x = m_finalPos.y = 0;
-
-	// End Add
 	m_name.clear();
 	m_animType = 0;
 	m_animImage = NULL;
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp
@@ -51,12 +51,7 @@
 ParkingPlaceBehavior::ParkingPlaceBehavior( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
 	m_gotInfo = false;
-
-
 	m_heliRallyPoint.zero();
-
-	//
-
 	m_heliRallyPointExists = FALSE;
 	m_nextHealFrame = FOREVER;
 	setWakeFrame(getObject(), UPDATE_SLEEP_NONE);
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp
@@ -52,11 +52,7 @@ CrateCollideModuleData::CrateCollideModuleData()
 	m_isHumanOnlyPickup = FALSE;
 	m_executeFX = NULL;
 	m_pickupScience = SCIENCE_INVALID;
-
-
 	m_executionAnimationTemplate = AsciiString::TheEmptyString;
-
-	// End Add
 }
 
 //-------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
@@ -247,13 +247,9 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 		m_convergenceFactor( 0.0f )
 	{
 		//Note: m_data is constructed with default values.
-
-
 		m_payload.clear();
 		m_putInContainerName.clear();
 		m_transportName.clear();
-
-		// End Add
 	}
 
 	virtual Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, UnsignedInt lifetimeFrames = 0 ) const
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp
@@ -118,11 +118,7 @@ DeliverPayloadAIUpdate::DeliverPayloadAIUpdate( Thing *thing, const ModuleData*
 
 	m_freeToExit = FALSE;
 	m_acceptingCommands = TRUE;
-
-
 	m_diveState = DIVESTATE_PREDIVE;
-
-	// End Add
 }
 
 //-------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp
@@ -154,12 +154,7 @@ BattlePlanUpdate::BattlePlanUpdate( Thing *thing, const ModuleData* moduleData )
 	m_bonuses->m_invalidKindOf				= data->m_invalidMemberKindOf;
 
 	m_visionObjectID = INVALID_ID;
-
-	//------------------------//
-	//------------------------//
-
 	m_specialPowerModule   = NULL;
-	//
 }
 
 //-------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h
@@ -314,7 +314,6 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	Bool m_shouldValidateCRCs;															///< Should we validate CRCs this frame?
 	//-----------------------------------------------------------------------------------------------
 
-	//Used to for load scene
 	//Bool m_loadingScene;
 	Bool m_loadingMap;
 	Bool m_loadingSave;
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h
@@ -206,7 +206,6 @@ class DeliverPayloadAIUpdateModuleData : public AIUpdateModuleData
 		m_deliveryDecalRadius = 0;
 
 		m_putInContainerName.clear();
-		// End Add
 	}
 
 	static void buildFieldParse(MultiIniFieldParse& p)
@@ -297,8 +296,6 @@ class DeliverPayloadData
 		m_visibleDropBoneName.clear();
 		m_visiblePayloadTemplateName.clear();
 		m_visibleSubObjectName.clear();
-
-		// End Add
 	}
 
 	static const FieldParse* getFieldParse();
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h
@@ -59,9 +59,7 @@ class DeployStyleAIUpdateModuleData : public AIUpdateModuleData
 		m_packTime = 0;
 		m_resetTurretBeforePacking = false;
 		m_turretsFunctionOnlyWhenDeployed = false;
-		// Initialization necessary
 		m_turretsMustCenterBeforePacking = FALSE;
-		// End Add
 		m_manualDeployAnimations = FALSE;
 	}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp
@@ -820,9 +820,6 @@ GlobalData::GlobalData()
 	m_drawEntireTerrain = FALSE;
 	m_maxParticleCount = 0;
 	m_maxFieldParticleCount = 30;
-
-	// End Add
-
 	m_debugAI = AI_DEBUG_NONE;
 	m_debugSupplyCenterPlacement = FALSE;
 	m_debugAIObstacles = FALSE;
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp
@@ -238,8 +238,6 @@ m_pOut(pOut)
 	tmpFileName.concat(TEMP_FILENAME);
 	m_tmp_file = ::fopen( tmpFileName.str(), "wb" );
 	m_chunkStack = NULL;
-
-	// End Add
 }
 
 DataChunkOutput::~DataChunkOutput()
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp
@@ -66,7 +66,6 @@ Display::Display()
 
 	m_currentlyPlayingMovie.clear();
 	m_letterBoxFadeStartTime = 0;
-	// End Add
 }
 
 /**
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp
@@ -584,9 +584,6 @@ CommandButton::CommandButton( void )
 	m_options = 0;
 	m_purchasedLabel.clear();
 	m_textLabel.clear();
-
-	// End Add
-
 	m_window = NULL;
 	m_commandButtonBorder = COMMAND_BUTTON_BORDER_NONE;
 	//m_prev = NULL;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp
@@ -192,8 +192,6 @@ ControlBarSchemeAnimation::ControlBarSchemeAnimation( void )
 
 	m_animDuration = 0;
 	m_finalPos.x = m_finalPos.y = 0;
-
-	// End Add
 	m_name.clear();
 	m_animType = 0;
 	m_animImage = NULL;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp
@@ -51,12 +51,7 @@
 ParkingPlaceBehavior::ParkingPlaceBehavior( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
 	m_gotInfo = false;
-
-
 	m_heliRallyPoint.zero();
-
-	//
-
 	m_heliRallyPointExists = FALSE;
 	m_nextHealFrame = FOREVER;
 	setWakeFrame(getObject(), UPDATE_SLEEP_NONE);
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp
@@ -55,11 +55,7 @@ CrateCollideModuleData::CrateCollideModuleData()
 	m_isHumanOnlyPickup = FALSE;
 	m_executeFX = NULL;
 	m_pickupScience = SCIENCE_INVALID;
-
-
 	m_executionAnimationTemplate = AsciiString::TheEmptyString;
-
-	// End Add
 }
 
 //-------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
@@ -256,13 +256,9 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 		m_convergenceFactor( 0.0f )
 	{
 		//Note: m_data is constructed with default values.
-
-
 		m_payload.clear();
 		m_putInContainerName.clear();
 		m_transportName.clear();
-
-		// End Add
 	}
 
 	virtual Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp
@@ -119,11 +119,7 @@ DeliverPayloadAIUpdate::DeliverPayloadAIUpdate( Thing *thing, const ModuleData*
 
 	m_freeToExit = FALSE;
 	m_acceptingCommands = TRUE;
-
-
 	m_diveState = DIVESTATE_PREDIVE;
-
-	// End Add
 }
 
 //-------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp
@@ -154,12 +154,7 @@ BattlePlanUpdate::BattlePlanUpdate( Thing *thing, const ModuleData* moduleData )
 	m_bonuses->m_invalidKindOf				= data->m_invalidMemberKindOf;
 
 	m_visionObjectID = INVALID_ID;
-
-	//------------------------//
-	//------------------------//
-
 	m_specialPowerModule   = NULL;
-	//
 }
 
 //-------------------------------------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -43,14 +43,12 @@ Connection::Connection() {`
`43`	`43`	`m_frameGrouping = 1;`
`44`	`44`	`m_isQuitting = false;`
`45`	`45`	`m_quitTime = 0;`
`46`		`- // clearing out the latency tracker`
`47`	`46`	`m_averageLatency = 0.0f;`
`48`	`47`	`Int i;`
`49`	`48`	`for(i = 0; i < CONNECTION_LATENCY_HISTORY_LENGTH; i++)`
`50`	`49`	`{`
`51`	`50`	`m_latencies[i] = 0.0f;`
`52`	`51`	`}`
`53`		`- // End Add`
`54`	`52`	`}`
`55`	`53`
`56`	`54`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,6 @@`
`37`	`37`	`NetCommandWrapperListNode::NetCommandWrapperListNode(NetWrapperCommandMsg *msg)`
`38`	`38`	`{`
`39`	`39`	`m_next = NULL;`
`40`		`-`
`41`		`-`
`42`	`40`	`m_numChunks = msg->getNumChunks();`
`43`	`41`	`m_chunksPresent = NEW Bool[m_numChunks]; // pool[]ify`
`44`	`42`	`m_numChunksPresent = 0;`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,6 @@ class DeliverPayloadAIUpdateModuleData : public AIUpdateModuleData`
`204`	`204`	`m_deliveryDecalRadius = 0;`
`205`	`205`
`206`	`206`	`m_putInContainerName.clear();`
`207`		`- // End Add`
`208`	`207`	`}`
`209`	`208`
`210`	`209`	`static void buildFieldParse(MultiIniFieldParse& p)`
`@@ -295,8 +294,6 @@ class DeliverPayloadData`
`295`	`294`	`m_visibleDropBoneName.clear();`
`296`	`295`	`m_visiblePayloadTemplateName.clear();`
`297`	`296`	`m_visibleSubObjectName.clear();`
`298`		`-`
`299`		`- // End Add`
`300`	`297`	`}`
`301`	`298`
`302`	`299`	`static const FieldParse* getFieldParse();`
Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,7 @@ class DeployStyleAIUpdateModuleData : public AIUpdateModuleData`
`58`	`58`	`m_packTime = 0;`
`59`	`59`	`m_resetTurretBeforePacking = false;`
`60`	`60`	`m_turretsFunctionOnlyWhenDeployed = false;`
`61`		`- // Initialization necessary`
`62`	`61`	`m_turretsMustCenterBeforePacking = FALSE;`
`63`		`- // End Add`
`64`	`62`	`}`
`65`	`63`
`66`	`64`	`static void buildFieldParse(MultiIniFieldParse& p)`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,6 @@ MultiplayerSettings::MultiplayerSettings()`
`75`	`75`	`{`
`76`	`76`	`m_initialCreditsMin = 5000;`
`77`	`77`
`78`		`- //DID U MEAN m_initialCreditsMax = 10000;?`
`79`	`78`	`m_initialCreditsMax = 10000;`
`80`	`79`	`m_maxBeaconsPerPlayer = 3;`
`81`	`80`
Original file line number	Diff line number	Diff line change
`@@ -238,8 +238,6 @@ m_pOut(pOut)`
`238`	`238`	`tmpFileName.concat(TEMP_FILENAME);`
`239`	`239`	`m_tmp_file = ::fopen( tmpFileName.str(), "wb" );`
`240`	`240`	`m_chunkStack = NULL;`
`241`		`-`
`242`		`- // End Add`
`243`	`241`	`}`
`244`	`242`
`245`	`243`	`DataChunkOutput::~DataChunkOutput()`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,6 @@ Display::Display()`
`66`	`66`
`67`	`67`	`m_currentlyPlayingMovie.clear();`
`68`	`68`	`m_letterBoxFadeStartTime = 0;`
`69`		`- // End Add`
`70`	`69`	`}`
`71`	`70`
`72`	`71`	`/**`