Skip to content

Commit 5e923ff

Browse files
committed
style: Tighten tabs-then-spaces heuristic to require 2+ spaces
1 parent a9cbcc2 commit 5e923ff

156 files changed

Lines changed: 1088 additions & 1084 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/GameClient/GameWindow.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ enum WindowMsgHandledType CPP_11(: Int) { MSG_IGNORED, MSG_HANDLED };
8181
// callback types -------------------------------------------------------------
8282
typedef void (*GameWinMsgBoxFunc)(); //used for the Message box callbacks.
8383
typedef void (*GameWinDrawFunc)( GameWindow *,
84-
WinInstanceData * );
84+
WinInstanceData * );
8585
typedef void (*GameWinTooltipFunc)( GameWindow *,
8686
WinInstanceData *,
8787
UnsignedInt );
@@ -90,9 +90,9 @@ typedef WindowMsgHandledType (*GameWinInputFunc)( GameWindow *,
9090
WindowMsgData,
9191
WindowMsgData );
9292
typedef WindowMsgHandledType (*GameWinSystemFunc)( GameWindow *,
93-
UnsignedInt,
94-
WindowMsgData,
95-
WindowMsgData );
93+
UnsignedInt,
94+
WindowMsgData,
95+
WindowMsgData );
9696

9797
enum
9898
{
@@ -250,7 +250,7 @@ friend class GameWindowManager;
250250
Int winActivate(); ///< pop window to top of list and activate
251251
Int winBringToTop(); ///< bring this window to the top of the win list
252252
Int winEnable( Bool enable ); /**< enable/disable a window, a disbled
253-
window can be seen but accepts no input */
253+
window can be seen but accepts no input */
254254
Bool winGetEnabled(); ///< Is window enabled?
255255
Int winHide( Bool hide ); ///< hide/unhide a window
256256
Bool winIsHidden(); ///< is this window hidden/
@@ -352,8 +352,8 @@ friend class GameWindowManager;
352352
Int winSetDrawFunc( GameWinDrawFunc draw ); ///< set draw
353353
Int winSetTooltipFunc( GameWinTooltipFunc tooltip ); ///< set tooltip
354354
Int winSetCallbacks( GameWinInputFunc input,
355-
GameWinDrawFunc draw,
356-
GameWinTooltipFunc tooltip ); ///< set draw, input, tooltip
355+
GameWinDrawFunc draw,
356+
GameWinTooltipFunc tooltip ); ///< set draw, input, tooltip
357357

358358
// pick correlation ---------------------------------------------------------
359359
Bool winPointInWindow( Int x, Int y ); /**is point inside this window?
@@ -488,16 +488,16 @@ extern WindowMsgHandledType GameWinDefaultSystem( GameWindow *window,
488488
WindowMsgData mData1,
489489
WindowMsgData mData2 );
490490
extern WindowMsgHandledType GameWinDefaultInput( GameWindow *window,
491-
UnsignedInt msg,
492-
WindowMsgData mData1,
493-
WindowMsgData mData2 );
491+
UnsignedInt msg,
492+
WindowMsgData mData1,
493+
WindowMsgData mData2 );
494494
extern WindowMsgHandledType GameWinBlockInput( GameWindow *window,
495-
UnsignedInt msg,
496-
WindowMsgData mData1,
497-
WindowMsgData mData2 );
495+
UnsignedInt msg,
496+
WindowMsgData mData1,
497+
WindowMsgData mData2 );
498498
extern void GameWinDefaultTooltip( GameWindow *window,
499-
WinInstanceData *instData,
500-
UnsignedInt mouse );
499+
WinInstanceData *instData,
500+
UnsignedInt mouse );
501501

502502
extern const char *const WindowStatusNames[];
503503
extern const char *const WindowStyleNames[];

Core/GameEngine/Include/GameClient/Keyboard.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ class Keyboard : public SubsystemInterface
9999

100100
// you may extend the functionality of these for your device
101101
virtual void init() override; /**< initialize the keyboard, only extend this
102-
functionality, do not replace */
102+
functionality, do not replace */
103103
virtual void reset() override; ///< Reset keyboard system
104104
virtual void update() override; /**< gather current state of all keys, extend
105-
this functionality, do not replace */
105+
this functionality, do not replace */
106106
virtual Bool getCapsState() = 0; ///< get state of caps lock key, return TRUE if down
107107

