Merge pull request #7135 from Moiman/typos

Fix typos

src/base/logger.h

@@ -103,7 +103,7 @@ public:
 	 */
 	virtual void GlobalFinish() {}
 	/**
-	 * Notifies thte logger of a changed `m_Filter`.
+	 * Notifies the logger of a changed `m_Filter`.
 	 */
 	virtual void OnFilterChange() {}
 };

src/base/rust.rs

@@ -11,7 +11,7 @@ use std::str;
 ///
 /// Callbacks in C are usually represented by a function pointer and some
 /// "userdata" pointer that is also passed to the function pointer. This allows
-/// to hand data to the callback. This type represents such a userdata poiner.
+/// to hand data to the callback. This type represents such a userdata pointer.
 ///
 /// It is `unsafe` to convert the `UserPtr` back to its original pointer using
 /// [`UserPtr::cast`] because its lifetime and type information was lost.

src/engine/client/backend/vulkan/backend_vulkan.cpp

@@ -1102,7 +1102,7 @@ protected:
 	bool m_CanAssert = false;
 
 	/**
-	 * After an error occured, the rendering stop as soon as possible
+	 * After an error occurred, the rendering stop as soon as possible
 	 * Always stop the current code execution after a call to this function (e.g. return false)
 	 */
 	void SetError(EGFXErrorType ErrType, const char *pErr, const char *pErrStrExtra = nullptr)
@@ -6492,7 +6492,7 @@ public:
 				Ret = CallbackObj.m_CMDIsHandled;
 				if(!CallbackObj.m_CommandCB(pBaseCommand, Buffer))
 				{
-					// an error occured, stop this command and ignore all further commands
+					// an error occurred, stop this command and ignore all further commands
 					return ERunCommandReturnTypes::RUN_COMMAND_COMMAND_ERROR;
 				}
 			}
@@ -7652,7 +7652,7 @@ public:
 				{
 					if(!m_aCommandCallbacks[CommandBufferCMDOff(NextCmd.m_Command)].m_CommandCB(NextCmd.m_pRawCommand, NextCmd))
 					{
-						// an error occured, the thread will not continue execution
+						// an error occurred, the thread will not continue execution
 						HasErrorFromCmd = true;
 						break;
 					}

src/engine/client/client.cpp

@@ -4626,7 +4626,7 @@ int main(int argc, const char **argv)
 		pClient->GetGPUInfoString(aGPUInfo);
 		char aMessage[768];
 		str_format(aMessage, sizeof(aMessage),
-			"An assertion error occured. Please write down or take a screenshot of the following information and report this error.\n"
+			"An assertion error occurred. Please write down or take a screenshot of the following information and report this error.\n"
 			"Please also share the assert log which you should find in the 'dumps' folder in your config directory.\n\n"
 			"%s\n\n"
 			"Platform: %s\n"

src/engine/client/text.cpp

@@ -113,7 +113,7 @@ class CAtlas
 	/**
 	 * Sections with a smaller width or height will not be created
 	 * when cutting larger sections, to prevent collecting many
-	 * small, mostly unuseable sections.
+	 * small, mostly unusable sections.
 	 */
 	static constexpr size_t MIN_SECTION_DIMENSION = 6;
 
@@ -227,7 +227,7 @@ public:
 			}
 
 			// We don't iterate sections in the map with increasing width and height at the same time,
-			// because it's slower and doesn't noticable increase the atlas utilization.
+			// because it's slower and doesn't noticeable increase the atlas utilization.
 		}
 
 		// Check vector for larger section
@@ -261,7 +261,7 @@ public:
 			}
 		} while(SectionIndex > 0);
 		if(SmallestLossIndex == m_vSections.size())
-			return false; // No useable section found in vector
+			return false; // No usable section found in vector
 
 		// Use the section with the smallest loss
 		const SSection Section = m_vSections[SmallestLossIndex];

src/engine/console.rs

