Skip to content

Commit c70ad0e

Browse files
committed
replicate changes to some files to GeneralsMD
1 parent b90d98e commit c70ad0e

File tree

13 files changed

+0
-21
lines changed

13 files changed

+0
-21
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
#include "GameClient/InGameUI.h"
7575

7676

77-
7877
// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
7978

8079
enum

GeneralsMD/Code/GameEngine/Include/Common/Geometry.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ class GeometryInfo : public Snapshot
113113
{
114114
m_boundingCircleRadius = 0.0f;
115115
m_boundingSphereRadius = 0.0f;
116-
117116
set(type, isSmall, height, majorRadius, minorRadius);
118117
}
119118

GeneralsMD/Code/GameEngine/Include/Common/INI.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ class MultiIniFieldParse
140140
{
141141
for(Int i = 0; i < MAX_MULTI_FIELDS; i++)
142142
m_extraOffset[i] = 0;
143-
144143
}
145144

146145
void add(const FieldParse* f, UnsignedInt e = 0);

GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ class DeliverPayloadAIUpdateModuleData : public AIUpdateModuleData
204204
m_dropOffset.zero();
205205
m_dropVariance.zero();
206206
m_deliveryDecalRadius = 0;
207-
208207
m_putInContainerName.clear();
209208
}
210209

@@ -292,11 +291,9 @@ class DeliverPayloadData
292291
m_visiblePayloadWeaponTemplate = NULL;
293292
m_selfDestructObject = FALSE;
294293
m_deliveryDecalRadius = 0;
295-
296294
m_visibleDropBoneName.clear();
297295
m_visiblePayloadTemplateName.clear();
298296
m_visibleSubObjectName.clear();
299-
300297
}
301298

302299
static const FieldParse* getFieldParse();

GeneralsMD/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ BezFwdIterator::BezFwdIterator(Int stepsDesired, const BezierSegment *bezSeg)
4141
mDDDq.zero();
4242
mDDq.zero();
4343
mDq.zero();
44-
4544
mStepsDesired = stepsDesired;
4645
mBezSeg = (*bezSeg);
4746
}

GeneralsMD/Code/GameEngine/Source/Common/MultiplayerSettings.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ MultiplayerSettings::MultiplayerSettings()
8080
m_showRandomPlayerTemplate = TRUE;
8181
m_showRandomStartPos = TRUE;
8282
m_showRandomColor = TRUE;
83-
8483
m_observerColor;
8584
m_randomColor;
8685

GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1317,7 +1317,6 @@ Team::Team(TeamPrototype *proto, TeamID id ) :
13171317
m_wasIdle(false)
13181318
{
13191319
m_created = FALSE;
1320-
13211320
m_commonAttackTarget = INVALID_ID;
13221321

13231322
// allocate new relation map pools

GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,6 @@ RecorderClass::RecorderClass()
372372
m_archiveReplays = FALSE;
373373
m_nextFrame = 0;
374374
m_wasDesync = FALSE;
375-
376375
init(); // just for the heck of it.
377376
}
378377

GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,15 @@ StatsCollector::StatsCollector( void )
7979
m_isScrolling = FALSE;
8080
m_scrollBeginTime = 0;
8181
m_scrollTime = 0;
82-
8382
m_timeCount = 0;
8483
m_buildCommands = 0;
8584
m_moveCommands = 0;
8685
m_attackCommands = 0;
8786
m_scrollMapCommands = 0;
8887
m_AIUnits = 0;
8988
m_playerUnits = 0;
90-
9189
m_lastUpdate = 0;
9290
m_startFrame = TheGameLogic->getFrame();
93-
9491
}
9592
//Destructor
9693
//=============================================================================

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,6 @@ CommandButton::CommandButton( void )
573573
//m_pushedImage = NULL;
574574

575575
m_flashCount = 0;
576-
577576
m_conflictingLabel.clear();
578577
m_cursorName.clear();
579578
m_descriptionLabel.clear();
@@ -582,7 +581,6 @@ CommandButton::CommandButton( void )
582581
m_options = 0;
583582
m_purchasedLabel.clear();
584583
m_textLabel.clear();
585-
586584
m_window = NULL;
587585
m_commandButtonBorder = COMMAND_BUTTON_BORDER_NONE;
588586
//m_prev = NULL;

0 commit comments

Comments
 (0)