From 3af1d21166433649b90d1d5d77a81f5d0b55897e Mon Sep 17 00:00:00 2001 From: m Date: Sun, 13 Mar 2022 07:45:20 -0500 Subject: [PATCH] add listassetpool & others --- src/client/component/command.cpp | 17 ++++- src/client/component/game_console.cpp | 103 +++++++++++++------------- src/client/component/game_console.hpp | 5 +- src/client/game/symbols.hpp | 10 +++ 4 files changed, 78 insertions(+), 57 deletions(-) diff --git a/src/client/component/command.cpp b/src/client/component/command.cpp index 19532a87..28600228 100644 --- a/src/client/component/command.cpp +++ b/src/client/component/command.cpp @@ -277,6 +277,15 @@ namespace command } } + void enum_assets(const game::XAssetType type, const std::function& callback, const bool includeOverride) + { + game::DB_EnumXAssets_Internal(type, static_cast([](game::XAssetHeader header, void* data) + { + const auto& cb = *static_cast*>(data); + cb(header); + }), &callback, includeOverride); + } + class component final : public component_interface { public: @@ -339,7 +348,7 @@ namespace command console::info("================================ END COMMAND DUMP =================================\n"); }); - /*add("listassetpool", [](const params& params) + add("listassetpool", [](const params& params) { if (params.size() < 2) { @@ -378,7 +387,7 @@ namespace command console::info("%s\n", asset_name); }, true); } - });*/ + }); add("vstr", [](const params& params) { @@ -570,7 +579,7 @@ namespace command : "^1off")); }); - /*add_sv("give", [](const int client_num, const params_sv& params) + add_sv("give", [](const int client_num, const params_sv& params) { if (!game::Dvar_FindVar("sv_cheats")->current.enabled) { @@ -620,7 +629,7 @@ namespace command { game::G_TakePlayerWeapon(ps, wp); } - });*/ + }); } }; } diff --git a/src/client/component/game_console.cpp b/src/client/component/game_console.cpp index deec2813..913b412b 100644 --- a/src/client/component/game_console.cpp +++ b/src/client/component/game_console.cpp @@ -177,58 +177,6 @@ namespace game_console game::R_AddCmdDrawText(text, 0x7FFFFFFF, console_font, con.globals.x + offset_x, _y, 1.0f, 1.0f, 0.0f, color, 0); } - bool match_compare(const std::string& input, const std::string& text, const bool exact) - { - if (exact && text == input) return true; - if (!exact && text.find(input) != std::string::npos) return true; - return false; - } - - void find_matches(std::string input, std::vector& suggestions, const bool exact) - { - input = utils::string::to_lower(input); - - for (const auto& dvar : dvars::dvar_list) - { - auto name = utils::string::to_lower(dvar.name); - if (game::Dvar_FindVar(name.data()) && match_compare(input, name, exact)) - { - suggestions.push_back(dvar); - } - - if (exact && suggestions.size() > 1) - { - return; - } - } - - if (suggestions.size() == 0 && game::Dvar_FindVar(input.data())) - { - suggestions.push_back({input.data(), ""}); - } - - game::cmd_function_s* cmd = (*game::cmd_functions); - while (cmd) - { - if (cmd->name) - { - std::string name = utils::string::to_lower(cmd->name); - - if (match_compare(input, name, exact)) - { - suggestions.push_back({cmd->name, ""}); - } - - if (exact && suggestions.size() > 1) - { - return; - } - } - - cmd = cmd->next; - } - } - void draw_input() { con.globals.font_height = static_cast(console_font->pixelHeight); @@ -718,6 +666,57 @@ namespace game_console return true; } + bool match_compare(const std::string& input, const std::string& text, const bool exact) + { + if (exact && text == input) return true; + if (!exact && text.find(input) != std::string::npos) return true; + return false; + } + + void find_matches(std::string input, std::vector& suggestions, const bool exact) + { + input = utils::string::to_lower(input); + + for (const auto& dvar : dvars::dvar_list) + { + auto name = utils::string::to_lower(dvar); + if (game::Dvar_FindVar(name.data()) && match_compare(input, name, exact)) + { + suggestions.push_back(dvar); + } + + if (exact && suggestions.size() > 1) + { + return; + } + } + + if (suggestions.size() == 0 && game::Dvar_FindVar(input.data())) + { + suggestions.push_back(input.data()); + } + + game::cmd_function_s* cmd = (*game::cmd_functions); + while (cmd) + { + if (cmd->name) + { + std::string name = utils::string::to_lower(cmd->name); + + if (game_console::match_compare(input, name, exact)) + { + suggestions.push_back(cmd->name); + } + + if (exact && suggestions.size() > 1) + { + return; + } + } + + cmd = cmd->next; + } + } class component final : public component_interface { diff --git a/src/client/component/game_console.hpp b/src/client/component/game_console.hpp index cdc001a7..e0b64753 100644 --- a/src/client/component/game_console.hpp +++ b/src/client/component/game_console.hpp @@ -4,4 +4,7 @@ namespace game_console { bool console_char_event(int local_client_num, int key); bool console_key_event(int local_client_num, int key, int down); -} \ No newline at end of file + + bool match_compare(const std::string& input, const std::string& text, const bool exact); + void find_matches(std::string input, std::vector& suggestions, const bool exact); +} diff --git a/src/client/game/symbols.hpp b/src/client/game/symbols.hpp index 9118b37c..bfabfd0d 100644 --- a/src/client/game/symbols.hpp +++ b/src/client/game/symbols.hpp @@ -82,6 +82,12 @@ namespace game WEAK symbol G_Glass_Update{0x14026C570, 0x14033A640}; WEAK symbol G_GetClientScore{0, 0x140342F90}; + WEAK symbol G_GetWeaponForName{0x1402C2A90, 0x14038C300}; + WEAK symbol G_GivePlayerWeapon{0x1402C2DF0, 0x14038C750}; + WEAK symbol G_InitializeAmmo{0x140270980, 0x14033EDD0}; + WEAK symbol G_SelectWeapon{0x1402C3750, 0x14038D1B0}; + WEAK symbol G_TakePlayerWeapon{0x1402C3900, 0x14038D370}; WEAK symbol I_CleanStr{0x1403CD230, 0x140503D00}; @@ -128,6 +134,9 @@ namespace game WEAK symbol ScrPlace_GetViewPlacement{0x1401981F0, 0x140288550}; + WEAK symbol + DB_EnumXAssets_Internal{0x1401C9C10, 0x1402BA830}; + WEAK symbol DB_GetXAssetName{0x14019A390, 0x14028BE50}; WEAK symbol DB_GetXAssetTypeSize{0x14019A3B0, 0x14028BE70}; WEAK symbol dvarPool{0x14C217D20, 0x14D064D00}; WEAK symbol DB_XAssetPool{0x140DE8C80, 0x140FEB5D0}; + WEAK symbol g_assetNames{0x1408B0870, 0x140FEA240}; WEAK symbol keyCatchers{0x14243DAF0, 0x142D0BA9C}; WEAK symbol playerKeys{0x1422A873C, 0x142C19AFC};