Skip to content

Commit a7fd99e

Browse files
StubbjaxStubbjax
committed
refactor: Standardise formatting
1 parent f37c12e commit a7fd99e

File tree

2 files changed

+24
-24
lines changed
  • GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar
  • Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar

2 files changed

+24
-24
lines changed

‎Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2680,42 +2680,42 @@ void ControlBar::setPortraitByObject( Object *obj )
26802680
/** Show a rally point marker at the world location specified. If no location is specified
26812681
* any marker that we might have visible is hidden */
26822682
// ------------------------------------------------------------------------------------------------
2683-
void ControlBar::showRallyPoint( const Coord3D *loc )
2683+
void ControlBar::showRallyPoint(const Coord3D* loc)
26842684
{
26852685
// if loc is NULL, destroy any rally point drawble we have shown
2686-
if( loc == NULL )
2686+
if (loc == NULL)
26872687
{
26882688
// destroy rally point drawable if present
2689-
if( m_rallyPointDrawableID != INVALID_DRAWABLE_ID )
2690-
TheGameClient->destroyDrawable( TheGameClient->findDrawableByID( m_rallyPointDrawableID ) );
2689+
if (m_rallyPointDrawableID != INVALID_DRAWABLE_ID)
2690+
TheGameClient->destroyDrawable(TheGameClient->findDrawableByID(m_rallyPointDrawableID));
26912691

26922692
m_rallyPointDrawableID = INVALID_DRAWABLE_ID;
26932693
return;
26942694
}
26952695

2696-
Drawable *marker = NULL;
2696+
Drawable* marker = NULL;
26972697

26982698
// create a rally point drawble if necessary
2699-
if( m_rallyPointDrawableID == INVALID_DRAWABLE_ID )
2699+
if (m_rallyPointDrawableID == INVALID_DRAWABLE_ID)
27002700
{
27012701
const ThingTemplate* ttn = TheThingFactory->findTemplate("RallyPointMarker");
2702-
marker = TheThingFactory->newDrawable( ttn );
2703-
DEBUG_ASSERTCRASH( marker, ("showRallyPoint: Unable to create rally point drawable") );
2702+
marker = TheThingFactory->newDrawable(ttn);
2703+
DEBUG_ASSERTCRASH(marker, ("showRallyPoint: Unable to create rally point drawable"));
27042704
if (marker)
27052705
{
27062706
marker->setDrawableStatus(DRAWABLE_STATUS_NO_SAVE);
27072707
m_rallyPointDrawableID = marker->getID();
27082708
}
27092709
}
27102710
else
2711-
marker = TheGameClient->findDrawableByID( m_rallyPointDrawableID );
2711+
marker = TheGameClient->findDrawableByID(m_rallyPointDrawableID);
27122712

27132713
// sanity
2714-
DEBUG_ASSERTCRASH( marker, ("showRallyPoint: No rally point marker found" ) );
2714+
DEBUG_ASSERTCRASH(marker, ("showRallyPoint: No rally point marker found"));
27152715

27162716
// set the position of the rally point drawble to the position passed in
2717-
marker->setPosition( loc );
2718-
marker->setOrientation( TheGlobalData->m_downwindAngle );//To blow down wind -- ML
2717+
marker->setPosition(loc);
2718+
marker->setOrientation(TheGlobalData->m_downwindAngle); // To blow down wind -- ML
27192719

27202720
// set the marker colors to that of the local player
27212721
Player* player = TheControlBar->getCurrentlyViewedPlayer();

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2703,42 +2703,42 @@ void ControlBar::setPortraitByObject( Object *obj )
27032703
/** Show a rally point marker at the world location specified. If no location is specified
27042704
* any marker that we might have visible is hidden */
27052705
// ------------------------------------------------------------------------------------------------
2706-
void ControlBar::showRallyPoint( const Coord3D *loc )
2706+
void ControlBar::showRallyPoint(const Coord3D* loc)
27072707
{
27082708
// if loc is NULL, destroy any rally point drawble we have shown
2709-
if( loc == NULL )
2709+
if (loc == NULL)
27102710
{
27112711
// destroy rally point drawable if present
2712-
if( m_rallyPointDrawableID != INVALID_DRAWABLE_ID )
2713-
TheGameClient->destroyDrawable( TheGameClient->findDrawableByID( m_rallyPointDrawableID ) );
2712+
if (m_rallyPointDrawableID != INVALID_DRAWABLE_ID)
2713+
TheGameClient->destroyDrawable(TheGameClient->findDrawableByID(m_rallyPointDrawableID));
27142714

27152715
m_rallyPointDrawableID = INVALID_DRAWABLE_ID;
27162716
return;
27172717
}
27182718

2719-
Drawable *marker = NULL;
2719+
Drawable* marker = NULL;
27202720

27212721
// create a rally point drawble if necessary
2722-
if( m_rallyPointDrawableID == INVALID_DRAWABLE_ID )
2722+
if (m_rallyPointDrawableID == INVALID_DRAWABLE_ID)
27232723
{
27242724
const ThingTemplate* ttn = TheThingFactory->findTemplate("RallyPointMarker");
2725-
marker = TheThingFactory->newDrawable( ttn );
2726-
DEBUG_ASSERTCRASH( marker, ("showRallyPoint: Unable to create rally point drawable") );
2725+
marker = TheThingFactory->newDrawable(ttn);
2726+
DEBUG_ASSERTCRASH(marker, ("showRallyPoint: Unable to create rally point drawable"));
27272727
if (marker)
27282728
{
27292729
marker->setDrawableStatus(DRAWABLE_STATUS_NO_SAVE);
27302730
m_rallyPointDrawableID = marker->getID();
27312731
}
27322732
}
27332733
else
2734-
marker = TheGameClient->findDrawableByID( m_rallyPointDrawableID );
2734+
marker = TheGameClient->findDrawableByID(m_rallyPointDrawableID);
27352735

27362736
// sanity
2737-
DEBUG_ASSERTCRASH( marker, ("showRallyPoint: No rally point marker found" ) );
2737+
DEBUG_ASSERTCRASH(marker, ("showRallyPoint: No rally point marker found"));
27382738

27392739
// set the position of the rally point drawble to the position passed in
2740-
marker->setPosition( loc );
2741-
marker->setOrientation( TheGlobalData->m_downwindAngle );//To blow down wind -- ML
2740+
marker->setPosition(loc);
2741+
marker->setOrientation(TheGlobalData->m_downwindAngle); // To blow down wind -- ML
27422742

27432743
// set the marker colors to that of the local player
27442744
Player* player = TheControlBar->getCurrentlyViewedPlayer();

0 commit comments

Comments
 (0)