Skip to content

Commit 16ba47b

Browse files
committed
fix: Handle braceless control-flow body indentation in conversion script and re-run
1 parent 579cc23 commit 16ba47b

116 files changed

Lines changed: 1027 additions & 1006 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Core/GameEngine/Include/Common/crc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class CRC
6969
__forceinline void computeCRC( const void *buf, Int len )
7070
{
7171
if (!buf||len<1)
72-
return;
72+
return;
7373

7474
#if !(defined(_MSC_VER) && _MSC_VER < 1300)
7575
// C++ version left in for reference purposes

Core/GameEngine/Include/GameClient/TerrainVisual.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ struct SeismicSimulationNode
115115
SeismicSimulationFilterBase::SeismicSimStatusCode handleFilterCallback( WorldHeightMapInterfaceClass *heightMap )
116116
{
117117
if ( callbackFilter == nullptr )
118-
return SeismicSimulationFilterBase::SEISMIC_STATUS_INVALID;
118+
return SeismicSimulationFilterBase::SEISMIC_STATUS_INVALID;
119119

120120
++m_life;
121121

@@ -127,7 +127,7 @@ struct SeismicSimulationNode
127127
DEBUG_ASSERTCRASH( callbackFilter, ("SeismicSimulationNode::applyGravity() has no callback filter!") );
128128

129129
if ( callbackFilter == nullptr )
130-
return velocityIn;//oops, we have no callback!
130+
return velocityIn;//oops, we have no callback!
131131

132132
return callbackFilter->applyGravityCallback( velocityIn );
133133

Core/GameEngine/Source/Common/Audio/DynamicAudioEventInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ void DynamicAudioEventInfo::overrideLoopFlag( Bool newLoopFlag )
8282
m_overriddenFields.set( OVERRIDE_LOOP_FLAG );
8383

8484
if ( newLoopFlag)
85-
BitSet( m_control, AC_LOOP );
85+
BitSet( m_control, AC_LOOP );
8686
else
8787
BitClear( m_control, AC_LOOP );
8888
}

Core/GameEngine/Source/Common/Audio/GameAudio.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ void AudioManager::set3DVolumeAdjustment( Real volumeAdjustment )
769769
m_sound3DVolume = 1.0f;
770770

771771
if ( ! has3DSensitiveStreamsPlaying() )
772-
m_volumeHasChanged = TRUE;
772+
m_volumeHasChanged = TRUE;
773773
}
774774

775775
//-------------------------------------------------------------------------------------------------

