aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcat_or_not <41955154+catornot@users.noreply.github.com>2024-01-04 16:10:37 -0500
committerGitHub <noreply@github.com>2024-01-04 22:10:37 +0100
commitf98513d71f4d39bd8286ccf816d2603fb09035e6 (patch)
tree32856a147ac18ff7ed44a2ce7a59867369278ac9
parentdcf6e1b1fd93d3afa7e0c5869c16d9760a3b4ece (diff)
downloadNorthstarLauncher-1.22.0.tar.gz
NorthstarLauncher-1.22.0.zip
Add ban/kick concommand completion (#604)v1.22.0-rc1v1.22.0
Adds completion to ban and kick commands when typing them in in-game console.
-rw-r--r--primedev/core/convar/concommand.cpp1
-rw-r--r--primedev/server/auth/bansystem.cpp52
2 files changed, 52 insertions, 1 deletions
diff --git a/primedev/core/convar/concommand.cpp b/primedev/core/convar/concommand.cpp
index 41f54c76..6e09ef91 100644
--- a/primedev/core/convar/concommand.cpp
+++ b/primedev/core/convar/concommand.cpp
@@ -145,6 +145,7 @@ void RegisterConCommand(
ConCommand* newCommand = new ConCommand;
ConCommandConstructor(newCommand, name, callback, helpString, flags, nullptr);
newCommand->m_pCompletionCallback = completionCallback;
+ newCommand->m_nCallbackFlags |= 0x3; // seems to be correct?; derived from client.dll + 0x737267
}
ON_DLL_LOAD("engine.dll", ConCommand, (CModule module))
diff --git a/primedev/server/auth/bansystem.cpp b/primedev/server/auth/bansystem.cpp
index a45cde93..6e4d1644 100644
--- a/primedev/server/auth/bansystem.cpp
+++ b/primedev/server/auth/bansystem.cpp
@@ -5,8 +5,11 @@
#include "engine/r2engine.h"
#include "client/r2client.h"
#include "config/profile.h"
+#include "shared/maxplayers.h"
#include <filesystem>
+#include <stdio.h>
+#include <string.h>
const char* BANLIST_PATH_SUFFIX = "/banlist.txt";
const char BANLIST_COMMENT_CHAR = '#';
@@ -213,12 +216,59 @@ void ConCommand_clearbanlist(const CCommand& args)
g_pBanSystem->ClearBanlist();
}
+int ConCommand_banCompletion(const char* const partial, char commands[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH])
+{
+ const char* space = strchr(partial, ' ');
+ const char* cmdName = partial;
+ const char* query = partial + (space == nullptr ? 0 : space - partial) + 1;
+
+ const int queryLength = strlen(query);
+ const int cmdLength = strlen(cmdName) - queryLength;
+
+ int numCompletions = 0;
+ for (int i = 0; i < GetMaxPlayers() && numCompletions < COMMAND_COMPLETION_MAXITEMS - 2; i++)
+ {
+ CBaseClient* client = &g_pClientArray[i];
+ if (client->m_Signon < eSignonState::CONNECTED)
+ continue;
+
+ if (!strncmp(query, client->m_Name, queryLength))
+ {
+ strncpy(commands[numCompletions], cmdName, cmdLength);
+ strncpy_s(
+ commands[numCompletions++] + cmdLength,
+ COMMAND_COMPLETION_ITEM_LENGTH,
+ client->m_Name,
+ COMMAND_COMPLETION_ITEM_LENGTH - cmdLength);
+ }
+
+ if (!strncmp(query, client->m_UID, queryLength))
+ {
+ strncpy(commands[numCompletions], cmdName, cmdLength);
+ strncpy_s(
+ commands[numCompletions++] + cmdLength,
+ COMMAND_COMPLETION_ITEM_LENGTH,
+ client->m_UID,
+ COMMAND_COMPLETION_ITEM_LENGTH - cmdLength);
+ }
+ }
+
+ return numCompletions;
+}
+
ON_DLL_LOAD_RELIESON("engine.dll", BanSystem, ConCommand, (CModule module))
{
g_pBanSystem = new ServerBanSystem;
g_pBanSystem->OpenBanlist();
- RegisterConCommand("ban", ConCommand_ban, "bans a given player by uid or name", FCVAR_GAMEDLL);
+ RegisterConCommand("ban", ConCommand_ban, "bans a given player by uid or name", FCVAR_GAMEDLL, ConCommand_banCompletion);
RegisterConCommand("unban", ConCommand_unban, "unbans a given player by uid", FCVAR_GAMEDLL);
RegisterConCommand("clearbanlist", ConCommand_clearbanlist, "clears all uids on the banlist", FCVAR_GAMEDLL);
}
+
+ON_DLL_LOAD_RELIESON("server.dll", KickCompletion, ConCommand, (CModule module))
+{
+ ConCommand* kick = g_pCVar->FindCommand("kick");
+ kick->m_pCompletionCallback = ConCommand_banCompletion;
+ kick->m_nCallbackFlags |= 0x3;
+}