Skip to content
Open
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
6 changes: 3 additions & 3 deletions Core/GameEngine/Include/Common/AudioEventRTS.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ class AudioEventRTS
const Coord3D *getCurrentPosition( void );

// This will return the directory leading up to the appropriate type, including the trailing '\\'
// If localized is true, we'll append a language specifc directory to the end of the path.
// If localized is true, we'll append a language specific directory to the end of the path.
AsciiString generateFilenamePrefix( AudioType audioTypeToPlay, Bool localized );
AsciiString generateFilenameExtension( AudioType audioTypeToPlay );
protected:
Expand All @@ -170,8 +170,8 @@ class AudioEventRTS
AsciiString m_attackName; ///< This is the filename that should be used during the attack.
AsciiString m_decayName; ///< This is the filename that should be used during the decay.

AudioPriority m_priority; ///< This should be the priority as given by the event info, or the overrided priority.
Real m_volume; ///< This is the override for the volume. It will either be the normal
AudioPriority m_priority; ///< This should be the priority as given by the event info, or the overridden priority.
Real m_volume; ///< This is the override for the volume. It will either be the normal volume or an overridden value.
TimeOfDay m_timeOfDay; ///< This should be the current Time Of Day.

Coord3D m_positionOfAudio; ///< Position of the sound if no further positional updates are necessary
Expand Down
2 changes: 1 addition & 1 deletion Core/GameEngine/Include/Common/Xfer.h
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ class Xfer

protected:

// this is the actual xfer impelmentation that each derived class should implement
// this is the actual xfer implementation that each derived class should implement
virtual void xferImplementation( void *data, Int dataSize ) = 0;

UnsignedInt m_options; ///< xfer options
Expand Down
2 changes: 1 addition & 1 deletion Core/GameEngine/Include/GameClient/TerrainVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ class TerrainVisual : public Snapshot,
virtual void enableWaterGrid( Bool enable ) = 0;
/// set min/max height values allowed in water grid pointed to by waterTable
virtual void setWaterGridHeightClamps( const WaterHandle *waterTable, Real minZ, Real maxZ ) = 0;
/// adjust fallof parameters for grid change method
/// adjust falloff parameters for grid change method
virtual void setWaterAttenuationFactors( const WaterHandle *waterTable, Real a, Real b, Real c, Real range ) = 0;
/// set the water table position and orientation in world space
virtual void setWaterTransform( const WaterHandle *waterTable, Real angle, Real x, Real y, Real z ) = 0;
Expand Down
2 changes: 1 addition & 1 deletion Core/GameEngine/Include/GameNetwork/GameInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ class GameSlot

