From 45ad8f9d1ad4c9f12cc2fae091231f49ce01fe08 Mon Sep 17 00:00:00 2001 From: OciXCrom Date: Sat, 10 Feb 2018 18:51:11 +0100 Subject: [PATCH] Updated plugins --- plugins/admincmd.sma | 4 ++-- plugins/dod/plmenu.sma | 15 ++++++++++----- plugins/ns/nscommands.sma | 4 +++- plugins/ns/plmenu.sma | 15 ++++++++++----- plugins/plmenu.sma | 15 ++++++++++----- plugins/telemenu.sma | 3 ++- plugins/tfc/plmenu.sma | 15 ++++++++++----- 7 files changed, 47 insertions(+), 24 deletions(-) diff --git a/plugins/admincmd.sma b/plugins/admincmd.sma index 843d8664..e59bd452 100755 --- a/plugins/admincmd.sma +++ b/plugins/admincmd.sma @@ -342,7 +342,7 @@ public cmdAddBan(id, level, cid) if (equal(IP, arg)) { - if (Access & ADMIN_IMMUNITY) + if (Access & ADMIN_IMMUNITY && !(get_user_flags(id) & ADMIN_SUPER)) { console_print(id, "[AMXX] %s : %L", IP, id, "CLIENT_IMM", Name); @@ -365,7 +365,7 @@ public cmdAddBan(id, level, cid) if (equal(Auth, arg)) { - if (Access & ADMIN_IMMUNITY) + if (Access & ADMIN_IMMUNITY && !(get_user_flags(id) & ADMIN_SUPER)) { console_print(id, "[AMXX] %s : %L", Auth, id, "CLIENT_IMM", Name); diff --git a/plugins/dod/plmenu.sma b/plugins/dod/plmenu.sma index 23a84518..91074e14 100755 --- a/plugins/dod/plmenu.sma +++ b/plugins/dod/plmenu.sma @@ -203,6 +203,7 @@ displayBanMenu(id,pos) new end = start + 7 new keys = MENU_KEY_0|MENU_KEY_8 + new bool:super = bool:(get_user_flags(id) & ADMIN_SUPER) if (end > g_menuPlayersNum[id]) end = g_menuPlayersNum[id] @@ -212,7 +213,7 @@ displayBanMenu(id,pos) i = g_menuPlayers[id][a] get_user_name(i, name, charsmax(name)) - if (is_user_bot(i) || access(i, ADMIN_IMMUNITY)) + if (is_user_bot(i) || (access(i, ADMIN_IMMUNITY) && !super)) { ++b @@ -341,6 +342,7 @@ displaySlapMenu(id,pos) new end = start + 7 new keys = MENU_KEY_0|MENU_KEY_8 + new bool:super = bool:(get_user_flags(id) & ADMIN_SUPER) if (end > g_menuPlayersNum[id]) end = g_menuPlayersNum[id] @@ -350,7 +352,7 @@ displaySlapMenu(id,pos) get_user_name(i,name,charsmax(name)) get_user_team(i,team,charsmax(team)) - if (!is_user_alive(i) || access(i, ADMIN_IMMUNITY)) + if (!is_user_alive(i) || (access(i, ADMIN_IMMUNITY) && !super)) { ++b @@ -450,6 +452,7 @@ displayKickMenu(id, pos) new end = start + 8 new keys = MENU_KEY_0 + new bool:super = bool:(get_user_flags(id) & ADMIN_SUPER) if (end > g_menuPlayersNum[id]) end = g_menuPlayersNum[id] @@ -459,7 +462,7 @@ displayKickMenu(id, pos) i = g_menuPlayers[id][a] get_user_name(i, name, charsmax(name)) - if (access(i, ADMIN_IMMUNITY)) + if (access(i, ADMIN_IMMUNITY) && !super) { ++b @@ -551,6 +554,7 @@ displayTeamMenu(id, pos) new end = start + 7 new keys = MENU_KEY_0|MENU_KEY_8 + new bool:super = bool:(get_user_flags(id) & ADMIN_SUPER) if (end > g_menuPlayersNum[id]) end = g_menuPlayersNum[id] @@ -561,7 +565,7 @@ displayTeamMenu(id, pos) get_user_name(i, name, charsmax(name)) iteam = get_user_team(i, team, charsmax(team)) - if ((iteam == (g_menuOption[id] ? 1 : 2)) || access(i, ADMIN_IMMUNITY)) + if ((iteam == (g_menuOption[id] ? 1 : 2)) || (access(i, ADMIN_IMMUNITY) && !super)) { ++b @@ -660,6 +664,7 @@ displayClcmdMenu(id, pos) new end = start + 7 new keys = MENU_KEY_0|MENU_KEY_8 + new bool:super = bool:(get_user_flags(id) & ADMIN_SUPER) if (end > g_menuPlayersNum[id]) end = g_menuPlayersNum[id] @@ -669,7 +674,7 @@ displayClcmdMenu(id, pos) i = g_menuPlayers[id][a] get_user_name(i, name, charsmax(name)) - if (!g_menuSelectNum[id] || access(i, ADMIN_IMMUNITY)) + if (!g_menuSelectNum[id] || (access(i, ADMIN_IMMUNITY) && !super)) { ++b diff --git a/plugins/ns/nscommands.sma b/plugins/ns/nscommands.sma index f65b2bca..747b57bb 100755 --- a/plugins/ns/nscommands.sma +++ b/plugins/ns/nscommands.sma @@ -149,9 +149,11 @@ public cmdRandom(id,level,cid) { else { new cur=0; new i=1; + new bool:super = bool:(get_user_flags(id) & ADMIN_SUPER) + while (i g_menuPlayersNum[id]) end = g_menuPlayersNum[id] @@ -395,7 +396,7 @@ displayBanMenu(id, pos) i = g_menuPlayers[id][a] get_user_name(i, name, charsmax(name)) - if (is_user_bot(i) || access(i, ADMIN_IMMUNITY)) + if (is_user_bot(i) || (access(i, ADMIN_IMMUNITY) && !super)) { ++b @@ -527,6 +528,7 @@ displaySlapMenu(id, pos) new len = format(menuBody, charsmax(menuBody), "%L %d/%d^n^n", id, "SLAP_SLAY_MENU", pos + 1, (g_menuPlayersNum[id] / 7 + ((g_menuPlayersNum[id] % 7) ? 1 : 0))) new end = start + 7 new keys = MENU_KEY_0|MENU_KEY_8 + new bool:super = bool:(get_user_flags(id) & ADMIN_SUPER) if (end > g_menuPlayersNum[id]) end = g_menuPlayersNum[id] @@ -538,7 +540,7 @@ displaySlapMenu(id, pos) get_user_team(i, team, charsmax(team)) - if (!is_user_alive(i) || access(i, ADMIN_IMMUNITY)) + if (!is_user_alive(i) || (access(i, ADMIN_IMMUNITY) && !super)) { ++b @@ -644,6 +646,7 @@ displayKickMenu(id, pos) new len = format(menuBody, charsmax(menuBody), "%L %d/%d^n^n", id, "KICK_MENU", pos + 1, (g_menuPlayersNum[id] / 8 + ((g_menuPlayersNum[id] % 8) ? 1 : 0))) new end = start + 8 new keys = MENU_KEY_0 + new bool:super = bool:(get_user_flags(id) & ADMIN_SUPER) if (end > g_menuPlayersNum[id]) end = g_menuPlayersNum[id] @@ -653,7 +656,7 @@ displayKickMenu(id, pos) i = g_menuPlayers[id][a] get_user_name(i, name, charsmax(name)) - if (access(i, ADMIN_IMMUNITY)) + if (access(i, ADMIN_IMMUNITY) && !super) { ++b @@ -748,6 +751,7 @@ displayTeamMenu(id, pos) new len = format(menuBody, charsmax(menuBody), "%L %d/%d^n^n", id, "TEAM_MENU", pos + 1, (g_menuPlayersNum[id] / 7 + ((g_menuPlayersNum[id] % 7) ? 1 : 0))) new end = start + 7 new keys = MENU_KEY_0|MENU_KEY_8 + new bool:super = bool:(get_user_flags(id) & ADMIN_SUPER) if (end > g_menuPlayersNum[id]) end = g_menuPlayersNum[id] @@ -759,7 +763,7 @@ displayTeamMenu(id, pos) iteam = GetNSTeam(i, team, charsmax(team)) - if (iteam == g_menuOption[id] || access(i, ADMIN_IMMUNITY)) + if (iteam == g_menuOption[id] || (access(i, ADMIN_IMMUNITY) && !super)) { ++b @@ -866,6 +870,7 @@ displayClcmdMenu(id, pos) new len = format(menuBody, charsmax(menuBody), "%L %d/%d^n^n", id, "CL_CMD_MENU", pos + 1, (g_menuPlayersNum[id] / 7 + ((g_menuPlayersNum[id] % 7) ? 1 : 0))) new end = start + 7 new keys = MENU_KEY_0|MENU_KEY_8 + new bool:super = bool:(get_user_flags(id) & ADMIN_SUPER) if (end > g_menuPlayersNum[id]) end = g_menuPlayersNum[id] @@ -875,7 +880,7 @@ displayClcmdMenu(id, pos) i = g_menuPlayers[id][a] get_user_name(i, name, charsmax(name)) - if (!g_menuSelectNum[id] || access(i, ADMIN_IMMUNITY)) + if (!g_menuSelectNum[id] || (access(i, ADMIN_IMMUNITY) && !super)) { ++b diff --git a/plugins/plmenu.sma b/plugins/plmenu.sma index bf96d873..f0acef0f 100755 --- a/plugins/plmenu.sma +++ b/plugins/plmenu.sma @@ -345,6 +345,7 @@ displayBanMenu(id, pos) new len = formatex(menuBody, charsmax(menuBody), g_coloredMenus ? "\y%L\R%d/%d^n\w^n" : "%L %d/%d^n^n", id, "BAN_MENU", pos + 1, (g_menuPlayersNum[id] / 7 + ((g_menuPlayersNum[id] % 7) ? 1 : 0))); new end = start + 7; new keys = MENU_KEY_0|MENU_KEY_8; + new bool:super = bool:(get_user_flags(id) & ADMIN_SUPER) if (end > g_menuPlayersNum[id]) { @@ -356,7 +357,7 @@ displayBanMenu(id, pos) i = g_menuPlayers[id][a]; get_user_name(i, name, charsmax(name)); - if (is_user_bot(i) || (access(i, ADMIN_IMMUNITY) && i != id)) + if (is_user_bot(i) || (access(i, ADMIN_IMMUNITY) && i != id && !super)) { ++b; @@ -521,6 +522,7 @@ displaySlapMenu(id, pos) new len = formatex(menuBody, charsmax(menuBody), g_coloredMenus ? "\y%L\R%d/%d^n\w^n" : "%L %d/%d^n^n", id, "SLAP_SLAY_MENU", pos + 1, (g_menuPlayersNum[id] / 7 + ((g_menuPlayersNum[id] % 7) ? 1 : 0))); new end = start + 7; new keys = MENU_KEY_0|MENU_KEY_8; + new bool:super = bool:(get_user_flags(id) & ADMIN_SUPER); if (end > g_menuPlayersNum[id]) { @@ -552,7 +554,7 @@ displaySlapMenu(id, pos) get_user_team(i, team, charsmax(team)); } - if (!is_user_alive(i) || (access(i, ADMIN_IMMUNITY) && i != id)) + if (!is_user_alive(i) || (access(i, ADMIN_IMMUNITY) && i != id && !super)) { ++b; @@ -688,6 +690,7 @@ displayKickMenu(id, pos) new len = formatex(menuBody, charsmax(menuBody), g_coloredMenus ? "\y%L\R%d/%d^n\w^n" : "%L %d/%d^n^n", id, "KICK_MENU", pos + 1, (g_menuPlayersNum[id] / 8 + ((g_menuPlayersNum[id] % 8) ? 1 : 0))); new end = start + 8; new keys = MENU_KEY_0; + new bool:super = bool:(get_user_flags(id) & ADMIN_SUPER); if (end > g_menuPlayersNum[id]) { @@ -699,7 +702,7 @@ displayKickMenu(id, pos) i = g_menuPlayers[id][a]; get_user_name(i, name, charsmax(name)); - if (access(i, ADMIN_IMMUNITY) && i != id) + if (access(i, ADMIN_IMMUNITY) && i != id && !super) { ++b; @@ -937,6 +940,7 @@ displayTeamMenu(id, pos) new len = formatex(menuBody, charsmax(menuBody), g_coloredMenus ? "\y%L\R%d/%d^n\w^n" : "%L %d/%d^n^n", id, "TEAM_MENU", pos + 1, (g_menuPlayersNum[id] / 6 + ((g_menuPlayersNum[id] % 6) ? 1 : 0))); new end = start + 6; new keys = MENU_KEY_0|MENU_KEY_7|MENU_KEY_8; + new bool:super = bool:(get_user_flags(id) & ADMIN_SUPER); if (end > g_menuPlayersNum[id]) { @@ -979,7 +983,7 @@ displayTeamMenu(id, pos) iteam = 3; // fix get_user_team returning 0 on spectators } - if ((iteam == g_CSTeamiNumbers[g_menuOption[id] % 3]) || (access(i, ADMIN_IMMUNITY) && i != id)) + if ((iteam == g_CSTeamiNumbers[g_menuOption[id] % 3]) || (access(i, ADMIN_IMMUNITY) && i != id && !super)) { ++b; @@ -1121,6 +1125,7 @@ displayClcmdMenu(id, pos) new len = formatex(menuBody, charsmax(menuBody), g_coloredMenus ? "\y%L\R%d/%d^n\w^n" : "%L %d/%d^n^n", id, "CL_CMD_MENU", pos + 1, (g_menuPlayersNum[id] / 7 + ((g_menuPlayersNum[id] % 7) ? 1 : 0))); new end = start + 7; new keys = MENU_KEY_0|MENU_KEY_8; + new bool:super = bool:(get_user_flags(id) & ADMIN_SUPER); if (end > g_menuPlayersNum[id]) { @@ -1132,7 +1137,7 @@ displayClcmdMenu(id, pos) i = g_menuPlayers[id][a]; get_user_name(i, name, charsmax(name)); - if (!g_menuSelectNum[id] || (access(i, ADMIN_IMMUNITY) && i != id)) + if (!g_menuSelectNum[id] || (access(i, ADMIN_IMMUNITY) && i != id && !super)) { ++b; diff --git a/plugins/telemenu.sma b/plugins/telemenu.sma index 37fc8208..64cb6dc3 100755 --- a/plugins/telemenu.sma +++ b/plugins/telemenu.sma @@ -166,6 +166,7 @@ displayTelMenu(id, pos) new len = formatex(menuBody, charsmax(menuBody), g_coloredMenus ? "\y%L\R%d/%d^n\w^n" : "%L %d/%d^n^n", id, "TELE_MENU", pos + 1, (g_menuPlayersNum[id] / 6 + ((g_menuPlayersNum[id] % 6) ? 1 : 0))) new end = start + 6 new keys = MENU_KEY_0|MENU_KEY_8 + new bool:super = bool:(get_user_flags(id) & ADMIN_SUPER) if (end > g_menuPlayersNum[id]) end = g_menuPlayersNum[id] @@ -175,7 +176,7 @@ displayTelMenu(id, pos) i = g_menuPlayers[id][a] get_user_name(i, name, charsmax(name)) - if (blockMenu || !is_user_alive(i) || (id != i && get_user_flags(i) & ADMIN_IMMUNITY)) + if (blockMenu || !is_user_alive(i) || (id != i && (get_user_flags(i) & ADMIN_IMMUNITY) && !super)) { ++b diff --git a/plugins/tfc/plmenu.sma b/plugins/tfc/plmenu.sma index ebaa79ae..e8314ce0 100755 --- a/plugins/tfc/plmenu.sma +++ b/plugins/tfc/plmenu.sma @@ -203,6 +203,7 @@ displayBanMenu(id, pos) new len = format(menuBody, charsmax(menuBody), g_coloredMenus ? "\y%L\R%d/%d^n\w^n" : "%L %d/%d^n^n", id, "BAN_MENU", pos + 1, (g_menuPlayersNum[id] / 7 + ((g_menuPlayersNum[id] % 7) ? 1 : 0))) new end = start + 7 new keys = MENU_KEY_0|MENU_KEY_8 + new bool:super = bool:(get_user_flags(id) & ADMIN_SUPER) if (end > g_menuPlayersNum[id]) end = g_menuPlayersNum[id] @@ -212,7 +213,7 @@ displayBanMenu(id, pos) i = g_menuPlayers[id][a] get_user_name(i, name, charsmax(name)) - if (is_user_bot(i) || access(i, ADMIN_IMMUNITY)) + if (is_user_bot(i) || (access(i, ADMIN_IMMUNITY) && !super)) { ++b @@ -339,6 +340,7 @@ displaySlapMenu(id, pos) new len = format(menuBody, charsmax(menuBody), g_coloredMenus ? "\y%L\R%d/%d^n\w^n" : "%L %d/%d^n^n", id, "SLAP_SLAY_MENU", pos + 1, (g_menuPlayersNum[id] / 7 + ((g_menuPlayersNum[id] % 7) ? 1 : 0))) new end = start + 7 new keys = MENU_KEY_0|MENU_KEY_8 + new bool:super = bool:(get_user_flags(id) & ADMIN_SUPER) if (end > g_menuPlayersNum[id]) end = g_menuPlayersNum[id] @@ -349,7 +351,7 @@ displaySlapMenu(id, pos) get_user_name(i, name, charsmax(name)) new iteam = get_user_team(i) - if (!is_user_alive(i) || access(i, ADMIN_IMMUNITY)) + if (!is_user_alive(i) || (access(i, ADMIN_IMMUNITY) && !super)) { ++b @@ -449,6 +451,7 @@ displayKickMenu(id, pos) new len = format(menuBody, charsmax(menuBody), g_coloredMenus ? "\y%L\R%d/%d^n\w^n" : "%L %d/%d^n^n", id, "KICK_MENU", pos + 1, (g_menuPlayersNum[id] / 8 + ((g_menuPlayersNum[id] % 8) ? 1 : 0))) new end = start + 8 new keys = MENU_KEY_0 + new bool:super = bool:(get_user_flags(id) & ADMIN_SUPER) if (end > g_menuPlayersNum[id]) end = g_menuPlayersNum[id] @@ -458,7 +461,7 @@ displayKickMenu(id, pos) i = g_menuPlayers[id][a] get_user_name(i, name, charsmax(name)) - if (access(i, ADMIN_IMMUNITY)) + if (access(i, ADMIN_IMMUNITY) && !super) { ++b @@ -558,6 +561,7 @@ displayTeamMenu(id, pos) new len = format(menuBody, charsmax(menuBody), g_coloredMenus ? "\y%L\R%d/%d^n\w^n" : "%L %d/%d^n^n", id, "TEAM_MENU", pos + 1, (g_menuPlayersNum[id] / 7 + ((g_menuPlayersNum[id] % 7) ? 1 : 0))) new end = start + 7 new keys = MENU_KEY_0|MENU_KEY_8 + new bool:super = bool:(get_user_flags(id) & ADMIN_SUPER) if (end > g_menuPlayersNum[id]) end = g_menuPlayersNum[id] @@ -568,7 +572,7 @@ displayTeamMenu(id, pos) get_user_name(i, name, charsmax(name)) iteam = get_user_team(i) - if ((iteam == g_menuOption[id]) || access(i, ADMIN_IMMUNITY)) + if ((iteam == g_menuOption[id]) || (access(i, ADMIN_IMMUNITY) && !super)) { ++b @@ -666,6 +670,7 @@ displayClcmdMenu(id, pos) new len = format(menuBody, charsmax(menuBody), g_coloredMenus ? "\y%L\R%d/%d^n\w^n" : "%L %d/%d^n^n", id, "CL_CMD_MENU", pos + 1, (g_menuPlayersNum[id] / 7 + ((g_menuPlayersNum[id] % 7) ? 1 : 0))) new end = start + 7 new keys = MENU_KEY_0|MENU_KEY_8 + new bool:super = bool:(get_user_flags(id) & ADMIN_SUPER) if (end > g_menuPlayersNum[id]) end = g_menuPlayersNum[id] @@ -675,7 +680,7 @@ displayClcmdMenu(id, pos) i = g_menuPlayers[id][a] get_user_name(i, name, charsmax(name)) - if (!g_menuSelectNum[id] || access(i, ADMIN_IMMUNITY)) + if (!g_menuSelectNum[id] || (access(i, ADMIN_IMMUNITY) && !super)) { ++b