Address last bit of review I forgot about

This commit is contained in:
Diavolo 2022-02-01 13:41:38 +01:00
parent e014dd9a2a
commit f75e4e5de4
No known key found for this signature in database
GPG Key ID: FA77F074E98D98A5
3 changed files with 17 additions and 32 deletions

View File

@ -22,19 +22,19 @@ namespace Components
static const BotAction BotActions[] = static const BotAction BotActions[] =
{ {
{ "gostand", Bots::JUMP }, { "gostand", Game::usercmdButtonBits::CMD_BUTTON_UP },
{ "gocrouch", Bots::CROUCH }, { "gocrouch", Game::usercmdButtonBits::CMD_BUTTON_CROUCH },
{ "goprone", Bots::PRONE }, { "goprone", Game::usercmdButtonBits::CMD_BUTTON_PRONE },
{ "fire", Bots::FIRE }, { "fire", Game::usercmdButtonBits::CMD_BUTTON_ATTACK },
{ "melee", Bots::FIRE}, { "melee", Game::usercmdButtonBits::CMD_BUTTON_MELEE },
{ "frag", Bots::THROW_EQUIPMENT }, { "frag", Game::usercmdButtonBits::CMD_BUTTON_FRAG },
{ "smoke", Bots::THROW_SPECIAL }, { "smoke", Game::usercmdButtonBits::CMD_BUTTON_OFFHAND_SECONDARY },
{ "reload", Bots::RELOAD }, { "reload", Game::usercmdButtonBits::CMD_BUTTON_RELOAD },
{ "sprint", Bots::SPRINT }, { "sprint", Game::usercmdButtonBits::CMD_BUTTON_SPRINT },
{ "leanleft", Bots::LEAN_LEFT}, { "leanleft", Game::usercmdButtonBits::CMD_BUTTON_LEAN_LEFT },
{ "leanright", Bots::LEAN_RIGHT }, { "leanright", Game::usercmdButtonBits::CMD_BUTTON_LEAN_RIGHT },
{ "ads", Bots::ADS_MODE }, { "ads", Game::usercmdButtonBits::CMD_BUTTON_ADS },
{ "holdbreath", Bots::HOLD_BREATH }, { "holdbreath", Game::usercmdButtonBits::CMD_BUTTON_BREATH },
{ "use", Bots::USE }, { "use", Bots::USE },
{ "0", Bots::NUM_0 }, { "0", Bots::NUM_0 },
{ "1", Bots::NUM_1 }, { "1", Bots::NUM_1 },
@ -45,7 +45,7 @@ namespace Components
{ "6", Bots::NUM_6 }, { "6", Bots::NUM_6 },
{ "7", Bots::NUM_7 }, { "7", Bots::NUM_7 },
{ "8", Bots::NUM_8 }, { "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) int Bots::BuildConnectString(char* buffer, const char* connectString, int num, int, int protocol, int checksum, int statVer, int statStuff, int port)

View File

@ -7,25 +7,8 @@ namespace Components
public: public:
Bots(); 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_0 = 0x8,
NUM_1 = 0x20, NUM_1 = 0x20,
NUM_2 = 0x10000, NUM_2 = 0x10000,

View File

@ -1335,6 +1335,8 @@ namespace Game
CMD_BUTTON_ACTIVATE = 0x8, CMD_BUTTON_ACTIVATE = 0x8,
CMD_BUTTON_RELOAD = 0x10, CMD_BUTTON_RELOAD = 0x10,
CMD_BUTTON_USE_RELOAD = 0x20, CMD_BUTTON_USE_RELOAD = 0x20,
CMD_BUTTON_LEAN_LEFT = 0x40,
CMD_BUTTON_LEAN_RIGHT = 0x80,
CMD_BUTTON_PRONE = 0x100, CMD_BUTTON_PRONE = 0x100,
CMD_BUTTON_CROUCH = 0x200, CMD_BUTTON_CROUCH = 0x200,
CMD_BUTTON_UP = 0x400, CMD_BUTTON_UP = 0x400,