fix: Handle braceless control-flow body indentation in conversion script and re-run

Author: bobtista

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

@@ -140,8 +140,8 @@ class ImageCollection : public SubsystemInterface
 	Image *Enum(unsigned index)
 	{
 		for (ImageMap::iterator i=m_imageMap.begin();i!=m_imageMap.end();++i)
-		if (!index--)
-		return i->second;
+			if (!index--)
+				return i->second;
 		return nullptr;
 	}
 

Generals/Code/GameEngine/Source/Common/System/BuildAssistant.cpp

@@ -340,7 +340,7 @@ Object *BuildAssistant::buildObjectNow( Object *constructorObject, const ThingTe
 	// Need to validate that we can make this in case someone fakes their CommandSet
 	// A Null constructorObject is used by the script engine to cheat, so let it slide
 	if( constructorObject && !isPossibleToMakeUnit(constructorObject, what) )
-	return nullptr;
+		return nullptr;
 
 	// clear out any objects from the building area that are "auto-clearable" when building
 	clearRemovableForConstruction( what, pos, angle );

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

@@ -1182,7 +1182,7 @@ void Drawable::updateDrawable()
 	}
 
 	if (m_colorTintEnvelope)
-	m_colorTintEnvelope->update(); // defector fx, disable fx, etc...
+		m_colorTintEnvelope->update(); // defector fx, disable fx, etc...
 
 	if (m_selectionFlashEnvelope)
 		m_selectionFlashEnvelope->update(); // selection flashing
@@ -1277,13 +1277,13 @@ Bool Drawable::calcPhysicsXform(PhysicsXformInfo& info)
 		// HOTFIX: Ensure that we are not passing denormalized values back to caller
 		// @todo remove hotfix
 		if (info.m_totalPitch>-1e-20f&&info.m_totalPitch<1e-20f)
-		info.m_totalPitch=0.f;
+			info.m_totalPitch=0.f;
 		if (info.m_totalRoll>-1e-20f&&info.m_totalRoll<1e-20f)
-		info.m_totalRoll=0.f;
+			info.m_totalRoll=0.f;
 		if (info.m_totalYaw>-1e-20f&&info.m_totalYaw<1e-20f)
-		info.m_totalYaw=0.f;
+			info.m_totalYaw=0.f;
 		if (info.m_totalZ>-1e-20f&&info.m_totalZ<1e-20f)
-		info.m_totalZ=0.f;
+			info.m_totalZ=0.f;
 	}
 
 	return hasPhysicsXform;

Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp

@@ -574,7 +574,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 		diffSize = newSize.y - size.y;
 		GameWindow *parent = m_buildToolTipLayout->getFirstWindow();
 		if(!parent)
-		return;
+			return;
 
 		parent->winGetSize(&size.x, &size.y);
 		if(size.y + diffSize < 102) {

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

@@ -1079,7 +1079,7 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 					{
 						// We don't have anything that'll happen if we click on ourselves
 						if(i == myGame->getLocalSlotNum())
-					break;
+						break;
 						// Get
 						Int pos = -1;
 						GadgetComboBoxGetSelectedPos(comboBoxPlayer[i], &pos);

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

@@ -407,7 +407,7 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 					buttonPushed = true;
 					// reset the campaign manager to empty
 					if( TheCampaignManager )
-					TheCampaignManager->setCampaign( "" );
+						TheCampaignManager->setCampaign( "" );
 					// get text of the map to load
 					const char *mapFname = (const char *)GadgetListBoxGetItemData( mapWindow, selected );
 					DEBUG_ASSERTCRASH(mapFname, ("No map item data"));

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

@@ -1651,7 +1651,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 					disCons = stats.discons[ptIdx];
 					disCons -= 1;
 					if (disCons >= 0)
-					stats.discons[ptIdx] = disCons;
+						stats.discons[ptIdx] = disCons;
 
 					stats.gamesAsRandom += (localSlot->getOriginalPlayerTemplate() == PLAYERTEMPLATE_RANDOM);
 

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

@@ -804,7 +804,7 @@ void updateMapStartSpots( GameInfo *myGame, GameWindow *buttonMapStartPositions[
 	for( i = 0; i < MAX_SLOTS; ++i)
 	{
 		if ( buttonMapStartPositions[i] == nullptr )
-		continue;
+			continue;
 
 		GameSlot *gs =myGame->getSlot(i);
 		if(onLoadScreen)
@@ -836,7 +836,7 @@ void updateMapStartSpots( GameInfo *myGame, GameWindow *buttonMapStartPositions[
 static void handlePlayerSelection(int index)
 {
 	if( index == 0 || index >=MAX_SLOTS)
-	return;
+		return;
 
 	GameWindow *combo = comboBoxPlayer[index];
 	Int playerType, selIndex;
@@ -849,7 +849,7 @@ static void handlePlayerSelection(int index)
 	{
 		GameSlot * slot = myGame->getSlot(index);
 		if(!slot)
-		return;
+			return;
 		slot->setState(SlotState(playerType), title);
 
 	}
@@ -869,7 +869,7 @@ static void handleColorSelection(int index)
 	{
 		GameSlot * slot = myGame->getSlot(index);
 		if(!slot)
-		return;
+			return;
 		if (color == slot->getColor())
 			return;
 
@@ -908,7 +908,7 @@ static void handlePlayerTemplateSelection(int index)
 	{
 		GameSlot * slot = myGame->getSlot(index);
 		if(!slot)
-		return;
+			return;
 		if (playerTemplate == slot->getPlayerTemplate())
 			return;
 
@@ -961,7 +961,7 @@ static void handleTeamSelection(int index)
 	{
 		GameSlot * slot = myGame->getSlot(index);
 		if(!slot)
-		return;
+			return;
 		if (team == slot->getTeamNumber())
 			return;
 

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

@@ -2432,7 +2432,7 @@ WindowMsgHandledType WOLGameSetupMenuSystem( GameWindow *window, UnsignedInt msg
 					{
 						// We don't have anything that'll happen if we click on ourselves
 						if(i == myGame->getLocalSlotNum())
-					break;
+						break;
 						// Get
 						Int pos = -1;
 						GadgetComboBoxGetSelectedPos(comboBoxPlayer[i], &pos);
@@ -2604,7 +2604,7 @@ WindowMsgHandledType WOLGameSetupMenuSystem( GameWindow *window, UnsignedInt msg
 		case GBM_SELECTED_RIGHT:
 		{
 			if (buttonPushed)
-			break;
+				break;
 
 			GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();

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

@@ -1616,7 +1616,7 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
 					Int val;
 					GadgetComboBoxGetSelectedPos(comboBoxMaxDisconnects, &val);
 					if( val < 0)
-				val = 0;
+					val = 0;
 					req.QM.maxDiscons = MAX_DISCONNECTS[val];
 
 					GadgetComboBoxGetSelectedPos(comboBoxMaxPing, &val);