diff --git a/src/Components/Modules/Chat.cpp b/src/Components/Modules/Chat.cpp index 204981df..2ad45ae4 100644 --- a/src/Components/Modules/Chat.cpp +++ b/src/Components/Modules/Chat.cpp @@ -69,7 +69,7 @@ namespace Components pop eax retn - return: + return: pop eax // Jump to the target @@ -121,7 +121,7 @@ namespace Components return; } - TextRenderer::FontIconInfo fontIconInfo{}; + TextRenderer::FontIconInfo fontIconInfo{}; auto len = 0.0f; auto lastColor = static_cast(TEXT_COLOR_DEFAULT); char* lastSpace = nullptr; @@ -172,7 +172,7 @@ namespace Components *p = 0; Game::cgsArray[0].teamChatMsgTimes[Game::cgsArray[0].teamChatPos % chatHeight] = Game::cgArray[0].time; if (Game::cgsArray[0].teamChatPos++ + 1 - Game::cgsArray[0].teamLastChatPos > chatHeight) - Game::cgsArray[0].teamLastChatPos = Game::cgsArray[0].teamChatPos + 1 - chatHeight; + Game::cgsArray[0].teamLastChatPos = Game::cgsArray[0].teamChatPos + 1 - chatHeight; } __declspec(naked) void Chat::CG_AddToTeamChat_Stub() diff --git a/src/Components/Modules/TextRenderer.cpp b/src/Components/Modules/TextRenderer.cpp index 6a69283d..6c74128a 100644 --- a/src/Components/Modules/TextRenderer.cpp +++ b/src/Components/Modules/TextRenderer.cpp @@ -1490,4 +1490,4 @@ namespace Components PatchColorLimit(COLOR_LAST_CHAR); } -} \ No newline at end of file +} diff --git a/src/Components/Modules/TextRenderer.hpp b/src/Components/Modules/TextRenderer.hpp index 97de8f54..baf1b945 100644 --- a/src/Components/Modules/TextRenderer.hpp +++ b/src/Components/Modules/TextRenderer.hpp @@ -4,7 +4,7 @@ namespace Components { enum TextColor { - TEXT_COLOR_BLACK = 0, + TEXT_COLOR_BLACK = 0, TEXT_COLOR_RED = 1, TEXT_COLOR_GREEN = 2, TEXT_COLOR_YELLOW = 3, @@ -58,8 +58,8 @@ namespace Components enum FontIconAutocompleteInstance { - FONT_ICON_ACI_CONSOLE, - FONT_ICON_ACI_CHAT, + FONT_ICON_ACI_CONSOLE, + FONT_ICON_ACI_CHAT, FONT_ICON_ACI_COUNT }; @@ -202,7 +202,7 @@ namespace Components static float GetMonospaceWidth(Game::Font_s* font, int rendererFlags); static void GlowColor(Game::GfxColor* result, Game::GfxColor baseColor, Game::GfxColor forcedGlowColor, int renderFlags); - static unsigned R_FontGetRandomLetter(int seed); + static unsigned R_FontGetRandomLetter(int seed); static void DrawTextFxExtraCharacter(Game::Material* material, int charIndex, float x, float y, float w, float h, float sinAngle, float cosAngle, unsigned color); static float DrawHudIcon(const char*& text, float x, float y, float sinAngle, float cosAngle, const Game::Font_s* font, float xScale, float yScale, unsigned color); static void RotateXY(float cosAngle, float sinAngle, float pivotX, float pivotY, float x, float y, float* outX, float* outY); diff --git a/src/Game/Functions.cpp b/src/Game/Functions.cpp index 12d2bd8a..9d5e52ab 100644 --- a/src/Game/Functions.cpp +++ b/src/Game/Functions.cpp @@ -1348,7 +1348,7 @@ namespace Game __declspec(naked) Glyph* R_GetCharacterGlyph(Font_s* /*font*/, unsigned int /*letter*/) { - __asm + __asm { push eax pushad @@ -1397,7 +1397,7 @@ namespace Game __declspec(naked) void RB_DrawChar(Material* /*material*/, float /*x*/, float /*y*/, float /*w*/, float /*h*/, float /*sinAngle*/, float /*cosAngle*/, Glyph* /*glyph*/, unsigned int /*color*/) { - __asm + __asm { pushad @@ -1422,7 +1422,7 @@ namespace Game __declspec(naked) void RB_DrawStretchPicRotate(Material* /*material*/, float /*x*/, float /*y*/, float /*w*/, float /*h*/, float /*s0*/, float /*t0*/, float /*s1*/, float /*t1*/, float /*sinAngle*/, float /*cosAngle*/, unsigned int /*color*/) { - __asm + __asm { pushad