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

revert: part of changes with bot icons (ref #424)

Browse source
This commit is contained in:
jeefo 2023-04-03 10:12:09 +03:00
commit 4b9acd5d5c
No known key found for this signature in database
GPG key ID: 927BCA0779BEA8ED
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/botlib.cpp
View file

@ -952,12 +952,11 @@ void Bot::showChaterIcon (bool show) {
return; return;
} }
auto sendBotVoice = [&show] (edict_t *ent, int ownId) { auto sendBotVoice = [] (bool on, edict_t *ent, int ownId) {
MessageWriter (MSG_ONE, msgs.id (NetMsg::BotVoice), nullptr, ent) // begin message MessageWriter (MSG_ONE, msgs.id (NetMsg::BotVoice), nullptr, ent) // begin message
.writeByte (show) // switch on/off .writeByte (on) // switch on/off
.writeByte (ownId); .writeByte (ownId);
}; };
int ownIndex = index (); int ownIndex = index ();
for (auto &client : util.getClients ()) { for (auto &client : util.getClients ()) {
@ -966,13 +965,13 @@ void Bot::showChaterIcon (bool show) {
} }
if (!show && (client.iconFlags[ownIndex] & ClientFlags::Icon) && client.iconTimestamp[ownIndex] < game.time ()) { if (!show && (client.iconFlags[ownIndex] & ClientFlags::Icon) && client.iconTimestamp[ownIndex] < game.time ()) {
sendBotVoice (client.ent, entindex ()); sendBotVoice (false, client.ent, entindex ());
client.iconTimestamp[ownIndex] = 0.0f; client.iconTimestamp[ownIndex] = 0.0f;
client.iconFlags[ownIndex] &= ~ClientFlags::Icon; client.iconFlags[ownIndex] &= ~ClientFlags::Icon;
} }
else if (show && !(client.iconFlags[ownIndex] & ClientFlags::Icon)) { else if (show && !(client.iconFlags[ownIndex] & ClientFlags::Icon)) {
sendBotVoice (client.ent, entindex ()); sendBotVoice (true, client.ent, entindex ());
} }
} }
} }