Merge pull request #9 from Crazily/master

Only When Shoooting
seksea · Feb 5, 2021 · 101b3f7 · 101b3f7
2 parents f93284b + a434465
commit 101b3f7
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 10 deletions.
diff --git a/src/core/features/recoilCrosshair.cpp b/src/core/features/recoilCrosshair.cpp
@@ -2,12 +2,15 @@
 #include "../../includes.hpp"
 
 void Features::RecoilCrosshair::draw() {
-    if (CONFIGBOOL("Visuals>World>Local Player>Spread Crosshair") || CONFIGBOOL("Visuals>World>Local Player>Recoil Crosshair") ) {
+    if (CONFIGBOOL("Visuals>World>Local Player>Spread Crosshair") ||
+        CONFIGBOOL("Visuals>World>Local Player>Recoil Crosshair")) {
         if (Globals::localPlayer) {
             if (Interfaces::engine->IsInGame()) {
                 if (Globals::localPlayer->health() > 0) {
                     if (Globals::localPlayer->activeWeapon()) {
-                        Weapon* weapon = (Weapon*)Interfaces::entityList->GetClientEntity((uintptr_t)Globals::localPlayer->activeWeapon() & 0xFFF); // GetClientEntityFromHandle is being gay
+                        Weapon *weapon = (Weapon *) Interfaces::entityList->GetClientEntity(
+                                (uintptr_t) Globals::localPlayer->activeWeapon() &
+                                0xFFF); // GetClientEntityFromHandle is being gay
                         if (weapon) {
                             float rad;
                             int x = Globals::screenSizeX / 2;
@@ -17,16 +20,25 @@ void Features::RecoilCrosshair::draw() {
                             QAngle punchAngle = Globals::localPlayer->aimPunch();
                             if (CONFIGBOOL("Visuals>World>Local Player>Recoil Crosshair")) {
                                 rad = 5;
-                                x = (int)(x - (dx * punchAngle.y));
-                                y = (int)(y + (dy * punchAngle.x));
+                                x = (int) (x - (dx * punchAngle.y));
+                                y = (int) (y + (dy * punchAngle.x));
                             }
                             if (CONFIGBOOL("Visuals>World>Local Player>Spread Crosshair")) {
                                 rad = ((weapon->GetSpread() + weapon->GetInaccuracy()) * Globals::screenSizeY) / 1.5f;
                             }
-
+                            if (CONFIGBOOL("Visuals>World>Local Player>Recoil Crosshair>Only When Shooting")) {
+                                if (CONFIGBOOL("Visuals>World>Local Player>Spread Crosshair"))
+                                    goto drawing;
+                                if (Globals::localPlayer->aimPunch().IsZero())
+                                    return;
+                            }
+                            drawing:
                             //drawing
-                            Globals::drawList->AddCircleFilled(ImVec2(x, y), rad, CONFIGCOL("Visuals>World>Local Player>Crosshair Color"));
-                            Globals::drawList->AddCircle(ImVec2(x, y), rad, CONFIGCOL("Visuals>World>Local Player>Crosshair Border Color"));
+                            Globals::drawList->AddCircleFilled(ImVec2(x, y), rad, CONFIGCOL(
+                                    "Visuals>World>Local Player>Crosshair Color"));
+                            Globals::drawList->AddCircle(ImVec2(x, y), rad, CONFIGCOL(
+                                    "Visuals>World>Local Player>Crosshair Border Color"));
+
                         }
                     }
                 }

diff --git a/src/core/menu/config.hpp b/src/core/menu/config.hpp
@@ -90,6 +90,7 @@ namespace Config {
             // World {
                 CONFIGITEM("Visuals>World>Local Player>Spread Crosshair", false),
                 CONFIGITEM("Visuals>World>Local Player>Recoil Crosshair", false),
+                CONFIGITEM("Visuals>World>Local Player>Recoil Crosshair>Only When Shooting", false),
                 CONFIGITEM("Visuals>World>Local Player>Crosshair Color", ImColor(0, 0, 0, 100)),
                 CONFIGITEM("Visuals>World>Local Player>Crosshair Border Color", ImColor(200, 200, 200, 100)),
 

diff --git a/src/core/menu/tabs/visuals.cpp b/src/core/menu/tabs/visuals.cpp
@@ -110,14 +110,20 @@ void Menu::drawVisualsTab() {
                 ImGui::ColorEdit4("Weapon Overlay Color", (float*)&CONFIGCOL("Visuals>World>Local Player>Weapon Overlay Color"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
                 ImGui::PushItemWidth(ImGui::GetWindowContentRegionWidth() * 0.65f);
 
+                ImGui::ColorEdit4("Crosshair Color", (float*)&CONFIGCOL("Visuals>World>Local Player>Crosshair Color"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                ImGui::SameLine();
+                ImGui::ColorEdit4("Crosshair Border Color", (float*)&CONFIGCOL("Visuals>World>Local Player>Crosshair Border Color"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                ImGui::SameLine();
                 ImGui::Checkbox("Spread Crosshair", &CONFIGBOOL("Visuals>World>Local Player>Spread Crosshair"));
                 ImGui::SameLine();
                 ImGui::Checkbox("Recoil Crosshair", &CONFIGBOOL("Visuals>World>Local Player>Recoil Crosshair"));
-                if (CONFIGBOOL("Visuals>World>Local Player>Spread Crosshair") || CONFIGBOOL("Visuals>World>Local Player>Recoil Crosshair")) {
+                //make sure they can't both be on at the same time
+                if (CONFIGBOOL("Visuals>World>Local Player>Recoil Crosshair") && !CONFIGBOOL("Visuals>World>Local Player>Spread Crosshair")) {
                     ImGui::SameLine();
-                    ImGui::ColorEdit4("Crosshair Color", (float*)&CONFIGCOL("Visuals>World>Local Player>Crosshair Color"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
+                    ImGui::Checkbox("Only When Shooting", &CONFIGBOOL("Visuals>World>Local Player>Recoil Crosshair>Only When Shooting"));
+                }
+                if (CONFIGBOOL("Visuals>World>Local Player>Spread Crosshair") || CONFIGBOOL("Visuals>World>Local Player>Recoil Crosshair")) {
                     ImGui::SameLine();
-                    ImGui::ColorEdit4("Crosshair Border Color", (float*)&CONFIGCOL("Visuals>World>Local Player>Crosshair Border Color"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
                 }
                 ImGui::EndChild();
             }