Merge pull request #104 from ByteCorum/WIP

Portable executable, Huge Bugfix

Author: ByteCorum

.gitignore

@@ -405,3 +405,5 @@ FodyWeavers.xsd
 DragonBurn/imgui.ini
 DragonBurn/settings.yml
 DragonBurn/prefs.ini
+DragonBurn/Libs/zlib/*
+DragonBurn/Libs/curl/*

CMakeLists.txt

@@ -64,6 +64,7 @@ add_executable(DragonBurn
     DragonBurn/Features/Radar.cpp
     DragonBurn/Features/Radar.h
     DragonBurn/DragonBurn/Features/RCS.h
+    DragonBurn/DragonBurn/Features/RCS.cpp
     DragonBurn/Features/SpectatorList.h
     DragonBurn/Features/TriggerBot.cpp
     DragonBurn/Features/TriggerBot.h
@@ -113,11 +114,6 @@ add_executable(DragonBurn
     DragonBurn/Resources/WeaponIcon.h
 )
 
-# Linking with Curl
-find_package(CURL REQUIRED)
-target_link_libraries(DragonBurn ${CURL_LIBRARIES})
-include_directories(${CURL_INCLUDE_DIRS})
-
 # Include OS-ImGui headers
 include_directories(${OS-ImGui_INCLUDE_DIRS})
 

DragonBurn/AssemblyInfo.rc

@@ -23,7 +23,7 @@ namespace MyConfigSaver
         json ConfigData;
 
         ConfigData["0"]["Name"] = "DragonBurn";
-        ConfigData["0"]["Version"] = "1.0.3.0";
+        ConfigData["0"]["Version"] = "1.0.4.3";
         ConfigData["0"]["Author"] = author;
 
 

DragonBurn/Config/ConfigSaver.cpp

@@ -33,7 +33,7 @@ int PreviousTotalHits = 0;
 //	}
 //}
 
-void RenderCrossHair(ImDrawList*);
+void RenderCrossHair(ImDrawList*, const CEntity&);
 
 void RadarSetting(Base_Radar&);
 
@@ -243,7 +243,7 @@ void Visual(CEntity LocalEntity)
 	// CrossHair
 	TriggerBot::TargetCheck(LocalEntity);
 	Misc::AirCheck(LocalEntity);
-	RenderCrossHair(ImGui::GetBackgroundDrawList());
+	RenderCrossHair(ImGui::GetBackgroundDrawList(), LocalEntity);
 }
 
 void Radar(Base_Radar Radar, CEntity LocalEntity)
@@ -331,9 +331,9 @@ void RadarSetting(Base_Radar& Radar)
 	Radar.Opened = true;
 }
 
-void RenderCrossHair(ImDrawList* drawList)
+void RenderCrossHair(ImDrawList* drawList, const CEntity& LocalEntity)
 {
-	if (!CrosshairsCFG::ShowCrossHair)
+	if (!CrosshairsCFG::ShowCrossHair || LocalEntity.Controller.TeamID == 0)
 		return;
 
 	if (CrosshairsCFG::isAim && MenuConfig::TargetingCrosshairs)

DragonBurn/Core/Cheats.cpp

@@ -90,19 +90,19 @@
     <OutDir>$(SolutionDir)\built\</OutDir>
     <IntDir>built\</IntDir>
     <RunCodeAnalysis>false</RunCodeAnalysis>
-    <IncludePath>Libs\json;Libs\zlib\include;Libs\curl\include</IncludePath>
+    <IncludePath>Libs\json</IncludePath>
     <ExternalIncludePath>$(ExternalIncludePath)</ExternalIncludePath>
     <TargetName>DragonBurn</TargetName>
-    <LibraryPath>Libs\zlib\lib;Libs\curl\lib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(SolutionDir)\built\</OutDir>
     <IntDir>built\</IntDir>
     <RunCodeAnalysis>false</RunCodeAnalysis>
-    <IncludePath>Libs\json;Libs\zlib\include;Libs\curl\include</IncludePath>
+    <IncludePath>Libs\json</IncludePath>
     <ExternalIncludePath>$(ExternalIncludePath)</ExternalIncludePath>
     <TargetName>DragonBurn</TargetName>
-    <LibraryPath>Libs\zlib\lib;Libs\curl\lib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -138,14 +138,14 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>CURL_STATICLIB;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libcurl.lib;Ws2_32.lib;Crypt32.lib;Wldap32.lib;Normaliz.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -154,7 +154,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>CURL_STATICLIB;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
@@ -163,7 +163,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libcurl.lib;Ws2_32.lib;Crypt32.lib;Wldap32.lib;Normaliz.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -229,6 +229,7 @@
     <ClCompile Include="Features\Aimbot.cpp" />
     <ClCompile Include="Features\Misc.cpp" />
     <ClCompile Include="Features\Radar.cpp" />
+    <ClCompile Include="Features\RCS.cpp" />
     <ClCompile Include="Features\TriggerBot.cpp" />
     <ClCompile Include="Game\Bone.cpp" />
     <ClCompile Include="Game\Entity.cpp" />

DragonBurn/DragonBurn.vcxproj

@@ -265,5 +265,8 @@
     <ClCompile Include="Offsets\Offsets.cpp">
       <Filter>Offsets</Filter>
     </ClCompile>
+    <ClCompile Include="Features\RCS.cpp">
+      <Filter>Features\Aim</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

DragonBurn/DragonBurn.vcxproj.filters

@@ -35,6 +35,8 @@ namespace bmb
 
 			return site;
 		}
+		else
+			return 0;
 
 	}
 

DragonBurn/Features/BombTimer.h

@@ -0,0 +1,82 @@
+#include "RCS.h"
+
+void RCS::UpdateAngles(const CEntity& Local, Vec2& Angles)
+{
+	auto oldPunch = Vec2{ };
+	auto shotsFired = Local.Pawn.ShotsFired;
+
+	int ScreenCenterX = Gui.Window.Size.x / 2;
+	int ScreenCenterY = Gui.Window.Size.y / 2;
+
+	if (shotsFired)
+	{
+		uintptr_t clientState;
+		auto viewAngles = Local.Pawn.ViewAngle;
+		auto aimPunch = Local.Pawn.AimPunchAngle;
+
+		auto newAngles = Vec2
+		{
+			viewAngles.x + oldPunch.x - aimPunch.x * 2.f,
+			viewAngles.y + oldPunch.y - aimPunch.y * 2.f,
+		};
+
+		if (newAngles.x > 89.f)
+			newAngles.x = 89.f;
+
+		if (newAngles.x < -89.f)
+			newAngles.x = -89.f;
+
+		while (newAngles.y > 180.f)
+			newAngles.y -= 360.f;
+
+		while (newAngles.y < -180.f)
+			newAngles.y += 360.f;
+
+		newAngles.x += ScreenCenterX;
+		newAngles.y += ScreenCenterY;
+		Angles = newAngles;//
+		oldPunch = aimPunch;
+	}
+	else
+	{
+		oldPunch.x = oldPunch.y = 0.f;
+	}
+
+	//if (Local.Pawn.ShotsFired > RCSBullet)
+	//{
+	Vec2 PunchAngle;
+	if (Local.Pawn.AimPunchCache.Count <= 0 && Local.Pawn.AimPunchCache.Count > 0xFFFF)
+		return;
+	if (!ProcessMgr.ReadMemory<Vec2>(Local.Pawn.AimPunchCache.Data + (Local.Pawn.AimPunchCache.Count - 1) * sizeof(Vec3), PunchAngle))
+		return;
+
+	Angles.x = PunchAngle.x;
+	Angles.y = PunchAngle.y;
+	//}
+}
+
+void RCS::RecoilControl(CEntity LocalPlayer)
+{
+	if (!MenuConfig::RCS)
+		return;
+	static Vec2 OldPunch;
+	if (LocalPlayer.Pawn.ShotsFired > RCSBullet && AimControl::HasTarget)
+	{
+		Vec2 viewAngles = LocalPlayer.Pawn.ViewAngle;
+		Vec2 delta = viewAngles - (viewAngles + (OldPunch - (LocalPlayer.Pawn.AimPunchAngle * 2.f)));
+
+		int MouseX = (int)(delta.y / (LocalPlayer.Client.Sensitivity * 0.011f) * RCSScale.x);
+		int MouseY = (int)(delta.x / (LocalPlayer.Client.Sensitivity * 0.011f) * RCSScale.y);
+
+		if ((GetAsyncKeyState(VK_LBUTTON) & 0x8000))
+		{
+			mouse_event(MOUSEEVENTF_MOVE, MouseX, -MouseY, 0, 0);
+		}
+
+		OldPunch = LocalPlayer.Pawn.AimPunchAngle * 2.0f;
+	}
+	else
+	{
+		OldPunch = Vec2{ 0,0 };
+	}
+}

DragonBurn/Features/RCS.cpp

@@ -1,90 +1,11 @@
 #pragma once
-#include <math.h>
-#include "..\Game\Entity.h"
-#include "..\Game\View.hpp"
-#include "..\Config\MenuConfig.hpp"
+#include "Aimbot.h"
 
 namespace RCS
 {
 	inline int RCSBullet = 1;
 	inline Vec2 RCSScale = { 1.f,1.f };
 
-	inline void UpdateAngles(const CEntity& Local, Vec2& Angles)
-	{
-		auto oldPunch = Vec2{ };
-		auto shotsFired = Local.Pawn.ShotsFired;
-
-		int ScreenCenterX = Gui.Window.Size.x / 2;
-		int ScreenCenterY = Gui.Window.Size.y / 2;
-
-		if (shotsFired)
-		{
-			uintptr_t clientState;
-			auto viewAngles = Local.Pawn.ViewAngle;
-			auto aimPunch = Local.Pawn.AimPunchAngle;
-
-			auto newAngles = Vec2
-			{
-				viewAngles.x + oldPunch.x - aimPunch.x * 2.f,
-				viewAngles.y + oldPunch.y - aimPunch.y * 2.f,
-			};
-
-			if (newAngles.x > 89.f)
-				newAngles.x = 89.f;
-
-			if (newAngles.x < -89.f)
-				newAngles.x = -89.f;
-
-			while (newAngles.y > 180.f)
-				newAngles.y -= 360.f;
-
-			while (newAngles.y < -180.f)
-				newAngles.y += 360.f;
-
-			newAngles.x += ScreenCenterX;
-			newAngles.y += ScreenCenterY;
-			Angles = newAngles;
-			oldPunch = aimPunch;
-		}
-		else
-		{
-			oldPunch.x = oldPunch.y = 0.f;
-		}
-
-		if (true/*Local.Pawn.ShotsFired > RCSBullet*/)
-		{
-			Vec2 PunchAngle;
-			if (Local.Pawn.AimPunchCache.Count <= 0 && Local.Pawn.AimPunchCache.Count > 0xFFFF)
-				return;
-			if (!ProcessMgr.ReadMemory<Vec2>(Local.Pawn.AimPunchCache.Data + (Local.Pawn.AimPunchCache.Count - 1) * sizeof(Vec3), PunchAngle))
-				return;
-
-			Angles.x = PunchAngle.x;
-			Angles.y = PunchAngle.y;
-		}
-	}
-
-	inline void RecoilControl(CEntity LocalPlayer)
-	{
-		if (!MenuConfig::RCS)
-			return;
-		static Vec2 OldPunch;
-		if (LocalPlayer.Pawn.ShotsFired > RCSBullet)
-		{       
-			Vec2 viewAngles = LocalPlayer.Pawn.ViewAngle;
-			Vec2 delta = viewAngles - (viewAngles + (OldPunch - (LocalPlayer.Pawn.AimPunchAngle * 2.f)));
-
-			int MouseX = (int)(delta.y / (LocalPlayer.Client.Sensitivity * 0.011f) * RCSScale.x);
-			int MouseY = (int)(delta.x / (LocalPlayer.Client.Sensitivity * 0.011f) * RCSScale.y);
-
-			if ((GetAsyncKeyState(VK_LBUTTON) & 0x8000))
-				mouse_event(MOUSEEVENTF_MOVE, MouseX, -MouseY, 0, 0);
-
-			OldPunch = LocalPlayer.Pawn.AimPunchAngle * 2.0f;
-		}
-		else
-		{
-			OldPunch = Vec2{ 0,0 };
-		}
-	}
+	void UpdateAngles(const CEntity&, Vec2&);
+	void RecoilControl(CEntity);
 }