Skip to content

Commit 4f08544

Browse files
committed
style: Tighten heuristic and fix continuation script bugs
1 parent 9368e2f commit 4f08544

305 files changed

Lines changed: 1833 additions & 1825 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: 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/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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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

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/Module.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public: \
173173
* convenient this way */
174174
//-------------------------------------------------------------------------------------------------
175175
class Module : public MemoryPoolObject,
176-
public Snapshot
176+
public Snapshot
177177
{
178178

179179
MEMORY_POOL_GLUE_ABC( Module ) ///< this abstract class needs memory pool hooks

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/Common/PlayerList.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ enum AllowPlayerRelationship CPP_11(: Int)
7171
This is a singleton class that maintains the list of Players.
7272
*/
7373
class PlayerList : public SubsystemInterface,
74-
public Snapshot
74+
public Snapshot
7575
{
7676

7777
public:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class Object;
3737

3838
// ------------------------------------------------------------------------------------------------
3939
class ResourceGatheringManager : public MemoryPoolObject,
40-
public Snapshot
40+
public Snapshot
4141
{
4242
MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( ResourceGatheringManager, "ResourceGatheringManager" );
4343

0 commit comments

Comments
 (0)