Merge branch 'master' of https://github.com/alliedmodders/sourcemod

gamedata/sdkhooks.games/game.nmrih.txt

@@ -36,27 +36,27 @@
 			}
 			"OnTakeDamage_Alive"
 			{
-				"windows"	"274"
+				"windows"	"275"
-				"linux"		"275"
+				"linux"		"276"
-				"mac"		"275"
+				"mac"		"276"
 			}
 			"PreThink"
 			{
-				"windows"	"346"
+				"windows"	"347"
-				"linux"		"347"
+				"linux"		"348"
-				"mac"		"347"
+				"mac"		"348"
 			}
 			"PostThink"
 			{
-				"windows"	"326"
+				"windows"	"327"
-				"linux"		"327"
+				"linux"		"328"
-				"mac"		"327"
+				"mac"		"328"
 			}
 			"Reload"
 			{
-				"windows"	"271"
+				"windows"	"272"
-				"linux"		"272"
+				"linux"		"273"
-				"mac"		"272"
+				"mac"		"273"
 			}
 			"SetTransmit"
 			{
@@ -114,34 +114,34 @@
 			}
 			"Weapon_CanSwitchTo"
 			{
-				"windows"	"268"
+				"windows"	"269"
-				"linux"		"269"
+				"linux"		"270"
-				"mac"		"269"
+				"mac"		"270"
 			}
 			"Weapon_CanUse"
-			{
-				"windows"	"262"
-				"linux"		"263"
-				"mac"		"263"
-			}
-			"Weapon_Drop"
-			{
-				"windows"	"265"
-				"linux"		"266"
-				"mac"		"266"
-			}
-			"Weapon_Equip"
 			{
 				"windows"	"263"
 				"linux"		"264"
 				"mac"		"264"
 			}
-			"Weapon_Switch"
+			"Weapon_Drop"
 			{
 				"windows"	"266"
 				"linux"		"267"
 				"mac"		"267"
 			}
+			"Weapon_Equip"
+			{
+				"windows"	"264"
+				"linux"		"265"
+				"mac"		"265"
+			}
+			"Weapon_Switch"
+			{
+				"windows"	"267"
+				"linux"		"268"
+				"mac"		"268"
+			}
 		}
 	}
-}
+}

gamedata/sdktools.games/game.nmrih.txt

@@ -69,33 +69,33 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"414"
+				"windows"	"415"
-				"linux"		"415"
+				"linux"		"416"
-				"mac"		"415"
+				"mac"		"416"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"272"
+				"windows"	"273"
-				"linux"		"273"
+				"linux"		"274"
-				"mac"		"273"
+				"mac"		"274"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"270"
+				"windows"	"271"
-				"linux"		"271"
+				"linux"		"272"
-				"mac"		"271"
+				"mac"		"272"
 			}
 			"Ignite"
 			{
-				"windows"	"210"
+				"windows"	"211"
-				"linux"		"211"
+				"linux"		"212"
-				"mac"		"211"
+				"mac"		"212"
 			}
 			"Extinguish"
 			{
-				"windows"	"214"
+				"windows"	"215"
-				"linux"		"215"
+				"linux"		"216"
-				"mac"		"215"
+				"mac"		"216"
 			}
 			"Teleport"
 			{
@@ -105,9 +105,9 @@
 			}
 			"CommitSuicide"
 			{
-				"windows"	"453"
+				"windows"	"454"
-				"linux"		"453"
+				"linux"		"454"
-				"mac"		"453"
+				"mac"		"454"
 			}
 			"GetVelocity"
 			{
@@ -135,9 +135,9 @@
 			}
 			"WeaponEquip"
 			{
-				"windows"	"263"
+				"windows"	"264"
-				"linux"		"264"
+				"linux"		"265"
-				"mac"		"264"
+				"mac"		"265"
 			}
 			"Activate"
 			{
@@ -147,15 +147,15 @@
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"432"
+				"windows"	"433"
-				"linux"		"433"
+				"linux"		"434"
-				"mac"		"433"
+				"mac"		"434"
 			}
 			"GiveAmmo"
 			{
-				"windows"	"254"
+				"windows"	"255"
-				"linux"		"255"
+				"linux"		"256"
-				"mac"		"255"
+				"mac"		"256"
 			}
 		}
 	}