Add CapabilityProvider for MultiTargetFilter client param

core/logic/smn_players.cpp

@@ -64,10 +64,13 @@ static const int kActivityAdmins = 4;			// Show admin activity to admins anonymo
 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.
 
+#define FEATURECAP_MULTITARGETFILTER_CLIENTPARAM    "SourceMod MultiTargetFilter ClientParam"
+
 class PlayerLogicHelpers : 
 	public SMGlobalClass,
 	public IPluginsListener,
-	public ICommandTargetProcessor
+	public ICommandTargetProcessor,
+	public IFeatureProvider
 {
 	struct SimpleMultiTargetFilter
 	{
@@ -141,6 +144,7 @@ public: //ICommandTargetProcessor
 
 				smtf->fun->PushString(info->pattern);
 				smtf->fun->PushCell(ahc.getClone());
+				smtf->fun->PushCell(info->admin);
 				cell_t result = 0;
 				if (smtf->fun->Execute(&result) != SP_ERROR_NONE || !result)
 					return false;
@@ -185,6 +189,7 @@ public: //SMGlobalClass
 	void OnSourceModAllInitialized()
 	{
 		pluginsys->AddPluginsListener(this);
+		sharesys->AddCapabilityProvider(NULL, this, FEATURECAP_MULTITARGETFILTER_CLIENTPARAM);
 	}
 
 	void OnSourceModShutdown()
@@ -194,6 +199,7 @@ public: //SMGlobalClass
 			playerhelpers->UnregisterCommandTargetProcessor(this);
 			filterEnabled = false;
 		}
+		sharesys->DropCapabilityProvider(NULL, this, FEATURECAP_MULTITARGETFILTER_CLIENTPARAM);
 	}
 
 public: //IPluginsListener
@@ -211,6 +217,13 @@ public: //IPluginsListener
 			}
 		}
 	}
+
+public: //IFeatureProvider
+
+	FeatureStatus GetFeatureStatus(FeatureType type, const char *name)
+	{
+		return FeatureStatus_Available;
+	}
 } s_PlayerLogicHelpers;
 
 static cell_t

extensions/sdktools/output.cpp

@@ -52,6 +52,7 @@ void EntityOutputManager::Shutdown()
 		return;
 	}
 
+	EntityOutputs->Destroy();
 	ClassNames->Destroy();
 	fireOutputDetour->Destroy();
 }
@@ -65,6 +66,7 @@ void EntityOutputManager::Init()
 		return;
 	}
 
+	EntityOutputs = adtfactory->CreateBasicTrie();
 	ClassNames = adtfactory->CreateBasicTrie();
 }
 
@@ -118,30 +120,45 @@ bool EntityOutputManager::FireEventDetour(void *pOutput, CBaseEntity *pActivator
 		return true;
 	}
 
+	char sOutput[20];
+	ke::SafeSprintf(sOutput, sizeof(sOutput), "%p", pOutput);
+
 	// attempt to directly lookup a hook using the pOutput pointer
 	OutputNameStruct *pOutputName = NULL;
 
-	const char *classname = gamehelpers->GetEntityClassname(pCaller);
-	if (!classname)
+	bool fastLookup = false;
+	
+	// Fast lookup failed - check the slow way for hooks that haven't fired yet
+	if ((fastLookup = EntityOutputs->Retrieve(sOutput, (void **)&pOutputName)) == false)
 	{
-		return true;
-	}
+		const char *classname = gamehelpers->GetEntityClassname(pCaller);
+		if (!classname)
+		{
+			return true;
+		}
 
-	const char *outputname = FindOutputName(pOutput, pCaller);		
-	if (!outputname)
-	{
-		return true;
-	}
+		const char *outputname = FindOutputName(pOutput, pCaller);		
+		if (!outputname)
+		{
+			return true;
+		}
 
-	pOutputName = FindOutputPointer(classname, outputname, false);
+		pOutputName = FindOutputPointer(classname, outputname, false);
 
-	if (!pOutputName)
-	{
-		return true;
+		if (!pOutputName)
+		{
+			return true;
+		}
 	}
 
 	if (!pOutputName->hooks.empty())
 	{
+		if (!fastLookup)
+		{
+			// hook exists on this classname and output - map it into our quick find trie
+			EntityOutputs->Insert(sOutput, pOutputName);
+		}
+
 		SourceHook::List<omg_hooks *>::iterator _iter;
 
 		omg_hooks *hook;

extensions/sdktools/output.h

@@ -121,6 +121,8 @@ private:
 
 	const char *FindOutputName(void *pOutput, CBaseEntity *pCaller);
 
+	//Maps CEntityOutput * to a OutputNameStruct
+	IBasicTrie *EntityOutputs;
 	// Maps classname to a ClassNameStruct
 	IBasicTrie *ClassNames;
 

plugins/include/commandfilters.inc

@@ -132,16 +132,23 @@ stock void ReplyToTargetError(int client, int reason)
 	}
 }
 
+#define FEATURECAP_MULTITARGETFILTER_CLIENTPARAM    "SourceMod MultiTargetFilter ClientParam"
+
 /**
  * Adds clients to a multi-target filter.
  *
  * @param pattern       Pattern name.
  * @param clients       Array to fill with unique, valid client indexes.
+ * @param client        Client that triggered this filter.
  * @return              True if pattern was recognized, false otherwise.
+ *
+ * @note To see if the client param is available, use FeatureType_Capability and FEATURECAP_MULTITARGETFILTER_CLIENTPARAM.
  */
 typeset MultiTargetFilter {
 	function bool (const char[] pattern, Handle clients);
 	function bool (const char[] pattern, ArrayList clients);
+	function bool (const char[] pattern, Handle clients, int client);
+	function bool (const char[] pattern, ArrayList clients, int client);
 }
 
 /**