From 99f7ee05885e272cc8215a7877f8970f03440d35 Mon Sep 17 00:00:00 2001
From: Nicholas Hastings <nshastings@gmail.com>
Date: Sun, 26 Mar 2017 11:04:52 -0400
Subject: [PATCH] Update Empires gamedata (supercedes #599).

---
 gamedata/sdkhooks.games/game.empires.txt | 55 +++++++++++++++---------
 gamedata/sdktools.games/game.empires.txt | 51 +++++++++++-----------
 2 files changed, 60 insertions(+), 46 deletions(-)

diff --git a/gamedata/sdkhooks.games/game.empires.txt b/gamedata/sdkhooks.games/game.empires.txt
index 6451fc92..ef34226b 100644
--- a/gamedata/sdkhooks.games/game.empires.txt
+++ b/gamedata/sdkhooks.games/game.empires.txt
@@ -4,6 +4,11 @@
 	{
 		"Offsets"
 		{
+			"Blocked"
+			{
+				"windows"	"104"
+				"linux"		"105"
+			}
 			"EndTouch"
 			{
 				"windows"	"102"
@@ -14,25 +19,35 @@
 				"windows"	"114"
 				"linux"		"115"
 			}
+			"GetMaxHealth"
+			{
+				"windows"	"119"
+				"linux"		"120"
+			}
+			"GroundEntChanged"
+			{
+				"windows"	"182"
+				"linux"		"184"
+			}
 			"OnTakeDamage"
 			{
 				"windows"	"62"
 				"linux"		"63"
 			}
 			"PreThink"
-			{
-				"windows"	"336"
-				"linux"		"337"
-			}
-			"PostThink"
 			{
 				"windows"	"337"
 				"linux"		"338"
 			}
+			"PostThink"
+			{
+				"windows"	"338"
+				"linux"		"339"
+			}
 			"Reload"
 			{
-				"windows"	"273"
-				"linux"		"274"
+				"windows"	"276"
+				"linux"		"277"
 			}
 			"SetTransmit"
 			{
@@ -81,29 +96,29 @@
 			}
 			"Weapon_CanSwitchTo"
 			{
-				"windows"	"270"
-				"linux"		"271"
+				"windows"	"271"
+				"linux"		"272"
 			}
 			"Weapon_CanUse"
-			{
-				"windows"	"264"
-				"linux"		"265"
-			}
-			"Weapon_Drop"
-			{
-				"windows"	"267"
-				"linux"		"268"
-			}
-			"Weapon_Equip"
 			{
 				"windows"	"265"
 				"linux"		"266"
 			}
-			"Weapon_Switch"
+			"Weapon_Drop"
 			{
 				"windows"	"268"
 				"linux"		"269"
 			}
+			"Weapon_Equip"
+			{
+				"windows"	"266"
+				"linux"		"267"
+			}
+			"Weapon_Switch"
+			{
+				"windows"	"269"
+				"linux"		"270"
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/gamedata/sdktools.games/game.empires.txt b/gamedata/sdktools.games/game.empires.txt
index ff8aa940..9c075397 100644
--- a/gamedata/sdktools.games/game.empires.txt
+++ b/gamedata/sdktools.games/game.empires.txt
@@ -19,8 +19,7 @@
 			/* Offset into CBaseTempEntity constructor */
 			"s_pTempEntities"
 			{
-				"windows"	"19"
-				"linux"		"20"
+				"windows"	"16"
 			}
 			"GetTEName"
 			{
@@ -47,12 +46,12 @@
 			"CBaseTempEntity"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x8B\xC1\x8B\x4D\x2A\xC7\x00\x2A\x2A\x2A\x2A\x89\x48"
-				"linux"		"\x55\x89\xE5\x8B\x45\x08\x8B\x55\x0C\xC7\x2A\x2A\x2A\x2A\x2A\x89\x50\x04\x8B\x15\x2A\x2A\x2A\x2A\xA3"
+				"windows"	"\x55\x8B\xEC\x8B\x45\x08\x89\x41\x04\xC7\x01"
 			}
 			"s_pTempEntities"
 			{
 				"library"	"server"
+				"linux"		"@_ZN15CBaseTempEntity15s_pTempEntitiesE"
 				"mac"		"@_ZN15CBaseTempEntity15s_pTempEntitiesE"
 			}
 		}
@@ -67,8 +66,8 @@
 			"FindEntityByClassname"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x53\x56\x8B\xF1\x8B\x4D\x2A\x57\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x2A\xFF\xD2\x8B\x00\x25\xFF\x0F\x00\x00\x40\x03\xC0\x8B\x3C\xC6\xEB\x2A\x8B"
-				"linux"		"\x55\x89\xE5\x57\x56\x53\x83\x2A\x2A\x8B\x2A\x2A\x8B\x2A\x2A\x85\xC0\x74\x2A\x8B\x10\x89\x04\x24\xFF\x52\x0C\x8B\x55\x08\x8B\x00\x25\xFF\x0F\x00\x00\xC1\xE0\x04\x8B\x2A\x2A\x2A\xEB\x15\x66"
+				"windows"	"\x55\x8B\xEC\x53\x56\x57\x8B\xF9\x8B\x4D\x08\x85\xC9\x74\x2A\x8B\x01\xFF\x50\x08\x8B\x30"
+				"linux"		"@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc"
 				"mac"		"@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc"
 			}
 		}
@@ -82,8 +81,8 @@
 			"FireOutput"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x81\x2A\x2A\x2A\x2A\x2A\xA1\x2A\x2A\x2A\x2A\x33\xC5\x89\x45\x2A\x8B\x45\x2A\x53\x56\x8B\x2A\x2A\x57\x8B\x2A\x2A\x89\x2A\x2A\x2A\x2A\x2A\x89\x2A\x2A\x2A\x2A\x2A\x89\x2A\x2A\x2A\x2A\x2A\xC7"
-				"linux"		"\x55\x89\xE5\x57\x56\x53\x81\xEC\x2A\x2A\x2A\x2A\x8B\x2A\x2A\x65\x2A\x2A\x2A\x2A\x2A\x89\x2A\x2A\x31\xC0\x8B\x2A\x2A\x8B\x2A\x2A\x8B\x2A\x2A\x8B\x2A\x2A\x89\x2A\x2A\x2A\x2A\x2A\x89\x2A\x2A\x2A\x2A\x2A\x89"
+				"windows"	"\x55\x8B\xEC\x81\xEC\x30\x01\x00\x00\xA1\x2A\x2A\x2A\x2A\x33\xC5\x89\x45\xFC\x53"
+				"linux"		"@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f"
 				"mac"		"@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f"
 			}
 		}
