Skip to content

Commit 5ab8410

Browse files
committed
style: Convert leading spaces to tabs in Generals
1 parent 8b97daf commit 5ab8410

425 files changed

Lines changed: 3938 additions & 3938 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: 31 additions & 31 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;
250-
for(const char* const* name = s_bitNameList; *name; ++name, ++i )
251-
{
252-
if( stricmp( *name, token ) == 0 )
253-
{
254-
return i;
255-
}
256-
}
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;
250+
for(const char* const* name = s_bitNameList; *name; ++name, ++i )
251+
{
252+
if( stricmp( *name, token ) == 0 )
253+
{
254+
return i;
255+
}
256+
}
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
{
275-
return false;
275+
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/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/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/Money.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@ class Money : public Snapshot
8686

8787
void setPlayerIndex(Int ndx) { m_playerIndex = ndx; }
8888

89-
static void parseMoneyAmount( INI *ini, void *instance, void *store, const void* userData );
89+
static void parseMoneyAmount( INI *ini, void *instance, void *store, const void* userData );
9090

91-
// Does the amount of this == the amount of that (compare everything except m_playerIndex)
92-
Bool amountEqual( const Money & that ) const
93-
{
94-
return m_money == that.m_money;
95-
}
91+
// Does the amount of this == the amount of that (compare everything except m_playerIndex)
92+
Bool amountEqual( const Money & that ) const
93+
{
94+
return m_money == that.m_money;
95+
}
9696

9797
protected:
9898

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,15 @@ class MultiplayerSettings : public SubsystemInterface
109109
MultiplayerColorDefinition * getColor(Int which);
110110

111111

112-
const Money & getDefaultStartingMoney() const
113-
{
114-
DEBUG_ASSERTCRASH( m_gotDefaultStartingMoney, ("You must specify a default starting money amount in multiplayer.ini") );
115-
return m_defaultStartingMoney;
116-
}
112+
const Money & getDefaultStartingMoney() const
113+
{
114+
DEBUG_ASSERTCRASH( m_gotDefaultStartingMoney, ("You must specify a default starting money amount in multiplayer.ini") );
115+
return m_defaultStartingMoney;
116+
}
117117

118-
const MultiplayerStartingMoneyList & getStartingMoneyList() const { return m_startingMoneyList; }
118+
const MultiplayerStartingMoneyList & getStartingMoneyList() const { return m_startingMoneyList; }
119119

120-
void addStartingMoneyChoice( const Money & money, Bool isDefault );
120+
void addStartingMoneyChoice( const Money & money, Bool isDefault );
121121

122122
private:
123123
Int m_initialCreditsMin;
@@ -133,9 +133,9 @@ class MultiplayerSettings : public SubsystemInterface
133133
Int m_numColors;
134134
MultiplayerColorDefinition m_observerColor;
135135
MultiplayerColorDefinition m_randomColor;
136-
MultiplayerStartingMoneyList m_startingMoneyList;
137-
Money m_defaultStartingMoney;
138-
Bool m_gotDefaultStartingMoney;
136+
MultiplayerStartingMoneyList m_startingMoneyList;
137+
Money m_defaultStartingMoney;
138+
Bool m_gotDefaultStartingMoney;
139139
};
140140

141141
// singleton

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class PlayerTemplate
125125

126126
AsciiString getLoadScreenMusic() const {return m_loadScreenMusic; }
127127

128-
Bool isOldFaction() const { return m_oldFaction; }
128+
Bool isOldFaction() const { return m_oldFaction; }
129129

130130
static const FieldParse* getFieldParse();
131131

@@ -163,7 +163,7 @@ class PlayerTemplate
163163
AsciiString m_tooltip; ///< The tooltip describing this player template
164164
Bool m_observer;
165165
Bool m_playableSide;
166-
Bool m_oldFaction; ///< Faction existed in the original Generals
166+
Bool m_oldFaction; ///< Faction existed in the original Generals
167167

168168
Int m_intrinsicSPP;
169169

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ class SkirmishPreferences : public UserPreferences
5555
AsciiString getPreferredMap(); // convenience function
5656
Bool usesSystemMapDir(); // convenience function
5757

58-
Bool getSuperweaponRestricted() const;
59-
void setSuperweaponRestricted( Bool superweaponRestricted);
58+
Bool getSuperweaponRestricted() const;
59+
void setSuperweaponRestricted( Bool superweaponRestricted);
6060

61-
Money getStartingCash() const;
62-
void setStartingCash( const Money &startingCash );
61+
Money getStartingCash() const;
62+
void setStartingCash( const Money &startingCash );
6363
};

0 commit comments

Comments
 (0)