Skip to content

Commit 1477558

Browse files
committed
style: Convert leading spaces and continuation lines to tabs in Generals
1 parent 2cacb85 commit 1477558

531 files changed

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ class ActionManager : public SubsystemInterface
9090
Bool canDisableBuildingViaHacking( const Object *obj, const Object *objectToHack, CommandSourceType commandSource );
9191
Bool canDoSpecialPowerAtLocation( const Object *obj, const Coord3D *loc, CommandSourceType commandSource, const SpecialPowerTemplate *spTemplate, const Object *objectInWay, UnsignedInt commandOptions, Bool checkSourceRequirements = true );
9292
Bool canDoSpecialPowerAtObject( const Object *obj, const Object *target, CommandSourceType commandSource, const SpecialPowerTemplate *spTemplate, UnsignedInt commandOptions, Bool checkSourceRequirements = true);
93-
Bool canDoSpecialPower( const Object *obj, const SpecialPowerTemplate *spTemplate, CommandSourceType commandSource, UnsignedInt commandOptions, Bool checkSourceRequirements = true );
93+
Bool canDoSpecialPower( const Object *obj, const SpecialPowerTemplate *spTemplate, CommandSourceType commandSource, UnsignedInt commandOptions, Bool checkSourceRequirements = true );
9494
Bool canMakeObjectDefector( const Object *obj, const Object *objectToMakeDefector, CommandSourceType commandSource );
9595
Bool canFireWeaponAtLocation( const Object *obj, const Coord3D *loc, CommandSourceType commandSource, const WeaponSlotType slot, const Object *objectInWay );
9696
Bool canFireWeaponAtObject( const Object *obj, const Object *target, CommandSourceType commandSource, const WeaponSlotType slot );
97-
Bool canFireWeapon( const Object *obj, const WeaponSlotType slot, CommandSourceType commandSource );
97+
Bool canFireWeapon( const Object *obj, const WeaponSlotType slot, CommandSourceType commandSource );
9898
Bool canGarrison( const Object *obj, const Object *target, CommandSourceType commandSource );
9999
Bool canOverrideSpecialPowerDestination( const Object *obj, const Coord3D *loc, SpecialPowerType spType, CommandSourceType commandSource );
100100

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -234,47 +234,47 @@ class BitFlags
234234
return val;
235235
}
236236

237-
static const char* const* getBitNames()
238-
{
239-
return s_bitNameList;
240-
}
241-
242-
static const char* getNameFromSingleBit(Int i)
243-
{
244-
return (i >= 0 && i < NUMBITS) ? s_bitNameList[i] : nullptr;
245-
}
246-
247-
static Int getSingleBitFromName(const char* token)
248-
{
249-
Int i = 0;
237+
static const char* const* getBitNames()
238+
{
239+
return s_bitNameList;
240+
}
241+
242+
static const char* getNameFromSingleBit(Int i)
243+
{
244+
return (i >= 0 && i < NUMBITS) ? s_bitNameList[i] : nullptr;
245+
}
246+
247+
static Int getSingleBitFromName(const char* token)
248+
{
249+
Int i = 0;
250250
for(const char* const* name = s_bitNameList; *name; ++name, ++i )
251251
{
252252
if( stricmp( *name, token ) == 0 )
253253
{
254-
return i;
254+
return i;
255255
}
256256
}
257257
return -1;
258-
}
258+
}
259259

260-
const char* getBitNameIfSet(Int i) const
261-
{
262-
return test(i) ? s_bitNameList[i] : nullptr;
263-
}
260+
const char* getBitNameIfSet(Int i) const
261+
{
262+
return test(i) ? s_bitNameList[i] : nullptr;
263+
}
264264

265-
Bool setBitByName(const char* token)
266-
{
267-
Int i = getSingleBitFromName(token);
265+
Bool setBitByName(const char* token)
266+
{
267+
Int i = getSingleBitFromName(token);
268268
if (i >= 0)
269269
{
270-
set(i);
270+
set(i);
271271
return true;
272272
}
273273
else
274274
{
275275
return false;
276276
}
277-
}
277+
}
278278

279279
void parse(INI* ini, AsciiString* str);
280280
void parseSingleBit(INI* ini, AsciiString* str);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ void BitFlags<NUMBITS>::xfer(Xfer* xfer)
184184
}
185185
else if( xfer->getXferMode() == XFER_LOAD )
186186
{
187-
// clear the kind of mask data
187+
// clear the kind of mask data
188188
clear();
189189

190190
// read how many entries follow

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

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

129129
/// iterate the "footprint" area of a structure at the given "sample resolution"
130130
void iterateFootprint( const ThingTemplate *build,
131-
Real buildOrientation,
132-
const Coord3D *worldPos,
133-
Real sampleResolution,
134-
IterateFootprintFunc func,
135-
void *funcUserData );
131+
Real buildOrientation,
132+
const Coord3D *worldPos,
133+
Real sampleResolution,
134+
IterateFootprintFunc func,
135+
void *funcUserData );
136136

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

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

146146
/// query if we can build at this location
147147
virtual LegalBuildCode isLocationLegalToBuild( const Coord3D *worldPos,
148-
const ThingTemplate *build,
149-
Real angle, // angle to construct 'build' at
150-
UnsignedInt options, // use LocationLegalToBuildOptions
151-
const Object *builderObject,
152-
Player *player);
148+
const ThingTemplate *build,
149+
Real angle, // angle to construct 'build' at
150+
UnsignedInt options, // use LocationLegalToBuildOptions
151+
const Object *builderObject,
152+
Player *player);
153153

