Skip to content

Commit f148578

Browse files
committed
style: Tighten tabs-then-spaces heuristic to require 2+ spaces
1 parent 3a7b14c commit f148578

226 files changed

Lines changed: 1211 additions & 1207 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.

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -131,36 +131,36 @@ class BuildAssistant : public SubsystemInterface
131131

132132
/// iterate the "footprint" area of a structure at the given "sample resolution"
133133
void iterateFootprint( const ThingTemplate *build,
134-
Real buildOrientation,
135-
const Coord3D *worldPos,
136-
Real sampleResolution,
137-
IterateFootprintFunc func,
138-
void *funcUserData );
134+
Real buildOrientation,
135+
const Coord3D *worldPos,
136+
Real sampleResolution,
137+
IterateFootprintFunc func,
138+
void *funcUserData );
139139

140140
/// create object from a build and put it in the world now
141141
virtual Object *buildObjectNow( Object *constructorObject, const ThingTemplate *what,
142142
const Coord3D *pos, Real angle, Player *owningPlayer );
143143

144144
/// using the "line placement" for objects (like walls etc) create that line of objects line
145145
virtual void buildObjectLineNow( Object *constructorObject, const ThingTemplate *what,
146-
const Coord3D *start, const Coord3D *end, Real angle,
147-
Player *owningPlayer );
146+
const Coord3D *start, const Coord3D *end, Real angle,
147+
Player *owningPlayer );
148148

149149
/// query if we can build at this location
150150
virtual LegalBuildCode isLocationLegalToBuild( const Coord3D *worldPos,
151-
const ThingTemplate *build,
152-
Real angle, // angle to construct 'build' at
153-
UnsignedInt options, // use LocationLegalToBuildOptions
154-
const Object *builderObject,
155-
Player *player);
151+
const ThingTemplate *build,
152+
Real angle, // angle to construct 'build' at
153+
UnsignedInt options, // use LocationLegalToBuildOptions
154+
const Object *builderObject,
155+
Player *player);
156156

157157
/// query if we can build at this location
158158
virtual LegalBuildCode isLocationClearOfObjects( const Coord3D *worldPos,
159-
const ThingTemplate *build,
160-
Real angle, // angle to construct 'build' a
161-
const Object *builderObject,
162-
UnsignedInt options,
163-
Player *thePlayer);
159+
const ThingTemplate *build,
160+
Real angle, // angle to construct 'build' a
161+
const Object *builderObject,
162+
UnsignedInt options,
163+
Player *thePlayer);
164164

165165
/// Adds bib highlighting for this location.
166166
virtual void addBibs( const Coord3D *worldPos,
@@ -202,7 +202,7 @@ class BuildAssistant : public SubsystemInterface
202202
/// will move objects that can move out of the way.
203203
/// will return false if there are objects that cannot be moved out of the way.
204204
Bool moveObjectsForConstruction( const ThingTemplate *whatToBuild,
205-
const Coord3D *pos, Real angle, Player *playerToBuild );
205+
const Coord3D *pos, Real angle, Player *playerToBuild );
206206

207207
Coord3D *m_buildPositions; ///< array used to create a line of build locations (think walls)
208208
Int m_buildPositionSize; ///< number of elements in the build position array

GeneralsMD/Code/GameEngine/Include/Common/GameEngine.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class GameEngine : public SubsystemInterface
6262
virtual void update() override; ///< per frame update
6363

6464
virtual void execute(); /**< The "main loop" of the game engine.
65-
It will not return until the game exits. */
65+
It will not return until the game exits. */
6666

6767
static Bool isTimeFrozen(); ///< Returns true if a script has frozen time.
6868
static Bool isGameHalted(); ///< Returns true if the game is paused or the network is stalling.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@ class GameState : public SubsystemInterface,
157157

158158
// save game methods
159159
SaveCode saveGame( AsciiString filename,
160-
UnicodeString desc,
161-
SaveFileType saveType,
162-
SnapshotType which = SNAPSHOT_SAVELOAD ); ///< save a game
160+
UnicodeString desc,
161+
SaveFileType saveType,
162+
SnapshotType which = SNAPSHOT_SAVELOAD ); ///< save a game
163163
SaveCode missionSave(); ///< do a in between mission save
164164
SaveCode loadGame( AvailableGameInfo gameInfo ); ///< load a save file
165165
SaveGameInfo *getSaveGameInfo() { return &m_gameInfo; }

