Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added some defines for cmd_target's filter system (for less cryptic code)

Browse Source 
Changed all immunity obeying commands to allow for self execution - amb633
This commit is contained in:
Steve Dudenhoeffer 2007-07-25 18:10:08 +00:00
parent 7c642fbf6e
commit d836aeb716
6 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/admin.sma
View File

@ -164,7 +164,7 @@ public addadminfn(id, level, cid)
if (containi(arg, "STEAM_0:") == -1) if (containi(arg, "STEAM_0:") == -1)
{ {
idtype |= ADMIN_LOOKUP idtype |= ADMIN_LOOKUP
player = cmd_target(id, arg, 10) player = cmd_target(id, arg, CMDTARGET_ALLOW_SELF | CMDTARGET_NO_BOTS)
} else { } else {
new _steamid[44] new _steamid[44]
static _players[32], _num, _pv static _players[32], _num, _pv
@ -189,7 +189,7 @@ public addadminfn(id, level, cid)
} }
else if (idtype & ADMIN_NAME) else if (idtype & ADMIN_NAME)
{ {
player = cmd_target(id, arg, 10) player = cmd_target(id, arg, CMDTARGET_ALLOW_SELF | CMDTARGET_NO_BOTS)
if (player) if (player)
idtype |= ADMIN_LOOKUP idtype |= ADMIN_LOOKUP

13
plugins/admincmd.sma
View File

@ -109,7 +109,7 @@ public cmdKick(id, level, cid)
new arg[32] new arg[32]
read_argv(1, arg, 31) read_argv(1, arg, 31)
new player = cmd_target(id, arg, 1) new player = cmd_target(id, arg, CMDTARGET_OBEY_IMMUNITY | CMDTARGET_ALLOW_SELF)
if (!player) if (!player)
return PLUGIN_HANDLED return PLUGIN_HANDLED
@ -212,7 +212,7 @@ public cmdBan(id, level, cid)
read_argv(2, minutes, 7) read_argv(2, minutes, 7)
read_argv(3, reason, 63) read_argv(3, reason, 63)
new player = cmd_target(id, target, 9) new player = cmd_target(id, target, CMDTARGET_OBEY_IMMUNITY | CMDTARGET_NO_BOTS | CMDTARGET_ALLOW_SELF)
if (!player) if (!player)
return PLUGIN_HANDLED return PLUGIN_HANDLED
@ -280,10 +280,11 @@ public cmdBanIP(id, level, cid)
read_argv(2, minutes, 7) read_argv(2, minutes, 7)
read_argv(3, reason, 63) read_argv(3, reason, 63)
new player = cmd_target(id, target, 9) new player = cmd_target(id, target, CMDTARGET_OBEY_IMMUNITY | CMDTARGET_NO_BOTS | CMDTARGET_ALLOW_SELF)
if (!player) if (!player)
{ {
// why is this here?
player = cmd_target(id, target, 9); player = cmd_target(id, target, 9);
return PLUGIN_HANDLED return PLUGIN_HANDLED
} }
@ -350,7 +351,7 @@ public cmdSlay(id, level, cid)
read_argv(1, arg, 31) read_argv(1, arg, 31)
new player = cmd_target(id, arg, 5) new player = cmd_target(id, arg, CMDTARGET_OBEY_IMMUNITY | CMDTARGET_ALLOW_SELF | CMDTARGET_ONLY_ALIVE)
if (!player) if (!player)
return PLUGIN_HANDLED return PLUGIN_HANDLED
@ -381,7 +382,7 @@ public cmdSlap(id, level, cid)
new arg[32] new arg[32]
read_argv(1, arg, 31) read_argv(1, arg, 31)
new player = cmd_target(id, arg, 5) new player = cmd_target(id, arg, CMDTARGET_OBEY_IMMUNITY | CMDTARGET_ALLOW_SELF | CMDTARGET_ONLY_ALIVE)
if (!player) if (!player)
return PLUGIN_HANDLED return PLUGIN_HANDLED
@ -901,7 +902,7 @@ public cmdNick(id, level, cid)
read_argv(1, arg1, 31) read_argv(1, arg1, 31)
read_argv(2, arg2, 31) read_argv(2, arg2, 31)
new player = cmd_target(id, arg1, 1) new player = cmd_target(id, arg1, CMDTARGET_OBEY_IMMUNITY | CMDTARGET_ALLOW_SELF)
if (!player) if (!player)
return PLUGIN_HANDLED return PLUGIN_HANDLED

2
plugins/adminvote.sma
View File

@ -466,7 +466,7 @@ public cmdVoteKickBan(id, level, cid)
new arg[32] new arg[32]
read_argv(1, arg, 31) read_argv(1, arg, 31)
new player = cmd_target(id, arg, 1) new player = cmd_target(id, arg, CMDTARGET_OBEY_IMMUNITY | CMDTARGET_ALLOW_SELF)
if (!player) if (!player)
return PLUGIN_HANDLED return PLUGIN_HANDLED

3
plugins/dlsym.c
View File

@ -37,7 +37,6 @@ int main(int argc, char **argv)
} else { } else {
printf("Shared module failed to load: %s\n", dlerror()); printf("Shared module failed to load: %s\n", dlerror());
} }
return 0;
exit(0);
} }

