[Deps]: Rename stb_truetype.h to stb_truetype.hpp (#719)

lib/include/stb_truetype.hpp

@@ -5008,4 +5008,4 @@ AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
 ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ------------------------------------------------------------------------------
-*/
+*/

src/Components/Modules/AssetInterfaces/IFont_s.cpp

@@ -2,7 +2,7 @@
 #include "IFont_s.hpp"
 
 #define STB_TRUETYPE_IMPLEMENTATION
-#include <stb_truetype.h>
+#include <stb_truetype.hpp>
 
 #include <json.hpp>
 

src/Components/Modules/Chat.cpp

@@ -56,6 +56,19 @@ namespace Components
 			Game::SV_GameSendServerCommand(player - Game::g_entities, Game::SV_CMD_CAN_IGNORE, Utils::String::VA("%c \"You are muted\"", 0x65));
 		}
 
+		if (sv_disableChat.get<bool>())
+		{
+			SendChat = false;
+			Game::SV_GameSendServerCommand(player - Game::g_entities, Game::SV_CMD_CAN_IGNORE, Utils::String::VA("%c \"Chat is disabled\"", 0x65));
+		}
+
+		// Message might be empty after processing the '/'
+		if (text[msgIndex] == '\0')
+		{
+			SendChat = false;
+			return text;
+		}
+
 		for (const auto& callback : SayCallbacks)
 		{
 			if (!ChatCallback(player, callback.getPos(), (text + msgIndex), mode))
@@ -64,12 +77,6 @@ namespace Components
 			}
 		}
 
-		if (sv_disableChat.get<bool>())
-		{
-			SendChat = false;
-			Game::SV_GameSendServerCommand(player - Game::g_entities, Game::SV_CMD_CAN_IGNORE, Utils::String::VA("%c \"Chat is disabled\"", 0x65));
-		}
-
 		TextRenderer::StripMaterialTextIcons(text, text, std::strlen(text) + 1);
 
 		Game::Scr_AddEntity(player);

src/Components/Modules/Debug.cpp

@@ -102,8 +102,6 @@ namespace Components
 
 	const char Debug::StrTemplate[] = "%s: %s All those moments will be lost in time, like tears in rain.";
 
-	const float Debug::ColorWhite[] = {1.0f, 1.0f, 1.0f, 1.0f};
-
 	std::string Debug::BuildPMFlagsString(const Game::playerState_s* ps)
 	{
 		std::string result;
@@ -163,19 +161,19 @@ namespace Components
 		auto* const font2 = Game::UI_GetFontHandle(scrPlace, 6, MY_SCALE2);
 
 		Game::UI_DrawText(scrPlace, "Client View of Flags", maxChars, font2, -60.0f, 0, 1, 1,
-			MY_SCALE2, ColorWhite, 1);
+			MY_SCALE2, TextRenderer::WHITE_COLOR, 1);
 
 		const auto pmf = BuildPMFlagsString(&cgameGlob->predictedPlayerState);
-		Game::UI_DrawText(scrPlace, pmf.data(), maxChars, font1, 30.0f, MY_Y, 1, 1, MY_SCALE_2, ColorWhite, 3);
+		Game::UI_DrawText(scrPlace, pmf.data(), maxChars, font1, 30.0f, MY_Y, 1, 1, MY_SCALE_2, TextRenderer::WHITE_COLOR, 3);
 
 		const auto pof = BuildPOFlagsString(&cgameGlob->predictedPlayerState);
-		Game::UI_DrawText(scrPlace, pof.data(), maxChars, font1, 350.0f, MY_Y, 1, 1, MY_SCALE_2, ColorWhite, 3);
+		Game::UI_DrawText(scrPlace, pof.data(), maxChars, font1, 350.0f, MY_Y, 1, 1, MY_SCALE_2, TextRenderer::WHITE_COLOR, 3);
 
 		const auto plf = BuildPLFlagsString(&cgameGlob->predictedPlayerState);
-		Game::UI_DrawText(scrPlace, plf.data(), maxChars, font1, 350.0f, 250.0f, 1, 1, MY_SCALE_2, ColorWhite, 3);
+		Game::UI_DrawText(scrPlace, plf.data(), maxChars, font1, 350.0f, 250.0f, 1, 1, MY_SCALE_2, TextRenderer::WHITE_COLOR, 3);
 
 		const auto pef = BuildPEFlagsString(&cgameGlob->predictedPlayerState);
-		Game::UI_DrawText(scrPlace, pef.data(), maxChars, font1, 525.0f, MY_Y, 1, 1, MY_SCALE_2, ColorWhite, 3);
+		Game::UI_DrawText(scrPlace, pef.data(), maxChars, font1, 525.0f, MY_Y, 1, 1, MY_SCALE_2, TextRenderer::WHITE_COLOR, 3);
 	}
 
 	void Debug::CG_DrawDebugPlayerHealth(const int localClientNum)