/**
* GameInfo class - maintains information about the game setup and
* the contents of its slot list hroughout the game.
* the contents of its slot list throughout the game.
*/
class GameInfo
{
Expand Down
2 changes: 1 addition & 1 deletion Core/GameEngine/Include/GameNetwork/LANGameInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class LANGameInfo : public GameInfo
void setName( UnicodeString name ) { m_gameName = name; } ///< Set the Name of the Game
UnicodeString getName( void ) { return m_gameName; } ///< Get the Name of the Game

// Convinience functions that interface with the LANPlayer held in the slot list
// Convenience functions that interface with the LANPlayer held in the slot list
virtual void resetAccepted(void); ///< Reset the accepted flag on all players
Bool amIHost( void ); ///< Convenience function - is the local player the game host?

Expand Down
2 changes: 1 addition & 1 deletion Core/GameEngine/Source/Common/Audio/GameSounds.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ Bool SoundManager::canPlayNow( AudioEventRTS *event )
// 1) Are we muted because we're beyond our maximum distance?
// 2) Are we shrouded and this is a shroud sound?
// 3) Are we violating our voice count or are we playing above the limit? (If so, stop now)
// 4) is there an avaiable channel open?
// 4) is there an available channel open?
// 5) if not, then determine if there is anything of lower priority that we can kill
// 6) if not, are we an interrupt-sound type?
// if so, are there any sounds of our type playing right now that we can interrupt?
Expand Down
2 changes: 1 addition & 1 deletion Core/GameEngine/Source/Common/System/XferLoad.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

// FILE: XferLoad.cpp /////////////////////////////////////////////////////////////////////////////
// Author: Colin Day, February 2002
// Desc: Xfer implemenation for loading from disk
// Desc: Xfer implementation for loading from disk
///////////////////////////////////////////////////////////////////////////////////////////////////

// USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class BaseHeightMapRenderObjClass;
class WorldHeightMap;

//-------------------------------------------------------------------------------------------------
/** W3D impelmentation of visual terrain details singleton */
/** W3D implementation of visual terrain details singleton */
//-------------------------------------------------------------------------------------------------
class W3DTerrainVisual : public TerrainVisual
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2170,7 +2170,7 @@ void HeightMapRenderObjClass::renderTerrainPass(CameraClass *pCamera)
//=============================================================================
// HeightMapRenderObjClass::renderExtraBlendTiles
//=============================================================================
/** Renders an additoinal terrain pass including only those tiles which have more than 2 textures
/** Renders an additional terrain pass including only those tiles which have more than 2 textures
blended together. Used primarily for corner cases where 3 different textures meet.*/
void HeightMapRenderObjClass::renderExtraBlendTiles(void)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2870,7 +2870,7 @@ IDirect3DTexture8 *W3DShaderManager::endRenderToTexture(void)
DEBUG_ASSERTCRASH(hr==S_OK, ("Set target failed unexpectedly."));
if (hr == S_OK)
{
//assume render target texure will be in stage 0. Most hardware has "conditional" support for
//assume render target texture will be in stage 0. Most hardware has "conditional" support for
//non-power-of-2 textures so we must force some required states:
DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Include/Common/Energy.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

#pragma once

// INLCUDES /////////////////////////////////////////////////////////////////////////////////////
// INCLUDES /////////////////////////////////////////////////////////////////////////////////////
#include "Common/Snapshot.h"

// ----------------------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Include/Common/FunctionLexicon.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class FunctionLexicon : public SubsystemInterface
// mapping of a symbol to a function address. However, when compiling
// in release, functions that have the same arguments and the same
// body (mainly empty stub functions) get optimized to the
// SAME ADDRESS. That destroyes our 1 to 1 mapping so it is something
// SAME ADDRESS. That destroys our 1 to 1 mapping so it is something
// that we must avoid
//
// translate a function pointer to its symbolic name
Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Include/Common/GameStateMap.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

#pragma once

// INLCUDES ///////////////////////////////////////////////////////////////////////////////////////
// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
#include "Common/Snapshot.h"
#include "Common/SubsystemInterface.h"

Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Include/Common/StatsCollector.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
//
// author: Chris Huybregts
//
// purpose: Convinience class to help with collecting stats.
// purpose: Convenience class to help with collecting stats.
//
//-----------------------------------------------------------------------------
///////////////////////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Include/Common/Thing.h
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ class Thing : public MemoryPoolObject

protected:

// Virtual method since objects can be on bridges and need to calculate heigh above terrain differently.
// Virtual method since objects can be on bridges and need to calculate height above terrain differently.
virtual Real calculateHeightAboveTerrain(void) const; // Calculates the actual height above terrain. Doesn't use cache.

virtual Object *asObjectMeth() { return nullptr; }
Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Include/GameClient/CommandXlat.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class CommandTranslator : public GameMessageTranslator
Int m_objective;
Bool m_teamExists; ///< is there a currently selected "team"?

// these are for determining if a drag occurred or it wasjust a sloppy click
// these are for determining if a drag occurred or it was just a sloppy click
ICoord2D m_mouseRightDragAnchor; // the location of a possible mouse drag start
ICoord2D m_mouseRightDragLift; // the location of a possible mouse drag end
UnsignedInt m_mouseRightDown; // when the mouse down happened
Expand Down
4 changes: 2 additions & 2 deletions Generals/Code/GameEngine/Include/GameClient/ControlBar.h
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ enum GUICommandType CPP_11(: Int)
GUI_COMMAND_COMBATDROP, ///< rappel contents to ground or bldg
GUI_COMMAND_SWITCH_WEAPON, ///< switch weapon use

//Context senstive command modes
//Context sensitive command modes
GUICOMMANDMODE_HIJACK_VEHICLE,
GUICOMMANDMODE_CONVERT_TO_CARBOMB,
#ifdef ALLOW_SURRENDER
Expand Down Expand Up @@ -805,7 +805,7 @@ class ControlBar : public SubsystemInterface
/// post process step, after all commands and command sets are loaded
void postProcessCommands( void );

// the following methods are for resetting data for vaious contexts
// the following methods are for resetting data for various contexts
void resetCommonCommandData( void ); /// reset shared command data
void resetContainData( void ); /// reset container data we use to tie controls to objects IDs for containment
void resetBuildQueueData( void ); /// reset the build queue data we use to die queue entires to control
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class ControlBarSchemeImage
ICoord2D m_size; ///< the size of the image needed when we draw it
Image *m_image; ///< the actual pointer to the mapped image

// m_layer is where the image will get drawn, everything in layer 0-2 gets drawn during the forground draw
// m_layer is where the image will get drawn, everything in layer 0-2 gets drawn during the foreground draw
// the layers 3-5 gets drawn during the background draw
Int m_layer; //layer means how deep the image will be drawn, it's a number between 0-5 with 0 being on top
};
Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Include/GameClient/Display.h
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ class Display : public SubsystemInterface
virtual void drawFillRect( Int startX, Int startY, Int width, Int height,
UnsignedInt color ) = 0;

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

Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Include/GameClient/Gadget.h
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ enum
GWS_PROGRESS_BAR,
};