@@ -95,28 +94,28 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"404"
-				"linux"		"405"
+				"windows"	"405"
+				"linux"		"406"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"274"
-				"linux"		"275"
+				"windows"	"275"
+				"linux"		"276"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"272"
-				"linux"		"273"
+				"windows"	"273"
+				"linux"		"274"
 			}
 			"Ignite"
 			{
-				"windows"	"213"
-				"linux"		"214"
+				"windows"	"214"
+				"linux"		"215"
 			}
 			"Extinguish"
 			{
-				"windows"	"217"
-				"linux"		"218"
+				"windows"	"218"
+				"linux"		"219"
 			}
 			"Teleport"
 			{
@@ -125,8 +124,8 @@
 			}
 			"CommitSuicide"
 			{
-				"windows"	"444"
-				"linux"		"444"
+				"windows"	"445"
+				"linux"		"445"
 			}
 			"GetVelocity"
 			{
@@ -155,18 +154,18 @@
 			}
 			"WeaponEquip"
 			{
-				"windows"	"265"
-				"linux"		"266"
+				"windows"	"266"
+				"linux"		"267"
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"422"
-				"linux"		"423"
+				"windows"	"423"
+				"linux"		"424"
 			}
 			"GiveAmmo"
 			{
-				"windows"	"256"
-				"linux"		"257"
+				"windows"	"257"
+				"linux"		"258"
 			}
 		}