Merge branch '1.7-dev' of https://github.com/alliedmodders/sourcemod …

…into 1.7-dev
alliedmodders · Dec 17, 2015 · 07ef209 · 07ef209
2 parents e9e89fa + ddc29e5
commit 07ef209
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 55 deletions.
diff --git a/gamedata/sdkhooks.games/game.nmrih.txt b/gamedata/sdkhooks.games/game.nmrih.txt
@@ -36,27 +36,27 @@
 			}
 			"OnTakeDamage_Alive"
 			{
-				"windows"	"274"
-				"linux"		"275"
-				"mac"		"275"
+				"windows"	"275"
+				"linux"		"276"
+				"mac"		"276"
 			}
 			"PreThink"
 			{
-				"windows"	"346"
-				"linux"		"347"
-				"mac"		"347"
+				"windows"	"347"
+				"linux"		"348"
+				"mac"		"348"
 			}
 			"PostThink"
 			{
-				"windows"	"326"
-				"linux"		"327"
-				"mac"		"327"
+				"windows"	"327"
+				"linux"		"328"
+				"mac"		"328"
 			}
 			"Reload"
 			{
-				"windows"	"271"
-				"linux"		"272"
-				"mac"		"272"
+				"windows"	"272"
+				"linux"		"273"
+				"mac"		"273"
 			}
 			"SetTransmit"
 			{
@@ -114,34 +114,34 @@
 			}
 			"Weapon_CanSwitchTo"
 			{
-				"windows"	"268"
-				"linux"		"269"
-				"mac"		"269"
+				"windows"	"269"
+				"linux"		"270"
+				"mac"		"270"
 			}
 			"Weapon_CanUse"
 			{
-				"windows"	"262"
-				"linux"		"263"
-				"mac"		"263"
+				"windows"	"263"
+				"linux"		"264"
+				"mac"		"264"
 			}
 			"Weapon_Drop"
 			{
-				"windows"	"265"
-				"linux"		"266"
-				"mac"		"266"
+				"windows"	"266"
+				"linux"		"267"
+				"mac"		"267"
 			}
 			"Weapon_Equip"
 			{
-				"windows"	"263"
-				"linux"		"264"
-				"mac"		"264"
+				"windows"	"264"
+				"linux"		"265"
+				"mac"		"265"
 			}
 			"Weapon_Switch"
 			{
-				"windows"	"266"
-				"linux"		"267"
-				"mac"		"267"
+				"windows"	"267"
+				"linux"		"268"
+				"mac"		"268"
 			}
 		}
 	}
-}
+}
diff --git a/gamedata/sdktools.games/game.nmrih.txt b/gamedata/sdktools.games/game.nmrih.txt
@@ -131,33 +131,33 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"414"
-				"linux"		"415"
-				"mac"		"415"
+				"windows"	"415"
+				"linux"		"416"
+				"mac"		"416"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"272"
-				"linux"		"273"
-				"mac"		"273"
+				"windows"	"273"
+				"linux"		"274"
+				"mac"		"274"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"270"
-				"linux"		"271"
-				"mac"		"271"
+				"windows"	"271"
+				"linux"		"272"
+				"mac"		"272"
 			}
 			"Ignite"
 			{
-				"windows"	"210"
-				"linux"		"211"
-				"mac"		"211"
+				"windows"	"211"
+				"linux"		"212"
+				"mac"		"212"
 			}
 			"Extinguish"
 			{
-				"windows"	"214"
-				"linux"		"215"
-				"mac"		"215"
+				"windows"	"215"
+				"linux"		"216"
+				"mac"		"216"
 			}
 			"Teleport"
 			{
@@ -167,9 +167,9 @@
 			}
 			"CommitSuicide"
 			{
-				"windows"	"453"
-				"linux"		"453"
-				"mac"		"453"
+				"windows"	"454"
+				"linux"		"454"
+				"mac"		"454"
 			}
 			"GetVelocity"
 			{
@@ -197,9 +197,9 @@
 			}
 			"WeaponEquip"
 			{
-				"windows"	"263"
-				"linux"		"264"
-				"mac"		"264"
+				"windows"	"264"
+				"linux"		"265"
+				"mac"		"265"
 			}
 			"Activate"
 			{
@@ -209,15 +209,15 @@
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"432"
-				"linux"		"433"
-				"mac"		"433"
+				"windows"	"433"
+				"linux"		"434"
+				"mac"		"434"
 			}
 			"GiveAmmo"
 			{
-				"windows"	"254"
-				"linux"		"255"
-				"mac"		"255"
+				"windows"	"255"
+				"linux"		"256"
+				"mac"		"256"
 			}
 		}
 	}