Skip to content

Commit 2718314

Browse files
committed
style: Convert leading spaces to tabs in Core and Dependencies
1 parent 8f17eb8 commit 2718314

537 files changed

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

Core/GameEngine/Include/Common/AudioEventInfo.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,14 @@ struct AudioEventInfo : public MemoryPoolObject
121121
AudioType m_soundType; // This should be either Music, Streaming or SoundEffect
122122

123123

124-
// DynamicAudioEventInfo interfacing functions
125-
virtual Bool isLevelSpecific() const { return false; } ///< If true, this sound is only defined on the current level and can be deleted when that level ends
126-
virtual DynamicAudioEventInfo * getDynamicAudioEventInfo() { return nullptr; } ///< If this object is REALLY a DynamicAudioEventInfo, return a pointer to the derived class
127-
virtual const DynamicAudioEventInfo * getDynamicAudioEventInfo() const { return nullptr; } ///< If this object is REALLY a DynamicAudioEventInfo, return a pointer to the derived class
128-
129-
/// Is this a permanent sound? That is, if I start this sound up, will it ever end
130-
/// "on its own" or only if I explicitly kill it?
131-
Bool isPermanentSound() const { return BitIsSet( m_control, AC_LOOP ) && (m_loopCount == 0 ); }
124+
// DynamicAudioEventInfo interfacing functions
125+
virtual Bool isLevelSpecific() const { return false; } ///< If true, this sound is only defined on the current level and can be deleted when that level ends
126+
virtual DynamicAudioEventInfo * getDynamicAudioEventInfo() { return nullptr; } ///< If this object is REALLY a DynamicAudioEventInfo, return a pointer to the derived class
127+
virtual const DynamicAudioEventInfo * getDynamicAudioEventInfo() const { return nullptr; } ///< If this object is REALLY a DynamicAudioEventInfo, return a pointer to the derived class
128+
129+
/// Is this a permanent sound? That is, if I start this sound up, will it ever end
130+
/// "on its own" or only if I explicitly kill it?
131+
Bool isPermanentSound() const { return BitIsSet( m_control, AC_LOOP ) && (m_loopCount == 0 ); }
132132

133133
static const FieldParse m_audioEventInfo[]; ///< the parse table for INI definition
134134
const FieldParse *getFieldParse() const { return m_audioEventInfo; }

Core/GameEngine/Include/Common/AudioSettings.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ struct AudioSettings
9696
Real m_microphoneMaxPercentageBetweenGroundAndCamera;
9797

9898
//Handles changing sound volume whenever the camera is close to the microphone.
99-
Real m_zoomMinDistance; //If we're closer than the minimum distance, then apply the full bonus no matter how close.
100-
Real m_zoomMaxDistance; //The maximum distance from microphone we need to be before benefiting from any bonus.
99+
Real m_zoomMinDistance; //If we're closer than the minimum distance, then apply the full bonus no matter how close.
100+
Real m_zoomMaxDistance; //The maximum distance from microphone we need to be before benefiting from any bonus.
101101

102-
//NOTE: The higher this value is, the lower normal sounds will be! If you specify a sound volume value of 25%, then sounds will play
102+
//NOTE: The higher this value is, the lower normal sounds will be! If you specify a sound volume value of 25%, then sounds will play
103103
//between 75% and 100%, not 100% to 125%!
104-
Real m_zoomSoundVolumePercentageAmount; //The amount of sound volume dedicated to zooming.
104+
Real m_zoomSoundVolumePercentageAmount; //The amount of sound volume dedicated to zooming.
105105
};

