show all wins when main window is open

ByteCorum · Sep 11, 2024 · 3f9f358 · 3f9f358
1 parent 338fa3d
commit 3f9f358
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 22 deletions.
diff --git a/DragonBurn/Core/Cheats.cpp b/DragonBurn/Core/Cheats.cpp
@@ -232,7 +232,7 @@ void Visual(const CEntity& LocalEntity)
 void Radar(Base_Radar Radar, const CEntity& LocalEntity)
 {
 	// Radar render
-	if (RadarCFG::ShowRadar && LocalEntity.Controller.TeamID != 0)
+	if ((RadarCFG::ShowRadar && LocalEntity.Controller.TeamID != 0) || (RadarCFG::ShowRadar && MenuConfig::ShowMenu))
 	{
 		Radar.Render();
 		ImGui::End();
@@ -322,7 +322,7 @@ void RenderCrosshair(ImDrawList* drawList, const CEntity& LocalEntity)
 	bool isScoped;
 	ProcessMgr.ReadMemory<bool>(LocalEntity.Pawn.Address + Offset.Pawn.isScoped, isScoped);
 
-	if (!MiscCFG::SniperCrosshair || LocalEntity.Controller.TeamID == 0 || !TriggerBot::CheckScopeWeapon(LocalEntity) || isScoped)
+	if (!MiscCFG::SniperCrosshair || LocalEntity.Controller.TeamID == 0 || !TriggerBot::CheckScopeWeapon(LocalEntity) || isScoped || MenuConfig::ShowMenu)
 		return;
 
 	Render::DrawCrossHair(drawList, ImVec2(ImGui::GetIO().DisplaySize.x / 2, ImGui::GetIO().DisplaySize.y / 2), MiscCFG::SniperCrosshairColor);

diff --git a/DragonBurn/Core/Render.hpp b/DragonBurn/Core/Render.hpp
@@ -160,7 +160,7 @@ namespace Render
 
 	void DrawFov(const CEntity& LocalEntity, float Size, ImColor Color, float Thickness)
 	{
-		if (!LegitBotConfig::ShowFovLine)
+		if (!LegitBotConfig::ShowFovLine || MenuConfig::ShowMenu)
 			return;
 
 		float Length;
@@ -184,7 +184,7 @@ namespace Render
 
 	void HeadShootLine(const CEntity& LocalEntity, ImColor Color)
 	{
-		if (!MiscCFG::ShowHeadShootLine)
+		if (!MiscCFG::ShowHeadShootLine || MenuConfig::ShowMenu)
 			return;
 
 		float View = 0.f;

diff --git a/DragonBurn/Features/BombTimer.h b/DragonBurn/Features/BombTimer.h
@@ -42,7 +42,7 @@ namespace bmb
 
 	void RenderWindow(int inGame)
 	{
-		if (!MiscCFG::bmbTimer || inGame == 0)
+		if ((!MiscCFG::bmbTimer || inGame == 0) && !(MiscCFG::bmbTimer && MenuConfig::ShowMenu))
 			return;
 
 		bool isBombPlanted;
@@ -60,21 +60,18 @@ namespace bmb
 			plantTime = time;
 		}
 
-		if (!isPlanted)
-		{
-			return;
-		}
-
 		//ProcessMgr.ReadMemory(Offset.PlantedC4 + Offset.C4.m_flDefuseCountDown, IsBeingDefused);
 		//ProcessMgr.ReadMemory(Offset.PlantedC4 + Offset.C4.m_flDefuseCountDown, DefuseTime);
 
+		if (!isPlanted && !MenuConfig::ShowMenu)
+			return;
+
 		static float windowWidth = 200.0f;
 		ImGuiWindowFlags flags = ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize;
 		ImGui::SetNextWindowPos({ (ImGui::GetIO().DisplaySize.x - 200.0f) / 2.0f, 80.0f }, ImGuiCond_Once);
 		ImGui::SetNextWindowSize({ windowWidth, 0 }, ImGuiCond_Once);
 		ImGui::GetStyle().WindowRounding = 8.0f;
 		ImGui::Begin("Bomb Timer", nullptr, flags);
-
 		float remaining = (40000 - (int64_t)time + plantTime) / (float)1000;
 
 		/*
@@ -116,7 +113,7 @@ namespace bmb
 		{
 			isPlanted = false;
 		}
-		ImGui::PopStyleColor();
+		//ImGui::PopStyleColor();
 		ImGui::End();
 	}
 }
diff --git a/DragonBurn/Features/Misc.cpp b/DragonBurn/Features/Misc.cpp
@@ -7,17 +7,17 @@ namespace fs = std::filesystem;
 
 namespace Misc
 {
-	bool aKeyPressed = false;
-	bool dKeyPressed = false;
-	bool wKeyPressed = false;
-	bool sKeyPressed = false;
+	//bool aKeyPressed = false;
+	//bool dKeyPressed = false;
+	//bool wKeyPressed = false;
+	//bool sKeyPressed = false;
 	HitMarker hitMarker(0, std::chrono::steady_clock::now());
 	const float HitMarker::SIZE = 10.f;
 	const float HitMarker::GAP = 3.f;
 
 	void Watermark(const CEntity& LocalPlayer) noexcept
 	{
-		if (!MiscCFG::WaterMark || LocalPlayer.Controller.TeamID == 0)
+		if ((!MiscCFG::WaterMark || LocalPlayer.Controller.TeamID == 0) && !(MiscCFG::WaterMark && MenuConfig::ShowMenu))
 			return;
 
 		//	globalvars GV;
@@ -55,7 +55,7 @@ namespace Misc
 
 	void HitManager(const CEntity& LocalPlayer, int& PreviousTotalHits) noexcept
 	{
-		if ((!MiscCFG::HitSound && !MiscCFG::HitMarker) || LocalPlayer.Controller.TeamID == 0)// or aLocalPlayer.Controller.Health)//add in game cheack
+		if ((!MiscCFG::HitSound && !MiscCFG::HitMarker) || LocalPlayer.Controller.TeamID == 0 || MenuConfig::ShowMenu)
 		{
 			return;
 		}
@@ -90,7 +90,7 @@ namespace Misc
 
 	void BunnyHop(const CEntity& Local) noexcept
 	{
-		if (!MiscCFG::BunnyHop)
+		if (!MiscCFG::BunnyHop ||  MenuConfig::ShowMenu || Local.Controller.TeamID == 0)
 			return;
 
 		HWND hwnd_cs2 = FindWindowA(NULL, "Counter-Strike 2");

diff --git a/DragonBurn/Features/SpectatorList.h b/DragonBurn/Features/SpectatorList.h
@@ -9,8 +9,8 @@ namespace SpecList
 {
     void SpectatorWindowList(CEntity& LocalEntity)
     {
-        if (!MiscCFG::SpecList || LocalEntity.Controller.TeamID == 0)
-            return;
+        if ((!MiscCFG::SpecList || LocalEntity.Controller.TeamID == 0) && !(MiscCFG::SpecList && MenuConfig::ShowMenu))
+                return;
 
         ImGuiWindowFlags flags = ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize;
         static float fontHeight = ImGui::GetFontSize();

diff --git a/DragonBurn/Features/TriggerBot.cpp b/DragonBurn/Features/TriggerBot.cpp
@@ -9,6 +9,9 @@ bool WaitForNoAttack = false;
 
 void TriggerBot::Run(const CEntity& LocalEntity)
 {
+    if (MenuConfig::ShowMenu)
+        return;
+
     if (LocalEntity.Controller.AliveStatus == 0)
         return;
 

diff --git a/DragonBurn/main.cpp b/DragonBurn/main.cpp
@@ -1,5 +1,5 @@
 #define _CRT_SECURE_NO_WARNINGS
-#define DEBUG false
+#define DEBUG true
 #include "Core/Cheats.h"
 #include "Offsets/Offsets.h"
 #include "Resources/Language.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,9 @@ bool WaitForNoAttack = false; @@
     void TriggerBot::Run(const CEntity& LocalEntity)
     {
+        if (MenuConfig::ShowMenu)
+            return;
         if (LocalEntity.Controller.AliveStatus == 0)
             return;
@@ Expand Down @@