From 34516d1619a57efe4b42e1f2244b386444f161f3 Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Sun, 18 Jan 2026 18:34:50 -0600 Subject: [PATCH] refactor: Fix spelling errors in internal identifiers --- Core/GameEngine/Include/Common/AudioEventRTS.h | 6 +++--- .../Source/Common/Audio/AudioEventRTS.cpp | 14 +++++++------- .../GameEngine/Source/Common/Audio/GameAudio.cpp | 2 +- .../Include/W3DDevice/GameClient/W3DView.h | 2 +- .../MilesAudioDevice/MilesAudioManager.cpp | 4 ++-- .../Source/WWVegas/WWMath/aabtreecull.cpp | 8 ++++---- Core/Tools/WW3D/max2w3d/aabtreebuilder.cpp | 4 ++-- Core/Tools/mangler/wlib/threadfac.cpp | 16 ++++++++-------- Core/Tools/mangler/wlib/threadfac.h | 2 +- Core/Tools/matchbot/wlib/threadfac.cpp | 16 ++++++++-------- Core/Tools/matchbot/wlib/threadfac.h | 2 +- .../GameEngine/Include/GameClient/ControlBar.h | 2 +- .../GameEngine/Include/GameLogic/ScriptEngine.h | 4 ++-- .../GameClient/GUI/ControlBar/ControlBar.cpp | 4 ++-- .../GUI/ControlBar/ControlBarScheme.cpp | 2 +- .../GameLogic/ScriptEngine/ScriptActions.cpp | 2 +- .../Source/WWVegas/WW3D2/aabtreebuilder.cpp | 4 ++-- .../Code/Libraries/Source/WWVegas/WW3D2/scene.h | 2 +- .../GameEngine/Include/GameClient/ControlBar.h | 2 +- .../GameEngine/Include/GameLogic/ScriptEngine.h | 4 ++-- .../GameClient/GUI/ControlBar/ControlBar.cpp | 4 ++-- .../GUI/ControlBar/ControlBarScheme.cpp | 2 +- .../GameLogic/ScriptEngine/ScriptActions.cpp | 2 +- .../Source/WWVegas/WW3D2/aabtreebuilder.cpp | 4 ++-- .../Code/Libraries/Source/WWVegas/WW3D2/scene.h | 2 +- 25 files changed, 58 insertions(+), 58 deletions(-) diff --git a/Core/GameEngine/Include/Common/AudioEventRTS.h b/Core/GameEngine/Include/Common/AudioEventRTS.h index 5a6f0f4510b..c11364bc4a1 100644 --- a/Core/GameEngine/Include/Common/AudioEventRTS.h +++ b/Core/GameEngine/Include/Common/AudioEventRTS.h @@ -144,8 +144,8 @@ class AudioEventRTS Int getPlayingAudioIndex( void ) { return m_playingAudioIndex; }; void setPlayingAudioIndex( Int pai ) { m_playingAudioIndex = pai; }; - Bool getUninterruptable( ) const { return m_uninterruptable; } - void setUninterruptable( Bool uninterruptable ) { m_uninterruptable = uninterruptable; } + Bool getUninterruptible( ) const { return m_uninterruptible; } + void setUninterruptible( Bool uninterruptible ) { m_uninterruptible = uninterruptible; } // This will retrieve the appropriate position based on type. @@ -184,7 +184,7 @@ class AudioEventRTS Bool m_shouldFade; ///< This should fade in or out (if it is starting or stopping) Bool m_isLogicalAudio; ///< Should probably only be true for scripted sounds - Bool m_uninterruptable; + Bool m_uninterruptible; // Playing attributes Real m_pitchShift; ///< Pitch shift that should occur on this piece of audio diff --git a/Core/GameEngine/Source/Common/Audio/AudioEventRTS.cpp b/Core/GameEngine/Source/Common/Audio/AudioEventRTS.cpp index b9d847b23ca..367f894caef 100644 --- a/Core/GameEngine/Source/Common/Audio/AudioEventRTS.cpp +++ b/Core/GameEngine/Source/Common/Audio/AudioEventRTS.cpp @@ -78,7 +78,7 @@ AudioEventRTS::AudioEventRTS() m_allCount(0), m_playerIndex(-1), m_delay(0.0f), - m_uninterruptable(FALSE) + m_uninterruptible(FALSE) { m_attackName.clear(); m_decayName.clear(); @@ -105,7 +105,7 @@ AudioEventRTS::AudioEventRTS( const AsciiString& eventName ) m_allCount(0), m_playerIndex(-1), m_delay(0.0f), - m_uninterruptable(FALSE) + m_uninterruptible(FALSE) { m_attackName.clear(); m_decayName.clear(); @@ -133,7 +133,7 @@ AudioEventRTS::AudioEventRTS( const AsciiString& eventName, ObjectID ownerID ) m_allCount(0), m_playerIndex(-1), m_delay(0.0f), - m_uninterruptable(FALSE) + m_uninterruptible(FALSE) { m_attackName.clear(); m_decayName.clear(); @@ -169,7 +169,7 @@ AudioEventRTS::AudioEventRTS( const AsciiString& eventName, DrawableID drawableI m_allCount(0), m_playerIndex(-1), m_delay(0.0f), - m_uninterruptable(FALSE) + m_uninterruptible(FALSE) { m_attackName.clear(); m_decayName.clear(); @@ -204,7 +204,7 @@ AudioEventRTS::AudioEventRTS( const AsciiString& eventName, const Coord3D *posit m_allCount(0), m_playerIndex(-1), m_delay(0.0f), - m_uninterruptable(FALSE) + m_uninterruptible(FALSE) { m_positionOfAudio.set( positionOfAudio ); m_attackName.clear(); @@ -235,7 +235,7 @@ AudioEventRTS::AudioEventRTS( const AudioEventRTS& right ) m_attackName = right.m_attackName; m_decayName = right.m_decayName; m_portionToPlayNext = right.m_portionToPlayNext; - m_uninterruptable = right.m_uninterruptable; + m_uninterruptible = right.m_uninterruptible; if( m_ownerType == OT_Positional || m_ownerType == OT_Dead ) { @@ -276,7 +276,7 @@ AudioEventRTS& AudioEventRTS::operator=( const AudioEventRTS& right ) m_attackName = right.m_attackName; m_decayName = right.m_decayName; m_portionToPlayNext = right.m_portionToPlayNext; - m_uninterruptable = right.m_uninterruptable; + m_uninterruptible = right.m_uninterruptible; if( m_ownerType == OT_Positional || m_ownerType == OT_Dead ) { diff --git a/Core/GameEngine/Source/Common/Audio/GameAudio.cpp b/Core/GameEngine/Source/Common/Audio/GameAudio.cpp index 3b3e93d67fc..a4df092b6d9 100644 --- a/Core/GameEngine/Source/Common/Audio/GameAudio.cpp +++ b/Core/GameEngine/Source/Common/Audio/GameAudio.cpp @@ -451,7 +451,7 @@ AudioHandle AudioManager::addAudioEvent(const AudioEventRTS *eventToAdd) #else const Bool logicalAudio = FALSE; #endif - const Bool notForLocal = !eventToAdd->getUninterruptable() && !shouldPlayLocally(eventToAdd); + const Bool notForLocal = !eventToAdd->getUninterruptible() && !shouldPlayLocally(eventToAdd); if (!logicalAudio && notForLocal) { diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h index df1dc768794..747a9167413 100644 --- a/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h +++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h @@ -163,7 +163,7 @@ class W3DView : public View, public SubsystemInterface virtual void lookAt( const Coord3D *o ); ///< Center the view on the given coordinate virtual void initHeightForMap( void ); ///< Init the camera height for the map at the current position. - virtual void moveCameraTo(const Coord3D *o, Int miliseconds, Int shutter, Bool orient, Real easeIn, Real easeOut); + virtual void moveCameraTo(const Coord3D *o, Int milliseconds, Int shutter, Bool orient, Real easeIn, Real easeOut); virtual void moveCameraAlongWaypointPath(Waypoint *pWay, Int frames, Int shutter, Bool orient, Real easeIn, Real easeOut); virtual Bool isCameraMovementFinished(void); virtual Bool isCameraMovementAtWaypointAlongPath(void); diff --git a/Core/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp b/Core/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp index 2737f8e9863..61e7bccdb6b 100644 --- a/Core/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp +++ b/Core/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp @@ -680,7 +680,7 @@ void MilesAudioManager::playAudioEvent( AudioEventRTS *event ) DEBUG_LOG(("- Stream")); #endif - if ((info->m_soundType == AT_Streaming) && event->getUninterruptable()) { + if ((info->m_soundType == AT_Streaming) && event->getUninterruptible()) { stopAllSpeech(); } @@ -716,7 +716,7 @@ void MilesAudioManager::playAudioEvent( AudioEventRTS *event ) audio->m_type = PAT_Stream; if (stream) { - if ((info->m_soundType == AT_Streaming) && event->getUninterruptable()) { + if ((info->m_soundType == AT_Streaming) && event->getUninterruptible()) { setDisallowSpeech(TRUE); } AIL_set_stream_volume_pan(stream, getEffectiveVolume(event), 0.5f); diff --git a/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.cpp b/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.cpp index 50df49b2d25..49549ae4a64 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.cpp @@ -1317,14 +1317,14 @@ void AABTreeNodeClass::Select_Splitting_Plane SimpleDynVecClass & boxes ) { - const int NUM_TRYS = 300; + const int NUM_TRIES = 300; /* ** Try putting axis-aligned planes through some random vertices */ int objcount = boxes.Count(); - int trys = 0; - for (trys = 0; trys < MIN(NUM_TRYS,objcount); trys++) { + int tries = 0; + for (tries = 0; tries < MIN(NUM_TRIES,objcount); tries++) { int obj_index; SplitChoiceStruct test; @@ -1361,7 +1361,7 @@ void AABTreeNodeClass::Select_Splitting_Plane /* ** Still haven't found a valid splitting plane, uh-oh. */ - if ((trys >= MIN(NUM_TRYS,objcount)) && (sc->Cost == FLT_MAX)) { + if ((tries >= MIN(NUM_TRIES,objcount)) && (sc->Cost == FLT_MAX)) { Select_Splitting_Plane_Brute_Force(sc,boxes); return; } diff --git a/Core/Tools/WW3D/max2w3d/aabtreebuilder.cpp b/Core/Tools/WW3D/max2w3d/aabtreebuilder.cpp index 958d2cdea00..54380dccff9 100644 --- a/Core/Tools/WW3D/max2w3d/aabtreebuilder.cpp +++ b/Core/Tools/WW3D/max2w3d/aabtreebuilder.cpp @@ -309,7 +309,7 @@ AABTreeBuilderClass::Select_Splitting_Plane(int polycount,int * polyindices) { WWASSERT(polyindices != nullptr); - const int NUM_TRYS = 50; + const int NUM_TRIES = 50; SplitChoiceStruct best_plane_stats; SplitChoiceStruct considered_plane_stats; @@ -317,7 +317,7 @@ AABTreeBuilderClass::Select_Splitting_Plane(int polycount,int * polyindices) /* ** Try putting axis-aligned planes through some random vertices */ - for (int trys = 0; trys < MIN(NUM_TRYS,polycount); trys++) { + for (int tries = 0; tries < MIN(NUM_TRIES,polycount); tries++) { AAPlaneClass plane; diff --git a/Core/Tools/mangler/wlib/threadfac.cpp b/Core/Tools/mangler/wlib/threadfac.cpp index 7ba7f3b65a1..3973335f8fb 100644 --- a/Core/Tools/mangler/wlib/threadfac.cpp +++ b/Core/Tools/mangler/wlib/threadfac.cpp @@ -52,7 +52,7 @@ struct ThreadInformation // // Start a thread inside a class // -bit8 ThreadFactory::startThread(Runnable &runable, void *data, bit8 destroy) +bit8 ThreadFactory::startThread(Runnable &runnable, void *data, bit8 destroy) { #ifdef _REENTRANT @@ -64,7 +64,7 @@ bit8 ThreadFactory::startThread(Runnable &runable, void *data, bit8 destroy) ThreadInformation *tInfo=new ThreadInformation; - tInfo->startPoint=(void *)&runable; + tInfo->startPoint=(void *)&runnable; tInfo->data=data; tInfo->destroy=destroy; @@ -79,9 +79,9 @@ bit8 ThreadFactory::startThread(Runnable &runable, void *data, bit8 destroy) else { { - runable.CritSec_.lock(); - runable.ThreadCount_--; // Ok, so it didn't really start - runable.CritSec_.unlock(); + runnable.CritSec_.lock(); + runnable.ThreadCount_--; // Ok, so it didn't really start + runnable.CritSec_.unlock(); } return(FALSE); } @@ -98,9 +98,9 @@ bit8 ThreadFactory::startThread(Runnable &runable, void *data, bit8 destroy) else { { - runable.CritSec_.lock(); - runable.ThreadCount_--; // Ok, so it didn't really start - runable.CritSec_.unlock(); + runnable.CritSec_.lock(); + runnable.ThreadCount_--; // Ok, so it didn't really start + runnable.CritSec_.unlock(); } return(FALSE); } diff --git a/Core/Tools/mangler/wlib/threadfac.h b/Core/Tools/mangler/wlib/threadfac.h index 027de9be53b..68d8fe0bd71 100644 --- a/Core/Tools/mangler/wlib/threadfac.h +++ b/Core/Tools/mangler/wlib/threadfac.h @@ -74,7 +74,7 @@ class ThreadFactory { public: static bit8 startThread(void (*start_func)(void *), void *data); - static bit8 startThread(Runnable &runable, void *data, bit8 destroy=FALSE); + static bit8 startThread(Runnable &runnable, void *data, bit8 destroy=FALSE); }; diff --git a/Core/Tools/matchbot/wlib/threadfac.cpp b/Core/Tools/matchbot/wlib/threadfac.cpp index 7ba7f3b65a1..3973335f8fb 100644 --- a/Core/Tools/matchbot/wlib/threadfac.cpp +++ b/Core/Tools/matchbot/wlib/threadfac.cpp @@ -52,7 +52,7 @@ struct ThreadInformation // // Start a thread inside a class // -bit8 ThreadFactory::startThread(Runnable &runable, void *data, bit8 destroy) +bit8 ThreadFactory::startThread(Runnable &runnable, void *data, bit8 destroy) { #ifdef _REENTRANT @@ -64,7 +64,7 @@ bit8 ThreadFactory::startThread(Runnable &runable, void *data, bit8 destroy) ThreadInformation *tInfo=new ThreadInformation; - tInfo->startPoint=(void *)&runable; + tInfo->startPoint=(void *)&runnable; tInfo->data=data; tInfo->destroy=destroy; @@ -79,9 +79,9 @@ bit8 ThreadFactory::startThread(Runnable &runable, void *data, bit8 destroy) else { { - runable.CritSec_.lock(); - runable.ThreadCount_--; // Ok, so it didn't really start - runable.CritSec_.unlock(); + runnable.CritSec_.lock(); + runnable.ThreadCount_--; // Ok, so it didn't really start + runnable.CritSec_.unlock(); } return(FALSE); } @@ -98,9 +98,9 @@ bit8 ThreadFactory::startThread(Runnable &runable, void *data, bit8 destroy) else { { - runable.CritSec_.lock(); - runable.ThreadCount_--; // Ok, so it didn't really start - runable.CritSec_.unlock(); + runnable.CritSec_.lock(); + runnable.ThreadCount_--; // Ok, so it didn't really start + runnable.CritSec_.unlock(); } return(FALSE); } diff --git a/Core/Tools/matchbot/wlib/threadfac.h b/Core/Tools/matchbot/wlib/threadfac.h index 027de9be53b..68d8fe0bd71 100644 --- a/Core/Tools/matchbot/wlib/threadfac.h +++ b/Core/Tools/matchbot/wlib/threadfac.h @@ -74,7 +74,7 @@ class ThreadFactory { public: static bit8 startThread(void (*start_func)(void *), void *data); - static bit8 startThread(Runnable &runable, void *data, bit8 destroy=FALSE); + static bit8 startThread(Runnable &runnable, void *data, bit8 destroy=FALSE); }; diff --git a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h index df83634f15e..58fc87f96d9 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h +++ b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h @@ -973,7 +973,7 @@ class ControlBar : public SubsystemInterface void setCommandBarBorder( GameWindow *button, CommandButtonMappedBorderType type); public: - void updateCommanBarBorderColors(Color build, Color action, Color upgrade, Color system ); + void updateCommandBarBorderColors(Color build, Color action, Color upgrade, Color system ); private: diff --git a/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h b/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h index 9b8afe8ea8a..b5f4785667a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h @@ -373,8 +373,8 @@ class ScriptEngine : public SubsystemInterface, void setFlag( ScriptAction *pAction ); void pauseTimer( ScriptAction *pAction ); void restartTimer( ScriptAction *pAction ); - void setTimer( ScriptAction *pAction, Bool milisecondTimer, Bool random); - void adjustTimer( ScriptAction *pAction, Bool milisecondTimer, Bool add); + void setTimer( ScriptAction *pAction, Bool millisecondTimer, Bool random); + void adjustTimer( ScriptAction *pAction, Bool millisecondTimer, Bool add); void enableScript( ScriptAction *pAction ); void disableScript( ScriptAction *pAction ); void callSubroutine( ScriptAction *pAction ); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index 0e5a5952e08..1690c0c91be 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -931,7 +931,7 @@ ControlBar::ControlBar( void ) m_generalButtonHighlight = nullptr; m_genArrow = nullptr; m_sideSelectAnimateDown = FALSE; - updateCommanBarBorderColors(GAME_COLOR_UNDEFINED,GAME_COLOR_UNDEFINED,GAME_COLOR_UNDEFINED,GAME_COLOR_UNDEFINED); + updateCommandBarBorderColors(GAME_COLOR_UNDEFINED,GAME_COLOR_UNDEFINED,GAME_COLOR_UNDEFINED,GAME_COLOR_UNDEFINED); m_radarAttackGlowOn = FALSE; m_remainingRadarAttackGlowFrames = 0; @@ -2887,7 +2887,7 @@ void ControlBar::updateBuildUpClockColor( Color color) -void ControlBar::updateCommanBarBorderColors(Color build, Color action, Color upgrade, Color system ) +void ControlBar::updateCommandBarBorderColors(Color build, Color action, Color upgrade, Color system ) { m_commandButtonBorderBuildColor = build; m_commandButtonBorderActionColor = action; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp index e96ec55f7aa..54f3c3e0eac 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp @@ -406,7 +406,7 @@ void ControlBarScheme::init(void) TheControlBar->updateBuildQueueDisabledImages( m_buttonQueueImage ); TheControlBar->updateRightHUDImage(m_rightHUDImage); TheControlBar->updateBuildUpClockColor( m_buildUpClockColor ); - TheControlBar->updateCommanBarBorderColors(m_borderBuildColor, m_borderActionColor, m_borderUpgradeColor,m_borderSystemColor); + TheControlBar->updateCommandBarBorderColors(m_borderBuildColor, m_borderActionColor, m_borderUpgradeColor,m_borderSystemColor); TheControlBar->updateBorderColor(m_commandBarBorderColor); //TheControlBar->updateCommandMarkerImage(m_commandMarkerImage); TheControlBar->updateSlotExitImage(m_commandMarkerImage); diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp index 5aa14860a19..3946161b6f6 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp @@ -2744,7 +2744,7 @@ void ScriptActions::doSpeechPlay(const AsciiString& speechName, Bool allowOverla AudioEventRTS speech(speechName); speech.setIsLogicalAudio(true); speech.setPlayerIndex(ThePlayerList->getLocalPlayer()->getPlayerIndex()); - speech.setUninterruptable(!allowOverlap); + speech.setUninterruptible(!allowOverlap); TheAudio->addAudioEvent(&speech); } diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.cpp index 67d3cacb9fa..e364ae3d366 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.cpp @@ -304,7 +304,7 @@ AABTreeBuilderClass::Select_Splitting_Plane(int polycount,int * polyindices) { WWASSERT(polyindices != nullptr); - const int NUM_TRYS = 50; + const int NUM_TRIES = 50; SplitChoiceStruct best_plane_stats; SplitChoiceStruct considered_plane_stats; @@ -312,7 +312,7 @@ AABTreeBuilderClass::Select_Splitting_Plane(int polycount,int * polyindices) /* ** Try putting axis-aligned planes through some random vertices */ - for (int trys = 0; trys < MIN(NUM_TRYS,polycount); trys++) { + for (int tries = 0; tries < MIN(NUM_TRIES,polycount); tries++) { AAPlaneClass plane; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h index c90d8272303..20fc4a6e1be 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h @@ -94,7 +94,7 @@ class SceneClass : public RefCountClass // RTTI information. /////////////////////////////////////////////////////////////////////////////////// enum { - SCENE_ID_UNKOWN = 0xFFFFFFFF, + SCENE_ID_UNKNOWN = 0xFFFFFFFF, SCENE_ID_SCENE = 0, SCENE_ID_SIMPLE, diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h index fb3da09a608..b4beb084eed 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h @@ -993,7 +993,7 @@ class ControlBar : public SubsystemInterface void setCommandBarBorder( GameWindow *button, CommandButtonMappedBorderType type); public: - void updateCommanBarBorderColors(Color build, Color action, Color upgrade, Color system ); + void updateCommandBarBorderColors(Color build, Color action, Color upgrade, Color system ); private: diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h index 0447dc20209..6e6de27516c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h @@ -382,8 +382,8 @@ class ScriptEngine : public SubsystemInterface, void setFlag( ScriptAction *pAction ); void pauseTimer( ScriptAction *pAction ); void restartTimer( ScriptAction *pAction ); - void setTimer( ScriptAction *pAction, Bool milisecondTimer, Bool random); - void adjustTimer( ScriptAction *pAction, Bool milisecondTimer, Bool add); + void setTimer( ScriptAction *pAction, Bool millisecondTimer, Bool random); + void adjustTimer( ScriptAction *pAction, Bool millisecondTimer, Bool add); void enableScript( ScriptAction *pAction ); void disableScript( ScriptAction *pAction ); void callSubroutine( ScriptAction *pAction ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index 5afdde344a0..f6ffdb6d086 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -956,7 +956,7 @@ ControlBar::ControlBar( void ) m_generalButtonHighlight = nullptr; m_genArrow = nullptr; m_sideSelectAnimateDown = FALSE; - updateCommanBarBorderColors(GAME_COLOR_UNDEFINED,GAME_COLOR_UNDEFINED,GAME_COLOR_UNDEFINED,GAME_COLOR_UNDEFINED); + updateCommandBarBorderColors(GAME_COLOR_UNDEFINED,GAME_COLOR_UNDEFINED,GAME_COLOR_UNDEFINED,GAME_COLOR_UNDEFINED); m_radarAttackGlowOn = FALSE; m_remainingRadarAttackGlowFrames = 0; @@ -2912,7 +2912,7 @@ void ControlBar::updateBuildUpClockColor( Color color) -void ControlBar::updateCommanBarBorderColors(Color build, Color action, Color upgrade, Color system ) +void ControlBar::updateCommandBarBorderColors(Color build, Color action, Color upgrade, Color system ) { m_commandButtonBorderBuildColor = build; m_commandButtonBorderActionColor = action; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp index 0917eb073f6..f0183be7814 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp @@ -409,7 +409,7 @@ void ControlBarScheme::init(void) TheControlBar->updateBuildQueueDisabledImages( m_buttonQueueImage ); TheControlBar->updateRightHUDImage(m_rightHUDImage); TheControlBar->updateBuildUpClockColor( m_buildUpClockColor ); - TheControlBar->updateCommanBarBorderColors(m_borderBuildColor, m_borderActionColor, m_borderUpgradeColor,m_borderSystemColor); + TheControlBar->updateCommandBarBorderColors(m_borderBuildColor, m_borderActionColor, m_borderUpgradeColor,m_borderSystemColor); TheControlBar->updateBorderColor(m_commandBarBorderColor); //TheControlBar->updateCommandMarkerImage(m_commandMarkerImage); TheControlBar->updateSlotExitImage(m_commandMarkerImage); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp index 546efa1ae32..0b3157ae665 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp @@ -2825,7 +2825,7 @@ void ScriptActions::doSpeechPlay(const AsciiString& speechName, Bool allowOverla AudioEventRTS speech(speechName); speech.setIsLogicalAudio(true); speech.setPlayerIndex(ThePlayerList->getLocalPlayer()->getPlayerIndex()); - speech.setUninterruptable(!allowOverlap); + speech.setUninterruptible(!allowOverlap); TheAudio->addAudioEvent(&speech); diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.cpp index eda1055a510..8da112c923c 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.cpp @@ -370,7 +370,7 @@ AABTreeBuilderClass::Select_Splitting_Plane(int polycount,int * polyindices) { WWASSERT(polyindices != nullptr); - const int NUM_TRYS = 50; + const int NUM_TRIES = 50; SplitChoiceStruct best_plane_stats; SplitChoiceStruct considered_plane_stats; @@ -378,7 +378,7 @@ AABTreeBuilderClass::Select_Splitting_Plane(int polycount,int * polyindices) /* ** Try putting axis-aligned planes through some random vertices */ - for (int trys = 0; trys < MIN(NUM_TRYS,polycount); trys++) { + for (int tries = 0; tries < MIN(NUM_TRIES,polycount); tries++) { AAPlaneClass plane; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h index 3b243968bdf..72d239a69ce 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h @@ -94,7 +94,7 @@ class SceneClass : public RefCountClass // RTTI information. /////////////////////////////////////////////////////////////////////////////////// enum { - SCENE_ID_UNKOWN = 0xFFFFFFFF, + SCENE_ID_UNKNOWN = 0xFFFFFFFF, SCENE_ID_SCENE = 0, SCENE_ID_SIMPLE,