Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Restore test client functionality for real

Browse Source
This commit is contained in:
FutureRave 2022-02-14 18:14:07 +00:00
parent 6043283ec9
commit 457475961b
No known key found for this signature in database
GPG Key ID: E883E2BC9657D955
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Components/Modules/Bots.cpp
View File

@ -10,6 +10,7 @@ namespace Components
int8_t forward; int8_t forward;
int8_t right; int8_t right;
uint16_t weapon; uint16_t weapon;
bool active;
}; };
static BotMovementInfo g_botai[18]; static BotMovementInfo g_botai[18];
@ -50,7 +51,7 @@ namespace Components
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)
{ {
static int botId = 0; static auto botId = 0;
const char* botName; const char* botName;
if (Bots::BotNames.empty()) if (Bots::BotNames.empty())
@ -159,6 +160,7 @@ namespace Components
g_botai[entref.entnum] = {0}; g_botai[entref.entnum] = {0};
g_botai[entref.entnum].weapon = 1; g_botai[entref.entnum].weapon = 1;
g_botai[entref.entnum].active = false;
}); });
Script::AddFunction("BotWeapon", [](Game::scr_entref_t entref) // Usage: <bot> BotWeapon(<str>); Script::AddFunction("BotWeapon", [](Game::scr_entref_t entref) // Usage: <bot> BotWeapon(<str>);
@ -182,6 +184,7 @@ namespace Components
const auto weapId = Game::G_GetWeaponIndexForName(weapon); const auto weapId = Game::G_GetWeaponIndexForName(weapon);
g_botai[entref.entnum].weapon = static_cast<uint16_t>(weapId); g_botai[entref.entnum].weapon = static_cast<uint16_t>(weapId);
g_botai[entref.entnum].active = true;
}); });
Script::AddFunction("BotAction", [](Game::scr_entref_t entref) // Usage: <bot> BotAction(<str action>); Script::AddFunction("BotAction", [](Game::scr_entref_t entref) // Usage: <bot> BotAction(<str action>);
@ -219,6 +222,7 @@ namespace Components
else else
g_botai[entref.entnum].buttons &= ~(BotActions[i].key); g_botai[entref.entnum].buttons &= ~(BotActions[i].key);
g_botai[entref.entnum].active = true;
return; return;
} }
@ -244,6 +248,7 @@ namespace Components
g_botai[entref.entnum].forward = static_cast<int8_t>(forwardInt); g_botai[entref.entnum].forward = static_cast<int8_t>(forwardInt);
g_botai[entref.entnum].right = static_cast<int8_t>(rightInt); g_botai[entref.entnum].right = static_cast<int8_t>(rightInt);
g_botai[entref.entnum].active = true;
}); });
} }
@ -252,9 +257,14 @@ namespace Components
if (cl->gentity == nullptr) if (cl->gentity == nullptr)
return; return;
Game::usercmd_s ucmd = {0};
const auto entnum = cl->gentity->s.number; const auto entnum = cl->gentity->s.number;
// Keep test client functionality
if (!g_botai[entnum].active)
return;
Game::usercmd_s ucmd = {0};
ucmd.serverTime = *Game::svs_time; ucmd.serverTime = *Game::svs_time;
ucmd.buttons = g_botai[entnum].buttons; ucmd.buttons = g_botai[entnum].buttons;