Merge branch 'master' of https://github.com/alliedmodders/sourcemod into mapchooser-updates

plugins/basetriggers.sp

@@ -71,7 +71,7 @@ public OnPluginStart()
 	LoadTranslations("common.phrases");
 	LoadTranslations("basetriggers.phrases");
 	
-	g_Cvar_TriggerShow = CreateConVar("sm_trigger_show", "1", "Display triggers message to all players? (0 off, 1 on, def. 1)", 0, true, 0.0, true, 1.0);	
+	g_Cvar_TriggerShow = CreateConVar("sm_trigger_show", "0", "Display triggers message to all players? (0 off, 1 on, def. 0)", 0, true, 0.0, true, 1.0);	
 	g_Cvar_TimeleftInterval = CreateConVar("sm_timeleft_interval", "0.0", "Display timeleft every x seconds. Default 0.", 0, true, 0.0, true, 1800.0);
 	g_Cvar_FriendlyFire = FindConVar("mp_friendlyfire");
 	

plugins/include/adt_array.inc

@@ -67,7 +67,7 @@ methodmap ArrayList < Handle {
 	public native ArrayList(int blocksize=1, int startsize=0);
 
 	// Clears an array of all entries.  This is the same as Resize(0).
-	public native void ClearArray();
+	public native void Clear();
 
 	// Clones an array, returning a new handle with the same size and data.
 	// This should NOT be confused with CloneHandle. This is a completely new

plugins/include/dbi.inc

@@ -477,13 +477,13 @@ stock Database SQLite_UseDatabase(const char[] database,
 			  					  char[] error, 
 			  					  maxlength)
 {
-	new Handle kv, Handle db;
+	Handle kv, db;
 
 	kv = CreateKeyValues("");
 	KvSetString(kv, "driver", "sqlite");
 	KvSetString(kv, "database", database);
 
-	db = SQL_ConnectCustom(kv, error, int maxlength, false);
+	db = SQL_ConnectCustom(kv, error, maxlength, false);
 
 	CloseHandle(kv);
 
@@ -641,7 +641,7 @@ stock bool SQL_QuoteString(Handle database,
 						   maxlength,
 						   &written=0)
 {
-	return SQL_EscapeString(database, string, buffer, int maxlength, written);
+	return SQL_EscapeString(database, string, buffer, maxlength, written);
 }
 
 /**

plugins/include/halflife.inc

@@ -624,3 +624,21 @@ native EntRefToEntIndex(ref);
  */
 native MakeCompatEntRef(ref);
 
+
+enum ClientRangeType
+{
+	RangeType_Visibility = 0,
+	RangeType_Audibility,
+}
+
+/**
+ * Find clients that are potentially in range of a position.
+ *
+ * @param origin		Coordinates from which to test range.
+ * @param rangeType		Range type to use for filtering clients.
+ * @param clients		Array to which found client indexes will be written.
+ * @param size			Maximum size of clients array.
+ * @return				Number of client indexes written to clients array.
+ */
+native int GetClientsInRange(float origin[3], ClientRangeType rangeType, int[] clients, int size);
+

plugins/include/sdkhooks.inc

@@ -264,7 +264,9 @@ typeset SDKHookCB
 	// OnTakeDamagePost
 	// OnTakeDamageAlivePost
 	function void (int victim, int attacker, int inflictor, float damage, int damagetype);
-	function void (int victim, int attacker, int inflictor, float damage, int damagetype, const float damageForce[3], const float damagePosition[3]);
+	function void (int victim, int attacker, int inflictor, float damage, int damagetype, int weapon, const float damageForce[3], const float damagePosition[3]);
+	function void (int victim, int attacker, int inflictor, float damage, int damagetype, int weapon, 
+		const float damageForce[3], const float damagePosition[3], int damagecustom);
 	
 	// FireBulletsPost
 	function void (int client, int shots, const char[] weaponname);