From bd56afd4c507b22164e34901ea31a918e7818d2e Mon Sep 17 00:00:00 2001 From: Federico Cecchetto Date: Fri, 15 Jul 2022 00:12:27 +0200 Subject: [PATCH] Some changes --- src/client/component/discord.cpp | 2 +- src/client/component/game_console.cpp | 14 ++++---------- src/client/game/symbols.hpp | 6 +++++- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/client/component/discord.cpp b/src/client/component/discord.cpp index 9dc203b5..d83a715b 100644 --- a/src/client/component/discord.cpp +++ b/src/client/component/discord.cpp @@ -27,7 +27,7 @@ namespace discord state = {}; details.reset(); - discord_presence.details = "Main Menu"; + discord_presence.details = game::UI_SafeTranslateString("MENU_MAIN_MENU"); discord_presence.state = ""; discord_presence.startTimestamp = 0; diff --git a/src/client/component/game_console.cpp b/src/client/component/game_console.cpp index a3a9110c..4d2e62b0 100644 --- a/src/client/component/game_console.cpp +++ b/src/client/component/game_console.cpp @@ -194,14 +194,8 @@ namespace game_console con.globals.left_x = con.globals.x; con.globals.auto_complete_choice[0] = 0; - /* game::R_AddCmdDrawTextWithCursor(con.buffer, 0x7FFFFFFF, console_font, 18, con.globals.x, - con.globals.y + con.globals.font_height, 1.0f, 1.0f, 0, color_white, 0, - con.cursor, '|'); - */ - - game::R_AddCmdDrawText(con.buffer, 0x7FFF, console_font, con.globals.x, - con.globals.y + con.globals.font_height, 1.0f, 1.0f, 0.0f, color_white, 0); + con.globals.y + con.globals.font_height, 1.0f, 1.0f, 0, color_white, nullptr, con.cursor, '|'); // check if using a prefixed '/' or not const auto input = con.buffer[1] && (con.buffer[0] == '/' || con.buffer[0] == '\\') @@ -443,13 +437,13 @@ namespace game_console { if (con.globals.may_auto_complete) { - const auto firstChar = con.buffer[0]; + const auto first_char = con.buffer[0]; clear(); - if (firstChar == '\\' || firstChar == '/') + if (first_char == '\\' || first_char == '/') { - con.buffer[0] = firstChar; + con.buffer[0] = first_char; con.buffer[1] = '\0'; } diff --git a/src/client/game/symbols.hpp b/src/client/game/symbols.hpp index fe0a18db..958ec112 100644 --- a/src/client/game/symbols.hpp +++ b/src/client/game/symbols.hpp @@ -124,9 +124,13 @@ namespace game float rotation, float* color1, float* color2, int style)> R_AddCmdDrawText2{0x14076C860}; WEAK symbol R_DrawRectangle{0x14076A280}; WEAK symbol R_AddCmdDrawTextWithCursor{0x14076CAF0}; + const float* color, int style, int cursorPos, char cursor, void* fontGlowStyle)> AddBaseDrawTextCmd{0x14076CAF0}; + WEAK symbol R_GetFontHeight{0x1407470C0}; + WEAK symbol R_GetFontGlowStyle{0x140746680}; WEAK symbol R_AddCmdDrawTextGradient{0x14076C570}; + WEAK symbol R_AddCmdDrawTextWithCursor{0x14076CAF0}; WEAK symbol R_RegisterFont{0x140746FE0}; WEAK symbol R_TextWidth{0x1407472A0}; WEAK symbol R_SyncRenderThread{0x14076E7D0};