diff --git a/Core/GameEngine/Include/GameNetwork/ConnectionManager.h b/Core/GameEngine/Include/GameNetwork/ConnectionManager.h index b10b79d2d62..956429dd422 100644 --- a/Core/GameEngine/Include/GameNetwork/ConnectionManager.h +++ b/Core/GameEngine/Include/GameNetwork/ConnectionManager.h @@ -144,7 +144,7 @@ class ConnectionManager // For disconnect blame assignment UnsignedInt getPingFrame(); Int getPingsSent(); - Int getPingsRecieved(); + Int getPingsReceived(); private: void doRelay(); diff --git a/Core/GameEngine/Include/GameNetwork/DisconnectManager.h b/Core/GameEngine/Include/GameNetwork/DisconnectManager.h index cfc1fb952e4..ccbb183881f 100644 --- a/Core/GameEngine/Include/GameNetwork/DisconnectManager.h +++ b/Core/GameEngine/Include/GameNetwork/DisconnectManager.h @@ -61,7 +61,7 @@ class DisconnectManager // For disconnect blame assignment UnsignedInt getPingFrame(); Int getPingsSent(); - Int getPingsRecieved(); + Int getPingsReceived(); protected: void sendKeepAlive(ConnectionManager *conMgr); @@ -120,6 +120,6 @@ class DisconnectManager time_t m_timeOfDisconnectScreenOn; Int m_pingsSent; - Int m_pingsRecieved; + Int m_pingsReceived; UnsignedInt m_pingFrame; }; diff --git a/Core/GameEngine/Include/GameNetwork/NetworkInterface.h b/Core/GameEngine/Include/GameNetwork/NetworkInterface.h index c0bf655eb64..3a577864f53 100644 --- a/Core/GameEngine/Include/GameNetwork/NetworkInterface.h +++ b/Core/GameEngine/Include/GameNetwork/NetworkInterface.h @@ -125,7 +125,7 @@ class NetworkInterface : public SubsystemInterface // For disconnect blame assignment virtual UnsignedInt getPingFrame() = 0; virtual Int getPingsSent() = 0; - virtual Int getPingsRecieved() = 0; + virtual Int getPingsReceived() = 0; }; diff --git a/Core/GameEngine/Source/GameNetwork/ConnectionManager.cpp b/Core/GameEngine/Source/GameNetwork/ConnectionManager.cpp index a9745c4ec70..ab7a87ef16b 100644 --- a/Core/GameEngine/Source/GameNetwork/ConnectionManager.cpp +++ b/Core/GameEngine/Source/GameNetwork/ConnectionManager.cpp @@ -295,9 +295,9 @@ Int ConnectionManager::getPingsSent() return (m_disconnectManager)?m_disconnectManager->getPingsSent():0; } -Int ConnectionManager::getPingsRecieved() +Int ConnectionManager::getPingsReceived() { - return (m_disconnectManager)?m_disconnectManager->getPingsRecieved():0; + return (m_disconnectManager)?m_disconnectManager->getPingsReceived():0; } Bool ConnectionManager::isPlayerConnected( Int playerID ) diff --git a/Core/GameEngine/Source/GameNetwork/DisconnectManager.cpp b/Core/GameEngine/Source/GameNetwork/DisconnectManager.cpp index 94beda05da6..6aec6e5868d 100644 --- a/Core/GameEngine/Source/GameNetwork/DisconnectManager.cpp +++ b/Core/GameEngine/Source/GameNetwork/DisconnectManager.cpp @@ -90,7 +90,7 @@ void DisconnectManager::init() { m_pingFrame = 0; m_pingsSent = 0; - m_pingsRecieved = 0; + m_pingsReceived = 0; } void DisconnectManager::update(ConnectionManager *conMgr) { @@ -124,7 +124,7 @@ void DisconnectManager::update(ConnectionManager *conMgr) { { m_pingFrame = TheGameLogic->getFrame(); m_pingsSent = 0; - m_pingsRecieved = 0; + m_pingsReceived = 0; // Send the pings if (ThePinger) @@ -173,7 +173,7 @@ void DisconnectManager::update(ConnectionManager *conMgr) { resp.avgPing, resp.hostname.c_str(), resp.repetitions)); if (resp.avgPing < 2000) { - m_pingsRecieved += resp.repetitions; + m_pingsReceived += resp.repetitions; } } } @@ -191,9 +191,9 @@ Int DisconnectManager::getPingsSent() return m_pingsSent; } -Int DisconnectManager::getPingsRecieved() +Int DisconnectManager::getPingsReceived() { - return m_pingsRecieved; + return m_pingsReceived; } diff --git a/Core/GameEngine/Source/GameNetwork/Network.cpp b/Core/GameEngine/Source/GameNetwork/Network.cpp index a308536ffc8..0df69993cea 100644 --- a/Core/GameEngine/Source/GameNetwork/Network.cpp +++ b/Core/GameEngine/Source/GameNetwork/Network.cpp @@ -176,7 +176,7 @@ class Network : public NetworkInterface // For disconnect blame assignment UnsignedInt getPingFrame(); Int getPingsSent(); - Int getPingsRecieved(); + Int getPingsReceived(); protected: void GetCommandsFromCommandList(); ///< Remove commands from TheCommandList and put them on the Network command list. @@ -231,9 +231,9 @@ Int Network::getPingsSent() return (m_conMgr)?m_conMgr->getPingsSent():0; } -Int Network::getPingsRecieved() +Int Network::getPingsReceived() { - return (m_conMgr)?m_conMgr->getPingsRecieved():0; + return (m_conMgr)?m_conMgr->getPingsReceived():0; } Bool Network::isPlayerConnected( Int playerID ) { diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp index ddfa8904b2e..de5e0de92f9 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp @@ -1101,7 +1101,7 @@ void RingRenderObjClass::Scale(float scalex, float scaley, float scalez) /*********************************************************************************************** - * RingRenderObjClass::Update_On_Visibilty -- Either starts or stops the animation based on vis* + * RingRenderObjClass::Update_On_Visibility -- Either starts or stops the animation based on vis* * * * INPUT: * * * @@ -1112,7 +1112,7 @@ void RingRenderObjClass::Scale(float scalex, float scaley, float scalez) * HISTORY: * * 4/04/00 pds : Created. * *=============================================================================================*/ -void RingRenderObjClass::Update_On_Visibilty(void) +void RingRenderObjClass::Update_On_Visibility(void) { // Simply start or stop the animation based on // the visibility state of the primitive. diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h index 578effcfb3f..fafdffe9e0f 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h @@ -140,10 +140,10 @@ class RingRenderObjClass : public RenderObjClass virtual void Scale(float scale); virtual void Scale(float scalex, float scaley, float scalez); - virtual void Set_Hidden(int onoff) { RenderObjClass::Set_Hidden (onoff); Update_On_Visibilty (); } - virtual void Set_Visible(int onoff) { RenderObjClass::Set_Visible (onoff); Update_On_Visibilty (); } - virtual void Set_Animation_Hidden(int onoff) { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibilty (); } - virtual void Set_Force_Visible(int onoff) { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibilty (); } + virtual void Set_Hidden(int onoff) { RenderObjClass::Set_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Visible(int onoff) { RenderObjClass::Set_Visible (onoff); Update_On_Visibility (); } + virtual void Set_Animation_Hidden(int onoff) { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Force_Visible(int onoff) { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibility (); } const AABoxClass & Get_Box(void); @@ -220,7 +220,7 @@ class RingRenderObjClass : public RenderObjClass protected: virtual void update_cached_box(void); - void Update_On_Visibilty(void); + void Update_On_Visibility(void); // Initialization stuff void Init_Material (void); diff --git a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.cpp index f8285b6085a..36434e71286 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.cpp @@ -195,7 +195,7 @@ SoundRenderObjClass::Set_Hidden (int onoff) // if (IsInitialized == false || Is_Not_Hidden_At_All () != before) { IsInitialized = true; - Update_On_Visibilty (); + Update_On_Visibility (); } return ; @@ -218,7 +218,7 @@ SoundRenderObjClass::Set_Visible (int onoff) // if (IsInitialized == false || Is_Not_Hidden_At_All () != before) { IsInitialized = true; - Update_On_Visibilty (); + Update_On_Visibility (); } return ; @@ -241,7 +241,7 @@ SoundRenderObjClass::Set_Animation_Hidden (int onoff) // if (IsInitialized == false || Is_Not_Hidden_At_All () != before) { IsInitialized = true; - Update_On_Visibilty (); + Update_On_Visibility (); } return ; @@ -264,7 +264,7 @@ SoundRenderObjClass::Set_Force_Visible (int onoff) // if (IsInitialized == false || Is_Not_Hidden_At_All () != before) { IsInitialized = true; - Update_On_Visibilty (); + Update_On_Visibility (); } return ; @@ -273,11 +273,11 @@ SoundRenderObjClass::Set_Force_Visible (int onoff) ////////////////////////////////////////////////////////////////////////////////// // -// Update_On_Visibilty +// Update_On_Visibility // ////////////////////////////////////////////////////////////////////////////////// void -SoundRenderObjClass::Update_On_Visibilty (void) +SoundRenderObjClass::Update_On_Visibility (void) { if (Sound == nullptr) { return ; @@ -363,7 +363,7 @@ SoundRenderObjClass::Notify_Added (SceneClass *scene) RenderObjClass::Notify_Added (scene); scene->Register (this, SceneClass::ON_FRAME_UPDATE); - Update_On_Visibilty (); + Update_On_Visibility (); return ; } @@ -379,7 +379,7 @@ SoundRenderObjClass::Notify_Removed (SceneClass *scene) scene->Unregister (this, SceneClass::ON_FRAME_UPDATE); RenderObjClass::Notify_Removed (scene); - Update_On_Visibilty (); + Update_On_Visibility (); return ; } @@ -396,7 +396,7 @@ SoundRenderObjClass::Set_Transform (const Matrix3D &tm) if (IsInitialized == false) { IsInitialized = true; - Update_On_Visibilty (); + Update_On_Visibility (); } return ; @@ -415,7 +415,7 @@ SoundRenderObjClass::Set_Position (const Vector3 &pos) if (IsInitialized == false) { IsInitialized = true; - Update_On_Visibilty (); + Update_On_Visibility (); } return ; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h index c22687dba9d..3624a6172c5 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h @@ -136,7 +136,7 @@ class SoundRenderObjClass : public RenderObjClass /////////////////////////////////////////////////////////// // Protected methods /////////////////////////////////////////////////////////// - virtual void Update_On_Visibilty (void); + virtual void Update_On_Visibility (void); private: diff --git a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp index 94aaeb7a9e2..72e8e9eed1e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp @@ -1058,7 +1058,7 @@ AlphaVectorStruct SphereRenderObjClass::Get_Default_Vector(void) const /*********************************************************************************************** - * SphereRenderObjClass::Update_On_Visibilty -- Either starts or stops the animation based on visibility* + * SphereRenderObjClass::Update_On_Visibility -- Either starts or stops the animation based on visibility* * * * INPUT: * * * @@ -1069,7 +1069,7 @@ AlphaVectorStruct SphereRenderObjClass::Get_Default_Vector(void) const * HISTORY: * * 4/04/00 pds : Created. * *=============================================================================================*/ -void SphereRenderObjClass::Update_On_Visibilty(void) +void SphereRenderObjClass::Update_On_Visibility(void) { // Simply start or stop the animation based on // the visibility state of the primitive. diff --git a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h index 57b8d1b9059..b681b91ed12 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h @@ -266,10 +266,10 @@ class SphereRenderObjClass : public RenderObjClass virtual void Scale(float scale); virtual void Scale(float scalex, float scaley, float scalez); - virtual void Set_Hidden(int onoff) { RenderObjClass::Set_Hidden (onoff); Update_On_Visibilty (); } - virtual void Set_Visible(int onoff) { RenderObjClass::Set_Visible (onoff); Update_On_Visibilty (); } - virtual void Set_Animation_Hidden(int onoff) { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibilty (); } - virtual void Set_Force_Visible(int onoff) { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibilty (); } + virtual void Set_Hidden(int onoff) { RenderObjClass::Set_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Visible(int onoff) { RenderObjClass::Set_Visible (onoff); Update_On_Visibility (); } + virtual void Set_Animation_Hidden(int onoff) { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Force_Visible(int onoff) { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibility (); } const AABoxClass & Get_Box(void); @@ -341,7 +341,7 @@ class SphereRenderObjClass : public RenderObjClass virtual void update_cached_box(void); virtual void Update_Cached_Bounding_Volumes(void) const; - void Update_On_Visibilty(void); + void Update_On_Visibility(void); // Initialization stuff void Init_Material (void); diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.cpp b/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.cpp index c3ed92b9e2f..00a0241bcda 100644 --- a/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.cpp +++ b/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.cpp @@ -32,12 +32,12 @@ * * *---------------------------------------------------------------------------------------------* * WWProfile_Get_Ticks -- Retrieves the cpu performance counter * - * WWProfileHierachyNodeClass::WWProfileHierachyNodeClass -- Constructor * - * WWProfileHierachyNodeClass::~WWProfileHierachyNodeClass -- Destructor * - * WWProfileHierachyNodeClass::Get_Sub_Node -- Searches for a child node by name (pointer) * - * WWProfileHierachyNodeClass::Reset -- Reset all profiling data in the tree * - * WWProfileHierachyNodeClass::Call -- Start timing * - * WWProfileHierachyNodeClass::Return -- Stop timing, record results * + * WWProfileHierarchyNodeClass::WWProfileHierarchyNodeClass -- Constructor * + * WWProfileHierarchyNodeClass::~WWProfileHierarchyNodeClass -- Destructor * + * WWProfileHierarchyNodeClass::Get_Sub_Node -- Searches for a child node by name (pointer) * + * WWProfileHierarchyNodeClass::Reset -- Reset all profiling data in the tree * + * WWProfileHierarchyNodeClass::Call -- Start timing * + * WWProfileHierarchyNodeClass::Return -- Stop timing, record results * * WWProfileManager::Start_Profile -- Begin a named profile * * WWProfileManager::Stop_Profile -- Stop timing and record the results. * * WWProfileManager::Reset -- Reset the contents of the profiling system * @@ -62,7 +62,7 @@ #include "hashtemplate.h" #include -static SimpleDynVecClass ProfileCollectVector; +static SimpleDynVecClass ProfileCollectVector; static double TotalFrameTimes; static bool ProfileCollecting; @@ -106,7 +106,7 @@ inline void WWProfile_Get_Ticks(_int64 * ticks) /*********************************************************************************************** - * WWProfileHierachyNodeClass::WWProfileHierachyNodeClass -- Constructor * + * WWProfileHierarchyNodeClass::WWProfileHierarchyNodeClass -- Constructor * * * * * * INPUT: * @@ -122,7 +122,7 @@ inline void WWProfile_Get_Ticks(_int64 * ticks) * HISTORY: * * 9/24/2000 gth : Created. * *=============================================================================================*/ -WWProfileHierachyNodeClass::WWProfileHierachyNodeClass( const char * name, WWProfileHierachyNodeClass * parent ) : +WWProfileHierarchyNodeClass::WWProfileHierarchyNodeClass( const char * name, WWProfileHierarchyNodeClass * parent ) : Name( name ), TotalCalls( 0 ), TotalTime( 0 ), @@ -140,7 +140,7 @@ WWProfileHierachyNodeClass::WWProfileHierachyNodeClass( const char * name, WWPro } } -WWProfileHierachyNodeClass::WWProfileHierachyNodeClass( unsigned id, WWProfileHierachyNodeClass * parent ) : +WWProfileHierarchyNodeClass::WWProfileHierarchyNodeClass( unsigned id, WWProfileHierarchyNodeClass * parent ) : Name( nullptr ), TotalCalls( 0 ), TotalTime( 0 ), @@ -156,7 +156,7 @@ WWProfileHierachyNodeClass::WWProfileHierachyNodeClass( unsigned id, WWProfileHi /*********************************************************************************************** - * WWProfileHierachyNodeClass::~WWProfileHierachyNodeClass -- Destructor * + * WWProfileHierarchyNodeClass::~WWProfileHierarchyNodeClass -- Destructor * * * * INPUT: * * * @@ -167,16 +167,16 @@ WWProfileHierachyNodeClass::WWProfileHierachyNodeClass( unsigned id, WWProfileHi * HISTORY: * * 9/24/2000 gth : Created. * *=============================================================================================*/ -WWProfileHierachyNodeClass::~WWProfileHierachyNodeClass( void ) +WWProfileHierarchyNodeClass::~WWProfileHierarchyNodeClass( void ) { delete Child; delete Sibling; } -WWProfileHierachyNodeClass* WWProfileHierachyNodeClass::Clone_Hierarchy(WWProfileHierachyNodeClass* parent) +WWProfileHierarchyNodeClass* WWProfileHierarchyNodeClass::Clone_Hierarchy(WWProfileHierarchyNodeClass* parent) { - WWProfileHierachyNodeClass* node=new WWProfileHierachyNodeClass(Name,parent); + WWProfileHierarchyNodeClass* node=new WWProfileHierarchyNodeClass(Name,parent); node->TotalCalls=TotalCalls; node->TotalTime=TotalTime; node->StartTime=StartTime; @@ -192,7 +192,7 @@ WWProfileHierachyNodeClass* WWProfileHierachyNodeClass::Clone_Hierarchy(WWProfil return node; } -void WWProfileHierachyNodeClass::Write_To_File(FileClass* file,int recursion) +void WWProfileHierarchyNodeClass::Write_To_File(FileClass* file,int recursion) { if (TotalTime!=0.0f) { int i; @@ -211,7 +211,7 @@ void WWProfileHierachyNodeClass::Write_To_File(FileClass* file,int recursion) } } -void WWProfileHierachyNodeClass::Add_To_String_Compact(StringClass& string,int recursion) +void WWProfileHierarchyNodeClass::Add_To_String_Compact(StringClass& string,int recursion) { if (TotalTime!=0.0f) { StringClass work; @@ -233,7 +233,7 @@ void WWProfileHierachyNodeClass::Add_To_String_Compact(StringClass& string,int r } /*********************************************************************************************** - * WWProfileHierachyNodeClass::Get_Sub_Node -- Searches for a child node by name (pointer) * + * WWProfileHierarchyNodeClass::Get_Sub_Node -- Searches for a child node by name (pointer) * * * * INPUT: * * name - static string pointer to the name of the node we are searching for * @@ -247,10 +247,10 @@ void WWProfileHierachyNodeClass::Add_To_String_Compact(StringClass& string,int r * HISTORY: * * 9/24/2000 gth : Created. * *=============================================================================================*/ -WWProfileHierachyNodeClass * WWProfileHierachyNodeClass::Get_Sub_Node( const char * name ) +WWProfileHierarchyNodeClass * WWProfileHierarchyNodeClass::Get_Sub_Node( const char * name ) { // Try to find this sub node - WWProfileHierachyNodeClass * child = Child; + WWProfileHierarchyNodeClass * child = Child; while ( child ) { if ( child->Name == name ) { return child; @@ -259,7 +259,7 @@ WWProfileHierachyNodeClass * WWProfileHierachyNodeClass::Get_Sub_Node( const cha } // We didn't find it, so add it - WWProfileHierachyNodeClass * node = W3DNEW WWProfileHierachyNodeClass( name, this ); + WWProfileHierarchyNodeClass * node = W3DNEW WWProfileHierarchyNodeClass( name, this ); node->Sibling = Child; Child = node; return node; @@ -267,7 +267,7 @@ WWProfileHierachyNodeClass * WWProfileHierachyNodeClass::Get_Sub_Node( const cha /*********************************************************************************************** - * WWProfileHierachyNodeClass::Reset -- Reset all profiling data in the tree * + * WWProfileHierarchyNodeClass::Reset -- Reset all profiling data in the tree * * * * INPUT: * * * @@ -278,7 +278,7 @@ WWProfileHierachyNodeClass * WWProfileHierachyNodeClass::Get_Sub_Node( const cha * HISTORY: * * 9/24/2000 gth : Created. * *=============================================================================================*/ -void WWProfileHierachyNodeClass::Reset( void ) +void WWProfileHierarchyNodeClass::Reset( void ) { TotalCalls = 0; TotalTime = 0.0f; @@ -293,7 +293,7 @@ void WWProfileHierachyNodeClass::Reset( void ) /*********************************************************************************************** - * WWProfileHierachyNodeClass::Call -- Start timing * + * WWProfileHierarchyNodeClass::Call -- Start timing * * * * INPUT: * * * @@ -304,7 +304,7 @@ void WWProfileHierachyNodeClass::Reset( void ) * HISTORY: * * 9/24/2000 gth : Created. * *=============================================================================================*/ -void WWProfileHierachyNodeClass::Call( void ) +void WWProfileHierarchyNodeClass::Call( void ) { TotalCalls++; if (RecursionCounter++ == 0) { @@ -314,7 +314,7 @@ void WWProfileHierachyNodeClass::Call( void ) /*********************************************************************************************** - * WWProfileHierachyNodeClass::Return -- Stop timing, record results * + * WWProfileHierarchyNodeClass::Return -- Stop timing, record results * * * * INPUT: * * * @@ -325,7 +325,7 @@ void WWProfileHierachyNodeClass::Call( void ) * HISTORY: * * 9/24/2000 gth : Created. * *=============================================================================================*/ -bool WWProfileHierachyNodeClass::Return( void ) +bool WWProfileHierarchyNodeClass::Return( void ) { if (--RecursionCounter == 0) { if ( TotalCalls != 0 ) { @@ -346,9 +346,9 @@ bool WWProfileHierachyNodeClass::Return( void ) ** ***************************************************************************************************/ bool WWProfileManager::IsProfileEnabled=false; -WWProfileHierachyNodeClass WWProfileManager::Root( "Root", nullptr ); -WWProfileHierachyNodeClass * WWProfileManager::CurrentNode = &WWProfileManager::Root; -WWProfileHierachyNodeClass * WWProfileManager::CurrentRootNode = &WWProfileManager::Root; +WWProfileHierarchyNodeClass WWProfileManager::Root( "Root", nullptr ); +WWProfileHierarchyNodeClass * WWProfileManager::CurrentNode = &WWProfileManager::Root; +WWProfileHierarchyNodeClass * WWProfileManager::CurrentRootNode = &WWProfileManager::Root; int WWProfileManager::FrameCounter = 0; __int64 WWProfileManager::ResetTime = 0; @@ -482,7 +482,7 @@ void WWProfileManager::Increment_Frame_Counter( void ) if (ProfileCollecting) { float time=Get_Time_Since_Reset(); TotalFrameTimes+=time; - WWProfileHierachyNodeClass* new_root=Root.Clone_Hierarchy(nullptr); + WWProfileHierarchyNodeClass* new_root=Root.Clone_Hierarchy(nullptr); new_root->Set_Total_Time(time); new_root->Set_Total_Calls(1); ProfileCollectVector.Add(new_root); @@ -717,14 +717,14 @@ static unsigned Read_ID(char* memory,unsigned pos,unsigned maxpos,StringClass& s return Read_Line(memory,pos,maxpos); } -static unsigned Read_Frame(char* memory,unsigned pos,unsigned maxpos,WWProfileHierachyInfoClass*& root,HashTemplateClass& id_hash) +static unsigned Read_Frame(char* memory,unsigned pos,unsigned maxpos,WWProfileHierarchyInfoClass*& root,HashTemplateClass& id_hash) { char statusstring[256]; unsigned framenumber=0; float frametime; root=nullptr; - WWProfileHierachyInfoClass* parent=nullptr; - WWProfileHierachyInfoClass* latest=nullptr; + WWProfileHierarchyInfoClass* parent=nullptr; + WWProfileHierarchyInfoClass* latest=nullptr; pos+=7; // "FRAME: " @@ -757,7 +757,7 @@ static unsigned Read_Frame(char* memory,unsigned pos,unsigned maxpos,WWProfileHi StringClass name="Unknown"; id_hash.Get(id,name); - WWProfileHierachyInfoClass* new_node=new WWProfileHierachyInfoClass(name,parent); + WWProfileHierarchyInfoClass* new_node=new WWProfileHierarchyInfoClass(name,parent); if (parent) { new_node->Set_Sibling(parent->Get_Child()); parent->Set_Child(new_node); @@ -785,7 +785,7 @@ static unsigned Read_Frame(char* memory,unsigned pos,unsigned maxpos,WWProfileHi return Read_Line(memory,pos,maxpos); } -void WWProfileManager::Load_Profile_Log(const char* filename, WWProfileHierachyInfoClass**& array, unsigned& count) +void WWProfileManager::Load_Profile_Log(const char* filename, WWProfileHierarchyInfoClass**& array, unsigned& count) { array=nullptr; count=0; @@ -795,7 +795,7 @@ void WWProfileManager::Load_Profile_Log(const char* filename, WWProfileHierachyI if (file != nullptr && file->Is_Available()) { HashTemplateClass string_hash; HashTemplateClass id_hash; - SimpleDynVecClass vec; + SimpleDynVecClass vec; // // Open or create the file @@ -819,7 +819,7 @@ void WWProfileManager::Load_Profile_Log(const char* filename, WWProfileHierachyI id_hash.Insert(id,string); } else if (tmp[0]=='F' && tmp[1]=='R' && tmp[2]=='A' && tmp[3]=='M' && tmp[4]=='E' && tmp[5]==':') { - WWProfileHierachyInfoClass* node=nullptr; + WWProfileHierarchyInfoClass* node=nullptr; pos=Read_Frame(memory,pos,size,node,id_hash); if (node) { vec.Add(node); @@ -833,7 +833,7 @@ void WWProfileManager::Load_Profile_Log(const char* filename, WWProfileHierachyI if (vec.Count()) { count=vec.Count(); - array=new WWProfileHierachyInfoClass*[count]; + array=new WWProfileHierarchyInfoClass*[count]; for (i=0;iGet_Child(); @@ -1080,7 +1080,7 @@ void WWMemoryAndTimeLog::Log_Intermediate(const char* text) } /*********************************************************************************************** - * WWProfileHierachyInfoClass::WWProfileHierachyInfoClass -- Constructor * + * WWProfileHierarchyInfoClass::WWProfileHierarchyInfoClass -- Constructor * * * * * * INPUT: * @@ -1093,7 +1093,7 @@ void WWMemoryAndTimeLog::Log_Intermediate(const char* text) * * * HISTORY: * *=============================================================================================*/ -WWProfileHierachyInfoClass::WWProfileHierachyInfoClass( const char * name, WWProfileHierachyInfoClass * parent ) : +WWProfileHierarchyInfoClass::WWProfileHierarchyInfoClass( const char * name, WWProfileHierarchyInfoClass * parent ) : Name( name ), TotalCalls( 0 ), TotalTime( 0 ), @@ -1104,7 +1104,7 @@ WWProfileHierachyInfoClass::WWProfileHierachyInfoClass( const char * name, WWPro } /*********************************************************************************************** - * WWProfileHierachyNodeClass::~WWProfileHierachyNodeClass -- Destructor * + * WWProfileHierarchyNodeClass::~WWProfileHierarchyNodeClass -- Destructor * * * * INPUT: * * * @@ -1115,7 +1115,7 @@ WWProfileHierachyInfoClass::WWProfileHierachyInfoClass( const char * name, WWPro * HISTORY: * * 9/24/2000 gth : Created. * *=============================================================================================*/ -WWProfileHierachyInfoClass::~WWProfileHierachyInfoClass( void ) +WWProfileHierarchyInfoClass::~WWProfileHierarchyInfoClass( void ) { delete Child; delete Sibling; diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.h b/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.h index ba76edea986..67bb3c832c7 100644 --- a/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.h +++ b/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.h @@ -55,22 +55,22 @@ class FileClass; /* ** A node in the WWProfile Hierarchy Tree */ -class WWProfileHierachyNodeClass { +class WWProfileHierarchyNodeClass { public: - WWProfileHierachyNodeClass( const char * name, WWProfileHierachyNodeClass * parent ); - WWProfileHierachyNodeClass( unsigned id, WWProfileHierachyNodeClass * parent ); - ~WWProfileHierachyNodeClass( void ); + WWProfileHierarchyNodeClass( const char * name, WWProfileHierarchyNodeClass * parent ); + WWProfileHierarchyNodeClass( unsigned id, WWProfileHierarchyNodeClass * parent ); + ~WWProfileHierarchyNodeClass( void ); - WWProfileHierachyNodeClass * Get_Sub_Node( const char * name ); + WWProfileHierarchyNodeClass * Get_Sub_Node( const char * name ); - WWProfileHierachyNodeClass * Get_Parent( void ) { return Parent; } - WWProfileHierachyNodeClass * Get_Sibling( void ) { return Sibling; } - WWProfileHierachyNodeClass * Get_Child( void ) { return Child; } + WWProfileHierarchyNodeClass * Get_Parent( void ) { return Parent; } + WWProfileHierarchyNodeClass * Get_Sibling( void ) { return Sibling; } + WWProfileHierarchyNodeClass * Get_Child( void ) { return Child; } - void Set_Parent( WWProfileHierachyNodeClass *node ) { Parent=node; } - void Set_Sibling( WWProfileHierachyNodeClass *node ) { Sibling=node; } - void Set_Child( WWProfileHierachyNodeClass *node ) { Child=node; } + void Set_Parent( WWProfileHierarchyNodeClass *node ) { Parent=node; } + void Set_Sibling( WWProfileHierarchyNodeClass *node ) { Sibling=node; } + void Set_Child( WWProfileHierarchyNodeClass *node ) { Child=node; } void Reset( void ); void Call( void ); @@ -82,7 +82,7 @@ class WWProfileHierachyNodeClass { void Set_Total_Calls(int calls) { TotalCalls=calls; } void Set_Total_Time(float time) { TotalTime=time; } - WWProfileHierachyNodeClass* Clone_Hierarchy(WWProfileHierachyNodeClass* parent); + WWProfileHierarchyNodeClass* Clone_Hierarchy(WWProfileHierarchyNodeClass* parent); void Write_To_File(FileClass* file,int recursion); void Add_To_String_Compact(StringClass& string,int recursion); @@ -96,23 +96,23 @@ class WWProfileHierachyNodeClass { int RecursionCounter; unsigned ProfileStringID; - WWProfileHierachyNodeClass * Parent; - WWProfileHierachyNodeClass * Child; - WWProfileHierachyNodeClass * Sibling; + WWProfileHierarchyNodeClass * Parent; + WWProfileHierarchyNodeClass * Child; + WWProfileHierarchyNodeClass * Sibling; }; -class WWProfileHierachyInfoClass { +class WWProfileHierarchyInfoClass { public: - WWProfileHierachyInfoClass( const char * name, WWProfileHierachyInfoClass * parent ); - ~WWProfileHierachyInfoClass( void ); + WWProfileHierarchyInfoClass( const char * name, WWProfileHierarchyInfoClass * parent ); + ~WWProfileHierarchyInfoClass( void ); - WWProfileHierachyInfoClass * Get_Parent( void ) { return Parent; } - WWProfileHierachyInfoClass * Get_Sibling( void ) { return Sibling; } - WWProfileHierachyInfoClass * Get_Child( void ) { return Child; } + WWProfileHierarchyInfoClass * Get_Parent( void ) { return Parent; } + WWProfileHierarchyInfoClass * Get_Sibling( void ) { return Sibling; } + WWProfileHierarchyInfoClass * Get_Child( void ) { return Child; } - void Set_Parent( WWProfileHierachyInfoClass *node ) { Parent=node; } - void Set_Sibling( WWProfileHierachyInfoClass *node ) { Sibling=node; } - void Set_Child( WWProfileHierachyInfoClass *node ) { Child=node; } + void Set_Parent( WWProfileHierarchyInfoClass *node ) { Parent=node; } + void Set_Sibling( WWProfileHierarchyInfoClass *node ) { Sibling=node; } + void Set_Child( WWProfileHierarchyInfoClass *node ) { Child=node; } const char * Get_Name( void ) { return Name; } void Set_Name( const char* name ) { Name=name; } @@ -127,9 +127,9 @@ class WWProfileHierachyInfoClass { int TotalCalls; float TotalTime; - WWProfileHierachyInfoClass * Parent; - WWProfileHierachyInfoClass * Child; - WWProfileHierachyInfoClass * Sibling; + WWProfileHierarchyInfoClass * Parent; + WWProfileHierarchyInfoClass * Child; + WWProfileHierarchyInfoClass * Sibling; }; /* @@ -158,10 +158,10 @@ class WWProfileIterator float Get_Current_Parent_Total_Time( void ) { return CurrentParent->Get_Total_Time(); } protected: - WWProfileHierachyNodeClass * CurrentParent; - WWProfileHierachyNodeClass * CurrentChild; + WWProfileHierarchyNodeClass * CurrentParent; + WWProfileHierarchyNodeClass * CurrentChild; - WWProfileIterator( WWProfileHierachyNodeClass * start ); + WWProfileIterator( WWProfileHierarchyNodeClass * start ); friend class WWProfileManager; }; @@ -182,7 +182,7 @@ class WWProfileInOrderIterator float Get_Current_Total_Time( void ) { return CurrentNode->Get_Total_Time(); } protected: - WWProfileHierachyNodeClass * CurrentNode; + WWProfileHierarchyNodeClass * CurrentNode; WWProfileInOrderIterator( void ); friend class WWProfileManager; @@ -213,17 +213,17 @@ class WWProfileManager { static WWProfileInOrderIterator * Get_In_Order_Iterator( void ); static void Release_In_Order_Iterator( WWProfileInOrderIterator * iterator ); - static WWProfileHierachyNodeClass * Get_Root( void ) { return &Root; } + static WWProfileHierarchyNodeClass * Get_Root( void ) { return &Root; } static void Begin_Collecting(); static void End_Collecting(const char* filename); - static void Load_Profile_Log(const char* filename, WWProfileHierachyInfoClass**& array, unsigned& count); + static void Load_Profile_Log(const char* filename, WWProfileHierarchyInfoClass**& array, unsigned& count); private: - static WWProfileHierachyNodeClass Root; - static WWProfileHierachyNodeClass * CurrentNode; - static WWProfileHierachyNodeClass * CurrentRootNode; + static WWProfileHierarchyNodeClass Root; + static WWProfileHierarchyNodeClass * CurrentNode; + static WWProfileHierarchyNodeClass * CurrentRootNode; static int FrameCounter; static __int64 ResetTime; static bool IsProfileEnabled; diff --git a/Core/Tools/W3DView/ScreenCursor.cpp b/Core/Tools/W3DView/ScreenCursor.cpp index cc4d18f95ef..ac8323e67bd 100644 --- a/Core/Tools/W3DView/ScreenCursor.cpp +++ b/Core/Tools/W3DView/ScreenCursor.cpp @@ -227,7 +227,7 @@ ScreenCursorClass::On_Frame_Update (void) z_pos = 0; // - // Build the verticies from the position and extents + // Build the vertices from the position and extents // m_Verticies[0].X = x_pos; m_Verticies[0].Y = y_pos; diff --git a/Core/Tools/WW3D/max2w3d/MeshDeform.cpp b/Core/Tools/WW3D/max2w3d/MeshDeform.cpp index f9f7db87d38..4cfb0d1f56a 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeform.cpp +++ b/Core/Tools/WW3D/max2w3d/MeshDeform.cpp @@ -499,7 +499,7 @@ MeshDeformClass::GetSubObjectCenters Matrix3 transform = node->GetObjectTM (time_val); Box3 box; - // Loop through all the selected verticies and create a bounding + // Loop through all the selected vertices and create a bounding // box which we can use to determine the selection center. for (int index = 0; index < mesh->getNumVerts (); index++ ) { if (sel_array[index]) { diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformSave.cpp b/Core/Tools/WW3D/max2w3d/MeshDeformSave.cpp index 52dc735ff6a..01b79720faa 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformSave.cpp +++ b/Core/Tools/WW3D/max2w3d/MeshDeformSave.cpp @@ -277,7 +277,7 @@ MeshDeformSaveClass::Export_Keyframes if (retval) { // - // Loop through all the verticies in this keyframe + // Loop through all the vertices in this keyframe // int data_count = set_save.Get_Deform_Data_Count (keyframe_index); for (int index = 0; (index < data_count) && retval; index ++) { diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformSet.cpp b/Core/Tools/WW3D/max2w3d/MeshDeformSet.cpp index 165555a5dcd..66f7017bfc7 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformSet.cpp +++ b/Core/Tools/WW3D/max2w3d/MeshDeformSet.cpp @@ -94,14 +94,14 @@ MeshDeformSetClass::Set_Vertex_Position const Point3 & value ) { - DEFORM_LIST &verticies = m_KeyFrames[m_CurrentKeyFrame]->verticies; + DEFORM_LIST &vertices = m_KeyFrames[m_CurrentKeyFrame]->vertices; BitArray &affected_verts = m_KeyFrames[m_CurrentKeyFrame]->affected_verts; // // Set the vert's position // m_pMesh->verts[index] = value; - verticies.Add (VERT_INFO (index, value)); + vertices.Add (VERT_INFO (index, value)); // // Make sure we remember that this vert is affected @@ -181,7 +181,7 @@ MeshDeformSetClass::Update_Set_Members (void) void MeshDeformSetClass::Collapse_Keyframe_Data (int keyframe) { - DEFORM_LIST &verticies = m_KeyFrames[keyframe]->verticies; + DEFORM_LIST &vertices = m_KeyFrames[keyframe]->vertices; DEFORM_LIST &colors = m_KeyFrames[keyframe]->colors; BitArray &affected_verts = m_KeyFrames[keyframe]->affected_verts; BitArray &affected_colors = m_KeyFrames[keyframe]->affected_colors; @@ -189,15 +189,15 @@ MeshDeformSetClass::Collapse_Keyframe_Data (int keyframe) // // Collapse the vertex position data // - for (int index = 0; index < verticies.Count (); index ++) { - VERT_INFO &info = verticies[index]; + for (int index = 0; index < vertices.Count (); index ++) { + VERT_INFO &info = vertices[index]; // // If this vertex is unchanged, then remove it // from the list. // if (m_pVertexArray[index] == info.value) { - verticies.Delete (index); + vertices.Delete (index); index --; } else { affected_verts.Set (info.index, 1); @@ -217,7 +217,7 @@ MeshDeformSetClass::Collapse_Keyframe_Data (int keyframe) // from the list. // if (m_pVertexColors[index] == info.value) { - verticies.Delete (index); + vertices.Delete (index); index --; } else { affected_colors.Set (info.index, 1); @@ -237,14 +237,14 @@ MeshDeformSetClass::Collapse_Keyframe_Data (int keyframe) void MeshDeformSetClass::Reset_Key_Frame_Verts (int keyframe) { - DEFORM_LIST &verticies = m_KeyFrames[keyframe]->verticies; + DEFORM_LIST &vertices = m_KeyFrames[keyframe]->vertices; BitArray &affected_verts = m_KeyFrames[keyframe]->affected_verts; // // Reset all data for this keyframe // affected_verts.ClearAll (); - verticies.Delete_All (); + vertices.Delete_All (); // // Regenerate the list of set members @@ -287,7 +287,7 @@ MeshDeformSetClass::Reset_Key_Frame_Colors (int keyframe) void MeshDeformSetClass::Update_Current_Data (void) { - DEFORM_LIST &verticies = m_KeyFrames[m_CurrentKeyFrame]->verticies; + DEFORM_LIST &vertices = m_KeyFrames[m_CurrentKeyFrame]->vertices; DEFORM_LIST &colors = m_KeyFrames[m_CurrentKeyFrame]->colors; BitArray &affected_verts = m_KeyFrames[m_CurrentKeyFrame]->affected_verts; BitArray &affected_colors = m_KeyFrames[m_CurrentKeyFrame]->affected_colors; @@ -297,7 +297,7 @@ MeshDeformSetClass::Update_Current_Data (void) // affected_verts.ClearAll (); affected_colors.ClearAll (); - verticies.Delete_All (); + vertices.Delete_All (); colors.Delete_All (); // @@ -319,7 +319,7 @@ MeshDeformSetClass::Update_Current_Data (void) // Record this vertex's position in our lists // affected_verts.Set (index, 1); - verticies.Add (VERT_INFO (index, m_pMesh->verts[index])); + vertices.Add (VERT_INFO (index, m_pMesh->verts[index])); } } @@ -350,7 +350,7 @@ MeshDeformSetClass::Update_Current_Data (void) } // - // Rebuild the list of verticies this 'set' affects + // Rebuild the list of vertices this 'set' affects // Update_Set_Members (); @@ -373,17 +373,17 @@ MeshDeformSetClass::Update_Current_Data (void) void MeshDeformSetClass::Update_Key_Frame (int key_frame) { - DEFORM_LIST &verticies = m_KeyFrames[key_frame]->verticies; + DEFORM_LIST &vertices = m_KeyFrames[key_frame]->vertices; DEFORM_LIST &colors = m_KeyFrames[key_frame]->colors; BitArray &affected_verts = m_KeyFrames[key_frame]->affected_verts; BitArray &affected_colors = m_KeyFrames[key_frame]->affected_colors; if ((key_frame == m_CurrentKeyFrame) || - (verticies.Count () > 0) || + (vertices.Count () > 0) || (colors.Count () > 0)) { // Clear all entries from this keyframe - verticies.Delete_All (); + vertices.Delete_All (); colors.Delete_All (); // @@ -391,7 +391,7 @@ MeshDeformSetClass::Update_Key_Frame (int key_frame) // for (int vert = 0; vert < m_pMesh->numVerts; vert ++) { if (affected_verts[vert]) { - verticies.Add (VERT_INFO (vert, m_pMesh->verts[vert])); + vertices.Add (VERT_INFO (vert, m_pMesh->verts[vert])); } } @@ -504,7 +504,7 @@ MeshDeformSetClass::Resize_Vertex_Array (int count, int color_count) { if (count != m_VertexCount) { - // Allocate a new array of verticies + // Allocate a new array of vertices Point3 *vertex_array = new Point3[count]; Point3 *opstart_array = new Point3[count]; @@ -588,7 +588,7 @@ MeshDeformSetClass::Determine_Interpolation_Indicies // Determine where we should start interpolation // for (int index = 0; index <= key_frame; index ++) { - if (position && m_KeyFrames[index]->verticies.Count () > 0) { + if (position && m_KeyFrames[index]->vertices.Count () > 0) { from = index; } else if (!position && m_KeyFrames[index]->colors.Count () > 0) { from = index; @@ -599,7 +599,7 @@ MeshDeformSetClass::Determine_Interpolation_Indicies // Determine where we should end interpolation // for (index = to; index < MAX_DEFORM_KEY_FRAMES; index ++) { - if (position && m_KeyFrames[index]->verticies.Count () > 0) { + if (position && m_KeyFrames[index]->vertices.Count () > 0) { to = index; break; } else if (!position && m_KeyFrames[index]->colors.Count () > 0) { @@ -678,7 +678,7 @@ MeshDeformSetClass::Apply_Position_Changes // Find the vertex value in the 'from' key frame and set the // triangle object's vertex to be this value (we will interplate from it). // - DEFORM_LIST &vert_from = m_KeyFrames[from]->verticies; + DEFORM_LIST &vert_from = m_KeyFrames[from]->vertices; for (int index = 0; index < vert_from.Count (); index ++) { VERT_INFO &info = vert_from[index]; if (info.index == vert) { @@ -700,7 +700,7 @@ MeshDeformSetClass::Apply_Position_Changes // Find the vertex value in the 'to' key frame and interpolate // this value from the triangle object's current vertex value. // - DEFORM_LIST &vert_to = m_KeyFrames[to]->verticies; + DEFORM_LIST &vert_to = m_KeyFrames[to]->vertices; for (int index = 0; index < vert_to.Count (); index ++) { VERT_INFO &info = vert_to[index]; if (info.index == vert) { @@ -909,7 +909,7 @@ MeshDeformSetClass::Update_Mesh (TriObject &tri_obj) } // - // Loop through all the verticies and interpolate their + // Loop through all the vertices and interpolate their // positions and colors based on the current 'deformation state'. // for (UINT vert = 0; vert < (UINT)m_pMesh->numVerts; vert ++) { @@ -940,19 +940,19 @@ MeshDeformSetClass::Update_Mesh (TriObject &tri_obj) for (int key_frame = 0; key_frame < m_KeyFrames.Count (); key_frame ++) { // - // Update the verticies + // Update the vertices // int from = 0; int to = 0; float state = 0; Determine_Interpolation_Indicies (key_frame, true, from, to, state); - DEFORM_LIST &vert_to = m_KeyFrames[to]->verticies; + DEFORM_LIST &vert_to = m_KeyFrames[to]->vertices; if (from <= m_CurrentKeyFrame) { if (from >= 0) { - DEFORM_LIST &vert_from = m_KeyFrames[from]->verticies; + DEFORM_LIST &vert_from = m_KeyFrames[from]->vertices; for (int index = 0; index < vert_from.Count (); index ++) { VERT_INFO &info = vert_from[index]; tri_obj.mesh.verts[info.index] = info.value; @@ -1100,7 +1100,7 @@ MeshDeformSetClass::Update_Members (DEFORM_CHANNELS flags) // // Finally, add this vertex to the list of all - // verticies affected by this set. + // vertices affected by this set. // m_SetMembers.Set (vert, 1); } @@ -1249,7 +1249,7 @@ MeshDeformSetClass::Save for (int key_frame = 0; key_frame < key_frames; key_frame ++) { // - // Loop through all the verticies and see if this keyframe + // Loop through all the vertices and see if this keyframe // modifies any of them // bool verts_affected = false; @@ -1345,7 +1345,7 @@ MeshDeformSetClass::Save (ISave *save_obj) DeformChunkKeyframeInfo keyframe_info = { 0 }; keyframe_info.DeformPercent = state_inc * (index + 1); - keyframe_info.VertexCount = key_frame.verticies.Count (); + keyframe_info.VertexCount = key_frame.vertices.Count (); keyframe_info.ColorCount = key_frame.colors.Count (); // @@ -1356,13 +1356,13 @@ MeshDeformSetClass::Save (ISave *save_obj) //save_obj->EndChunk (); // - // Loop through the verticies and save their position + // Loop through the vertices and save their position // for ( unsigned int pos_index = 0; (pos_index < keyframe_info.VertexCount) && (result == IO_OK); pos_index ++) { - VERT_INFO &deform_data = key_frame.verticies[pos_index]; + VERT_INFO &deform_data = key_frame.vertices[pos_index]; DeformDataChunk data; data.VertexIndex = deform_data.index; @@ -1378,7 +1378,7 @@ MeshDeformSetClass::Save (ISave *save_obj) } // - // Loop through the verticies and save their color + // Loop through the vertices and save their color // for ( unsigned int color_index = 0; (color_index < keyframe_info.ColorCount) && (result == IO_OK); @@ -1485,7 +1485,7 @@ MeshDeformSetClass::Load (ILoad *load_obj) DeformDataChunk data; result = load_obj->Read (&data, sizeof (data), &bytes); if (result == IO_OK) { - key_frame.verticies.Add (VERT_INFO (data.VertexIndex, data.Value, data.ColorIndex)); + key_frame.vertices.Add (VERT_INFO (data.VertexIndex, data.Value, data.ColorIndex)); key_frame.affected_verts.Set (data.VertexIndex, 1); m_SetMembers.Set (data.VertexIndex, 1); } diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformSet.h b/Core/Tools/WW3D/max2w3d/MeshDeformSet.h index 5e5bc62342e..7e5dc5cbbde 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformSet.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformSet.h @@ -114,9 +114,9 @@ class MeshDeformSetClass // Information bool Is_Empty (void) const; - int Get_Vertex_Count (int keyframe) const { return m_KeyFrames[keyframe]->verticies.Count (); } + int Get_Vertex_Count (int keyframe) const { return m_KeyFrames[keyframe]->vertices.Count (); } int Get_Color_Count (int keyframe) const { return m_KeyFrames[keyframe]->colors.Count (); } - const VERT_INFO & Get_Vertex_Data (int keyframe, int index) const { return m_KeyFrames[keyframe]->verticies[index]; } + const VERT_INFO & Get_Vertex_Data (int keyframe, int index) const { return m_KeyFrames[keyframe]->vertices[index]; } const VERT_INFO & Get_Color_Data (int keyframe, int index) const { return m_KeyFrames[keyframe]->colors[index]; } // Persistent storage @@ -150,7 +150,7 @@ class MeshDeformSetClass ////////////////////////////////////////////////////////////////////// typedef struct { - DEFORM_LIST verticies; + DEFORM_LIST vertices; DEFORM_LIST colors; BitArray affected_verts; BitArray affected_colors; @@ -171,7 +171,7 @@ class MeshDeformSetClass float m_State; bool m_bAutoApply; - // Array representing which verticies are part of the set + // Array representing which vertices are part of the set BitArray m_SetMembers; // List of key frames diff --git a/Core/Tools/WW3D/max2w3d/colboxsave.cpp b/Core/Tools/WW3D/max2w3d/colboxsave.cpp index de09cf1b41f..918933e37c1 100644 --- a/Core/Tools/WW3D/max2w3d/colboxsave.cpp +++ b/Core/Tools/WW3D/max2w3d/colboxsave.cpp @@ -83,19 +83,19 @@ CollisionBoxSaveClass::CollisionBoxSaveClass BoxData.Attributes |= W3D_BOX_ATTRIBUTE_ORIENTED; } if (Is_Physical_Collision(inode)) { - BoxData.Attributes |= W3D_BOX_ATTRIBTUE_COLLISION_TYPE_PHYSICAL; + BoxData.Attributes |= W3D_BOX_ATTRIBUTE_COLLISION_TYPE_PHYSICAL; } if (Is_Projectile_Collision(inode)) { - BoxData.Attributes |= W3D_BOX_ATTRIBTUE_COLLISION_TYPE_PROJECTILE; + BoxData.Attributes |= W3D_BOX_ATTRIBUTE_COLLISION_TYPE_PROJECTILE; } if (Is_Vis_Collision(inode)) { - BoxData.Attributes |= W3D_BOX_ATTRIBTUE_COLLISION_TYPE_VIS; + BoxData.Attributes |= W3D_BOX_ATTRIBUTE_COLLISION_TYPE_VIS; } if (Is_Camera_Collision(inode)) { - BoxData.Attributes |= W3D_BOX_ATTRIBTUE_COLLISION_TYPE_CAMERA; + BoxData.Attributes |= W3D_BOX_ATTRIBUTE_COLLISION_TYPE_CAMERA; } if (Is_Vehicle_Collision(inode)) { - BoxData.Attributes |= W3D_BOX_ATTRIBTUE_COLLISION_TYPE_VEHICLE; + BoxData.Attributes |= W3D_BOX_ATTRIBUTE_COLLISION_TYPE_VEHICLE; } BoxData.Color.R = GetRValue(wirecolor); diff --git a/Core/Tools/WW3D/max2w3d/geometryexporttask.cpp b/Core/Tools/WW3D/max2w3d/geometryexporttask.cpp index b3042a8ce5e..d3a521c42be 100644 --- a/Core/Tools/WW3D/max2w3d/geometryexporttask.cpp +++ b/Core/Tools/WW3D/max2w3d/geometryexporttask.cpp @@ -1125,7 +1125,7 @@ Point3 MeshGeometryExportTaskClass::Get_Shared_Vertex_Normal(const Point3 & worl if ((face_smgroup & smgroup) || (face_smgroup == smgroup)) { /* - ** Find out if any of the verticies of this face share the + ** Find out if any of the vertices of this face share the ** same space as the vertex we are looking for. */ bool found = false; diff --git a/Core/Tools/WW3D/max2w3d/maxworldinfo.cpp b/Core/Tools/WW3D/max2w3d/maxworldinfo.cpp index 095503f0980..651e660b6cb 100644 --- a/Core/Tools/WW3D/max2w3d/maxworldinfo.cpp +++ b/Core/Tools/WW3D/max2w3d/maxworldinfo.cpp @@ -42,7 +42,7 @@ /* ** Get_Shared_Vertex_Normal ** Loops through all the other meshes in the world and builds a vertex normal for -** the verticies that share the same space and are part of the same smoothing group. +** the vertices that share the same space and are part of the same smoothing group. */ Vector3 MaxWorldInfoClass::Get_Shared_Vertex_Normal (Vector3 pos, int smgroup) { @@ -51,7 +51,7 @@ Vector3 MaxWorldInfoClass::Get_Shared_Vertex_Normal (Vector3 pos, int smgroup) // // Loop through all the meshes in the world and see which ones contain - // verticies that share the same space and are part of the same smoothing group. + // vertices that share the same space and are part of the same smoothing group. // for(unsigned int index = 0; index < MeshList.Count(); index ++) { GeometryExportTaskClass * task = MeshList[index]; diff --git a/Core/Tools/WW3D/max2w3d/w3d_file.h b/Core/Tools/WW3D/max2w3d/w3d_file.h index 5ce8ac79cf2..034da603f34 100644 --- a/Core/Tools/WW3D/max2w3d/w3d_file.h +++ b/Core/Tools/WW3D/max2w3d/w3d_file.h @@ -1985,11 +1985,11 @@ struct W3dHLodSubObjectStruct #define W3D_BOX_ATTRIBUTE_ALIGNED 0x00000002 #define W3D_BOX_ATTRIBUTE_COLLISION_TYPE_MASK 0x00000FF0 // mask for the collision type bits #define W3D_BOX_ATTRIBUTE_COLLISION_TYPE_SHIFT 4 // shifting to get to the collision type bits -#define W3D_BOX_ATTRIBTUE_COLLISION_TYPE_PHYSICAL 0x00000010 // physical collisions -#define W3D_BOX_ATTRIBTUE_COLLISION_TYPE_PROJECTILE 0x00000020 // projectiles (rays) collide with this -#define W3D_BOX_ATTRIBTUE_COLLISION_TYPE_VIS 0x00000040 // vis rays collide with this mesh -#define W3D_BOX_ATTRIBTUE_COLLISION_TYPE_CAMERA 0x00000080 // cameras collide with this mesh -#define W3D_BOX_ATTRIBTUE_COLLISION_TYPE_VEHICLE 0x00000100 // vehicles collide with this mesh +#define W3D_BOX_ATTRIBUTE_COLLISION_TYPE_PHYSICAL 0x00000010 // physical collisions +#define W3D_BOX_ATTRIBUTE_COLLISION_TYPE_PROJECTILE 0x00000020 // projectiles (rays) collide with this +#define W3D_BOX_ATTRIBUTE_COLLISION_TYPE_VIS 0x00000040 // vis rays collide with this mesh +#define W3D_BOX_ATTRIBUTE_COLLISION_TYPE_CAMERA 0x00000080 // cameras collide with this mesh +#define W3D_BOX_ATTRIBUTE_COLLISION_TYPE_VEHICLE 0x00000100 // vehicles collide with this mesh struct W3dBoxStruct { diff --git a/Generals/Code/GameEngine/Include/Common/StackDump.h b/Generals/Code/GameEngine/Include/Common/StackDump.h index 24983d70d15..944c029471c 100644 --- a/Generals/Code/GameEngine/Include/Common/StackDump.h +++ b/Generals/Code/GameEngine/Include/Common/StackDump.h @@ -24,7 +24,7 @@ #pragma once -#ifndef IG_DEGBUG_STACKTRACE +#ifndef IG_DEBUG_STACKTRACE #define IG_DEBUG_STACKTRACE 1 #endif diff --git a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h index c95f8a332bf..df83634f15e 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h +++ b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h @@ -206,7 +206,7 @@ enum GUICommandType CPP_11(: Int) GUI_COMMAND_NUM_COMMANDS }; -#ifdef DEFINE_GUI_COMMMAND_NAMES +#ifdef DEFINE_GUI_COMMAND_NAMES static const char *const TheGuiCommandNames[] = { "NONE", diff --git a/Generals/Code/GameEngine/Include/GameClient/ControlBarScheme.h b/Generals/Code/GameEngine/Include/GameClient/ControlBarScheme.h index 7c4852c2626..b564a27563a 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ControlBarScheme.h +++ b/Generals/Code/GameEngine/Include/GameClient/ControlBarScheme.h @@ -270,7 +270,7 @@ class ControlBarSchemeManager private: ControlBarScheme *m_currentScheme; ///< the current scheme that everythign uses - Coord2D m_multiplyer; + Coord2D m_multiplier; typedef std::list< ControlBarScheme* > ControlBarSchemeList; ///< list of control bar schemes ControlBarSchemeList m_schemeList; diff --git a/Generals/Code/GameEngine/Include/GameClient/GameWindow.h b/Generals/Code/GameEngine/Include/GameClient/GameWindow.h index f9d27b3593c..a22648a8ed4 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameWindow.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameWindow.h @@ -157,7 +157,7 @@ enum WIN_STATUS_NONE = 0x00000000, // No status bits set at all WIN_STATUS_ACTIVE = 0x00000001, // At the top of the window list WIN_STATUS_TOGGLE = 0x00000002, // If set, click to toggle - WIN_STATUS_DRAGABLE = 0x00000004, // Window can be dragged + WIN_STATUS_DRAGGABLE = 0x00000004, // Window can be dragged WIN_STATUS_ENABLED = 0x00000008, // Window can receive input WIN_STATUS_HIDDEN = 0x00000010, // Window is hidden, no input WIN_STATUS_ABOVE = 0x00000020, // Window is always above others diff --git a/Generals/Code/GameEngine/Include/GameClient/GameWindowTransitions.h b/Generals/Code/GameEngine/Include/GameClient/GameWindowTransitions.h index ce043f4a3b7..fdff9dbaf48 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameWindowTransitions.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameWindowTransitions.h @@ -668,7 +668,7 @@ class GameWindowTransitionsHandler: public SubsystemInterface static const FieldParse m_gameWindowTransitionsFieldParseTable[]; ///< the parse table static void parseWindow( INI* ini, void *instance, void *store, const void *userData ); - void setGroup(AsciiString groupName, Bool immidiate = FALSE); // THis will be the next group to fire off. + void setGroup(AsciiString groupName, Bool immediate = FALSE); // THis will be the next group to fire off. void reverse( AsciiString groupName );// reverse the animations for the current group. void remove( AsciiString groupName, Bool skipPending = FALSE );// remove the animation from the current or pending groups. TransitionGroup *getNewGroup( AsciiString name ); diff --git a/Generals/Code/GameEngine/Include/GameClient/IMEManager.h b/Generals/Code/GameEngine/Include/GameClient/IMEManager.h index 7b245c5e845..4b304ed2953 100644 --- a/Generals/Code/GameEngine/Include/GameClient/IMEManager.h +++ b/Generals/Code/GameEngine/Include/GameClient/IMEManager.h @@ -75,7 +75,7 @@ class IMEManagerInterface : public SubsystemInterface virtual ~IMEManagerInterface() {}; virtual void attach( GameWindow *window ) = 0; ///< attach IME to specified window - virtual void detatch( void ) = 0; ///< detatch IME from current window + virtual void detach( void ) = 0; ///< detach IME from current window virtual void enable( void ) = 0; ///< Enable IME virtual void disable( void ) = 0; ///< Disable IME virtual Bool isEnabled( void ) = 0; ///< Is IME enabled diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIPathfind.h b/Generals/Code/GameEngine/Include/GameLogic/AIPathfind.h index a9bd8b2cd77..98df973bce0 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIPathfind.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIPathfind.h @@ -812,7 +812,7 @@ class Pathfinder : PathfindServicesInterface, public Snapshot const Coord3D *fromPos, PathfindCell *goalCell, Bool center, Bool blocked ); ///< Work backwards from goal cell to construct final path Path *buildGroundPath( Bool isCrusher,const Coord3D *fromPos, PathfindCell *goalCell, Bool center, Int pathDiameter ); ///< Work backwards from goal cell to construct final path - Path *buildHierachicalPath( const Coord3D *fromPos, PathfindCell *goalCell); ///< Work backwards from goal cell to construct final path + Path *buildHierarchicalPath( const Coord3D *fromPos, PathfindCell *goalCell); ///< Work backwards from goal cell to construct final path void prependCells( Path *path, const Coord3D *fromPos, PathfindCell *goalCell, Bool center ); ///< Add pathfind cells to a path. diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h index f29c3d7730b..0e3307df26a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h @@ -281,8 +281,8 @@ class RailroadBehavior : public PhysicsBehavior Bool m_waitingInWings; /// I have not entered the real track yet, so leave me alone Bool m_endOfLine; /// I have reached the end of a non looping track Bool m_isLocomotive; ///< Am I a locomotive, - Bool m_isLeadCarraige; ///< Am the carraige in front, - Int m_wantsToBeLeadCarraige; ///< Am the carraige in front, + Bool m_isLeadCarriage; ///< Am the carraige in front, + Int m_wantsToBeLeadCarriage; ///< Am the carraige in front, Bool m_disembark; ///< If I wait at a station, I should also evacuate everybody when I get theres Bool m_inTunnel; ///< Am I in a tunnel, so I wil not snap to ground height, until the next waypoint, // i.e. do I provide the movement and scheduling AI for m_trailerID diff --git a/Generals/Code/GameEngine/Source/GameClient/Credits.cpp b/Generals/Code/GameEngine/Source/GameClient/Credits.cpp index 8b0ebc7556b..21eafbbd786 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Credits.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/Credits.cpp @@ -193,16 +193,16 @@ void CreditsManager::update( void ) Int lastHeight = 0; Int start = m_scrollDown? 0:TheDisplay->getHeight(); Int end =m_scrollDown? TheDisplay->getHeight():0; - Int offsetStartMultiplyer = m_scrollDown? -1:0; // if we're scrolling from the top, we need to subtract the height - Int offsetEndMultiplyer = m_scrollDown? 0:1; - Int directionMultiplyer = m_scrollDown? 1:-1; + Int offsetStartMultiplier = m_scrollDown? -1:0; // if we're scrolling from the top, we need to subtract the height + Int offsetEndMultiplier = m_scrollDown? 0:1; + Int directionMultiplier = m_scrollDown? 1:-1; CreditsLineList::iterator drawIt = m_displayedCreditLineList.begin(); while (drawIt != m_displayedCreditLineList.end()) { CreditsLine *cLine = *drawIt; - y = cLine->m_pos.y = cLine->m_pos.y + (m_scrollRate * directionMultiplyer); + y = cLine->m_pos.y = cLine->m_pos.y + (m_scrollRate * directionMultiplier); lastHeight = cLine->m_height; - yTest = y + ((lastHeight + CREDIT_SPACE_OFFSET) * offsetEndMultiplyer); + yTest = y + ((lastHeight + CREDIT_SPACE_OFFSET) * offsetEndMultiplier); if(((m_scrollDown && (yTest > end)) || (!m_scrollDown && (yTest < end)))) { TheDisplayStringManager->freeDisplayString(cLine->m_displayString); @@ -215,7 +215,7 @@ void CreditsManager::update( void ) drawIt++; } - y= y + ((lastHeight + CREDIT_SPACE_OFFSET) * offsetStartMultiplyer); + y= y + ((lastHeight + CREDIT_SPACE_OFFSET) * offsetStartMultiplier); // is it time to add a new string? if(!((m_scrollDown && (yTest >= start)) || (!m_scrollDown && (yTest <= start)))) @@ -247,7 +247,7 @@ void CreditsManager::update( void ) ds->getSize(&pos.x,&pos.y); cLine->m_height = pos.y; cLine->m_pos.x = TheDisplay->getWidth()/2 - pos.x/2 ; - cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplyer); + cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplier); cLine->m_displayString = ds; } } @@ -268,7 +268,7 @@ void CreditsManager::update( void ) ds->getSize(&pos.x,&pos.y); cLine->m_height = pos.y; cLine->m_pos.x = TheDisplay->getWidth()/2 - pos.x/2 ; - cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplyer); + cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplier); cLine->m_displayString = ds; } } @@ -289,7 +289,7 @@ void CreditsManager::update( void ) ds->getSize(&pos.x,&pos.y); cLine->m_height = pos.y; cLine->m_pos.x = TheDisplay->getWidth()/2 - pos.x/2 ; - cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplyer); + cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplier); cLine->m_displayString = ds; } } @@ -310,7 +310,7 @@ void CreditsManager::update( void ) ds->getSize(&pos.x,&pos.y); cLine->m_height = pos.y; cLine->m_pos.x = TheDisplay->getWidth()/2 - pos.x/2 ; - cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplyer); + cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplier); cLine->m_displayString = ds; } if(TheGlobalLanguageData && !cLine->m_secondText.isEmpty()) @@ -325,7 +325,7 @@ void CreditsManager::update( void ) ds->getSize(&pos.x,&pos.y); cLine->m_height = pos.y; cLine->m_pos.x = TheDisplay->getWidth()/2 - pos.x/2 ; - cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplyer); + cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplier); cLine->m_secondDisplayString = ds; } @@ -334,7 +334,7 @@ void CreditsManager::update( void ) case CREDIT_STYLE_BLANK: { cLine->m_height = m_normalFontHeight; - cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplyer); + cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplier); } break; } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index 1a15cb86512..b03d47f7774 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -30,7 +30,7 @@ // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "PreRTS.h" // This must go first in EVERY cpp file in the GameEngine -#define DEFINE_GUI_COMMMAND_NAMES +#define DEFINE_GUI_COMMAND_NAMES #define DEFINE_COMMAND_OPTION_NAMES #define DEFINE_WEAPONSLOTTYPE_NAMES #define DEFINE_RADIUSCURSOR_NAMES diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp index 634357b8624..e96ec55f7aa 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp @@ -807,7 +807,7 @@ ControlBarSchemeManager::ControlBarSchemeManager( void ) { m_currentScheme = nullptr; m_schemeList.clear(); - m_multiplyer.x = m_multiplyer.y = 1; + m_multiplier.x = m_multiplier.y = 1; } // @@ -1026,9 +1026,9 @@ void ControlBarSchemeManager::setControlBarScheme(AsciiString schemeName) ControlBarScheme *tempScheme = findControlBarScheme( schemeName ); if(tempScheme) { - // setup the multiplyer value - m_multiplyer.x = TheDisplay->getWidth() / tempScheme->m_ScreenCreationRes.x; - m_multiplyer.y = TheDisplay->getHeight() / tempScheme->m_ScreenCreationRes.y; + // setup the multiplier value + m_multiplier.x = TheDisplay->getWidth() / tempScheme->m_ScreenCreationRes.x; + m_multiplier.y = TheDisplay->getHeight() / tempScheme->m_ScreenCreationRes.y; m_currentScheme = tempScheme; } else @@ -1053,13 +1053,13 @@ void ControlBarSchemeManager::update( void ) void ControlBarSchemeManager::drawForeground( ICoord2D offset ) { if(m_currentScheme) - m_currentScheme->drawForeground( m_multiplyer, offset); + m_currentScheme->drawForeground( m_multiplier, offset); } //----------------------------------------------------------------------------- void ControlBarSchemeManager::drawBackground( ICoord2D offset ) { if(m_currentScheme) - m_currentScheme->drawBackground( m_multiplyer, offset ); + m_currentScheme->drawBackground( m_multiplier, offset ); } //----------------------------------------------------------------------------- @@ -1108,9 +1108,9 @@ void ControlBarSchemeManager::setControlBarSchemeByPlayerTemplate( const PlayerT if(tempScheme) { - // setup the multiplyer value - m_multiplyer.x = TheDisplay->getWidth() / (Real)tempScheme->m_ScreenCreationRes.x; - m_multiplyer.y = TheDisplay->getHeight() / (Real)tempScheme->m_ScreenCreationRes.y; + // setup the multiplier value + m_multiplier.x = TheDisplay->getWidth() / (Real)tempScheme->m_ScreenCreationRes.x; + m_multiplier.y = TheDisplay->getHeight() / (Real)tempScheme->m_ScreenCreationRes.y; m_currentScheme = tempScheme; } else @@ -1176,9 +1176,9 @@ void ControlBarSchemeManager::setControlBarSchemeByPlayer(Player *p) if(tempScheme) { - // setup the multiplyer value - m_multiplyer.x = TheDisplay->getWidth() / (Real)tempScheme->m_ScreenCreationRes.x; - m_multiplyer.y = TheDisplay->getHeight() / (Real)tempScheme->m_ScreenCreationRes.y; + // setup the multiplier value + m_multiplier.x = TheDisplay->getWidth() / (Real)tempScheme->m_ScreenCreationRes.x; + m_multiplier.y = TheDisplay->getHeight() / (Real)tempScheme->m_ScreenCreationRes.y; m_currentScheme = tempScheme; } else diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp index bc466edec30..aaf601cff14 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp @@ -1468,7 +1468,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos); { // we pinged on the last frame someone was there - i.e. game ended in a disconnect. // check if we were to blame. - if (TheNetwork->getPingsRecieved() < max(1, TheNetwork->getPingsSent()/2)) /// @todo: what's a good percent of pings to have gotten? + if (TheNetwork->getPingsReceived() < max(1, TheNetwork->getPingsSent()/2)) /// @todo: what's a good percent of pings to have gotten? { DEBUG_LOG(("We were to blame. Leaving gameEndedInDisconnect = true")); } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp index b278e8599cc..3ed3bcb551a 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp @@ -386,7 +386,7 @@ WindowMsgHandledType GadgetTextEntrySystem( GameWindow *window, UnsignedInt msg, e->conCharPos = 0; if(TheIMEManager && TheIMEManager->isAttachedTo(window)) TheIMEManager->attach(nullptr); - //TheIMEManager->detatch(); + //TheIMEManager->detach(); } else { diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp index 3f1f07a8766..93b13ff6f91 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp @@ -917,7 +917,7 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms BitClear( m_grabWindow->m_status, WIN_STATUS_ACTIVE ); if( m_grabWindow->winPointInWindow( mousePos->x, mousePos->y ) ) winSendInputMsg( m_grabWindow, GWM_LEFT_UP, packedMouseCoords, 0 ); - else if( BitIsSet( m_grabWindow->m_status, WIN_STATUS_DRAGABLE )) + else if( BitIsSet( m_grabWindow->m_status, WIN_STATUS_DRAGGABLE )) { winSendInputMsg( m_grabWindow, GWM_LEFT_UP, packedMouseCoords, 0 ); } @@ -932,7 +932,7 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms case GWM_LEFT_DRAG: { - if( BitIsSet( m_grabWindow->m_status, WIN_STATUS_DRAGABLE ) ) + if( BitIsSet( m_grabWindow->m_status, WIN_STATUS_DRAGGABLE ) ) { ICoord2D *mouseDelta = (ICoord2D *)data; dx = mouseDelta->x; @@ -2266,7 +2266,7 @@ GameWindow *GameWindowManager::gogoGadgetSlider( GameWindow *parent, // create the slider thumb button WinInstanceData buttonInstData; - UnsignedInt statusFlags = status | WIN_STATUS_ENABLED | WIN_STATUS_DRAGABLE; + UnsignedInt statusFlags = status | WIN_STATUS_ENABLED | WIN_STATUS_DRAGGABLE; buttonInstData.init(); @@ -3672,7 +3672,7 @@ Bool GameWindowManager::initTestGUI( void ) // UnsignedByte alpha = 200; GameWindow *window; - UnsignedInt statusFlags = WIN_STATUS_ENABLED | WIN_STATUS_DRAGABLE | WIN_STATUS_IMAGE; + UnsignedInt statusFlags = WIN_STATUS_ENABLED | WIN_STATUS_DRAGGABLE | WIN_STATUS_IMAGE; WinInstanceData instData; // make some windows inside each other in the upper left @@ -3737,7 +3737,7 @@ Bool GameWindowManager::initTestGUI( void ) &instData, nullptr, TRUE ); // make window to hold radio buttons - window = winCreate( nullptr, WIN_STATUS_ENABLED | WIN_STATUS_DRAGABLE, + window = winCreate( nullptr, WIN_STATUS_ENABLED | WIN_STATUS_DRAGGABLE, 200, 200, 250, 45, nullptr ); window->winSetInputFunc( testGrab ); window->winSetEnabledColor( 0, winMakeColor( 50, 50, 50, 200 ) ); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp index f9913bfed2a..7040f8390b2 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp @@ -449,11 +449,11 @@ void GameWindowTransitionsHandler::draw( void ) m_secondaryDrawGroup->draw(); } -void GameWindowTransitionsHandler::setGroup(AsciiString groupName, Bool immidiate ) +void GameWindowTransitionsHandler::setGroup(AsciiString groupName, Bool immediate ) { - if(groupName.isEmpty() && immidiate) + if(groupName.isEmpty() && immediate) m_currentGroup = nullptr; - if(immidiate && m_currentGroup) + if(immediate && m_currentGroup) { m_currentGroup->skip(); m_currentGroup = findGroup(groupName); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp index 565b55f54e0..8f21a0884bf 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp @@ -97,7 +97,7 @@ class IMEManager : public IMEManagerInterface virtual void update( void ); virtual void attach( GameWindow *window ); ///< attach IME to specified window - virtual void detatch( void ); ///< detatch IME from current window + virtual void detach( void ); ///< detach IME from current window virtual void enable( void ); ///< Enable IME virtual void disable( void ); ///< Disable IME virtual Bool isEnabled( void ); ///< Is IME enabled @@ -539,7 +539,7 @@ IMEManager::~IMEManager() delete [] m_candidateString; - detatch(); + detach(); ImmAssociateContext( ApplicationHWnd, m_oldContext ); ImmReleaseContext( ApplicationHWnd, m_oldContext ); if ( m_context ) @@ -604,7 +604,7 @@ void IMEManager::init( void ) m_candidateTextArea->winSetUserData( TheIMEManager ); } - detatch(); + detach(); enable(); } @@ -634,7 +634,7 @@ void IMEManager::attach( GameWindow *window ) { if ( m_window != window ) { - detatch(); + detach(); if ( m_disabled == 0 ) { ImmAssociateContext( ApplicationHWnd, m_context ); @@ -646,10 +646,10 @@ void IMEManager::attach( GameWindow *window ) } //============================================================================ -// IMEManager::detatch +// IMEManager::detach //============================================================================ -void IMEManager::detatch( void ) +void IMEManager::detach( void ) { //ImmAssociateContext( ApplicationHWnd, nullptr ); m_window = nullptr; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp index f251c55fc9d..b59692c25ae 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp @@ -196,7 +196,7 @@ void SinglePlayerLoadScreen::moveWindows( Int frame ) enum{ STATE_BEGIN = 250, STATE_SHOW_LOCATION = 251, - STATE_BEGIN_BREIFING = 255, + STATE_BEGIN_BRIEFING = 255, // STATE_BEGIN_ANIMATING_TEXT = 250, STATE_SHOW_CAMEO_1 = 434, STATE_BEGIN_ANIMATING_TEXT = 356, @@ -212,7 +212,7 @@ void SinglePlayerLoadScreen::moveWindows( Int frame ) if(frame < STATE_BEGIN || frame > STATE_END) return; - if( frame == STATE_BEGIN_BREIFING) + if( frame == STATE_BEGIN_BRIEFING) { // add sound support here TheAudio->friend_forcePlayAudioEventRTS(&TheCampaignManager->getCurrentMission()->m_briefingVoice); @@ -278,9 +278,9 @@ void SinglePlayerLoadScreen::moveWindows( Int frame ) STATE_BEGIN = 275, STATE_BEGIN_ANIM = 290, STATE_ANIM_CAMEO1 = 300, - STATE_ANIM_CAMEO1_TRASITION_CAMEO2 = 350, + STATE_ANIM_CAMEO1_TRANSITION_CAMEO2 = 350, STATE_ANIM_CAMEO2 = 400, - STATE_ANIM_CAMEO2_TRASITION_CAMEO3 = 450, + STATE_ANIM_CAMEO2_TRANSITION_CAMEO3 = 450, STATE_ANIM_CAMEO3 = 500, STATED_END_ANIM = 550, STATE_END = 800 @@ -300,7 +300,7 @@ void SinglePlayerLoadScreen::moveWindows( Int frame ) GadgetStaticTextSetText(m_cameoText, TheGameText->fetch(TheCampaignManager->getCurrentMission()->m_cameoImageName[0])); //save of positions } - else if( frame == STATE_ANIM_CAMEO1_TRASITION_CAMEO2) + else if( frame == STATE_ANIM_CAMEO1_TRANSITION_CAMEO2) { m_cameoWindow1->winEnable(FALSE); GadgetStaticTextSetText(m_cameoText, UnicodeString::TheEmptyString); @@ -314,11 +314,11 @@ void SinglePlayerLoadScreen::moveWindows( Int frame ) endPos.y = startPos.y; } - else if( frame > STATE_ANIM_CAMEO1_TRASITION_CAMEO2 && frame < STATE_ANIM_CAMEO2) + else if( frame > STATE_ANIM_CAMEO1_TRANSITION_CAMEO2 && frame < STATE_ANIM_CAMEO2) { //extrapolate between start and end pos - Real percent = INT_TO_REAL((frame - STATE_ANIM_CAMEO1_TRASITION_CAMEO2)) / (STATE_ANIM_CAMEO2 - STATE_ANIM_CAMEO1_TRASITION_CAMEO2); + Real percent = INT_TO_REAL((frame - STATE_ANIM_CAMEO1_TRANSITION_CAMEO2)) / (STATE_ANIM_CAMEO2 - STATE_ANIM_CAMEO1_TRANSITION_CAMEO2); m_cameoFrame->winSetPosition(startPos.x + (endPos.x - startPos.x) * percent, endPos.y); } else if( frame == STATE_ANIM_CAMEO2 ) @@ -327,7 +327,7 @@ void SinglePlayerLoadScreen::moveWindows( Int frame ) m_cameoFrame->winSetPosition(endPos.x, endPos.y); GadgetStaticTextSetText(m_cameoText, TheGameText->fetch(TheCampaignManager->getCurrentMission()->m_cameoImageName[1])); } - else if( frame == STATE_ANIM_CAMEO2_TRASITION_CAMEO3) + else if( frame == STATE_ANIM_CAMEO2_TRANSITION_CAMEO3) { m_cameoWindow2->winEnable(FALSE); GadgetStaticTextSetText(m_cameoText, UnicodeString::TheEmptyString); @@ -341,11 +341,11 @@ void SinglePlayerLoadScreen::moveWindows( Int frame ) endPos.y = startPos.y; } - else if( frame > STATE_ANIM_CAMEO2_TRASITION_CAMEO3 && frame < STATE_ANIM_CAMEO3) + else if( frame > STATE_ANIM_CAMEO2_TRANSITION_CAMEO3 && frame < STATE_ANIM_CAMEO3) { //extrapolate between start and end pos - Real percent = INT_TO_REAL((frame - STATE_ANIM_CAMEO2_TRASITION_CAMEO3)) / (STATE_ANIM_CAMEO3 - STATE_ANIM_CAMEO2_TRASITION_CAMEO3); + Real percent = INT_TO_REAL((frame - STATE_ANIM_CAMEO2_TRANSITION_CAMEO3)) / (STATE_ANIM_CAMEO3 - STATE_ANIM_CAMEO2_TRANSITION_CAMEO3); m_cameoFrame->winSetPosition(startPos.x + (endPos.x - startPos.x) * percent, endPos.y); } else if( frame == STATE_ANIM_CAMEO3 ) diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp index f5262b666ef..bf79ec1735d 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp @@ -161,7 +161,7 @@ void Shell::reset( void ) { if (TheIMEManager) - TheIMEManager->detatch(); + TheIMEManager->detach(); // pop all screens while( m_screenCount ) @@ -310,7 +310,7 @@ void Shell::hide( Bool hide ) m_screenStack[ i ]->hide( hide ); if (TheIMEManager) - TheIMEManager->detatch(); + TheIMEManager->detach(); } @@ -374,7 +374,7 @@ void Shell::push( AsciiString filename, Bool shutdownImmediate ) } // if (TheIMEManager) -// TheIMEManager->detatch(); +// TheIMEManager->detach(); } @@ -414,7 +414,7 @@ void Shell::pop( void ) screen->runShutdown( &immediatePop ); if (TheIMEManager) - TheIMEManager->detatch(); + TheIMEManager->detach(); } @@ -452,7 +452,7 @@ void Shell::popImmediate( void ) doPop( FALSE ); if (TheIMEManager) - TheIMEManager->detatch(); + TheIMEManager->detach(); } @@ -586,7 +586,7 @@ void Shell::hideShell( void ) } if (TheIMEManager) - TheIMEManager->detatch(); + TheIMEManager->detach(); // Mark that the shell is no longer up. m_isShellActive = FALSE; @@ -669,7 +669,7 @@ void Shell::doPush( AsciiString layoutFile ) linkScreen( newScreen ); if (TheIMEManager) - TheIMEManager->detatch(); + TheIMEManager->detach(); // run the init function automatically newScreen->runInit( nullptr ); @@ -709,7 +709,7 @@ void Shell::doPop( Bool impendingPush ) } if (TheIMEManager) - TheIMEManager->detatch(); + TheIMEManager->detach(); } diff --git a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp index 48fcba3564a..14046b09523 100644 --- a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp @@ -4167,9 +4167,9 @@ void InGameUI::militarySubtitle( const AsciiString& label, Int duration ) disableTooltipsUntil(messageTimeout); // calculate where this screen position should be since the position being passed in is based off 8x6 - Coord2D multiplyer; - multiplyer.x = TheDisplay->getWidth() / (Real)DEFAULT_DISPLAY_WIDTH; - multiplyer.y = TheDisplay->getHeight() / (Real)DEFAULT_DISPLAY_HEIGHT; + Coord2D multiplier; + multiplier.x = TheDisplay->getWidth() / (Real)DEFAULT_DISPLAY_WIDTH; + multiplier.y = TheDisplay->getHeight() / (Real)DEFAULT_DISPLAY_HEIGHT; // lets bring out the data structure! m_militarySubtitle = NEW MilitarySubtitleData; @@ -4178,8 +4178,8 @@ void InGameUI::militarySubtitle( const AsciiString& label, Int duration ) m_militarySubtitle->blockDrawn = TRUE; m_militarySubtitle->blockBeginFrame = currLogicFrame; m_militarySubtitle->lifetime = messageTimeout; - m_militarySubtitle->blockPos.x = m_militarySubtitle->position.x = m_militaryCaptionPosition.x * multiplyer.x; - m_militarySubtitle->blockPos.y = m_militarySubtitle->position.y = m_militaryCaptionPosition.y * multiplyer.y; + m_militarySubtitle->blockPos.x = m_militarySubtitle->position.x = m_militaryCaptionPosition.x * multiplier.x; + m_militarySubtitle->blockPos.y = m_militarySubtitle->position.y = m_militaryCaptionPosition.y * multiplier.y; m_militarySubtitle->incrementOnFrame = currLogicFrame + (Int)(((Real)LOGICFRAMES_PER_SECOND * m_militaryCaptionDelayMS)/1000.0f); m_militarySubtitle->index = 0; for (int i = 1; i < MAX_SUBTITLE_LINES; i ++) diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp index dcd1c7069a0..c54bcb0829d 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp @@ -6175,9 +6175,9 @@ Path *Pathfinder::buildGroundPath(Bool isCrusher, const Coord3D *fromPos, Pathfi /** * Work backwards from goal cell to construct final path. */ -Path *Pathfinder::buildHierachicalPath( const Coord3D *fromPos, PathfindCell *goalCell ) +Path *Pathfinder::buildHierarchicalPath( const Coord3D *fromPos, PathfindCell *goalCell ) { - DEBUG_ASSERTCRASH( goalCell, ("Pathfinder::buildHierachicalPath: goalCell == nullptr") ); + DEBUG_ASSERTCRASH( goalCell, ("Pathfinder::buildHierarchicalPath: goalCell == nullptr") ); Path *path = newInstance(Path); @@ -7101,7 +7101,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu m_isTunneling = false; // construct and return path - Path *path = buildHierachicalPath( from, goalCell ); + Path *path = buildHierarchicalPath( from, goalCell ); #if defined(RTS_DEBUG) Bool show = TheGlobalData->m_debugAI==AI_DEBUG_PATHS; show |= (TheGlobalData->m_debugAI==AI_DEBUG_GROUND_PATHS); @@ -7290,7 +7290,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu if (closestOK && closestCell) { m_isTunneling = false; // construct and return path - Path *path = buildHierachicalPath( from, closestCell ); + Path *path = buildHierarchicalPath( from, closestCell ); #if RETAIL_COMPATIBLE_PATHFINDING if (!s_useFixedPathfinding) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp index a4f8dce7872..48c43912c05 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp @@ -150,8 +150,8 @@ RailroadBehavior::RailroadBehavior( Thing *thing, const ModuleData *moduleData ) m_waitingInWings = TRUE; m_endOfLine = FALSE; m_isLocomotive = modData->m_isLocomotive; - m_isLeadCarraige = m_isLocomotive; // for now, I am the lead, only if I am the locomotive - m_wantsToBeLeadCarraige = FALSE; + m_isLeadCarriage = m_isLocomotive; // for now, I am the lead, only if I am the locomotive + m_wantsToBeLeadCarriage = FALSE; m_disembark = FALSE; m_inTunnel = FALSE; @@ -191,7 +191,7 @@ Bool RailroadBehavior::isRailroad() const return FALSE; if (m_endOfLine) return FALSE; - if (m_isLeadCarraige) + if (m_isLeadCarriage) return TRUE; if (m_trailerID==INVALID_ID) return TRUE; @@ -234,7 +234,7 @@ void RailroadBehavior::onCollide( Object *other, const Coord3D *loc, const Coord { other->kill(); } - else if ( m_isLeadCarraige ) //yikes! I just coasted into some other carriage + else if ( m_isLeadCarriage ) //yikes! I just coasted into some other carriage { other->kill(); obj->kill();//and I am dead, too @@ -729,12 +729,12 @@ UpdateSleepTime RailroadBehavior::update( void ) } - if ( m_wantsToBeLeadCarraige > FRAMES_UNPULLED_LONG_ENOUGH_TO_UNHITCH )//if this flag survived until now, I have lost my puller + if ( m_wantsToBeLeadCarriage > FRAMES_UNPULLED_LONG_ENOUGH_TO_UNHITCH )//if this flag survived until now, I have lost my puller { - m_isLeadCarraige = TRUE; + m_isLeadCarriage = TRUE; } - if ( m_isLeadCarraige ) + if ( m_isLeadCarriage ) { if ( m_conductorState == COAST ) @@ -779,9 +779,9 @@ UpdateSleepTime RailroadBehavior::update( void ) TheGameLogic->destroyObject( getObject() ); } } - else if ( m_wantsToBeLeadCarraige <= FRAMES_UNPULLED_LONG_ENOUGH_TO_UNHITCH )// if I am not the lead carriage + else if ( m_wantsToBeLeadCarriage <= FRAMES_UNPULLED_LONG_ENOUGH_TO_UNHITCH )// if I am not the lead carriage { - m_wantsToBeLeadCarraige ++; // like every young carriage, I aspire to be the lead carriage some day + m_wantsToBeLeadCarriage ++; // like every young carriage, I aspire to be the lead carriage some day // unless getpulled() set this false, I will be on the next update! Joy! } @@ -1125,7 +1125,7 @@ void RailroadBehavior::hitchNewCarriagebyProximity( ObjectID locoID, TrainTrack void RailroadBehavior::getPulled( PullInfo *info ) { //ENFORCE MY STATUS AS A PULLEE, NOT A PULLER, and update my position, speed etc. - m_wantsToBeLeadCarraige = 0; + m_wantsToBeLeadCarriage = 0; if ( ! m_track ) { @@ -1521,11 +1521,11 @@ void RailroadBehavior::xfer( Xfer *xfer ) //Bool m_isLocomotive; ///< Am I a locomotive, xfer->xferBool( &m_isLocomotive ); - //Bool m_isLeadCarraige; ///< Am the carraige in front, - xfer->xferBool( &m_isLeadCarraige ); + //Bool m_isLeadCarriage; ///< Am the carraige in front, + xfer->xferBool( &m_isLeadCarriage ); - //Int m_wantsToBeLeadCarraige; ///< Am the carraige in front, - xfer->xferInt( &m_wantsToBeLeadCarraige ); + //Int m_wantsToBeLeadCarriage; ///< Am the carraige in front, + xfer->xferInt( &m_wantsToBeLeadCarriage ); //Bool m_disembark; ///< If I wait at a station, I should also evacuate everybody when I get theres xfer->xferBool( &m_disembark ); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp index ef09e5cfcbe..0551f708a57 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp @@ -2648,8 +2648,8 @@ Bool Weapon::isWithinTargetPitch(const Object *source, const Object *victim) con const Coord3D* src = source->getPosition(); const Coord3D* dst = victim->getPosition(); - const Real ACCCEPTABLE_DZ = 10.0f; - if (fabs(dst->z - src->z) < ACCCEPTABLE_DZ) + const Real ACCEPTABLE_DZ = 10.0f; + if (fabs(dst->z - src->z) < ACCEPTABLE_DZ) return true; // always good enough if dz is small, regardless of pitch Real minPitch, maxPitch; diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp index 4602a53b2fe..e615c6e9de4 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp @@ -1991,7 +1991,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData ) //UnsignedInt oldCRC = m_cachedCRCs[msg->getPlayerIndex()]; UnsignedInt newCRC = msg->getArgument(0)->integer; - //DEBUG_LOG(("Recieved CRC of %8.8X from %ls on frame %d", newCRC, + //DEBUG_LOG(("Received CRC of %8.8X from %ls on frame %d", newCRC, //thisPlayer->getPlayerDisplayName().str(), m_frame)); m_cachedCRCs[msg->getPlayerIndex()] = newCRC; // to mask problem: = (oldCRC < newCRC)?newCRC:oldCRC; } diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h index eeaedcb31e7..9fc81ad0889 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h @@ -73,7 +73,7 @@ class W3DAssetManager: public WW3DAssetManager void Report_Used_Font3DDatas( void ); void Report_Used_FontChars (void); - virtual RenderObjClass * Create_Render_Obj(const char * name,float scale, const int color, const char *oldTexure=nullptr, const char *newTexture=nullptr); + virtual RenderObjClass * Create_Render_Obj(const char * name,float scale, const int color, const char *oldTexture=nullptr, const char *newTexture=nullptr); ///Swaps the specified textures in the render object prototype. int replacePrototypeTexture(RenderObjClass *robj, const char * oldname, const char * newname); diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp index 97a88b6295b..7e2a58d1089 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp @@ -181,10 +181,10 @@ void W3DMainMenuDraw( GameWindow *window, WinInstanceData *instData ) IRegion2D bottomHorizontal2= {pos.x, pos.y + size.y, pos.x + size.x, pos.y + size.y }; IRegion2D bottomHorizontal2drop= {pos.x, pos.y + size.y + 1, pos.x + size.x, pos.y + size.y + 1 }; - IRegion2D verticle1 ={pos.x + Int(size.x * .225), pos.y , pos.x + Int(size.x * .225), height }; - IRegion2D verticle2 ={pos.x + Int(size.x * .445), pos.y, pos.x + Int(size.x * .445), height }; - IRegion2D verticle3 ={pos.x + Int(size.x * .6662), pos.y, pos.x + Int(size.x * .6662), height }; - IRegion2D verticle4 ={pos.x + Int(size.x * .885), pos.y , pos.x + Int(size.x * .885), height }; + IRegion2D vertical1 ={pos.x + Int(size.x * .225), pos.y , pos.x + Int(size.x * .225), height }; + IRegion2D vertical2 ={pos.x + Int(size.x * .445), pos.y, pos.x + Int(size.x * .445), height }; + IRegion2D vertical3 ={pos.x + Int(size.x * .6662), pos.y, pos.x + Int(size.x * .6662), height }; + IRegion2D vertical4 ={pos.x + Int(size.x * .885), pos.y , pos.x + Int(size.x * .885), height }; // static IRegion2D verticle5 ={pos.x + (size.x * .7250), pos.y + (size.y * .12), pos.x + (size.x * .7250), pos.y + (size.y * .86) }; // static IRegion2D verticle6 ={pos.x + (size.x * .9062), pos.y + (size.y * .12), pos.x + (size.x * .9062), pos.y + (size.y * .86) }; @@ -200,10 +200,10 @@ void W3DMainMenuDraw( GameWindow *window, WinInstanceData *instData ) - TheDisplay->drawLine(verticle1.lo.x,verticle1.lo.y,verticle1.hi.x,verticle1.hi.y,3,color); - TheDisplay->drawLine(verticle2.lo.x,verticle2.lo.y,verticle2.hi.x,verticle2.hi.y,3,color); - TheDisplay->drawLine(verticle3.lo.x,verticle3.lo.y,verticle3.hi.x,verticle3.hi.y,3,color); - TheDisplay->drawLine(verticle4.lo.x,verticle4.lo.y,verticle4.hi.x,verticle4.hi.y,3,color); + TheDisplay->drawLine(vertical1.lo.x,vertical1.lo.y,vertical1.hi.x,vertical1.hi.y,3,color); + TheDisplay->drawLine(vertical2.lo.x,vertical2.lo.y,vertical2.hi.x,vertical2.hi.y,3,color); + TheDisplay->drawLine(vertical3.lo.x,vertical3.lo.y,vertical3.hi.x,vertical3.hi.y,3,color); + TheDisplay->drawLine(vertical4.lo.x,vertical4.lo.y,vertical4.hi.x,vertical4.hi.y,3,color); // TheDisplay->drawLine(verticle5.lo.x,verticle5.lo.y,verticle5.hi.x,verticle5.hi.y,3,color); // TheDisplay->drawLine(verticle6.lo.x,verticle6.lo.y,verticle6.hi.x,verticle6.hi.y,3,color); // TheDisplay->drawLine(m_rightLineFromButton.lo.x,m_rightLineFromButton.lo.y,m_rightLineFromButton.hi.x,m_rightLineFromButton.hi.y,3,color1,color2); @@ -245,10 +245,10 @@ void W3DMainMenuFourDraw( GameWindow *window, WinInstanceData *instData ) IRegion2D bottomHorizontal2= {pos.x, pos.y + size.y, pos.x + size.x, pos.y + size.y }; IRegion2D bottomHorizontal2drop= {pos.x, pos.y + size.y + 1, pos.x + size.x, pos.y + size.y + 1 }; - IRegion2D verticle1 ={pos.x + Int(size.x * .295), pos.y , pos.x + Int(size.x * .295), height }; - IRegion2D verticle2 ={pos.x + Int(size.x * .59), pos.y, pos.x + Int(size.x * .59), height }; - //IRegion2D verticle3 ={pos.x + (size.x * .6662), pos.y, pos.x + (size.x * .6662), height }; - IRegion2D verticle4 ={pos.x + Int(size.x * .885), pos.y , pos.x + Int(size.x * .885), height }; + IRegion2D vertical1 ={pos.x + Int(size.x * .295), pos.y , pos.x + Int(size.x * .295), height }; + IRegion2D vertical2 ={pos.x + Int(size.x * .59), pos.y, pos.x + Int(size.x * .59), height }; + //IRegion2D vertical3 ={pos.x + (size.x * .6662), pos.y, pos.x + (size.x * .6662), height }; + IRegion2D vertical4 ={pos.x + Int(size.x * .885), pos.y , pos.x + Int(size.x * .885), height }; // static IRegion2D verticle5 ={pos.x + (size.x * .7250), pos.y + (size.y * .12), pos.x + (size.x * .7250), pos.y + (size.y * .86) }; // static IRegion2D verticle6 ={pos.x + (size.x * .9062), pos.y + (size.y * .12), pos.x + (size.x * .9062), pos.y + (size.y * .86) }; @@ -264,10 +264,10 @@ void W3DMainMenuFourDraw( GameWindow *window, WinInstanceData *instData ) - TheDisplay->drawLine(verticle1.lo.x,verticle1.lo.y,verticle1.hi.x,verticle1.hi.y,3,color); - TheDisplay->drawLine(verticle2.lo.x,verticle2.lo.y,verticle2.hi.x,verticle2.hi.y,3,color); - //TheDisplay->drawLine(verticle3.lo.x,verticle3.lo.y,verticle3.hi.x,verticle3.hi.y,3,color); - TheDisplay->drawLine(verticle4.lo.x,verticle4.lo.y,verticle4.hi.x,verticle4.hi.y,3,color); + TheDisplay->drawLine(vertical1.lo.x,vertical1.lo.y,vertical1.hi.x,vertical1.hi.y,3,color); + TheDisplay->drawLine(vertical2.lo.x,vertical2.lo.y,vertical2.hi.x,vertical2.hi.y,3,color); + //TheDisplay->drawLine(vertical3.lo.x,vertical3.lo.y,vertical3.hi.x,vertical3.hi.y,3,color); + TheDisplay->drawLine(vertical4.lo.x,vertical4.lo.y,vertical4.hi.x,vertical4.hi.y,3,color); // TheDisplay->drawLine(verticle5.lo.x,verticle5.lo.y,verticle5.hi.x,verticle5.hi.y,3,color); // TheDisplay->drawLine(verticle6.lo.x,verticle6.lo.y,verticle6.hi.x,verticle6.hi.y,3,color); // TheDisplay->drawLine(m_rightLineFromButton.lo.x,m_rightLineFromButton.lo.y,m_rightLineFromButton.hi.x,m_rightLineFromButton.hi.y,3,color1,color2); diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp index f0f81fc2c2e..031f1b456a5 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp @@ -673,7 +673,7 @@ __int64 Total_Create_Render_Obj_Time=0; #endif //--------------------------------------------------------------------- /** Generals specific code to generate customized render objects for each team color - Scale==1.0, color==0x00000000, and oldTexure== nullptr are defaults that do nothing. + Scale==1.0, color==0x00000000, and oldTexture==nullptr are defaults that do nothing. */ RenderObjClass * W3DAssetManager::Create_Render_Obj( const char * name, diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp index 42289c9437f..ba3f6e9de28 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp @@ -383,7 +383,7 @@ void ParticleEmitterClass::Reset(void) // Note: This flag needs to be set first thing, otherwise // getting the transform will result in an 'update_x' call // which in turn results in a 'Set_Animation_Hidden' call, which - // in turn will cause the Update_Visibilty function to call + // in turn will cause the Update_Visibility function to call // Start(). This won't cause a stack overflow like in Start // but it would do some extra work. Active = true; @@ -403,7 +403,7 @@ void ParticleEmitterClass::Start(void) // Note: This flag needs to be set first thing, otherwise // getting the transform will result in an 'update_x' call // which in turn results in a 'Set_Animation_Hidden' call, which - // in turn will cause the Update_Visibilty function to call + // in turn will cause the Update_Visibility function to call // this method. And then... Stack Overflow! ;) Active = true; @@ -835,7 +835,7 @@ ParticleEmitterClass::Set_Name (const char *pname) void -ParticleEmitterClass::Update_On_Visibilty(void) +ParticleEmitterClass::Update_On_Visibility(void) { // Simply start or stop the emission based on // the visibility state of the emitter. diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h index 47b450d0035..e6beffa1211 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h @@ -151,10 +151,10 @@ class ParticleEmitterClass : public RenderObjClass virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const { sphere.Center.Set(0,0,0); sphere.Radius = 0; } virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const { box.Center.Set(0,0,0); box.Extent.Set(0,0,0); } - virtual void Set_Hidden(int onoff) { RenderObjClass::Set_Hidden (onoff); Update_On_Visibilty (); } - virtual void Set_Visible(int onoff) { RenderObjClass::Set_Visible (onoff); Update_On_Visibilty (); } - virtual void Set_Animation_Hidden(int onoff) { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibilty (); } - virtual void Set_Force_Visible(int onoff) { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibilty (); } + virtual void Set_Hidden(int onoff) { RenderObjClass::Set_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Visible(int onoff) { RenderObjClass::Set_Visible (onoff); Update_On_Visibility (); } + virtual void Set_Animation_Hidden(int onoff) { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Force_Visible(int onoff) { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibility (); } virtual void Set_LOD_Bias(float bias) { if (Buffer) Buffer->Set_LOD_Bias(bias); } @@ -277,7 +277,7 @@ class ParticleEmitterClass : public RenderObjClass virtual void Add_Dependencies_To_List (DynamicVectorClass &file_list, bool textures_only = false); // This method is called each time the visiblity state of the emitter changes. - virtual void Update_On_Visibilty (void); + virtual void Update_On_Visibility (void); private: diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp index 7ebdae2b037..d37617bfff6 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp @@ -416,7 +416,7 @@ void Render2DClass::Add_Tri( const Vector2 & v0, const Vector2 & v1, const Vecto int new_vert_count = old_vert_count + 3; int new_index_count = Indices.Count() + 3; - // Add the verticies (translated to new coordinates) + // Add the vertices (translated to new coordinates) #if 0 Vertices.Add( Convert_Vert( v0 ), new_vert_count ); Vertices.Add( Convert_Vert( v1 ), new_vert_count ); diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h index efd0ed87ce8..7a9235d10b4 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h @@ -2119,11 +2119,11 @@ struct W3dHLodSubObjectStruct #define W3D_BOX_ATTRIBUTE_ALIGNED 0x00000002 #define W3D_BOX_ATTRIBUTE_COLLISION_TYPE_MASK 0x00000FF0 // mask for the collision type bits #define W3D_BOX_ATTRIBUTE_COLLISION_TYPE_SHIFT 4 // shifting to get to the collision type bits -#define W3D_BOX_ATTRIBTUE_COLLISION_TYPE_PHYSICAL 0x00000010 // physical collisions -#define W3D_BOX_ATTRIBTUE_COLLISION_TYPE_PROJECTILE 0x00000020 // projectiles (rays) collide with this -#define W3D_BOX_ATTRIBTUE_COLLISION_TYPE_VIS 0x00000040 // vis rays collide with this mesh -#define W3D_BOX_ATTRIBTUE_COLLISION_TYPE_CAMERA 0x00000080 // cameras collide with this mesh -#define W3D_BOX_ATTRIBTUE_COLLISION_TYPE_VEHICLE 0x00000100 // vehicles collide with this mesh +#define W3D_BOX_ATTRIBUTE_COLLISION_TYPE_PHYSICAL 0x00000010 // physical collisions +#define W3D_BOX_ATTRIBUTE_COLLISION_TYPE_PROJECTILE 0x00000020 // projectiles (rays) collide with this +#define W3D_BOX_ATTRIBUTE_COLLISION_TYPE_VIS 0x00000040 // vis rays collide with this mesh +#define W3D_BOX_ATTRIBUTE_COLLISION_TYPE_CAMERA 0x00000080 // cameras collide with this mesh +#define W3D_BOX_ATTRIBUTE_COLLISION_TYPE_VEHICLE 0x00000100 // vehicles collide with this mesh struct W3dBoxStruct { diff --git a/Generals/Code/Tools/GUIEdit/Resource/GUIEdit.rc b/Generals/Code/Tools/GUIEdit/Resource/GUIEdit.rc index 16e4db31812..1a7a964a811 100644 --- a/Generals/Code/Tools/GUIEdit/Resource/GUIEdit.rc +++ b/Generals/Code/Tools/GUIEdit/Resource/GUIEdit.rc @@ -258,7 +258,7 @@ BEGIN LTEXT "Name length + layout filename length (.wnd) must not exceed 'X' characters", STATIC_NAME_MAX,199,160,244,12,SS_CENTERIMAGE GROUPBOX "Window Status",IDC_STATIC,4,108,144,70 - CONTROL "Dragable",CHECK_DRAGABLE,"Button",BS_AUTOCHECKBOX | + CONTROL "Dragable",CHECK_DRAGGABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,120,45,10 CONTROL "Enabled",CHECK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,132,42,10 @@ -360,7 +360,7 @@ BEGIN STATIC_NAME_MAX,200,135,244,12,SS_CENTERIMAGE GROUPBOX "Window Status",IDC_STATIC,152,4,108,100 GROUPBOX "Images and Colors",IDC_STATIC,268,4,192,100 - CONTROL "Dragable",CHECK_DRAGABLE,"Button",BS_AUTOCHECKBOX | + CONTROL "Dragable",CHECK_DRAGGABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,17,45,10 CONTROL "Enabled",CHECK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,31,42,10 @@ -441,7 +441,7 @@ BEGIN STATIC_NAME_MAX,200,135,244,12,SS_CENTERIMAGE GROUPBOX "Window Status",IDC_STATIC,152,4,108,100 GROUPBOX "Images and Colors",IDC_STATIC,268,4,192,100 - CONTROL "Dragable",CHECK_DRAGABLE,"Button",BS_AUTOCHECKBOX | + CONTROL "Dragable",CHECK_DRAGGABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,20,45,10 CONTROL "Enabled",CHECK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,40,42,10 @@ -493,7 +493,7 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,395,166,50,14 GROUPBOX "Window Status",IDC_STATIC,152,4,108,100 GROUPBOX "Images and Colors",IDC_STATIC,268,4,192,100 - CONTROL "Dragable",CHECK_DRAGABLE,"Button",BS_AUTOCHECKBOX | + CONTROL "Dragable",CHECK_DRAGGABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,20,45,10 CONTROL "Enabled",CHECK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,40,42,10 @@ -575,7 +575,7 @@ BEGIN LTEXT "Name length + layout filename length (.wnd) must not exceed 'X' characters", STATIC_NAME_MAX,160,159,244,12,SS_CENTERIMAGE GROUPBOX "Window Status",IDC_STATIC,112,4,108,124 - CONTROL "Dragable",CHECK_DRAGABLE,"Button",BS_AUTOCHECKBOX | + CONTROL "Dragable",CHECK_DRAGGABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,20,45,10 CONTROL "Enabled",CHECK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,40,42,10 @@ -663,7 +663,7 @@ BEGIN STATIC_NAME_MAX,200,158,244,12,SS_CENTERIMAGE GROUPBOX "Window Status",IDC_STATIC,152,4,108,100 GROUPBOX "Images and Colors",IDC_STATIC,269,7,192,124 - CONTROL "Dragable",CHECK_DRAGABLE,"Button",BS_AUTOCHECKBOX | + CONTROL "Dragable",CHECK_DRAGGABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,20,45,10 CONTROL "Enabled",CHECK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,40,42,10 @@ -742,7 +742,7 @@ BEGIN STATIC_NAME_MAX,200,135,244,12,SS_CENTERIMAGE GROUPBOX "Window Status",IDC_STATIC,152,4,108,100 GROUPBOX "Images and Colors",IDC_STATIC,268,4,192,100 - CONTROL "Dragable",CHECK_DRAGABLE,"Button",BS_AUTOCHECKBOX | + CONTROL "Dragable",CHECK_DRAGGABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,20,45,10 CONTROL "Enabled",CHECK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,40,42,10 @@ -817,7 +817,7 @@ BEGIN STATIC_NAME_MAX,200,135,244,12,SS_CENTERIMAGE GROUPBOX "Window Status",IDC_STATIC,152,4,108,100 GROUPBOX "Images and Colors",IDC_STATIC,268,4,192,100 - CONTROL "Dragable",CHECK_DRAGABLE,"Button",BS_AUTOCHECKBOX | + CONTROL "Dragable",CHECK_DRAGGABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,20,45,10 CONTROL "Enabled",CHECK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,40,42,10 @@ -902,7 +902,7 @@ BEGIN LTEXT "Display Font",IDC_STATIC,14,146,128,8 GROUPBOX "Window Status",IDC_STATIC,152,4,108,100 GROUPBOX "Images and Colors",IDC_STATIC,268,4,192,100 - CONTROL "Dragable",CHECK_DRAGABLE,"Button",BS_AUTOCHECKBOX | + CONTROL "Dragable",CHECK_DRAGGABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,20,45,10 CONTROL "Enabled",CHECK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,40,42,10 @@ -1068,7 +1068,7 @@ BEGIN STATIC_NAME_MAX,200,135,244,12,SS_CENTERIMAGE GROUPBOX "Window Status",IDC_STATIC,152,4,108,100 GROUPBOX "Images and Colors",IDC_STATIC,268,4,192,100 - CONTROL "Dragable",CHECK_DRAGABLE,"Button",BS_AUTOCHECKBOX | + CONTROL "Dragable",CHECK_DRAGGABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,20,45,10 CONTROL "Enabled",CHECK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,40,42,10 @@ -1178,7 +1178,7 @@ BEGIN GROUPBOX "Combo Box Data",IDC_STATIC,4,4,144,233 LTEXT "Display Font",IDC_STATIC,12,152,128,8 GROUPBOX "Window Status",IDC_STATIC,152,4,108,100 - CONTROL "Dragable",CHECK_DRAGABLE,"Button",BS_AUTOCHECKBOX | + CONTROL "Dragable",CHECK_DRAGGABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,20,45,10 CONTROL "Enabled",CHECK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,40,42,10 diff --git a/Generals/Code/Tools/GUIEdit/Resource/resource.h b/Generals/Code/Tools/GUIEdit/Resource/resource.h index f0c5de11600..3af3857b67c 100644 --- a/Generals/Code/Tools/GUIEdit/Resource/resource.h +++ b/Generals/Code/Tools/GUIEdit/Resource/resource.h @@ -41,7 +41,7 @@ #define TAB_CONTROL_PROPERTIES_DIALOG 153 #define COMBO_BOX_PROPERTIES_DIALOG 154 #define CHECK_SEE_THRU 1004 -#define CHECK_DRAGABLE 1005 +#define CHECK_DRAGGABLE 1005 #define CHECK_ENABLED 1006 #define CHECK_HIDDEN 1007 #define CHECK_NO_INPUT 1008 diff --git a/Generals/Code/Tools/GUIEdit/Source/Properties.cpp b/Generals/Code/Tools/GUIEdit/Source/Properties.cpp index 371b3d853dc..e32032e8b35 100644 --- a/Generals/Code/Tools/GUIEdit/Source/Properties.cpp +++ b/Generals/Code/Tools/GUIEdit/Source/Properties.cpp @@ -808,8 +808,8 @@ void CommonDialogInitialize( GameWindow *window, HWND dialog ) // populate common properties if( BitIsSet( window->winGetStatus(), WIN_STATUS_ENABLED ) ) CheckDlgButton( dialog, CHECK_ENABLED, BST_CHECKED ); - if( BitIsSet( window->winGetStatus(), WIN_STATUS_DRAGABLE ) ) - CheckDlgButton( dialog, CHECK_DRAGABLE, BST_CHECKED ); + if( BitIsSet( window->winGetStatus(), WIN_STATUS_DRAGGABLE ) ) + CheckDlgButton( dialog, CHECK_DRAGGABLE, BST_CHECKED ); if( BitIsSet( window->winGetStatus(), WIN_STATUS_HIDDEN ) ) CheckDlgButton( dialog, CHECK_HIDDEN, BST_CHECKED ); if( BitIsSet( window->winGetStatus(), WIN_STATUS_NO_INPUT ) ) @@ -1068,9 +1068,9 @@ Bool SaveCommonDialogProperties( HWND dialog, GameWindow *window ) // save bits window->winEnable( IsDlgButtonChecked( dialog, CHECK_ENABLED ) ); - bit = WIN_STATUS_DRAGABLE; + bit = WIN_STATUS_DRAGGABLE; window->winClearStatus( bit ); - if( IsDlgButtonChecked( dialog, CHECK_DRAGABLE ) ) + if( IsDlgButtonChecked( dialog, CHECK_DRAGGABLE ) ) window->winSetStatus( bit ); bit = WIN_STATUS_HIDDEN; diff --git a/GeneralsMD/Code/GameEngine/Include/Common/AcademyStats.h b/GeneralsMD/Code/GameEngine/Include/Common/AcademyStats.h index 910b7dc6995..752bb8f3e24 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/AcademyStats.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/AcademyStats.h @@ -91,7 +91,7 @@ class AcademyStats : public Snapshot Bool isFirstUpdate() const { return m_firstUpdate; } void setFirstUpdate( Bool set ) { m_firstUpdate = set; } - void recordProduction( const Object *obj, const Object *constructer ); + void recordProduction( const Object *obj, const Object *constructor ); void recordUpgrade( const UpgradeTemplate *upgrade, Bool granted ); void recordSpecialPowerUsed( const SpecialPowerTemplate *spTemplate ); void recordIncome(); diff --git a/GeneralsMD/Code/GameEngine/Include/Common/StackDump.h b/GeneralsMD/Code/GameEngine/Include/Common/StackDump.h index 6312d3467ee..ce84c0af736 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/StackDump.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/StackDump.h @@ -24,7 +24,7 @@ #pragma once -#ifndef IG_DEGBUG_STACKTRACE +#ifndef IG_DEBUG_STACKTRACE #define IG_DEBUG_STACKTRACE 1 #endif // Unsure about this one -ML 3/25/03 #if defined(RTS_DEBUG) || defined(IG_DEBUG_STACKTRACE) diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h index b4a0dbbddb9..eec85e73123 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h @@ -216,7 +216,7 @@ enum GUICommandType CPP_11(: Int) GUI_COMMAND_NUM_COMMANDS }; -#ifdef DEFINE_GUI_COMMMAND_NAMES +#ifdef DEFINE_GUI_COMMAND_NAMES static const char *const TheGuiCommandNames[] = { "NONE", diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarScheme.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarScheme.h index 19f4db31055..ba2c539a5be 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarScheme.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarScheme.h @@ -272,7 +272,7 @@ class ControlBarSchemeManager private: ControlBarScheme *m_currentScheme; ///< the current scheme that everythign uses - Coord2D m_multiplyer; + Coord2D m_multiplier; typedef std::list< ControlBarScheme* > ControlBarSchemeList; ///< list of control bar schemes ControlBarSchemeList m_schemeList; diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindow.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindow.h index 4a490fef3e2..a49f4efffed 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindow.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindow.h @@ -157,7 +157,7 @@ enum WIN_STATUS_NONE = 0x00000000, // No status bits set at all WIN_STATUS_ACTIVE = 0x00000001, // At the top of the window list WIN_STATUS_TOGGLE = 0x00000002, // If set, click to toggle - WIN_STATUS_DRAGABLE = 0x00000004, // Window can be dragged + WIN_STATUS_DRAGGABLE = 0x00000004, // Window can be dragged WIN_STATUS_ENABLED = 0x00000008, // Window can receive input WIN_STATUS_HIDDEN = 0x00000010, // Window is hidden, no input WIN_STATUS_ABOVE = 0x00000020, // Window is always above others diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowTransitions.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowTransitions.h index 239014b8ece..2c98519bc8e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowTransitions.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowTransitions.h @@ -668,7 +668,7 @@ class GameWindowTransitionsHandler: public SubsystemInterface static const FieldParse m_gameWindowTransitionsFieldParseTable[]; ///< the parse table static void parseWindow( INI* ini, void *instance, void *store, const void *userData ); - void setGroup(AsciiString groupName, Bool immidiate = FALSE); // THis will be the next group to fire off. + void setGroup(AsciiString groupName, Bool immediate = FALSE); // THis will be the next group to fire off. void reverse( AsciiString groupName );// reverse the animations for the current group. void remove( AsciiString groupName, Bool skipPending = FALSE );// remove the animation from the current or pending groups. TransitionGroup *getNewGroup( AsciiString name ); diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/IMEManager.h b/GeneralsMD/Code/GameEngine/Include/GameClient/IMEManager.h index 5d916675274..2b78b9b6270 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/IMEManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/IMEManager.h @@ -75,7 +75,7 @@ class IMEManagerInterface : public SubsystemInterface virtual ~IMEManagerInterface() {}; virtual void attach( GameWindow *window ) = 0; ///< attach IME to specified window - virtual void detatch( void ) = 0; ///< detatch IME from current window + virtual void detach( void ) = 0; ///< detach IME from current window virtual void enable( void ) = 0; ///< Enable IME virtual void disable( void ) = 0; ///< Disable IME virtual Bool isEnabled( void ) = 0; ///< Is IME enabled diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPathfind.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPathfind.h index 89f36104be3..52429c69c41 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPathfind.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPathfind.h @@ -820,7 +820,7 @@ class Pathfinder : PathfindServicesInterface, public Snapshot const Coord3D *fromPos, PathfindCell *goalCell, Bool center, Bool blocked ); ///< Work backwards from goal cell to construct final path Path *buildGroundPath( Bool isCrusher,const Coord3D *fromPos, PathfindCell *goalCell, Bool center, Int pathDiameter ); ///< Work backwards from goal cell to construct final path - Path *buildHierachicalPath( const Coord3D *fromPos, PathfindCell *goalCell); ///< Work backwards from goal cell to construct final path + Path *buildHierarchicalPath( const Coord3D *fromPos, PathfindCell *goalCell); ///< Work backwards from goal cell to construct final path void prependCells( Path *path, const Coord3D *fromPos, PathfindCell *goalCell, Bool center ); ///< Add pathfind cells to a path. diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h index dc171244527..726db569112 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h @@ -284,8 +284,8 @@ class RailroadBehavior : public PhysicsBehavior Bool m_waitingInWings; /// I have not entered the real track yet, so leave me alone Bool m_endOfLine; /// I have reached the end of a non looping track Bool m_isLocomotive; ///< Am I a locomotive, - Bool m_isLeadCarraige; ///< Am the carraige in front, - Int m_wantsToBeLeadCarraige; ///< Am the carraige in front, + Bool m_isLeadCarriage; ///< Am the carraige in front, + Int m_wantsToBeLeadCarriage; ///< Am the carraige in front, Bool m_disembark; ///< If I wait at a station, I should also evacuate everybody when I get theres Bool m_inTunnel; ///< Am I in a tunnel, so I wil not snap to ground height, until the next waypoint, // i.e. do I provide the movement and scheduling AI for m_trailerID diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/AcademyStats.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/AcademyStats.cpp index ad565ea87f3..3fc4206aed0 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/AcademyStats.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/AcademyStats.cpp @@ -359,7 +359,7 @@ void AcademyStats::update() } //------------------------------------------------------------------------------------------------ -void AcademyStats::recordProduction( const Object *obj, const Object *constructer ) +void AcademyStats::recordProduction( const Object *obj, const Object *constructor ) { UnsignedInt now = TheGameLogic->getFrame(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Credits.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Credits.cpp index d3a1d8ed1a5..fc23c65eac8 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Credits.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Credits.cpp @@ -193,16 +193,16 @@ void CreditsManager::update( void ) Int lastHeight = 0; Int start = m_scrollDown? 0:TheDisplay->getHeight(); Int end =m_scrollDown? TheDisplay->getHeight():0; - Int offsetStartMultiplyer = m_scrollDown? -1:0; // if we're scrolling from the top, we need to subtract the height - Int offsetEndMultiplyer = m_scrollDown? 0:1; - Int directionMultiplyer = m_scrollDown? 1:-1; + Int offsetStartMultiplier = m_scrollDown? -1:0; // if we're scrolling from the top, we need to subtract the height + Int offsetEndMultiplier = m_scrollDown? 0:1; + Int directionMultiplier = m_scrollDown? 1:-1; CreditsLineList::iterator drawIt = m_displayedCreditLineList.begin(); while (drawIt != m_displayedCreditLineList.end()) { CreditsLine *cLine = *drawIt; - y = cLine->m_pos.y = cLine->m_pos.y + (m_scrollRate * directionMultiplyer); + y = cLine->m_pos.y = cLine->m_pos.y + (m_scrollRate * directionMultiplier); lastHeight = cLine->m_height; - yTest = y + ((lastHeight + CREDIT_SPACE_OFFSET) * offsetEndMultiplyer); + yTest = y + ((lastHeight + CREDIT_SPACE_OFFSET) * offsetEndMultiplier); if(((m_scrollDown && (yTest > end)) || (!m_scrollDown && (yTest < end)))) { TheDisplayStringManager->freeDisplayString(cLine->m_displayString); @@ -215,7 +215,7 @@ void CreditsManager::update( void ) drawIt++; } - y= y + ((lastHeight + CREDIT_SPACE_OFFSET) * offsetStartMultiplyer); + y= y + ((lastHeight + CREDIT_SPACE_OFFSET) * offsetStartMultiplier); // is it time to add a new string? if(!((m_scrollDown && (yTest >= start)) || (!m_scrollDown && (yTest <= start)))) @@ -247,7 +247,7 @@ void CreditsManager::update( void ) ds->getSize(&pos.x,&pos.y); cLine->m_height = pos.y; cLine->m_pos.x = TheDisplay->getWidth()/2 - pos.x/2 ; - cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplyer); + cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplier); cLine->m_displayString = ds; } } @@ -268,7 +268,7 @@ void CreditsManager::update( void ) ds->getSize(&pos.x,&pos.y); cLine->m_height = pos.y; cLine->m_pos.x = TheDisplay->getWidth()/2 - pos.x/2 ; - cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplyer); + cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplier); cLine->m_displayString = ds; } } @@ -289,7 +289,7 @@ void CreditsManager::update( void ) ds->getSize(&pos.x,&pos.y); cLine->m_height = pos.y; cLine->m_pos.x = TheDisplay->getWidth()/2 - pos.x/2 ; - cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplyer); + cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplier); cLine->m_displayString = ds; } } @@ -310,7 +310,7 @@ void CreditsManager::update( void ) ds->getSize(&pos.x,&pos.y); cLine->m_height = pos.y; cLine->m_pos.x = TheDisplay->getWidth()/2 - pos.x/2 ; - cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplyer); + cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplier); cLine->m_displayString = ds; } if(TheGlobalLanguageData && !cLine->m_secondText.isEmpty()) @@ -325,7 +325,7 @@ void CreditsManager::update( void ) ds->getSize(&pos.x,&pos.y); cLine->m_height = pos.y; cLine->m_pos.x = TheDisplay->getWidth()/2 - pos.x/2 ; - cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplyer); + cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplier); cLine->m_secondDisplayString = ds; } @@ -334,7 +334,7 @@ void CreditsManager::update( void ) case CREDIT_STYLE_BLANK: { cLine->m_height = m_normalFontHeight; - cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplyer); + cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplier); } break; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index 9b1e52f7eed..61a2916e0d2 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -30,7 +30,7 @@ // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "PreRTS.h" // This must go first in EVERY cpp file in the GameEngine -#define DEFINE_GUI_COMMMAND_NAMES +#define DEFINE_GUI_COMMAND_NAMES #define DEFINE_COMMAND_OPTION_NAMES #define DEFINE_WEAPONSLOTTYPE_NAMES #define DEFINE_RADIUSCURSOR_NAMES diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp index e8cc648bb69..0917eb073f6 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp @@ -820,7 +820,7 @@ ControlBarSchemeManager::ControlBarSchemeManager( void ) { m_currentScheme = nullptr; m_schemeList.clear(); - m_multiplyer.x = m_multiplyer.y = 1; + m_multiplier.x = m_multiplier.y = 1; } // @@ -1039,9 +1039,9 @@ void ControlBarSchemeManager::setControlBarScheme(AsciiString schemeName) ControlBarScheme *tempScheme = findControlBarScheme( schemeName ); if(tempScheme) { - // setup the multiplyer value - m_multiplyer.x = TheDisplay->getWidth() / tempScheme->m_ScreenCreationRes.x; - m_multiplyer.y = TheDisplay->getHeight() / tempScheme->m_ScreenCreationRes.y; + // setup the multiplier value + m_multiplier.x = TheDisplay->getWidth() / tempScheme->m_ScreenCreationRes.x; + m_multiplier.y = TheDisplay->getHeight() / tempScheme->m_ScreenCreationRes.y; m_currentScheme = tempScheme; } else @@ -1066,13 +1066,13 @@ void ControlBarSchemeManager::update( void ) void ControlBarSchemeManager::drawForeground( ICoord2D offset ) { if(m_currentScheme) - m_currentScheme->drawForeground( m_multiplyer, offset); + m_currentScheme->drawForeground( m_multiplier, offset); } //----------------------------------------------------------------------------- void ControlBarSchemeManager::drawBackground( ICoord2D offset ) { if(m_currentScheme) - m_currentScheme->drawBackground( m_multiplyer, offset ); + m_currentScheme->drawBackground( m_multiplier, offset ); } //----------------------------------------------------------------------------- @@ -1121,9 +1121,9 @@ void ControlBarSchemeManager::setControlBarSchemeByPlayerTemplate( const PlayerT if(tempScheme) { - // setup the multiplyer value - m_multiplyer.x = TheDisplay->getWidth() / (Real)tempScheme->m_ScreenCreationRes.x; - m_multiplyer.y = TheDisplay->getHeight() / (Real)tempScheme->m_ScreenCreationRes.y; + // setup the multiplier value + m_multiplier.x = TheDisplay->getWidth() / (Real)tempScheme->m_ScreenCreationRes.x; + m_multiplier.y = TheDisplay->getHeight() / (Real)tempScheme->m_ScreenCreationRes.y; m_currentScheme = tempScheme; } else @@ -1189,9 +1189,9 @@ void ControlBarSchemeManager::setControlBarSchemeByPlayer(Player *p) if(tempScheme) { - // setup the multiplyer value - m_multiplyer.x = TheDisplay->getWidth() / (Real)tempScheme->m_ScreenCreationRes.x; - m_multiplyer.y = TheDisplay->getHeight() / (Real)tempScheme->m_ScreenCreationRes.y; + // setup the multiplier value + m_multiplier.x = TheDisplay->getWidth() / (Real)tempScheme->m_ScreenCreationRes.x; + m_multiplier.y = TheDisplay->getHeight() / (Real)tempScheme->m_ScreenCreationRes.y; m_currentScheme = tempScheme; } else diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp index 3e16150c71e..208af49523c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp @@ -1731,7 +1731,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos); { // we pinged on the last frame someone was there - i.e. game ended in a disconnect. // check if we were to blame. - if (TheNetwork->getPingsRecieved() < max(1, TheNetwork->getPingsSent()/2)) /// @todo: what's a good percent of pings to have gotten? + if (TheNetwork->getPingsReceived() < max(1, TheNetwork->getPingsSent()/2)) /// @todo: what's a good percent of pings to have gotten? { DEBUG_LOG(("We were to blame. Leaving gameEndedInDisconnect = true")); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp index e8f5f1115bf..3ae6ee7d7d8 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp @@ -386,7 +386,7 @@ WindowMsgHandledType GadgetTextEntrySystem( GameWindow *window, UnsignedInt msg, e->conCharPos = 0; if(TheIMEManager && TheIMEManager->isAttachedTo(window)) TheIMEManager->attach(nullptr); - //TheIMEManager->detatch(); + //TheIMEManager->detach(); } else { diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp index a6348db2ae4..b7c996399c4 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp @@ -917,7 +917,7 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms BitClear( m_grabWindow->m_status, WIN_STATUS_ACTIVE ); if( m_grabWindow->winPointInWindow( mousePos->x, mousePos->y ) ) winSendInputMsg( m_grabWindow, GWM_LEFT_UP, packedMouseCoords, 0 ); - else if( BitIsSet( m_grabWindow->m_status, WIN_STATUS_DRAGABLE )) + else if( BitIsSet( m_grabWindow->m_status, WIN_STATUS_DRAGGABLE )) { winSendInputMsg( m_grabWindow, GWM_LEFT_UP, packedMouseCoords, 0 ); } @@ -932,7 +932,7 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms case GWM_LEFT_DRAG: { - if( BitIsSet( m_grabWindow->m_status, WIN_STATUS_DRAGABLE ) ) + if( BitIsSet( m_grabWindow->m_status, WIN_STATUS_DRAGGABLE ) ) { ICoord2D *mouseDelta = (ICoord2D *)data; dx = mouseDelta->x; @@ -2266,7 +2266,7 @@ GameWindow *GameWindowManager::gogoGadgetSlider( GameWindow *parent, // create the slider thumb button WinInstanceData buttonInstData; - UnsignedInt statusFlags = status | WIN_STATUS_ENABLED | WIN_STATUS_DRAGABLE; + UnsignedInt statusFlags = status | WIN_STATUS_ENABLED | WIN_STATUS_DRAGGABLE; buttonInstData.init(); @@ -3672,7 +3672,7 @@ Bool GameWindowManager::initTestGUI( void ) // UnsignedByte alpha = 200; GameWindow *window; - UnsignedInt statusFlags = WIN_STATUS_ENABLED | WIN_STATUS_DRAGABLE | WIN_STATUS_IMAGE; + UnsignedInt statusFlags = WIN_STATUS_ENABLED | WIN_STATUS_DRAGGABLE | WIN_STATUS_IMAGE; WinInstanceData instData; // make some windows inside each other in the upper left @@ -3737,7 +3737,7 @@ Bool GameWindowManager::initTestGUI( void ) &instData, nullptr, TRUE ); // make window to hold radio buttons - window = winCreate( nullptr, WIN_STATUS_ENABLED | WIN_STATUS_DRAGABLE, + window = winCreate( nullptr, WIN_STATUS_ENABLED | WIN_STATUS_DRAGGABLE, 200, 200, 250, 45, nullptr ); window->winSetInputFunc( testGrab ); window->winSetEnabledColor( 0, winMakeColor( 50, 50, 50, 200 ) ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp index 19458e64a61..5879b8a07e1 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp @@ -449,11 +449,11 @@ void GameWindowTransitionsHandler::draw( void ) m_secondaryDrawGroup->draw(); } -void GameWindowTransitionsHandler::setGroup(AsciiString groupName, Bool immidiate ) +void GameWindowTransitionsHandler::setGroup(AsciiString groupName, Bool immediate ) { - if(groupName.isEmpty() && immidiate) + if(groupName.isEmpty() && immediate) m_currentGroup = nullptr; - if(immidiate && m_currentGroup) + if(immediate && m_currentGroup) { m_currentGroup->skip(); m_currentGroup = findGroup(groupName); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp index ca6e2798479..2fb169b0b03 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp @@ -97,7 +97,7 @@ class IMEManager : public IMEManagerInterface virtual void update( void ); virtual void attach( GameWindow *window ); ///< attach IME to specified window - virtual void detatch( void ); ///< detatch IME from current window + virtual void detach( void ); ///< detach IME from current window virtual void enable( void ); ///< Enable IME virtual void disable( void ); ///< Disable IME virtual Bool isEnabled( void ); ///< Is IME enabled @@ -539,7 +539,7 @@ IMEManager::~IMEManager() delete [] m_candidateString; - detatch(); + detach(); ImmAssociateContext( ApplicationHWnd, m_oldContext ); ImmReleaseContext( ApplicationHWnd, m_oldContext ); if ( m_context ) @@ -604,7 +604,7 @@ void IMEManager::init( void ) m_candidateTextArea->winSetUserData( TheIMEManager ); } - detatch(); + detach(); enable(); } @@ -634,7 +634,7 @@ void IMEManager::attach( GameWindow *window ) { if ( m_window != window ) { - detatch(); + detach(); if ( m_disabled == 0 ) { ImmAssociateContext( ApplicationHWnd, m_context ); @@ -646,10 +646,10 @@ void IMEManager::attach( GameWindow *window ) } //============================================================================ -// IMEManager::detatch +// IMEManager::detach //============================================================================ -void IMEManager::detatch( void ) +void IMEManager::detach( void ) { //ImmAssociateContext( ApplicationHWnd, nullptr ); m_window = nullptr; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp index ffb718029d5..08717b8c6db 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp @@ -217,7 +217,7 @@ void SinglePlayerLoadScreen::moveWindows( Int frame ) enum{ STATE_BEGIN = 250, STATE_SHOW_LOCATION = 251, - STATE_BEGIN_BREIFING = 255, + STATE_BEGIN_BRIEFING = 255, // STATE_BEGIN_ANIMATING_TEXT = 250, STATE_SHOW_CAMEO_1 = 434, STATE_BEGIN_ANIMATING_TEXT = 356, @@ -233,7 +233,7 @@ void SinglePlayerLoadScreen::moveWindows( Int frame ) if(frame < STATE_BEGIN || frame > STATE_END) return; - if( frame == STATE_BEGIN_BREIFING) + if( frame == STATE_BEGIN_BRIEFING) { // add sound support here TheAudio->friend_forcePlayAudioEventRTS(&TheCampaignManager->getCurrentMission()->m_briefingVoice); @@ -299,9 +299,9 @@ void SinglePlayerLoadScreen::moveWindows( Int frame ) STATE_BEGIN = 275, STATE_BEGIN_ANIM = 290, STATE_ANIM_CAMEO1 = 300, - STATE_ANIM_CAMEO1_TRASITION_CAMEO2 = 350, + STATE_ANIM_CAMEO1_TRANSITION_CAMEO2 = 350, STATE_ANIM_CAMEO2 = 400, - STATE_ANIM_CAMEO2_TRASITION_CAMEO3 = 450, + STATE_ANIM_CAMEO2_TRANSITION_CAMEO3 = 450, STATE_ANIM_CAMEO3 = 500, STATED_END_ANIM = 550, STATE_END = 800 @@ -321,7 +321,7 @@ void SinglePlayerLoadScreen::moveWindows( Int frame ) GadgetStaticTextSetText(m_cameoText, TheGameText->fetch(TheCampaignManager->getCurrentMission()->m_cameoImageName[0])); //save of positions } - else if( frame == STATE_ANIM_CAMEO1_TRASITION_CAMEO2) + else if( frame == STATE_ANIM_CAMEO1_TRANSITION_CAMEO2) { m_cameoWindow1->winEnable(FALSE); GadgetStaticTextSetText(m_cameoText, UnicodeString::TheEmptyString); @@ -335,11 +335,11 @@ void SinglePlayerLoadScreen::moveWindows( Int frame ) endPos.y = startPos.y; } - else if( frame > STATE_ANIM_CAMEO1_TRASITION_CAMEO2 && frame < STATE_ANIM_CAMEO2) + else if( frame > STATE_ANIM_CAMEO1_TRANSITION_CAMEO2 && frame < STATE_ANIM_CAMEO2) { //extrapolate between start and end pos - Real percent = INT_TO_REAL((frame - STATE_ANIM_CAMEO1_TRASITION_CAMEO2)) / (STATE_ANIM_CAMEO2 - STATE_ANIM_CAMEO1_TRASITION_CAMEO2); + Real percent = INT_TO_REAL((frame - STATE_ANIM_CAMEO1_TRANSITION_CAMEO2)) / (STATE_ANIM_CAMEO2 - STATE_ANIM_CAMEO1_TRANSITION_CAMEO2); m_cameoFrame->winSetPosition(startPos.x + (endPos.x - startPos.x) * percent, endPos.y); } else if( frame == STATE_ANIM_CAMEO2 ) @@ -348,7 +348,7 @@ void SinglePlayerLoadScreen::moveWindows( Int frame ) m_cameoFrame->winSetPosition(endPos.x, endPos.y); GadgetStaticTextSetText(m_cameoText, TheGameText->fetch(TheCampaignManager->getCurrentMission()->m_cameoImageName[1])); } - else if( frame == STATE_ANIM_CAMEO2_TRASITION_CAMEO3) + else if( frame == STATE_ANIM_CAMEO2_TRANSITION_CAMEO3) { m_cameoWindow2->winEnable(FALSE); GadgetStaticTextSetText(m_cameoText, UnicodeString::TheEmptyString); @@ -362,11 +362,11 @@ void SinglePlayerLoadScreen::moveWindows( Int frame ) endPos.y = startPos.y; } - else if( frame > STATE_ANIM_CAMEO2_TRASITION_CAMEO3 && frame < STATE_ANIM_CAMEO3) + else if( frame > STATE_ANIM_CAMEO2_TRANSITION_CAMEO3 && frame < STATE_ANIM_CAMEO3) { //extrapolate between start and end pos - Real percent = INT_TO_REAL((frame - STATE_ANIM_CAMEO2_TRASITION_CAMEO3)) / (STATE_ANIM_CAMEO3 - STATE_ANIM_CAMEO2_TRASITION_CAMEO3); + Real percent = INT_TO_REAL((frame - STATE_ANIM_CAMEO2_TRANSITION_CAMEO3)) / (STATE_ANIM_CAMEO3 - STATE_ANIM_CAMEO2_TRANSITION_CAMEO3); m_cameoFrame->winSetPosition(startPos.x + (endPos.x - startPos.x) * percent, endPos.y); } else if( frame == STATE_ANIM_CAMEO3 ) diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp index c5498126c4f..f1ae0af8f51 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp @@ -163,7 +163,7 @@ void Shell::reset( void ) { if (TheIMEManager) - TheIMEManager->detatch(); + TheIMEManager->detach(); // pop all screens while( m_screenCount ) @@ -312,7 +312,7 @@ void Shell::hide( Bool hide ) m_screenStack[ i ]->hide( hide ); if (TheIMEManager) - TheIMEManager->detatch(); + TheIMEManager->detach(); } @@ -376,7 +376,7 @@ void Shell::push( AsciiString filename, Bool shutdownImmediate ) } // if (TheIMEManager) -// TheIMEManager->detatch(); +// TheIMEManager->detach(); } @@ -416,7 +416,7 @@ void Shell::pop( void ) screen->runShutdown( &immediatePop ); if (TheIMEManager) - TheIMEManager->detatch(); + TheIMEManager->detach(); } @@ -454,7 +454,7 @@ void Shell::popImmediate( void ) doPop( FALSE ); if (TheIMEManager) - TheIMEManager->detatch(); + TheIMEManager->detach(); } @@ -593,7 +593,7 @@ void Shell::hideShell( void ) } if (TheIMEManager) - TheIMEManager->detatch(); + TheIMEManager->detach(); // Mark that the shell is no longer up. m_isShellActive = FALSE; @@ -676,7 +676,7 @@ void Shell::doPush( AsciiString layoutFile ) linkScreen( newScreen ); if (TheIMEManager) - TheIMEManager->detatch(); + TheIMEManager->detach(); // run the init function automatically newScreen->runInit( nullptr ); @@ -716,7 +716,7 @@ void Shell::doPop( Bool impendingPush ) } if (TheIMEManager) - TheIMEManager->detatch(); + TheIMEManager->detach(); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp index e5a67328b24..de89a8b5a29 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp @@ -6471,9 +6471,9 @@ Path *Pathfinder::buildGroundPath(Bool isCrusher, const Coord3D *fromPos, Pathfi /** * Work backwards from goal cell to construct final path. */ -Path *Pathfinder::buildHierachicalPath( const Coord3D *fromPos, PathfindCell *goalCell ) +Path *Pathfinder::buildHierarchicalPath( const Coord3D *fromPos, PathfindCell *goalCell ) { - DEBUG_ASSERTCRASH( goalCell, ("Pathfinder::buildHierachicalPath: goalCell == nullptr") ); + DEBUG_ASSERTCRASH( goalCell, ("Pathfinder::buildHierarchicalPath: goalCell == nullptr") ); Path *path = newInstance(Path); @@ -7437,7 +7437,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu m_isTunneling = false; // construct and return path - Path *path = buildHierachicalPath( from, goalCell ); + Path *path = buildHierarchicalPath( from, goalCell ); #if defined(RTS_DEBUG) Bool show = TheGlobalData->m_debugAI==AI_DEBUG_PATHS; show |= (TheGlobalData->m_debugAI==AI_DEBUG_GROUND_PATHS); @@ -7626,7 +7626,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu if (closestOK && closestCell) { m_isTunneling = false; // construct and return path - Path *path = buildHierachicalPath( from, closestCell ); + Path *path = buildHierarchicalPath( from, closestCell ); #if RETAIL_COMPATIBLE_PATHFINDING if (!s_useFixedPathfinding) diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp index 04a21d7cc38..700a1ea8cc9 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp @@ -152,8 +152,8 @@ RailroadBehavior::RailroadBehavior( Thing *thing, const ModuleData *moduleData ) m_waitingInWings = TRUE; m_endOfLine = FALSE; m_isLocomotive = modData->m_isLocomotive; - m_isLeadCarraige = m_isLocomotive; // for now, I am the lead, only if I am the locomotive - m_wantsToBeLeadCarraige = FALSE; + m_isLeadCarriage = m_isLocomotive; // for now, I am the lead, only if I am the locomotive + m_wantsToBeLeadCarriage = FALSE; m_disembark = FALSE; m_inTunnel = FALSE; m_held = FALSE; @@ -194,7 +194,7 @@ Bool RailroadBehavior::isRailroad() const return FALSE; if (m_endOfLine) return FALSE; - if (m_isLeadCarraige) + if (m_isLeadCarriage) return TRUE; if (m_trailerID==INVALID_ID) return TRUE; @@ -237,7 +237,7 @@ void RailroadBehavior::onCollide( Object *other, const Coord3D *loc, const Coord { other->kill(); } - else if ( m_isLeadCarraige ) //yikes! I just coasted into some other carriage + else if ( m_isLeadCarriage ) //yikes! I just coasted into some other carriage { other->kill(); obj->kill();//and I am dead, too @@ -769,12 +769,12 @@ UpdateSleepTime RailroadBehavior::update( void ) - if ( m_wantsToBeLeadCarraige > FRAMES_UNPULLED_LONG_ENOUGH_TO_UNHITCH )//if this flag survived until now, I have lost my puller + if ( m_wantsToBeLeadCarriage > FRAMES_UNPULLED_LONG_ENOUGH_TO_UNHITCH )//if this flag survived until now, I have lost my puller { - m_isLeadCarraige = TRUE; + m_isLeadCarriage = TRUE; } - if ( m_isLeadCarraige ) + if ( m_isLeadCarriage ) { if ( m_conductorState == COAST ) @@ -819,9 +819,9 @@ UpdateSleepTime RailroadBehavior::update( void ) TheGameLogic->destroyObject( getObject() ); } } - else if ( m_wantsToBeLeadCarraige <= FRAMES_UNPULLED_LONG_ENOUGH_TO_UNHITCH )// if I am not the lead carriage + else if ( m_wantsToBeLeadCarriage <= FRAMES_UNPULLED_LONG_ENOUGH_TO_UNHITCH )// if I am not the lead carriage { - m_wantsToBeLeadCarraige ++; // like every young carriage, I aspire to be the lead carriage some day + m_wantsToBeLeadCarriage ++; // like every young carriage, I aspire to be the lead carriage some day // unless getpulled() set this false, I will be on the next update! Joy! } @@ -1165,7 +1165,7 @@ void RailroadBehavior::hitchNewCarriagebyProximity( ObjectID locoID, TrainTrack void RailroadBehavior::getPulled( PullInfo *info ) { //ENFORCE MY STATUS AS A PULLEE, NOT A PULLER, and update my position, speed etc. - m_wantsToBeLeadCarraige = 0; + m_wantsToBeLeadCarriage = 0; if ( ! m_track ) { @@ -1567,11 +1567,11 @@ void RailroadBehavior::xfer( Xfer *xfer ) //Bool m_isLocomotive; ///< Am I a locomotive, xfer->xferBool( &m_isLocomotive ); - //Bool m_isLeadCarraige; ///< Am the carraige in front, - xfer->xferBool( &m_isLeadCarraige ); + //Bool m_isLeadCarriage; ///< Am the carraige in front, + xfer->xferBool( &m_isLeadCarriage ); - //Int m_wantsToBeLeadCarraige; ///< Am the carraige in front, - xfer->xferInt( &m_wantsToBeLeadCarraige ); + //Int m_wantsToBeLeadCarriage; ///< Am the carraige in front, + xfer->xferInt( &m_wantsToBeLeadCarriage ); //Bool m_disembark; ///< If I wait at a station, I should also evacuate everybody when I get theres xfer->xferBool( &m_disembark ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp index 94d8ac84b87..c5693de7f61 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp @@ -2859,8 +2859,8 @@ Bool Weapon::isWithinTargetPitch(const Object *source, const Object *victim) con const Coord3D* src = source->getPosition(); const Coord3D* dst = victim->getPosition(); - const Real ACCCEPTABLE_DZ = 10.0f; - if (fabs(dst->z - src->z) < ACCCEPTABLE_DZ) + const Real ACCEPTABLE_DZ = 10.0f; + if (fabs(dst->z - src->z) < ACCEPTABLE_DZ) return true; // always good enough if dz is small, regardless of pitch Real minPitch, maxPitch; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp index 397edece8d1..9ab56dfb32a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp @@ -2019,7 +2019,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData ) //UnsignedInt oldCRC = m_cachedCRCs[msg->getPlayerIndex()]; UnsignedInt newCRC = msg->getArgument(0)->integer; - //DEBUG_LOG(("Recieved CRC of %8.8X from %ls on frame %d", newCRC, + //DEBUG_LOG(("Received CRC of %8.8X from %ls on frame %d", newCRC, //thisPlayer->getPlayerDisplayName().str(), m_frame)); m_cachedCRCs[msg->getPlayerIndex()] = newCRC; // to mask problem: = (oldCRC < newCRC)?newCRC:oldCRC; } diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h index d7080a933e1..7e33fcd7552 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h @@ -78,7 +78,7 @@ class W3DAssetManager: public WW3DAssetManager void Report_Used_Font3DDatas( void ); void Report_Used_FontChars (void); - virtual RenderObjClass * Create_Render_Obj(const char * name,float scale, const int color, const char *oldTexure=nullptr, const char *newTexture=nullptr); + virtual RenderObjClass * Create_Render_Obj(const char * name,float scale, const int color, const char *oldTexture=nullptr, const char *newTexture=nullptr); ///Swaps the specified textures in the render object prototype. int replacePrototypeTexture(RenderObjClass *robj, const char * oldname, const char * newname); diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp index 51e0b0f76ca..4d7f7168548 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp @@ -181,10 +181,10 @@ void W3DMainMenuDraw( GameWindow *window, WinInstanceData *instData ) IRegion2D bottomHorizontal2= {pos.x, pos.y + size.y, pos.x + size.x, pos.y + size.y }; IRegion2D bottomHorizontal2drop= {pos.x, pos.y + size.y + 1, pos.x + size.x, pos.y + size.y + 1 }; - IRegion2D verticle1 ={pos.x + Int(size.x * .225), pos.y , pos.x + Int(size.x * .225), height }; - IRegion2D verticle2 ={pos.x + Int(size.x * .445), pos.y, pos.x + Int(size.x * .445), height }; - IRegion2D verticle3 ={pos.x + Int(size.x * .6662), pos.y, pos.x + Int(size.x * .6662), height }; - IRegion2D verticle4 ={pos.x + Int(size.x * .885), pos.y , pos.x + Int(size.x * .885), height }; + IRegion2D vertical1 ={pos.x + Int(size.x * .225), pos.y , pos.x + Int(size.x * .225), height }; + IRegion2D vertical2 ={pos.x + Int(size.x * .445), pos.y, pos.x + Int(size.x * .445), height }; + IRegion2D vertical3 ={pos.x + Int(size.x * .6662), pos.y, pos.x + Int(size.x * .6662), height }; + IRegion2D vertical4 ={pos.x + Int(size.x * .885), pos.y , pos.x + Int(size.x * .885), height }; // static IRegion2D verticle5 ={pos.x + (size.x * .7250), pos.y + (size.y * .12), pos.x + (size.x * .7250), pos.y + (size.y * .86) }; // static IRegion2D verticle6 ={pos.x + (size.x * .9062), pos.y + (size.y * .12), pos.x + (size.x * .9062), pos.y + (size.y * .86) }; @@ -200,10 +200,10 @@ void W3DMainMenuDraw( GameWindow *window, WinInstanceData *instData ) - TheDisplay->drawLine(verticle1.lo.x,verticle1.lo.y,verticle1.hi.x,verticle1.hi.y,3,color); - TheDisplay->drawLine(verticle2.lo.x,verticle2.lo.y,verticle2.hi.x,verticle2.hi.y,3,color); - TheDisplay->drawLine(verticle3.lo.x,verticle3.lo.y,verticle3.hi.x,verticle3.hi.y,3,color); - TheDisplay->drawLine(verticle4.lo.x,verticle4.lo.y,verticle4.hi.x,verticle4.hi.y,3,color); + TheDisplay->drawLine(vertical1.lo.x,vertical1.lo.y,vertical1.hi.x,vertical1.hi.y,3,color); + TheDisplay->drawLine(vertical2.lo.x,vertical2.lo.y,vertical2.hi.x,vertical2.hi.y,3,color); + TheDisplay->drawLine(vertical3.lo.x,vertical3.lo.y,vertical3.hi.x,vertical3.hi.y,3,color); + TheDisplay->drawLine(vertical4.lo.x,vertical4.lo.y,vertical4.hi.x,vertical4.hi.y,3,color); // TheDisplay->drawLine(verticle5.lo.x,verticle5.lo.y,verticle5.hi.x,verticle5.hi.y,3,color); // TheDisplay->drawLine(verticle6.lo.x,verticle6.lo.y,verticle6.hi.x,verticle6.hi.y,3,color); // TheDisplay->drawLine(m_rightLineFromButton.lo.x,m_rightLineFromButton.lo.y,m_rightLineFromButton.hi.x,m_rightLineFromButton.hi.y,3,color1,color2); @@ -245,10 +245,10 @@ void W3DMainMenuFourDraw( GameWindow *window, WinInstanceData *instData ) IRegion2D bottomHorizontal2= {pos.x, pos.y + size.y, pos.x + size.x, pos.y + size.y }; IRegion2D bottomHorizontal2drop= {pos.x, pos.y + size.y + 1, pos.x + size.x, pos.y + size.y + 1 }; - IRegion2D verticle1 ={pos.x + Int(size.x * .295), pos.y , pos.x + Int(size.x * .295), height }; - IRegion2D verticle2 ={pos.x + Int(size.x * .59), pos.y, pos.x + Int(size.x * .59), height }; - //IRegion2D verticle3 ={pos.x + (size.x * .6662), pos.y, pos.x + (size.x * .6662), height }; - IRegion2D verticle4 ={pos.x + Int(size.x * .885), pos.y , pos.x + Int(size.x * .885), height }; + IRegion2D vertical1 ={pos.x + Int(size.x * .295), pos.y , pos.x + Int(size.x * .295), height }; + IRegion2D vertical2 ={pos.x + Int(size.x * .59), pos.y, pos.x + Int(size.x * .59), height }; + //IRegion2D vertical3 ={pos.x + (size.x * .6662), pos.y, pos.x + (size.x * .6662), height }; + IRegion2D vertical4 ={pos.x + Int(size.x * .885), pos.y , pos.x + Int(size.x * .885), height }; // static IRegion2D verticle5 ={pos.x + (size.x * .7250), pos.y + (size.y * .12), pos.x + (size.x * .7250), pos.y + (size.y * .86) }; // static IRegion2D verticle6 ={pos.x + (size.x * .9062), pos.y + (size.y * .12), pos.x + (size.x * .9062), pos.y + (size.y * .86) }; @@ -264,10 +264,10 @@ void W3DMainMenuFourDraw( GameWindow *window, WinInstanceData *instData ) - TheDisplay->drawLine(verticle1.lo.x,verticle1.lo.y,verticle1.hi.x,verticle1.hi.y,3,color); - TheDisplay->drawLine(verticle2.lo.x,verticle2.lo.y,verticle2.hi.x,verticle2.hi.y,3,color); - //TheDisplay->drawLine(verticle3.lo.x,verticle3.lo.y,verticle3.hi.x,verticle3.hi.y,3,color); - TheDisplay->drawLine(verticle4.lo.x,verticle4.lo.y,verticle4.hi.x,verticle4.hi.y,3,color); + TheDisplay->drawLine(vertical1.lo.x,vertical1.lo.y,vertical1.hi.x,vertical1.hi.y,3,color); + TheDisplay->drawLine(vertical2.lo.x,vertical2.lo.y,vertical2.hi.x,vertical2.hi.y,3,color); + //TheDisplay->drawLine(vertical3.lo.x,vertical3.lo.y,vertical3.hi.x,vertical3.hi.y,3,color); + TheDisplay->drawLine(vertical4.lo.x,vertical4.lo.y,vertical4.hi.x,vertical4.hi.y,3,color); // TheDisplay->drawLine(verticle5.lo.x,verticle5.lo.y,verticle5.hi.x,verticle5.hi.y,3,color); // TheDisplay->drawLine(verticle6.lo.x,verticle6.lo.y,verticle6.hi.x,verticle6.hi.y,3,color); // TheDisplay->drawLine(m_rightLineFromButton.lo.x,m_rightLineFromButton.lo.y,m_rightLineFromButton.hi.x,m_rightLineFromButton.hi.y,3,color1,color2); diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp index 80dd1ad076d..ba5cde751d2 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp @@ -703,7 +703,7 @@ __int64 Total_Create_Render_Obj_Time=0; #endif //--------------------------------------------------------------------- /** Generals specific code to generate customized render objects for each team color - Scale==1.0, color==0x00000000, and oldTexure== nullptr are defaults that do nothing. + Scale==1.0, color==0x00000000, and oldTexture==nullptr are defaults that do nothing. */ RenderObjClass * W3DAssetManager::Create_Render_Obj( const char * name, diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp index e2b02421b96..e75b7d522ef 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp @@ -387,7 +387,7 @@ void ParticleEmitterClass::Reset(void) // Note: This flag needs to be set first thing, otherwise // getting the transform will result in an 'update_x' call // which in turn results in a 'Set_Animation_Hidden' call, which - // in turn will cause the Update_Visibilty function to call + // in turn will cause the Update_Visibility function to call // Start(). This won't cause a stack overflow like in Start // but it would do some extra work. Active = true; @@ -407,7 +407,7 @@ void ParticleEmitterClass::Start(void) // Note: This flag needs to be set first thing, otherwise // getting the transform will result in an 'update_x' call // which in turn results in a 'Set_Animation_Hidden' call, which - // in turn will cause the Update_Visibilty function to call + // in turn will cause the Update_Visibility function to call // this method. And then... Stack Overflow! ;) Active = true; @@ -848,7 +848,7 @@ ParticleEmitterClass::Set_Name (const char *pname) void -ParticleEmitterClass::Update_On_Visibilty(void) +ParticleEmitterClass::Update_On_Visibility(void) { // Simply start or stop the emission based on // the visibility state of the emitter. diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h index ece8ba7c080..05dc24ed556 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h @@ -151,10 +151,10 @@ class ParticleEmitterClass : public RenderObjClass virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const { sphere.Center.Set(0,0,0); sphere.Radius = 0; } virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const { box.Center.Set(0,0,0); box.Extent.Set(0,0,0); } - virtual void Set_Hidden(int onoff) { RenderObjClass::Set_Hidden (onoff); Update_On_Visibilty (); } - virtual void Set_Visible(int onoff) { RenderObjClass::Set_Visible (onoff); Update_On_Visibilty (); } - virtual void Set_Animation_Hidden(int onoff) { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibilty (); } - virtual void Set_Force_Visible(int onoff) { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibilty (); } + virtual void Set_Hidden(int onoff) { RenderObjClass::Set_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Visible(int onoff) { RenderObjClass::Set_Visible (onoff); Update_On_Visibility (); } + virtual void Set_Animation_Hidden(int onoff) { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibility (); } + virtual void Set_Force_Visible(int onoff) { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibility (); } virtual void Set_LOD_Bias(float bias) { if (Buffer) Buffer->Set_LOD_Bias(bias); } @@ -284,7 +284,7 @@ class ParticleEmitterClass : public RenderObjClass virtual void Add_Dependencies_To_List (DynamicVectorClass &file_list, bool textures_only = false); // This method is called each time the visiblity state of the emitter changes. - virtual void Update_On_Visibilty (void); + virtual void Update_On_Visibility (void); private: diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp index 48f10b95ca9..e27d11a055f 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp @@ -488,7 +488,7 @@ void Render2DClass::Add_Tri( const Vector2 & v0, const Vector2 & v1, const Vecto { int old_vert_count = Vertices.Count(); - // Add the verticies (translated to new coordinates) + // Add the vertices (translated to new coordinates) #if 0 Vertices.Add( Convert_Vert( v0 ), new_vert_count ); Vertices.Add( Convert_Vert( v1 ), new_vert_count ); diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h index 65201f6a9d5..6c21bf03522 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h @@ -2119,11 +2119,11 @@ struct W3dHLodSubObjectStruct #define W3D_BOX_ATTRIBUTE_ALIGNED 0x00000002 #define W3D_BOX_ATTRIBUTE_COLLISION_TYPE_MASK 0x00000FF0 // mask for the collision type bits #define W3D_BOX_ATTRIBUTE_COLLISION_TYPE_SHIFT 4 // shifting to get to the collision type bits -#define W3D_BOX_ATTRIBTUE_COLLISION_TYPE_PHYSICAL 0x00000010 // physical collisions -#define W3D_BOX_ATTRIBTUE_COLLISION_TYPE_PROJECTILE 0x00000020 // projectiles (rays) collide with this -#define W3D_BOX_ATTRIBTUE_COLLISION_TYPE_VIS 0x00000040 // vis rays collide with this mesh -#define W3D_BOX_ATTRIBTUE_COLLISION_TYPE_CAMERA 0x00000080 // cameras collide with this mesh -#define W3D_BOX_ATTRIBTUE_COLLISION_TYPE_VEHICLE 0x00000100 // vehicles collide with this mesh +#define W3D_BOX_ATTRIBUTE_COLLISION_TYPE_PHYSICAL 0x00000010 // physical collisions +#define W3D_BOX_ATTRIBUTE_COLLISION_TYPE_PROJECTILE 0x00000020 // projectiles (rays) collide with this +#define W3D_BOX_ATTRIBUTE_COLLISION_TYPE_VIS 0x00000040 // vis rays collide with this mesh +#define W3D_BOX_ATTRIBUTE_COLLISION_TYPE_CAMERA 0x00000080 // cameras collide with this mesh +#define W3D_BOX_ATTRIBUTE_COLLISION_TYPE_VEHICLE 0x00000100 // vehicles collide with this mesh struct W3dBoxStruct { diff --git a/GeneralsMD/Code/Tools/GUIEdit/Resource/GUIEdit.rc b/GeneralsMD/Code/Tools/GUIEdit/Resource/GUIEdit.rc index 16e4db31812..1a7a964a811 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Resource/GUIEdit.rc +++ b/GeneralsMD/Code/Tools/GUIEdit/Resource/GUIEdit.rc @@ -258,7 +258,7 @@ BEGIN LTEXT "Name length + layout filename length (.wnd) must not exceed 'X' characters", STATIC_NAME_MAX,199,160,244,12,SS_CENTERIMAGE GROUPBOX "Window Status",IDC_STATIC,4,108,144,70 - CONTROL "Dragable",CHECK_DRAGABLE,"Button",BS_AUTOCHECKBOX | + CONTROL "Dragable",CHECK_DRAGGABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,120,45,10 CONTROL "Enabled",CHECK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,132,42,10 @@ -360,7 +360,7 @@ BEGIN STATIC_NAME_MAX,200,135,244,12,SS_CENTERIMAGE GROUPBOX "Window Status",IDC_STATIC,152,4,108,100 GROUPBOX "Images and Colors",IDC_STATIC,268,4,192,100 - CONTROL "Dragable",CHECK_DRAGABLE,"Button",BS_AUTOCHECKBOX | + CONTROL "Dragable",CHECK_DRAGGABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,17,45,10 CONTROL "Enabled",CHECK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,31,42,10 @@ -441,7 +441,7 @@ BEGIN STATIC_NAME_MAX,200,135,244,12,SS_CENTERIMAGE GROUPBOX "Window Status",IDC_STATIC,152,4,108,100 GROUPBOX "Images and Colors",IDC_STATIC,268,4,192,100 - CONTROL "Dragable",CHECK_DRAGABLE,"Button",BS_AUTOCHECKBOX | + CONTROL "Dragable",CHECK_DRAGGABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,20,45,10 CONTROL "Enabled",CHECK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,40,42,10 @@ -493,7 +493,7 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,395,166,50,14 GROUPBOX "Window Status",IDC_STATIC,152,4,108,100 GROUPBOX "Images and Colors",IDC_STATIC,268,4,192,100 - CONTROL "Dragable",CHECK_DRAGABLE,"Button",BS_AUTOCHECKBOX | + CONTROL "Dragable",CHECK_DRAGGABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,20,45,10 CONTROL "Enabled",CHECK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,40,42,10 @@ -575,7 +575,7 @@ BEGIN LTEXT "Name length + layout filename length (.wnd) must not exceed 'X' characters", STATIC_NAME_MAX,160,159,244,12,SS_CENTERIMAGE GROUPBOX "Window Status",IDC_STATIC,112,4,108,124 - CONTROL "Dragable",CHECK_DRAGABLE,"Button",BS_AUTOCHECKBOX | + CONTROL "Dragable",CHECK_DRAGGABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,20,45,10 CONTROL "Enabled",CHECK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,40,42,10 @@ -663,7 +663,7 @@ BEGIN STATIC_NAME_MAX,200,158,244,12,SS_CENTERIMAGE GROUPBOX "Window Status",IDC_STATIC,152,4,108,100 GROUPBOX "Images and Colors",IDC_STATIC,269,7,192,124 - CONTROL "Dragable",CHECK_DRAGABLE,"Button",BS_AUTOCHECKBOX | + CONTROL "Dragable",CHECK_DRAGGABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,20,45,10 CONTROL "Enabled",CHECK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,40,42,10 @@ -742,7 +742,7 @@ BEGIN STATIC_NAME_MAX,200,135,244,12,SS_CENTERIMAGE GROUPBOX "Window Status",IDC_STATIC,152,4,108,100 GROUPBOX "Images and Colors",IDC_STATIC,268,4,192,100 - CONTROL "Dragable",CHECK_DRAGABLE,"Button",BS_AUTOCHECKBOX | + CONTROL "Dragable",CHECK_DRAGGABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,20,45,10 CONTROL "Enabled",CHECK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,40,42,10 @@ -817,7 +817,7 @@ BEGIN STATIC_NAME_MAX,200,135,244,12,SS_CENTERIMAGE GROUPBOX "Window Status",IDC_STATIC,152,4,108,100 GROUPBOX "Images and Colors",IDC_STATIC,268,4,192,100 - CONTROL "Dragable",CHECK_DRAGABLE,"Button",BS_AUTOCHECKBOX | + CONTROL "Dragable",CHECK_DRAGGABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,20,45,10 CONTROL "Enabled",CHECK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,40,42,10 @@ -902,7 +902,7 @@ BEGIN LTEXT "Display Font",IDC_STATIC,14,146,128,8 GROUPBOX "Window Status",IDC_STATIC,152,4,108,100 GROUPBOX "Images and Colors",IDC_STATIC,268,4,192,100 - CONTROL "Dragable",CHECK_DRAGABLE,"Button",BS_AUTOCHECKBOX | + CONTROL "Dragable",CHECK_DRAGGABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,20,45,10 CONTROL "Enabled",CHECK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,40,42,10 @@ -1068,7 +1068,7 @@ BEGIN STATIC_NAME_MAX,200,135,244,12,SS_CENTERIMAGE GROUPBOX "Window Status",IDC_STATIC,152,4,108,100 GROUPBOX "Images and Colors",IDC_STATIC,268,4,192,100 - CONTROL "Dragable",CHECK_DRAGABLE,"Button",BS_AUTOCHECKBOX | + CONTROL "Dragable",CHECK_DRAGGABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,20,45,10 CONTROL "Enabled",CHECK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,40,42,10 @@ -1178,7 +1178,7 @@ BEGIN GROUPBOX "Combo Box Data",IDC_STATIC,4,4,144,233 LTEXT "Display Font",IDC_STATIC,12,152,128,8 GROUPBOX "Window Status",IDC_STATIC,152,4,108,100 - CONTROL "Dragable",CHECK_DRAGABLE,"Button",BS_AUTOCHECKBOX | + CONTROL "Dragable",CHECK_DRAGGABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,20,45,10 CONTROL "Enabled",CHECK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,40,42,10 diff --git a/GeneralsMD/Code/Tools/GUIEdit/Resource/resource.h b/GeneralsMD/Code/Tools/GUIEdit/Resource/resource.h index b1c220f0d51..3158c6358b3 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Resource/resource.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Resource/resource.h @@ -59,7 +59,7 @@ #define TAB_CONTROL_PROPERTIES_DIALOG 153 #define COMBO_BOX_PROPERTIES_DIALOG 154 #define CHECK_SEE_THRU 1004 -#define CHECK_DRAGABLE 1005 +#define CHECK_DRAGGABLE 1005 #define CHECK_ENABLED 1006 #define CHECK_HIDDEN 1007 #define CHECK_NO_INPUT 1008 diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Properties.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Properties.cpp index 53823215495..72feb50dc80 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Source/Properties.cpp +++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Properties.cpp @@ -808,8 +808,8 @@ void CommonDialogInitialize( GameWindow *window, HWND dialog ) // populate common properties if( BitIsSet( window->winGetStatus(), WIN_STATUS_ENABLED ) ) CheckDlgButton( dialog, CHECK_ENABLED, BST_CHECKED ); - if( BitIsSet( window->winGetStatus(), WIN_STATUS_DRAGABLE ) ) - CheckDlgButton( dialog, CHECK_DRAGABLE, BST_CHECKED ); + if( BitIsSet( window->winGetStatus(), WIN_STATUS_DRAGGABLE ) ) + CheckDlgButton( dialog, CHECK_DRAGGABLE, BST_CHECKED ); if( BitIsSet( window->winGetStatus(), WIN_STATUS_HIDDEN ) ) CheckDlgButton( dialog, CHECK_HIDDEN, BST_CHECKED ); if( BitIsSet( window->winGetStatus(), WIN_STATUS_NO_INPUT ) ) @@ -1068,9 +1068,9 @@ Bool SaveCommonDialogProperties( HWND dialog, GameWindow *window ) // save bits window->winEnable( IsDlgButtonChecked( dialog, CHECK_ENABLED ) ); - bit = WIN_STATUS_DRAGABLE; + bit = WIN_STATUS_DRAGGABLE; window->winClearStatus( bit ); - if( IsDlgButtonChecked( dialog, CHECK_DRAGABLE ) ) + if( IsDlgButtonChecked( dialog, CHECK_DRAGGABLE ) ) window->winSetStatus( bit ); bit = WIN_STATUS_HIDDEN; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp index 5a73e774719..f41134b4a6f 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp @@ -1978,7 +1978,7 @@ void WbView3d::updateHysteresis(void) // ---------------------------------------------------------------------------- Bool WbView3d::docToViewCoords(Coord3D curPt, CPoint* newPt) { - Bool coordInsideFrustrum = true; + Bool coordInsideFrustum = true; Vector3 world; Vector3 screen; newPt->x = -1000; @@ -1989,9 +1989,9 @@ Bool WbView3d::docToViewCoords(Coord3D curPt, CPoint* newPt) world.Set( curPt.x, curPt.y, curPt.z ); if (m_camera->Project( screen, world ) != CameraClass::INSIDE_FRUSTUM) { - coordInsideFrustrum = false; + coordInsideFrustum = false; } else { - coordInsideFrustrum = true; + coordInsideFrustum = true; } CRect rClient; @@ -2011,7 +2011,7 @@ Bool WbView3d::docToViewCoords(Coord3D curPt, CPoint* newPt) newPt->x = rClient.left + sx; newPt->y = rClient.top + sy; - return coordInsideFrustrum; + return coordInsideFrustum; } // ---------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/Tools/wdump/chunk_d.cpp b/GeneralsMD/Code/Tools/wdump/chunk_d.cpp index 1f645f923ed..373dff6a7af 100644 --- a/GeneralsMD/Code/Tools/wdump/chunk_d.cpp +++ b/GeneralsMD/Code/Tools/wdump/chunk_d.cpp @@ -2027,20 +2027,20 @@ void ChunkTableClass::List_W3D_CHUNK_BOX(ChunkItem * Item,CListCtrl * list) if (box->Attributes & W3D_BOX_ATTRIBUTE_ALIGNED) { AddItem(list,counter,"Attributes","W3D_BOX_ATTRIBUTE_ALIGNED","flag"); } - if (box->Attributes & W3D_BOX_ATTRIBTUE_COLLISION_TYPE_PHYSICAL) { - AddItem(list,counter,"Attributes","W3D_BOX_ATTRIBTUE_COLLISION_TYPE_PHYSICAL","flag"); + if (box->Attributes & W3D_BOX_ATTRIBUTE_COLLISION_TYPE_PHYSICAL) { + AddItem(list,counter,"Attributes","W3D_BOX_ATTRIBUTE_COLLISION_TYPE_PHYSICAL","flag"); } - if (box->Attributes & W3D_BOX_ATTRIBTUE_COLLISION_TYPE_PROJECTILE) { - AddItem(list,counter,"Attributes","W3D_BOX_ATTRIBTUE_COLLISION_TYPE_PROJECTILE","flag"); + if (box->Attributes & W3D_BOX_ATTRIBUTE_COLLISION_TYPE_PROJECTILE) { + AddItem(list,counter,"Attributes","W3D_BOX_ATTRIBUTE_COLLISION_TYPE_PROJECTILE","flag"); } - if (box->Attributes & W3D_BOX_ATTRIBTUE_COLLISION_TYPE_VIS) { - AddItem(list,counter,"Attributes","W3D_BOX_ATTRIBTUE_COLLISION_TYPE_VIS","flag"); + if (box->Attributes & W3D_BOX_ATTRIBUTE_COLLISION_TYPE_VIS) { + AddItem(list,counter,"Attributes","W3D_BOX_ATTRIBUTE_COLLISION_TYPE_VIS","flag"); } - if (box->Attributes & W3D_BOX_ATTRIBTUE_COLLISION_TYPE_CAMERA) { - AddItem(list,counter,"Attributes","W3D_BOX_ATTRIBTUE_COLLISION_TYPE_CAMERA","flag"); + if (box->Attributes & W3D_BOX_ATTRIBUTE_COLLISION_TYPE_CAMERA) { + AddItem(list,counter,"Attributes","W3D_BOX_ATTRIBUTE_COLLISION_TYPE_CAMERA","flag"); } - if (box->Attributes & W3D_BOX_ATTRIBTUE_COLLISION_TYPE_VEHICLE) { - AddItem(list,counter,"Attributes","W3D_BOX_ATTRIBTUE_COLLISION_TYPE_VEHICLE","flag"); + if (box->Attributes & W3D_BOX_ATTRIBUTE_COLLISION_TYPE_VEHICLE) { + AddItem(list,counter,"Attributes","W3D_BOX_ATTRIBUTE_COLLISION_TYPE_VEHICLE","flag"); } AddItem(list,counter,"Name",box->Name);