From f75e4e5de4a074ab532640842cd9b74ac813ad15 Mon Sep 17 00:00:00 2001
From: Diavolo <edoardo.sanguineti222@gmail.com>
Date: Tue, 1 Feb 2022 13:41:38 +0100
Subject: [PATCH] Address last bit of review I forgot about

---
 src/Components/Modules/Bots.cpp | 28 ++++++++++++++--------------
 src/Components/Modules/Bots.hpp | 19 +------------------
 src/Game/Structs.hpp            |  2 ++
 3 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/src/Components/Modules/Bots.cpp b/src/Components/Modules/Bots.cpp
index e9e01f8e..8d342b5a 100644
--- a/src/Components/Modules/Bots.cpp
+++ b/src/Components/Modules/Bots.cpp
@@ -22,19 +22,19 @@ namespace Components
 
 	static const BotAction BotActions[] =
 	{
-		{ "gostand", Bots::JUMP },
-		{ "gocrouch", Bots::CROUCH },
-		{ "goprone", Bots::PRONE },
-		{ "fire", Bots::FIRE },
-		{ "melee", Bots::FIRE},
-		{ "frag", Bots::THROW_EQUIPMENT },
-		{ "smoke", Bots::THROW_SPECIAL },
-		{ "reload", Bots::RELOAD },
-		{ "sprint", Bots::SPRINT },
-		{ "leanleft", Bots::LEAN_LEFT},
-		{ "leanright", Bots::LEAN_RIGHT },
-		{ "ads", Bots::ADS_MODE },
-		{ "holdbreath", Bots::HOLD_BREATH },
+		{ "gostand", Game::usercmdButtonBits::CMD_BUTTON_UP },
+		{ "gocrouch", Game::usercmdButtonBits::CMD_BUTTON_CROUCH },
+		{ "goprone", Game::usercmdButtonBits::CMD_BUTTON_PRONE },
+		{ "fire", Game::usercmdButtonBits::CMD_BUTTON_ATTACK },
+		{ "melee", Game::usercmdButtonBits::CMD_BUTTON_MELEE },
+		{ "frag", Game::usercmdButtonBits::CMD_BUTTON_FRAG },
+		{ "smoke",  Game::usercmdButtonBits::CMD_BUTTON_OFFHAND_SECONDARY },
+		{ "reload", Game::usercmdButtonBits::CMD_BUTTON_RELOAD },
+		{ "sprint", Game::usercmdButtonBits::CMD_BUTTON_SPRINT },
+		{ "leanleft", Game::usercmdButtonBits::CMD_BUTTON_LEAN_LEFT },
+		{ "leanright", Game::usercmdButtonBits::CMD_BUTTON_LEAN_RIGHT },
+		{ "ads", Game::usercmdButtonBits::CMD_BUTTON_ADS },
+		{ "holdbreath", Game::usercmdButtonBits::CMD_BUTTON_BREATH },
 		{ "use", Bots::USE },
 		{ "0", Bots::NUM_0 },
 		{ "1", Bots::NUM_1 },
@@ -45,7 +45,7 @@ namespace Components
 		{ "6", Bots::NUM_6 },
 		{ "7", Bots::NUM_7 },
 		{ "8", Bots::NUM_8 },
-		{ "9", Bots::NUM_9 },
+		{ "9", Bots::NUM_9 }
 	};
 
 	int Bots::BuildConnectString(char* buffer, const char* connectString, int num, int, int protocol, int checksum, int statVer, int statStuff, int port)
diff --git a/src/Components/Modules/Bots.hpp b/src/Components/Modules/Bots.hpp
index 56473eda..cc6c2dd2 100644
--- a/src/Components/Modules/Bots.hpp
+++ b/src/Components/Modules/Bots.hpp
@@ -7,25 +7,8 @@ namespace Components
 	public:
 		Bots();
 
-		enum PlayerKeyFlag
+		enum testClientKeyFlag
 		{
-			FIRE = 0x1,
-			SPRINT = 0x2,
-			MELEE = 0x4,
-			RELOAD = 0x10,
-			LEAN_LEFT = 0x40,
-			LEAN_RIGHT = 0x80,
-			PRONE = 0x100,
-			CROUCH = 0x200,
-			JUMP = 0x400,
-			ADS_MODE = 0x800,
-			TEMP_ACTION = 0x1000,
-			HOLD_BREATH = 0x2000,
-			THROW_EQUIPMENT = 0x4000,
-			THROW_SPECIAL = 0x8000,
-			NIGHT_VISION = 0x40000,
-			ADS = 0x80000,
-
 			NUM_0 = 0x8,
 			NUM_1 = 0x20,
 			NUM_2 = 0x10000,
diff --git a/src/Game/Structs.hpp b/src/Game/Structs.hpp
index 2aaee789..5eda0854 100644
--- a/src/Game/Structs.hpp
+++ b/src/Game/Structs.hpp
@@ -1335,6 +1335,8 @@ namespace Game
 	    CMD_BUTTON_ACTIVATE = 0x8,
 	    CMD_BUTTON_RELOAD = 0x10,
 	    CMD_BUTTON_USE_RELOAD = 0x20,
+		CMD_BUTTON_LEAN_LEFT = 0x40,
+		CMD_BUTTON_LEAN_RIGHT = 0x80,
 	    CMD_BUTTON_PRONE = 0x100,
 	    CMD_BUTTON_CROUCH = 0x200,
 	    CMD_BUTTON_UP = 0x400,