GeneralsMD/Code/GameEngine/Include/Common/GameStateMap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class Xfer;
3939
// ------------------------------------------------------------------------------------------------
4040
// ------------------------------------------------------------------------------------------------
4141
class GameStateMap : public SubsystemInterface,
42-
public Snapshot
42+
public Snapshot
4343
{
4444

4545
public:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -393,10 +393,10 @@ class GlobalData : public SubsystemInterface
393393

394394
Real m_cameraAudibleRadius; ///< If the camera is being used as the position of audio, then how far can we hear?
395395
Real m_groupMoveClickToGatherFactor; /** if you take all the selected units and calculate the smallest possible rectangle
396-
that contains them all, and click within that, all the selected units will break
397-
formation and gather at the point the user clicked (if the value is 1.0). If it's 0.0,
398-
units will always keep their formation. If it's <1.0, then the user must click a
399-
smaller area within the rectangle to order the gather. */
396+
that contains them all, and click within that, all the selected units will break
397+
formation and gather at the point the user clicked (if the value is 1.0). If it's 0.0,
398+
units will always keep their formation. If it's <1.0, then the user must click a
399+
smaller area within the rectangle to order the gather. */
400400

401401
Int m_antiAliasBoxValue; ///< value of selected antialias from combo box in options menu
402402
Bool m_languageFilterPref; ///< Bool if user wants to filter language

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -550,9 +550,9 @@ class GameMessage : public MemoryPoolObject
550550
MSG_QUEUE_UNIT_CREATE, ///< clicked on a button to queue the production of a unit
551551
MSG_CANCEL_UNIT_CREATE, ///< clicked on UI button to cancel production of a unit
552552
MSG_DOZER_CONSTRUCT, /**< building things requires clicking on a dozer
553-
selecting what to build, selecting where to
554-
build it ... this construct message will
555-
start the actual build process */
553+
selecting what to build, selecting where to
554+
build it ... this construct message will
555+
start the actual build process */
556556
MSG_DOZER_CONSTRUCT_LINE, ///< Like MSG_CONSTRUCT, but for build processes that occur in a line (like walls)
557557
MSG_DOZER_CANCEL_CONSTRUCT, ///< cancel construction of a building
558558
MSG_SELL, ///< sell a structure

GeneralsMD/Code/GameEngine/Include/Common/Module.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public: \
176176
* convenient this way */
177177
//-------------------------------------------------------------------------------------------------
178178
class Module : public MemoryPoolObject,
179-
public Snapshot
179+
public Snapshot
180180
{
181181

182182
MEMORY_POOL_GLUE_ABC( Module ) ///< this abstract class needs memory pool hooks

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ class Player : public Snapshot
315315
const UpgradeMaskType& getCompletedUpgradeMask() const { return m_upgradesCompleted; } ///< get list of upgrades that are completed
316316
Bool hasUpgradeInProduction( const UpgradeTemplate *upgradeTemplate ); ///< does player have this upgrade in progress right now
317317
Upgrade *addUpgrade( const UpgradeTemplate *upgradeTemplate,
318-
UpgradeStatusType status ); ///< add upgrade, or update existing upgrade status
318+
UpgradeStatusType status ); ///< add upgrade, or update existing upgrade status
319319
void removeUpgrade( const UpgradeTemplate *upgradeTemplate ); ///< remove this upgrade from us
320320

321321
/** find upgrade, NOTE, the upgrade may *NOT* be "complete" and therefore "active", it could be in production

GeneralsMD/Code/GameEngine/Include/Common/PlayerList.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ enum AllowPlayerRelationship CPP_11(: Int)
7171
This is a singleton class that maintains the list of Players.
7272
*/
7373
class PlayerList : public SubsystemInterface,
74-
public Snapshot
74+
public Snapshot
7575
{
7676

7777
public:

GeneralsMD/Code/GameEngine/Include/Common/ResourceGatheringManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class Object;
3737

3838
// ------------------------------------------------------------------------------------------------
3939
class ResourceGatheringManager : public MemoryPoolObject,
40-
public Snapshot
40+
public Snapshot
4141
{
4242
MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( ResourceGatheringManager, "ResourceGatheringManager" );
4343

0 commit comments

Comments
 (0)