Core/GameEngine/Include/Common/DynamicAudioEventInfo.h

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -39,51 +39,51 @@ class Xfer;
3939
*****************************************************************************/
4040
class DynamicAudioEventInfo : public AudioEventInfo
4141
{
42-
// NOTE: This implementation would be a lot cleaner & safer if AudioEventInfo was better
43-
// written. Ideally, AudioEventInfo would be a class, not a struct, and provide only
44-
// "get" functions, not "set" functions except for the INI parsing. Then we could
45-
// force people to go through our override...() functions.
46-
47-
MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( DynamicAudioEventInfo, "DynamicAudioEventInfo" )
48-
49-
public:
50-
DynamicAudioEventInfo();
51-
explicit DynamicAudioEventInfo( const AudioEventInfo & baseInfo );
52-
53-
// DynamicAudioEventInfo interfacing function overrides
54-
virtual Bool isLevelSpecific() const override;
55-
virtual DynamicAudioEventInfo * getDynamicAudioEventInfo() override;
56-
virtual const DynamicAudioEventInfo * getDynamicAudioEventInfo() const override;
57-
58-
// Change various fields from their default (INI) values
59-
void overrideAudioName( const AsciiString & newName );
60-
void overrideLoopFlag( Bool newLoopFlag );
61-
void overrideLoopCount( Int newLoopCount );
62-
void overrideVolume( Real newVolume );
63-
void overrideMinVolume( Real newMinVolume );
64-
void overrideMinRange( Real newMinRange );
65-
void overrideMaxRange( Real newMaxRange );
66-
void overridePriority( AudioPriority newPriority );
67-
68-
// Query fields to see if they have been changed from their INI values
69-
Bool wasAudioNameOverriden() const;
70-
Bool wasLoopFlagOverriden() const;
71-
Bool wasLoopCountOverriden() const;
72-
Bool wasVolumeOverriden() const;
73-
Bool wasMinVolumeOverriden() const;
74-
Bool wasMinRangeOverriden() const;
75-
Bool wasMaxRangeOverriden() const;
76-
Bool wasPriorityOverriden() const;
77-
78-
// Get the name of the audio event which this was based off of
79-
const AsciiString & getOriginalName() const;
80-
81-
// Transfer all overridden fields except the customized name
82-
void xferNoName( Xfer * xfer );
83-
84-
private:
85-
// List of fields we can override
86-
enum OverriddenFields CPP_11(: Int)
42+
// NOTE: This implementation would be a lot cleaner & safer if AudioEventInfo was better
43+
// written. Ideally, AudioEventInfo would be a class, not a struct, and provide only
44+
// "get" functions, not "set" functions except for the INI parsing. Then we could
45+
// force people to go through our override...() functions.
46+
47+
MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( DynamicAudioEventInfo, "DynamicAudioEventInfo" )
48+
49+
public:
50+
DynamicAudioEventInfo();
51+
explicit DynamicAudioEventInfo( const AudioEventInfo & baseInfo );
52+
53+
// DynamicAudioEventInfo interfacing function overrides
54+
virtual Bool isLevelSpecific() const override;
55+
virtual DynamicAudioEventInfo * getDynamicAudioEventInfo() override;
56+
virtual const DynamicAudioEventInfo * getDynamicAudioEventInfo() const override;
57+
58+
// Change various fields from their default (INI) values
59+
void overrideAudioName( const AsciiString & newName );
60+
void overrideLoopFlag( Bool newLoopFlag );
61+
void overrideLoopCount( Int newLoopCount );
62+
void overrideVolume( Real newVolume );
63+
void overrideMinVolume( Real newMinVolume );
64+
void overrideMinRange( Real newMinRange );
65+
void overrideMaxRange( Real newMaxRange );
66+
void overridePriority( AudioPriority newPriority );
67+
68+
// Query fields to see if they have been changed from their INI values
69+
Bool wasAudioNameOverriden() const;
70+
Bool wasLoopFlagOverriden() const;
71+
Bool wasLoopCountOverriden() const;
72+
Bool wasVolumeOverriden() const;
73+
Bool wasMinVolumeOverriden() const;
74+
Bool wasMinRangeOverriden() const;
75+
Bool wasMaxRangeOverriden() const;
76+
Bool wasPriorityOverriden() const;
77+
78+
// Get the name of the audio event which this was based off of
79+
const AsciiString & getOriginalName() const;
80+
81+
// Transfer all overridden fields except the customized name
82+
void xferNoName( Xfer * xfer );
83+
84+
private:
85+
// List of fields we can override
86+
enum OverriddenFields CPP_11(: Int)
8787
{
8888
OVERRIDE_NAME = 0,
8989
OVERRIDE_LOOP_FLAG,
@@ -96,58 +96,58 @@ class DynamicAudioEventInfo : public AudioEventInfo
9696

9797
OVERRIDE_COUNT // Keep list
9898
};
99-
// Warning: update xferNoName if you modify the enum list!
99+
// Warning: update xferNoName if you modify the enum list!
100100

101-
BitFlags< OVERRIDE_COUNT > m_overriddenFields;
101+
BitFlags< OVERRIDE_COUNT > m_overriddenFields;
102102

103-
// Retain the original name so we can look it up later
104-
AsciiString m_originalName;
103+
// Retain the original name so we can look it up later
104+
AsciiString m_originalName;
105105
};
106106

