Skip to content

fix: Fix spelling errors in code words #2149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 1 commit into from
Jan 19, 2026
Merged

fix: Fix spelling errors in code words #2149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Core/GameEngine/Include/Common/AudioEventRTS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions Core/GameEngine/Source/Common/Audio/AudioEventRTS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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 )
{
Expand Down Expand Up @@ -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 )
{
Expand Down
2 changes: 1 addition & 1 deletion Core/GameEngine/Source/Common/Audio/GameAudio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions Core/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions Core/Libraries/Source/WWVegas/WWMath/aabtreecull.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1317,14 +1317,14 @@ void AABTreeNodeClass::Select_Splitting_Plane
SimpleDynVecClass<AABoxClass> & 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;
Expand Down Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions Core/Tools/WW3D/max2w3d/aabtreebuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,15 +309,15 @@ 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;

/*
** 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;

Expand Down
16 changes: 8 additions & 8 deletions Core/Tools/mangler/wlib/threadfac.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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;

Expand All @@ -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);
}
Expand All @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion Core/Tools/mangler/wlib/threadfac.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
};


Expand Down
16 changes: 8 additions & 8 deletions Core/Tools/matchbot/wlib/threadfac.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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;

Expand All @@ -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);
}
Expand All @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion Core/Tools/matchbot/wlib/threadfac.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
};


Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Include/GameClient/ControlBar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
4 changes: 2 additions & 2 deletions Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
4 changes: 2 additions & 2 deletions Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
4 changes: 2 additions & 2 deletions Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,15 +304,15 @@ 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;

/*
** 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;

Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,

Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
4 changes: 2 additions & 2 deletions GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
4 changes: 2 additions & 2 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading
Loading