// Gadget paramaters
// Gadget parameters
enum
{

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ extern void *GadgetComboBoxGetItemData( GameWindow *comboBox, Int index );
extern Int GadgetComboBoxGetLength( GameWindow *comboBox );

extern void GadgetComboBoxHideList( GameWindow *comboBox );
// Functions that set the ComboBoxData Paramaters
// Functions that set the ComboBoxData Parameters
extern void GadgetComboBoxSetAsciiOnly(GameWindow *comboBox, Bool isAsciiOnly );
extern void GadgetComboBoxSetLettersAndNumbersOnly(GameWindow *comboBox, Bool isLettersAndNumbersOnly );
extern void GadgetComboBoxSetMaxChars( GameWindow *comboBox, Int maxChars );
Expand Down
12 changes: 6 additions & 6 deletions Generals/Code/GameEngine/Include/GameClient/GameWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@ enum GameWindowMessage CPP_11(: Int)
GWM_MOUSE_ENTERING, GWM_MOUSE_LEAVING,
GWM_WHEEL_UP, GWM_WHEEL_DOWN,
GWM_CHAR, GWM_SCRIPT_CREATE,
// note that GWM_MOUSE_POS is only actually propogated to windows if the static
// note that GWM_MOUSE_POS is only actually propagated to windows if the static
// sendMousePosMessages is set to true in the window manager file. See the
// comment on the static declaration for addtional info
// comment on the static declaration for additional info
GWM_INPUT_FOCUS, GWM_MOUSE_POS,
GWM_IME_CHAR, GWM_IME_STRING

Expand Down Expand Up @@ -220,7 +220,7 @@ struct GameWindowEditData

// GameWindow -----------------------------------------------------------------
/** Class definition for a game window. These are the basic elements of the
* whole windowing sytem, all windows are GameWindows, as are all GUI controls
* whole windowing system, all windows are GameWindows, as are all GUI controls
* etc. */
//-----------------------------------------------------------------------------
class GameWindow : public MemoryPoolObject
Expand Down Expand Up @@ -324,7 +324,7 @@ friend class GameWindowManager;
virtual void *winGetUserData( void ); ///< get the window user data
void winSetUserData( void *userData ); ///< set the user data

// heirarchy methods
// hierarchy methods
Int winSetParent( GameWindow *parent ); ///< set parent
GameWindow *winGetParent( void ); ///< get parent
Bool winIsChild( GameWindow *child ); ///< verifies parent
Expand Down Expand Up @@ -357,11 +357,11 @@ friend class GameWindowManager;
Bool winPointInWindow( Int x, Int y ); /**is point inside this window?
also return TRUE if point is in
a child */
/** given a piont, return the child window which contains the mouse pointer,
/** given a point, return the child window which contains the mouse pointer,
if the point is not in a chilc, the function returns the 'window' paramater
back to the caller */
GameWindow *winPointInChild( Int x, Int y, Bool ignoreEnableCheck = FALSE, Bool playDisabledSound = FALSE );
/** finds the child which contains the mouse pointer - reguardless of
/** finds the child which contains the mouse pointer - regardless of
the enabled status of the child */
GameWindow *winPointInAnyChild( Int x, Int y, Bool ignoreHidden, Bool ignoreEnableCheck = FALSE );

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ friend class GameWindow;
virtual Int winDestroyAll( void ); ///< destroy all windows in the system
virtual GameWindow *winGetWindowList( void ); ///< get head of master list

/// hide all windows in a certain range of id's (inclusinve );
/// hide all windows in a certain range of id's (inclusive );
virtual void hideWindowsInRange( GameWindow *baseWindow, Int first, Int last,
Bool hideFlag );
/// enable all windows in a range of id's (inclusive)
Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Include/GameClient/Image.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( Image, "Image" );
public:

Image( void );
// virtual desctructor defined by memory pool object
// virtual destructor defined by memory pool object

void setName( AsciiString name ); ///< set image name
AsciiString getName( void ) const; ///< return name
Expand Down
4 changes: 2 additions & 2 deletions Generals/Code/GameEngine/Include/GameClient/ParticleSys.h
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ class ParticleSystem : public MemoryPoolObject,
EmissionVolumeType getEmisionVolumeType() const { return m_emissionVolumeType; }
ParticlePriorityType getPriority() const { return m_priority; }

// Access to wind motoin
// Access to wind motion
Real getWindAngle( void ) { return m_windAngle; }
WindMotion getWindMotion( void ) { return m_windMotion; }

Expand Down Expand Up @@ -791,7 +791,7 @@ class ParticleSystemManager : public SubsystemInterface,

virtual void preloadAssets( TimeOfDay timeOfDay );

// these are only for use by partcle systems to link and unlink themselves
// these are only for use by particle systems to link and unlink themselves
void friend_addParticleSystem( ParticleSystem *particleSystemToAdd );
void friend_removeParticleSystem( ParticleSystem *particleSystemToRemove );

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
// purpose: If a new animation is wanted to be added for the windows, All you
// have to do is create a new class derived from ProcessAnimateWindow.
// Then setup each of the virtual classes to process an AnimateWindow
// class. The Update adn reverse functions get called every frame
// class. The Update and reverse functions get called every frame
// by the shell and will continue to process the AdminWin until the
// isFinished flag on the adminWin is set to true.
//
Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Include/GameLogic/GameLogic.h
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class GameLogic : public SubsystemInterface, public Snapshot
GameLogic( void );
virtual ~GameLogic();

// subsytem methods
// subsystem methods
virtual void init( void ); ///< Initialize or re-initialize the instance
virtual void reset( void ); ///< Reset the logic system
virtual void update( void ); ///< update the world
Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Include/GameLogic/Module/DamDie.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class DamDie : public DieModule
public:

DamDie( Thing *thing, const ModuleData* moduleData );
// virtual destructor prorotype provided by MemoryPoolObject
// virtual destructor prototype provided by MemoryPoolObject

virtual void onDie( const DamageInfo *damageInfo );

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class DefaultProductionExitUpdate : public UpdateModule, public ExitInterface
DefaultProductionExitUpdate( Thing *thing, const ModuleData* moduleData );
// virtual destructor prototype provided by memory pool declaration

// Required funcs to fufill interface requirements
// Required funcs to fulfill interface requirements
virtual Bool isExitBusy() const {return FALSE;} ///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check.
virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ) { return DOOR_1; }
virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class DynamicShroudClearingRangeUpdate : public UpdateModule
UnsignedInt m_sustainDeadline;
UnsignedInt m_shrinkStartDeadline;
UnsignedInt m_doneForeverFrame; ///< Just in case interval and state timing goes awry
///< This supercedes and makes us quit
///< This supersedes and makes us quit