107107
/** Query: was overrideAudioName called? */
108108
inline Bool DynamicAudioEventInfo::wasAudioNameOverriden() const
109109
{
110-
return m_overriddenFields.test( OVERRIDE_NAME );
110+
return m_overriddenFields.test( OVERRIDE_NAME );
111111
}
112112

113113
/** Query: was overrideLoopFlag called? */
114114
inline Bool DynamicAudioEventInfo::wasLoopFlagOverriden() const
115115
{
116-
return m_overriddenFields.test( OVERRIDE_LOOP_FLAG );
116+
return m_overriddenFields.test( OVERRIDE_LOOP_FLAG );
117117
}
118118

119119
/** Query: was overrideLoopCount called? */
120120
inline Bool DynamicAudioEventInfo::wasLoopCountOverriden() const
121121
{
122-
return m_overriddenFields.test( OVERRIDE_LOOP_COUNT );
122+
return m_overriddenFields.test( OVERRIDE_LOOP_COUNT );
123123
}
124124

125125
/** Query: was overrideVolume called? */
126126
inline Bool DynamicAudioEventInfo::wasVolumeOverriden() const
127127
{
128-
return m_overriddenFields.test( OVERRIDE_VOLUME );
128+
return m_overriddenFields.test( OVERRIDE_VOLUME );
129129
}
130130

131131
/** Query: was overrideMinVolume called? */
132132
inline Bool DynamicAudioEventInfo::wasMinVolumeOverriden() const
133133
{
134-
return m_overriddenFields.test( OVERRIDE_MIN_VOLUME );
134+
return m_overriddenFields.test( OVERRIDE_MIN_VOLUME );
135135
}
136136

137137
/** Query: was overrideMinRange called? */
138138
inline Bool DynamicAudioEventInfo::wasMinRangeOverriden() const
139139
{
140-
return m_overriddenFields.test( OVERRIDE_MIN_RANGE );
140+
return m_overriddenFields.test( OVERRIDE_MIN_RANGE );
141141
}
142142

143143
/** Query: was overrideMaxRange called? */
144144
inline Bool DynamicAudioEventInfo::wasMaxRangeOverriden() const
145145
{
146-
return m_overriddenFields.test( OVERRIDE_MAX_RANGE );
146+
return m_overriddenFields.test( OVERRIDE_MAX_RANGE );
147147
}
148148

149149
/** Query: was overridePriority called? */
150150
inline Bool DynamicAudioEventInfo::wasPriorityOverriden() const
151151
{
152-
return m_overriddenFields.test( OVERRIDE_PRIORITY );
152+
return m_overriddenFields.test( OVERRIDE_PRIORITY );
153153
}

