diff --git a/src/Components/Modules/Bots.cpp b/src/Components/Modules/Bots.cpp index 98191866..66c61a15 100644 --- a/src/Components/Modules/Bots.cpp +++ b/src/Components/Modules/Bots.cpp @@ -3,7 +3,6 @@ namespace Components { std::vector Bots::BotNames; - Game::dvar_t* Bots::SVBotWarfare; struct BotMovementInfo { @@ -280,21 +279,11 @@ namespace Components { __asm { - // If bot warfare isn't being used let's keep - // test clients normal functionality - push eax - mov eax, Bots::SVBotWarfare - cmp byte ptr [eax + 0x10], 1 - pop eax - - jz skip + pushad call SV_UpdateBots - ret - - skip: - pushad call Bots::BotAiAction + popad ret } @@ -308,9 +297,6 @@ namespace Components // Intercept sprintf for the connect string Utils::Hook(0x48ADAB, Bots::BuildConnectString, HOOK_CALL).install()->quick(); - Bots::SVBotWarfare = Game::Dvar_RegisterBool("sv_botWarfare", false, - Game::DVAR_FLAG_NONE, "Allow bot warfare mod to override default bot behaviour"); - Utils::Hook(0x627021, SV_UpdateBots_Hk, HOOK_CALL).install()->quick(); Utils::Hook(0x627241, SV_UpdateBots_Hk, HOOK_CALL).install()->quick(); diff --git a/src/Components/Modules/Bots.hpp b/src/Components/Modules/Bots.hpp index 2546fe16..14379bd0 100644 --- a/src/Components/Modules/Bots.hpp +++ b/src/Components/Modules/Bots.hpp @@ -42,7 +42,6 @@ namespace Components private: static std::vector BotNames; - static Game::dvar_t* SVBotWarfare; static void BuildConnectString(char* buffer, const char* connectString, int num, int, int protocol, int checksum, int statVer, int statStuff, int port);