From e367d456e1007846598b497b13d8b1c7102eeb19 Mon Sep 17 00:00:00 2001
From: Nicholas Hastings <skamonkey@gmail.com>
Date: Mon, 27 Aug 2012 18:56:33 -0400
Subject: [PATCH] Updated GMod gamedata (bug 5408).

---
 gamedata/sdktools.games/engine.ep2valve.txt |   9 +-
 gamedata/sdktools.games/game.garrysmod.txt  | 160 +++++++++++++++-----
 2 files changed, 125 insertions(+), 44 deletions(-)

diff --git a/gamedata/sdktools.games/engine.ep2valve.txt b/gamedata/sdktools.games/engine.ep2valve.txt
index 8dc39780..4a53f806 100644
--- a/gamedata/sdktools.games/engine.ep2valve.txt
+++ b/gamedata/sdktools.games/engine.ep2valve.txt
@@ -19,7 +19,6 @@
 			"game"		"dod"
 			"game"		"tf"
 			"game"		"hl2mp"
-			"game"		"garrysmod"
 		}
 
 		"Offsets"
@@ -173,6 +172,13 @@
 	/* EntityFactoryDictionary function */
 	"#default"
 	{
+		"#supported"
+		{
+			"game"		"tf"
+			"game"		"dod"
+			"game"		"hl2mp"
+		}
+		
 		"Signatures"
 		{
 			"EntityFactory"
@@ -193,7 +199,6 @@
 			"game"		"dod"
 			"game"		"tf"
 			"game"		"hl2mp"
-			"game"		"garrysmod"
 		}
 		"Signatures"
 		{
diff --git a/gamedata/sdktools.games/game.garrysmod.txt b/gamedata/sdktools.games/game.garrysmod.txt
index 7479f412..77b3556d 100644
--- a/gamedata/sdktools.games/game.garrysmod.txt
+++ b/gamedata/sdktools.games/game.garrysmod.txt
@@ -18,87 +18,163 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"434"
-				"linux"		"435"
-				"mac"		"435"
+				"windows"	"437"
+				"linux"		"438"
+				"mac"		"438"
 			}
 			"RemovePlayerItem"
+			{
+				"windows"	"308"
+				"linux"		"309"
+				"mac"		"309"
+			}
+			"Weapon_GetSlot"
 			{
 				"windows"	"306"
 				"linux"		"307"
 				"mac"		"307"
 			}
-			"Weapon_GetSlot"
-			{
-				"windows"	"304"
-				"linux"		"305"
-				"mac"		"305"
-			}
 			"Ignite"
 			{
-				"windows"	"241"
-				"linux"		"242"
-				"mac"		"242"
+				"windows"	"243"
+				"linux"		"244"
+				"mac"		"244"
 			}
 			"Extinguish"
 			{
-				"windows"	"245"
-				"linux"		"246"
-				"mac"		"246"
+				"windows"	"247"
+				"linux"		"248"
+				"mac"		"248"
 			}
 			"Teleport"
 			{
-				"windows"	"107"
-				"linux"		"108"
-				"mac"		"108"
+				"windows"	"108"
+				"linux"		"109"
+				"mac"		"109"
 			}
 			"CommitSuicide"
 			{
-				"windows"	"473"
-				"linux"		"473"
-				"mac"		"473"
+				"windows"	"476"
+				"linux"		"476"
+				"mac"		"476"
 			}
 			"GetVelocity"
 			{
-				"windows"	"139"
-				"linux"		"140"
-				"mac"		"140"
+				"windows"	"140"
+				"linux"		"141"
+				"mac"		"141"
 			}
 			"EyeAngles"
 			{
-				"windows"	"130"
-				"linux"		"131"
-				"mac"		"131"
+				"windows"	"131"
+				"linux"		"132"
+				"mac"		"132"
 			}
 			"AcceptInput"
 			{
-				"windows"	"35"
-				"linux"		"36"
-				"mac"		"36"
+				"windows"	"36"
+				"linux"		"37"
+				"mac"		"37"
 			}
 			"SetEntityModel"
 			{
-				"windows"	"23"
-				"linux"		"24"
-				"mac"		"24"
+				"windows"	"24"
+				"linux"		"25"
+				"mac"		"25"
 			}
 			"WeaponEquip"
 			{
-				"windows"	"297"
-				"linux"		"298"
-				"mac"		"298"
+				"windows"	"299"
+				"linux"		"300"
+				"mac"		"300"
 			}
 			"Activate"
 			{
-				"windows"	"32"
-				"linux"		"33"
-				"mac"		"33"
+				"windows"	"33"
+				"linux"		"34"
+				"mac"		"34"
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"452"
-				"linux"		"453"
-				"mac"		"453"
+				"windows"	"455"
+				"linux"		"456"
+				"mac"		"456"
+			}
+		}
+	}
+	
+	"garrysmod"
+	{
+		"Offsets"
+		{
+			/* Offset into func at "CBaseTempEntity" signature */
+			"s_pTempEntities"
+			{
+				"windows"	"8"
+			}
+			"GetTEName"
+			{
+				"windows"	"4"
+				"linux"		"4"
+				"mac"		"4"
+			}
+			"GetTENext"
+			{
+				"windows"	"8"
+				"linux"		"8"
+				"mac"		"8"
+			}
+			"TE_GetServerClass"
+			{
+				"windows"	"0"
+				"linux"		"0"
+				"mac"		"0"
+			}
+		}
+
+		"Signatures"
+		{
+			/* This isn't CBaseTempEntity::CBaseTempEntity on gmod, it's a randon one of now many, many funcs that have
+			 * the s_pTempEntities ptr available due to inlining
+			 */
+			"CBaseTempEntity"
+			{
+				"library"	"server"
+				"windows"	"\x55\x8B\xEC\x51\x0F\x57\xC0\xA1\x2A\x2A\x2A\x2A\x8D\x4D\xFC\xA3"
+			}
+			"s_pTempEntities"
+			{
+				"library"	"server"
+				"linux"		"@_ZN15CBaseTempEntity15s_pTempEntitiesE"
+				"mac"		"@_ZN15CBaseTempEntity15s_pTempEntitiesE"
+			}
+		}
+	}
+	
+	"garrysmod"
+	{
+		"Signatures"
+		{
+			"EntityFactory"
+			{
+				"library"	"server"
+				"windows"	"\x55\x8B\xEC\x51\x56\x8D\x2A\x2A\xBE\x2A\x2A\x2A\x2A\xC7\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x2A\xC7\x2A\x2A\x2A\x2A\x2A\x2A\xE8"
+				"linux"		"@_Z23EntityFactoryDictionaryv"
+				"mac"		"@_Z23EntityFactoryDictionaryv"
+			}
+		}
+	}
+	
+	"garrysmod"
+	{
+		"Signatures"
+		{
+			"FireOutput"
+			{
+				"library"	"server"
+				"windows"	"\x55\x8B\xEC\x83\x2A\x2A\x81\x2A\x2A\x2A\x2A\x2A\x8B\x2A\x2A\x53\x56\x8B\x2A\x2A\x85\xF6\x57"
+				"linux"		"@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f"
+				"mac"		"@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f"
 			}
 		}
 	}