Added hack to make plugins open a menu with all possible targets on ReplyToTargetError COMMAND_TARGET_AMBIGUOUS.

Explanation:
There are two clients in the server, one named gene, the other one "Ene ~special characters~".
An admin issues "sm_slay Ene" and gets following error message: More than one client matched the given pattern.
What this hack will do is: Use GetCmdArg(0, ...); to get the command name "sm_slay".
Use GetCmdArgString(...); to get the arguments supplied to the command.
Use GetLastProcessTargetString(...); (which was implemented in this commit) to retrieve the arguments that were passed to the last ProcessTargetString call.
It will then pass this data to the DynamicTargeting plugin through its AmbiguousMenu native.
The plugin will open up a menu on the client and list all targets which match the pattern that was supplied to ProcessTargetString.
If the client selects a menu entry, FakeClientCommand will be used to re-execute the command with the correct target.

.gitattributes

@@ -1,12 +0,0 @@
-# GitHub views all .h files as C, let's assume it's C++
-*.h linguist-language=c++
-
-# Internal tools overriding
-tools/* linguist-vendored
-editor/* linguist-vendored
-
-# Third-party overriding 
-extensions/curl/curl-src/* linguist-vendored
-extensions/geoip/GeoIP.c linguist-vendored
-extensions/geoip/GeoIP.h linguist-vendored
-extensions/sqlite/sqlite-source/* linguist-vendored

AMBuildScript

@@ -379,16 +379,6 @@ class SMConfig(object):
   def configure_windows(self, cxx):
     cxx.defines += ['WIN32', '_WINDOWS']
 
-  def add_libamtl(self):
-    # Add libamtl.
-    self.libamtl = {}
-    for arch in self.archs:
-      def get_configure_fn(arch):
-        return lambda builder, name: self.StaticLibrary(builder, name, arch)
-      extra_vars = {'Configure': get_configure_fn(arch)}
-      libamtl = builder.Build('public/amtl/amtl/AMBuilder', extra_vars)
-      self.libamtl[arch] = libamtl.binary
-
   def AddVersioning(self, binary, arch):
     if builder.target.platform == 'windows':
       binary.sources += ['version.rc']
@@ -623,7 +613,6 @@ SM = SMConfig()
 SM.detectProductVersion()
 SM.detectSDKs()
 SM.configure()
-SM.add_libamtl()
 
 if SM.use_auto_versioning():
   SM.generated_headers = builder.Build(

core/PlayerManager.cpp

@@ -1474,10 +1474,7 @@ void PlayerManager::InvalidatePlayer(CPlayer *pPlayer)
 		}
 	}
 	
-	auto userid = engine->GetPlayerUserId(pPlayer->m_pEdict);
-	if (userid != -1)
-		m_UserIdLookUp[userid] = 0;
-
+	m_UserIdLookUp[engine->GetPlayerUserId(pPlayer->m_pEdict)] = 0;
 	pPlayer->Disconnect();
 }
 

core/logic/ExtensionSys.cpp

@@ -1364,7 +1364,7 @@ bool CLocalExtension::IsSameFile(const char *file)
 
 bool CRemoteExtension::IsSameFile(const char *file)
 {
-	/* Check full path and name passed in from LoadExternal */
-	return strcmp(file, m_Path.c_str()) == 0 || strcmp(file, m_File.c_str()) == 0;
+	/* :TODO: this could be better, but no one uses this API anyway. */
+	return strcmp(file, m_Path.c_str()) == 0;
 }
 

core/logic/smn_players.cpp

@@ -1458,24 +1458,23 @@ static cell_t IsClientInKickQueue(IPluginContext *pContext, const cell_t *params
 	return pPlayer->IsInKickQueue() ? 1 : 0;
 }
 
+cmd_target_info_t g_ProcessTargetString_info;
 static cell_t ProcessTargetString(IPluginContext *pContext, const cell_t *params)
 {
-	cmd_target_info_t info;
-
-	pContext->LocalToString(params[1], (char **) &info.pattern);
-	info.admin = params[2];
-	pContext->LocalToPhysAddr(params[3], &info.targets);
-	info.max_targets = params[4];
-	info.flags = params[5];
-	pContext->LocalToString(params[6], &info.target_name);
-	info.target_name_maxlength = params[7];
+	pContext->LocalToString(params[1], (char **) &g_ProcessTargetString_info.pattern);
+	g_ProcessTargetString_info.admin = params[2];
+	pContext->LocalToPhysAddr(params[3], &g_ProcessTargetString_info.targets);
+	g_ProcessTargetString_info.max_targets = params[4];
+	g_ProcessTargetString_info.flags = params[5];
+	pContext->LocalToString(params[6], &g_ProcessTargetString_info.target_name);
+	g_ProcessTargetString_info.target_name_maxlength = params[7];
 
 	cell_t *tn_is_ml;
 	pContext->LocalToPhysAddr(params[8], &tn_is_ml);
 
-	playerhelpers->ProcessCommandTarget(&info);
+	playerhelpers->ProcessCommandTarget(&g_ProcessTargetString_info);
 
-	if (info.target_name_style == COMMAND_TARGETNAME_ML)
+	if (g_ProcessTargetString_info.target_name_style == COMMAND_TARGETNAME_ML)
 	{
 		*tn_is_ml = 1;
 	}
@@ -1484,16 +1483,30 @@ static cell_t ProcessTargetString(IPluginContext *pContext, const cell_t *params
 		*tn_is_ml = 0;
 	}
 
-	if (info.num_targets == 0)
+	if (g_ProcessTargetString_info.num_targets == 0)
 	{
-		return info.reason;
+		return g_ProcessTargetString_info.reason;
 	}
 	else
 	{
-		return info.num_targets;
+		return g_ProcessTargetString_info.num_targets;
 	}
 }
 