Core/GameEngine/Source/Common/System/GameMemory.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1638,7 +1638,7 @@ void* MemoryPool::allocateBlockDoNotZeroImplementation(DECLARE_LITERALSTRING_ARG
16381638
for (; blob != nullptr; blob = blob->getNextInList())
16391639
{
16401640
if (blob->hasAnyFreeBlocks())
1641-
break;
1641+
break;
16421642
}
16431643

16441644
// note that if we walk thru the list without finding anything, this will
@@ -2249,7 +2249,7 @@ void *DynamicMemoryAllocator::allocateBytesDoNotZeroImplementation(Int numBytes
22492249
#if defined(RTS_DEBUG)
22502250
// check alignment
22512251
if (unsigned(result)&3)
2252-
throw ERROR_OUT_OF_MEMORY;
2252+
throw ERROR_OUT_OF_MEMORY;
22532253
#endif
22542254

22552255
return result;

Core/GameEngine/Source/Common/System/Radar.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ Bool Radar::radarToWorld2D( const ICoord2D *radar, Coord3D *world )
528528
Bool Radar::radarToWorld( const ICoord2D *radar, Coord3D *world )
529529
{
530530
if (!radarToWorld2D(radar,world))
531-
return FALSE;
531+
return FALSE;
532532

533533
// find the terrain height here
534534
world->z = TheTerrainLogic->getGroundHeight( world->x, world->y );

Core/GameEngine/Source/GameClient/Input/Mouse.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ void Mouse::reset()
643643

644644
// reset the text of the cursor text
645645
if ( m_cursorTextDisplayString )
646-
m_cursorTextDisplayString->reset();
646+
m_cursorTextDisplayString->reset();
647647

648648
blockCapture(CursorCaptureBlockReason_NoInit);
649649

@@ -683,7 +683,7 @@ void Mouse::createStreamMessages()
683683

684684
Int delay = m_tooltipDelayTime;
685685
if(m_tooltipDelay >= 0 )
686-
delay = m_tooltipDelay;
686+
delay = m_tooltipDelay;
687687
if( TheGlobalData->m_scriptDebug )
688688
{
689689
//No delay while scriptdebugging!

Core/GameEngine/Source/GameClient/SelectionInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ Bool addDrawableToList( Drawable *draw, void *userData )
370370
ContainModuleInterface *contain = obj->getContainedBy()->getContain();
371371
Drawable *containDraw = obj->getContainedBy()->getDrawable();
372372
if (contain && ! contain->isEnclosingContainerFor( obj ) && containDraw )
373-
return addDrawableToList( containDraw, userData );
373+
return addDrawableToList( containDraw, userData );
374374
}
375375
else
376376
return FALSE;

Core/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,11 @@ SeismicSimulationFilterBase::SeismicSimStatusCode DomeStyleSeismicFilter::filter
136136
Int life = node->m_life;
137137

138138
if ( heightMap == nullptr )
139-
return SEISMIC_STATUS_INVALID;
139+
return SEISMIC_STATUS_INVALID;
140140

141141

142142
if ( life == 0 )
143-
return SEISMIC_STATUS_ACTIVE;
143+
return SEISMIC_STATUS_ACTIVE;
144144
if ( life < 15 )
145145
{
146146
// ADD HEIGHT BECAUSE THE EXPLOSION IS PUSHING DIRT UP
@@ -179,18 +179,18 @@ SeismicSimulationFilterBase::SeismicSimStatusCode DomeStyleSeismicFilter::filter
179179
{
180180
workspace[ (radius - x) + workspaceWidth * (radius + y) ] = height + heightMap->getBilinearSampleSeismicZVelocity( centerX - x, centerY + y ) ;
181181
if ( y != 0 )
182-
workspace[ (radius - x) + workspaceWidth * (radius - y) ] = height + heightMap->getBilinearSampleSeismicZVelocity( centerX - x, centerY - y ) ;
182+
workspace[ (radius - x) + workspaceWidth * (radius - y) ] = height + heightMap->getBilinearSampleSeismicZVelocity( centerX - x, centerY - y ) ;
183183
}
184184
if ( y != 0 )
185-
workspace[ (radius + x) + workspaceWidth * (radius - y) ] = height + heightMap->getBilinearSampleSeismicZVelocity( centerX + x, centerY - y ) ;
185+
workspace[ (radius + x) + workspaceWidth * (radius - y) ] = height + heightMap->getBilinearSampleSeismicZVelocity( centerX + x, centerY - y ) ;
186186
}
187187
}
188188
}
189189

190190
// stuff the values from the workspace into the heightmap's velocities
191191
for (x = 0; x < workspaceWidth; ++x)
192-
for (y = 0; y < workspaceWidth; ++y)
193-
heightMap->setSeismicZVelocity( centerX - radius + x, centerY - radius + y, MIN( 9.0f, workspace[ x + workspaceWidth * y ]) );
192+
for (y = 0; y < workspaceWidth; ++y)
193+
heightMap->setSeismicZVelocity( centerX - radius + x, centerY - radius + y, MIN( 9.0f, workspace[ x + workspaceWidth * y ]) );
194194

195195
delete [] workspace;
196196

Core/GameEngine/Source/GameLogic/AI/AIPathfind.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4352,7 +4352,7 @@ void Pathfinder::classifyObjectFootprint( Object *obj, Bool insert )
43524352

43534353
#if !RTS_GENERALS
43544354
if ( obj->isKindOf( KINDOF_BLAST_CRATER ) ) // since these footprints are permanent, never remove them
4355-
return;
4355+
return;
43564356
#endif
43574357

43584358
removeUnitFromPathfindMap(obj);

0 commit comments

Comments
 (0)