From 755aaa387874b6823e98d5c35da6ae16d1a22ea2 Mon Sep 17 00:00:00 2001 From: momo5502 Date: Mon, 14 Nov 2016 19:26:15 +0100 Subject: [PATCH] [Console] New ingame console colors --- src/Components/Modules/Console.cpp | 41 ++++++++++++++++++++++++++++++ src/Components/Modules/Console.hpp | 2 ++ 2 files changed, 43 insertions(+) diff --git a/src/Components/Modules/Console.cpp b/src/Components/Modules/Console.cpp index 55f3fd26..61446a94 100644 --- a/src/Components/Modules/Console.cpp +++ b/src/Components/Modules/Console.cpp @@ -491,11 +491,45 @@ namespace Components } } + Game::dvar_t* Console::RegisterConColor(const char* name, float r, float g, float b, float a, float min, float max, int flags, const char* description) + { + static struct + { + const char* name; + float color[4]; + } patchedColors[] = + { + { "con_inputBoxColor", { 0.20f, 0.20f, 0.20f, 1.00f } }, + { "con_inputHintBoxColor", { 0.30f, 0.30f, 0.30f, 1.00f } }, + { "con_outputBarColor", { 0.50f, 0.50f, 0.50f, 0.60f } }, + { "con_outputSliderColor", { 0.35f, 0.50f, 0.00f, 0.60f } }, + { "con_outputWindowColor", { 0.25f, 0.25f, 0.25f, 0.85f } }, + }; + + for (int i = 0; i < ARRAY_SIZE(patchedColors); ++i) + { + if (std::string(name) == patchedColors[i].name) + { + r = patchedColors[i].color[0]; + g = patchedColors[i].color[1]; + b = patchedColors[i].color[2]; + a = patchedColors[i].color[3]; + break; + } + } + + return reinterpret_cast(0x471500)(name, r, g, b, a, min, max, flags, description); + } + Console::Console() { // Console '%s: %s> ' string Utils::Hook::Set(0x5A44B4, "IW4x: " VERSION "> "); + // Patch console color + static float consoleColor[] = { 0.53f, 0.75f, 0.00f, 1.00f }; + Utils::Hook::Set(0x5A451A, consoleColor); + // Internal console Utils::Hook(0x4F690C, Console::ToggleConsole, HOOK_CALL).Install()->Quick(); Utils::Hook(0x4F65A5, Console::ToggleConsole, HOOK_JUMP).Install()->Quick(); @@ -506,6 +540,13 @@ namespace Components // Check for bad food ;) Utils::Hook(0x4CB9F4, Console::GetAutoCompleteFileList, HOOK_CALL).Install()->Quick(); + // Patch console dvars + Utils::Hook(0x4829AB, Console::RegisterConColor, HOOK_CALL).Install()->Quick(); + Utils::Hook(0x4829EE, Console::RegisterConColor, HOOK_CALL).Install()->Quick(); + Utils::Hook(0x482A31, Console::RegisterConColor, HOOK_CALL).Install()->Quick(); + Utils::Hook(0x482A7A, Console::RegisterConColor, HOOK_CALL).Install()->Quick(); + Utils::Hook(0x482AC3, Console::RegisterConColor, HOOK_CALL).Install()->Quick(); + // Modify console style Utils::Hook::Set(0x428A8E, 0); // Adjust logo Y pos Utils::Hook::Set(0x428A90, 0); // Adjust logo X pos diff --git a/src/Components/Modules/Console.hpp b/src/Components/Modules/Console.hpp index e4ccf8fb..c359f969 100644 --- a/src/Components/Modules/Console.hpp +++ b/src/Components/Modules/Console.hpp @@ -63,5 +63,7 @@ namespace Components static void ToggleConsole(); static char** GetAutoCompleteFileList(const char *path, const char *extension, Game::FsListBehavior_e behavior, int *numfiles, int allocTrackType); + + static Game::dvar_t* RegisterConColor(const char* name, float r, float g, float b, float a, float min, float max, int flags, const char* description); }; }