core/ConCmdManager.cpp
changeset 3389 68d3e56f4bb7
parent 3302 767c92704500
child 3687 d0b1262dbc03
     1.1 --- a/core/ConCmdManager.cpp	Fri Sep 09 15:29:17 2011 -0400
     1.2 +++ b/core/ConCmdManager.cpp	Sat Sep 10 12:08:38 2011 -0400
     1.3 @@ -450,7 +450,7 @@
     1.4  	}
     1.5  }
     1.6  
     1.7 -bool ConCmdManager::CheckCommandAccess(int client, const char *cmd, FlagBits cmdflags)
     1.8 +bool ConCmdManager::CheckClientCommandAccess(int client, const char *cmd, FlagBits cmdflags)
     1.9  {
    1.10  	if (cmdflags == 0 || client == 0)
    1.11  	{
    1.12 @@ -471,7 +471,11 @@
    1.13  		return false;
    1.14  	}
    1.15  
    1.16 -	AdminId adm = player->GetAdminId();
    1.17 +	return CheckAdminCommandAccess(player->GetAdminId(), cmd, cmdflags);
    1.18 +}
    1.19 +
    1.20 +bool ConCmdManager::CheckAdminCommandAccess(AdminId adm, const char *cmd, FlagBits cmdflags)
    1.21 +{
    1.22  	if (adm != INVALID_ADMIN_ID)
    1.23  	{
    1.24  		FlagBits bits = g_Admins.GetAdminFlags(adm, Access_Effective);
    1.25 @@ -524,7 +528,7 @@
    1.26  
    1.27  bool ConCmdManager::CheckAccess(int client, const char *cmd, AdminCmdInfo *pAdmin)
    1.28  {
    1.29 -	if (CheckCommandAccess(client, cmd, pAdmin->eflags))
    1.30 +	if (CheckClientCommandAccess(client, cmd, pAdmin->eflags))
    1.31  	{
    1.32  		return true;
    1.33  	}