Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

FontIcon tabs vs spaces stuff

Browse Source
This commit is contained in:
Jan 2021-09-20 18:21:38 +02:00
parent b36df5130b
commit b8b8608a3d
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Components/Modules/Chat.cpp
View File

@ -69,7 +69,7 @@ namespace Components
pop eax pop eax
retn retn
return: return:
pop eax pop eax
// Jump to the target // Jump to the target
@ -121,7 +121,7 @@ namespace Components
return; return;
} }
TextRenderer::FontIconInfo fontIconInfo{}; TextRenderer::FontIconInfo fontIconInfo{};
auto len = 0.0f; auto len = 0.0f;
auto lastColor = static_cast<int>(TEXT_COLOR_DEFAULT); auto lastColor = static_cast<int>(TEXT_COLOR_DEFAULT);
char* lastSpace = nullptr; char* lastSpace = nullptr;
@ -172,7 +172,7 @@ namespace Components
*p = 0; *p = 0;
Game::cgsArray[0].teamChatMsgTimes[Game::cgsArray[0].teamChatPos % chatHeight] = Game::cgArray[0].time; Game::cgsArray[0].teamChatMsgTimes[Game::cgsArray[0].teamChatPos % chatHeight] = Game::cgArray[0].time;
if (Game::cgsArray[0].teamChatPos++ + 1 - Game::cgsArray[0].teamLastChatPos > chatHeight) 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() __declspec(naked) void Chat::CG_AddToTeamChat_Stub()

8
src/Components/Modules/TextRenderer.hpp
View File

@ -4,7 +4,7 @@ namespace Components
{ {
enum TextColor enum TextColor
{ {
TEXT_COLOR_BLACK = 0, TEXT_COLOR_BLACK = 0,
TEXT_COLOR_RED = 1, TEXT_COLOR_RED = 1,
TEXT_COLOR_GREEN = 2, TEXT_COLOR_GREEN = 2,
TEXT_COLOR_YELLOW = 3, TEXT_COLOR_YELLOW = 3,
@ -58,8 +58,8 @@ namespace Components
enum FontIconAutocompleteInstance enum FontIconAutocompleteInstance
{ {
FONT_ICON_ACI_CONSOLE, FONT_ICON_ACI_CONSOLE,
FONT_ICON_ACI_CHAT, FONT_ICON_ACI_CHAT,
FONT_ICON_ACI_COUNT FONT_ICON_ACI_COUNT
}; };
@ -202,7 +202,7 @@ namespace Components
static float GetMonospaceWidth(Game::Font_s* font, int rendererFlags); static float GetMonospaceWidth(Game::Font_s* font, int rendererFlags);
static void GlowColor(Game::GfxColor* result, Game::GfxColor baseColor, Game::GfxColor forcedGlowColor, int renderFlags); 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 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 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); static void RotateXY(float cosAngle, float sinAngle, float pivotX, float pivotY, float x, float y, float* outX, float* outY);

6
src/Game/Functions.cpp
View File

@ -1348,7 +1348,7 @@ namespace Game
__declspec(naked) Glyph* R_GetCharacterGlyph(Font_s* /*font*/, unsigned int /*letter*/) __declspec(naked) Glyph* R_GetCharacterGlyph(Font_s* /*font*/, unsigned int /*letter*/)
{ {
__asm __asm
{ {
push eax push eax
pushad 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*/) __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 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*/) __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 pushad