replicate changes to some files to GeneralsMD

Author: bobtista

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;

Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp

@@ -74,7 +74,6 @@
 #include "GameClient/InGameUI.h"
 
 
-
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 
 enum

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);
 	}
 

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);

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();

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);
 }

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;
 

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

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.
 }
 

GeneralsMD/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
 //=============================================================================