15
plugins/include/amxmisc.inc
View File

@ -99,7 +99,11 @@ stock access(id,level)
* 2 - allow yourself * 2 - allow yourself
* 4 - must be alive * 4 - must be alive
* 8 - can't be bot */ * 8 - can't be bot */
stock cmd_target(id,const arg[],flags = 1) #define CMDTARGET_OBEY_IMMUNITY (1<<0)
#define CMDTARGET_ALLOW_SELF (1<<1)
#define CMDTARGET_ONLY_ALIVE (1<<2)
#define CMDTARGET_NO_BOTS (1<<3)
stock cmd_target(id,const arg[],flags = CMDTARGET_OBEY_IMMUNITY)
{ {
new player = find_player("bl",arg); new player = find_player("bl",arg);
if (player) if (player)
@ -127,9 +131,10 @@ stock cmd_target(id,const arg[],flags = 1)
#endif #endif
return 0; return 0;
} }
if (flags & 1) if (flags & CMDTARGET_OBEY_IMMUNITY)
{ {
if ((get_user_flags(player)&ADMIN_IMMUNITY) && ((flags&2)?(id!=player):true) ) if ((get_user_flags(player) & ADMIN_IMMUNITY) &&
((flags & CMDTARGET_ALLOW_SELF) ? (id != player) : true) )
{ {
new imname[32]; new imname[32];
get_user_name(player,imname,31); get_user_name(player,imname,31);
@ -141,7 +146,7 @@ stock cmd_target(id,const arg[],flags = 1)
return 0; return 0;
} }
} }
if (flags & 4) if (flags & CMDTARGET_ONLY_ALIVE)
{ {
if (!is_user_alive(player)) if (!is_user_alive(player))
{ {
@ -155,7 +160,7 @@ stock cmd_target(id,const arg[],flags = 1)
return 0; return 0;
} }
} }
if (flags & 8) if (flags & CMDTARGET_NO_BOTS)
{ {
if (is_user_bot(player)) if (is_user_bot(player))
{ {

8
plugins/ns/nscommands.sma
View File

@ -165,7 +165,7 @@ public cmdRandom(id,level,cid) {
if (read_argc()>1) { // person is specified.. if (read_argc()>1) { // person is specified..
new arg[32] new arg[32]
read_argv(1,arg,31) read_argv(1,arg,31)
new player = cmd_target(id,arg,1) new player = cmd_target(id,arg,CMDTARGET_OBEY_IMMUNITY | CMDTARGET_ALLOW_SELF)
if (!player) return PLUGIN_HANDLED if (!player) return PLUGIN_HANDLED
new name[32],name_targ[32]; new name[32],name_targ[32];
new auth[32],auth_targ[32]; new auth[32],auth_targ[32];
@ -231,7 +231,7 @@ public cmdReadyRoom(id,level,cid) {
if (read_argc()>1) { // person is specified.. if (read_argc()>1) { // person is specified..
new arg[32] new arg[32]
read_argv(1,arg,31) read_argv(1,arg,31)
new player = cmd_target(id,arg,1) new player = cmd_target(id,arg,CMDTARGET_OBEY_IMMUNITY | CMDTARGET_ALLOW_SELF)
if (!player) return PLUGIN_HANDLED if (!player) return PLUGIN_HANDLED
new name[32],name_targ[32]; new name[32],name_targ[32];
new auth[32],auth_targ[32]; new auth[32],auth_targ[32];
@ -294,7 +294,7 @@ public cmdTeamTwo(id,level,cid) {
if (read_argc()>1) { // person is specified.. if (read_argc()>1) { // person is specified..
new arg[32] new arg[32]
read_argv(1,arg,31) read_argv(1,arg,31)
new player = cmd_target(id,arg,1) new player = cmd_target(id,arg,CMDTARGET_OBEY_IMMUNITY | CMDTARGET_ALLOW_SELF)
if (!player) return PLUGIN_HANDLED if (!player) return PLUGIN_HANDLED
if (g_Team[player]==2 || g_Team[player]==4 /*i think 4 is team 2 in ava..*/) { if (g_Team[player]==2 || g_Team[player]==4 /*i think 4 is team 2 in ava..*/) {
client_print(id,print_chat,"[AMXX] That user is already on team two."); client_print(id,print_chat,"[AMXX] That user is already on team two.");
@ -322,7 +322,7 @@ public cmdTeamOne(id,level,cid) {
if (read_argc()>1) { // person is specified.. if (read_argc()>1) { // person is specified..
new arg[32] new arg[32]
read_argv(1,arg,31) read_argv(1,arg,31)
new player = cmd_target(id,arg,1) new player = cmd_target(id,arg,CMDTARGET_OBEY_IMMUNITY | CMDTARGET_ALLOW_SELF)
if (!player) return PLUGIN_HANDLED if (!player) return PLUGIN_HANDLED
if (g_Team[player]==1 || g_Team[player]==3 /*i think 3 is team 2 in mvm..*/) { if (g_Team[player]==1 || g_Team[player]==3 /*i think 3 is team 2 in mvm..*/) {
client_print(id,print_chat,"[AMXX] That user is already on team one."); client_print(id,print_chat,"[AMXX] That user is already on team one.");