enable command reloading and better register function

Author: Bitl

game/quiver/info_changelog.txt

@@ -49,6 +49,7 @@ Added the following Source SDK Pull Requests:
 	- #1480: Fixed Widowmaker not giving metal on friendly disguises
 	- #1481: Workaround for CTFStatPanel not hiding on freezecam screenshot
 	- #1483: (Temporary) Fix issues with dynamic models on listen servers
+	- #948: Add proper server admin tools (heavily modified)
 
 Details:
 - Fixed a bug where the mini-crit damage effect doesn't show up when your shield breaks.

src/game/server/admin/base_serveradmin.cpp

@@ -8,11 +8,13 @@
 #include "fmtstr.h"
 
 //MODULES
-#include "serveradmin_command_base.h"
+#include "serveradmin_register.h"
 
 // always comes last
 #include "tier0/memdbgon.h"
 
+#ifdef BDSBASE
+
 CBase_Admin *g_pBaseAdmin = NULL;
 bool g_bAdminSystem = false;
 
@@ -91,7 +93,7 @@ CBase_Admin::CBase_Admin()
 	m_steamID = NULL;
 	m_permissions = NULL;
 
-	InitAdminCommands();
+	RegisterCommands();
 }
 
 CBase_Admin::~CBase_Admin()
@@ -283,6 +285,8 @@ bool IsSteamIDAdmin( const char *steamID )
 	return false;
 }
 
+//ConVar sa_listenserverhostimmune("sa_listenserverhostimmune", "1", FCVAR_DEVELOPMENTONLY);
+
 //-----------------------------------------------------------------------------
 // Purpose: Check if a player has admin permissions
 //-----------------------------------------------------------------------------
@@ -291,7 +295,7 @@ bool CBase_Admin::IsPlayerAdmin( CBasePlayer *pPlayer, const char *requiredFlags
 	if ( !pPlayer )
 		return false;
 
-	if ( !engine->IsDedicatedServer() && pPlayer == UTIL_GetListenServerHost() )
+	if (!engine->IsDedicatedServer() && pPlayer == UTIL_GetListenServerHost())
 	{
 		// We only need to see this once
 		if ( !bIsListenServerMsg )
@@ -470,6 +474,8 @@ int CBase_Admin::GetRedNumber()
 	return TEAM_REBELS;
 #elif TF_DLL
 	return TF_TEAM_RED;
+#else
+	return TEAM_UNASSIGNED;
 #endif
 }
 
@@ -479,6 +485,8 @@ int CBase_Admin::GetBlueNumber()
 	return TEAM_COMBINE;
 #elif TF_DLL
 	return TF_TEAM_BLUE;
+#else
+	return TEAM_UNASSIGNED;
 #endif
 }
 
