New Menu && Fixed Binding

Author: PhilipPanda

TempleWare-CS2/source/templeware/config/config.cpp

@@ -12,9 +12,9 @@ namespace Config {
 	bool teamCheck = false;
 	bool espFill = false;
 	bool showNameTags = false;
-	
+
 	bool Night = false;
-	
+
 	bool enemyChamsInvisible = false;
 	bool enemyChams = false;
 	bool teamChams = false;

TempleWare-CS2/source/templeware/config/config.h

@@ -15,10 +15,10 @@ namespace Config {
 	extern float espFillOpacity;
 	extern ImVec4 espColor;
 	extern bool showNameTags;
-	
+
 	extern bool Night;
 	extern ImVec4 NightColor;
-	
+
 	extern bool enemyChamsInvisible;
 	extern bool enemyChams;
 	extern bool teamChams;

TempleWare-CS2/source/templeware/features/aim/aim.cpp

@@ -4,6 +4,9 @@
 #include "../../../templeware/hooks/hooks.h"
 #include "../../../templeware/config/config.h"
 
+#include <chrono>
+#include <Windows.h>
+
 // Literally the most autistic code ive ever written in my life
 // Please dont ever make me do this again
 
@@ -92,7 +95,7 @@ void Aimbot() {
 
             QAngle_t ang_punch_angle = *(QAngle_t*)((uintptr_t)lp + SchemaFinder::Get(hash_32_fnv1a_const("C_CSPlayerPawn->m_aimPunchAngle")));
 
-            if(Config::rcs)
+            if (Config::rcs)
                 angle -= ang_punch_angle * 2.f;
 
             angle.z = 0.f;

TempleWare-CS2/source/templeware/features/aim/aim.h

@@ -1,3 +1,3 @@
 #pragma once
 
-void Aimbot();
+void Aimbot();

TempleWare-CS2/source/templeware/keybinds/keybinds.cpp

@@ -1,5 +1,7 @@
 #include "keybinds.h"
 #include <Windows.h>
+#include <cstring>   // For strcpy_s and sprintf_s
+#include <cstdio>    // For sprintf_s
 
 #include "../../../external/imgui/imgui.h"
 #include "../config/config.h"
@@ -8,39 +10,73 @@ Keybind::Keybind(bool& v, int k)
     : var(v), key(k), isListening(false), skipFrame(false) {}
 
 Keybinds::Keybinds() {
-	keybinds.emplace_back(Keybind(Config::aimbot, VK_INSERT));
+    keybinds.emplace_back(Keybind(Config::aimbot, VK_XBUTTON1));
 }
 
 void Keybinds::pollInputs() {
-	for (Keybind& k : keybinds) {
-		if (GetAsyncKeyState(k.key) & 1) {
-			k.var = !k.var;
-		}
-	}
+    for (Keybind& k : keybinds) {
+        if (k.key != 0 && (GetAsyncKeyState(k.key) & 0x1)) {
+            k.var = !k.var;
+        }
+    }
 }
 
 void Keybinds::menuButton(bool& var) {
     for (auto& kb : keybinds) {
         if (&kb.var != &var) continue;
 
+        char keyName[32] = "None";
+        if (kb.key != 0) {
+            switch (kb.key) {
+            case VK_INSERT: strcpy_s(keyName, "INSERT"); break;
+            case VK_DELETE: strcpy_s(keyName, "DELETE"); break;
+            case VK_HOME: strcpy_s(keyName, "HOME"); break;
+            case VK_END: strcpy_s(keyName, "END"); break;
+            case VK_PRIOR: strcpy_s(keyName, "PAGE UP"); break;
+            case VK_NEXT: strcpy_s(keyName, "PAGE DOWN"); break;
+            case VK_LBUTTON: strcpy_s(keyName, "MOUSE1"); break;
+            case VK_RBUTTON: strcpy_s(keyName, "MOUSE2"); break;
+            case VK_MBUTTON: strcpy_s(keyName, "MOUSE3"); break;
+            case VK_XBUTTON1: strcpy_s(keyName, "MOUSE4"); break;
+            case VK_XBUTTON2: strcpy_s(keyName, "MOUSE5"); break;
+            default:
+                if (kb.key >= 'A' && kb.key <= 'Z') {
+                    sprintf_s(keyName, "%c", kb.key);
+                }
+                else if (kb.key >= '0' && kb.key <= '9') {
+                    sprintf_s(keyName, "%c", kb.key);
+                }
+                else {
+                    sprintf_s(keyName, "0x%X", kb.key);
+                }
+                break;
+            }
+        }
+
         if (!kb.isListening) {
-            if (ImGui::Button("Bind")) {
+            ImGui::PushID(&kb);
+            ImGui::Text("[%s]", keyName);
+            ImGui::SameLine();
+            bool clicked = ImGui::Button("Change##Bind");
+            ImGui::PopID();
+
+            if (clicked) {
                 kb.isListening = true;
                 kb.skipFrame = true;
             }
         }
         else {
-            ImGui::Text("Press any key (ESC to cancel)...");
+            ImGui::Text("Press any key...");
             ImGui::SameLine();
 
-            if (ImGui::Button("Cancel") || (GetAsyncKeyState(VK_ESCAPE) & 1)) {
+            if (ImGui::Button("Cancel") || (GetAsyncKeyState(VK_ESCAPE) & 0x8000)) {
                 kb.isListening = false;
                 return;
             }
 
             if (!kb.skipFrame) {
                 for (int keyCode = 7; keyCode < 256; ++keyCode) {
-                    if (GetAsyncKeyState(keyCode)) {
+                    if (GetAsyncKeyState(keyCode) & 0x8000) {
                         kb.key = keyCode;
                         kb.isListening = false;
                         return;
@@ -55,4 +91,4 @@ void Keybinds::menuButton(bool& var) {
 }
 
 
-Keybinds keybind;
+Keybinds keybind;