@@ -512,7 +512,7 @@ mod ffi {
 /// Used as a last parameter in [`IConsole::Print`].
 ///
 /// It is treated as "no color" in the console code, meaning that the default
-/// color of the output medium isn't overriden.
+/// color of the output medium isn't overridden.
 #[allow(non_upper_case_globals)]
 pub const gs_ConsoleDefaultColor: ColorRGBA = ColorRGBA {
     r: 1.0,

src/game/client/components/skins.cpp

@@ -234,7 +234,7 @@ const CSkin *CSkins::LoadSkin(const char *pName, CImageInfo &Info)
 	int OrgWeight = 0;
 	int NewWeight = 192;
 
-	// find most common frequence
+	// find most common frequency
 	for(int y = 0; y < BodyHeight; y++)
 		for(int x = 0; x < BodyWidth; x++)
 		{

src/game/client/components/spectator.cpp

@@ -173,7 +173,7 @@ void CSpectator::OnConsoleInit()
 	Console()->Register("spectate_next", "", CFGFLAG_CLIENT, ConSpectateNext, this, "Spectate the next player");
 	Console()->Register("spectate_previous", "", CFGFLAG_CLIENT, ConSpectatePrevious, this, "Spectate the previous player");
 	Console()->Register("spectate_closest", "", CFGFLAG_CLIENT, ConSpectateClosest, this, "Spectate the closest player");
-	Console()->Register("spectate_multiview", "i[id]", CFGFLAG_CLIENT, ConMultiView, this, "Add/remove Client-IDs to spectate them exclusivly (-1 to reset)");
+	Console()->Register("spectate_multiview", "i[id]", CFGFLAG_CLIENT, ConMultiView, this, "Add/remove Client-IDs to spectate them exclusively (-1 to reset)");
 }
 
 bool CSpectator::OnCursorMove(float x, float y, IInput::ECursorType CursorType)

src/game/client/gameclient.cpp

@@ -3585,7 +3585,7 @@ void CGameClient::HandleMultiView()
 	else if(m_MultiView.m_SecondChance != 0.0f)
 		m_MultiView.m_SecondChance = 0.0f;
 
-	// if we only have one tee thats in the list, we activate solo-mode
+	// if we only have one tee that's in the list, we activate solo-mode
 	m_MultiView.m_Solo = std::count(std::begin(m_aMultiViewId), std::end(m_aMultiViewId), true) == 1;
 
 	vec2 TargetPos = vec2((Minpos.x + Maxpos.x) / 2.0f, (Minpos.y + Maxpos.y) / 2.0f);
@@ -3751,7 +3751,7 @@ float CGameClient::CalculateMultiViewZoom(vec2 MinPos, vec2 MaxPos, float Vel)
 	float Zoom = std::max(ZoomX, ZoomY);
 	// zoom out to maximum 10 percent of the current zoom for 70 velocity
 	float Diff = clamp(MapValue(70.0f, 15.0f, Zoom * 0.10f, 0.0f, Vel), 0.0f, Zoom * 0.10f);
-	// zoom should stay inbetween 1.1 and 20.0
+	// zoom should stay between 1.1 and 20.0
 	Zoom = clamp(Zoom + Diff, 1.1f, 20.0f);
 	// add the user preference
 	Zoom -= (Zoom * 0.1f) * m_MultiViewPersonalZoom;

src/game/client/lineinput.h

@@ -53,7 +53,7 @@ private:
 
 	static char ms_aStars[128];
 
-	char *m_pStr = nullptr; // explicitly set to nullptr outside of contructor, so SetBuffer works in this case
+	char *m_pStr = nullptr; // explicitly set to nullptr outside of constructor, so SetBuffer works in this case
 	size_t m_MaxSize;
 	size_t m_MaxChars;
 	size_t m_Len;

src/game/editor/map_grid.h

@@ -13,7 +13,7 @@ public:
 	int GridLineDistance() const;
 
 	/**
-	 * Returns wether the grid is rendered.
+	 * Returns whether the grid is rendered.
 	 */
 	bool IsEnabled() const;
 

src/game/server/entity.h

@@ -134,7 +134,7 @@ public: // TODO: Maybe make protected
 			ClientID of the initiator from this entity. -1 created by map.
 			This is used by save/load to remove related entities to the tee.
 			CCharacter should not return the PlayerId, because they get
-			handled separatly in save/load code.
+			handled separately in save/load code.
 	*/
 	virtual int GetOwnerID() const { return -1; }
 

src/game/server/scoreworker.cpp

@@ -425,7 +425,7 @@ bool CScoreWorker::SaveScore(IDbConnection *pSqlServer, const ISqlData *pGameDat
 	if(w == Write::NORMAL_FAILED)
 	{
 		int NumUpdated;
-		// move to non-tmp table succeded. delete from backup again
+		// move to non-tmp table succeeded. delete from backup again
 		str_format(aBuf, sizeof(aBuf),
 			"INSERT INTO %s_race SELECT * FROM %s_race_backup WHERE GameId=? AND Name=? AND Timestamp=%s",
 			pSqlServer->GetPrefix(), pSqlServer->GetPrefix(), pSqlServer->InsertTimestampAsUtc());
@@ -442,7 +442,7 @@ bool CScoreWorker::SaveScore(IDbConnection *pSqlServer, const ISqlData *pGameDat
 			return true;
 		}
 
-		// move to non-tmp table succeded. delete from backup again
+		// move to non-tmp table succeeded. delete from backup again
 		str_format(aBuf, sizeof(aBuf),
 			"DELETE FROM %s_race_backup WHERE GameId=? AND Name=? AND Timestamp=%s",
 			pSqlServer->GetPrefix(), pSqlServer->InsertTimestampAsUtc());
@@ -1501,7 +1501,7 @@ bool CScoreWorker::SaveTeam(IDbConnection *pSqlServer, const ISqlData *pGameData
 
 	if(w == Write::NORMAL_SUCCEEDED)
 	{
-		// write succeded on mysql server. delete from sqlite again
+		// write succeeded on mysql server. delete from sqlite again
 		char aBuf[128] = {0};
 		str_format(aBuf, sizeof(aBuf),
 			"DELETE FROM %s_saves_backup WHERE Code = ?",
@@ -1518,7 +1518,7 @@ bool CScoreWorker::SaveTeam(IDbConnection *pSqlServer, const ISqlData *pGameData
 	{
 		char aBuf[256] = {0};
 		bool End;
-		// move to non-tmp table succeded. delete from backup again
+		// move to non-tmp table succeeded. delete from backup again
 		str_format(aBuf, sizeof(aBuf),
 			"INSERT INTO %s_saves SELECT * FROM %s_saves_backup WHERE Code = ?",
 			pSqlServer->GetPrefix(), pSqlServer->GetPrefix());
@@ -1532,7 +1532,7 @@ bool CScoreWorker::SaveTeam(IDbConnection *pSqlServer, const ISqlData *pGameData
 			return true;
 		}
 
-		// move to non-tmp table succeded. delete from backup again
+		// move to non-tmp table succeeded. delete from backup again
 		str_format(aBuf, sizeof(aBuf),
 			"DELETE FROM %s_saves_backup WHERE Code = ?",
 			pSqlServer->GetPrefix());