Skip to content

Commit 4c147cf

Browse files
committed
style: Convert continuation lines to tabs in Generals
1 parent 9a9d137 commit 4c147cf

277 files changed

Lines changed: 1984 additions & 1984 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/BuildAssistant.h

Lines changed: 20 additions & 20 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,
@@ -166,8 +166,8 @@ class BuildAssistant : public SubsystemInterface
166166
/// tiling wall object helper function, we can use this to "tile" walls when building
167167
virtual TileBuildInfo *buildTiledLocations( const ThingTemplate *thingBeingTiled,
168168
Real angle, // angle to construct thing being tiled
169-
const Coord3D *start, const Coord3D *end,
170-
Real tilingSize, Int maxTiles,
169+
const Coord3D *start, const Coord3D *end,
170+
Real tilingSize, Int maxTiles,
171171
Object *builderObject );
172172

173173
/// return the "scratch pad" array that can be used to create a line of build locations
@@ -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/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/MessageStream.h

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

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

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

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

Generals/Code/GameEngine/Include/GameClient/Display.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,21 +117,21 @@ class Display : public SubsystemInterface
117117
virtual void draw() override; ///< Redraw the entire display
118118
virtual void setTimeOfDay( TimeOfDay tod ) = 0; ///< Set the time of day for this display
119119
virtual void createLightPulse( const Coord3D *pos, const RGBColor *color, Real innerRadius,Real attenuationWidth,
120-
UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime//, Bool donut = FALSE
121-
) = 0;
120+
UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime//, Bool donut = FALSE
121+
) = 0;
122122

123123
/// draw a line on the display in pixel coordinates with the specified color
124124
virtual void drawLine( Int startX, Int startY, Int endX, Int endY,
125-
Real lineWidth, UnsignedInt lineColor ) = 0;
125+
Real lineWidth, UnsignedInt lineColor ) = 0;
126126
/// draw a line on the display in pixel coordinates with the specified 2 colors
127127
virtual void drawLine( Int startX, Int startY, Int endX, Int endY,
128-
Real lineWidth, UnsignedInt lineColor1, UnsignedInt lineColor2 ) = 0;
128+
Real lineWidth, UnsignedInt lineColor1, UnsignedInt lineColor2 ) = 0;
129129
/// draw a rect border on the display in pixel coordinates with the specified color
130130
virtual void drawOpenRect( Int startX, Int startY, Int width, Int height,
131-
Real lineWidth, UnsignedInt lineColor ) = 0;
131+
Real lineWidth, UnsignedInt lineColor ) = 0;
132132
/// draw a filled rect on the display in pixel coords with the specified color
133133
virtual void drawFillRect( Int startX, Int startY, Int width, Int height,
134-
UnsignedInt color ) = 0;
134+
UnsignedInt color ) = 0;
135135

136136
/// Draw a percentage of a rectangle, much like a clock
137137
virtual void drawRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) = 0;

Generals/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,16 @@ struct WindowExMessageBoxData
5454

5555

5656
GameWindow *ExMessageBoxYesNo (UnicodeString titleString,UnicodeString bodyString, void *userData,
57-
MessageBoxFunc yesCallback, MessageBoxFunc noCallback);
57+
MessageBoxFunc yesCallback, MessageBoxFunc noCallback);
5858

5959
GameWindow *ExMessageBoxYesNoCancel (UnicodeString titleString,UnicodeString bodyString, void *userData,
60-
MessageBoxFunc yesCallback, MessageBoxFunc noCallback, MessageBoxFunc cancelCallback);
60+
MessageBoxFunc yesCallback, MessageBoxFunc noCallback, MessageBoxFunc cancelCallback);
6161

6262
GameWindow *ExMessageBoxOkCancel (UnicodeString titleString,UnicodeString bodyString, void *userData,
63-
MessageBoxFunc okCallback, MessageBoxFunc cancelCallback);
63+
MessageBoxFunc okCallback, MessageBoxFunc cancelCallback);
6464

6565
GameWindow *ExMessageBoxOk (UnicodeString titleString,UnicodeString bodyString, void *userData,
66-
MessageBoxFunc okCallback);
66+
MessageBoxFunc okCallback);
6767

