Merge pull request #66 from ByteCorum/WIP

Game update [`8964291`]
ByteCorum · Jun 11, 2024 · 271b164 · 271b164
2 parents 9b8836c + ae5e0ad
commit 271b164
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 46 deletions.
diff --git a/DragonBurn/Cheats.cpp b/DragonBurn/Cheats.cpp
@@ -291,7 +291,7 @@ void AIM(CEntity LocalEntity, std::vector<Vec3> AimPosList)
 void MiscFuncs(CEntity LocalEntity)
 {
 	Misc::HitManager(LocalEntity, PreviousTotalHits);
-	Misc::FastStop();
+	//Misc::FastStop();
 }
 
 void RadarSetting(Base_Radar& Radar)

diff --git a/DragonBurn/Features/GUI.h b/DragonBurn/Features/GUI.h
@@ -581,7 +581,7 @@ namespace GUI
 					ImGui::SetCursorPos(ImVec2(15.f, 24.f));
 					ImGui::SeparatorText("Misc");
 					PutSwitch(Lang::MiscText.bmbTimer, 10.f, ImGui::GetFrameHeight() * 1.7, &MiscCFG::bmbTimer, true, "###bmbTimerCol", reinterpret_cast<float*>(&MiscCFG::BombTimerCol));
-					PutSwitch(Lang::MiscText.FastStop, 10.f, ImGui::GetFrameHeight() * 1.7, &MiscCFG::FastStop);
+					//PutSwitch(Lang::MiscText.FastStop, 10.f, ImGui::GetFrameHeight() * 1.7, &MiscCFG::FastStop);
 					PutSwitch(Lang::MiscText.HeadshotLine, 10.f, ImGui::GetFrameHeight() * 1.7, &MenuConfig::ShowHeadShootLine);
 					ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 10.f);
 					ImGui::TextDisabled(Lang::MiscText.HitSound);

diff --git a/DragonBurn/Features/Misc.cpp b/DragonBurn/Features/Misc.cpp
@@ -103,20 +103,20 @@ namespace Misc
 		PreviousTotalHits = totalHits;
 	}
 
-	void FastStop() noexcept// junk
-	{
-		if (!MiscCFG::FastStop)
-			return;
-		// Disable when bhopping
-		if (GetAsyncKeyState(VK_SPACE) & 0x8000)
-			return;
-		// Disable when slow walking
-		if (GetAsyncKeyState(VK_LSHIFT) & 0x8000)
-			return;
-
-		Misc::StopKeyEvent('A', &aKeyPressed, 'D', 50.f);
-		Misc::StopKeyEvent('D', &dKeyPressed, 'A', 50.f);
-		Misc::StopKeyEvent('W', &wKeyPressed, 'S', 50.f);
-		Misc::StopKeyEvent('S', &sKeyPressed, 'W', 50.f);
-	}
+	//void FastStop() noexcept// junk
+	//{
+	//	if (!MiscCFG::FastStop)
+	//		return;
+	//	// Disable when bhopping
+	//	if (GetAsyncKeyState(VK_SPACE) & 0x8000)
+	//		return;
+	//	// Disable when slow walking
+	//	if (GetAsyncKeyState(VK_LSHIFT) & 0x8000)
+	//		return;
+
+	//	Misc::StopKeyEvent('A', &aKeyPressed, 'D', 50.f);
+	//	Misc::StopKeyEvent('D', &dKeyPressed, 'A', 50.f);
+	//	Misc::StopKeyEvent('W', &wKeyPressed, 'S', 50.f);
+	//	Misc::StopKeyEvent('S', &sKeyPressed, 'W', 50.f);
+	//}
 }
diff --git a/DragonBurn/Features/Misc.h b/DragonBurn/Features/Misc.h
@@ -150,5 +150,5 @@ namespace Misc
 
 	void Watermark(const CEntity& aLocalPlayer) noexcept;
 	void HitManager(const CEntity& aLocalPlayer, int& PreviousTotalHits) noexcept;
-	void FastStop() noexcept;// junk
+	//void FastStop() noexcept;// junk
 }
diff --git a/DragonBurn/MenuConfig.hpp b/DragonBurn/MenuConfig.hpp
@@ -159,7 +159,7 @@ namespace MiscCFG
 	inline int	HitSound = 0;
 	inline bool HitMarker = false;
 	inline bool bmbTimer = false;
