markmental/yapb-noob-edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: zero out bots pings prior bot disconnection

Browse source 
fix: do not hook pfnCmdStart if game doesn't support fake pings
This commit is contained in:
jeefo 2024-02-19 23:43:25 +03:00
commit a4233dfaf8
No known key found for this signature in database
GPG key ID: 927BCA0779BEA8ED
4 changed files with 46 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/linkage.cpp
View file

@ -389,22 +389,24 @@ CR_EXPORT int GetEntityAPI (gamefuncs_t *table, int interfaceVersion) {
bots.frame ();
};
table->pfnCmdStart = [] (const edict_t *player, usercmd_t *cmd, unsigned int random_seed) {
auto ent = const_cast <edict_t *> (player);
if (game.is (GameFlags::HasFakePings)) {
table->pfnCmdStart = [] (const edict_t *player, usercmd_t *cmd, unsigned int random_seed) {
auto ent = const_cast <edict_t *> (player);
// if we're handle pings for bots and clients, clear IN_SCORE button so SV_ShouldUpdatePing engine function return false, and SV_EmitPings will not overwrite our results
if (game.is (GameFlags::HasFakePings) && cv_show_latency.int_ () == 2) {
if (!util.isFakeClient (ent) && (ent->v.oldbuttons | ent->v.button | cmd->buttons) & IN_SCORE) {
cmd->buttons &= ~IN_SCORE;
util.emitPings (ent);
// if we're handle pings for bots and clients, clear IN_SCORE button so SV_ShouldUpdatePing engine function return false, and SV_EmitPings will not overwrite our results
if (cv_show_latency.int_ () == 2) {
if (!util.isFakeClient (ent) && (ent->v.oldbuttons | ent->v.button | cmd->buttons) & IN_SCORE) {
cmd->buttons &= ~IN_SCORE;
util.emitPings (ent);
}
}
}
if (game.is (GameFlags::Metamod)) {
RETURN_META (MRES_IGNORED);
}
dllapi.pfnCmdStart (ent, cmd, random_seed);
};
if (game.is (GameFlags::Metamod)) {
RETURN_META (MRES_IGNORED);
}
dllapi.pfnCmdStart (ent, cmd, random_seed);
};
}
table->pfnPM_Move = [] (playermove_t *pm, int server) {
// this is the player movement code clients run to predict things when the server can't update

3
src/manager.cpp
View file

@ -1691,6 +1691,9 @@ void Bot::markStale () {
// switch chatter icon off
showChatterIcon (false, true);
// reset bots ping to default
util.resetPings (ent ());
// mark bot as leaving
m_isStale = true;

27
src/support.cpp
View file

@ -498,7 +498,7 @@ void BotSupport::syncCalculatePings () {
}
void BotSupport::emitPings (edict_t *to) {
MessageWriter msg;
static MessageWriter msg;
auto isThirdpartyBot = [] (edict_t *ent) {
return !bots[ent] && (ent->v.flags & FL_FAKECLIENT);
@ -509,6 +509,11 @@ void BotSupport::emitPings (edict_t *to) {
continue;
}
// do not send to dormants
if (client.ent->v.flags & FL_DORMANT) {
continue;
}
// no ping, no fun
if (!client.ping) {
client.ping = getPingBitmask (client.ent, rg.get (5, 10), rg.get (15, 40));
@ -518,7 +523,25 @@ void BotSupport::emitPings (edict_t *to) {
.writeLong (client.ping)
.end ();
}
return;
}
void BotSupport::resetPings (edict_t *to) {
static MessageWriter msg;
// no reset if game isn't support them
if (!game.is (GameFlags::HasFakePings)) {
return;
}
for (auto &client : m_clients) {
if (!(client.flags & ClientFlags::Used) || isFakeClient (client.ent)) {
continue;
}
msg.start (MSG_ONE_UNRELIABLE, SVC_PINGS, nullptr, client.ent)
.writeLong (getPingBitmask (to, 0, 0))
.end ();
}
}
bool BotSupport::isModel (const edict_t *ent, StringRef model) {