diff options
| -rw-r--r-- | NorthstarDedicatedTest/bansystem.cpp | 12 | ||||
| -rw-r--r-- | NorthstarDedicatedTest/modmanager.cpp | 4 | ||||
| -rw-r--r-- | NorthstarDedicatedTest/playlist.cpp | 10 | ||||
| -rw-r--r-- | NorthstarDedicatedTest/serverauthentication.cpp | 5 |
4 files changed, 16 insertions, 15 deletions
diff --git a/NorthstarDedicatedTest/bansystem.cpp b/NorthstarDedicatedTest/bansystem.cpp index 3f62db38..1688a23c 100644 --- a/NorthstarDedicatedTest/bansystem.cpp +++ b/NorthstarDedicatedTest/bansystem.cpp @@ -63,7 +63,7 @@ bool ServerBanSystem::IsUIDAllowed(uint64_t uid) return std::find(m_vBannedUids.begin(), m_vBannedUids.end(), uid) == m_vBannedUids.end(); } -void BanPlayerCommand(const CCommand& args) +void ConCommand_ban(const CCommand& args) { if (args.ArgC() < 2) return; @@ -82,7 +82,7 @@ void BanPlayerCommand(const CCommand& args) } } -void UnbanPlayerCommand(const CCommand& args) +void ConCommand_unban(const CCommand& args) { if (args.ArgC() < 2) return; @@ -91,7 +91,7 @@ void UnbanPlayerCommand(const CCommand& args) g_ServerBanSystem->UnbanUID(strtoll(args.Arg(1), nullptr, 10)); } -void ClearBanlistCommand(const CCommand& args) +void ConCommand_clearbanlist(const CCommand& args) { g_ServerBanSystem->ClearBanlist(); } @@ -101,7 +101,7 @@ ON_DLL_LOAD_RELIESON("engine.dll", BanSystem, ConCommand, (HMODULE baseAddress) g_ServerBanSystem = new ServerBanSystem; g_ServerBanSystem->OpenBanlist(); - RegisterConCommand("ban", BanPlayerCommand, "bans a given player by uid or name", FCVAR_GAMEDLL); - RegisterConCommand("unban", UnbanPlayerCommand, "unbans a given player by uid", FCVAR_NONE); - RegisterConCommand("clearbanlist", ClearBanlistCommand, "clears all uids on the banlist", FCVAR_NONE); + RegisterConCommand("ban", ConCommand_ban, "bans a given player by uid or name", FCVAR_GAMEDLL); + RegisterConCommand("unban", ConCommand_unban, "unbans a given player by uid", FCVAR_NONE); + RegisterConCommand("clearbanlist", ConCommand_clearbanlist, "clears all uids on the banlist", FCVAR_NONE); })
\ No newline at end of file diff --git a/NorthstarDedicatedTest/modmanager.cpp b/NorthstarDedicatedTest/modmanager.cpp index 79244194..0b733ebf 100644 --- a/NorthstarDedicatedTest/modmanager.cpp +++ b/NorthstarDedicatedTest/modmanager.cpp @@ -566,7 +566,7 @@ void ModManager::CompileAssetsForFile(const char* filename) } } -void ReloadModsCommand(const CCommand& args) +void ConCommand_reload_mods(const CCommand& args) { g_ModManager->LoadMods(); } @@ -575,7 +575,7 @@ ON_DLL_LOAD_RELIESON("engine.dll", ModManager, ConCommand, (HMODULE baseAddress) { g_ModManager = new ModManager; - RegisterConCommand("reload_mods", ReloadModsCommand, "reloads mods", FCVAR_NONE); + RegisterConCommand("reload_mods", ConCommand_reload_mods, "reloads mods", FCVAR_NONE); }) fs::path GetModFolderPath() diff --git a/NorthstarDedicatedTest/playlist.cpp b/NorthstarDedicatedTest/playlist.cpp index 477b3b0a..f91f3f3a 100644 --- a/NorthstarDedicatedTest/playlist.cpp +++ b/NorthstarDedicatedTest/playlist.cpp @@ -17,7 +17,7 @@ namespace R2 GetCurrentPlaylistVarType GetCurrentPlaylistVar; } // namespace R2 -void SetPlaylistCommand(const CCommand& args) +void ConCommand_playlist(const CCommand& args) { if (args.ArgC() < 2) return; @@ -25,7 +25,7 @@ void SetPlaylistCommand(const CCommand& args) R2::SetCurrentPlaylist(args.Arg(1)); } -void SetPlaylistVarOverrideCommand(const CCommand& args) +void ConCommand_setplaylistvaroverride(const CCommand& args) { if (args.ArgC() < 3) return; @@ -79,9 +79,9 @@ int GetCurrentGamemodeMaxPlayersHook() ON_DLL_LOAD_RELIESON("engine.dll", PlaylistHooks, ConCommand, (HMODULE baseAddress) { // playlist is the name of the command on respawn servers, but we already use setplaylist so can't get rid of it - RegisterConCommand("playlist", SetPlaylistCommand, "Sets the current playlist", FCVAR_NONE); - RegisterConCommand("setplaylist", SetPlaylistCommand, "Sets the current playlist", FCVAR_NONE); - RegisterConCommand("setplaylistvaroverrides", SetPlaylistVarOverrideCommand, "sets a playlist var override", FCVAR_NONE); + RegisterConCommand("playlist", ConCommand_playlist, "Sets the current playlist", FCVAR_NONE); + RegisterConCommand("setplaylist", ConCommand_playlist, "Sets the current playlist", FCVAR_NONE); + RegisterConCommand("setplaylistvaroverrides", ConCommand_setplaylistvaroverride, "sets a playlist var override", FCVAR_NONE); // note: clc_SetPlaylistVarOverride is pretty insecure, since it allows for entirely arbitrary playlist var overrides to be sent to the // server, this is somewhat restricted on custom servers to prevent it being done outside of private matches, but ideally it should be diff --git a/NorthstarDedicatedTest/serverauthentication.cpp b/NorthstarDedicatedTest/serverauthentication.cpp index 5f9f10e8..d7e67af8 100644 --- a/NorthstarDedicatedTest/serverauthentication.cpp +++ b/NorthstarDedicatedTest/serverauthentication.cpp @@ -600,7 +600,7 @@ bool ProcessConnectionlessPacketHook(void* a1, netpacket_t* packet) return ProcessConnectionlessPacket(a1, packet); } -void ResetPdataCommand(const CCommand& args) +void ConCommand_ns_resetpersistence(const CCommand& args) { if (*sv_m_State == server_state_t::ss_active) { @@ -645,7 +645,8 @@ ON_DLL_LOAD_RELIESON("engine.dll", ServerAuthentication, ConCommand, (HMODULE ba Cvar_net_datablock_enabled = g_pCVar->FindVar("net_datablock_enabled"); - RegisterConCommand("ns_resetpersistence", ResetPdataCommand, "resets your pdata when you next enter the lobby", FCVAR_NONE); + RegisterConCommand( + "ns_resetpersistence", ConCommand_ns_resetpersistence, "resets your pdata when you next enter the lobby", FCVAR_NONE); HookEnabler hook; ENABLER_CREATEHOOK( |