108108
virtual void createStreamMessages(); /**< given state of device, create
@@ -119,7 +119,7 @@ class Keyboard : public SubsystemInterface
119119
KeyboardIO *getFirstKey(); ///< get first key ready for processing
120120
KeyboardIO *findKey( KeyDefType key, KeyboardIO::StatusType status ); ///< get key ready for processing, can return nullptr
121121
void setKeyStatusData( KeyDefType key,
122-
KeyboardIO::StatusType data ); ///< set key status
122+
KeyboardIO::StatusType data ); ///< set key status
123123
WideChar translateKey( WideChar keyCode ); ///< translate key code to printable UNICODE char
124124
WideChar getPrintableKey( KeyDefType key, Int state );
125125
enum { MAX_KEY_STATES = 3};

Core/GameEngine/Include/GameClient/Line2D.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ extern Bool IntersectLine2D( const Coord2D *a, const Coord2D *b,
4747
///< PointInsideRect2D will return true iff inputPoint lies iside of the rectangle specified
4848
///< by bl, tl, br, tr.
4949
extern Bool PointInsideRect2D( const Coord2D *bl, const Coord2D *tl,
50-
const Coord2D *br, const Coord2D *tr,
51-
const Coord2D *inputPoint);
50+
const Coord2D *br, const Coord2D *tr,
51+
const Coord2D *inputPoint);
5252

5353
///< Checks if a point is inside a perfect rectangle (top left and bottom right)
5454
extern Bool Coord3DInsideRect2D( const Coord3D *inputPoint, const Coord2D *tl, const Coord2D *br );
@@ -60,22 +60,22 @@ extern void ScaleRect2D( Coord2D *tl, Coord2D *br, Real scaleFactor );
6060
by bl, tl, br, tr. It does not actually consider the Z value, it is merely a convenience function
6161
for calling PointInsideRect2D */
6262
extern Bool PointInsideRect3D( const Coord3D *bl, const Coord3D *tl,
63-
const Coord3D *br, const Coord3D *tr,
64-
const Coord3D *inputPoint);
63+
const Coord3D *br, const Coord3D *tr,
64+
const Coord3D *inputPoint);
6565

6666

6767
///< This function will take the ptToTest and will perform even-odd checking against the area.
6868
///< If the area is not closed, it will be closed for this check.
6969
extern Bool PointInsideArea2D( const Coord2D *ptToTest,
70-
const Coord2D *area,
71-
Int numPointsInArea);
70+
const Coord2D *area,
71+
Int numPointsInArea);
7272

7373
///< This function will take the ptToTest and will perform even-odd checking against the area.
7474
///< The area and the ptToTest will be flattened first, so a 2-D check will be sufficient.
7575
///< This function is only for convenience so that points do not need to first be flattened.
7676
extern Bool PointInsideArea2D( const Coord3D *ptToTest,
77-
const Coord3D *area,
78-
Int numPointsInArea);
77+
const Coord3D *area,
78+
Int numPointsInArea);
7979

8080
///< This function will find the shortest distance between the given segment (ab) and the pt.
8181
///< It will also give the intersection points on the segment (ab) if desired.

Core/GameEngine/Include/GameClient/MapUtil.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,5 +146,5 @@ AsciiString getDefaultOfficialMap();
146146
Bool isOfficialMap( AsciiString mapName );
147147
Bool parseMapPreviewChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
148148
void findDrawPositions( Int startX, Int startY, Int width, Int height, Region3D extent,
149-
ICoord2D *ul, ICoord2D *lr );
149+
ICoord2D *ul, ICoord2D *lr );
150150
Bool WouldMapTransfer( const AsciiString& mapName );

Core/GameEngine/Include/GameClient/Mouse.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ struct MouseIO
103103
UnsignedInt time; ///< The time that this message was posted.
104104

105105
Int wheelPos; /**< mouse wheel position, 0 is no event, + is up/away from
106-
user while - is down/toward user */
106+
user while - is down/toward user */
107107
ICoord2D deltaPos; ///< overall change in mouse pointer this frame
108108

