Merge branch 'master' into csgo-hashmap

plugins/basechat.sp

@@ -392,7 +392,7 @@ void SendPrivateChat(int client, int target, const char[] message)
 	}
 
 	PrintToChat(target, "\x04(Private to %N) %N: \x01%s", target, client, message);
-	LogAction(client, -1, "\"%L\" triggered sm_psay to \"%L\" (text %s)", client, target, message);
+	LogAction(client, target, "\"%L\" triggered sm_psay to \"%L\" (text %s)", client, target, message);
 }
 
 void SendPanelToAll(int from, char[] message)

plugins/funcommands/blind.sp

@@ -76,7 +76,7 @@ void PerformBlind(int client, int target, int amount)
 	
 	EndMessage();
 
-	LogAction(client, target, "\"%L\" set blind on \"%L\", amount %d.", client, target, amount);
+	LogAction(client, target, "\"%L\" set blind on \"%L\" (amount \"%d\")", client, target, amount);
 }
 
 public void AdminMenu_Blind(TopMenu topmenu, 

plugins/funcommands/gravity.sp

@@ -36,7 +36,7 @@ int g_GravityTarget[MAXPLAYERS+1];
 void PerformGravity(int client, int target, float amount)
 {
 	SetEntityGravity(target, amount);
-	LogAction(client, target, "\"%L\" set gravity on \"%L\" to %f.", client, target, amount);
+	LogAction(client, target, "\"%L\" set gravity on \"%L\" (amount \"%f\")", client, target, amount);
 }
 
 public void AdminMenu_Gravity(TopMenu topmenu, 

plugins/include/core.inc

@@ -143,6 +143,22 @@ struct SharedPlugin
 public float NULL_VECTOR[3];		/**< Pass this into certain functions to act as a C++ NULL */
 public const char NULL_STRING[1];	/**< pass this into certain functions to act as a C++ NULL */
 
+/**
+ * Check if the given vector is the NULL_VECTOR.
+ *
+ * @param vec     The vector to test.
+ * @return        True if NULL_VECTOR, false otherwise.
+ */
+native bool IsNullVector(const float vec[3]);
+
+/**
+ * Check if the given string is the NULL_STRING.
+ *
+ * @param str     The string to test.
+ * @return        True if NULL_STRING, false otherwise.
+ */
+native bool IsNullString(const char[] str);
+
 /**
  * Horrible compatibility shim.
  */

plugins/include/functions.inc

@@ -290,6 +290,16 @@ native void Call_PushArray(const any[] value, int size);
  */
 native void Call_PushArrayEx(any[] value, int size, int cpflags);
 
+/**
+ * Pushes the NULL_VECTOR onto the current call.
+ * @see IsNullVector
+ *
+ * @note Cannot be used before a call has been started.
+ *
+ * @error					Called before a call has been started.
+ */
+native void Call_PushNullVector();
+
 /**
  * Pushes a string onto the current call.
  *
@@ -317,6 +327,16 @@ native void Call_PushString(const char[] value);
  */
 native void Call_PushStringEx(char[] value, int length, int szflags, int cpflags);
 
+/**
+ * Pushes the NULL_STRING onto the current call.
+ * @see IsNullString
+ *
+ * @note Cannot be used before a call has been started.
+ *
+ * @error					Called before a call has been started.
+ */
+native void Call_PushNullString();
+
 /**
  * Completes a call to a function or forward's call list.
  *
@@ -465,6 +485,22 @@ native int GetNativeArray(int param, any[] local, int size);
  */
 native int SetNativeArray(int param, const any[] local, int size);
 
+/**
+ * Check if the native parameter is the NULL_VECTOR.
+ *
+ * @param param		Parameter number, starting from 1.
+ * @return        True if NULL_VECTOR, false otherwise.
+ */
+native bool IsNativeParamNullVector(int param);
+
+/**
+ * Check if the native parameter is the NULL_STRING.
+ *
+ * @param param		Parameter number, starting from 1.
+ * @return        True if NULL_STRING, false otherwise.
+ */
+native bool IsNativeParamNullString(int param);
+
 /**
  * Formats a string using parameters from a native.
  *

plugins/include/tf2.inc

@@ -42,6 +42,7 @@
 #define TF_STUNFLAG_NOSOUNDOREFFECT (1 << 5)	/**< no sound or particle */
 #define TF_STUNFLAG_THIRDPERSON     (1 << 6)	/**< panic animation */
 #define TF_STUNFLAG_GHOSTEFFECT     (1 << 7)	/**< ghost particles */
+#define TF_STUNFLAG_SOUND           (1 << 8)	/**< sound */
 
 #define TF_STUNFLAGS_LOSERSTATE     TF_STUNFLAG_SLOWDOWN|TF_STUNFLAG_NOSOUNDOREFFECT|TF_STUNFLAG_THIRDPERSON
 #define TF_STUNFLAGS_GHOSTSCARE     TF_STUNFLAG_GHOSTEFFECT|TF_STUNFLAG_THIRDPERSON
@@ -195,7 +196,17 @@ enum TFCond
 	TFCond_KnockedIntoAir,
 	TFCond_CompetitiveWinner,
 	TFCond_CompetitiveLoser,
-	TFCond_NoTaunting,
+	TFCond_NoTaunting_DEPRECATED,
+	TFCond_HealingDebuff = 118,
+	TFCond_PasstimePenaltyDebuff,
+	TFCond_GrappledToPlayer,
+	TFCond_GrappledByPlayer,
+	TFCond_ParachuteDeployed,
+	TFCond_Gas,
+	TFCond_BurningPyro,
+	TFCond_RocketPack,
+	TFCond_LostFooting,
+	TFCond_AirCurrent,
 };
 
 const float TFCondDuration_Infinite = -1.0;

plugins/playercommands/rename.sp

@@ -35,7 +35,7 @@ char g_NewName[MAXPLAYERS+1][MAX_NAME_LENGTH];
 
 void PerformRename(int client, int target)
 {
-	LogAction(client, target, "\"%L\" renamed \"%L\" to \"%s\")", client, target, g_NewName[target]);
+	LogAction(client, target, "\"%L\" renamed \"%L\" (to \"%s\")", client, target, g_NewName[target]);
 
 	SetClientName(target, g_NewName[target]);