UnsignedInt m_changeIntervalCountdown;///< How long till I change my vision range again
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class FireWeaponWhenDamagedBehavior : public UpdateModule,
FireWeaponWhenDamagedBehavior( Thing *thing, const ModuleData* moduleData );
// virtual destructor prototype provided by memory pool declaration

// module methids
// module methods
static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | (MODULEINTERFACE_UPGRADE) | (MODULEINTERFACE_DAMAGE); }

// BehaviorModule
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

// FILE: FloatUpdate.h ////////////////////////////////////////////////////////////////////////////
// Author: Colin Day, May 2002
// Desc: Floting on water update
// Desc: Floating on water update
///////////////////////////////////////////////////////////////////////////////////////////////////

#pragma once
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

// FILE: ObjectDefectionHelper.h //////////////////////////////////////////////////////////////////
// Author: Steven Johnson, Colin Day - September 202
// Desc: Object helpder - defection
// Desc: Object helper - defection
///////////////////////////////////////////////////////////////////////////////////////////////////

#pragma once
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

// FILE: ObjectHelper.h ///////////////////////////////////////////////////////////////////////////
// Author: Steven Johnson, Colin Day - September 202
// Desc: Object helpder
// Desc: Object helper
///////////////////////////////////////////////////////////////////////////////////////////////////

#pragma once
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

// FILE: ObjectSMCHelper.h ////////////////////////////////////////////////////////////////////////
// Author: Steven Johnson, Colin Day - September 202
// Desc: Object helpder - SMC
// Desc: Object helper - SMC
///////////////////////////////////////////////////////////////////////////////////////////////////

#pragma once
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

// FILE: ObjectWeaponStatusHelper.h ///////////////////////////////////////////////////////////////
// Author: Steven Johnson, Colin Day - September 202
// Desc: Object helpder - WeaponStatus
// Desc: Object helper - WeaponStatus
///////////////////////////////////////////////////////////////////////////////////////////////////

#pragma once
Expand Down
Loading
Loading