From a326a70a7f342deb4d24afea2622e94df04748a1 Mon Sep 17 00:00:00 2001 From: Skull <86374920+skkuull@users.noreply.github.com> Date: Fri, 4 Feb 2022 13:21:35 +0200 Subject: [PATCH] branding --- src/client/component/branding.cpp | 35 +++++++++++++++++++------------ src/client/game/dvars.cpp | 7 +++++++ src/client/game/dvars.hpp | 1 + 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/src/client/component/branding.cpp b/src/client/component/branding.cpp index 95a62748..cfa5d057 100644 --- a/src/client/component/branding.cpp +++ b/src/client/component/branding.cpp @@ -7,10 +7,24 @@ #include #include +#include + + +#include "version.hpp" namespace branding { - game::dvar_t* dvar_draw2d; + namespace + { + utils::hook::detour ui_get_formatted_build_number_hook; + + const char* ui_get_formatted_build_number_stub() + { + const auto* const build_num = ui_get_formatted_build_number_hook.invoke(); + + return utils::string::va("%s (%s)", VERSION, build_num); + } + } class component final : public component_interface { @@ -27,27 +41,22 @@ namespace branding { localized_strings::override("LUA_MENU_MULTIPLAYER_CAPS", "H1-Mod: MULTIPLAYER\n"); localized_strings::override("MENU_MULTIPLAYER_CAPS", "H1-Mod: MULTIPLAYER"); - localized_strings::override("PLATFORM_UI_HEADER_PLAY_MP_CAPS", "H1-ONLINE"); } + dvars::override::Dvar_SetString("version", utils::string::va("H1-Mod %s", VERSION)); + + ui_get_formatted_build_number_hook.create( + SELECT_VALUE(0x1403B1C40, 0x1404E74C0), ui_get_formatted_build_number_stub); + scheduler::loop([]() { - if (!dvar_draw2d) - { - dvar_draw2d = game::Dvar_FindVar("cg_draw2d"); - } - - if (dvar_draw2d && !dvar_draw2d->current.enabled) - { - return; - } const auto x = 4; const auto y = 4; const auto scale = 1.0f; - float color[4] = { 1.0f, 0.5f, 0.0f, 1.0f }; + float color[4] = { 0.666f, 0.666f, 0.666f, 0.666f }; - const auto* text = "H1-Mod 1.4"; + const auto* text = "H1-Mod: " VERSION; auto* font = game::R_RegisterFont("fonts/fira_mono_bold.ttf", 20); diff --git a/src/client/game/dvars.cpp b/src/client/game/dvars.cpp index 95898098..dc71fe83 100644 --- a/src/client/game/dvars.cpp +++ b/src/client/game/dvars.cpp @@ -543,6 +543,8 @@ namespace dvars } namespace override { + static std::unordered_map set_string_overrides; + game::dvar_t* register_int(const std::string& name, int value, int min, int max, const unsigned int flags, bool add_to_list) { @@ -555,5 +557,10 @@ namespace dvars return game::Dvar_RegisterInt(hash, "", value, min, max, flags); } + + void Dvar_SetString(const std::string& name, const std::string& value) + { + set_string_overrides[name] = value; + } } } diff --git a/src/client/game/dvars.hpp b/src/client/game/dvars.hpp index 2f68ccff..16b80b67 100644 --- a/src/client/game/dvars.hpp +++ b/src/client/game/dvars.hpp @@ -34,5 +34,6 @@ namespace dvars namespace override { game::dvar_t* register_int(const std::string& name, int value, int min, int max, const unsigned int flags, bool add_to_list = true); + void Dvar_SetString(const std::string& name, const std::string& string); } }