From 03faf914374033865dedf5b447dfcd70e19d4adb Mon Sep 17 00:00:00 2001 From: Rim Date: Mon, 13 Nov 2023 13:36:02 -0500 Subject: [PATCH] Remove watermark, updater, --dirty, console ver --- premake5.lua | 2 +- src/client/component/branding.cpp | 10 +++++----- src/client/component/console.cpp | 2 +- src/client/component/updater.cpp | 30 +++++++++++++++++++++++++----- 4 files changed, 32 insertions(+), 12 deletions(-) diff --git a/premake5.lua b/premake5.lua index 7bb114b7..4caf30d6 100644 --- a/premake5.lua +++ b/premake5.lua @@ -1,4 +1,4 @@ -gitVersioningCommand = "git describe --tags --dirty --always" +gitVersioningCommand = "git describe --tags --always" gitCurrentBranchCommand = "git symbolic-ref -q --short HEAD" -- Quote the given string input as a C string diff --git a/src/client/component/branding.cpp b/src/client/component/branding.cpp index 342b8b0f..c9aa7b6a 100644 --- a/src/client/component/branding.cpp +++ b/src/client/component/branding.cpp @@ -20,7 +20,7 @@ namespace branding { utils::hook::detour ui_get_formatted_build_number_hook; - float color[4] = {0.39f, 0.9f, 0.4f, 0.9f}; + float color[4] = { 0.39f, 0.9f, 0.4f, 0.9f }; const char* ui_get_formatted_build_number_stub() { @@ -34,14 +34,14 @@ namespace branding if (font) { #ifdef DEBUG - game::R_AddCmdDrawText("h1-mod: " VERSION " (" __DATE__ " " __TIME__ ")", + game::R_AddCmdDrawText("", 0x7FFFFFFF, font, 10.f, - 5.f + static_cast(font->pixelHeight), + 5.f + static_cast(font->pixelHeight), 1.f, 1.f, 0.0f, color, 0); #else - game::R_AddCmdDrawText("h1-mod", + game::R_AddCmdDrawText("", 0x7FFFFFFF, font, 10.f, - 5.f + static_cast(font->pixelHeight), + 5.f + static_cast(font->pixelHeight), 1.f, 1.f, 0.0f, color, 0); #endif } diff --git a/src/client/component/console.cpp b/src/client/component/console.cpp index f6c769b8..4c743d09 100644 --- a/src/client/component/console.cpp +++ b/src/client/component/console.cpp @@ -357,7 +357,7 @@ namespace console printf_hook.create(printf, printf_stub); ShowWindow(GetConsoleWindow(), SW_SHOW); - SetConsoleTitle("H1-Mod: " VERSION); + SetConsoleTitle("H1-Mod: "); con.kill_event = CreateEvent(NULL, TRUE, FALSE, NULL); diff --git a/src/client/component/updater.cpp b/src/client/component/updater.cpp index dcb44584..8bc195eb 100644 --- a/src/client/component/updater.cpp +++ b/src/client/component/updater.cpp @@ -20,7 +20,9 @@ #include #include -#define MASTER "https://master.fed0001.xyz/h1-mod/" +// Ahrimdon +#define MASTER "" +// #define MASTER "https://master.fed0001.xyz/h1-mod/" #define FILES_PATH "files.json" #define FILES_PATH_DEV "files-dev.json" @@ -396,8 +398,9 @@ namespace updater data_.cancelled = true; }); } - - void start_update_check() + // Ahrimdon + /* + void start_update_check() { cancel_update(); reset_data(); @@ -491,10 +494,27 @@ namespace updater notify("update_check_done"); }, scheduler::pipeline::async); } + */ + + void start_update_check() // Ahrimdon + { + console::debug("[Updater] Skipping update check as master server is not defined.\n"); + + update_data.access([](update_data_t& data_) + { + data_.check.done = true; + data_.check.success = true; + }); + + notify("update_check_done"); + } + void start_update_download() { - console::debug("[Updater] starting update download\n"); + // console::debug("[Updater] starting update download\n"); - Ahrimdon + console::debug("[Updater] Skipping update download as master server is not defined.\n"); + return; if (!is_update_check_done() || !get_update_check_status() || is_update_cancelled()) { @@ -596,4 +616,4 @@ namespace updater }; } -REGISTER_COMPONENT(updater::component) +REGISTER_COMPONENT(updater::component) \ No newline at end of file