Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1418,7 +1418,7 @@ static void parseCommandLine(const CommandLineParam* params, int numParams)
// and functions to handle them. Comparisons can be case-(in)sensitive, and
// can check the entire string (for testing the presence of a flag) or check
// just the start (for a key=val argument). The handling function can also
// look at the next argument(s), to accomodate multi-arg parameters, e.g. "-p 1234".
// look at the next argument(s), to accommodate multi-arg parameters, e.g. "-p 1234".
while (arg<argc)
{
// Look at arg #i
Expand Down
6 changes: 3 additions & 3 deletions GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ GlobalData* GlobalData::m_theOriginal = nullptr;
{ "MaxTranslucentObjects", INI::parseInt, nullptr, offsetof( GlobalData, m_maxVisibleTranslucentObjects) },
{ "OccludedColorLuminanceScale", INI::parseReal, nullptr, offsetof( GlobalData, m_occludedLuminanceScale) },

/* These are internal use only, they do not need file definitons
/* These are internal use only, they do not need file definitions
{ "TerrainAmbientRGB", INI::parseRGBColor, nullptr, offsetof( GlobalData, m_terrainAmbient ) },
{ "TerrainDiffuseRGB", INI::parseRGBColor, nullptr, offsetof( GlobalData, m_terrainDiffuse ) },
{ "TerrainLightPos", INI::parseCoord3D, nullptr, offsetof( GlobalData, m_terrainLightPos ) },
Expand All @@ -331,7 +331,7 @@ GlobalData* GlobalData::m_theOriginal = nullptr;
{ "VideoOn", INI::parseBool, nullptr, offsetof( GlobalData, m_videoOn ) },
{ "DisableCameraMovements", INI::parseBool, nullptr, offsetof( GlobalData, m_disableCameraMovement ) },

/* These are internal use only, they do not need file definitons
/* These are internal use only, they do not need file definitions
/// @todo remove this hack
{ "InGame", INI::parseBool, nullptr, offsetof( GlobalData, m_inGame ) },
*/
Expand Down Expand Up @@ -365,7 +365,7 @@ GlobalData* GlobalData::m_theOriginal = nullptr;
{ "AutoAflameParticleSystem", INI::parseAsciiString, nullptr, offsetof( GlobalData, m_autoAflameParticleSystem ) },
{ "AutoAflameParticleMax", INI::parseInt, nullptr, offsetof( GlobalData, m_autoAflameParticleMax ) },

/* These are internal use only, they do not need file definitons
/* These are internal use only, they do not need file definitions
{ "LatencyAverage", INI::parseInt, nullptr, offsetof( GlobalData, m_latencyAverage ) },
{ "LatencyAmplitude", INI::parseInt, nullptr, offsetof( GlobalData, m_latencyAmplitude ) },
{ "LatencyPeriod", INI::parseInt, nullptr, offsetof( GlobalData, m_latencyPeriod ) },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
/* 4/12/2002 : Initial creation */
/*---------------------------------------------------------------------------*/
/**************************************************************************************************
Some info about partioning problems:
Some info about partitioning problems:

This problem is contained in a very interesting class of problems known as NP complete. The
basic problem is that there is no way to tell whether you have an optimal solution or not.
Expand Down
8 changes: 4 additions & 4 deletions GeneralsMD/Code/GameEngine/Source/Common/RTS/AcademyStats.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ void AcademyStats::init( const Player *player )
//13) Extra gatherers built?
m_gatherersBuilt = 0;

//14) Heros built?
//14) Heroes built?
m_heroesBuilt = 0;

//+------------------------------+
Expand Down Expand Up @@ -401,7 +401,7 @@ void AcademyStats::recordProduction( const Object *obj, const Object *constructe
m_gatherersBuilt++;
}

//14) Heros built?
//14) Heroes built?
if( obj->isKindOf( KINDOF_HERO ) )
{
m_heroesBuilt++;
Expand Down Expand Up @@ -702,7 +702,7 @@ void AcademyStats::evaluateTier1Advice( AcademyAdviceInfo *info, Int numAvailabl
numAvailableTips--;
}

//14) Heros built?
//14) Heroes built?
if( !m_heroesBuilt )
{
availableTips++;
Expand Down Expand Up @@ -1174,7 +1174,7 @@ void AcademyStats::xfer( Xfer *xfer )
//13) Extra gathers built?
xfer->xferUnsignedInt( &m_gatherersBuilt );

//14) Heros built?
//14) Heroes built?
xfer->xferUnsignedInt( &m_heroesBuilt );

//+------------------------------+
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@ CanAttackResult ActionManager::getCanAttackObject( const Object *obj, const Obje
}
}
}
else if( result == ATTACKRESULT_NOT_POSSIBLE )// oh dear me. The wierd case of a garrisoncontainer being a KINDOF_SPAWNS_ARE_THE_WEAPONS... the AmericaBuildingFirebase
else if( result == ATTACKRESULT_NOT_POSSIBLE )// oh dear me. The weird case of a garrisoncontainer being a KINDOF_SPAWNS_ARE_THE_WEAPONS... the AmericaBuildingFirebase
{
ContainModuleInterface *contain = obj->getContain();
if ( contain )
Expand Down
4 changes: 2 additions & 2 deletions GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1620,7 +1620,7 @@ void Player::preTeamDestroy( const Team *team )
}

//-------------------------------------------------------------------------------------------------
/// a structuer was just created, but is under construction
/// a structure was just created, but is under construction
//-------------------------------------------------------------------------------------------------
void Player::onStructureCreated( Object *builder, Object *structure )
{
Expand Down Expand Up @@ -3147,7 +3147,7 @@ Bool Player::okToPlayRadarEdgeSound( void )
}

//-------------------------------------------------------------------------------------------------
/** The parameter object has just aquired a radar */
/** The parameter object has just acquired a radar */
//-------------------------------------------------------------------------------------------------
void Player::addRadar( Bool disableProof )
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ Bool ProductionPrerequisite::isSatisfied(const Player *player) const
//-------------------------------------------------------------------------------------------------
/** Add a unit prerequisite, if 'orWithPrevious' is set then this unit is said
* to be an alternate prereq to the previously added unit, otherwise this becomes
* a new 'block' and is required in ADDDITION to other entries.
* a new 'block' and is required in ADDITION to other entries.
* Return FALSE if no space left to add unit */
//-------------------------------------------------------------------------------------------------
void ProductionPrerequisite::addUnitPrereq( AsciiString unit, Bool orUnitWithPrevious )
Expand All @@ -205,7 +205,7 @@ void ProductionPrerequisite::addUnitPrereq( AsciiString unit, Bool orUnitWithPre
//-------------------------------------------------------------------------------------------------
/** Add a unit prerequisite, if 'orWithPrevious' is set then this unit is said
* to be an alternate prereq to the previously added unit, otherwise this becomes
* a new 'block' and is required in ADDDITION to other entries.
* a new 'block' and is required in ADDITION to other entries.
* Return FALSE if no space left to add unit */
//-------------------------------------------------------------------------------------------------
void ProductionPrerequisite::addUnitPrereq( const std::vector<AsciiString>& units )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ static Real computeRelativeCost( Object *queryObject, Object *destObject, Real *
return FLT_MAX;

if( !TheActionManager->canTransferSuppliesAt(queryObject, destObject) )
return FLT_MAX;// Handles emptyness and alliances
return FLT_MAX;// Handles emptiness and alliances

DockUpdateInterface *dockInterface = destObject->getDockUpdateInterface();
if( !dockInterface->isClearToApproach( queryObject ) )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ Bool SpecialPowerStore::canUseSpecialPower( Object *obj, const SpecialPowerTempl
// they cannot have all of them.
//

// check for requried science
// check for required science
ScienceType requiredScience = specialPowerTemplate->getRequiredScience();
if( requiredScience != SCIENCE_INVALID )
{
Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1125,7 +1125,7 @@ Bool TeamPrototype::evaluateProductionCondition(void)
return false;
}
if (m_productionConditionScript) {
// If we are doing peridic evaluation, check the frame.
// If we are doing periodic evaluation, check the frame.
if (TheGameLogic->getFrame()<m_productionConditionScript->getFrameToEvaluate()) {
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ void TunnelTracker::onTunnelDestroyed( const Object *deadTunnel )
void TunnelTracker::destroyObject( Object *obj, void * )
{
// Now that tunnels consider ContainedBy to be "the tunnel you entered", I need to say goodbye
// llike other contain types so they don't look us up on their deletion and crash
// like other contain types so they don't look us up on their deletion and crash
obj->onRemovedFrom( obj->getContainedBy() );
TheGameLogic->destroyObject( obj );
}
Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ void RecorderClass::stopPlayback() {
}

/**
* Update function for recording a game. Basically all the pertinant logic commands for this frame are written out
* Update function for recording a game. Basically all the pertinent logic commands for this frame are written out
* to a file.
*/
void RecorderClass::updateRecord()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
//
// author: Chris Huybregts
//
// purpose: Convinience class to gather player stats
// purpose: Convenience class to gather player stats
//
//-----------------------------------------------------------------------------
///////////////////////////////////////////////////////////////////////////////
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1111,7 +1111,7 @@ void BuildAssistant::addBibs(const Coord3D *worldPos,
* actually used for the tiling is returned along with a pointer to the array
* of positions in the tile build info.
*
* REQUIRES: Note that the array at 'postions' must be large enough to hold 'maxTiles'
* REQUIRES: Note that the array at 'positions' must be large enough to hold 'maxTiles'
* entries of positions
*/
//-------------------------------------------------------------------------------------------------
Expand All @@ -1130,7 +1130,7 @@ BuildAssistant::TileBuildInfo *BuildAssistant::buildTiledLocations( const ThingT

//
// we will fill out our own internal array of positions, it better be big enough to
// accomodate max tiles, if it's not lets make it bigger!
// accommodate max tiles, if it's not lets make it bigger!
//
if( maxTiles > m_buildPositionSize )
{
Expand Down Expand Up @@ -1158,7 +1158,7 @@ BuildAssistant::TileBuildInfo *BuildAssistant::buildTiledLocations( const ThingT
placementVector.z = 0.0f; //end->z - start->z;

//
// get the lengh of the placement vector in the world, we'll use this to see how
// get the length of the placement vector in the world, we'll use this to see how
// many objects we'll need to fill the entire line
//
Real placementLength = placementVector.length();
Expand Down Expand Up @@ -1602,7 +1602,7 @@ void BuildAssistant::sellObject( Object *obj )

// destroy any mines that are owned by this structure, right now.
// unfortunately, structures don't keep list of mines they own, so we must do
// this the hard way :-( [fortunately, this doens't happen very often, so this
// this the hard way :-( [fortunately, this doesn't happen very often, so this
// is probably an acceptable, if icky, solution.] (srj)
for (Object* mine = TheGameLogic->getFirstObject(); mine; mine = mine->getNextObject())
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ void *FunctionLexicon::findFunction( NameKeyType key, TableIndex index )
if( key == NAMEKEY_INVALID )
return nullptr;

// search ALL tables for function if the index paramater allows if
// search ALL tables for function if the index parameter allows if
if( index == TABLE_ANY )
{

Expand Down Expand Up @@ -527,7 +527,7 @@ FunctionLexicon::~FunctionLexicon( void )
}

//-------------------------------------------------------------------------------------------------
/** Initialize our dictionary of funtion pointers and symbols */
/** Initialize our dictionary of function pointers and symbols */
//-------------------------------------------------------------------------------------------------
void FunctionLexicon::init( void )
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
////////////////////////////////////////////////////////////////////////////////

// Registry.cpp
// Simple interface for storing/retreiving registry values
// Simple interface for storing/retrieving registry values
// Author: Matthew D. Campbell, December 2001

#include "PreRTS.h" // This must go first in EVERY cpp file in the GameEngine
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
// FILE: ModuleFactory.cpp ////////////////////////////////////////////////////////////////////////
// Author: Colin Day, September 2001
// Desc: TheModuleFactory is where we actually instance modules for objects
// and drawbles. Those modules are things such as an UpdateModule
// and drawables. Those modules are things such as an UpdateModule
// or DamageModule or DrawModule etc.
//
// TheModuleFactory will contain a list of ModuleTemplates, when we
Expand Down Expand Up @@ -623,7 +623,7 @@ const ModuleFactory::ModuleTemplate* ModuleFactory::findModuleTemplate(const Asc
}

//-------------------------------------------------------------------------------------------------
/** Allocate a new acton class istance given the name */
/** Allocate a new acton class instance given the name */
//-------------------------------------------------------------------------------------------------
Module *ModuleFactory::newModule( Thing *thing, const AsciiString& name, const ModuleData* moduleData, ModuleType type )
{
Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Source/Common/Thing/Thing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ void Thing::convertBonePosToWorldPos(const Coord3D* bonePos, const Matrix3D* bon
void Thing::transformPoint( const Coord3D *in, Coord3D *out )
{

// santiy
// sanity
if( in == nullptr || out == nullptr )
return;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ void ThingFactory::freeDatabase( void )
}

//-------------------------------------------------------------------------------------------------
/** add the thing template passed in, into the databse */
/** add the thing template passed in, into the database */
//-------------------------------------------------------------------------------------------------
void ThingFactory::addTemplate( ThingTemplate *tmplate )
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ Bool ModuleInfo::clearCopiedFromDefaultEntries(Int interfaceMask, const AsciiStr
ret = true;
}
else
++it;//no match, preserve the default instnace of this Module for now
++it;//no match, preserve the default instance of this Module for now
}
else // just dump this instance of this Module, since one of the same interface mask has been added by caller
{
Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Source/GameClient/Color.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
//=============================================================================

// GameGetColorComponents =====================================================
/** Get the RGB color comonents of a color */
/** Get the RGB color components of a color */
//=============================================================================


Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ void Display::playLogoMovie( AsciiString movieName, Int minMovieLength, Int minC
m_currentlyPlayingMovie = movieName;
m_movieHoldTime = minMovieLength;
m_copyrightHoldTime = minCopyrightLength;
m_elapsedMovieTime = timeGetTime(); // we're using time get time becuase legal want's actual "Seconds"
m_elapsedMovieTime = timeGetTime(); // we're using time get time because legal wants actual "Seconds"

m_videoBuffer = createVideoBuffer();
if ( m_videoBuffer == nullptr ||
Expand Down
10 changes: 5 additions & 5 deletions GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1244,14 +1244,14 @@ void Drawable::updateDrawable( void )
}
else if( testTintStatus(TINT_STATUS_GAINING_SUBDUAL_DAMAGE) )
{
// Disabled has precendence, so it goes first
// Disabled has precedence, so it goes first
if (m_colorTintEnvelope == nullptr)
m_colorTintEnvelope = newInstance(TintEnvelope);
m_colorTintEnvelope->play( &SUBDUAL_DAMAGE_COLOR, 150, 150, SUSTAIN_INDEFINITELY);
}
else if( testTintStatus(TINT_STATUS_FRENZY) )
{
// Disabled has precendence, so it goes first
// Disabled has precedence, so it goes first
if (m_colorTintEnvelope == nullptr)
m_colorTintEnvelope = newInstance(TintEnvelope);

Expand Down Expand Up @@ -2541,7 +2541,7 @@ void Drawable::setStealthLook(StealthLookType look)
Object *obj = getObject();
if( obj )
{
//Try to get the stealthupdate module and see if the opacity value is overriden.
//Try to get the stealthupdate module and see if the opacity value is overridden.
StealthUpdate *stealth = obj->getStealth();
if( stealth )
{
Expand Down Expand Up @@ -3838,7 +3838,7 @@ void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)
return;

//
// only draw health for selected drawbles and drawables that have been moused over
// only draw health for selected drawables and drawables that have been moused over
// by the cursor
//
if( TheGlobalData->m_showObjectHealth &&
Expand Down Expand Up @@ -4714,7 +4714,7 @@ void Drawable::notifyDrawableDependencyCleared()
//-------------------------------------------------------------------------------------------------
void Drawable::setSelectable( Bool selectable )
{
// unselct drawable if it is no longer selectable.
// unselect drawable if it is no longer selectable.
if( !selectable )
TheInGameUI->deselectDrawable( this );

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1045,7 +1045,7 @@ ControlBar::~ControlBar( void )
void ControlBarPopupDescriptionUpdateFunc( WindowLayout *layout, void *param );

//-------------------------------------------------------------------------------------------------
/** Initialzie the control bar, this is our interface to the context sinsitive GUI */
/** Initialize the control bar, this is our interface to the context sinsitive GUI */
//-------------------------------------------------------------------------------------------------
void ControlBar::init( void )
{
Expand All @@ -1061,7 +1061,7 @@ void ControlBar::init( void )
// post process step after loading the command buttons and command sets
postProcessCommands();

// Init the scheme manager, this will call it's won INI init funciton.
// Init the scheme manager, this will call its own INI init function.
m_controlBarSchemeManager = NEW ControlBarSchemeManager;
m_controlBarSchemeManager->init();

Expand Down Expand Up @@ -1294,7 +1294,7 @@ void ControlBar::init( void )
void ControlBar::reset( void )
{
hideSpecialPowerShortcut();
// do not destroy the rally drawable, it will get destroyed with everythign else during a reset
// do not destroy the rally drawable, it will get destroyed with everything else during a reset
m_rallyPointDrawableID = INVALID_DRAWABLE_ID;
if(m_radarAttackGlowWindow)
m_radarAttackGlowWindow->winEnable(TRUE);
Expand Down Expand Up @@ -1642,7 +1642,7 @@ void ControlBar::onDrawableDeselected( Drawable *draw )

//
// always when becoming unselected should we remove any build placement icons because if
// we have some and are in the middle of a build process, it must obiously be over now
// we have some and are in the middle of a build process, it must obviously be over now
// because we are no longer selecting the dozer or worker
//
TheInGameUI->placeBuildAvailable( nullptr, nullptr );
Expand Down
Loading
Loading