+static cell_t GetLastProcessTargetString(IPluginContext *pContext, const cell_t *params)
+{
+	cell_t *admin, *flags;
+
+	pContext->StringToLocalUTF8(params[1], params[2], g_ProcessTargetString_info.pattern, NULL);
+	pContext->LocalToPhysAddr(params[3], &admin);
+	pContext->LocalToPhysAddr(params[4], &flags);
+
+	*admin = g_ProcessTargetString_info.admin;
+	*flags = g_ProcessTargetString_info.flags;
+
+	return 0;
+}
+
 static cell_t FormatActivitySource(IPluginContext *pContext, const cell_t *params)
 {
 	int value;
@@ -1645,6 +1658,7 @@ REGISTER_NATIVES(playernatives)
 	{ "NotifyPostAdminCheck", NotifyPostAdminCheck },
 	{ "IsClientInKickQueue", IsClientInKickQueue },
 	{ "ProcessTargetString", ProcessTargetString },
+	{ "GetLastProcessTargetString", GetLastProcessTargetString },
 	{ "FormatActivitySource", FormatActivitySource },
 	{ "GetClientSerial", sm_GetClientSerial },
 	{ "GetClientFromSerial", sm_GetClientFromSerial },

core/smn_console.cpp

@@ -789,6 +789,16 @@ static cell_t sm_RegAdminCmd(IPluginContext *pContext, const cell_t *params)
 	return 1;
 }
 
+static cell_t sm_IsCommandCallback(IPluginContext *pContext, const cell_t *params)
+{
+	const ICommandArgs *pCmd = g_HL2.PeekCommandStack();
+
+	if (!pCmd)
+		return 0;
+
+	return 1;
+}
+
 static cell_t sm_GetCmdArgs(IPluginContext *pContext, const cell_t *params)
 {
 	const ICommandArgs *pCmd = g_HL2.PeekCommandStack();
@@ -1467,6 +1477,7 @@ REGISTER_NATIVES(consoleNatives)
 	{"GetConVarDefault",	GetConVarDefault},
 	{"RegServerCmd",		sm_RegServerCmd},
 	{"RegConsoleCmd",		sm_RegConsoleCmd},
+	{"IsCommandCallback",	sm_IsCommandCallback},
 	{"GetCmdArgString",		sm_GetCmdArgString},
 	{"GetCmdArgs",			sm_GetCmdArgs},
 	{"GetCmdArg",			sm_GetCmdArg},

extensions/sdktools/gamerulesnatives.cpp

@@ -53,10 +53,6 @@ static CBaseEntity *FindEntityByNetClass(int start, const char *classname)
 		if (network == NULL)
 			continue;
 
-		IHandleEntity *pHandleEnt = network->GetEntityHandle();
-		if (pHandleEnt == NULL)
-			continue;
-
 		ServerClass *sClass = network->GetServerClass();
 		const char *name = sClass->GetName();
 

extensions/sdktools/trnatives.cpp

@@ -998,22 +998,6 @@ static cell_t smn_TRGetHitGroup(IPluginContext *pContext, const cell_t *params)
 	return tr->hitgroup;
 }
 