6868
GameWindow *ExMessageBoxCancel (UnicodeString titleString,UnicodeString bodyString, void *userData,
69-
MessageBoxFunc cancelCallback);
69+
MessageBoxFunc cancelCallback);

Generals/Code/GameEngine/Include/GameClient/Gadget.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -479,47 +479,47 @@ typedef struct _TabControlData
479479
extern WindowMsgHandledType GadgetPushButtonSystem( GameWindow *window, UnsignedInt msg,
480480
WindowMsgData mData1, WindowMsgData mData2 );
481481
extern WindowMsgHandledType GadgetPushButtonInput( GameWindow *window, UnsignedInt msg,
482-
WindowMsgData mData1, WindowMsgData mData2 );
482+
WindowMsgData mData1, WindowMsgData mData2 );
483483
extern WindowMsgHandledType GadgetCheckBoxInput( GameWindow *window, UnsignedInt msg,
484-
WindowMsgData mData1, WindowMsgData mData2 );
484+
WindowMsgData mData1, WindowMsgData mData2 );
485485
extern WindowMsgHandledType GadgetCheckBoxSystem( GameWindow *window, UnsignedInt msg,
486486
WindowMsgData mData1, WindowMsgData mData2 );
487487
extern WindowMsgHandledType GadgetRadioButtonInput( GameWindow *window, UnsignedInt msg,
488488
WindowMsgData mData1, WindowMsgData mData2 );
489489
extern WindowMsgHandledType GadgetRadioButtonSystem( GameWindow *window, UnsignedInt msg,
490-
WindowMsgData mData1, WindowMsgData mData2 );
490+
WindowMsgData mData1, WindowMsgData mData2 );
491491
extern WindowMsgHandledType GadgetTabControlInput( GameWindow *window, UnsignedInt msg,
492492
WindowMsgData mData1, WindowMsgData mData2 );
493493
extern WindowMsgHandledType GadgetTabControlSystem( GameWindow *window, UnsignedInt msg,
494-
WindowMsgData mData1, WindowMsgData mData2 );
494+
WindowMsgData mData1, WindowMsgData mData2 );
495495
extern WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
496496
WindowMsgData mData1, WindowMsgData mData2 );
497497
extern WindowMsgHandledType GadgetListBoxMultiInput( GameWindow *window, UnsignedInt msg,
498-
WindowMsgData mData1, WindowMsgData mData2 );
498+
WindowMsgData mData1, WindowMsgData mData2 );
499499
extern WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
500-
WindowMsgData mData1, WindowMsgData mData2 );
500+
WindowMsgData mData1, WindowMsgData mData2 );
501501
extern WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedInt msg,
502-
WindowMsgData mData1, WindowMsgData mData2 );
502+
WindowMsgData mData1, WindowMsgData mData2 );
503503
extern WindowMsgHandledType GadgetHorizontalSliderSystem( GameWindow *window, UnsignedInt msg,
504504
WindowMsgData mData1, WindowMsgData mData2 );
505505
extern WindowMsgHandledType GadgetVerticalSliderInput( GameWindow *window, UnsignedInt msg,
506-
WindowMsgData mData1, WindowMsgData mData2 );
506+
WindowMsgData mData1, WindowMsgData mData2 );
507507
extern WindowMsgHandledType GadgetVerticalSliderSystem( GameWindow *window, UnsignedInt msg,
508508
WindowMsgData mData1, WindowMsgData mData2 );
509509
extern WindowMsgHandledType GadgetProgressBarSystem( GameWindow *window, UnsignedInt msg,
510-
WindowMsgData mData1, WindowMsgData mData2 );
510+
WindowMsgData mData1, WindowMsgData mData2 );
511511
extern WindowMsgHandledType GadgetStaticTextInput( GameWindow *window, UnsignedInt msg,
512-
WindowMsgData mData1, WindowMsgData mData2 );
512+
WindowMsgData mData1, WindowMsgData mData2 );
513513
extern WindowMsgHandledType GadgetStaticTextSystem( GameWindow *window, UnsignedInt msg,
514514
WindowMsgData mData1, WindowMsgData mData2 );
515515
extern WindowMsgHandledType GadgetTextEntryInput( GameWindow *window, UnsignedInt msg,
516516
WindowMsgData mData1, WindowMsgData mData2 );
517517
extern WindowMsgHandledType GadgetTextEntrySystem( GameWindow *window, UnsignedInt msg,
518-
WindowMsgData mData1, WindowMsgData mData2 );
518+
WindowMsgData mData1, WindowMsgData mData2 );
519519
extern WindowMsgHandledType GadgetComboBoxInput( GameWindow *window, UnsignedInt msg,
520520
WindowMsgData mData1, WindowMsgData mData2 );
521521
extern WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
522-
WindowMsgData mData1, WindowMsgData mData2 );
522+
WindowMsgData mData1, WindowMsgData mData2 );
523523