Core/GameEngine/Include/Common/FileSystem.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ struct FileInfo {
137137
//===============================
138138
class FileSystem : public SubsystemInterface
139139
{
140-
FileSystem(const FileSystem&);
141-
FileSystem& operator=(const FileSystem&);
140+
FileSystem(const FileSystem&);
141+
FileSystem& operator=(const FileSystem&);
142142

143143
public:
144144
FileSystem();

Core/GameEngine/Include/Common/GameAudio.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -243,10 +243,10 @@ class AudioManager : public SubsystemInterface
243243
// on zoom.
244244
virtual void set3DVolumeAdjustment( Real volumeAdjustment );
245245

246-
virtual Bool has3DSensitiveStreamsPlaying() const = 0;
246+
virtual Bool has3DSensitiveStreamsPlaying() const = 0;
247247

248-
virtual void *getHandleForBink() = 0;
249-
virtual void releaseHandleForBink() = 0;
248+
virtual void *getHandleForBink() = 0;
249+
virtual void releaseHandleForBink() = 0;
250250

251251
// this function will play an audio event rts by loading it into memory. It should not be used
252252
// by anything except for the load screens.
@@ -262,7 +262,7 @@ class AudioManager : public SubsystemInterface
262262
virtual void processRequestList();
263263

264264
virtual AudioEventInfo *newAudioEventInfo( AsciiString newEventName );
265-
virtual void addAudioEventInfo( AudioEventInfo * newEventInfo );
265+
virtual void addAudioEventInfo( AudioEventInfo * newEventInfo );
266266
virtual AudioEventInfo *findAudioEventInfo( AsciiString eventName ) const;
267267

268268
const AudioSettings *getAudioSettings() const;
@@ -303,7 +303,7 @@ class AudioManager : public SubsystemInterface
303303

304304
// For Worldbuilder, to build lists from which to select
305305
virtual void findAllAudioEventsOfType( AudioType audioType, std::vector<AudioEventInfo*>& allEvents );
306-
virtual const AudioEventInfoHash & getAllAudioEvents() const { return m_allAudioEventInfo; }
306+
virtual const AudioEventInfoHash & getAllAudioEvents() const { return m_allAudioEventInfo; }
307307

308308
Real getZoomVolume() const { return m_zoomVolume; }
309309
protected:
@@ -323,10 +323,10 @@ class AudioManager : public SubsystemInterface
323323
// For tracking purposes
324324
virtual AudioHandle allocateNewHandle();
325325

326-
// Remove all AudioEventInfo's with the m_isLevelSpecific flag
327-
virtual void removeLevelSpecificAudioEventInfos();
326+
// Remove all AudioEventInfo's with the m_isLevelSpecific flag
327+
virtual void removeLevelSpecificAudioEventInfos();
328328

329-
void removeAllAudioRequests();
329+
void removeAllAudioRequests();
330330

331331
protected:
332332
AudioSettings *m_audioSettings;

Core/GameEngine/Include/Common/INI.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ typedef void (*BuildMultiIniFieldProc)(MultiIniFieldParse& p);
160160
//-------------------------------------------------------------------------------------------------
161161
class INI
162162
{
163-
INI(const INI&);
164-
INI& operator=(const INI&);
163+
INI(const INI&);
164+
INI& operator=(const INI&);
165165

166166
public:
167167

@@ -219,7 +219,7 @@ class INI
219219
static void parseObjectCreationListDefinition( INI* ini );
220220
static void parseMultiplayerSettingsDefinition( INI* ini );
221221
static void parseMultiplayerColorDefinition( INI* ini );
222-
static void parseMultiplayerStartingMoneyChoiceDefinition( INI* ini );
222+
static void parseMultiplayerStartingMoneyChoiceDefinition( INI* ini );
223223
static void parseOnlineChatColorDefinition( INI* ini );
224224
static void parseMapCacheDefinition( INI* ini );
225225
static void parseVideoDefinition( INI* ini );

Core/GameEngine/Include/Common/MapObject.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ class WorldHeightMapInterfaceClass
3939
{
4040
public:
4141

42-
virtual Int getBorderSize() = 0;
43-
virtual Real getSeismicZVelocity(Int xIndex, Int yIndex) const = 0;
44-
virtual void setSeismicZVelocity(Int xIndex, Int yIndex, Real value) = 0;
45-
virtual Real getBilinearSampleSeismicZVelocity( Int x, Int y) = 0;
42+
virtual Int getBorderSize() = 0;
43+
virtual Real getSeismicZVelocity(Int xIndex, Int yIndex) const = 0;
44+
virtual void setSeismicZVelocity(Int xIndex, Int yIndex, Real value) = 0;
45+
virtual Real getBilinearSampleSeismicZVelocity( Int x, Int y) = 0;
4646

4747
};
4848

Core/GameEngine/Include/Common/Radar.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ class Radar : public Snapshot,
185185
Bool getLastEventLoc( Coord3D *eventPos ); ///< get last event loc (if any)
186186
void tryUnderAttackEvent( const Object *obj ); ///< try to make an "under attack" event if it's the proper time
187187
void tryInfiltrationEvent( const Object *obj ); ///< try to make an "infiltration" event if it's the proper time
188-
Bool tryEvent( RadarEventType event, const Coord3D *pos ); ///< try to make a "stealth" event
188+
Bool tryEvent( RadarEventType event, const Coord3D *pos ); ///< try to make a "stealth" event
189189

190190
// adding and removing objects from the radar
191191
virtual Bool addObject( Object *obj ); ///< add object to radar

Core/GameEngine/Include/Common/UserPreferences.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ class LANPreferences : public UserPreferences
8989
Int getNumRemoteIPs(); // convenience function
9090
UnicodeString getRemoteIPEntry(Int i); // convenience function
9191

92-
Bool getSuperweaponRestricted() const;
93-
Money getStartingCash() const;
94-
void setSuperweaponRestricted( Bool superweaponRestricted);
95-
void setStartingCash( const Money & startingCash );
92+
Bool getSuperweaponRestricted() const;
93+
Money getStartingCash() const;
94+
void setSuperweaponRestricted( Bool superweaponRestricted);
95+
void setStartingCash( const Money & startingCash );
9696
};

0 commit comments

Comments
 (0)