From 70be263918b7228e40c7c3b455433096619b5a24 Mon Sep 17 00:00:00 2001
From: Edo <edoardo.sanguineti222@gmail.com>
Date: Wed, 19 Apr 2023 15:53:07 +0200
Subject: [PATCH] [Bots]: I misread std::string docs (#943)

---
 src/Components/Modules/Bots.cpp | 19 ++++---------------
 src/Components/Modules/Bots.hpp |  1 -
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/Components/Modules/Bots.cpp b/src/Components/Modules/Bots.cpp
index 8b0f13df..a598c4ef 100644
--- a/src/Components/Modules/Bots.cpp
+++ b/src/Components/Modules/Bots.cpp
@@ -6,8 +6,8 @@
 #include "GSC/Script.hpp"
 
 // From Quake-III
-#define	ANGLE2SHORT(x) ((int)((x) * (USHRT_MAX + 1) / 360.0f) & USHRT_MAX)
-#define	SHORT2ANGLE(x) ((x)* (360.0f / (USHRT_MAX + 1)))
+#define ANGLE2SHORT(x) ((int)((x) * (USHRT_MAX + 1) / 360.0f) & USHRT_MAX)
+#define SHORT2ANGLE(x) ((x)* (360.0f / (USHRT_MAX + 1)))
 
 namespace Components
 {
@@ -61,16 +61,6 @@ namespace Components
 		std::ranges::shuffle(BotNames, gen);
 	}
 
-	std::string Bots::TruncBotString(const std::string& input, const std::size_t length)
-	{
-		if (length > input.size())
-		{
-			return input;
-		}
-
-		return input.substr(length);
-	}
-
 	void Bots::LoadBotNames()
 	{
 		FileSystem::File bots("bots.txt");
@@ -102,14 +92,13 @@ namespace Components
 				// Only start copying over from non-null characters (otherwise it can be "<=")
 				if ((pos + 1) < entry.size())
 				{
-					clanAbbrev = entry.substr(pos + 1);
+					clanAbbrev = entry.substr(pos + 1, ClanTags::MAX_CLAN_NAME_LENGTH - 1);
 				}
 
 				entry = entry.substr(0, pos);
 			}
 
-			entry = TruncBotString(entry, MAX_NAME_LENGTH - 1);
-			clanAbbrev = TruncBotString(clanAbbrev, ClanTags::MAX_CLAN_NAME_LENGTH - 1);
+			entry = entry.substr(0, MAX_NAME_LENGTH - 1);
 
 			BotNames.emplace_back(entry, clanAbbrev);
 		}
diff --git a/src/Components/Modules/Bots.hpp b/src/Components/Modules/Bots.hpp
index 23d253f3..9d7526e1 100644
--- a/src/Components/Modules/Bots.hpp
+++ b/src/Components/Modules/Bots.hpp
@@ -17,7 +17,6 @@ namespace Components
 		static const Game::dvar_t* sv_replaceBots;
 
 		static void RandomizeBotNames();
-		static std::string TruncBotString(const std::string& input, std::size_t length);
 		static void LoadBotNames();
 		static int BuildConnectString(char* buffer, const char* connectString, int num, int, int protocol, int checksum, int statVer, int statStuff, int port);