-static cell_t smn_TRGetHitBoxIndex(IPluginContext *pContext, const cell_t *params)
-{
-	sm_trace_t *tr;
-	HandleError err;
-	HandleSecurity sec(pContext->GetIdentity(), myself->GetIdentity());
-
-	if (params[1] == BAD_HANDLE)
-	{
-		tr = &g_Trace;
-	} else if ((err = handlesys->ReadHandle(params[1], g_TraceHandle, &sec, (void **)&tr)) != HandleError_None) {
-		return pContext->ThrowNativeError("Invalid Handle %x (error %d)", params[1], err);
-	}
-
-	return tr->hitbox;
-}
-
 static cell_t smn_TRGetEntityIndex(IPluginContext *pContext, const cell_t *params)
 {
 	sm_trace_t *tr;
@@ -1118,7 +1102,6 @@ sp_nativeinfo_t g_TRNatives[] =
 	{"TR_StartSolid",				smn_TRStartSolid},
 	{"TR_DidHit",					smn_TRDidHit},
 	{"TR_GetHitGroup",				smn_TRGetHitGroup},
-	{"TR_GetHitBoxIndex",			smn_TRGetHitBoxIndex},
 	{"TR_ClipRayToEntity",			smn_TRClipRayToEntity},
 	{"TR_ClipRayToEntityEx",		smn_TRClipRayToEntityEx},
 	{"TR_ClipRayHullToEntity",		smn_TRClipRayHullToEntity},

extensions/sdktools/vcallbuilder.cpp

@@ -255,12 +255,10 @@ ValveCall *CreateValveVCall(unsigned int vtableIdx,
 
 	/* Get return information - encode only */
 	PassInfo retBuf;
-	ObjectField retFieldBuf[16];
 	size_t retBufSize = 0;
 	bool retbuf_needs_extra;
 	if (retInfo)
 	{
-		retBuf.fields = retFieldBuf;
 		if ((size = ValveParamToBinParam(retInfo->vtype, retInfo->type, retInfo->flags, &retBuf, retbuf_needs_extra)) == 0)
 		{
 			delete vc;
@@ -271,14 +269,12 @@ ValveCall *CreateValveVCall(unsigned int vtableIdx,
 
 	/* Get parameter info */
 	PassInfo paramBuf[32];
-	ObjectField fieldBuf[32][16];
 	size_t sizes[32];
 	size_t normSize = 0;
 	size_t extraSize = 0;
 	for (unsigned int i=0; i<numParams; i++)
 	{
 		bool needs_extra;
-		paramBuf[i].fields = fieldBuf[i];
 		if ((size = ValveParamToBinParam(params[i].vtype, 
 										params[i].type,
 										params[i].flags,

licenses/LICENSE.txt

@@ -1,14 +1,15 @@
 SOURCEMOD LICENSE INFORMATION
-VERSION: 2019-9-30
+VERSION: JUNE-13-2008
 -----------------------------
 
 SourceMod is licensed under the GNU General Public License, version 3.  
 
 As a special exception, AlliedModders LLC gives you permission to link the code
 of this program (as well as its derivative works) to "Half-Life 2," the "Source 
-Engine" and any Game MODs that run on software by the Valve Corporation.
-You must obey the GNU General Public License in all respects for all other code used.
-Additionally, AlliedModders LLC grants this exception to all derivative works.
+Engine," the "SourcePawn JIT," and any Game MODs that run on software by the 
+Valve Corporation.  You must obey the GNU General Public License in all 
+respects for all other code used. Additionally, AlliedModders LLC grants this 
+exception to all derivative works.
 
 As an additional special exception to the GNU General Public License 3.0, 
 AlliedModders LLC permits dual-licensing of DERIVATIVE WORKS ONLY (that is, 
@@ -26,6 +27,7 @@ License version 2 (without an "or any higher version" clause) if and only if
 the work was already GNU General Public License 2.0 exclusive.  This clause is 
 provided for backwards compatibility only.
 
+A copy of the JIT License is available in JIT.txt.
 A copy of the GNU General Public License 2.0 is available in GPLv2.txt.
 A copy of the GNU General Public License 3.0 is available in GPLv3.txt.
 
@@ -33,4 +35,5 @@ SourcePawn is Copyright (C) 2006-2008 AlliedModders LLC.  All rights reserved.
 SourceMod is Copyright (C) 2006-2008 AlliedModders LLC.  All rights reserved.
 Pawn and SMALL are Copyright (C) 1997-2008 ITB CompuPhase.
 Source is Copyright (C) Valve Corporation.
-All trademarks are property of their respective owners in the US and other countries.
+All trademarks are property of their respective owners in the US and other 
+

plugins/AMBuilder

@@ -24,7 +24,8 @@ files = [
   'basecommands.sp',
   'mapchooser.sp',
   'randomcycle.sp',
-  'sql-admin-manager.sp'
+  'sql-admin-manager.sp',
+  'DynamicTargeting.sp'
 ]
 
 spcomp_argv = [

plugins/DynamicTargeting.sp

@@ -0,0 +1,266 @@
+#pragma semicolon 1
+#define PLUGIN_VERSION "1.0"
+
+#include <sourcemod>
+#include <DynamicTargeting>
+
+#pragma newdecls required
+
+public Plugin myinfo =
+{
+	name = "Dynamic Targeting",
+	author = "BotoX",
+	description = "",
+	version = PLUGIN_VERSION,
+	url = ""
+}
+
+char g_PlayerNames[MAXPLAYERS + 1][MAX_NAME_LENGTH];
+Handle g_PlayerData[MAXPLAYERS + 1];
+
+public APLRes AskPluginLoad2(Handle myself, bool late, char[] error, int err_max)
+{
+	CreateNative("AmbiguousMenu", Native_AmbiguousMenu);
+	RegPluginLibrary("DynamicTargeting");
+
+	return APLRes_Success;
+}
+
+public void OnClientDisconnect(int client)
+{
+	if(g_PlayerData[client] != INVALID_HANDLE)
+	{
+		CloseHandle(g_PlayerData[client]);
+		g_PlayerData[client] = INVALID_HANDLE;
+	}
+}
+
+int CreateAmbiguousMenu(int client, const char[] sCommand, const char[] sArgString, const char[] sPattern, int FilterFlags)
+{
+	Menu menu = new Menu(MenuHandler_AmbiguousMenu, MenuAction_Select|MenuAction_Cancel|MenuAction_End|MenuAction_DrawItem|MenuAction_DisplayItem);
+	menu.ExitButton = true;
+
+	char sTitle[32 + MAX_TARGET_LENGTH];
+	FormatEx(sTitle, sizeof(sTitle), "Target \"%s\" is ambiguous.", sPattern);
+	menu.SetTitle(sTitle);
+
+	int Players = 0;
+	int[] aClients = new int[MaxClients + 1];
+
+	for(int i = 1; i <= MaxClients; i++)
+	{
+		if(!IsClientConnected(i) || i == client)
+			continue;
+
+		if(FilterFlags & COMMAND_FILTER_NO_BOTS && IsFakeClient(i))
+			continue;
+
+		if(!(FilterFlags & COMMAND_FILTER_CONNECTED) && !IsClientInGame(i))
+			continue;
+
+		if(FilterFlags & COMMAND_FILTER_ALIVE && !IsPlayerAlive(i))
+			continue;
+
+		if(FilterFlags & COMMAND_FILTER_DEAD && IsPlayerAlive(i))
+			continue;
+
+		// insert player names into g_PlayerNames array
+		GetClientName(i, g_PlayerNames[i], sizeof(g_PlayerNames[]));
+
+		if(StrContains(g_PlayerNames[i], sPattern, false) != -1)
+			aClients[Players++] = i;
+	}
+
+	// sort aClients array by player name
+	SortCustom1D(aClients, Players, SortByPlayerName);
+
+	// insert players sorted
+	char sUserId[12];
+	char sDisp[MAX_NAME_LENGTH + 16];
+	for(int i = 0; i < Players; i++)
+	{
+		IntToString(GetClientUserId(aClients[i]), sUserId, sizeof(sUserId));
+
+		FormatEx(sDisp, sizeof(sDisp), "%s (%s)", g_PlayerNames[aClients[i]], sUserId);
+		menu.AddItem(sUserId, sDisp);
+	}
+
+	DataPack pack = new DataPack();
+	pack.WriteString(sCommand);
+	pack.WriteString(sArgString);
+	pack.WriteString(sPattern);
+	pack.WriteCell(FilterFlags);
+
+	if(g_PlayerData[client] != INVALID_HANDLE)
+	{
+		CloseHandle(g_PlayerData[client]);
+		g_PlayerData[client] = INVALID_HANDLE;
+	}
+	CancelClientMenu(client);
+
+	g_PlayerData[client] = pack;
+	menu.Display(client, MENU_TIME_FOREVER);
+
+	return 0;
+}
+
+public int MenuHandler_AmbiguousMenu(Menu menu, MenuAction action, int param1, int param2)
+{
+	switch(action)
+	{
+		case MenuAction_End:
+		{
+			CloseHandle(menu);
+		}
+		case MenuAction_Cancel:
+		{
+			if(g_PlayerData[param1] != INVALID_HANDLE)
+			{
+				CloseHandle(g_PlayerData[param1]);
+				g_PlayerData[param1] = INVALID_HANDLE;
+			}
+		}
+		case MenuAction_Select:
+		{
+			int Style;
+			char sItem[32];
+			char sDisp[MAX_NAME_LENGTH + 16];
+			menu.GetItem(param2, sItem, sizeof(sItem), Style, sDisp, sizeof(sDisp));
+
+			int UserId = StringToInt(sItem);
+			int client = GetClientOfUserId(UserId);
+			if(!client)
+			{
+				PrintToChat(param1, "\x04[DynamicTargeting]\x01 Player no longer available.");
+				menu.DisplayAt(param1, GetMenuSelectionPosition(), MENU_TIME_FOREVER);
+				return 0;
+			}
+
+			DataPack pack = view_as<DataPack>(g_PlayerData[param1]);
+			pack.Reset();
+
+			char sCommand[128];
+			pack.ReadString(sCommand, sizeof(sCommand));
+
+			char sArgString[256];
+			pack.ReadString(sArgString, sizeof(sArgString));
+
+			char sPattern[MAX_TARGET_LENGTH];
+			pack.ReadString(sPattern, sizeof(sPattern));
+
+			int Result = ReCallAmbiguous(param1, client, sCommand, sArgString, sPattern);
+
+			return Result;
+		}
+		case MenuAction_DrawItem:
+		{
+			int Style;
+			char sItem[32];
+			menu.GetItem(param2, sItem, sizeof(sItem), Style);
+
+			int UserId = StringToInt(sItem);
+			int client = GetClientOfUserId(UserId);
+			if(!client) // Player disconnected
+				return ITEMDRAW_DISABLED;
+
+			return Style;
+		}
+		case MenuAction_DisplayItem:
+		{
+			int Style;
+			char sItem[32];
+			char sDisp[MAX_NAME_LENGTH + 16];
+			menu.GetItem(param2, sItem, sizeof(sItem), Style, sDisp, sizeof(sDisp));
+
+			if(!sItem[0])
+				return 0;
+
+			char sBuffer[MAX_NAME_LENGTH + 16];
+			int UserId = StringToInt(sItem);
+			int client = GetClientOfUserId(UserId);
+			if(!client) // Player disconnected
+				return 0;
+
+			GetClientName(client, g_PlayerNames[client], sizeof(g_PlayerNames[]));
+			FormatEx(sBuffer, sizeof(sBuffer), "%s (%d)", g_PlayerNames[client], UserId);
+
+			if(!StrEqual(sDisp, sBuffer))
+				return RedrawMenuItem(sBuffer);
+
+			return 0;
+		}
+	}
+
+	return 0;
+}
+
+int ReCallAmbiguous(int client, int newClient, const char[] sCommand, const char[] sArgString, const char[] sPattern)
+{
+	char sTarget[16];
+	FormatEx(sTarget, sizeof(sTarget), "#%d", GetClientUserId(newClient));
+
+	char sNewArgString[256];
+	strcopy(sNewArgString, sizeof(sNewArgString), sArgString);
+
+	char sPart[256];
+	int CurrentIndex = 0;
+	int NextIndex = 0;
+
+	while(NextIndex != -1 && CurrentIndex < sizeof(sNewArgString))
+	{
+		NextIndex = BreakString(sNewArgString[CurrentIndex], sPart, sizeof(sPart));
+
+		if(StrEqual(sPart, sPattern))
+		{
+			ReplaceStringEx(sNewArgString[CurrentIndex], sizeof(sNewArgString) - CurrentIndex, sPart, sTarget);
+			break;
+		}
+
+		CurrentIndex += NextIndex;
+	}
+
+	FakeClientCommandEx(client, "%s %s", sCommand, sNewArgString);
+
+	return 0;
+}
+
+public int Native_AmbiguousMenu(Handle plugin, int numParams)
+{
+	int client = GetNativeCell(1);
+
+	if(client > MaxClients || client <= 0)
+	{
+		ThrowNativeError(SP_ERROR_NATIVE, "Client is not valid.");
+		return -1;
+	}
+
+	if(!IsClientInGame(client))
+	{
+		ThrowNativeError(SP_ERROR_NATIVE, "Client is not in-game.");
+		return -1;
+	}
+
+	if(IsFakeClient(client))
+	{
+		ThrowNativeError(SP_ERROR_NATIVE, "Client is fake-client.");
+		return -1;
+	}
+
+	char sCommand[128];
+	GetNativeString(2, sCommand, sizeof(sCommand));
+
+	char sArgString[256];
+	GetNativeString(3, sArgString, sizeof(sArgString));
+
+	char sPattern[MAX_TARGET_LENGTH];
+	GetNativeString(4, sPattern, sizeof(sPattern));
+
+	int FilterFlags = GetNativeCell(5);
+
+	return CreateAmbiguousMenu(client, sCommand, sArgString, sPattern, FilterFlags);
+}
+
+public int SortByPlayerName(int elem1, int elem2, const int[] array, Handle hndl)
+{
+	return strcmp(g_PlayerNames[elem1], g_PlayerNames[elem2], false);
+}

plugins/adminmenu/dynamicmenu.sp

@@ -4,26 +4,26 @@
 
 #define ARRAY_STRING_LENGTH 32
 
-enum struct GroupCommands
+enum GroupCommands
 {
-	ArrayList groupListName;
-	ArrayList groupListCommand;
-}
+	ArrayList:groupListName,
+	ArrayList:groupListCommand	
+};
 
-GroupCommands g_groupList;
+int g_groupList[GroupCommands];
 int g_groupCount;
 
 SMCParser g_configParser;
 
-enum struct Places
+enum Places
 {
-	int category;
-	int item;
-	int replaceNum;
-}
+	Place_Category,
+	Place_Item,
+	Place_ReplaceNum
+};
 
 char g_command[MAXPLAYERS+1][CMD_LENGTH];
-Places g_currentPlace[MAXPLAYERS+1];
+int g_currentPlace[MAXPLAYERS+1][Places];
 
 /**
  * What to put in the 'info' menu field (for PlayerList and Player_Team menus only)
@@ -331,11 +331,11 @@ void ParseConfigs()
 	g_configParser.OnKeyValue = KeyValue;
 	g_configParser.OnLeaveSection = EndSection;
 	
-	delete g_groupList.groupListName;
-	delete g_groupList.groupListCommand;
+	delete g_groupList[groupListName];
+	delete g_groupList[groupListCommand];
 	
-	g_groupList.groupListName = new ArrayList(ARRAY_STRING_LENGTH);
-	g_groupList.groupListCommand = new ArrayList(ARRAY_STRING_LENGTH);
+	g_groupList[groupListName] = new ArrayList(ARRAY_STRING_LENGTH);
+	g_groupList[groupListCommand] = new ArrayList(ARRAY_STRING_LENGTH);
 	
 	char configPath[256];
 	BuildPath(Path_SM, configPath, sizeof(configPath), "configs/dynamicmenu/adminmenu_grouping.txt");
@@ -376,13 +376,13 @@ public SMCResult NewSection(SMCParser smc, const char[] name, bool opt_quotes)
 
 public SMCResult KeyValue(SMCParser smc, const char[] key, const char[] value, bool key_quotes, bool value_quotes)
 {
-	g_groupList.groupListName.PushString(key);
-	g_groupList.groupListCommand.PushString(value);
+	g_groupList[groupListName].PushString(key);
+	g_groupList[groupListCommand].PushString(value);
 }
 
 public SMCResult EndSection(SMCParser smc)
 {
-	g_groupCount = g_groupList.groupListName.Length;
+	g_groupCount = g_groupList[groupListName].Length;
 }
 
 public void DynamicMenuCategoryHandler(TopMenu topmenu, 
@@ -421,8 +421,8 @@ public void DynamicMenuItemHandler(TopMenu topmenu,
 		
 		strcopy(g_command[param], sizeof(g_command[]), output.cmd);
 					
-		g_currentPlace[param].item = location;
-		g_currentPlace[param].replaceNum = 1;
+		g_currentPlace[param][Place_Item] = location;
+		g_currentPlace[param][Place_ReplaceNum] = 1;
 		
 		ParamCheck(param);
 	}
@@ -436,19 +436,19 @@ public void ParamCheck(int client)
 	Item outputItem;
 	Submenu outputSubmenu;
 	
-	g_DataArray.GetArray(g_currentPlace[client].item, outputItem);
+	g_DataArray.GetArray(g_currentPlace[client][Place_Item], outputItem);
 		
-	if (g_currentPlace[client].replaceNum < 1)
+	if (g_currentPlace[client][Place_ReplaceNum] < 1)
 	{
-		g_currentPlace[client].replaceNum = 1;
+		g_currentPlace[client][Place_ReplaceNum] = 1;
 	}
 	
-	Format(buffer, 5, "#%i", g_currentPlace[client].replaceNum);
-	Format(buffer2, 5, "@%i", g_currentPlace[client].replaceNum);
+	Format(buffer, 5, "#%i", g_currentPlace[client][Place_ReplaceNum]);
+	Format(buffer2, 5, "@%i", g_currentPlace[client][Place_ReplaceNum]);
 	
 	if (StrContains(g_command[client], buffer) != -1 || StrContains(g_command[client], buffer2) != -1)
 	{
-		outputItem.submenus.GetArray(g_currentPlace[client].replaceNum - 1, outputSubmenu);
+		outputItem.submenus.GetArray(g_currentPlace[client][Place_ReplaceNum] - 1, outputSubmenu);
 		
 		Menu itemMenu = new Menu(Menu_Selection);
 		itemMenu.ExitBackButton = true;
@@ -460,8 +460,8 @@ public void ParamCheck(int client)
 		
 			for (int i = 0; i<g_groupCount; i++)
 			{			
-				g_groupList.groupListName.GetString(i, nameBuffer, sizeof(nameBuffer));
-				g_groupList.groupListCommand.GetString(i, commandBuffer, sizeof(commandBuffer));
+				g_groupList[groupListName].GetString(i, nameBuffer, sizeof(nameBuffer));
+				g_groupList[groupListCommand].GetString(i, commandBuffer, sizeof(commandBuffer));
 				itemMenu.AddItem(commandBuffer, nameBuffer);
 			}
 		}
@@ -591,7 +591,7 @@ public void ParamCheck(int client)
 		}
 
 		g_command[client][0] = '\0';
-		g_currentPlace[client].replaceNum = 1;
+		g_currentPlace[client][Place_ReplaceNum] = 1;
 	}
 }
 
@@ -622,16 +622,16 @@ public int Menu_Selection(Menu menu, MenuAction action, int param1, int param2)
 		char infobuffer[NAME_LENGTH+2];
 		Format(infobuffer, sizeof(infobuffer), "\"%s\"", info);
 		
-		Format(buffer, 5, "#%i", g_currentPlace[param1].replaceNum);
+		Format(buffer, 5, "#%i", g_currentPlace[param1][Place_ReplaceNum]);
 		ReplaceString(g_command[param1], sizeof(g_command[]), buffer, infobuffer);
 		//replace #num with the selected option (quoted)
 		
-		Format(buffer, 5, "@%i", g_currentPlace[param1].replaceNum);
+		Format(buffer, 5, "@%i", g_currentPlace[param1][Place_ReplaceNum]);
 		ReplaceString(g_command[param1], sizeof(g_command[]), buffer, info);
 		//replace @num with the selected option (unquoted)
 		
 		// Increment the parameter counter.
-		g_currentPlace[param1].replaceNum++;
+		g_currentPlace[param1][Place_ReplaceNum]++;
 		
 		ParamCheck(param1);
 	}

plugins/basecommands/map.sp

@@ -159,10 +159,8 @@ int LoadMapList(Menu menu)
 	
 	for (int i = 0; i < map_count; i++)
 	{
-		char displayName[PLATFORM_MAX_PATH];
 		GetArrayString(g_map_array, i, map_name, sizeof(map_name));
-		GetMapDisplayName(map_name, displayName, sizeof(displayName));
-		menu.AddItem(map_name, displayName);
+		menu.AddItem(map_name, map_name);
 	}
 	
 	return map_count;

plugins/include/DynamicTargeting.inc

@@ -0,0 +1,24 @@
+#if defined _DynamicTargeting_Included
+	#endinput
+#endif
+#define _DynamicTargeting_Included
+
+native int AmbiguousMenu(int client, char[] sCommand, char[] sArgString, char[] sPattern, int FilterFlags);
+
+public SharedPlugin __pl_DynamicTargeting =
+{
+	name = "DynamicTargeting",
+	file = "DynamicTargeting.smx",
+#if defined REQUIRE_PLUGIN
+	required = 1,
+#else
+	required = 0,
+#endif
+};
+
+#if !defined REQUIRE_PLUGIN
+public __pl_DynamicTargeting_SetNTVOptional()
+{
+	MarkNativeAsOptional("AmbiguousMenu");
+}
+#endif

plugins/include/adt_stack.inc

@@ -84,7 +84,7 @@ methodmap ArrayStack < Handle
 	// @param block        Optionally specify which block to read from
 	//                     (useful if the blocksize > 0).
 	// @param asChar       Optionally read as a byte instead of a cell.
-	// @return             Value popped from the stack.
+	// @return             True on success, false if the stack is empty.
 	// @error              The stack is empty.
 	public native any Pop(int block=0, bool asChar=false);
 
@@ -92,7 +92,7 @@ methodmap ArrayStack < Handle
 	//
 	// @param buffer       Buffer to store string.
 	// @param maxlength    Maximum size of the buffer.
-	// @param written      Number of characters written to buffer, not including
+	// @oaram written      Number of characters written to buffer, not including
 	//                     the null terminator.
 	// @error              The stack is empty.
 	public native void PopString(char[] buffer, int maxlength, int &written = 0);

plugins/include/commandfilters.inc

@@ -84,6 +84,25 @@ native int ProcessTargetString(const char[] pattern,
 							   int tn_maxlength,
 							   bool &tn_is_ml);
 
+
+/**
+ * Retrieves arguments that were passed to the last ProcessTargetString call.
+ *
+ * @param pattern		Buffer to store the pattern.
+ * @param p_maxlen		Maximum length of the pattern buffer.
+ * @param admin			OUTPUT: Admin performing the action, or 0 if the server.
+ * @param filter_flags	OUTPUT: Filter flags.
+ * @noreturn
+ */
+native void GetLastProcessTargetString(char[] pattern,
+								  int p_maxlen,
+								  int &admin,
+								  int &filter_flags);
+
+#undef REQUIRE_PLUGIN
+#include <DynamicTargeting>
+#define REQUIRE_PLUGIN
+
 /**
  * Replies to a client with a given message describing a targetting 
  * failure reason.
@@ -93,7 +112,7 @@ native int ProcessTargetString(const char[] pattern,
  * @param client        Client index, or 0 for server.
  * @param reason        COMMAND_TARGET reason.
  */
-stock void ReplyToTargetError(int client, int reason)
+stock void ReplyToTargetError(int client, int reason, bool dynamic=true)
 {
 	switch (reason)
 	{
@@ -128,6 +147,34 @@ stock void ReplyToTargetError(int client, int reason)
 		case COMMAND_TARGET_AMBIGUOUS:
 		{
 			ReplyToCommand(client, "[SM] %t", "More than one client matched");
+
+			if(dynamic &&
+				GetFeatureStatus(FeatureType_Native, "GetLastProcessTargetString") == FeatureStatus_Available &&
+				LibraryExists("DynamicTargeting"))
+			{
+				if(GetFeatureStatus(FeatureType_Native, "IsCommandCallback") == FeatureStatus_Available &&
+					!IsCommandCallback())
+				{
+					return;
+				}
+
+				char sCommand[128];
+				GetCmdArg(0, sCommand, sizeof(sCommand));
+
+				char sArgString[256];
+				GetCmdArgString(sArgString, sizeof(sArgString));
+
+				char pattern[MAX_TARGET_LENGTH];
+				int admin;
+				int filter_flags;
+
+				GetLastProcessTargetString(pattern, sizeof(pattern), admin, filter_flags);
+
+				if(!admin || !IsClientInGame(admin) || IsFakeClient(admin))
+					return;
+
+				AmbiguousMenu(admin, sCommand, sArgString, pattern, filter_flags);
+			}
 		}
 	}
 }

plugins/include/console.inc

@@ -402,7 +402,14 @@ native void RegAdminCmd(const char[] cmd,
 					const char[] description="",
 					const char[] group="",
 					int flags=0);
-					
+
+/**
+ * Returns whether there is a command callback available.
+ *
+ * @return				True if called from inside a command callback.
+ */
+native bool IsCommandCallback();
+
 /**
  * Returns the number of arguments from the current console or server command.
  * @note Unlike the HL2 engine call, this does not include the command itself.

plugins/include/core.inc

@@ -311,6 +311,9 @@ public void __ext_core_SetNTVOptional()
 	MarkNativeAsOptional("Protobuf.ReadRepeatedMessage");
 	MarkNativeAsOptional("Protobuf.AddMessage");
 
+	MarkNativeAsOptional("IsCommandCallback");
+	MarkNativeAsOptional("GetLastProcessTargetString");
+
 	VerifyCoreVersion();
 }
 

plugins/include/cstrike.inc

@@ -45,8 +45,6 @@
 #define CS_SLOT_KNIFE       2   /**< Knife slot. */
 #define CS_SLOT_GRENADE     3   /**< Grenade slot (will only return one grenade). */
 #define CS_SLOT_C4          4   /**< C4 slot. */
-#define CS_SLOT_BOOST       11  /**< Slot for healthshot and shield (will only return one weapon/item). */
-#define CS_SLOT_UTILITY     12  /**< Slot for tablet. */
 
 #define CS_DMG_HEADSHOT     (1 << 30)    /**< Headshot */
 
@@ -158,7 +156,6 @@ enum CSWeaponID
 	CSWeapon_BUMPMINE = 85,
 	CSWeapon_MAX_WEAPONS_NO_KNIFES, // Max without the knife item defs, useful when treating all knives as a regular knife.
 	CSWeapon_BAYONET = 500,
-	CSWeapon_KNIFE_CLASSIC = 503,
 	CSWeapon_KNIFE_FLIP = 505,
 	CSWeapon_KNIFE_GUT = 506,
 	CSWeapon_KNIFE_KARAMBIT = 507,

plugins/include/dbi.inc

@@ -547,7 +547,7 @@ native bool SQL_CheckConfig(const char[] name);
  *                      string to return the default driver.
  * @return              Driver Handle, or INVALID_HANDLE on failure.
  */
-native DBDriver SQL_GetDriver(const char[] name="");
+native Handle SQL_GetDriver(const char[] name="");
 
 /**
  * Reads the driver of an opened database.
@@ -557,7 +557,7 @@ native DBDriver SQL_GetDriver(const char[] name="");
  * @param ident_length  Maximum length of the buffer.
  * @return              Driver Handle.
  */
-native DBDriver SQL_ReadDriver(Handle database, char[] ident="", int ident_length=0);
+native Handle SQL_ReadDriver(Handle database, char[] ident="", int ident_length=0);
 
 /**
  * Retrieves a driver's identification string.

plugins/include/files.inc

@@ -314,7 +314,7 @@ native bool ReadDirEntry(Handle dir, char[] buffer, int maxlength, FileType &typ
  * Mac, this has no distinction from binary mode. On Windows, it causes the '\n'
  * character (0xA) to be written as "\r\n" (0xD, 0xA).
  *
- * Example: "rb" opens a binary file for reading; "at" opens a text file for
+ * Example: "rb" opens a binary file for writing; "at" opens a text file for
  * appending.
  *
  * @param file          File to open.

plugins/include/halflife.inc

@@ -682,7 +682,7 @@ enum ClientRangeType
  * @param size          Maximum size of clients array.
  * @return              Number of client indexes written to clients array.
  */
-native int GetClientsInRange(const float origin[3], ClientRangeType rangeType, int[] clients, int size);
+native int GetClientsInRange(float origin[3], ClientRangeType rangeType, int[] clients, int size);
 
 /**
  * Retrieves the server's authentication string (SteamID).

plugins/include/sdktools_tempents.inc

@@ -224,7 +224,7 @@ stock void TE_SendToClient(int client, float delay=0.0)
  * @param rangeType     Range type to use for filtering clients.
  * @param delay         Delay in seconds to send the TE.
  */
-stock void TE_SendToAllInRange(const float origin[3], ClientRangeType rangeType, float delay=0.0)
+stock void TE_SendToAllInRange(float origin[3], ClientRangeType rangeType, float delay=0.0)
 {
 	int[] clients = new int[MaxClients];
 	int total = GetClientsInRange(origin, rangeType, clients, MaxClients);

plugins/include/sdktools_trace.inc

@@ -633,18 +633,6 @@ native bool TR_DidHit(Handle hndl=INVALID_HANDLE);
  */
 native int TR_GetHitGroup(Handle hndl=INVALID_HANDLE);
 
-/**
- * Returns in which hitbox the trace collided if any. 
- *
- * Note: if the entity that collided with the trace is the world entity, 
- * then this function doesn't return an hitbox index but a static prop index.
- *
- * @param hndl          A trace Handle, or INVALID_HANDLE to use a global trace result.
- * @return              Hitbox index (Or static prop index).
- * @error               Invalid Handle.
- */
-native int TR_GetHitBoxIndex(Handle hndl=INVALID_HANDLE);
-
 /**
  * Find the normal vector to the collision plane of a trace.
  *

plugins/include/sourcemod.inc

@@ -47,6 +47,92 @@ struct Plugin
    public const char[] url;         /**< Plugin URL */
 };
 
+/**
+ * Returns whether a library exists.  This function should be considered
+ * expensive; it should only be called on plugin to determine availability
+ * of resources.  Use OnLibraryAdded()/OnLibraryRemoved() to detect changes
+ * in optional resources.
+ *
+ * @param name          Library name of a plugin or extension.
+ * @return              True if exists, false otherwise.
+ */
+native bool LibraryExists(const char[] name);
+
+/**
+ * Feature types.
+ */
+enum FeatureType
+{
+	/**
+	 * A native function call.
+	 */
+	FeatureType_Native,
+
+	/**
+	 * A named capability. This is distinctly different from checking for a
+	 * native, because the underlying functionality could be enabled on-demand
+	 * to improve loading time. Thus a native may appear to exist, but it might
+	 * be part of a set of features that are not compatible with the current game
+	 * or version of SourceMod.
+	 */
+	FeatureType_Capability
+};
+
+/**
+ * Feature statuses.
+ */
+enum FeatureStatus
+{
+	/**
+	 * Feature is available for use.
+	 */
+	FeatureStatus_Available,
+
+	/**
+	 * Feature is not available.
+	 */
+	FeatureStatus_Unavailable,
+
+	/**
+	 * Feature is not known at all.
+	 */
+	FeatureStatus_Unknown
+};
+
+/**
+ * Returns whether "GetFeatureStatus" will work. Using this native
+ * or this function will not cause SourceMod to fail loading on older versions,
+ * however, GetFeatureStatus will only work if this function returns true.
+ *
+ * @return              True if GetFeatureStatus will work, false otherwise.
+ */
+stock bool CanTestFeatures()
+{
+	return LibraryExists("__CanTestFeatures__");
+}
+
+/**
+ * Returns whether a feature exists, and if so, whether it is usable.
+ *
+ * @param type          Feature type.
+ * @param name          Feature name.
+ * @return              Feature status.
+ */
+native FeatureStatus GetFeatureStatus(FeatureType type, const char[] name);
+
+/**
+ * Requires that a given feature is available. If it is not, SetFailState()
+ * is called with the given message.
+ *
+ * @param type          Feature type.
+ * @param name          Feature name.
+ * @param fmt           Message format string, or empty to use default.
+ * @param ...           Message format parameters, if any.
+ */
+native void RequireFeature(FeatureType type, const char[] name,
+                           const char[] fmt="", any ...);
+
+
 #include <core>
 #include <float>
 #include <vector>
@@ -448,17 +534,6 @@ native void AutoExecConfig(bool autoCreate=true, const char[] name="", const cha
  */
 native void RegPluginLibrary(const char[] name);
 
-/**
- * Returns whether a library exists.  This function should be considered
- * expensive; it should only be called on plugin to determine availability
- * of resources.  Use OnLibraryAdded()/OnLibraryRemoved() to detect changes
- * in optional resources.
- *
- * @param name          Library name of a plugin or extension.
- * @return              True if exists, false otherwise.
- */
-native bool LibraryExists(const char[] name);
-
 /**
  * Returns the status of an extension, by filename.
  *
@@ -582,80 +657,6 @@ forward bool OnClientFloodCheck(int client);
  */
 forward void OnClientFloodResult(int client, bool blocked);
 
-/**
- * Feature types.
- */
-enum FeatureType
-{
-	/**
-	 * A native function call.
-	 */
-	FeatureType_Native,
-
-	/**
-	 * A named capability. This is distinctly different from checking for a
-	 * native, because the underlying functionality could be enabled on-demand
-	 * to improve loading time. Thus a native may appear to exist, but it might
-	 * be part of a set of features that are not compatible with the current game
-	 * or version of SourceMod.
-	 */
-	FeatureType_Capability
-};
-
-/**
- * Feature statuses.
- */
-enum FeatureStatus
-{
-	/**
-	 * Feature is available for use.
-	 */
-	FeatureStatus_Available,
-
-	/**
-	 * Feature is not available.
-	 */
-	FeatureStatus_Unavailable,
-
-	/**
-	 * Feature is not known at all.
-	 */
-	FeatureStatus_Unknown
-};
-
-/**
- * Returns whether "GetFeatureStatus" will work. Using this native
- * or this function will not cause SourceMod to fail loading on older versions,
- * however, GetFeatureStatus will only work if this function returns true.
- *
- * @return              True if GetFeatureStatus will work, false otherwise.
- */
-stock bool CanTestFeatures()
-{
-	return LibraryExists("__CanTestFeatures__");
-}
-
-/**
- * Returns whether a feature exists, and if so, whether it is usable.
- *
- * @param type          Feature type.
- * @param name          Feature name.
- * @return              Feature status.
- */
-native FeatureStatus GetFeatureStatus(FeatureType type, const char[] name);
-
-/**
- * Requires that a given feature is available. If it is not, SetFailState()
- * is called with the given message.
- *
- * @param type          Feature type.
- * @param name          Feature name.
- * @param fmt           Message format string, or empty to use default.
- * @param ...           Message format parameters, if any.
- */
-native void RequireFeature(FeatureType type, const char[] name,
-                           const char[] fmt="", any ...);
-
 /**
  * Represents how many bytes we can read from an address with one load
  */

product.version

@@ -1 +1 @@
-1.11.0
+1.10.0

tools/buildbot/PackageScript

@@ -324,6 +324,7 @@ CopyFiles('plugins', 'addons/sourcemod/scripting',
     'rockthevote.sp',
     'sounds.sp',
     'sql-admin-manager.sp',
+    'DynamicTargeting.sp',
   ]
 )
 CopyFiles('plugins/include', 'addons/sourcemod/scripting/include',
@@ -394,6 +395,7 @@ CopyFiles('plugins/include', 'addons/sourcemod/scripting/include',
     'usermessages.inc',
     'vector.inc',
     'version.inc',
+    'DynamicTargeting.inc',
   ]
 )
 CopyFiles('translations', 'addons/sourcemod/translations',

tools/checkout-deps.ps1

@@ -18,17 +18,7 @@ param(
         'tf2',
         'insurgency',
         'sdk2013',
-        'dota',
-        'orangebox',
-        'blade',
-        'episode1',
-        'bms',
-        'darkm',
-        'swarm',
-        'bgt',
-        'eye',
-        'contagion',
-        'doi'
+        'dota'
         )
 )
 
@@ -88,4 +78,4 @@ Checkout-Repo -Name "ambuild" -Branch "master" -Repo "https://github.com/alliedm
 Set-Location ambuild
 & python setup.py install
 
-Set-Location ..
+Set-Location ..