@@ -755,13 +763,13 @@ bool CBase_Admin::FindSpecialTargetGroup( const char *targetSpecifier )
 //-----------------------------------------------------------------------------
 AdminCommandFunction FindAdminCommand(const char* cmd)
 {
-	FOR_EACH_VEC(BaseAdmin()->g_AdminCommands, i)
+	FOR_EACH_VEC(BaseAdmin()->GetCommands(), i)
 	{
-		const CommandEntry& entry = BaseAdmin()->g_AdminCommands[i];
+		const CommandEntry *entry = BaseAdmin()->GetCommands()[i];
 
-		if (Q_stricmp(entry.chatCommand, cmd) == 0)
+		if (Q_stricmp(entry->chatCommand, cmd) == 0)
 		{
-			return entry.function;
+			return entry->function;
 		}
 	}
 
@@ -770,11 +778,11 @@ AdminCommandFunction FindAdminCommand(const char* cmd)
 
 bool IsCommandAllowed(const char* cmd, bool isServerConsole, CBasePlayer* pAdmin)
 {
-	FOR_EACH_VEC(BaseAdmin()->g_AdminCommands, i)
+	FOR_EACH_VEC(BaseAdmin()->GetCommands(), i)
 	{
-		const CommandEntry& entry = BaseAdmin()->g_AdminCommands[i];
+		const CommandEntry *entry = BaseAdmin()->GetCommands()[i];
 
-		if (Q_stricmp(entry.chatCommand, cmd) == 0)
+		if (Q_stricmp(entry->chatCommand, cmd) == 0)
 		{
 			if (!isServerConsole)
 			{
@@ -787,9 +795,22 @@ bool IsCommandAllowed(const char* cmd, bool isServerConsole, CBasePlayer* pAdmin
 
 				if (!bImmunity)
 				{
-					if (!CBase_Admin::IsPlayerAdmin(pAdmin, entry.requiredFlags))
+					if (strchr(entry->requiredFlags, ADMIN_UNDEFINED) != NULL)
 					{
-						return false;
+						return true;
+					}
+
+					if (!CBase_Admin::IsPlayerAdmin(pAdmin, entry->requiredFlags))
+					{
+						//do we at least have the b flag?
+						if (CBase_Admin::IsPlayerAdmin(pAdmin, "b"))
+						{
+							return true;
+						}
+						else
+						{
+							return false;
+						}
 					}
 				}
 			}
@@ -803,39 +824,6 @@ bool IsCommandAllowed(const char* cmd, bool isServerConsole, CBasePlayer* pAdmin
 	return false;
 }
 
-void PrintCommandHelpStrings(bool isServerConsole, CBasePlayer *pAdmin)
-{
-	const char* szTitle = "[Server Admin] Usage: sa <command> [arguments]\n==============================================\n\n";
-
-	if (isServerConsole)
-	{
-		Msg(szTitle);
-	}
-	else
-	{
-		ClientPrint(pAdmin, HUD_PRINTCONSOLE, szTitle);
-	}
-
-	FOR_EACH_VEC(BaseAdmin()->g_AdminCommands, i)
-	{
-		const CommandEntry& entry = BaseAdmin()->g_AdminCommands[i];
-
-		if (IsCommandAllowed(entry.chatCommand, isServerConsole, pAdmin))
-		{
-			const char* szMsg = UTIL_VarArgs("[%s] %s %s\n", entry.moduleName, entry.chatCommand, entry.helpMessage);
-
-			if (isServerConsole)
-			{
-				Msg(szMsg);
-			}
-			else
-			{
-				ClientPrint(pAdmin, HUD_PRINTCONSOLE, szMsg);
-			}
-		}
-	}
-}
-
 //-----------------------------------------------------------------------------
 // Purpose: Initialize the admin system (parse the file, add admins, register commands)
 //-----------------------------------------------------------------------------
@@ -901,11 +889,6 @@ void CBase_Admin::InitAdminSystem()
 	}
 }
 
-void CBase_Admin::InitAdminCommands()
-{
-	LoadBaseCommandModule();
-}
-
 //-----------------------------------------------------------------------------
 // Purpose: Checks chat for certain strings (chat commands)
 //-----------------------------------------------------------------------------
@@ -925,30 +908,30 @@ void CBase_Admin::CheckChatText( char *p, int bufsize )
 
 	FOR_EACH_VEC(g_pBaseAdmin->g_AdminCommands, i)
 	{
-		const CommandEntry& entry = g_pBaseAdmin->g_AdminCommands[i];
+		const CommandEntry *entry = g_pBaseAdmin->g_AdminCommands[i];
 
-		size_t cmdLen = strlen(entry.chatCommand);
-		if (Q_strncmp(p, entry.chatCommand, cmdLen) == 0)
+		size_t cmdLen = strlen(entry->chatCommand);
+		if (Q_strncmp(p, entry->chatCommand, cmdLen) == 0)
 		{
 			char consoleCmd[256];
 
-			if (entry.requiresArguments)
+			if (entry->requiresArguments)
 			{
 				const char* args = p + cmdLen;
-				Q_snprintf(consoleCmd, sizeof(consoleCmd), "%s%s", entry.consoleCommand, args);
+				Q_snprintf(consoleCmd, sizeof(consoleCmd), "%s%s", entry->consoleCommand, args);
 			}
 			else
 			{
-				Q_snprintf(consoleCmd, sizeof(consoleCmd), "%s", entry.consoleCommand);
+				Q_snprintf(consoleCmd, sizeof(consoleCmd), "%s", entry->consoleCommand);
 			}
 
 			if (pPlayer)
 			{
 				pPlayer->SetLastCommandWasFromChat(true);
 				engine->ClientCommand(pPlayer->edict(), consoleCmd);
-				if (entry.consoleMessage)
+				if (entry->consoleMessage)
 				{
-					ClientPrint(pPlayer, HUD_PRINTTALK, entry.consoleMessage);
+					ClientPrint(pPlayer, HUD_PRINTTALK, entry->consoleMessage);
 				}
 			}
 			return;
@@ -1044,4 +1027,18 @@ void CBase_Admin::LogAction( CBasePlayer *pAdmin, CBasePlayer *pTarget, const ch
 
 	filesystem->FPrintf( g_AdminLogFile, "%s", logEntry.Get() );
 	filesystem->Flush( g_AdminLogFile );
-}
+}
+
+void CBase_Admin::ReloadCommands(void)
+{
+	g_AdminCommands.PurgeAndDeleteElements();
+	RegisterCommands();
+	DevMsg("Reloaded commands.\n");
+}
+
+void ToggleModule_ChangeCallback(IConVar* pConVar, char const* pOldString, float flOldValue)
+{
+	BaseAdmin()->ReloadCommands();
+}
+
+#endif

src/game/server/admin/base_serveradmin.h

@@ -1,7 +1,9 @@
 #ifndef BASE_SERVERADMIN_H
 #define BASE_SERVERADMIN_H
 
-#include "admin\serveradmin_command_core.h"
+#ifdef BDSBASE
+
+#include "admin\serveradmin_core.h"
 
 #define VERSION				"1.0"
 
@@ -73,8 +75,7 @@ class CBase_Admin
     const char *GetSteamID() const { return m_steamID; }
 
     static void InitAdminSystem();
-    void AddCommand(CommandEntry entry) {g_AdminCommands.AddToTail(entry);}
-    static CUtlMap<CUtlString, AdminData_t> &GetAdminMap();
+    static CUtlMap<CUtlString, AdminData_t>& GetAdminMap();
     static bool ParseAdminFile( const char *filename, CUtlMap<CUtlString, AdminData_t> &outAdminMap );
     static void SaveAdminCache();  // For persisting updated list if needed
     static bool IsPlayerAdmin( CBasePlayer *pPlayer, const char *requiredFlags );
@@ -86,6 +87,10 @@ class CBase_Admin
     static void CheckChatText( char *p, int bufsize );
     static void LogAction( CBasePlayer *pAdmin, CBasePlayer *pTarget, const char *action, const char *details = "", const char *groupTarget = nullptr );
 
+    CUtlVector<CommandEntry *>& GetCommands() { return g_AdminCommands; }
+    void AddCommand(CommandEntry *entry) { g_AdminCommands.AddToTail(entry); }
+    void ReloadCommands();
+
 	int GetRedNumber();
 	int GetBlueNumber();
 
@@ -109,12 +114,6 @@ class CBase_Admin
     void TargetAllBots( bool enabled ) { bBots = enabled; }
     void TargetAllHumans( bool enabled ) { bHumans = enabled; }
 
-private:
-    void InitAdminCommands();
-
-public:
-    CUtlVector<CommandEntry> g_AdminCommands;
-
 private:
     const char *m_steamID;
     const char *m_permissions;
@@ -131,6 +130,8 @@ class CBase_Admin
     bool bHumans;
 
     static bool bIsListenServerMsg;
+
+    CUtlVector<CommandEntry *> g_AdminCommands;
 };
 
 extern CUtlVector<CBase_Admin *> g_AdminList;
@@ -174,4 +175,17 @@ extern AdminCommandFunction FindAdminCommand(const char* cmd);
 extern bool IsCommandAllowed(const char* cmd, bool isServerConsole, CBasePlayer* pAdmin);
 extern void PrintCommandHelpStrings(bool isServerConsole, CBasePlayer* pAdmin);
 
+extern void ToggleModule_ChangeCallback(IConVar* pConVar, char const* pOldString, float flOldValue);
+
+#define CONVAR_MODULE_TOGGLE(name, defaultVal, flags, helpString)                     \
+    ConVar moduleToggle(name, defaultVal, flags, helpString, ToggleModule_ChangeCallback);
+
+#define REGISTER_ADMIN_COMMAND(toggleCvarName, moduleName, chatName, commandName, usesArguments, consoleText, helpString, flags, func)                     \
+    {ConVarRef toggleCvar( toggleCvarName ); \
+    if (toggleCvar.GetBool()) \
+    {                          \
+        BaseAdmin()->AddCommand(new CommandEntry{ moduleName, chatName, commandName, usesArguments, consoleText, helpString, flags, func });                \
+    }}
+#endif
+
 #endif // BASE_SERVERADMIN_H