style: Fix script edge cases and re-run continuation conversion on Generals

Author: bobtista

Generals/Code/GameEngine/Include/Common/BitFlags.h

@@ -247,13 +247,13 @@ class BitFlags
 	static Int getSingleBitFromName(const char* token)
 	{
 		Int i = 0;
-		for(const char* const* name = s_bitNameList; *name; ++name, ++i )
-		{
-			if( stricmp( *name, token ) == 0 )
-			{
+	  for(const char* const* name = s_bitNameList; *name; ++name, ++i )
+	  {
+		  if( stricmp( *name, token ) == 0 )
+		  {
 				return i;
-			}
-		}
+		  }
+	  }
 		return -1;
 	}
 
@@ -272,7 +272,7 @@ class BitFlags
 		}
 		else
 		{
-			return false;
+	    return false;
 		}
 	}
 

Generals/Code/GameEngine/Include/Common/BitFlagsIO.h

@@ -184,7 +184,7 @@ void BitFlags<NUMBITS>::xfer(Xfer* xfer)
 	}
 	else if( xfer->getXferMode() == XFER_LOAD )
 	{
-		// clear the kind of mask data
+	// clear the kind of mask data
 		clear();
 
 		// read how many entries follow

Generals/Code/GameEngine/Include/Common/BuildAssistant.h

@@ -128,36 +128,36 @@ class BuildAssistant : public SubsystemInterface
 
 	/// iterate the "footprint" area of a structure at the given "sample resolution"
 	void iterateFootprint( const ThingTemplate *build,
-		Real buildOrientation,
-		const Coord3D *worldPos,
-		Real sampleResolution,
-		IterateFootprintFunc func,
-		void *funcUserData );
+												 Real buildOrientation,
+												 const Coord3D *worldPos,
+												 Real sampleResolution,
+												 IterateFootprintFunc func,
+												 void *funcUserData );
 
 	/// create object from a build and put it in the world now
 	virtual Object *buildObjectNow( Object *constructorObject, const ThingTemplate *what,
 																	const Coord3D *pos, Real angle, Player *owningPlayer );
 
 	/// using the "line placement" for objects (like walls etc) create that line of objects line
 	virtual void buildObjectLineNow( Object *constructorObject, const ThingTemplate *what,
-		const Coord3D *start, const Coord3D *end, Real angle,
-		Player *owningPlayer );
+																	 const Coord3D *start, const Coord3D *end, Real angle,
+																	 Player *owningPlayer );
 
 	/// query if we can build at this location
 	virtual LegalBuildCode isLocationLegalToBuild( const Coord3D *worldPos,
-		const ThingTemplate *build,
-		Real angle,  // angle to construct 'build' at
-		UnsignedInt options,		// use LocationLegalToBuildOptions
-		const Object *builderObject,
-		Player *player);
+																								 const ThingTemplate *build,
+																								 Real angle,  // angle to construct 'build' at
+																								 UnsignedInt options,		// use LocationLegalToBuildOptions
+																								 const Object *builderObject,
+																								 Player *player);
 
 	/// query if we can build at this location
 	virtual Bool isLocationClearOfObjects( const Coord3D *worldPos,
-		const ThingTemplate *build,
-		Real angle,  // angle to construct 'build' a
-		const Object *builderObject,
-		UnsignedInt options,
-		Player *thePlayer);
+																								 const ThingTemplate *build,
+																								 Real angle,  // angle to construct 'build' a
+																								 const Object *builderObject,
+																								 UnsignedInt options,
+																								 Player *thePlayer);
 
 	/// Adds bib highlighting for this location.
 	virtual void addBibs( const Coord3D *worldPos,
@@ -166,8 +166,8 @@ class BuildAssistant : public SubsystemInterface
 	/// tiling wall object helper function, we can use this to "tile" walls when building
 	virtual TileBuildInfo *buildTiledLocations( const ThingTemplate *thingBeingTiled,
 																							Real angle, // angle to construct thing being tiled
-		const Coord3D *start, const Coord3D *end,
-		Real tilingSize, Int maxTiles,
+																						  const Coord3D *start, const Coord3D *end,
+																						  Real tilingSize, Int maxTiles,
 																							Object *builderObject );
 
 	/// return the "scratch pad" array that can be used to create a line of build locations
@@ -199,7 +199,7 @@ class BuildAssistant : public SubsystemInterface
 	/// will move objects that can move out of the way.
 	/// will return false if there are objects that cannot be moved out of the way.
 	Bool moveObjectsForConstruction( const ThingTemplate *whatToBuild,
-		const Coord3D *pos, Real angle, Player *playerToBuild );
+																	 const Coord3D *pos, Real angle, Player *playerToBuild );
 
 	Coord3D *m_buildPositions;			///< array used to create a line of build locations (think walls)
 	Int m_buildPositionSize;				///< number of elements in the build position array