524524

525525
extern Bool InitializeEntryGadget();

Generals/Code/GameEngine/Include/GameClient/GadgetComboBox.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,18 @@ extern void GadgetComboBoxSetIMECompositeTextColors( GameWindow *comboBox, Color
9191
// and those slider buttons and thumb as well as the drop down button and edit box.
9292
//
9393
extern void GadgetComboBoxSetColors( GameWindow *comboBox,
94-
Color enabledColor,
95-
Color enabledBorderColor,
96-
Color enabledSelectedItemColor,
97-
Color enabledSelectedItemBorderColor,
98-
Color disabledColor,
99-
Color disabledBorderColor,
100-
Color disabledSelectedItemColor,
101-
Color disabledSelectedItemBorderColor,
102-
Color hiliteColor,
103-
Color hiliteBorderColor,
104-
Color hiliteSelectedItemColor,
105-
Color hiliteSelectedItemBorderColor );
94+
Color enabledColor,
95+
Color enabledBorderColor,
96+
Color enabledSelectedItemColor,
97+
Color enabledSelectedItemBorderColor,
98+
Color disabledColor,
99+
Color disabledBorderColor,
100+
Color disabledSelectedItemColor,
101+
Color disabledSelectedItemBorderColor,
102+
Color hiliteColor,
103+
Color hiliteBorderColor,
104+
Color hiliteSelectedItemColor,
105+
Color hiliteSelectedItemBorderColor );
106106

107107
inline void GadgetComboBoxSetEnabledImage( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 0, image ); }
108108
inline void GadgetComboBoxSetEnabledColor( GameWindow *g, Color color ) { g->winSetEnabledColor( 0, color ); }

Generals/Code/GameEngine/Include/GameClient/GadgetListBox.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -109,18 +109,18 @@ extern void GadgetListBoxSetAudioFeedback( GameWindow *listbox, Bool enable );
109109
// and those slider buttons and thumb
110110
//
111111
extern void GadgetListBoxSetColors( GameWindow *listbox,
112-
Color enabledColor,
113-
Color enabledBorderColor,
114-
Color enabledSelectedItemColor,
115-
Color enabledSelectedItemBorderColor,
116-
Color disabledColor,
117-
Color disabledBorderColor,
118-
Color disabledSelectedItemColor,
119-
Color disabledSelectedItemBorderColor,
120-
Color hiliteColor,
121-
Color hiliteBorderColor,
122-
Color hiliteSelectedItemColor,
123-
Color hiliteSelectedItemBorderColor );
112+
Color enabledColor,
113+
Color enabledBorderColor,
114+
Color enabledSelectedItemColor,
115+
Color enabledSelectedItemBorderColor,
116+
Color disabledColor,
117+
Color disabledBorderColor,
118+
Color disabledSelectedItemColor,
119+
Color disabledSelectedItemBorderColor,
120+
Color hiliteColor,
121+
Color hiliteBorderColor,
122+
Color hiliteSelectedItemColor,
123+
Color hiliteSelectedItemBorderColor );
124124

125125
inline void GadgetListBoxSetEnabledImage( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 0, image ); }
126126
inline void GadgetListBoxSetEnabledColor( GameWindow *g, Color color ) { g->winSetEnabledColor( 0, color ); }

0 commit comments

Comments
 (0)