From 8f3a764617b87b5d99c6e3a21fd3b86a58598bc6 Mon Sep 17 00:00:00 2001 From: stdnullptr Date: Fri, 20 Dec 2024 22:36:10 +0200 Subject: [PATCH] feat: dumper and new code style formatter --- um-client/src/controller/Aim.hpp | 14 +- .../src/controller/Cs2CheatController.cpp | 49 +++--- .../src/controller/Cs2CheatController.hpp | 8 +- um-client/src/controller/Entity.cpp | 37 ++-- um-client/src/driver/driver.cpp | 5 +- um-client/src/driver/driver.hpp | 6 +- um-client/src/global.hpp | 50 +++--- um-client/src/imgui/ImGuiFrame.hpp | 52 +++--- um-client/src/main.cpp | 64 +++---- um-client/src/render/DrawCache.hpp | 2 +- um-client/src/render/Render.hpp | 36 ++-- .../src/sdk/dumper/animationsystem_dll.hpp | 2 +- um-client/src/sdk/dumper/buttons.hpp | 34 ++-- um-client/src/sdk/dumper/client_dll.hpp | 16 +- um-client/src/sdk/dumper/engine2_dll.hpp | 2 +- um-client/src/sdk/dumper/host_dll.hpp | 2 +- um-client/src/sdk/dumper/info.json | 4 +- um-client/src/sdk/dumper/interfaces.hpp | 162 +++++++++--------- .../src/sdk/dumper/materialsystem2_dll.hpp | 2 +- .../src/sdk/dumper/networksystem_dll.hpp | 2 +- um-client/src/sdk/dumper/offsets.hpp | 44 ++--- um-client/src/sdk/dumper/panorama_dll.hpp | 2 +- um-client/src/sdk/dumper/particles_dll.hpp | 2 +- um-client/src/sdk/dumper/pulse_system_dll.hpp | 2 +- .../src/sdk/dumper/rendersystemdx11_dll.hpp | 2 +- .../src/sdk/dumper/resourcesystem_dll.hpp | 2 +- um-client/src/sdk/dumper/scenesystem_dll.hpp | 2 +- um-client/src/sdk/dumper/schemasystem_dll.hpp | 2 +- um-client/src/sdk/dumper/server_dll.hpp | 10 +- um-client/src/sdk/dumper/soundsystem_dll.hpp | 2 +- um-client/src/sdk/dumper/vphysics2_dll.hpp | 2 +- .../src/sdk/dumper/worldrenderer_dll.hpp | 2 +- um-client/src/util/BoneMatrix.hpp | 4 +- um-client/src/util/Esp.hpp | 28 +-- um-client/src/util/Vec2.hpp | 8 +- um-client/src/util/Vec3.hpp | 4 +- um-client/src/util/ViewMatrix.hpp | 4 +- 37 files changed, 334 insertions(+), 337 deletions(-) diff --git a/um-client/src/controller/Aim.hpp b/um-client/src/controller/Aim.hpp index a371c63..63f3a3d 100644 --- a/um-client/src/controller/Aim.hpp +++ b/um-client/src/controller/Aim.hpp @@ -11,13 +11,13 @@ namespace cheat::aim inline std::optional find_valid_aim_target_in_circle(const Vec2& center, const float& radius, const std::vector& aim_targets) { - const float radius_squared{radius * radius}; - float min_distance_squared{std::numeric_limits::max()}; - std::optional aim_target{std::nullopt}; + const float radius_squared{ radius * radius }; + float min_distance_squared{ std::numeric_limits::max() }; + std::optional aim_target{ std::nullopt }; for (const auto& target : aim_targets) { - const float dist_squared{center.distance_squared(target)}; + const float dist_squared{ center.distance_squared(target) }; if (dist_squared <= radius_squared && dist_squared < min_distance_squared) { @@ -42,7 +42,7 @@ namespace cheat::aim inline void aim_loop(const std::stop_token& stop_token, const std::optional& aim_target) { - static const ImVec2 crosshair{g::screen_center}; + static const ImVec2 crosshair{ g::screen_center }; while (!stop_token.stop_requested()) { @@ -50,8 +50,8 @@ namespace cheat::aim { if (GetAsyncKeyState(VK_MBUTTON) & 0x8000 || (g::toggles::aim_assist && GetAsyncKeyState(VK_LBUTTON) & 0x8000)) { - const float delta_x{aim_target->x - crosshair.x}; - const float delta_y{aim_target->y - crosshair.y}; + const float delta_x{ aim_target->x - crosshair.x }; + const float delta_y{ aim_target->y - crosshair.y }; move_mouse(delta_x, delta_y); sleep_for(10us); diff --git a/um-client/src/controller/Cs2CheatController.cpp b/um-client/src/controller/Cs2CheatController.cpp index 6166bba..c39c019 100644 --- a/um-client/src/controller/Cs2CheatController.cpp +++ b/um-client/src/controller/Cs2CheatController.cpp @@ -4,7 +4,7 @@ namespace cheat { std::optional Cs2CheatController::get_cs2_process_id() { - const auto process_id{commons::process::GetProcessIdByName(g::cs2_process_name)}; + const auto process_id{ commons::process::GetProcessIdByName(g::cs2_process_name) }; if (!process_id.has_value()) { std::wcerr << XORW(L"Failed to find pid of requested process.\n"); @@ -20,7 +20,7 @@ namespace cheat std::optional Cs2CheatController::find_client_dll_base() const { - const auto client_dll_base{commons::process::GetModuleBaseAddress(cs2_process_id_, g::client_dll_module_name)}; + const auto client_dll_base{ commons::process::GetModuleBaseAddress(cs2_process_id_, g::client_dll_module_name) }; if (!client_dll_base.has_value()) { std::wcerr << XORW(L"Failed GetModuleBaseAddress for Client DLL.\n"); @@ -36,7 +36,7 @@ namespace cheat std::optional Cs2CheatController::find_engine_dll_base() const { - const auto engine_dll_base{commons::process::GetModuleBaseAddress(cs2_process_id_, g::engine_dll_module_name)}; + const auto engine_dll_base{ commons::process::GetModuleBaseAddress(cs2_process_id_, g::engine_dll_module_name) }; if (!engine_dll_base.has_value()) { std::wcerr << XORW(L"Failed GetModuleBaseAddress for Engine DLL.\n"); @@ -88,7 +88,7 @@ namespace cheat bool Cs2CheatController::init(const driver::Driver& driver) { - auto result{true}; + auto result{ true }; result &= (cs2_process_id_ = get_cs2_process_id().value_or(0)) != 0; result &= (client_dll_base_ = find_client_dll_base().value_or(0)) != 0; @@ -102,15 +102,15 @@ namespace cheat bool Cs2CheatController::build_number_changed(const driver::Driver& driver) const { //TODO read the json info.json dont be an idiot - static constexpr DWORD expected_build{14055}; + static constexpr DWORD expected_build{ 14055 }; return driver.read(engine_dll_base_ + cs2_dumper::offsets::engine2_dll::dwBuildNumber) != expected_build; } bool Cs2CheatController::is_in_game(const driver::Driver& driver) const { - const auto is_background{driver.read(get_network_client(driver) + cs2_dumper::offsets::engine2_dll::dwNetworkGameClient_isBackgroundMap)}; - const auto state{driver.read(get_network_client(driver) + cs2_dumper::offsets::engine2_dll::dwNetworkGameClient_signOnState)}; + const auto is_background{ driver.read(get_network_client(driver) + cs2_dumper::offsets::engine2_dll::dwNetworkGameClient_isBackgroundMap) }; + const auto state{ driver.read(get_network_client(driver) + cs2_dumper::offsets::engine2_dll::dwNetworkGameClient_signOnState) }; return !is_background && state >= 6; } @@ -121,24 +121,24 @@ namespace cheat std::optional Cs2CheatController::get_entity_from_list(const driver::Driver& driver, const int& index) const { - const auto controller{get_entity_controller(driver, index)}; + const auto controller{ get_entity_controller(driver, index) }; if (!controller) { return std::nullopt; } - const auto entity_pawn{get_entity_pawn(driver, *controller)}; + const auto entity_pawn{ get_entity_pawn(driver, *controller) }; if (!entity_pawn) { return std::nullopt; } - return entity::Entity{*controller, *entity_pawn}; + return entity::Entity{ *controller, *entity_pawn }; } entity::Entity Cs2CheatController::get_local_player(const driver::Driver& driver) const { - return entity::Entity{find_local_player_controller(driver), find_local_player_pawn(driver)}; + return entity::Entity{ find_local_player_controller(driver), find_local_player_pawn(driver) }; } util::ViewMatrix Cs2CheatController::get_view_matrix(const driver::Driver& driver) const @@ -148,40 +148,39 @@ namespace cheat float Cs2CheatController::c4_blow_remaining_time(const driver::Driver& driver) const { - const auto dw_game_rules{driver.read(client_dll_base_ + cs2_dumper::offsets::client_dll::dwGameRules)}; - const auto bomb_planted{driver.read(dw_game_rules + cs2_dumper::schemas::client_dll::C_CSGameRules::m_bBombPlanted)}; + const auto dw_game_rules{ driver.read(client_dll_base_ + cs2_dumper::offsets::client_dll::dwGameRules) }; + const auto bomb_planted{ driver.read(dw_game_rules + cs2_dumper::schemas::client_dll::C_CSGameRules::m_bBombPlanted) }; - if (!bomb_planted) - { + if (!bomb_planted){ return 0.0f; } - const auto planted_c4{driver.read(driver.read(client_dll_base_ + cs2_dumper::offsets::client_dll::dwPlantedC4))}; - const auto global_vars{driver.read(client_dll_base_ + cs2_dumper::offsets::client_dll::dwGlobalVars)}; + const auto planted_c4{ driver.read(driver.read(client_dll_base_ + cs2_dumper::offsets::client_dll::dwPlantedC4)) }; + const auto global_vars{ driver.read(client_dll_base_ + cs2_dumper::offsets::client_dll::dwGlobalVars) }; - const auto c4_time{driver.read(planted_c4 + cs2_dumper::schemas::client_dll::C_PlantedC4::m_flC4Blow)}; - const auto global_time{driver.read(global_vars + 0x34)}; + const auto c4_time{ driver.read(planted_c4 + cs2_dumper::schemas::client_dll::C_PlantedC4::m_flC4Blow) }; + const auto global_time{ driver.read(global_vars + 0x34) }; return c4_time - global_time; } bool Cs2CheatController::c4_is_bomb_site_a(const driver::Driver& driver) const { - const auto planted_c4{driver.read(driver.read(client_dll_base_ + cs2_dumper::offsets::client_dll::dwPlantedC4))}; - const auto bomb_site{driver.read(planted_c4 + cs2_dumper::schemas::client_dll::C_PlantedC4::m_nBombSite)}; + const auto planted_c4{ driver.read(driver.read(client_dll_base_ + cs2_dumper::offsets::client_dll::dwPlantedC4)) }; + const auto bomb_site{ driver.read(planted_c4 + cs2_dumper::schemas::client_dll::C_PlantedC4::m_nBombSite) }; return bomb_site == 0; } std::optional Cs2CheatController::get_entity_controller(const driver::Driver& driver, const int& i) const { - const auto list_entity{driver.read(entity_system_ + ((8 * (i & 0x7FFF) >> 9) + 16))}; + const auto list_entity{ driver.read(entity_system_ + ((8 * (i & 0x7FFF) >> 9) + 16)) }; if (!list_entity) { return std::nullopt; } - const auto entity_controller{driver.read(list_entity + 0x78 * (i & 0x1FF))}; + const auto entity_controller{ driver.read(list_entity + 0x78 * (i & 0x1FF)) }; if (!entity_controller) { return std::nullopt; @@ -192,7 +191,7 @@ namespace cheat std::optional Cs2CheatController::get_entity_pawn(const driver::Driver& driver, const uintptr_t& entity_controller) const { - const auto entity_controller_pawn{driver.read(entity_controller + cs2_dumper::schemas::client_dll::CCSPlayerController::m_hPlayerPawn)}; + const auto entity_controller_pawn{ driver.read(entity_controller + cs2_dumper::schemas::client_dll::CCSPlayerController::m_hPlayerPawn) }; if (!entity_controller_pawn) { return std::nullopt; @@ -204,7 +203,7 @@ namespace cheat return std::nullopt; } - const auto entity_pawn{driver.read(list_entity + 0x78 * (entity_controller_pawn & 0x1FF))}; + const auto entity_pawn{ driver.read(list_entity + 0x78 * (entity_controller_pawn & 0x1FF)) }; if (!entity_pawn) { std::wcerr << XORW(L"Cant grab player pawn, maybe the player disconnected?\n"); diff --git a/um-client/src/controller/Cs2CheatController.hpp b/um-client/src/controller/Cs2CheatController.hpp index 35a98a2..93707e4 100644 --- a/um-client/src/controller/Cs2CheatController.hpp +++ b/um-client/src/controller/Cs2CheatController.hpp @@ -18,10 +18,10 @@ namespace cheat class Cs2CheatController { private: - DWORD cs2_process_id_{0}; - uintptr_t client_dll_base_{0}; - uintptr_t engine_dll_base_{0}; - uintptr_t entity_system_{0}; + DWORD cs2_process_id_{ 0 }; + uintptr_t client_dll_base_{ 0 }; + uintptr_t engine_dll_base_{ 0 }; + uintptr_t entity_system_{ 0 }; private: [[nodiscard]] static std::optional get_cs2_process_id(); diff --git a/um-client/src/controller/Entity.cpp b/um-client/src/controller/Entity.cpp index ff0a112..632cd19 100644 --- a/um-client/src/controller/Entity.cpp +++ b/um-client/src/controller/Entity.cpp @@ -16,8 +16,7 @@ namespace cheat::entity } Entity::Entity(const uintptr_t& entity_controller, const uintptr_t& entity_pawn) : entity_controller_(entity_controller), entity_pawn_(entity_pawn) - { - } + {} std::string Entity::get_name(const driver::Driver& driver) const { @@ -30,9 +29,9 @@ namespace cheat::entity char buf[20]; }; - const auto str{driver.read(entity_name_address)}; + const auto str{ driver.read(entity_name_address) }; - return {str.buf, str.buf + strnlen(str.buf, sizeof(str.buf))}; + return { str.buf, str.buf + strnlen(str.buf, sizeof(str.buf)) }; } std::string Entity::get_weapon_name(const driver::Driver& driver) const @@ -42,12 +41,12 @@ namespace cheat::entity char buf[20]; }; - const auto weapon_base{driver.read(entity_pawn_ + client_dll::C_CSPlayerPawnBase::m_pClippingWeapon)}; - const auto identity{driver.read(weapon_base + client_dll::CEntityInstance::m_pEntity)}; - const auto designer_name{driver.read(identity + client_dll::CEntityIdentity::m_designerName)}; - const auto str{driver.read(designer_name)}; + const auto weapon_base{ driver.read(entity_pawn_ + client_dll::C_CSPlayerPawnBase::m_pClippingWeapon) }; + const auto identity{ driver.read(weapon_base + client_dll::CEntityInstance::m_pEntity) }; + const auto designer_name{ driver.read(identity + client_dll::CEntityIdentity::m_designerName) }; + const auto str{ driver.read(designer_name) }; - return {str.buf, str.buf + strnlen(str.buf, sizeof(str.buf))}; + return { str.buf, str.buf + strnlen(str.buf, sizeof(str.buf)) }; } int Entity::get_team(const driver::Driver& driver) const @@ -62,8 +61,8 @@ namespace cheat::entity bool Entity::is_spotted(const driver::Driver& driver) const { - const auto p_entity_spotted_state{entity_pawn_ + client_dll::C_CSPlayerPawn::m_entitySpottedState}; - const auto entity_spotted_address{p_entity_spotted_state + client_dll::EntitySpottedState_t::m_bSpotted}; + const auto p_entity_spotted_state{ entity_pawn_ + client_dll::C_CSPlayerPawn::m_entitySpottedState }; + const auto entity_spotted_address{ p_entity_spotted_state + client_dll::EntitySpottedState_t::m_bSpotted }; return driver.read(entity_spotted_address); } @@ -95,14 +94,14 @@ namespace cheat::entity } const auto p_entity_spotted_state{ entity_pawn_ + client_dll::C_CSPlayerPawn::m_entitySpottedState }; - const auto entity_spotted_by_mask{ driver.read(p_entity_spotted_state + client_dll::EntitySpottedState_t::m_bSpottedByMask )}; + const auto entity_spotted_by_mask{ driver.read(p_entity_spotted_state + client_dll::EntitySpottedState_t::m_bSpottedByMask) }; return entity_spotted_by_mask & (DWORD64(1) << (local_player_index)); } util::Vec3 Entity::get_forward_vector(const driver::Driver& driver) const { - const auto movement_services{get_movement_services(driver)}; + const auto movement_services{ get_movement_services(driver) }; return driver.read(movement_services + client_dll::CCSPlayer_MovementServices::m_vecForward); } @@ -118,19 +117,19 @@ namespace cheat::entity util::Vec3 Entity::get_head_bone_pos(const driver::Driver& driver) const { - constexpr auto bone_head{6}; + constexpr auto bone_head{ 6 }; - const auto game_scene_node{get_game_scene_node(driver)}; - const auto bone_array{driver.read(game_scene_node + client_dll::CPlayer_MovementServices_Humanoid::m_groundNormal)}; - const auto head{driver.read(bone_array + bone_head * 32)}; + const auto game_scene_node{ get_game_scene_node(driver) }; + const auto bone_array{ driver.read(game_scene_node + client_dll::CPlayer_MovementServices_Humanoid::m_groundNormal) }; + const auto head{ driver.read(bone_array + bone_head * 32) }; return head; } void Entity::set_spotted(const driver::Driver& driver, const bool& spotted) const { - const auto p_entity_spotted_state{entity_pawn_ + client_dll::C_CSPlayerPawn::m_entitySpottedState}; - const auto entity_spotted_address{p_entity_spotted_state + client_dll::EntitySpottedState_t::m_bSpotted}; + const auto p_entity_spotted_state{ entity_pawn_ + client_dll::C_CSPlayerPawn::m_entitySpottedState }; + const auto entity_spotted_address{ p_entity_spotted_state + client_dll::EntitySpottedState_t::m_bSpotted }; driver.write(entity_spotted_address, spotted); } diff --git a/um-client/src/driver/driver.cpp b/um-client/src/driver/driver.cpp index b48d45f..c2b86e4 100644 --- a/um-client/src/driver/driver.cpp +++ b/um-client/src/driver/driver.cpp @@ -2,9 +2,8 @@ namespace driver { - Driver::Driver(): handle_(create_handle()) - { - } + Driver::Driver() : handle_(create_handle()) + {} Driver::~Driver() { diff --git a/um-client/src/driver/driver.hpp b/um-client/src/driver/driver.hpp index 3f3091f..9b7e5db 100644 --- a/um-client/src/driver/driver.hpp +++ b/um-client/src/driver/driver.hpp @@ -22,9 +22,9 @@ namespace driver // TODO this duplication between user mode and kernel mode is error prone namespace control_codes { - constexpr ULONG attach{CTL_CODE(FILE_DEVICE_UNKNOWN, 0xA1, METHOD_BUFFERED, FILE_SPECIAL_ACCESS)}; - constexpr ULONG read{CTL_CODE(FILE_DEVICE_UNKNOWN, 0xA2, METHOD_BUFFERED, FILE_SPECIAL_ACCESS)}; - constexpr ULONG write{CTL_CODE(FILE_DEVICE_UNKNOWN, 0xA3, METHOD_BUFFERED, FILE_SPECIAL_ACCESS)}; + constexpr ULONG attach{ CTL_CODE(FILE_DEVICE_UNKNOWN, 0xA1, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) }; + constexpr ULONG read{ CTL_CODE(FILE_DEVICE_UNKNOWN, 0xA2, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) }; + constexpr ULONG write{ CTL_CODE(FILE_DEVICE_UNKNOWN, 0xA3, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) }; } class Driver diff --git a/um-client/src/global.hpp b/um-client/src/global.hpp index 25849db..f4407a7 100644 --- a/um-client/src/global.hpp +++ b/um-client/src/global.hpp @@ -6,38 +6,38 @@ namespace g { - static const std::wstring cs2_process_name{XORW(L"cs2.exe")}; - static const std::wstring cs2_window_name{XORW(L"Counter-Strike 2")}; - static const std::wstring client_dll_module_name{XORW(L"client.dll")}; - static const std::wstring engine_dll_module_name{XORW(L"engine2.dll")}; - static const int screen_width{GetSystemMetrics(SM_CXSCREEN)}; - static const int screen_height{GetSystemMetrics(SM_CYSCREEN)}; - static const ImVec2 screen_center{screen_width / 2.0f, screen_height / 2.0f}; + static const std::wstring cs2_process_name{ XORW(L"cs2.exe") }; + static const std::wstring cs2_window_name{ XORW(L"Counter-Strike 2") }; + static const std::wstring client_dll_module_name{ XORW(L"client.dll") }; + static const std::wstring engine_dll_module_name{ XORW(L"engine2.dll") }; + static const int screen_width{ GetSystemMetrics(SM_CXSCREEN) }; + static const int screen_height{ GetSystemMetrics(SM_CYSCREEN) }; + static const ImVec2 screen_center{ screen_width / 2.0f, screen_height / 2.0f }; - static ImVec4 esp_color{255.0f, 0.0f, 0.0f, 255.0f}; + static ImVec4 esp_color{ 255.0f, 0.0f, 0.0f, 255.0f }; static ImVec4 esp_color_enemy_visible{ 0.0f, 0.0f, 255.0f, 255.0f }; - static float esp_box_thickness{1.0f}; - static ImVec4 esp_health_color{0.0f, 255.0f, 0.0f, 255.0f}; - static ImVec4 text_color{0.0f, 255.0f, 0.0f, 255.0f}; - static ImVec4 weapon_awp_text_color{255.0f, 0.0f, 0.0f, 255.0f}; - static ImVec4 weapon_knife_text_color{0.0f, 0.0f, 255.0f, 255.0f}; - static ImVec4 additional_screen_info_text_color{255.0f, 0.0f, 0.0f, 255.0f}; - static int additional_screen_info_position_x{100}; - static int additional_screen_info_position_y{350}; + static float esp_box_thickness{ 1.0f }; + static ImVec4 esp_health_color{ 0.0f, 255.0f, 0.0f, 255.0f }; + static ImVec4 text_color{ 0.0f, 255.0f, 0.0f, 255.0f }; + static ImVec4 weapon_awp_text_color{ 255.0f, 0.0f, 0.0f, 255.0f }; + static ImVec4 weapon_knife_text_color{ 0.0f, 0.0f, 255.0f, 255.0f }; + static ImVec4 additional_screen_info_text_color{ 255.0f, 0.0f, 0.0f, 255.0f }; + static int additional_screen_info_position_x{ 100 }; + static int additional_screen_info_position_y{ 350 }; - static float aim_fov{50.0f}; + static float aim_fov{ 50.0f }; namespace toggles { //TODO atomic - static bool is_paused{false}; - static bool show_menu{false}; - static bool radar_hack{false}; - static bool glow_hack{false}; - static bool no_flash_hack{false}; - static bool esp_hack{false}; - static bool aim_hack{false}; - static bool aim_assist{false}; + static bool is_paused{ false }; + static bool show_menu{ false }; + static bool radar_hack{ false }; + static bool glow_hack{ false }; + static bool no_flash_hack{ false }; + static bool esp_hack{ false }; + static bool aim_hack{ false }; + static bool aim_assist{ false }; inline void reset_toggles() { diff --git a/um-client/src/imgui/ImGuiFrame.hpp b/um-client/src/imgui/ImGuiFrame.hpp index c52b5d8..6398eb2 100644 --- a/um-client/src/imgui/ImGuiFrame.hpp +++ b/um-client/src/imgui/ImGuiFrame.hpp @@ -15,18 +15,18 @@ namespace cheat::imgui { namespace g { - static inline ID3D11Device* g_pd3dDevice{nullptr}; - static inline ID3D11DeviceContext* g_pd3dDeviceContext{nullptr}; - static inline IDXGISwapChain* g_pSwapChain{nullptr}; - static inline bool g_SwapChainOccluded{false}; - static inline UINT g_ResizeWidth{0}; - static inline UINT g_ResizeHeight{0}; - static inline ID3D11RenderTargetView* g_mainRenderTargetView{nullptr}; + static inline ID3D11Device* g_pd3dDevice{ nullptr }; + static inline ID3D11DeviceContext* g_pd3dDeviceContext{ nullptr }; + static inline IDXGISwapChain* g_pSwapChain{ nullptr }; + static inline bool g_SwapChainOccluded{ false }; + static inline UINT g_ResizeWidth{ 0 }; + static inline UINT g_ResizeHeight{ 0 }; + static inline ID3D11RenderTargetView* g_mainRenderTargetView{ nullptr }; static inline WNDCLASSEXW wc; static inline HWND hOverlay; - constexpr auto overlay_window_name{L"zzxzz"}; - constexpr auto font_size{20.0f}; + constexpr auto overlay_window_name{ L"zzxzz" }; + constexpr auto font_size{ 20.0f }; } LRESULT WINAPI WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); @@ -55,17 +55,17 @@ namespace cheat::imgui RegisterClassExW(&g::wc); g::hOverlay = CreateWindowExW(WS_EX_TOPMOST | WS_EX_LAYERED | WS_EX_TOOLWINDOW | WS_EX_TRANSPARENT, - g::wc.lpszClassName, - g::overlay_window_name, - WS_POPUP, - 0, - 0, - ::g::screen_width, - ::g::screen_height, - nullptr, - nullptr, - g::wc.hInstance, - nullptr); + g::wc.lpszClassName, + g::overlay_window_name, + WS_POPUP, + 0, + 0, + ::g::screen_width, + ::g::screen_height, + nullptr, + nullptr, + g::wc.hInstance, + nullptr); SetLayeredWindowAttributes(g::hOverlay, RGB(0, 0, 0), 255, LWA_ALPHA | LWA_COLORKEY); @@ -84,7 +84,7 @@ namespace cheat::imgui // Setup Dear ImGui context IMGUI_CHECKVERSION(); ImGui::CreateContext(); - ImGuiIO& io{ImGui::GetIO()}; + ImGuiIO& io{ ImGui::GetIO() }; (void)io; io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard; @@ -96,7 +96,7 @@ namespace cheat::imgui float baseFontSize = g::font_size; float iconFontSize = baseFontSize * 2.0f / 3.0f; - static constexpr ImWchar ranges[]{0x1, 0x1FFFF, 0}; + static constexpr ImWchar ranges[]{ 0x1, 0x1FFFF, 0 }; static ImFontConfig cfg; // cfg.OversampleH = cfg.OversampleV = 5; cfg.FontBuilderFlags |= ImGuiFreeTypeBuilderFlags_LoadColor; @@ -104,7 +104,7 @@ namespace cheat::imgui //cfg.RasterizerMultiply = 1.5f; io.Fonts->AddFontFromFileTTF(XOR("NotoSans-Regular.ttf"), baseFontSize, &cfg, ranges); - static constexpr ImWchar icons_ranges[]{ICON_MIN_FA, ICON_MAX_16_FA, 0}; + static constexpr ImWchar icons_ranges[]{ ICON_MIN_FA, ICON_MAX_16_FA, 0 }; static ImFontConfig icons_config; icons_config.MergeMode = true; icons_config.PixelSnapH = true; @@ -165,13 +165,13 @@ namespace cheat::imgui inline void render() { ImGui::Render(); - constexpr float transparent[4]{0, 0, 0, 0}; + constexpr float transparent[4]{ 0, 0, 0, 0 }; g::g_pd3dDeviceContext->OMSetRenderTargets(1, &g::g_mainRenderTargetView, nullptr); g::g_pd3dDeviceContext->ClearRenderTargetView(g::g_mainRenderTargetView, transparent); ImGui_ImplDX11_RenderDrawData(ImGui::GetDrawData()); // Present - HRESULT hr{g::g_pSwapChain->Present(1, 0)}; // Present with vsync + HRESULT hr{ g::g_pSwapChain->Present(1, 0) }; // Present with vsync //HRESULT hr = g_pSwapChain->Present(0, 0); // Present without vsync g::g_SwapChainOccluded = (hr == DXGI_STATUS_OCCLUDED); } @@ -200,7 +200,7 @@ namespace cheat::imgui UINT createDeviceFlags = 0; //createDeviceFlags |= D3D11_CREATE_DEVICE_DEBUG; D3D_FEATURE_LEVEL featureLevel; - const D3D_FEATURE_LEVEL featureLevelArray[2] = {D3D_FEATURE_LEVEL_11_0, D3D_FEATURE_LEVEL_10_0,}; + const D3D_FEATURE_LEVEL featureLevelArray[2] = { D3D_FEATURE_LEVEL_11_0, D3D_FEATURE_LEVEL_10_0, }; HRESULT res = D3D11CreateDeviceAndSwapChain(nullptr, D3D_DRIVER_TYPE_HARDWARE, nullptr, createDeviceFlags, featureLevelArray, 2, D3D11_SDK_VERSION, &sd, &g::g_pSwapChain, &g::g_pd3dDevice, &featureLevel, &g::g_pd3dDeviceContext); if (res == DXGI_ERROR_UNSUPPORTED) // Try high-performance WARP software driver if hardware is not available. res = D3D11CreateDeviceAndSwapChain(nullptr, D3D_DRIVER_TYPE_WARP, nullptr, createDeviceFlags, featureLevelArray, 2, D3D11_SDK_VERSION, &sd, &g::g_pSwapChain, &g::g_pd3dDevice, &featureLevel, &g::g_pd3dDeviceContext); diff --git a/um-client/src/main.cpp b/um-client/src/main.cpp index b3ace79..8b93269 100644 --- a/um-client/src/main.cpp +++ b/um-client/src/main.cpp @@ -48,7 +48,7 @@ int main() while (!(GetAsyncKeyState(VK_END) & 0x1)) { #ifndef NDEBUG - clearConsole({0, 0}); + clearConsole({ 0, 0 }); #endif if (!cheat.is_state_valid()) { @@ -115,10 +115,10 @@ int main() continue; } - const auto me{cheat.get_local_player(driver)}; - const auto my_team{me.get_team(driver)}; - const auto view_matrix{cheat.get_view_matrix(driver)}; - const auto c4_remaining_time{cheat.c4_blow_remaining_time(driver)}; + const auto me{ cheat.get_local_player(driver) }; + const auto my_team{ me.get_team(driver) }; + const auto view_matrix{ cheat.get_view_matrix(driver) }; + const auto c4_remaining_time{ cheat.c4_blow_remaining_time(driver) }; if (no_flash_hack && me.is_flashed(driver)) { @@ -130,14 +130,14 @@ int main() if (esp_hack && c4_remaining_time > 0.0f) { - const auto is_planted_a{cheat.c4_is_bomb_site_a(driver)}; - const auto esp_c4{util::esp::build_c4_esp(c4_remaining_time, is_planted_a)}; + const auto is_planted_a{ cheat.c4_is_bomb_site_a(driver) }; + const auto esp_c4{ util::esp::build_c4_esp(c4_remaining_time, is_planted_a) }; draw_items.append_range(esp_c4); } #ifndef NDEBUG - const auto my_eye_pos{me.get_eye_pos(driver)}; - const auto my_forward_vec{me.get_forward_vector(driver)}; + const auto my_eye_pos{ me.get_eye_pos(driver) }; + const auto my_forward_vec{ me.get_forward_vector(driver) }; std::wcout << XORW(L"Forward vec: ") << my_forward_vec << '\n' << XORW(L"My eye position: ") << my_eye_pos << '\n' << XORW(L"View matrix: ") << view_matrix << '\n'; @@ -146,10 +146,10 @@ int main() #endif std::vector aim_targets; - static int local_player_index{-1}; - for (int i{1}; i < 64; i++) + static int local_player_index{ -1 }; + for (int i{ 1 }; i < 64; i++) { - const std::optional entity{cheat.get_entity_from_list(driver, i)}; + const std::optional entity{ cheat.get_entity_from_list(driver, i) }; if (!entity.has_value()) { @@ -161,27 +161,27 @@ int main() local_player_index = i - 1; } - const auto player_health{entity->get_health(driver)}; - const auto player_team{entity->get_team(driver)}; - const auto is_valid_enemy{my_team != player_team && player_health > 0}; + const auto player_health{ entity->get_health(driver) }; + const auto player_team{ entity->get_team(driver) }; + const auto is_valid_enemy{ my_team != player_team && player_health > 0 }; if (!is_valid_enemy) { continue; } - const auto entity_spotted{entity->is_spotted(driver)}; - const auto entity_spotted_by_local_player{entity->is_spotted_by_local_player(driver, local_player_index)}; - const auto entity_name{entity->get_name(driver)}; - const auto is_scoped{entity->is_scoped(driver)}; - auto weapon_name{entity->get_weapon_name(driver)}; + const auto entity_spotted{ entity->is_spotted(driver) }; + const auto entity_spotted_by_local_player{ entity->is_spotted_by_local_player(driver, local_player_index) }; + const auto entity_name{ entity->get_name(driver) }; + const auto is_scoped{ entity->is_scoped(driver) }; + auto weapon_name{ entity->get_weapon_name(driver) }; if (weapon_name.length() > 7) { weapon_name = weapon_name.substr(7); //get rid of weapon_ prefix } - const auto entity_eyes_pos_screen{render::utils::world_to_screen(view_matrix, entity->get_eye_pos(driver))}; - const auto entity_feet_pos_screen{render::utils::world_to_screen(view_matrix, entity->get_vec_origin(driver))}; + const auto entity_eyes_pos_screen{ render::utils::world_to_screen(view_matrix, entity->get_eye_pos(driver)) }; + const auto entity_feet_pos_screen{ render::utils::world_to_screen(view_matrix, entity->get_vec_origin(driver)) }; #ifndef NDEBUG std::wcout << XORW(L"Ent: ") << i << '\n' @@ -190,11 +190,11 @@ int main() << XORW(L"Visible on Radar: ") << (entity_spotted ? "yes" : "no") << '\n'; #endif - const auto head_bone_pos_world{entity->get_head_bone_pos(driver)}; - const auto head_bone_pos_screen{render::utils::world_to_screen(view_matrix, head_bone_pos_world)}; + const auto head_bone_pos_world{ entity->get_head_bone_pos(driver) }; + const auto head_bone_pos_screen{ render::utils::world_to_screen(view_matrix, head_bone_pos_world) }; if (entity_spotted_by_local_player) { - const auto aim_position{head_bone_pos_screen}; + const auto aim_position{ head_bone_pos_screen }; aim_targets.emplace_back(aim_position); } @@ -211,13 +211,13 @@ int main() if (esp_hack && (render::utils::is_in_screen(entity_eyes_pos_screen) || render::utils::is_in_screen(entity_feet_pos_screen))) { - const auto esp_box_color{entity_spotted_by_local_player ? g::esp_color_enemy_visible : g::esp_color}; + const auto esp_box_color{ entity_spotted_by_local_player ? g::esp_color_enemy_visible : g::esp_color }; - const auto esp_player{util::esp::build_player_esp(entity_eyes_pos_screen, entity_feet_pos_screen, esp_box_color)}; - const auto esp_bones{util::esp::build_bone_esp(head_bone_pos_screen)}; - const auto esp_health{util::esp::build_health_esp(esp_player.get_top_left(), esp_player.get_bottom_right(), player_health, esp_box_color)}; - const auto esp_player_bottom{util::esp::build_player_bottom_esp(entity_name, entity_eyes_pos_screen, esp_player.get_bottom_right(), weapon_name)}; - const auto esp_player_top{util::esp::build_player_top_esp(is_scoped, entity_eyes_pos_screen, esp_player.get_top_left())}; + const auto esp_player{ util::esp::build_player_esp(entity_eyes_pos_screen, entity_feet_pos_screen, esp_box_color) }; + const auto esp_bones{ util::esp::build_bone_esp(head_bone_pos_screen) }; + const auto esp_health{ util::esp::build_health_esp(esp_player.get_top_left(), esp_player.get_bottom_right(), player_health, esp_box_color) }; + const auto esp_player_bottom{ util::esp::build_player_bottom_esp(entity_name, entity_eyes_pos_screen, esp_player.get_bottom_right(), weapon_name) }; + const auto esp_player_top{ util::esp::build_player_top_esp(is_scoped, entity_eyes_pos_screen, esp_player.get_top_left()) }; draw_items.emplace_back(esp_player); draw_items.emplace_back(esp_bones); @@ -233,7 +233,7 @@ int main() if (aim_hack) { - aim_target = cheat::aim::find_valid_aim_target_in_circle(Vec2{.x = g::screen_center.x, .y = g::screen_center.y}, g::aim_fov, aim_targets); + aim_target = cheat::aim::find_valid_aim_target_in_circle(Vec2{ .x = g::screen_center.x, .y = g::screen_center.y }, g::aim_fov, aim_targets); } draw_list.update(draw_items); diff --git a/um-client/src/render/DrawCache.hpp b/um-client/src/render/DrawCache.hpp index 3760e41..2f18dc6 100644 --- a/um-client/src/render/DrawCache.hpp +++ b/um-client/src/render/DrawCache.hpp @@ -48,7 +48,7 @@ namespace render [[nodiscard]] float get_radius() const; - static DrawCache build_rect(const ImVec2& top_left, const ImVec2& bottom_right, const bool& filled = false, const ImVec4& col = {255.0f, 0.0f, 0.0f, 255.0f}, const float& thick = 2.0f); + static DrawCache build_rect(const ImVec2& top_left, const ImVec2& bottom_right, const bool& filled = false, const ImVec4& col = { 255.0f, 0.0f, 0.0f, 255.0f }, const float& thick = 2.0f); static DrawCache build_text(const std::string& text, const ImVec2& position, const ImVec4& col, const int& line_position); diff --git a/um-client/src/render/Render.hpp b/um-client/src/render/Render.hpp index 1e725b0..47dce0d 100644 --- a/um-client/src/render/Render.hpp +++ b/um-client/src/render/Render.hpp @@ -19,23 +19,23 @@ namespace render { inline Vec2 world_to_screen(const ViewMatrix& view_matrix, const Vec3& world_position) { - float clip_space_x{view_matrix[0][0] * world_position.x + view_matrix[0][1] * world_position.y + view_matrix[0][2] * world_position.z + view_matrix[0][3]}; - float clip_space_y{view_matrix[1][0] * world_position.x + view_matrix[1][1] * world_position.y + view_matrix[1][2] * world_position.z + view_matrix[1][3]}; - const float clip_space_w{view_matrix[3][0] * world_position.x + view_matrix[3][1] * world_position.y + view_matrix[3][2] * world_position.z + view_matrix[3][3]}; + float clip_space_x{ view_matrix[0][0] * world_position.x + view_matrix[0][1] * world_position.y + view_matrix[0][2] * world_position.z + view_matrix[0][3] }; + float clip_space_y{ view_matrix[1][0] * world_position.x + view_matrix[1][1] * world_position.y + view_matrix[1][2] * world_position.z + view_matrix[1][3] }; + const float clip_space_w{ view_matrix[3][0] * world_position.x + view_matrix[3][1] * world_position.y + view_matrix[3][2] * world_position.z + view_matrix[3][3] }; if (clip_space_w <= 0.f) { return {}; // Return an empty Vec2 if the point is behind the camera } - const float reciprocal_w{1.f / clip_space_w}; + const float reciprocal_w{ 1.f / clip_space_w }; clip_space_x *= reciprocal_w; clip_space_y *= reciprocal_w; - const float screen_x{(1 + clip_space_x) * static_cast(g::screen_width) / 2.0f}; - const float screen_y{(1 - clip_space_y) * static_cast(g::screen_height) / 2.0f}; + const float screen_x{ (1 + clip_space_x) * static_cast(g::screen_width) / 2.0f }; + const float screen_y{ (1 - clip_space_y) * static_cast(g::screen_height) / 2.0f }; - return Vec2{.x = screen_x, .y = screen_y}; + return Vec2{ .x = screen_x, .y = screen_y }; } inline bool is_in_screen(const Vec2& location) @@ -105,7 +105,7 @@ namespace render show_menu = !show_menu; } - const auto frame_state{cheat::imgui::frame::startFrame()}; + const auto frame_state{ cheat::imgui::frame::startFrame() }; if (frame_state == cheat::imgui::frame::FRAME_QUIT) { @@ -117,7 +117,7 @@ namespace render continue; } - ImDrawList* const draw_list{ImGui::GetBackgroundDrawList()}; + ImDrawList* const draw_list{ ImGui::GetBackgroundDrawList() }; if (show_menu) { set_click_through(false); @@ -252,7 +252,7 @@ namespace render set_click_through(true); } - const std::vector draw_objects{esp_draw_list.get()}; + const std::vector draw_objects{ esp_draw_list.get() }; for (const auto& object : draw_objects) { @@ -283,22 +283,22 @@ namespace render draw_list->AddCircle(object.get_position(), object.get_radius(), IM_COL32_WHITE); break; case RenderObjectType::text: - const std::string text{object.get_text()}; - const ImVec4 color{object.get_color()}; + const std::string text{ object.get_text() }; + const ImVec4 color{ object.get_color() }; if (color.x == 0.0f && color.y == 0.0f && color.z == 0.0f) { break; } - const ImVec2 requested_position{object.get_position()}; + const ImVec2 requested_position{ object.get_position() }; - const int line_position{object.get_line_position()}; - const ImVec2 text_size{ImGui::CalcTextSize(text.c_str())}; - const ImVec2 position{requested_position.x - text_size.x / 2.0f, requested_position.y + text_size.y * static_cast(line_position)}; + const int line_position{ object.get_line_position() }; + const ImVec2 text_size{ ImGui::CalcTextSize(text.c_str()) }; + const ImVec2 position{ requested_position.x - text_size.x / 2.0f, requested_position.y + text_size.y * static_cast(line_position) }; #pragma region shadow - const ImVec4 shadow_color{0.1f, 0.1f, 0.1f, color.w * 0.5f}; - constexpr float shadow_offset{1.0f}; + const ImVec4 shadow_color{ 0.1f, 0.1f, 0.1f, color.w * 0.5f }; + constexpr float shadow_offset{ 1.0f }; draw_list->AddText( ImVec2(position.x + shadow_offset, position.y), diff --git a/um-client/src/sdk/dumper/animationsystem_dll.hpp b/um-client/src/sdk/dumper/animationsystem_dll.hpp index fd47125..eef5d38 100644 --- a/um-client/src/sdk/dumper/animationsystem_dll.hpp +++ b/um-client/src/sdk/dumper/animationsystem_dll.hpp @@ -1,5 +1,5 @@ // Generated using https://github.com/a2x/cs2-dumper -// 2024-12-17 19:49:06.424924500 UTC +// 2024-12-20 16:21:57.938209900 UTC #pragma once diff --git a/um-client/src/sdk/dumper/buttons.hpp b/um-client/src/sdk/dumper/buttons.hpp index 1f7fdfa..105b20e 100644 --- a/um-client/src/sdk/dumper/buttons.hpp +++ b/um-client/src/sdk/dumper/buttons.hpp @@ -1,5 +1,5 @@ // Generated using https://github.com/a2x/cs2-dumper -// 2024-12-17 19:49:06.424924500 UTC +// 2024-12-20 16:21:57.938209900 UTC #pragma once @@ -8,21 +8,21 @@ namespace cs2_dumper { // Module: client.dll namespace buttons { - constexpr std::ptrdiff_t attack = 0x184E4D0; - constexpr std::ptrdiff_t attack2 = 0x184E560; - constexpr std::ptrdiff_t back = 0x184E7A0; - constexpr std::ptrdiff_t duck = 0x184EA70; - constexpr std::ptrdiff_t forward = 0x184E710; - constexpr std::ptrdiff_t jump = 0x184E9E0; - constexpr std::ptrdiff_t left = 0x184E830; - constexpr std::ptrdiff_t lookatweapon = 0x1A5E1A0; - constexpr std::ptrdiff_t reload = 0x184E440; - constexpr std::ptrdiff_t right = 0x184E8C0; - constexpr std::ptrdiff_t showscores = 0x1A5E080; - constexpr std::ptrdiff_t sprint = 0x184E3B0; - constexpr std::ptrdiff_t turnleft = 0x184E5F0; - constexpr std::ptrdiff_t turnright = 0x184E680; - constexpr std::ptrdiff_t use = 0x184E950; - constexpr std::ptrdiff_t zoom = 0x1A5E110; + constexpr std::ptrdiff_t attack = 0x18614C0; + constexpr std::ptrdiff_t attack2 = 0x1861550; + constexpr std::ptrdiff_t back = 0x1861790; + constexpr std::ptrdiff_t duck = 0x1861A60; + constexpr std::ptrdiff_t forward = 0x1861700; + constexpr std::ptrdiff_t jump = 0x18619D0; + constexpr std::ptrdiff_t left = 0x1861820; + constexpr std::ptrdiff_t lookatweapon = 0x1A89260; + constexpr std::ptrdiff_t reload = 0x1861430; + constexpr std::ptrdiff_t right = 0x18618B0; + constexpr std::ptrdiff_t showscores = 0x1A89140; + constexpr std::ptrdiff_t sprint = 0x18613A0; + constexpr std::ptrdiff_t turnleft = 0x18615E0; + constexpr std::ptrdiff_t turnright = 0x1861670; + constexpr std::ptrdiff_t use = 0x1861940; + constexpr std::ptrdiff_t zoom = 0x1A891D0; } } diff --git a/um-client/src/sdk/dumper/client_dll.hpp b/um-client/src/sdk/dumper/client_dll.hpp index 8e20b71..a49f952 100644 --- a/um-client/src/sdk/dumper/client_dll.hpp +++ b/um-client/src/sdk/dumper/client_dll.hpp @@ -1,5 +1,5 @@ // Generated using https://github.com/a2x/cs2-dumper -// 2024-12-17 19:49:06.424924500 UTC +// 2024-12-20 16:21:57.938209900 UTC #pragma once @@ -2928,13 +2928,13 @@ namespace cs2_dumper { // Parent: C_CSGO_MapPreviewCameraPath // Field count: 7 namespace C_CSGO_TeamPreviewCamera { - constexpr std::ptrdiff_t m_nVariant = 0x5D0; // int32 - constexpr std::ptrdiff_t m_bDofEnabled = 0x5D4; // bool - constexpr std::ptrdiff_t m_flDofNearBlurry = 0x5D8; // float32 - constexpr std::ptrdiff_t m_flDofNearCrisp = 0x5DC; // float32 - constexpr std::ptrdiff_t m_flDofFarCrisp = 0x5E0; // float32 - constexpr std::ptrdiff_t m_flDofFarBlurry = 0x5E4; // float32 - constexpr std::ptrdiff_t m_flDofTiltToGround = 0x5E8; // float32 + constexpr std::ptrdiff_t m_nVariant = 0x5D8; // int32 + constexpr std::ptrdiff_t m_bDofEnabled = 0x5DC; // bool + constexpr std::ptrdiff_t m_flDofNearBlurry = 0x5E0; // float32 + constexpr std::ptrdiff_t m_flDofNearCrisp = 0x5E4; // float32 + constexpr std::ptrdiff_t m_flDofFarCrisp = 0x5E8; // float32 + constexpr std::ptrdiff_t m_flDofFarBlurry = 0x5EC; // float32 + constexpr std::ptrdiff_t m_flDofTiltToGround = 0x5F0; // float32 } // Parent: CCSPlayerBase_CameraServices // Field count: 2 diff --git a/um-client/src/sdk/dumper/engine2_dll.hpp b/um-client/src/sdk/dumper/engine2_dll.hpp index f02ca19..38f50e7 100644 --- a/um-client/src/sdk/dumper/engine2_dll.hpp +++ b/um-client/src/sdk/dumper/engine2_dll.hpp @@ -1,5 +1,5 @@ // Generated using https://github.com/a2x/cs2-dumper -// 2024-12-17 19:49:06.424924500 UTC +// 2024-12-20 16:21:57.938209900 UTC #pragma once diff --git a/um-client/src/sdk/dumper/host_dll.hpp b/um-client/src/sdk/dumper/host_dll.hpp index a5b1927..ccdbcfd 100644 --- a/um-client/src/sdk/dumper/host_dll.hpp +++ b/um-client/src/sdk/dumper/host_dll.hpp @@ -1,5 +1,5 @@ // Generated using https://github.com/a2x/cs2-dumper -// 2024-12-17 19:49:06.424924500 UTC +// 2024-12-20 16:21:57.938209900 UTC #pragma once diff --git a/um-client/src/sdk/dumper/info.json b/um-client/src/sdk/dumper/info.json index 46eb00d..ad6f747 100644 --- a/um-client/src/sdk/dumper/info.json +++ b/um-client/src/sdk/dumper/info.json @@ -1,4 +1,4 @@ { - "build_number": 14055, - "timestamp": "2024-12-17T19:49:06.424924500+00:00" + "build_number": 14057, + "timestamp": "2024-12-20T16:21:57.938209900+00:00" } \ No newline at end of file diff --git a/um-client/src/sdk/dumper/interfaces.hpp b/um-client/src/sdk/dumper/interfaces.hpp index c222c81..54fb178 100644 --- a/um-client/src/sdk/dumper/interfaces.hpp +++ b/um-client/src/sdk/dumper/interfaces.hpp @@ -1,5 +1,5 @@ // Generated using https://github.com/a2x/cs2-dumper -// 2024-12-17 19:49:06.424924500 UTC +// 2024-12-20 16:21:57.938209900 UTC #pragma once @@ -9,54 +9,54 @@ namespace cs2_dumper { namespace interfaces { // Module: animationsystem.dll namespace animationsystem_dll { - constexpr std::ptrdiff_t AnimationSystemUtils_001 = 0x600DC8; - constexpr std::ptrdiff_t AnimationSystem_001 = 0x5F8CF0; + constexpr std::ptrdiff_t AnimationSystemUtils_001 = 0x60EDC8; + constexpr std::ptrdiff_t AnimationSystem_001 = 0x606CF0; } // Module: client.dll namespace client_dll { - constexpr std::ptrdiff_t ClientToolsInfo_001 = 0x184DAC0; - constexpr std::ptrdiff_t EmptyWorldService001_Client = 0x1808E50; - constexpr std::ptrdiff_t GameClientExports001 = 0x184A778; - constexpr std::ptrdiff_t LegacyGameUI001 = 0x186B290; - constexpr std::ptrdiff_t Source2Client002 = 0x1A4DD80; - constexpr std::ptrdiff_t Source2ClientConfig001 = 0x19EDF90; - constexpr std::ptrdiff_t Source2ClientPrediction001 = 0x1855B80; - constexpr std::ptrdiff_t Source2ClientUI001 = 0x18696B0; + constexpr std::ptrdiff_t ClientToolsInfo_001 = 0x1860AB0; + constexpr std::ptrdiff_t EmptyWorldService001_Client = 0x181BE10; + constexpr std::ptrdiff_t GameClientExports001 = 0x185D768; + constexpr std::ptrdiff_t LegacyGameUI001 = 0x187E2E0; + constexpr std::ptrdiff_t Source2Client002 = 0x1A78E30; + constexpr std::ptrdiff_t Source2ClientConfig001 = 0x1A0F600; + constexpr std::ptrdiff_t Source2ClientPrediction001 = 0x1868B60; + constexpr std::ptrdiff_t Source2ClientUI001 = 0x187C6C0; } // Module: engine2.dll namespace engine2_dll { - constexpr std::ptrdiff_t BenchmarkService001 = 0x537B50; - constexpr std::ptrdiff_t BugService001 = 0x5D08B0; - constexpr std::ptrdiff_t ClientServerEngineLoopService_001 = 0x538870; - constexpr std::ptrdiff_t EngineGameUI001 = 0x535AE0; - constexpr std::ptrdiff_t EngineServiceMgr001 = 0x6116F0; - constexpr std::ptrdiff_t GameEventSystemClientV001 = 0x611A20; - constexpr std::ptrdiff_t GameEventSystemServerV001 = 0x611B60; - constexpr std::ptrdiff_t GameResourceServiceClientV001 = 0x537C50; - constexpr std::ptrdiff_t GameResourceServiceServerV001 = 0x537CB0; - constexpr std::ptrdiff_t GameUIService_001 = 0x5D0BB0; - constexpr std::ptrdiff_t HostStateMgr001 = 0x538760; - constexpr std::ptrdiff_t INETSUPPORT_001 = 0x531060; - constexpr std::ptrdiff_t InputService_001 = 0x5D0E90; - constexpr std::ptrdiff_t KeyValueCache001 = 0x538810; - constexpr std::ptrdiff_t MapListService_001 = 0x60FE90; - constexpr std::ptrdiff_t NetworkClientService_001 = 0x610020; - constexpr std::ptrdiff_t NetworkP2PService_001 = 0x537F60; - constexpr std::ptrdiff_t NetworkServerService_001 = 0x6103B0; - constexpr std::ptrdiff_t NetworkService_001 = 0x5380B0; - constexpr std::ptrdiff_t RenderService_001 = 0x610610; - constexpr std::ptrdiff_t ScreenshotService001 = 0x6108E0; - constexpr std::ptrdiff_t SimpleEngineLoopService_001 = 0x538980; - constexpr std::ptrdiff_t SoundService_001 = 0x5380F0; - constexpr std::ptrdiff_t Source2EngineToClient001 = 0x535180; - constexpr std::ptrdiff_t Source2EngineToClientStringTable001 = 0x5351E0; - constexpr std::ptrdiff_t Source2EngineToServer001 = 0x535278; - constexpr std::ptrdiff_t Source2EngineToServerStringTable001 = 0x5352A0; - constexpr std::ptrdiff_t SplitScreenService_001 = 0x5383D0; - constexpr std::ptrdiff_t StatsService_001 = 0x610CE0; - constexpr std::ptrdiff_t ToolService_001 = 0x538590; - constexpr std::ptrdiff_t VENGINE_GAMEUIFUNCS_VERSION005 = 0x535B70; - constexpr std::ptrdiff_t VProfService_001 = 0x5385D0; + constexpr std::ptrdiff_t BenchmarkService001 = 0x538BB0; + constexpr std::ptrdiff_t BugService001 = 0x5D1940; + constexpr std::ptrdiff_t ClientServerEngineLoopService_001 = 0x5398D0; + constexpr std::ptrdiff_t EngineGameUI001 = 0x536B40; + constexpr std::ptrdiff_t EngineServiceMgr001 = 0x6127A0; + constexpr std::ptrdiff_t GameEventSystemClientV001 = 0x612AD0; + constexpr std::ptrdiff_t GameEventSystemServerV001 = 0x612C10; + constexpr std::ptrdiff_t GameResourceServiceClientV001 = 0x538CB0; + constexpr std::ptrdiff_t GameResourceServiceServerV001 = 0x538D10; + constexpr std::ptrdiff_t GameUIService_001 = 0x5D1C40; + constexpr std::ptrdiff_t HostStateMgr001 = 0x5397C0; + constexpr std::ptrdiff_t INETSUPPORT_001 = 0x532060; + constexpr std::ptrdiff_t InputService_001 = 0x5D1F20; + constexpr std::ptrdiff_t KeyValueCache001 = 0x539870; + constexpr std::ptrdiff_t MapListService_001 = 0x610F20; + constexpr std::ptrdiff_t NetworkClientService_001 = 0x6110B0; + constexpr std::ptrdiff_t NetworkP2PService_001 = 0x538FC0; + constexpr std::ptrdiff_t NetworkServerService_001 = 0x611440; + constexpr std::ptrdiff_t NetworkService_001 = 0x539110; + constexpr std::ptrdiff_t RenderService_001 = 0x6116A0; + constexpr std::ptrdiff_t ScreenshotService001 = 0x611970; + constexpr std::ptrdiff_t SimpleEngineLoopService_001 = 0x5399E0; + constexpr std::ptrdiff_t SoundService_001 = 0x539150; + constexpr std::ptrdiff_t Source2EngineToClient001 = 0x5361E0; + constexpr std::ptrdiff_t Source2EngineToClientStringTable001 = 0x536240; + constexpr std::ptrdiff_t Source2EngineToServer001 = 0x5362D8; + constexpr std::ptrdiff_t Source2EngineToServerStringTable001 = 0x536300; + constexpr std::ptrdiff_t SplitScreenService_001 = 0x539430; + constexpr std::ptrdiff_t StatsService_001 = 0x611D70; + constexpr std::ptrdiff_t ToolService_001 = 0x5395F0; + constexpr std::ptrdiff_t VENGINE_GAMEUIFUNCS_VERSION005 = 0x536BD0; + constexpr std::ptrdiff_t VProfService_001 = 0x539630; } // Module: filesystem_stdio.dll namespace filesystem_stdio_dll { @@ -94,19 +94,19 @@ namespace cs2_dumper { } // Module: materialsystem2.dll namespace materialsystem2_dll { - constexpr std::ptrdiff_t FontManager_001 = 0x113330; - constexpr std::ptrdiff_t MaterialUtils_001 = 0x10E4C0; - constexpr std::ptrdiff_t PostProcessingSystem_001 = 0x10E3D0; - constexpr std::ptrdiff_t TextLayout_001 = 0x10E450; - constexpr std::ptrdiff_t VMaterialSystem2_001 = 0x112910; + constexpr std::ptrdiff_t FontManager_001 = 0x114330; + constexpr std::ptrdiff_t MaterialUtils_001 = 0x10F4C0; + constexpr std::ptrdiff_t PostProcessingSystem_001 = 0x10F3D0; + constexpr std::ptrdiff_t TextLayout_001 = 0x10F450; + constexpr std::ptrdiff_t VMaterialSystem2_001 = 0x113910; } // Module: meshsystem.dll namespace meshsystem_dll { - constexpr std::ptrdiff_t MeshSystem001 = 0x150C20; + constexpr std::ptrdiff_t MeshSystem001 = 0x19D600; } // Module: navsystem.dll namespace navsystem_dll { - constexpr std::ptrdiff_t NavSystem001 = 0xFA730; + constexpr std::ptrdiff_t NavSystem001 = 0xFB730; } // Module: networksystem.dll namespace networksystem_dll { @@ -117,7 +117,7 @@ namespace cs2_dumper { } // Module: panorama.dll namespace panorama_dll { - constexpr std::ptrdiff_t PanoramaUIEngine001 = 0x4E4260; + constexpr std::ptrdiff_t PanoramaUIEngine001 = 0x4E5260; } // Module: panorama_text_pango.dll namespace panorama_text_pango_dll { @@ -129,11 +129,11 @@ namespace cs2_dumper { } // Module: particles.dll namespace particles_dll { - constexpr std::ptrdiff_t ParticleSystemMgr003 = 0x5E2370; + constexpr std::ptrdiff_t ParticleSystemMgr003 = 0x629CB0; } // Module: pulse_system.dll namespace pulse_system_dll { - constexpr std::ptrdiff_t IPulseSystem_001 = 0x14A240; + constexpr std::ptrdiff_t IPulseSystem_001 = 0x17D990; } // Module: rendersystemdx11.dll namespace rendersystemdx11_dll { @@ -143,42 +143,42 @@ namespace cs2_dumper { } // Module: resourcesystem.dll namespace resourcesystem_dll { - constexpr std::ptrdiff_t ResourceSystem013 = 0x6AFF0; + constexpr std::ptrdiff_t ResourceSystem013 = 0x72A40; } // Module: scenefilecache.dll namespace scenefilecache_dll { - constexpr std::ptrdiff_t ResponseRulesCache001 = 0x710E0; - constexpr std::ptrdiff_t SceneFileCache002 = 0x71250; + constexpr std::ptrdiff_t ResponseRulesCache001 = 0x720F0; + constexpr std::ptrdiff_t SceneFileCache002 = 0x72260; } // Module: scenesystem.dll namespace scenesystem_dll { constexpr std::ptrdiff_t RenderingPipelines_001 = 0x5CEB10; - constexpr std::ptrdiff_t SceneSystem_002 = 0x7ADFE0; + constexpr std::ptrdiff_t SceneSystem_002 = 0x7ADFF0; constexpr std::ptrdiff_t SceneUtils_001 = 0x5CF360; } // Module: schemasystem.dll namespace schemasystem_dll { - constexpr std::ptrdiff_t SchemaSystem_001 = 0x5E790; + constexpr std::ptrdiff_t SchemaSystem_001 = 0x616E0; } // Module: server.dll namespace server_dll { - constexpr std::ptrdiff_t EmptyWorldService001_Server = 0x136EB20; - constexpr std::ptrdiff_t EntitySubclassUtilsV001 = 0x131F3E0; - constexpr std::ptrdiff_t NavGameTest001 = 0x140EB78; - constexpr std::ptrdiff_t ServerToolsInfo_001 = 0x13C4488; - constexpr std::ptrdiff_t Source2GameClients001 = 0x13BE330; - constexpr std::ptrdiff_t Source2GameDirector001 = 0x14F2140; - constexpr std::ptrdiff_t Source2GameEntities001 = 0x13C43B0; - constexpr std::ptrdiff_t Source2Server001 = 0x13C4220; - constexpr std::ptrdiff_t Source2ServerConfig001 = 0x15AEB38; - constexpr std::ptrdiff_t customnavsystem001 = 0x1303B48; + constexpr std::ptrdiff_t EmptyWorldService001_Server = 0x1376B20; + constexpr std::ptrdiff_t EntitySubclassUtilsV001 = 0x13273E0; + constexpr std::ptrdiff_t NavGameTest001 = 0x1416B88; + constexpr std::ptrdiff_t ServerToolsInfo_001 = 0x13CC4A8; + constexpr std::ptrdiff_t Source2GameClients001 = 0x13C6350; + constexpr std::ptrdiff_t Source2GameDirector001 = 0x14FA100; + constexpr std::ptrdiff_t Source2GameEntities001 = 0x13CC3D0; + constexpr std::ptrdiff_t Source2Server001 = 0x13CC240; + constexpr std::ptrdiff_t Source2ServerConfig001 = 0x15C4F68; + constexpr std::ptrdiff_t customnavsystem001 = 0x130BB38; } // Module: soundsystem.dll namespace soundsystem_dll { - constexpr std::ptrdiff_t SoundOpSystem001 = 0x39AC40; - constexpr std::ptrdiff_t SoundOpSystemEdit001 = 0x39AB10; - constexpr std::ptrdiff_t SoundSystem001 = 0x39A5E0; - constexpr std::ptrdiff_t VMixEditTool001 = 0x48289BBA; + constexpr std::ptrdiff_t SoundOpSystem001 = 0x39DC40; + constexpr std::ptrdiff_t SoundOpSystemEdit001 = 0x39DB10; + constexpr std::ptrdiff_t SoundSystem001 = 0x39D5E0; + constexpr std::ptrdiff_t VMixEditTool001 = 0x48289C6A; } // Module: steamaudio.dll namespace steamaudio_dll { @@ -209,23 +209,23 @@ namespace cs2_dumper { } // Module: tier0.dll namespace tier0_dll { - constexpr std::ptrdiff_t TestScriptMgr001 = 0x37BA30; - constexpr std::ptrdiff_t VEngineCvar007 = 0x38A530; - constexpr std::ptrdiff_t VProcessUtils002 = 0x37B940; - constexpr std::ptrdiff_t VStringTokenSystem001 = 0x3A2F40; + constexpr std::ptrdiff_t TestScriptMgr001 = 0x37DA50; + constexpr std::ptrdiff_t VEngineCvar007 = 0x38C4B0; + constexpr std::ptrdiff_t VProcessUtils002 = 0x37D960; + constexpr std::ptrdiff_t VStringTokenSystem001 = 0x3A4F00; } // Module: v8system.dll namespace v8system_dll { - constexpr std::ptrdiff_t Source2V8System001 = 0x2C470; + constexpr std::ptrdiff_t Source2V8System001 = 0x2C480; } // Module: vphysics2.dll namespace vphysics2_dll { - constexpr std::ptrdiff_t VPhysics2_Handle_Interface_001 = 0x38BF40; - constexpr std::ptrdiff_t VPhysics2_Interface_001 = 0x38BF80; + constexpr std::ptrdiff_t VPhysics2_Handle_Interface_001 = 0x391F50; + constexpr std::ptrdiff_t VPhysics2_Interface_001 = 0x391F90; } // Module: vscript.dll namespace vscript_dll { - constexpr std::ptrdiff_t VScriptManager010 = 0x1285F0; + constexpr std::ptrdiff_t VScriptManager010 = 0x128600; } // Module: vstdlib_s64.dll namespace vstdlib_s64_dll { @@ -234,7 +234,7 @@ namespace cs2_dumper { } // Module: worldrenderer.dll namespace worldrenderer_dll { - constexpr std::ptrdiff_t WorldRendererMgr001 = 0x15F1B0; + constexpr std::ptrdiff_t WorldRendererMgr001 = 0x161D80; } } } diff --git a/um-client/src/sdk/dumper/materialsystem2_dll.hpp b/um-client/src/sdk/dumper/materialsystem2_dll.hpp index e6df670..6ec134f 100644 --- a/um-client/src/sdk/dumper/materialsystem2_dll.hpp +++ b/um-client/src/sdk/dumper/materialsystem2_dll.hpp @@ -1,5 +1,5 @@ // Generated using https://github.com/a2x/cs2-dumper -// 2024-12-17 19:49:06.424924500 UTC +// 2024-12-20 16:21:57.938209900 UTC #pragma once diff --git a/um-client/src/sdk/dumper/networksystem_dll.hpp b/um-client/src/sdk/dumper/networksystem_dll.hpp index c490c08..9cc28c1 100644 --- a/um-client/src/sdk/dumper/networksystem_dll.hpp +++ b/um-client/src/sdk/dumper/networksystem_dll.hpp @@ -1,5 +1,5 @@ // Generated using https://github.com/a2x/cs2-dumper -// 2024-12-17 19:49:06.424924500 UTC +// 2024-12-20 16:21:57.938209900 UTC #pragma once diff --git a/um-client/src/sdk/dumper/offsets.hpp b/um-client/src/sdk/dumper/offsets.hpp index 38a9938..847b1f6 100644 --- a/um-client/src/sdk/dumper/offsets.hpp +++ b/um-client/src/sdk/dumper/offsets.hpp @@ -1,5 +1,5 @@ // Generated using https://github.com/a2x/cs2-dumper -// 2024-12-17 19:49:06.424924500 UTC +// 2024-12-20 16:21:57.938209900 UTC #pragma once @@ -9,28 +9,28 @@ namespace cs2_dumper { namespace offsets { // Module: client.dll namespace client_dll { - constexpr std::ptrdiff_t dwCSGOInput = 0x1A5E280; - constexpr std::ptrdiff_t dwEntityList = 0x19F2488; - constexpr std::ptrdiff_t dwGameEntitySystem = 0x1B0CCF8; - constexpr std::ptrdiff_t dwGameEntitySystem_highestEntityIndex = 0x1520; - constexpr std::ptrdiff_t dwGameRules = 0x1A4FE68; - constexpr std::ptrdiff_t dwGlobalVars = 0x18499C0; - constexpr std::ptrdiff_t dwGlowManager = 0x1A4F5A8; - constexpr std::ptrdiff_t dwLocalPlayerController = 0x1A41FD0; - constexpr std::ptrdiff_t dwLocalPlayerPawn = 0x1855CE8; - constexpr std::ptrdiff_t dwPlantedC4 = 0x1A59ED0; - constexpr std::ptrdiff_t dwPrediction = 0x1855B80; - constexpr std::ptrdiff_t dwSensitivity = 0x1A50B88; + constexpr std::ptrdiff_t dwCSGOInput = 0x1A89340; + constexpr std::ptrdiff_t dwEntityList = 0x1A146E8; + constexpr std::ptrdiff_t dwGameEntitySystem = 0x1B37E58; + constexpr std::ptrdiff_t dwGameEntitySystem_highestEntityIndex = 0x20F0; + constexpr std::ptrdiff_t dwGameRules = 0x1A7AF28; + constexpr std::ptrdiff_t dwGlobalVars = 0x185C9B0; + constexpr std::ptrdiff_t dwGlowManager = 0x1A7A668; + constexpr std::ptrdiff_t dwLocalPlayerController = 0x1A64E80; + constexpr std::ptrdiff_t dwLocalPlayerPawn = 0x1868CC8; + constexpr std::ptrdiff_t dwPlantedC4 = 0x1A84F90; + constexpr std::ptrdiff_t dwPrediction = 0x1868B60; + constexpr std::ptrdiff_t dwSensitivity = 0x1A7BC48; constexpr std::ptrdiff_t dwSensitivity_sensitivity = 0x40; - constexpr std::ptrdiff_t dwViewAngles = 0x1A5E650; - constexpr std::ptrdiff_t dwViewMatrix = 0x1A54550; - constexpr std::ptrdiff_t dwViewRender = 0x1A54D60; - constexpr std::ptrdiff_t dwWeaponC4 = 0x19F55F8; + constexpr std::ptrdiff_t dwViewAngles = 0x1A89710; + constexpr std::ptrdiff_t dwViewMatrix = 0x1A7F610; + constexpr std::ptrdiff_t dwViewRender = 0x1A7FE20; + constexpr std::ptrdiff_t dwWeaponC4 = 0x1A17928; } // Module: engine2.dll namespace engine2_dll { - constexpr std::ptrdiff_t dwBuildNumber = 0x531BE4; - constexpr std::ptrdiff_t dwNetworkGameClient = 0x530CE0; + constexpr std::ptrdiff_t dwBuildNumber = 0x532BE4; + constexpr std::ptrdiff_t dwNetworkGameClient = 0x531CE0; constexpr std::ptrdiff_t dwNetworkGameClient_clientTickCount = 0x368; constexpr std::ptrdiff_t dwNetworkGameClient_deltaTick = 0x27C; constexpr std::ptrdiff_t dwNetworkGameClient_isBackgroundMap = 0x281447; @@ -38,8 +38,8 @@ namespace cs2_dumper { constexpr std::ptrdiff_t dwNetworkGameClient_maxClients = 0x238; constexpr std::ptrdiff_t dwNetworkGameClient_serverTickCount = 0x36C; constexpr std::ptrdiff_t dwNetworkGameClient_signOnState = 0x228; - constexpr std::ptrdiff_t dwWindowHeight = 0x6140B4; - constexpr std::ptrdiff_t dwWindowWidth = 0x6140B0; + constexpr std::ptrdiff_t dwWindowHeight = 0x61514C; + constexpr std::ptrdiff_t dwWindowWidth = 0x615148; } // Module: inputsystem.dll namespace inputsystem_dll { @@ -52,7 +52,7 @@ namespace cs2_dumper { } // Module: soundsystem.dll namespace soundsystem_dll { - constexpr std::ptrdiff_t dwSoundSystem = 0x39A5E0; + constexpr std::ptrdiff_t dwSoundSystem = 0x39D5E0; constexpr std::ptrdiff_t dwSoundSystem_engineViewData = 0x7C; } } diff --git a/um-client/src/sdk/dumper/panorama_dll.hpp b/um-client/src/sdk/dumper/panorama_dll.hpp index 075f155..c28e9af 100644 --- a/um-client/src/sdk/dumper/panorama_dll.hpp +++ b/um-client/src/sdk/dumper/panorama_dll.hpp @@ -1,5 +1,5 @@ // Generated using https://github.com/a2x/cs2-dumper -// 2024-12-17 19:49:06.424924500 UTC +// 2024-12-20 16:21:57.938209900 UTC #pragma once diff --git a/um-client/src/sdk/dumper/particles_dll.hpp b/um-client/src/sdk/dumper/particles_dll.hpp index ea8aade..5bd97bf 100644 --- a/um-client/src/sdk/dumper/particles_dll.hpp +++ b/um-client/src/sdk/dumper/particles_dll.hpp @@ -1,5 +1,5 @@ // Generated using https://github.com/a2x/cs2-dumper -// 2024-12-17 19:49:06.424924500 UTC +// 2024-12-20 16:21:57.938209900 UTC #pragma once diff --git a/um-client/src/sdk/dumper/pulse_system_dll.hpp b/um-client/src/sdk/dumper/pulse_system_dll.hpp index b5e34c8..98a404c 100644 --- a/um-client/src/sdk/dumper/pulse_system_dll.hpp +++ b/um-client/src/sdk/dumper/pulse_system_dll.hpp @@ -1,5 +1,5 @@ // Generated using https://github.com/a2x/cs2-dumper -// 2024-12-17 19:49:06.424924500 UTC +// 2024-12-20 16:21:57.938209900 UTC #pragma once diff --git a/um-client/src/sdk/dumper/rendersystemdx11_dll.hpp b/um-client/src/sdk/dumper/rendersystemdx11_dll.hpp index c944be0..4c99364 100644 --- a/um-client/src/sdk/dumper/rendersystemdx11_dll.hpp +++ b/um-client/src/sdk/dumper/rendersystemdx11_dll.hpp @@ -1,5 +1,5 @@ // Generated using https://github.com/a2x/cs2-dumper -// 2024-12-17 19:49:06.424924500 UTC +// 2024-12-20 16:21:57.938209900 UTC #pragma once diff --git a/um-client/src/sdk/dumper/resourcesystem_dll.hpp b/um-client/src/sdk/dumper/resourcesystem_dll.hpp index 828f027..7d7f1bb 100644 --- a/um-client/src/sdk/dumper/resourcesystem_dll.hpp +++ b/um-client/src/sdk/dumper/resourcesystem_dll.hpp @@ -1,5 +1,5 @@ // Generated using https://github.com/a2x/cs2-dumper -// 2024-12-17 19:49:06.424924500 UTC +// 2024-12-20 16:21:57.938209900 UTC #pragma once diff --git a/um-client/src/sdk/dumper/scenesystem_dll.hpp b/um-client/src/sdk/dumper/scenesystem_dll.hpp index d456a43..19be3e1 100644 --- a/um-client/src/sdk/dumper/scenesystem_dll.hpp +++ b/um-client/src/sdk/dumper/scenesystem_dll.hpp @@ -1,5 +1,5 @@ // Generated using https://github.com/a2x/cs2-dumper -// 2024-12-17 19:49:06.424924500 UTC +// 2024-12-20 16:21:57.938209900 UTC #pragma once diff --git a/um-client/src/sdk/dumper/schemasystem_dll.hpp b/um-client/src/sdk/dumper/schemasystem_dll.hpp index ee1b8c2..155c2de 100644 --- a/um-client/src/sdk/dumper/schemasystem_dll.hpp +++ b/um-client/src/sdk/dumper/schemasystem_dll.hpp @@ -1,5 +1,5 @@ // Generated using https://github.com/a2x/cs2-dumper -// 2024-12-17 19:49:06.424924500 UTC +// 2024-12-20 16:21:57.938209900 UTC #pragma once diff --git a/um-client/src/sdk/dumper/server_dll.hpp b/um-client/src/sdk/dumper/server_dll.hpp index 04a4d18..3a31a6c 100644 --- a/um-client/src/sdk/dumper/server_dll.hpp +++ b/um-client/src/sdk/dumper/server_dll.hpp @@ -1,5 +1,5 @@ // Generated using https://github.com/a2x/cs2-dumper -// 2024-12-17 19:49:06.424924500 UTC +// 2024-12-20 16:21:57.938209900 UTC #pragma once @@ -6471,7 +6471,7 @@ namespace cs2_dumper { constexpr std::ptrdiff_t m_vecClientAngles = 0x86C; // QAngle } // Parent: CBaseGrenade - // Field count: 17 + // Field count: 16 // // Metadata: // NetworkVarNames: m_vInitialPosition (Vector) @@ -6496,8 +6496,7 @@ namespace cs2_dumper { constexpr std::ptrdiff_t m_vecGrenadeSpin = 0xB30; // RotationVector constexpr std::ptrdiff_t m_vecLastHitSurfaceNormal = 0xB3C; // Vector constexpr std::ptrdiff_t m_nTicksAtZeroVelocity = 0xB48; // int32 - constexpr std::ptrdiff_t m_bHasEverHitPlayer = 0xB4C; // bool - constexpr std::ptrdiff_t m_bClearFromPlayers = 0xB4D; // bool + constexpr std::ptrdiff_t m_bHasEverHitEnemy = 0xB4C; // bool } // Parent: CServerOnlyModelEntity // Field count: 1 @@ -10050,7 +10049,7 @@ namespace cs2_dumper { namespace CBumpMineProjectile { } // Parent: CBasePlayerController - // Field count: 89 + // Field count: 90 // // Metadata: // MNetworkUserGroupProxy @@ -10127,6 +10126,7 @@ namespace cs2_dumper { constexpr std::ptrdiff_t m_bJustBecameSpectator = 0x7CF; // bool constexpr std::ptrdiff_t m_bSwitchTeamsOnNextRoundReset = 0x7D0; // bool constexpr std::ptrdiff_t m_bRemoveAllItemsOnNextRoundReset = 0x7D1; // bool + constexpr std::ptrdiff_t m_flLastJoinTeamTime = 0x7D4; // GameTime_t constexpr std::ptrdiff_t m_szClan = 0x7D8; // CUtlSymbolLarge constexpr std::ptrdiff_t m_szClanName = 0x7E0; // char[32] constexpr std::ptrdiff_t m_iCoachingTeam = 0x800; // int32 diff --git a/um-client/src/sdk/dumper/soundsystem_dll.hpp b/um-client/src/sdk/dumper/soundsystem_dll.hpp index 5b45a9b..91d8d98 100644 --- a/um-client/src/sdk/dumper/soundsystem_dll.hpp +++ b/um-client/src/sdk/dumper/soundsystem_dll.hpp @@ -1,5 +1,5 @@ // Generated using https://github.com/a2x/cs2-dumper -// 2024-12-17 19:49:06.424924500 UTC +// 2024-12-20 16:21:57.938209900 UTC #pragma once diff --git a/um-client/src/sdk/dumper/vphysics2_dll.hpp b/um-client/src/sdk/dumper/vphysics2_dll.hpp index 6a64b3a..f72b41c 100644 --- a/um-client/src/sdk/dumper/vphysics2_dll.hpp +++ b/um-client/src/sdk/dumper/vphysics2_dll.hpp @@ -1,5 +1,5 @@ // Generated using https://github.com/a2x/cs2-dumper -// 2024-12-17 19:49:06.424924500 UTC +// 2024-12-20 16:21:57.938209900 UTC #pragma once diff --git a/um-client/src/sdk/dumper/worldrenderer_dll.hpp b/um-client/src/sdk/dumper/worldrenderer_dll.hpp index aa6ba10..4a45ec3 100644 --- a/um-client/src/sdk/dumper/worldrenderer_dll.hpp +++ b/um-client/src/sdk/dumper/worldrenderer_dll.hpp @@ -1,5 +1,5 @@ // Generated using https://github.com/a2x/cs2-dumper -// 2024-12-17 19:49:06.424924500 UTC +// 2024-12-20 16:21:57.938209900 UTC #pragma once diff --git a/um-client/src/util/BoneMatrix.hpp b/um-client/src/util/BoneMatrix.hpp index 9e5b2ae..46b8d8f 100644 --- a/um-client/src/util/BoneMatrix.hpp +++ b/um-client/src/util/BoneMatrix.hpp @@ -23,10 +23,10 @@ namespace util friend std::wostream& operator<<(std::wostream& os, const BoneMatrix& matrix) { os << L"BoneMatrix:\n"; - for (int i{0}; i < 4; ++i) + for (int i{ 0 }; i < 4; ++i) { os << L"[ "; - for (int j{0}; j < 2; ++j) + for (int j{ 0 }; j < 2; ++j) { os << std::setw(10) << std::fixed << std::setprecision(3) << matrix[i][j] << L" "; } diff --git a/um-client/src/util/Esp.hpp b/um-client/src/util/Esp.hpp index 304bed9..a8e6e26 100644 --- a/um-client/src/util/Esp.hpp +++ b/um-client/src/util/Esp.hpp @@ -9,23 +9,23 @@ namespace util::esp inline DrawCache build_bone_esp(const Vec2& head_bone_pos_screen) { - const DrawCache head_bone_circle{DrawCache::build_circle({head_bone_pos_screen.x, head_bone_pos_screen.y}, g::esp_color, 4.0f)}; + const DrawCache head_bone_circle{ DrawCache::build_circle({head_bone_pos_screen.x, head_bone_pos_screen.y}, g::esp_color, 4.0f) }; return head_bone_circle; } inline DrawCache build_player_esp(const Vec2& entity_eyes_pos_screen, const Vec2& entity_feet_pos_screen, const ImVec4& esp_box_color) { - constexpr float width_shrink_coefficient{0.35f}; - constexpr float height_shrink_coefficient{0.15f}; + constexpr float width_shrink_coefficient{ 0.35f }; + constexpr float height_shrink_coefficient{ 0.15f }; - const float width_relative_to_player_distance{(entity_feet_pos_screen.y - entity_eyes_pos_screen.y) * width_shrink_coefficient}; - const float height_relative_to_player_distance{(entity_feet_pos_screen.y - entity_eyes_pos_screen.y) * height_shrink_coefficient}; + const float width_relative_to_player_distance{ (entity_feet_pos_screen.y - entity_eyes_pos_screen.y) * width_shrink_coefficient }; + const float height_relative_to_player_distance{ (entity_feet_pos_screen.y - entity_eyes_pos_screen.y) * height_shrink_coefficient }; - const auto main_esp_top_left{ImVec2{entity_eyes_pos_screen.x - width_relative_to_player_distance, entity_eyes_pos_screen.y - height_relative_to_player_distance}}; - const auto main_esp_bot_right{ImVec2{entity_feet_pos_screen.x + width_relative_to_player_distance, entity_feet_pos_screen.y + height_relative_to_player_distance}}; + const auto main_esp_top_left{ ImVec2{entity_eyes_pos_screen.x - width_relative_to_player_distance, entity_eyes_pos_screen.y - height_relative_to_player_distance} }; + const auto main_esp_bot_right{ ImVec2{entity_feet_pos_screen.x + width_relative_to_player_distance, entity_feet_pos_screen.y + height_relative_to_player_distance} }; - const DrawCache main_esp_box{DrawCache::build_rect(main_esp_top_left, main_esp_bot_right, false, esp_box_color, g::esp_box_thickness)}; + const DrawCache main_esp_box{ DrawCache::build_rect(main_esp_top_left, main_esp_bot_right, false, esp_box_color, g::esp_box_thickness) }; return main_esp_box; } @@ -42,8 +42,8 @@ namespace util::esp ) }; - const float health_bar_height{esp_health_border.get_bottom_right().y - esp_health_border.get_top_left().y}; - const float top_left_y{esp_health_border.get_bottom_right().y - (health_bar_height * (static_cast(health) / 100.0f))}; + const float health_bar_height{ esp_health_border.get_bottom_right().y - esp_health_border.get_top_left().y }; + const float top_left_y{ esp_health_border.get_bottom_right().y - (health_bar_height * (static_cast(health) / 100.0f)) }; const DrawCache health_box_filled{ DrawCache::build_rect( ImVec2{ @@ -72,7 +72,7 @@ namespace util::esp ) }; - return {esp_health_border, health_text, health_box_filled}; + return { esp_health_border, health_text, health_box_filled }; } inline std::vector build_player_bottom_esp(const std::string& entity_name, const Vec2& entity_eyes_pos_screen, const ImVec2& player_esp_bot_right, const std::string& weapon_name) @@ -85,7 +85,7 @@ namespace util::esp 0) }; - ImVec4 weapon_text_color{g::text_color}; + ImVec4 weapon_text_color{ g::text_color }; if (weapon_name.starts_with(XOR("awp"))) { weapon_text_color = g::weapon_awp_text_color; @@ -102,7 +102,7 @@ namespace util::esp 1) }; - return {entity_name_render_obj, weapon_name_render_obj}; + return { entity_name_render_obj, weapon_name_render_obj }; } inline std::vector build_player_top_esp(const bool& is_scoped, const Vec2& entity_eyes_pos_screen, const ImVec2& player_esp_top_left) @@ -142,6 +142,6 @@ namespace util::esp 1) }; - return {c4_timer_text, c4_bomb_site_text}; + return { c4_timer_text, c4_bomb_site_text }; } } diff --git a/um-client/src/util/Vec2.hpp b/um-client/src/util/Vec2.hpp index e815970..7462a04 100644 --- a/um-client/src/util/Vec2.hpp +++ b/um-client/src/util/Vec2.hpp @@ -9,19 +9,19 @@ namespace util [[nodiscard]] float distance_squared(const Vec2& other) const { - const float dx{x - other.x}; - const float dy{y - other.y}; + const float dx{ x - other.x }; + const float dy{ y - other.y }; return dx * dx + dy * dy; } Vec2 operator+(const Vec2& other) const { - return {.x = x + other.x, .y = y + other.y}; + return { .x = x + other.x, .y = y + other.y }; } Vec2 operator-(const Vec2& other) const { - return {.x = x - other.x, .y = y - other.y}; + return { .x = x - other.x, .y = y - other.y }; } friend std::ostream& operator<<(std::ostream& os, const Vec2& vec) diff --git a/um-client/src/util/Vec3.hpp b/um-client/src/util/Vec3.hpp index 371c54d..1d244ab 100644 --- a/um-client/src/util/Vec3.hpp +++ b/um-client/src/util/Vec3.hpp @@ -9,12 +9,12 @@ namespace util Vec3 operator+(const Vec3& other) const { - return {.x = x + other.x, .y = y + other.y, .z = z + other.z}; + return { .x = x + other.x, .y = y + other.y, .z = z + other.z }; } Vec3 operator-(const Vec3& other) const { - return {.x = x - other.x, .y = y - other.y, .z = z - other.z}; + return { .x = x - other.x, .y = y - other.y, .z = z - other.z }; } friend std::ostream& operator<<(std::ostream& os, const Vec3& vec) diff --git a/um-client/src/util/ViewMatrix.hpp b/um-client/src/util/ViewMatrix.hpp index b00eba3..8a56080 100644 --- a/um-client/src/util/ViewMatrix.hpp +++ b/um-client/src/util/ViewMatrix.hpp @@ -21,10 +21,10 @@ namespace util friend std::wostream& operator<<(std::wostream& os, const ViewMatrix& matrix) { os << L"ViewMatrix:\n"; - for (int i{0}; i < 4; ++i) + for (int i{ 0 }; i < 4; ++i) { os << L"[ "; - for (int j{0}; j < 4; ++j) + for (int j{ 0 }; j < 4; ++j) { os << std::setw(10) << std::fixed << std::setprecision(3) << matrix[i][j] << L" "; }