Generals/Code/GameEngine/Include/Common/GameEngine.h

@@ -62,7 +62,7 @@ class GameEngine : public SubsystemInterface
 	virtual void update() override;							///< per frame update
 
 	virtual void execute();											/**< The "main loop" of the game engine.
-	It will not return until the game exits. */
+																								 It will not return until the game exits. */
 
 	static Bool isTimeFrozen(); ///< Returns true if a script has frozen time.
 	static Bool isGameHalted(); ///< Returns true if the game is paused or the network is stalling.

Generals/Code/GameEngine/Include/Common/GameState.h

@@ -157,9 +157,9 @@ class GameState : public SubsystemInterface,
 
 	// save game methods
 	SaveCode saveGame( AsciiString filename,
-		UnicodeString desc,
-		SaveFileType saveType,
-		SnapshotType which = SNAPSHOT_SAVELOAD  );  ///< save a game
+										 UnicodeString desc,
+										 SaveFileType saveType,
+										 SnapshotType which = SNAPSHOT_SAVELOAD  );  ///< save a game
 	SaveCode missionSave();																	 ///< do a in between mission save
 	SaveCode loadGame( AvailableGameInfo gameInfo );							 ///< load a save file
 	SaveGameInfo *getSaveGameInfo() { return &m_gameInfo; }

Generals/Code/GameEngine/Include/Common/GlobalData.h

@@ -392,10 +392,10 @@ class GlobalData : public SubsystemInterface
 
 	Real m_cameraAudibleRadius;				///< If the camera is being used as the position of audio, then how far can we hear?
 	Real m_groupMoveClickToGatherFactor; /** if you take all the selected units and calculate the smallest possible rectangle
-	that contains them all, and click within that, all the selected units will break
-	formation and gather at the point the user clicked (if the value is 1.0). If it's 0.0,
-	units will always keep their formation. If it's <1.0, then the user must click a
-	smaller area within the rectangle to order the gather. */
+																			 that contains them all, and click within that, all the selected units will break
+																			 formation and gather at the point the user clicked (if the value is 1.0). If it's 0.0,
+																			 units will always keep their formation. If it's <1.0, then the user must click a
+																			 smaller area within the rectangle to order the gather. */
 
 	Int m_antiAliasBoxValue;          ///< value of selected antialias from combo box in options menu
 	Bool m_languageFilterPref;        ///< Bool if user wants to filter language

Generals/Code/GameEngine/Include/Common/MessageStream.h

@@ -519,9 +519,9 @@ class GameMessage : public MemoryPoolObject
 		MSG_QUEUE_UNIT_CREATE,											///< clicked on a button to queue the production of a unit
 		MSG_CANCEL_UNIT_CREATE,											///< clicked on UI button to cancel production of a unit
 		MSG_DOZER_CONSTRUCT,												/**< building things requires clicking on a dozer
-		selecting what to build, selecting where to
-		build it ... this construct message will
-		start the actual build process */
+																										 selecting what to build, selecting where to
+																										 build it ... this construct message will
+																										 start the actual build process */
 		MSG_DOZER_CONSTRUCT_LINE,										///< Like MSG_CONSTRUCT, but for build processes that occur in a line (like walls)
 		MSG_DOZER_CANCEL_CONSTRUCT,									///< cancel construction of a building
 		MSG_SELL,																		///< sell a structure

