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

Added alive checks before adding certain player lists to the admin menu

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401632
This commit is contained in:
Matt Woodrow
2007-10-22 02:05:51 +00:00
parent ef6da943d6
commit f3e7bf4a16
13 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/adminmenu.sp
+7 -2
View File
@@ -171,7 +171,7 @@ public __GetAdminTopMenu(Handle:plugin, numParams)
public __AddTargetsToMenu(Handle:plugin, numParams)
{
return UTIL_AddTargetsToMenu(GetNativeCell(1), GetNativeCell(2), GetNativeCell(3));
return UTIL_AddTargetsToMenu(GetNativeCell(1), GetNativeCell(2), GetNativeCell(3), GetNativeCell(4));
}
public Action:Command_DisplayMenu(client, args)
@@ -187,7 +187,7 @@ public Action:Command_DisplayMenu(client, args)
return Plugin_Handled;
}
stock UTIL_AddTargetsToMenu(Handle:menu, source_client, bool:in_game_only)
stock UTIL_AddTargetsToMenu(Handle:menu, source_client, bool:in_game_only, bool:alive_only)
{
new max_clients = GetMaxClients();
decl String:user_id[12];
@@ -208,6 +208,11 @@ stock UTIL_AddTargetsToMenu(Handle:menu, source_client, bool:in_game_only)
continue;
}
if (alive_only && !IsPlayerAlive(i))
{
continue;
}
if (source_client && !CanUserTarget(source_client, i))
{
continue;
plugins/basebans/ban.sp
+1 -1
View File
@@ -40,7 +40,7 @@ DisplayBanTargetMenu(client)
SetMenuTitle(menu, title);
SetMenuExitBackButton(menu, true);
AddTargetsToMenu(menu, client, false);
AddTargetsToMenu(menu, client, false, false);
DisplayMenu(menu, client, MENU_TIME_FOREVER);
}
plugins/basecomm/gag.sp
+1 -1
View File
@@ -59,7 +59,7 @@ DisplayGagPlayerMenu(client)
SetMenuTitle(menu, title);
SetMenuExitBackButton(menu, true);
AddTargetsToMenu(menu, client, false);
AddTargetsToMenu(menu, client, false, false);
DisplayMenu(menu, client, MENU_TIME_FOREVER);
}
plugins/basecommands/kick.sp
+1 -1
View File
@@ -22,7 +22,7 @@ DisplayKickMenu(client)
SetMenuTitle(menu, title);
SetMenuExitBackButton(menu, true);
AddTargetsToMenu(menu, client, false);
AddTargetsToMenu(menu, client, false, false);
DisplayMenu(menu, client, MENU_TIME_FOREVER);
}
plugins/basecommands/who.sp
+1 -1
View File
@@ -57,7 +57,7 @@ DisplayWhoMenu(client)
SetMenuTitle(menu, title);
SetMenuExitBackButton(menu, true);
AddTargetsToMenu(menu, client, false);
AddTargetsToMenu(menu, client, false, false);
DisplayMenu(menu, client, MENU_TIME_FOREVER);
}
plugins/basefuncommands/burn.sp
+1 -1
View File
@@ -13,7 +13,7 @@ DisplayBurnMenu(client)
SetMenuTitle(menu, title);
SetMenuExitBackButton(menu, true);
AddTargetsToMenu(menu, client, false);
AddTargetsToMenu(menu, client, false, true);
DisplayMenu(menu, client, MENU_TIME_FOREVER);
}
plugins/basefuncommands/slap.sp
+1 -1
View File
@@ -33,7 +33,7 @@ DisplaySlapTargetMenu(client)
SetMenuTitle(menu, title);
SetMenuExitBackButton(menu, true);
AddTargetsToMenu(menu, client, false);
AddTargetsToMenu(menu, client, false, true);
DisplayMenu(menu, client, MENU_TIME_FOREVER);
}
plugins/basefuncommands/slay.sp
+1 -1
View File
@@ -14,7 +14,7 @@ DisplaySlayMenu(client)
SetMenuTitle(menu, title);
SetMenuExitBackButton(menu, true);
AddTargetsToMenu(menu, client, false);
AddTargetsToMenu(menu, client, false, true);
DisplayMenu(menu, client, MENU_TIME_FOREVER);
}
plugins/basefunvotes/voteburn.sp
+1 -1
View File
@@ -31,7 +31,7 @@ DisplayBurnTargetMenu(client)
SetMenuTitle(menu, title);
SetMenuExitBackButton(menu, true);
AddTargetsToMenu(menu, client, false);
AddTargetsToMenu(menu, client, false, true);
DisplayMenu(menu, client, MENU_TIME_FOREVER);
}
plugins/basefunvotes/voteslay.sp
+1 -1
View File
@@ -32,7 +32,7 @@ DisplaySlayTargetMenu(client)
SetMenuTitle(menu, title);
SetMenuExitBackButton(menu, true);
AddTargetsToMenu(menu, client, false);
AddTargetsToMenu(menu, client, false, true);
DisplayMenu(menu, client, MENU_TIME_FOREVER);
}
plugins/basevotes/voteban.sp
+1 -1
View File
@@ -30,7 +30,7 @@ DisplayBanTargetMenu(client)
SetMenuTitle(menu, title);
SetMenuExitBackButton(menu, true);
AddTargetsToMenu(menu, client, false);
AddTargetsToMenu(menu, client, false, false);
DisplayMenu(menu, client, MENU_TIME_FOREVER);
}
plugins/basevotes/votekick.sp
+1 -1
View File
@@ -29,7 +29,7 @@ DisplayKickTargetMenu(client)
SetMenuTitle(menu, title);
SetMenuExitBackButton(menu, true);
AddTargetsToMenu(menu, client, false);
AddTargetsToMenu(menu, client, false, false);
DisplayMenu(menu, client, MENU_TIME_FOREVER);
}
plugins/include/adminmenu.inc
+2 -1
View File
@@ -91,9 +91,10 @@ native Handle:GetAdminTopMenu();
* @param menu Menu Handle.
* @param source_client Source client, or 0 to ignore immunity.
* @param in_game_only True to only select in-game players.
* @param alive_only True to only select alive players.
* @return Number of clients added.
*/
native AddTargetsToMenu(Handle:menu, source_client, bool:in_game_only=true);
native AddTargetsToMenu(Handle:menu, source_client, bool:in_game_only=true, bool:alive_only=false);
/**
* Re-displays the admin menu to a client after selecting an item.