Skip to content

Commit a94c874

Browse files
committed
restored some comments, fixed an indent, more space removal, replicated to MD
1 parent 7f2be45 commit a94c874

File tree

19 files changed

+9
-37
lines changed

19 files changed

+9
-37
lines changed

Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ class PeerThreadClass : public ThreadClass
180180
PeerThreadClass() : ThreadClass()
181181
{
182182
m_roomJoined = m_allowObservers = m_hasPassword = FALSE;
183-
m_useStats = TRUE;
183+
m_useStats = TRUE;
184184
m_exeCRC = m_iniCRC = 0;
185185
m_gameVersion = 0;
186186
m_ladderPort = 0;

Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ class SelectionTranslator : public GameMessageTranslator
6262
SelectionTranslator();
6363
~SelectionTranslator();
6464
virtual GameMessageDisposition translateGameMessage(const GameMessage *msg);
65-
65+
//added for fix to the drag selection when entering control bar
66+
//changes the mode of drag selecting to it's opposite
6667
void setDragSelecting(Bool dragSelect);
6768
void setLeftMouseButton(Bool state);
6869
};

Generals/Code/GameEngine/Source/Common/RTS/Player.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,6 @@ Player::Player( Int playerIndex )
336336
{
337337
m_squads[i] = NULL;
338338
}
339-
//
340339
for (i = 0; i < MAX_PLAYER_COUNT; ++i)
341340
{
342341
m_attackedBy[i] = false;

Generals/Code/GameEngine/Source/GameClient/Drawable.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatusBits statu
333333
m_expirationDate = 0; // 0 == never expires
334334

335335
m_lastConstructDisplayed = -1.0f;
336-
336+
//Fix for the building percent
337337
m_constructDisplayString = TheDisplayStringManager->newDisplayString();
338338
m_constructDisplayString->setFont(TheFontLibrary->getFont(TheInGameUI->getDrawableCaptionFontName(),
339339
TheGlobalLanguageData->adjustFontSize(TheInGameUI->getDrawableCaptionPointSize()),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,7 @@ void InitLanGameGadgets( void )
649649
Int localSlotNum = TheLAN->GetMyGame()->getLocalSlotNum();
650650
DEBUG_ASSERTCRASH(localSlotNum >= 0, ("Bad slot number!"));
651651

652+
//Tooltip function is being set for techBuildings, and supplyDocks
652653
windowMap->winSetTooltipFunc(MapSelectorTooltip);
653654

654655
for (Int i = 0; i < MAX_SLOTS; i++)

Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,7 @@
5151
ParkingPlaceBehavior::ParkingPlaceBehavior( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
5252
{
5353
m_gotInfo = false;
54-
55-
5654
m_heliRallyPoint.zero();
57-
58-
5955
m_heliRallyPointExists = FALSE;
6056
m_nextHealFrame = FOREVER;
6157
setWakeFrame(getObject(), UPDATE_SLEEP_NONE);

Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,7 @@ CrateCollideModuleData::CrateCollideModuleData()
5252
m_isHumanOnlyPickup = FALSE;
5353
m_executeFX = NULL;
5454
m_pickupScience = SCIENCE_INVALID;
55-
56-
5755
m_executionAnimationTemplate = AsciiString::TheEmptyString;
58-
5956
}
6057

6158
//-------------------------------------------------------------------------------------------------

Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -662,8 +662,6 @@ Locomotor::Locomotor(const Locomotor& that)
662662
{
663663
m_angleOffset = 0.0f;
664664
m_maintainPos.zero();
665-
666-
667665
m_template = that.m_template;
668666
m_brakingFactor = that.m_brakingFactor;
669667
m_maxLift = that.m_maxLift;

Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,9 @@ DeliverPayloadAIUpdate::DeliverPayloadAIUpdate( Thing *thing, const ModuleData*
115115
m_visibleItemsDelivered = 0;
116116
m_deliveryDecal.clear();
117117
m_previousDistanceSqr = 0;
118-
119118
m_freeToExit = FALSE;
120119
m_acceptingCommands = TRUE;
121-
122-
123120
m_diveState = DIVESTATE_PREDIVE;
124-
125121
}
126122

127123
//-------------------------------------------------------------------------------------------------

Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,7 @@ DefaultProductionExitUpdate::DefaultProductionExitUpdate( Thing *thing, const Mo
4646
{
4747
// no rally point has been set
4848
m_rallyPointExists = false;
49-
5049
m_rallyPoint.zero();
51-
52-
5350
setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
5451
}
5552

0 commit comments

Comments
 (0)