109109
MouseButtonState leftState; // button state: None (no event), Up, Down, DoubleClick
@@ -278,8 +278,8 @@ class Mouse : public SubsystemInterface
278278
virtual void initCursorResources()=0; ///< needed so Win32 cursors can load resources before D3D device created.
279279

280280
virtual void createStreamMessages(); /**< given state of device, create
281-
messages and put them on the
282-
stream for the raw state. */
281+
messages and put them on the
282+
stream for the raw state. */
283283

284284
virtual void draw() override; ///< draw the mouse
285285
virtual void setPosition( Int x, Int y ); ///< set the mouse position

Core/GameEngine/Include/GameClient/ParticleSys.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ class ParticleInfo : public Snapshot
169169
* NOTE: Particles cannot exist without a parent particle system.
170170
*/
171171
class Particle : public MemoryPoolObject,
172-
public ParticleInfo
172+
public ParticleInfo
173173
{
174174

175175
MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( Particle, "ParticlePool" )
@@ -550,7 +550,7 @@ class ParticleSystemTemplate : public MemoryPoolObject, protected ParticleSystem
550550
* is reset.
551551
*/
552552
class ParticleSystem : public MemoryPoolObject,
553-
public ParticleSystemInfo
553+
public ParticleSystemInfo
554554
{
555555

556556
MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( ParticleSystem, "ParticleSystemPool" )

Core/GameEngine/Include/GameClient/Snow.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ class SnowManager : public SubsystemInterface
8282
{
8383
public :
8484
enum{
85-
SNOW_NOISE_X=64, //dimensions table holding noise function used for initial snow positions.
86-
SNOW_NOISE_Y=64, //dimensions table holding noise function used for initial snow positions.
85+
SNOW_NOISE_X=64, //dimensions table holding noise function used for initial snow positions.
86+
SNOW_NOISE_Y=64, //dimensions table holding noise function used for initial snow positions.
8787
};
8888

89-
SnowManager();
89+
SnowManager();
9090
virtual ~SnowManager() override;
9191

9292
virtual void init() override;

Core/GameEngine/Include/GameClient/TerrainVisual.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,8 @@ class TerrainVisual : public Snapshot,
220220
/** intersect the ray with the terrain, if a hit occurs TRUE is returned
221221
and the result point on the terrain is returned in "result" */
222222
virtual Bool intersectTerrain( Coord3D *rayStart,
223-
Coord3D *rayEnd,
224-
Coord3D *result ) { return FALSE; }
223+
Coord3D *rayEnd,
224+
Coord3D *result ) { return FALSE; }
225225

226226
//
227227
// water methods

Core/GameEngine/Include/GameLogic/AIPathfind.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ class ZoneBlock
526526

527527
zoneStorageType m_firstZone; // First zone in this block.
528528
UnsignedShort m_numZones; // Number of zones in this block. If == 1, there is only one zone, and
529-
// no zone equivalency arrays will be allocated.
529+
// no zone equivalency arrays will be allocated.
530530

531531
UnsignedShort m_zonesAllocated;
532532
zoneStorageType *m_groundCliffZones;
@@ -858,8 +858,8 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
858858

859859
Bool evaluateCell(PathfindCell* newCell, PathfindCell *parentCell,
860860
const LocomotorSet& locomotorSet,
861-
Bool centerInCell, Int radius,
862-
const Object *obj, Int attackDistance);
861+
Bool centerInCell, Int radius,
862+
const Object *obj, Int attackDistance);
863863

864864
Path *buildActualPath( const Object *obj, LocomotorSurfaceTypeMask acceptableSurfaces,
865865
const Coord3D *fromPos, PathfindCell *goalCell, Bool center, Bool blocked ); ///< Work backwards from goal cell to construct final path

Core/GameEngine/Include/GameNetwork/GameInfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class GameSlot
8282
{ m_playerTemplate = playerTemplate;
8383
if (playerTemplate <= PLAYERTEMPLATE_MIN)
8484
m_startPos = -1;
85-
}
85+
}
8686
Int getPlayerTemplate() const { return m_playerTemplate; }
8787

8888
void setTeamNumber( Int teamNumber ) { m_teamNumber = teamNumber; }

0 commit comments

Comments
 (0)