From 58ec1dc3f27aadebe9954931513286b6a5315ba7 Mon Sep 17 00:00:00 2001 From: IMXNOOBX <69653071+IMXNOOBX@users.noreply.github.com> Date: Tue, 14 Jan 2025 15:18:53 +0100 Subject: [PATCH] Added title feature status display, few config tweaks, changed default value of offsets to 0 to verify if they have been correctly parsed, added title update on feature changes & Updated gitignore --- .gitignore | 2 +- memory-external/classes/auto_updater.hpp | 46 +++++++++---------- memory-external/classes/config.cpp | 2 + memory-external/classes/config.hpp | 6 +-- memory-external/classes/utils.cpp | 14 ++++++ memory-external/classes/utils.h | 13 ++++++ memory-external/hacks/reader.cpp | 3 ++ memory-external/main.cpp | 6 ++- memory-external/memory-external.vcxproj | 2 + .../memory-external.vcxproj.filters | 6 +++ 10 files changed, 71 insertions(+), 29 deletions(-) create mode 100644 memory-external/classes/utils.cpp create mode 100644 memory-external/classes/utils.h diff --git a/.gitignore b/.gitignore index 9c9a5e2..1239169 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ # Ignore all the offsets.json files but the one in the folder offsets for the auto updater offsets.json +config.json !offsets/offsets.json # User-specific files @@ -400,4 +401,3 @@ FodyWeavers.xsd # JetBrains Rider *.sln.iml -/memory-external/config.json diff --git a/memory-external/classes/auto_updater.hpp b/memory-external/classes/auto_updater.hpp index 7c01631..624215d 100644 --- a/memory-external/classes/auto_updater.hpp +++ b/memory-external/classes/auto_updater.hpp @@ -30,32 +30,32 @@ namespace updater { const inline std::string github_repo_api = "https://api.github.com/repos/IMXNOOBX/cs2-external-esp/commits"; const inline std::string raw_updated_offets = "https://github.com/IMXNOOBX/cs2-external-esp/raw/main/offsets/offsets.json"; - inline int build_number = 13964; + inline int build_number = 0; namespace offsets { - inline std::ptrdiff_t dwLocalPlayerController = 0x17E7158; - inline std::ptrdiff_t dwEntityList = 0x1798738; - inline std::ptrdiff_t dwViewMatrix = 0x1886710; - inline std::ptrdiff_t dwBuildNumber = 0x487514; - inline std::ptrdiff_t dwPlantedC4 = 0x188CAD0; + inline std::ptrdiff_t dwLocalPlayerController = 0x0; + inline std::ptrdiff_t dwEntityList = 0x0; + inline std::ptrdiff_t dwViewMatrix = 0x0; + inline std::ptrdiff_t dwBuildNumber = 0x0; + inline std::ptrdiff_t dwPlantedC4 = 0x0; - inline std::ptrdiff_t m_flC4Blow = 0xEB0; - inline std::ptrdiff_t m_flNextBeep = 0xEAC; - inline std::ptrdiff_t m_flTimerLength = 0xEB8; + inline std::ptrdiff_t m_flC4Blow = 0x0; + inline std::ptrdiff_t m_flNextBeep = 0x0; + inline std::ptrdiff_t m_flTimerLength = 0x0; - inline std::ptrdiff_t m_pInGameMoneyServices = 0x6D0; - inline std::ptrdiff_t m_iAccount = 0x40; - inline std::ptrdiff_t m_vecAbsOrigin = 0xC8; - inline std::ptrdiff_t m_vOldOrigin = 0x1224; - inline std::ptrdiff_t m_pGameSceneNode = 0x310; - inline std::ptrdiff_t m_flFlashOverlayAlpha = 0x1444; - inline std::ptrdiff_t m_bIsDefusing = 0x1390; - inline std::ptrdiff_t m_szName = 0xC18; - inline std::ptrdiff_t m_pClippingWeapon = 0x1290; - inline std::ptrdiff_t m_ArmorValue = 0x14F0; - inline std::ptrdiff_t m_iHealth = 0x32C; - inline std::ptrdiff_t m_hPlayerPawn = 0x7BC; - inline std::ptrdiff_t m_sSanitizedPlayerName = 0x720; - inline std::ptrdiff_t m_iTeamNum = 0x3BF; + inline std::ptrdiff_t m_pInGameMoneyServices = 0x0; + inline std::ptrdiff_t m_iAccount = 0x0; + inline std::ptrdiff_t m_vecAbsOrigin = 0x0; + inline std::ptrdiff_t m_vOldOrigin = 0x0; + inline std::ptrdiff_t m_pGameSceneNode = 0x0; + inline std::ptrdiff_t m_flFlashOverlayAlpha = 0x0; + inline std::ptrdiff_t m_bIsDefusing = 0x0; + inline std::ptrdiff_t m_szName = 0x0; + inline std::ptrdiff_t m_pClippingWeapon = 0x0; + inline std::ptrdiff_t m_ArmorValue = 0x0; + inline std::ptrdiff_t m_iHealth = 0x0; + inline std::ptrdiff_t m_hPlayerPawn = 0x0; + inline std::ptrdiff_t m_sSanitizedPlayerName = 0x0; + inline std::ptrdiff_t m_iTeamNum = 0x0; } } diff --git a/memory-external/classes/config.cpp b/memory-external/classes/config.cpp index e515959..1415950 100644 --- a/memory-external/classes/config.cpp +++ b/memory-external/classes/config.cpp @@ -118,5 +118,7 @@ namespace config { std::ofstream output(file_path); output << std::setw(4) << data << std::endl; output.close(); + + utils.update_console_title(); } } diff --git a/memory-external/classes/config.hpp b/memory-external/classes/config.hpp index 9ac9966..6e6fc35 100644 --- a/memory-external/classes/config.hpp +++ b/memory-external/classes/config.hpp @@ -1,5 +1,6 @@ #pragma once #include +#include "utils.h" #include "json.hpp" #include "auto_updater.hpp" @@ -16,7 +17,6 @@ struct RGB { } }; - namespace config { const std::string file_path = "config.json"; @@ -33,9 +33,9 @@ namespace config { inline bool show_extra_flags = false; inline RGB esp_box_color_team = { 75, 175, 75 }; - inline RGB esp_box_color_enemy = { 175, 75, 75 }; + inline RGB esp_box_color_enemy = { 225, 75, 75 }; inline RGB esp_skeleton_color_team = { 75, 175, 75 }; - inline RGB esp_skeleton_color_enemy = { 175, 75, 75 }; + inline RGB esp_skeleton_color_enemy = { 225, 75, 75 }; inline RGB esp_name_color = { 75, 75, 175 }; inline RGB esp_distance_color = { 75, 75, 175 }; } diff --git a/memory-external/classes/utils.cpp b/memory-external/classes/utils.cpp new file mode 100644 index 0000000..74b395b --- /dev/null +++ b/memory-external/classes/utils.cpp @@ -0,0 +1,14 @@ +#include "utils.h" + +void Utils::update_console_title() { + std::string title = "cs2-external-esp"; + + config::show_box_esp ? title += " | Box: [O]" : title += " | Box: [X]"; + config::show_skeleton_esp ? title += " | Skeleton: [O]" : title += " | Skeleton: [X]"; + config::show_head_tracker ? title += " | Head Tracker: [O]" : title += " | Head Tracker: [X]"; + config::team_esp ? title += " | Team: [O]" : title += " | Team: [X]"; + config::automatic_update ? title += " | Auto Update: [O]" : title += " | Auto Update: [X]"; + config::show_extra_flags ? title += " | Flags: [O]" : title += " | Flags: [X]"; + + SetConsoleTitle(title.c_str()); +} \ No newline at end of file diff --git a/memory-external/classes/utils.h b/memory-external/classes/utils.h new file mode 100644 index 0000000..91b7270 --- /dev/null +++ b/memory-external/classes/utils.h @@ -0,0 +1,13 @@ +#pragma once +#include +#include + +#include "config.hpp" + +class Utils { +private: +public: + void update_console_title(); +}; + +inline Utils utils; \ No newline at end of file diff --git a/memory-external/hacks/reader.cpp b/memory-external/hacks/reader.cpp index 80f0cff..dc8834e 100644 --- a/memory-external/hacks/reader.cpp +++ b/memory-external/hacks/reader.cpp @@ -71,6 +71,9 @@ void CGame::loop() { std::lock_guard lock(dataMutex); + if (updater::offsets::dwLocalPlayerController == 0x0) + throw std::runtime_error("Offsets have not been corretly set, cannot proceed."); + inGame = false; isC4Planted = false; diff --git a/memory-external/main.cpp b/memory-external/main.cpp index 01288b0..263ef91 100644 --- a/memory-external/main.cpp +++ b/memory-external/main.cpp @@ -1,8 +1,9 @@ #include #include #include -#include +#include +#include "classes/utils.h" #include "memory/memory.hpp" #include "classes/vector.hpp" #include "hacks/reader.hpp" @@ -73,7 +74,8 @@ void read_thread() { } int main() { - SetConsoleTitle("cs2-external-esp"); + utils.update_console_title(); + std::cout << "[info] Github Repository: https://github.com/IMXNOOBX/cs2-external-esp" << std::endl; std::cout << "[info] Unknowncheats thread: https://www.unknowncheats.me/forum/counter-strike-2-releases/600259-cs2-external-esp.html\n" << std::endl; diff --git a/memory-external/memory-external.vcxproj b/memory-external/memory-external.vcxproj index bebe581..fa683e8 100644 --- a/memory-external/memory-external.vcxproj +++ b/memory-external/memory-external.vcxproj @@ -214,6 +214,7 @@ + @@ -224,6 +225,7 @@ + diff --git a/memory-external/memory-external.vcxproj.filters b/memory-external/memory-external.vcxproj.filters index 60b10ee..ce796fb 100644 --- a/memory-external/memory-external.vcxproj.filters +++ b/memory-external/memory-external.vcxproj.filters @@ -30,6 +30,9 @@ Source Files + + Source Files + @@ -62,5 +65,8 @@ Header Files + + Header Files + \ No newline at end of file