Skip to content

Commit f526b53

Browse files
committed
style: Fix script edge cases and re-run on GeneralsMD GameEngine
1 parent 814cd43 commit f526b53

98 files changed

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

GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -247,13 +247,13 @@ class BitFlags
247247
static Int getSingleBitFromName(const char* token)
248248
{
249249
Int i = 0;
250-
for(const char* const* name = s_bitNameList; *name; ++name, ++i )
251-
{
252-
if( stricmp( *name, token ) == 0 )
253-
{
250+
for(const char* const* name = s_bitNameList; *name; ++name, ++i )
251+
{
252+
if( stricmp( *name, token ) == 0 )
253+
{
254254
return i;
255-
}
256-
}
255+
}
256+
}
257257
return -1;
258258
}
259259

@@ -272,7 +272,7 @@ class BitFlags
272272
}
273273
else
274274
{
275-
return false;
275+
return false;
276276
}
277277
}
278278

GeneralsMD/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

GeneralsMD/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.

GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -393,10 +393,10 @@ class GlobalData : public SubsystemInterface
393393

394394
Real m_cameraAudibleRadius; ///< If the camera is being used as the position of audio, then how far can we hear?
395395
Real m_groupMoveClickToGatherFactor; /** if you take all the selected units and calculate the smallest possible rectangle
396-
that contains them all, and click within that, all the selected units will break
397-
formation and gather at the point the user clicked (if the value is 1.0). If it's 0.0,
398-
units will always keep their formation. If it's <1.0, then the user must click a
399-
smaller area within the rectangle to order the gather. */
396+
that contains them all, and click within that, all the selected units will break
397+
formation and gather at the point the user clicked (if the value is 1.0). If it's 0.0,
398+
units will always keep their formation. If it's <1.0, then the user must click a
399+
smaller area within the rectangle to order the gather. */
400400

401401
Int m_antiAliasBoxValue; ///< value of selected antialias from combo box in options menu
402402
Bool m_languageFilterPref; ///< Bool if user wants to filter language

GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ class ThingTemplate : public Overridable
754754
Bool m_maxSimultaneousDeterminedBySuperweaponRestriction; ///< If true, override value in m_maxSimultaneousOfType with value from GameInfo::getSuperweaponRestriction()
755755
Bool m_isPrerequisite; ///< Is this thing considered in a prerequisite for any other thing?
756756
Bool m_isBridge; ///< True if this model is a bridge.
757-
Bool m_isBuildFacility; ///< is this the build facility for something? (calculated based on other template's prereqs)
757+
Bool m_isBuildFacility; ///< is this the build facility for something? (calculated based on other template's prereqs)
758758
Bool m_isTrainable; ///< Whether or not I can even gain experience
759759
Bool m_enterGuard; ///< Whether or not I can enter objects when guarding
760760
Bool m_hijackGuard; ///< Whether or not I can hijack objects when guarding

GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ class AutoHealBehavior : public UpdateModule,
181181
I can't rely solely on my sleeping. So this will guard onDamage's wake up.
182182
I could guard the act of healing, but that would defeat the gain of being
183183
a sleepy module. I never want to run update unless I am going to heal.
184-
*/
184+
*/
185185

186186
Bool m_stopped;
187187

GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BunkerBusterBehavior.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class BunkerBusterBehaviorModuleData : //public UpdateModuleData
6868
// ------------------------------------------------------------------------------------------------
6969
// ------------------------------------------------------------------------------------------------
7070
class BunkerBusterBehavior : public UpdateModule,
71-
public DieModuleInterface
71+
public DieModuleInterface
7272
{
7373

7474
MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( BunkerBusterBehavior, BunkerBusterBehaviorModuleData );

GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,6 @@ class HijackerUpdate : public UpdateModule
8686
Bool m_wasTargetAirborne;
8787

8888
// DieModuleInterface *m_ejectPilotDMI; // point to ejectpilotdiemodule
89-
// of target vehicle if it has one
89+
// of target vehicle if it has one
9090

9191
};

GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ class RailedTransportDockUpdateModuleData : public DockUpdateModuleData
4444
static void buildFieldParse( MultiIniFieldParse &p );
4545

4646
UnsignedInt m_pullInsideDurationInFrames; /**< how long it takes to pull object inside
47-
once they're at the dock action point */
47+
once they're at the dock action point */
4848
UnsignedInt m_pushOutsideDurationInFrames; /**< how long it takes to push object outside
49-
when we're unloading */
49+
when we're unloading */
5050

5151
Real m_toleranceDistance; ///< The maximum distance the docking unit must be within in order to cheat and dock.
5252
};

GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ class SupplyTruckAIUpdateModuleData : public AIUpdateModuleData
145145
{ "SupplyCenterActionDelay", INI::parseDurationUnsignedInt, nullptr, offsetof( SupplyTruckAIUpdateModuleData, m_centerDelay ) },
146146
{ "SupplyWarehouseActionDelay", INI::parseDurationUnsignedInt, nullptr, offsetof( SupplyTruckAIUpdateModuleData, m_warehouseDelay ) },
147147
{ "SupplyWarehouseScanDistance", INI::parseReal, nullptr, offsetof( SupplyTruckAIUpdateModuleData, m_warehouseScanDistance ) },
148-
{ "SuppliesDepletedVoice", INI::parseAudioEventRTS, nullptr, offsetof( SupplyTruckAIUpdateModuleData, m_suppliesDepletedVoice) },
148+
{ "SuppliesDepletedVoice", INI::parseAudioEventRTS, nullptr, offsetof( SupplyTruckAIUpdateModuleData, m_suppliesDepletedVoice) },
149149
{ 0, 0, 0, 0 }
150150
};
151151
p.add(dataFieldParse);

0 commit comments

Comments
 (0)