UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #14 from psychonic/rip-magic

Browse Source 
Replace magic numbers for sm_show_activity with named constants (r=asherkin).
This commit is contained in:
Asher Baker 2014-05-29 19:06:22 +01:00
commit ab68e70998
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
core/logic/smn_players.cpp
View File

@ -43,6 +43,13 @@
using namespace SourceHook; using namespace SourceHook;
using namespace SourceMod; using namespace SourceMod;
static const int kActivityNone = 0;
static const int kActivityNonAdmins = 1; // Show admin activity to non-admins anonymously.
static const int kActivityNonAdminsNames = 2; // If 1 is specified, admin names will be shown.
static const int kActivityAdmins = 4; // Show admin activity to admins anonymously.
static const int kActivityAdminsNames = 8; // If 4 is specified, admin names will be shown.
static const int kActivityRootNames = 16; // Always show admin names to root users.
class PlayerLogicHelpers : class PlayerLogicHelpers :
public SMGlobalClass, public SMGlobalClass,
public IPluginsListener, public IPluginsListener,
@ -1035,7 +1042,7 @@ static cell_t _ShowActivity(IPluginContext *pContext,
smcore.ConPrint(message); smcore.ConPrint(message);
} }
if (!value) if (value == kActivityNone)
{ {
return 1; return 1;
} }
@ -1056,10 +1063,10 @@ static cell_t _ShowActivity(IPluginContext *pContext,
|| !adminsys->GetAdminFlag(id, Admin_Generic, Access_Effective)) || !adminsys->GetAdminFlag(id, Admin_Generic, Access_Effective))
{ {
/* Treat this as a normal user */ /* Treat this as a normal user */
if ((value & 1) || (value & 2)) if ((value & kActivityNonAdmins) || (value & kActivityNonAdminsNames))
{ {
const char *newsign = sign; const char *newsign = sign;
if ((value & 2) || (i == client)) if ((value & kActivityNonAdminsNames) || (i == client))
{ {
newsign = name; newsign = name;
} }
@ -1078,12 +1085,12 @@ static cell_t _ShowActivity(IPluginContext *pContext,
{ {
/* Treat this as an admin user */ /* Treat this as an admin user */
bool is_root = adminsys->GetAdminFlag(id, Admin_Root, Access_Effective); bool is_root = adminsys->GetAdminFlag(id, Admin_Root, Access_Effective);
if ((value & 4) if ((value & kActivityAdmins)
|| (value & 8) || (value & kActivityAdminsNames)
|| ((value & 16) && is_root)) || ((value & kActivityRootNames) && is_root))
{ {
const char *newsign = sign; const char *newsign = sign;
if ((value & 8) || ((value & 16) && is_root) || (i == client)) if ((value & kActivityAdminsNames) || ((value & kActivityRootNames) && is_root) || (i == client))
{ {
newsign = name; newsign = name;
} }
@ -1160,7 +1167,7 @@ static cell_t _ShowActivity2(IPluginContext *pContext,
smcore.ConPrint(message); smcore.ConPrint(message);
} }
if (!value) if (value == kActivityNone)
{ {
return 1; return 1;
} }
@ -1181,10 +1188,10 @@ static cell_t _ShowActivity2(IPluginContext *pContext,
|| !adminsys->GetAdminFlag(id, Admin_Generic, Access_Effective)) || !adminsys->GetAdminFlag(id, Admin_Generic, Access_Effective))
{ {
/* Treat this as a normal user */ /* Treat this as a normal user */
if ((value & 1) || (value & 2)) if ((value & kActivityNonAdmins) || (value & kActivityNonAdminsNames))
{ {
const char *newsign = sign; const char *newsign = sign;
if ((value & 2)) if ((value & kActivityNonAdminsNames))
{ {
newsign = name; newsign = name;
} }
@ -1203,12 +1210,12 @@ static cell_t _ShowActivity2(IPluginContext *pContext,
{ {
/* Treat this as an admin user */ /* Treat this as an admin user */
bool is_root = adminsys->GetAdminFlag(id, Admin_Root, Access_Effective); bool is_root = adminsys->GetAdminFlag(id, Admin_Root, Access_Effective);
if ((value & 4) if ((value & kActivityAdmins)
|| (value & 8) || (value & kActivityAdminsNames)
|| ((value & 16) && is_root)) || ((value & kActivityRootNames) && is_root))
{ {
const char *newsign = sign; const char *newsign = sign;
if ((value & 8) || ((value & 16) && is_root)) if ((value & kActivityAdminsNames) || ((value & kActivityRootNames) && is_root))
{ {
newsign = name; newsign = name;
} }
@ -1475,7 +1482,7 @@ static cell_t FormatActivitySource(IPluginContext *pContext, const cell_t *param
|| !adminsys->GetAdminFlag(aidTarget, Admin_Generic, Access_Effective)) || !adminsys->GetAdminFlag(aidTarget, Admin_Generic, Access_Effective))
{ {
/* Treat this as a normal user */ /* Treat this as a normal user */
if ((value & 1) || (value & 2)) if ((value & kActivityNonAdmins) || (value & kActivityNonAdminsNames))
{ {
if ((value & 2) || (target == client)) if ((value & 2) || (target == client))
{ {
@ -1488,11 +1495,11 @@ static cell_t FormatActivitySource(IPluginContext *pContext, const cell_t *param
{ {
/* Treat this as an admin user */ /* Treat this as an admin user */
bool is_root = adminsys->GetAdminFlag(aidTarget, Admin_Root, Access_Effective); bool is_root = adminsys->GetAdminFlag(aidTarget, Admin_Root, Access_Effective);
if ((value & 4) if ((value & kActivityAdmins)
|| (value & 8) || (value & kActivityAdminsNames)
|| ((value & 16) && is_root)) || ((value & kActivityRootNames) && is_root))
{ {
if ((value & 8) || ((value & 16) && is_root) || (target == client)) if ((value & kActivityAdminsNames) || ((value & kActivityRootNames) && is_root) || (target == client))
{ {
mode = 0; mode = 0;
} }