@@ -223,23 +221,23 @@ namespace Components
 
 		sprintf_s(strFinal, StrTemplate, font1->fontName, StrButtons);
 		Game::UI_FilterStringForButtonAnimation(strFinal, sizeof(strFinal));
-		Game::UI_DrawText(scrPlace, strFinal, std::numeric_limits<int>::max(), font1, MY_X, 10.0f, 1, 1, 0.4f, ColorWhite, 3);
+		Game::UI_DrawText(scrPlace, strFinal, std::numeric_limits<int>::max(), font1, MY_X, 10.0f, 1, 1, 0.4f, TextRenderer::WHITE_COLOR, 3);
 
 		sprintf_s(strFinal, StrTemplate, font2->fontName, StrButtons);
 		Game::UI_FilterStringForButtonAnimation(strFinal, sizeof(strFinal));
-		Game::UI_DrawText(scrPlace, strFinal, std::numeric_limits<int>::max(), font2, MY_X, 35.0f, 1, 1, 0.4f, ColorWhite, 3);
+		Game::UI_DrawText(scrPlace, strFinal, std::numeric_limits<int>::max(), font2, MY_X, 35.0f, 1, 1, 0.4f, TextRenderer::WHITE_COLOR, 3);
 
 		sprintf_s(strFinal, StrTemplate, font3->fontName, StrButtons);
 		Game::UI_FilterStringForButtonAnimation(strFinal, sizeof(strFinal));
-		Game::UI_DrawText(scrPlace, strFinal, std::numeric_limits<int>::max(), font3, MY_X, 60.0f, 1, 1, 0.4f, ColorWhite, 3);
+		Game::UI_DrawText(scrPlace, strFinal, std::numeric_limits<int>::max(), font3, MY_X, 60.0f, 1, 1, 0.4f, TextRenderer::WHITE_COLOR, 3);
 
 		sprintf_s(strFinal, StrTemplate, font5->fontName, StrButtons);
 		Game::UI_FilterStringForButtonAnimation(strFinal, sizeof(strFinal));
-		Game::UI_DrawText(scrPlace, strFinal, std::numeric_limits<int>::max(), font5, MY_X, 85.0f, 1, 1, 0.4f, ColorWhite, 3);
+		Game::UI_DrawText(scrPlace, strFinal, std::numeric_limits<int>::max(), font5, MY_X, 85.0f, 1, 1, 0.4f, TextRenderer::WHITE_COLOR, 3);
 
 		sprintf_s(strFinal, StrTemplate, font6->fontName, StrButtons);
 		Game::UI_FilterStringForButtonAnimation(strFinal, sizeof(strFinal));
-		Game::UI_DrawText(scrPlace, strFinal, std::numeric_limits<int>::max(), font6, MY_X, 110.0f, 1, 1, 0.4f, ColorWhite, 3);
+		Game::UI_DrawText(scrPlace, strFinal, std::numeric_limits<int>::max(), font6, MY_X, 110.0f, 1, 1, 0.4f, TextRenderer::WHITE_COLOR, 3);
 	}
 
 	void Debug::CG_DrawDebugOverlays_Hk(const int localClientNum)

src/Components/Modules/Debug.hpp

@@ -28,8 +28,6 @@ namespace Components
 		static constexpr auto MY_X = -25.0f;
 		static constexpr auto MY_Y = 20.0f;
 
-		static const float ColorWhite[];
-
 		static std::string BuildPMFlagsString(const Game::playerState_s* ps);
 		static std::string BuildPOFlagsString(const Game::playerState_s* ps);
 		static std::string BuildPLFlagsString(const Game::playerState_s* ps);

src/Components/Modules/TextRenderer.hpp

@@ -42,6 +42,7 @@ namespace Components
 
 	class TextRenderer : public Component
 	{
+	public:
 		static constexpr auto STRING_BUFFER_SIZE_BIG = 1024;
 		static constexpr auto STRING_BUFFER_SIZE_SMALL = 128;
 
@@ -88,7 +89,6 @@ namespace Components
 			1.0f
 		};
 
-	public:
 		static constexpr char FONT_ICON_SEPARATOR_CHARACTER = ':';
 		static constexpr char FONT_ICON_MODIFIER_SEPARATOR_CHARACTER = '+';
 		static constexpr char FONT_ICON_MODIFIER_FLIP_HORIZONTALLY = 'h';
@@ -139,7 +139,7 @@ namespace Components
 		class BufferedLocalizedString
 		{
 		public:
-			BufferedLocalizedString(const char* reference, size_t bufferSize);
+			BufferedLocalizedString(const char* reference, std::size_t bufferSize);
 			void Cache();
 			const char* Format(const char* value);
 			const char* GetString() const;
@@ -148,7 +148,7 @@ namespace Components
 		private:
 			const char* stringReference;
 			std::unique_ptr<char[]> stringBuffer;
-			size_t stringBufferSize;
+			std::size_t stringBufferSize;
 			int stringWidth[FONT_ICON_ACI_COUNT];
 		};