From a010e648ee28ccad3930686e63fe910695492806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Noel?= Date: Thu, 19 Sep 2024 10:52:47 +0200 Subject: [PATCH] Fix a few typos --- code/cgame/cg_commands.cpp | 8 ++++---- code/client/cl_main.cpp | 2 +- code/fgame/VehicleTank.cpp | 2 +- code/fgame/actor.cpp | 4 ++-- code/fgame/barrels.cpp | 2 +- code/fgame/beam.cpp | 2 +- code/fgame/entity.cpp | 12 ++++++------ code/fgame/g_main.cpp | 4 ++-- code/fgame/level.cpp | 4 ++-- code/fgame/player.cpp | 6 +++--- code/fgame/portableturret.cpp | 4 ++-- code/fgame/scriptthread.cpp | 12 ++++++------ code/fgame/sentient.cpp | 4 ++-- code/fgame/weapturret.cpp | 4 ++-- code/gamespy/gstats/gp_stats/gp_stats.rc | 2 +- code/gamespy/sc/sciInterface.c | 2 +- code/gamespy/webservices/AuthService.c | 2 +- code/qcommon/files.cpp | 2 +- code/sys/sys_unix.c | 2 +- 19 files changed, 40 insertions(+), 40 deletions(-) diff --git a/code/cgame/cg_commands.cpp b/code/cgame/cg_commands.cpp index 05440444..24376895 100644 --- a/code/cgame/cg_commands.cpp +++ b/code/cgame/cg_commands.cpp @@ -564,7 +564,7 @@ Event EV_Client_LoopSound EV_DEFAULT, "sFFf", "soundName volume min_distance pitch", - "Play the specifed sound as a looping sound" + "Play the specified sound as a looping sound" ); Event EV_Client_Cache ( @@ -985,7 +985,7 @@ Event EV_Client_BounceDecal( "maxamount temporary", "Put a mark when the tempmodel bounces and hits a surface\n" "maxamount = Max amount of decals to make when bouncing\n" - "temporary = specify 1 for a temporary mark that only appears for a short time, 0 for a decal that stays aroung " + "temporary = specify 1 for a temporary mark that only appears for a short time, 0 for a decal that stays around " "longer (default is 0)\n" ); Event EV_Client_SetDecalRadius @@ -1122,7 +1122,7 @@ Event EV_Client_SetAlignStretch( EV_DEFAULT, "F", "scaleMultiplier", - "Aligns the temp model to the direction of travel, and stretches it betwen the last and current positions.\n" + "Aligns the temp model to the direction of travel, and stretches it between the last and current positions.\n" ); Event EV_Client_SetClampVelocity ( @@ -3883,7 +3883,7 @@ void ClientGameCommandManager::PlaySound( } else { if (debugSound->integer) { Com_Printf( - "\nWARNING: OVERRIDE OVERRIDE OVERRIDESound %s had all its parm overriden by code.\n\n", + "\nWARNING: OVERRIDE OVERRIDE OVERRIDESound %s had all its parm overridden by code.\n\n", sound_name.c_str() ); } diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp index 4a535776..068d68e4 100644 --- a/code/client/cl_main.cpp +++ b/code/client/cl_main.cpp @@ -1906,7 +1906,7 @@ void CL_InitDownloads(void) { if (FS_ComparePaks( missingfiles, sizeof( missingfiles ), qfalse ) ) { // NOTE TTimo I would rather have that printed as a modal message box - // but at this point while joining the game we don't know wether we will successfully join or not + // but at this point while joining the game we don't know whether we will successfully join or not Com_Printf( "\nWARNING: You are missing some files referenced by the server:\n%s" "You might not be able to join the game\n" "Go to the setting menu to turn on autodownload, or get the file elsewhere\n\n", missingfiles ); diff --git a/code/fgame/VehicleTank.cpp b/code/fgame/VehicleTank.cpp index a215a628..b336cbfb 100644 --- a/code/fgame/VehicleTank.cpp +++ b/code/fgame/VehicleTank.cpp @@ -503,7 +503,7 @@ void VehicleTank::UpdateSound() // This method only work when called from script. // But it is not called automatically when the player actually uses the vehicle // when that vehicle is unlocked. -// So the other native method is overriden instead +// So the other native method is overridden instead /* void VehicleTank::AttachDriverSlot(Event *ev) { diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp index 0c476ebb..78fc9bfd 100644 --- a/code/fgame/actor.cpp +++ b/code/fgame/actor.cpp @@ -558,7 +558,7 @@ Event EV_Actor_DamagePuff EV_DEFAULT, "vv", "position direction", - "Spawns a puff of 'blood' smoke at the speficied location in the specified direction.", + "Spawns a puff of 'blood' smoke at the specified location in the specified direction.", EV_NORMAL ); Event EV_Actor_SetAngleYawSpeed @@ -5646,7 +5646,7 @@ void Actor::EventSetMood(Event *ev) =============== Actor::EventDamagePuff -Spawns a puff of 'blood' smoke at the speficied location in the specified direction. +Spawns a puff of 'blood' smoke at the specified location in the specified direction. =============== */ void Actor::EventDamagePuff(Event *ev) diff --git a/code/fgame/barrels.cpp b/code/fgame/barrels.cpp index e23a0096..647ecf5d 100644 --- a/code/fgame/barrels.cpp +++ b/code/fgame/barrels.cpp @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA /***************************************************************************** /*QUAKED func_barrel (0 0.25 0.5) ? INDESTRUCTABLE Brush model barrel object -Bashing only makes thunk or gong sounds (depending on wether it's full or not) +Bashing only makes thunk or gong sounds (depending on whether it's full or not) Bullets and explosions effects are dependant apon the type of barrel. "barreltype" sets the type of barrel that it is. Valid settings are: - "water" makes the barrel be filled with water. diff --git a/code/fgame/beam.cpp b/code/fgame/beam.cpp index 65717b76..6163ce32 100644 --- a/code/fgame/beam.cpp +++ b/code/fgame/beam.cpp @@ -104,7 +104,7 @@ Event EV_FuncBeam_Minoffset EV_DEFAULT, "f", "min_offset", - "Set the minimun offset the beam can travel above, below, forward or back of it's endpoints", + "Set the minimum offset the beam can travel above, below, forward or back of it's endpoints", EV_NORMAL ); Event EV_FuncBeam_Overlap diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp index a3db0fdb..bd7ec1c4 100644 --- a/code/fgame/entity.cpp +++ b/code/fgame/entity.cpp @@ -768,7 +768,7 @@ Event EV_SetLight EV_DEFAULT, "ffff", "red green blue radius", - "Create a dynmaic light on this entity.", + "Create a dynamic light on this entity.", EV_NORMAL ); @@ -778,7 +778,7 @@ Event EV_LightOn EV_DEFAULT, NULL, NULL, - "Turn the configured dynmaic light on this entity on.", + "Turn the configured dynamic light on this entity on.", EV_NORMAL ); Event EV_LightOff @@ -805,7 +805,7 @@ Event EV_LightRed EV_DEFAULT, "f", "red", - "Set the red component of the dynmaic light on this entity.", + "Set the red component of the dynamic light on this entity.", EV_NORMAL ); Event EV_LightGreen @@ -814,7 +814,7 @@ Event EV_LightGreen EV_DEFAULT, "f", "red", - "Set the red component of the dynmaic light on this entity.", + "Set the red component of the dynamic light on this entity.", EV_NORMAL ); Event EV_LightBlue @@ -823,7 +823,7 @@ Event EV_LightBlue EV_DEFAULT, "f", "red", - "Set the red component of the dynmaic light on this entity.", + "Set the red component of the dynamic light on this entity.", EV_NORMAL ); Event EV_LightRadius @@ -832,7 +832,7 @@ Event EV_LightRadius EV_DEFAULT, "f", "red", - "Set the red component of the dynmaic light on this entity.", + "Set the red component of the dynamic light on this entity.", EV_NORMAL ); diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp index 1d947b9c..e69e55fd 100644 --- a/code/fgame/g_main.cpp +++ b/code/fgame/g_main.cpp @@ -1095,11 +1095,11 @@ void G_ArchivePersistant(const char *name, qboolean loading) arc.ArchiveInteger(&version); if (version < PERSISTANT_VERSION) { - gi.Printf("Persistant data from an older version (%d) of MOHAA.\n", version); + gi.Printf("Persistent data from an older version (%d) of MOHAA.\n", version); arc.Close(); return; } else if (version > PERSISTANT_VERSION) { - gi.DPrintf("Persistant data from newer version %d of MOHAA.\n", version); + gi.DPrintf("Persistent data from newer version %d of MOHAA.\n", version); arc.Close(); return; } diff --git a/code/fgame/level.cpp b/code/fgame/level.cpp index b0bbe7f4..5242d29f 100644 --- a/code/fgame/level.cpp +++ b/code/fgame/level.cpp @@ -391,7 +391,7 @@ Event EV_Level_GetRoundBased EV_DEFAULT, NULL, NULL, - "Gets wether or not the game is currently round based or not", + "Gets whether or not the game is currently round based or not", EV_GETTER ); @@ -401,7 +401,7 @@ Event EV_Level_GetObjectiveBased EV_DEFAULT, NULL, NULL, - "Gets wether or not the game is currently objective based or not", + "Gets whether or not the game is currently objective based or not", EV_GETTER ); diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp index 5036e94b..bbcc7800 100644 --- a/code/fgame/player.cpp +++ b/code/fgame/player.cpp @@ -278,7 +278,7 @@ Event EV_Player_CorrectWeaponAttachments EV_CONSOLE, NULL, NULL, - "makes sure the weapons is properly attached when interupting a reload", + "makes sure the weapons is properly attached when interrupting a reload", EV_NORMAL ); Event EV_Player_GiveCheat @@ -1278,7 +1278,7 @@ Event EV_Player_SetPerferredWeapon EV_DEFAULT, "s", "weapon_name", - "Overrides your perferred weapon that is displayed in the stats screen.", + "Overrides your preferred weapon that is displayed in the stats screen.", EV_NORMAL ); Event EV_Player_SetVoiceType @@ -10728,7 +10728,7 @@ str Player::GetBattleLanguageCondition() const case 0: return "almost dead"; case 1: - return "severly wounded"; + return "severely wounded"; case 2: return "wounded"; case 3: diff --git a/code/fgame/portableturret.cpp b/code/fgame/portableturret.cpp index 2ac3bc4a..718d0bd0 100644 --- a/code/fgame/portableturret.cpp +++ b/code/fgame/portableturret.cpp @@ -215,7 +215,7 @@ void CarryableTurret::EventPlaceTurret(Event *ev) if (trace.startsolid || trace.fraction < 1 || trace.ent) { gi.DPrintf( - "~*~*~ Not enough room to auto place protable turret at (%i %i %i)\n", + "~*~*~ Not enough room to auto place portable turret at (%i %i %i)\n", (int)origin[0], (int)origin[1], (int)origin[2] @@ -243,7 +243,7 @@ void CarryableTurret::EventPlaceTurret(Event *ev) if (trace.startsolid || trace.fraction < 1) { gi.DPrintf( - "~*~*~ Not enough room to auto place protable turret at (%i %i %i)\n", + "~*~*~ Not enough room to auto place portable turret at (%i %i %i)\n", (int)origin[0], (int)origin[1], (int)origin[2] diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp index 62e48659..7929cc2a 100644 --- a/code/fgame/scriptthread.cpp +++ b/code/fgame/scriptthread.cpp @@ -957,7 +957,7 @@ Event EV_ScriptThread_HudDraw_VirtualSize EV_DEFAULT, "ii", "index virtual", - "Sets if the huddraw element for given player should use virutal screen resolution for positioning and size", + "Sets if the huddraw element for given player should use virtual screen resolution for positioning and size", EV_NORMAL ); Event EV_ScriptThread_HudDraw_Color @@ -1369,7 +1369,7 @@ Event EV_ScriptThread_iHudDrawVirtualSize EV_DEFAULT, "eii", "player index virtual", - "Sets if the huddraw element for given player should use virutal screen resolution for positioning and size", + "Sets if the huddraw element for given player should use virtual screen resolution for positioning and size", EV_NORMAL ); Event EV_ScriptThread_IsArray @@ -3882,7 +3882,7 @@ void ScriptThread::EventHudDrawAlign(Event *ev) } else if (h_align == "right") { h_alignement = 2; } else { - throw ScriptException("Wrong alignement h_align string for huddraw_align!\n"); + throw ScriptException("Wrong alignment h_align string for huddraw_align!\n"); } if (v_align == "top") { @@ -3892,7 +3892,7 @@ void ScriptThread::EventHudDrawAlign(Event *ev) } else if (v_align == "bottom") { v_alignement = 2; } else { - throw ScriptException("Wrong alignement v_align string for huddraw_align!\n"); + throw ScriptException("Wrong alignment v_align string for huddraw_align!\n"); } HudDrawAlign(index, h_alignement, v_alignement); @@ -5032,7 +5032,7 @@ void ScriptThread::EventIHudDrawAlign(Event *ev) } else if (h_align == "right") { h_alignement = 2; } else { - throw ScriptException("Wrong alignement h_align string for ihuddraw_align!\n"); + throw ScriptException("Wrong alignment h_align string for ihuddraw_align!\n"); } if (v_align == "top") { @@ -5042,7 +5042,7 @@ void ScriptThread::EventIHudDrawAlign(Event *ev) } else if (v_align == "bottom") { v_alignement = 2; } else { - throw ScriptException("Wrong alignement v_align string for ihuddraw_align!\n"); + throw ScriptException("Wrong alignment v_align string for ihuddraw_align!\n"); } iHudDrawAlign(player->edict - g_entities, index, h_alignement, v_alignement); diff --git a/code/fgame/sentient.cpp b/code/fgame/sentient.cpp index ddffc88a..43cabb62 100644 --- a/code/fgame/sentient.cpp +++ b/code/fgame/sentient.cpp @@ -193,7 +193,7 @@ Event EV_Sentient_UseItem EV_CONSOLE, "si", "name weapon_hand", - "Use the specified weapon or item in the hand choosen (optional).", + "Use the specified weapon or item in the hand chosen (optional).", EV_NORMAL ); Event EV_Sentient_SetBloodModel @@ -391,7 +391,7 @@ Event EV_Sentient_UseWeaponClass EV_CONSOLE, "sI", "name weapon_hand", - "Use the weapon of the specified class in the hand choosen (optional).", + "Use the weapon of the specified class in the hand chosen (optional).", EV_NORMAL ); Event EV_Sentient_German diff --git a/code/fgame/weapturret.cpp b/code/fgame/weapturret.cpp index 00fc3fae..8ebd0586 100644 --- a/code/fgame/weapturret.cpp +++ b/code/fgame/weapturret.cpp @@ -73,7 +73,7 @@ Event EV_Turret_P_SetPlayerUsable EV_DEFAULT, "i", "state", - "Sets wether the turret can be used by players. 0 means no, 1 means yes.", + "Sets whether the turret can be used by players. 0 means no, 1 means yes.", EV_NORMAL ); Event EV_Turret_AI_SetAimTarget @@ -309,7 +309,7 @@ Event EV_Turret_SetUsable EV_DEFAULT, "i", "state", - "Sets wether the turret can be used as a weapon. 0 means no, 1 means yes.", + "Sets whether the turret can be used as a weapon. 0 means no, 1 means yes.", EV_NORMAL ); Event EV_Turret_AI_SetBulletSpread diff --git a/code/gamespy/gstats/gp_stats/gp_stats.rc b/code/gamespy/gstats/gp_stats/gp_stats.rc index dee94b35..d0b03cff 100644 --- a/code/gamespy/gstats/gp_stats/gp_stats.rc +++ b/code/gamespy/gstats/gp_stats/gp_stats.rc @@ -90,7 +90,7 @@ BEGIN EDITTEXT IDC_PASSWORD,65,50,110,12,ES_PASSWORD | ES_AUTOHSCROLL EDITTEXT IDC_PROFILE_ID,65,65,110,12,ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "Authenticate",IDC_AUTHENTICATE,35,85,50,14 - GROUPBOX "Persistant Data",IDC_STATIC,10,115,175,140 + GROUPBOX "Persistent Data",IDC_STATIC,10,115,175,140 CONTROL "Private Read/Write",IDC_PRIVATE_RW,"Button", BS_AUTORADIOBUTTON | WS_GROUP,20,130,77,10 CONTROL "Private Read-Only",IDC_PRIVATE_RO,"Button", diff --git a/code/gamespy/sc/sciInterface.c b/code/gamespy/sc/sciInterface.c index 1bf05252..f572337c 100644 --- a/code/gamespy/sc/sciInterface.c +++ b/code/gamespy/sc/sciInterface.c @@ -9,7 +9,7 @@ /////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -// This is declared as an extern so it can be overriden when testing +// This is declared as an extern so it can be overridden when testing #define SC_SERVICE_URL_FORMAT "http://%s.comp.pubsvs." GSI_DOMAIN_NAME "/CompetitionService/CompetitionService.asmx" char scServiceURL[SC_SERVICE_MAX_URL_LEN] = ""; diff --git a/code/gamespy/webservices/AuthService.c b/code/gamespy/webservices/AuthService.c index 0ad0ac51..11ecd459 100644 --- a/code/gamespy/webservices/AuthService.c +++ b/code/gamespy/webservices/AuthService.c @@ -51,7 +51,7 @@ const char WS_AUTHSERVICE_SIGNATURE_KEY[] = const char WS_AUTHSERVICE_SIGNATURE_EXP[] = "010001"; -// This is declared as an extern so it can be overriden when testing +// This is declared as an extern so it can be overridden when testing #define WS_LOGIN_SERVICE_URL_FORMAT "https://%s.auth.pubsvs." GSI_DOMAIN_NAME "/AuthService/AuthService.asmx" char wsAuthServiceURL[WS_LOGIN_MAX_URL_LEN] = ""; diff --git a/code/qcommon/files.cpp b/code/qcommon/files.cpp index e8f9336b..0890fee7 100644 --- a/code/qcommon/files.cpp +++ b/code/qcommon/files.cpp @@ -293,7 +293,7 @@ typedef struct { static fileHandleData_t fsh[MAX_FILE_HANDLES]; // TTimo - https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=540 -// wether we did a reorder on the current search path when joining the server +// whether we did a reorder on the current search path when joining the server static qboolean fs_reordered; // never load anything from pk3 files that are not present at the server when pure diff --git a/code/sys/sys_unix.c b/code/sys/sys_unix.c index cbbc0f6d..8fc99ee6 100644 --- a/code/sys/sys_unix.c +++ b/code/sys/sys_unix.c @@ -150,7 +150,7 @@ unsigned long sys_timeBase = 0; /* current time in ms, using sys_timeBase as origin NOTE: sys_timeBase*1000 + curtime -> ms since the Epoch 0x7fffffff ms - ~24 days - although timeval:tv_usec is an int, I'm not sure wether it is actually used as an unsigned int + although timeval:tv_usec is an int, I'm not sure whether it is actually used as an unsigned int (which would affect the wrap period) */ int curtime; int Sys_Milliseconds (void)