fixed per-group command overrides not working
authorDavid Anderson <dvander@alliedmods.net>
Fri Aug 10 05:59:03 2007 +0000 (2007-08-10)
changeset 13002c6b22445149
parent 1299 10f58032bc78
child 1301 a9e6cd2953f2
fixed per-group command overrides not working
core/ConCmdManager.cpp
     1.1 --- a/core/ConCmdManager.cpp	Fri Aug 10 05:08:14 2007 +0000
     1.2 +++ b/core/ConCmdManager.cpp	Fri Aug 10 05:59:03 2007 +0000
     1.3 @@ -356,13 +356,9 @@
     1.4  			return true;
     1.5  		}
     1.6  
     1.7 -		/* See if our other flags match */
     1.8 -		if ((bits & cmdflags) == cmdflags)
     1.9 -		{
    1.10 -			return true;
    1.11 -		}
    1.12 -
    1.13 -		/* Check for overrides */
    1.14 +		/* Check for overrides
    1.15 +		 * :TODO: is it worth optimizing this?
    1.16 +		 */
    1.17  		unsigned int groups = g_Admins.GetAdminGroupCount(adm);
    1.18  		GroupId gid;
    1.19  		OverrideRule rule;
    1.20 @@ -383,10 +379,16 @@
    1.21  				{
    1.22  					return true;
    1.23  				} else if (rule == Command_Deny) {
    1.24 -					break;
    1.25 +					return false;
    1.26  				}
    1.27  			}
    1.28  		}
    1.29 +
    1.30 +		/* See if our other flags match */
    1.31 +		if ((bits & cmdflags) == cmdflags)
    1.32 +		{
    1.33 +			return true;
    1.34 +		}
    1.35  	}
    1.36  
    1.37  	return false;