From be7f0c28561b201f6d3b92f3de38fd5ad56704ba Mon Sep 17 00:00:00 2001
From: tucucu <tucucu@zoho.com>
Date: Sun, 5 Nov 2023 21:25:51 +0100
Subject: [PATCH] game closing and code cleanup

---
 memory-external/hacks/reader.cpp | 11 ++++++++---
 memory-external/hacks/reader.hpp |  1 +
 memory-external/main.cpp         |  3 +--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/memory-external/hacks/reader.cpp b/memory-external/hacks/reader.cpp
index 805bc17..20154d2 100644
--- a/memory-external/hacks/reader.cpp
+++ b/memory-external/hacks/reader.cpp
@@ -35,11 +35,16 @@ void CGame::init() {
 		}
 	} while (base_client.base == 0 || base_engine.base == 0);
 
-	GetClientRect(g_game.process->hwnd_, &game_bounds);
+	GetClientRect(process->hwnd_, &game_bounds);
 
 	buildNumber = process->read<uintptr_t>(base_engine.base + updater::offsets::dwBuildNumber);
 }
 
+void CGame::close() {
+	std::cout << "[cs2] Deatachig from process" << std::endl;
+	process->Close();
+}
+
 void CGame::loop() {
 	inGame = false;
 	isC4Planted = false;
@@ -60,7 +65,7 @@ void CGame::loop() {
 
 	localTeam = process->read<int>(localPlayer + updater::offsets::m_iTeamNum);
 	localOrigin = process->read<Vector3>(localpCSPlayerPawn + updater::offsets::m_vecOrigin);
-	isC4Planted = process->read<bool>(g_game.base_client.base + updater::offsets::dwPlantedC4 - 0x8);
+	isC4Planted = process->read<bool>(base_client.base + updater::offsets::dwPlantedC4 - 0x8);
 
 	inGame = true;
 	int playerIndex = 0;
@@ -143,7 +148,7 @@ void CGame::loop() {
 }
 
 std::string CGame::read_string(uintptr_t addr) {
-	const DWORD64 address = g_game.process->read<DWORD64>(addr);
+	const DWORD64 address = process->read<DWORD64>(addr);
 	if (address) {
 		char buffer[256];
 		process->read_raw(address, buffer, sizeof(buffer));
diff --git a/memory-external/hacks/reader.hpp b/memory-external/hacks/reader.hpp
index c7f38fe..5cf69fc 100644
--- a/memory-external/hacks/reader.hpp
+++ b/memory-external/hacks/reader.hpp
@@ -50,6 +50,7 @@ public:
 	std::vector<CPlayer> players = {};
 	void init();
 	void loop();
+	void close();
 	Vector3 world_to_screen(Vector3* v);
 private:
 	view_matrix_t view_matrix;
diff --git a/memory-external/main.cpp b/memory-external/main.cpp
index e65a652..2c1129e 100644
--- a/memory-external/main.cpp
+++ b/memory-external/main.cpp
@@ -177,8 +177,7 @@ int main() {
 
 	DestroyWindow(hWnd);
 
-	std::cout << "[cs2] Deataching from process" << std::endl;
-	g_game.process->Close();
+	g_game.close();
 
 #ifdef NDEBUG
 	std::cout << "[cs2] Press any key to close" << std::endl;