reorder function calls

core/concmd_cleaner.cpp

@@ -36,11 +36,7 @@
 
 #if SOURCE_ENGINE >= SE_ORANGEBOX
 SH_DECL_HOOK1_void(ICvar, UnregisterConCommand, SH_NOATTRIB, 0, ConCommandBase *);
-#if SOURCE_ENGINE == SE_CSGO
-SH_DECL_HOOK2_void(ICvar, RegisterConCommand, SH_NOATTRIB, 0, ConCommandBase *, bool);
-#else
 SH_DECL_HOOK1_void(ICvar, RegisterConCommand, SH_NOATTRIB, 0, ConCommandBase *);
-#endif
 #else
 SH_DECL_HOOK1_void(ICvar, RegisterConCommandBase, SH_NOATTRIB, 0, ConCommandBase *);
 #endif
@@ -82,11 +78,7 @@ public:
 #endif
 	}
 
-#if SOURCE_ENGINE == SE_CSGO
-	void LinkConCommandBase(ConCommandBase *pBase, bool unknown)
-#else
 	void LinkConCommandBase(ConCommandBase *pBase)
-#endif
 	{
 		IConCommandLinkListener *listener = IConCommandLinkListener::head;
 		while (listener)

core/logic/smn_players.cpp

@@ -64,13 +64,10 @@ 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 IFeatureProvider
+	public ICommandTargetProcessor
 {
 	struct SimpleMultiTargetFilter
 	{
@@ -144,7 +141,6 @@ 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;
@@ -189,7 +185,6 @@ public: //SMGlobalClass
 	void OnSourceModAllInitialized()
 	{
 		pluginsys->AddPluginsListener(this);
-		sharesys->AddCapabilityProvider(NULL, this, FEATURECAP_MULTITARGETFILTER_CLIENTPARAM);
 	}
 
 	void OnSourceModShutdown()
@@ -199,7 +194,6 @@ public: //SMGlobalClass
 			playerhelpers->UnregisterCommandTargetProcessor(this);
 			filterEnabled = false;
 		}
-		sharesys->DropCapabilityProvider(NULL, this, FEATURECAP_MULTITARGETFILTER_CLIENTPARAM);
 	}
 
 public: //IPluginsListener
@@ -217,13 +211,6 @@ public: //IPluginsListener
 			}
 		}
 	}
-
-public: //IFeatureProvider
-
-	FeatureStatus GetFeatureStatus(FeatureType type, const char *name)
-	{
-		return FeatureStatus_Available;
-	}
 } s_PlayerLogicHelpers;
 
 static cell_t

plugins/include/commandfilters.inc

@@ -132,23 +132,16 @@ 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);
 }
 
 /**

plugins/include/functions.inc

@@ -615,10 +615,7 @@ native int FormatNativeString(int out_param,
  *
  * @param data          Data passed to the RequestFrame native.
  */
-typeset RequestFrameCallback {
-	function void ();
-	function void (any data);
-}
+typedef RequestFrameCallback = function void (any data);
 
 /**
  * Creates a single use Next Frame hook.