github
/
NorthstarLauncher
mirror of https://github.com/R2Northstar/NorthstarLauncher
1
Fork 0
Code Releases Activity

Add ban/kick concommand completion (#604) 

Adds completion to ban and kick commands when typing them in in-game console.
This commit is contained in:
cat_or_not 2024-01-04 16:10:37 -05:00 committed by GitHub
parent dcf6e1b1fd
commit f98513d71f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
primedev/core/convar/concommand.cpp
View File

@ -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))

52
primedev/server/auth/bansystem.cpp
View File

@ -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;
}