add: rapid output console commands are now put on queue and sent with intervals. fixes #176, and overflows causes by yb cvars and yb g clean all commands.

This commit is contained in:
ds 2020-10-13 15:43:25 +03:00
commit fba3837523
5 changed files with 76 additions and 16 deletions

View file

@ -207,6 +207,9 @@ int BotControl::cmdCvars () {
cfg.open (strings.format ("%s/addons/%s/conf/%s.cfg", game.getRunningModName (), product.folder, product.folder), "wt");
cfg.puts ("// Configuration file for %s\n\n", product.name);
}
else {
ctrl.setRapidOutput (true);
}
for (const auto &cvar : game.getCvars ()) {
if (cvar.info.empty ()) {
@ -258,6 +261,7 @@ int BotControl::cmdCvars () {
msg (" ");
}
}
ctrl.setRapidOutput (false);
if (isSave) {
msg ("Bots cvars has been written to file.");
@ -1854,6 +1858,22 @@ void BotControl::maintainAdminRights () {
}
}
void BotControl::flushPrintQueue () {
if (m_printQueueFlushTimestamp > game.time () || m_printQueue.empty ()) {
return;
}
auto printable = m_printQueue.popFront ();
// send to needed destination
if (printable.destination == PrintQueueDestination::ServerConsole) {
game.print (printable.text.chars ());
}
else if (!game.isNullEntity (m_ent)) {
game.clientPrint (m_ent, printable.text.chars ());
}
m_printQueueFlushTimestamp = game.time () + 0.05f;
}
BotControl::BotControl () {
m_ent = nullptr;
m_djump = nullptr;
@ -1862,6 +1882,7 @@ BotControl::BotControl () {
m_isMenuFillCommand = false;
m_rapidOutput = false;
m_menuServerFillTeam = 5;
m_printQueueFlushTimestamp = 0.0f;
m_cmds.emplace ("add/addbot/add_ct/addbot_ct/add_t/addbot_t/addhs/addhs_t/addhs_ct", "add [difficulty[personality[team[model[name]]]]]", "Adding specific bot into the game.", &BotControl::cmdAddBot);
m_cmds.emplace ("kick/kickone/kick_ct/kick_t/kickbot_ct/kickbot_t", "kick [team]", "Kicks off the random bot from the game.", &BotControl::cmdKickBot);

View file

@ -430,6 +430,7 @@ void Game::sendClientMessage (bool console, edict_t *ent, StringRef message) {
if (!util.isPlayer (ent) || util.isFakeClient (ent)) {
return;
}
const String &buffer = message;
// used to split messages
auto sendTextMsg = [&console, &ent] (StringRef text) {
@ -439,19 +440,19 @@ void Game::sendClientMessage (bool console, edict_t *ent, StringRef message) {
};
// do not excess limit
constexpr size_t maxSendLength = 125;
constexpr size_t maxSendLength = 187;
// split up the string into chunks if needed (maybe check if it's multibyte?)
if (message.length () > maxSendLength) {
auto chunks = message.split (maxSendLength);
if (buffer.length () > maxSendLength) {
auto chunks = buffer.split (maxSendLength);
// send in chunks
for (size_t i = 0; i < chunks.length (); ++i) {
sendTextMsg (chunks[i]);
}
return;
}
sendTextMsg (message);
sendTextMsg (buffer);
}
void Game::sendServerMessage (StringRef message) {

View file

@ -406,6 +406,9 @@ CR_EXPORT int GetEntityAPI (gamefuncs_t *table, int) {
// keep bot number up to date
bots.maintainQuota ();
// flush print queue to users
ctrl.flushPrintQueue ();
if (game.is (GameFlags::Metamod)) {
RETURN_META (MRES_IGNORED);