-	inline bool FastStop = false;
+	//inline bool FastStop = false;
 	//inline bool SpecList = false;
 	inline ImColor BombTimerCol = ImColor(255, 120, 0, 255);
 }
diff --git a/DragonBurn/Offsets.h b/DragonBurn/Offsets.h
@@ -10,7 +10,7 @@ namespace offsetsInput = cs2_dumper::offsets::inputsystem_dll;
 
 namespace Offset
 {
-	inline long long CS2ver = 8947443;
+	inline long long CS2ver = 8964291; //nano "D:\SteamLibrary\steamapps\common\Counter-Strike Global Offensive\game\bin\built_from_cl.txt"
 
 	//https://github.com/a2x/cs2-dumper/blob/main/output/offsets.hpp
 	inline DWORD EntityList =				offsets::dwEntityList;

diff --git a/DragonBurn/OffsetsList/Client.hpp b/DragonBurn/OffsetsList/Client.hpp
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-06-05 00:45:27.941820300 UTC
+// 2024-06-11 03:50:46.229934900 UTC
 
 #pragma once
 

diff --git a/DragonBurn/OffsetsList/Offsets.hpp b/DragonBurn/OffsetsList/Offsets.hpp
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-06-05 00:45:27.941820300 UTC
+// 2024-06-11 03:50:46.229934900 UTC
 
 #pragma once
 
@@ -9,23 +9,23 @@ namespace cs2_dumper {
     namespace offsets {
         // Module: client.dll
         namespace client_dll {
-            constexpr std::ptrdiff_t dwCSGOInput = 0x19C62F0;
-            constexpr std::ptrdiff_t dwEntityList = 0x195C460;
-            constexpr std::ptrdiff_t dwGameEntitySystem = 0x1A7B2C8;
+            constexpr std::ptrdiff_t dwCSGOInput = 0x19C8310;
+            constexpr std::ptrdiff_t dwEntityList = 0x195E480;
+            constexpr std::ptrdiff_t dwGameEntitySystem = 0x1A7D308;
             constexpr std::ptrdiff_t dwGameEntitySystem_getHighestEntityIndex = 0x1510;
-            constexpr std::ptrdiff_t dwGameRules = 0x19B9FB8;
-            constexpr std::ptrdiff_t dwGlobalVars = 0x17BD158;
-            constexpr std::ptrdiff_t dwGlowManager = 0x19B96D0;
-            constexpr std::ptrdiff_t dwLocalPlayerController = 0x19AC728;
-            constexpr std::ptrdiff_t dwLocalPlayerPawn = 0x17C9468;
-            constexpr std::ptrdiff_t dwPlantedC4 = 0x19C3668;
-            constexpr std::ptrdiff_t dwPrediction = 0x17C9320;
-            constexpr std::ptrdiff_t dwSensitivity = 0x19BAC78;
+            constexpr std::ptrdiff_t dwGameRules = 0x19BBFD8;
+            constexpr std::ptrdiff_t dwGlobalVars = 0x17BF0F8;
+            constexpr std::ptrdiff_t dwGlowManager = 0x19BB6F0;
+            constexpr std::ptrdiff_t dwLocalPlayerController = 0x19AE748;
+            constexpr std::ptrdiff_t dwLocalPlayerPawn = 0x17CB468;
+            constexpr std::ptrdiff_t dwPlantedC4 = 0x19C5688;
+            constexpr std::ptrdiff_t dwPrediction = 0x17CB320;
+            constexpr std::ptrdiff_t dwSensitivity = 0x19BCC98;
             constexpr std::ptrdiff_t dwSensitivity_sensitivity = 0x40;
-            constexpr std::ptrdiff_t dwViewAngles = 0x19CB708;
-            constexpr std::ptrdiff_t dwViewMatrix = 0x19BE600;
-            constexpr std::ptrdiff_t dwViewRender = 0x19BEF18;
-            constexpr std::ptrdiff_t dwWeaponC4 = 0x1960470;
+            constexpr std::ptrdiff_t dwViewAngles = 0x19CD728;
+            constexpr std::ptrdiff_t dwViewMatrix = 0x19C0620;
+            constexpr std::ptrdiff_t dwViewRender = 0x19C0F38;
+            constexpr std::ptrdiff_t dwWeaponC4 = 0x1962490;
         }
         // Module: engine2.dll
         namespace engine2_dll {
@@ -40,8 +40,8 @@ namespace cs2_dumper {
             constexpr std::ptrdiff_t dwNetworkGameClient_serverTickCount = 0x174;
             constexpr std::ptrdiff_t dwNetworkGameClient_signOnState = 0x260;
             constexpr std::ptrdiff_t dwSoundService = 0x5DCB10;
-            constexpr std::ptrdiff_t dwWindowHeight = 0x5E0494;
-            constexpr std::ptrdiff_t dwWindowWidth = 0x5E0490;
+            constexpr std::ptrdiff_t dwWindowHeight = 0x5E048C;
+            constexpr std::ptrdiff_t dwWindowWidth = 0x5E0488;
         }
         // Module: inputsystem.dll
         namespace inputsystem_dll {

diff --git a/DragonBurn/Resources/Language.h b/DragonBurn/Resources/Language.h
@@ -147,7 +147,7 @@ namespace Lang
 		inline static const char* HeadshotLine;
 		inline static const char* SpecCheck;
 		inline static const char* NoFlash;
-		inline static const char* FastStop;
+		//inline static const char* FastStop;
 		inline static const char* HitSound;
 		inline static const char* HitMerker;
 		inline static const char* bmbTimer;
@@ -294,15 +294,14 @@ namespace Lang
 		MiscText.HeadshotLine = u8"Headshot Line";
 		MiscText.SpecCheck = u8"Cheat in Spec";
 		MiscText.NoFlash = u8"No Flash";
-		MiscText.FastStop = u8"Fast Stop";
+		//MiscText.FastStop = u8"Fast Stop";
 		MiscText.HitSound = u8"Hit Sound  ";
 		MiscText.HitMerker = u8"Hit Markers";
 		MiscText.bmbTimer = u8"Bomb Timer";
 		//MiscText.SpecList = u8"Spec List";
 		MiscText.Watermark = u8"Watermark";
 		MiscText.TeamCheck = u8"Team Check";
 		MiscText.AntiRecord = u8"Anti Record";
-		MiscText.FastStop = u8"Fast Stop";
 		MiscText.VisCheckDisable = u8"Visible Check DISABLED";
 
 

diff --git a/DragonBurn/Utils/ConfigMenu.cpp b/DragonBurn/Utils/ConfigMenu.cpp
@@ -227,7 +227,7 @@ namespace ConfigMenu {
 		MiscCFG::WaterMark = false;
 		MiscCFG::HitSound = 0;
 		MiscCFG::HitMarker = false;
-		MiscCFG::FastStop = false;
+		//MiscCFG::FastStop = false;
 
 		ESPConfig::ESPenabled = false;
 

diff --git a/DragonBurn/Utils/ConfigSaver.cpp b/DragonBurn/Utils/ConfigSaver.cpp
@@ -256,7 +256,7 @@ namespace MyConfigSaver {
         emitter << YAML::Key << "b" << YAML::Value << MiscCFG::BombTimerCol.Value.z;
         emitter << YAML::Key << "a" << YAML::Value << MiscCFG::BombTimerCol.Value.w;
         emitter << YAML::EndMap;
-        emitter << YAML::Key << "FastStop" << YAML::Value << MiscCFG::FastStop;
+        //emitter << YAML::Key << "FastStop" << YAML::Value << MiscCFG::FastStop;
         emitter << YAML::Key << "TeamCheck" << YAML::Value << MenuConfig::TeamCheck;
         emitter << YAML::Key << "AntiRecord" << YAML::Value << MenuConfig::BypassOBS;
         emitter << YAML::EndMap;
@@ -445,7 +445,7 @@ namespace MyConfigSaver {
             MiscCFG::BombTimerCol.Value.y = ReadData(config["Misc"]["TimerColor"]["g"], 0.f);
             MiscCFG::BombTimerCol.Value.z = ReadData(config["Misc"]["TimerColor"]["b"], 0.f);
             MiscCFG::BombTimerCol.Value.w = ReadData(config["Misc"]["TimerColor"]["a"], 0.f);
-            MiscCFG::FastStop = ReadData(config["Misc"]["FastStop"], false);
+            //MiscCFG::FastStop = ReadData(config["Misc"]["FastStop"], false);
             //MiscCFG::SpecList = ReadData(config["Misc"]["SpecList"], false);
             MenuConfig::TeamCheck = ReadData(config["Misc"]["TeamCheck"], true);
             MenuConfig::BypassOBS = ReadData(config["Misc"]["AntiRecord"], false);