154154
/// query if we can build at this location
155155
virtual Bool isLocationClearOfObjects( const Coord3D *worldPos,
156-
const ThingTemplate *build,
157-
Real angle, // angle to construct 'build' a
158-
const Object *builderObject,
159-
UnsignedInt options,
160-
Player *thePlayer);
156+
const ThingTemplate *build,
157+
Real angle, // angle to construct 'build' a
158+
const Object *builderObject,
159+
UnsignedInt options,
160+
Player *thePlayer);
161161

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

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

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@ class CustomMatchPreferences : public UserPreferences
7575
Bool getDisallowNonAsianText();
7676
void setDisallowNonAsianText( Bool val );
7777

78-
Bool getSuperweaponRestricted() const;
79-
void setSuperweaponRestricted( Bool superweaponRestricted);
78+
Bool getSuperweaponRestricted() const;
79+
void setSuperweaponRestricted( Bool superweaponRestricted);
8080

81-
Money getStartingCash() const;
82-
void setStartingCash( const Money &startingCash );
81+
Money getStartingCash() const;
82+
void setStartingCash( const Money &startingCash );
8383

84-
Bool getFactionsLimited() const; // Prefers to only use the original 3 sides, not USA Air Force General, GLA Toxin General, et al
85-
void setFactionsLimited( Bool factionsLimited );
84+
Bool getFactionsLimited() const; // Prefers to only use the original 3 sides, not USA Air Force General, GLA Toxin General, et al
85+
void setFactionsLimited( Bool factionsLimited );
8686

87-
Bool getUseStats() const;
88-
void setUseStats( Bool useStats );
87+
Bool getUseStats() const;
88+
void setUseStats( Bool useStats );
8989
};

Generals/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.

Generals/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; }

Generals/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:

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,8 @@ class GlobalData : public SubsystemInterface
285285

286286
#ifdef DUMP_PERF_STATS
287287
Bool m_dumpPerformanceStatistics;
288-
Bool m_dumpStatsAtInterval;///< should I automatically dump stats every N frames
289-
Int m_statsInterval; ///< if so, how many is N?
288+
Bool m_dumpStatsAtInterval;///< should I automatically dump stats every N frames
289+
Int m_statsInterval; ///< if so, how many is N?
290290
#endif
291291

292292
Bool m_forceBenchmark; ///<forces running of CPU detection benchmark, even on known cpu's.
@@ -392,10 +392,10 @@ class GlobalData : public SubsystemInterface
392392

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

400400
Int m_antiAliasBoxValue; ///< value of selected antialias from combo box in options menu
401401
Bool m_languageFilterPref; ///< Bool if user wants to filter language
@@ -487,9 +487,9 @@ class GlobalData : public SubsystemInterface
487487
UnsignedInt m_networkDisconnectScreenNotifyTime; ///< The number of milliseconds between when the disconnect screen comes up and when the other players are notified that we are on the disconnect screen.
488488

489489
Real m_keyboardCameraRotateSpeed; ///< How fast the camera rotates when rotated via keyboard controls.
490-
Int m_playStats; ///< Int whether we want to log play stats or not, if <= 0 then we don't log
490+
Int m_playStats; ///< Int whether we want to log play stats or not, if <= 0 then we don't log
491491

492-
Bool m_TiVOFastMode; ///< When true, the client speeds up the framerate... set by HOTKEY!
492+
Bool m_TiVOFastMode; ///< When true, the client speeds up the framerate... set by HOTKEY!
493493

494494
#if defined(RTS_DEBUG) || ENABLE_CONFIGURABLE_SHROUD
495495
Bool m_shroudOn;
@@ -529,7 +529,7 @@ class GlobalData : public SubsystemInterface
529529
Int m_debugProjectileTileDuration; ///< How long should these tiles stay around, in frames?
530530
RGBColor m_debugProjectileTileColor; ///< What color should these tiles be?
531531
Bool m_showCollisionExtents; ///< Used to display collision extents
532-
Bool m_showAudioLocations; ///< Used to display audio markers and ambient sound radii
532+
Bool m_showAudioLocations; ///< Used to display audio markers and ambient sound radii
533533
Bool m_saveStats;
534534
Bool m_saveAllStats;
535535
Bool m_useLocalMOTD;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -521,9 +521,9 @@ class GameMessage : public MemoryPoolObject
521521
MSG_QUEUE_UNIT_CREATE, ///< clicked on a button to queue the production of a unit
522522
MSG_CANCEL_UNIT_CREATE, ///< clicked on UI button to cancel production of a unit
523523
MSG_DOZER_CONSTRUCT, /**< building things requires clicking on a dozer
524-
selecting what to build, selecting where to
525-
build it ... this construct message will
526-
start the actual build process */
524+
selecting what to build, selecting where to
525+
build it ... this construct message will
526+
start the actual build process */
527527
MSG_DOZER_CONSTRUCT_LINE, ///< Like MSG_CONSTRUCT, but for build processes that occur in a line (like walls)
528528
MSG_DOZER_CANCEL_CONSTRUCT, ///< cancel construction of a building
529529
MSG_SELL, ///< sell a structure

0 commit comments

Comments
 (0)