Generals/Code/GameEngine/Include/Common/Player.h

@@ -294,7 +294,7 @@ class Player : public Snapshot
 	const UpgradeMaskType& getCompletedUpgradeMask() const { return m_upgradesCompleted; }	///< get list of upgrades that are completed
 	Bool hasUpgradeInProduction( const UpgradeTemplate *upgradeTemplate );		///< does player have this upgrade in progress right now
 	Upgrade *addUpgrade( const UpgradeTemplate *upgradeTemplate,
-		UpgradeStatusType status );		///< add upgrade, or update existing upgrade status
+											 UpgradeStatusType status );		///< add upgrade, or update existing upgrade status
 	void removeUpgrade( const UpgradeTemplate *upgradeTemplate );	///< remove this upgrade from us
 
 	/** find upgrade, NOTE, the upgrade may *NOT* be "complete" and therefore "active", it could be in production

Generals/Code/GameEngine/Include/Common/ThingTemplate.h

@@ -734,7 +734,7 @@ class ThingTemplate : public Overridable
 	// ---- Bool-sized things
 	Bool					m_isPrerequisite;							///< Is this thing considered in a prerequisite for any other thing?
 	Bool					m_isBridge;										///< True if this model is a bridge.
-		Bool					m_isBuildFacility;						///< is this the build facility for something? (calculated based on other template's prereqs)
+	Bool					m_isBuildFacility;						///< is this the build facility for something? (calculated based on other template's prereqs)
 	Bool					m_isTrainable;								///< Whether or not I can even gain experience
 	Bool					m_isForbidden;								///< useful when overriding in <mapfile>.ini
 	Bool					m_armorCopiedFromDefault;

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

@@ -117,21 +117,21 @@ class Display : public SubsystemInterface
 	virtual void draw() override;																		///< Redraw the entire display
 	virtual void setTimeOfDay( TimeOfDay tod ) = 0;								///< Set the time of day for this display
 	virtual void createLightPulse( const Coord3D *pos, const RGBColor *color, Real innerRadius,Real attenuationWidth,
-		UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime//, Bool donut = FALSE
-		) = 0;
+																 UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime//, Bool donut = FALSE
+																 ) = 0;
 
 	/// draw a line on the display in pixel coordinates with the specified color
 	virtual void drawLine( Int startX, Int startY, Int endX, Int endY,
-		Real lineWidth, UnsignedInt lineColor ) = 0;
+												 Real lineWidth, UnsignedInt lineColor ) = 0;
 	/// draw a line on the display in pixel coordinates with the specified 2 colors
 	virtual void drawLine( Int startX, Int startY, Int endX, Int endY,
-		Real lineWidth, UnsignedInt lineColor1, UnsignedInt lineColor2 ) = 0;
+												 Real lineWidth, UnsignedInt lineColor1, UnsignedInt lineColor2 ) = 0;
 	/// draw a rect border on the display in pixel coordinates with the specified color
 	virtual void drawOpenRect( Int startX, Int startY, Int width, Int height,
-		Real lineWidth, UnsignedInt lineColor ) = 0;
+														 Real lineWidth, UnsignedInt lineColor ) = 0;
 	/// draw a filled rect on the display in pixel coords with the specified color
 	virtual void drawFillRect( Int startX, Int startY, Int width, Int height,
-		UnsignedInt color ) = 0;
+														 UnsignedInt color ) = 0;
 
 	/// Draw a percentage of a rectangle, much like a clock
 	virtual void drawRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) = 0;