Update versioning for 1.6.3 release.

changelog.txt

@@ -1,5 +1,19 @@
 SourceMod Changelog
 
+SourceMod 1.6.3 [2014-11-25]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.6.3_Release_Notes
+
+User Changes:
+ - Updated game support for TF2, CS:GO, No More Room in Hell, Insurgency, PVK2 and Fistful of Frags.
+ - Made changes to make TF2, CSS, DoDS, HL2DM, and SDK 2013 mods less likely to break on game update (PR 174, PR 192).
+ - Added support for longer key names in languages.cfg (to fix Portuguese) (bug 6282, PR 208).
+
+Developer Changes:
+ - Updated TF2 player condition and holiday enums (Ross "Powerlord" Bemrose) (PR 183, PR 181).
+ - Add support for TF2 player conditions >= 96 for condition functions/forwards (PR 205).
+
+----------------------------------------------------------
 SourceMod 1.6.2 [2014-09-20]
 
 URL: http://wiki.alliedmods.net/SourceMod_1.6.2_Release_Notes

core/HalfLife2.cpp

@@ -153,6 +153,18 @@ void CHalfLife2::OnSourceModAllInitialized_Post()
 
 void CHalfLife2::InitLogicalEntData()
 {
+#if SOURCE_ENGINE == SE_TF2      \
+	|| SOURCE_ENGINE == SE_DODS  \
+	|| SOURCE_ENGINE == SE_HL2DM \
+	|| SOURCE_ENGINE == SE_CSS   \
+	|| SOURCE_ENGINE == SE_SDK2013
+
+	if (g_SMAPI->GetServerFactory(false)("VSERVERTOOLS003", NULL))
+	{
+		g_EntList = servertools->GetEntityList();
+	}
+#endif
+
 	char *addr = NULL;
 
 	/*
@@ -162,21 +174,24 @@ void CHalfLife2::InitLogicalEntData()
 	 * If symbols aren't present (Windows or stripped Linux/Mac), 
 	 * attempt find via LevelShutdown + offset
 	 */
-	if (g_pGameConf->GetMemSig("gEntList", (void **)&addr))
+	if (!g_EntList)
 	{
-#if !defined PLATFORM_WINDOWS
+		if (g_pGameConf->GetMemSig("gEntList", (void **) &addr))
-		if (!addr)
 		{
-			// Key exists so notify if lookup fails, but try other method.
-			g_Logger.LogError("Failed lookup of gEntList directly - Reverting to lookup via LevelShutdown");
-		}
-		else
-		{
-#endif
-			g_EntList = reinterpret_cast<void *>(addr);
 #if !defined PLATFORM_WINDOWS
-		}
+			if (!addr)
+			{
+				// Key exists so notify if lookup fails, but try other method.
+				g_Logger.LogError("Failed lookup of gEntList directly - Reverting to lookup via LevelShutdown");
+			}
+			else
+			{
 #endif
+				g_EntList = reinterpret_cast<void *>(addr);
+#if !defined PLATFORM_WINDOWS
+			}
+#endif
+		}
 	}
 
 	if (!g_EntList)

core/logic/Translator.cpp

@@ -887,6 +887,14 @@ SMCResult Translator::ReadSMC_LeavingSection(const SMCStates *states)
 
 SMCResult Translator::ReadSMC_KeyValue(const SMCStates *states, const char *key, const char *value)
 {
+	size_t len = strlen(key);
+
+	if (len >= sizeof(((Language *)0)->m_code2))
+	{
+		smcore.LogError("[SM] Warning encountered parsing languages.cfg file.");
+		smcore.LogError("[SM] Invalid language code \"%s\" is too long.", key);
+	}
+
 	AddLanguage(key, value);
 
 	return SMCResult_Continue;

core/logic/Translator.h

@@ -54,7 +54,7 @@ enum PhraseParseState
 
 struct Language
 {
-	char m_code2[4];
+	char m_code2[32];
 	int m_CanonicalName;
 };
 

core/smn_halflife.cpp

@@ -35,9 +35,11 @@
 #include "PlayerManager.h"
 #include "HalfLife2.h"
 
+#include <vstdlib/random.h>
+
 static cell_t SetRandomSeed(IPluginContext *pContext, const cell_t *params)
 {
-	engrandom->SetSeed(params[1]);
+	::RandomSeed(params[1]);
 
 	return 1;
 }
@@ -47,14 +49,14 @@ static cell_t GetRandomFloat(IPluginContext *pContext, const cell_t *params)
 	float fMin = sp_ctof(params[1]);
 	float fMax = sp_ctof(params[2]);
 
-	float fRandom = engrandom->RandomFloat(fMin, fMax);
+	float fRandom = ::RandomFloat(fMin, fMax);
 
 	return sp_ftoc(fRandom);
 }
 
 static cell_t GetRandomInt(IPluginContext *pContext, const cell_t *params)
 {
-	return engrandom->RandomInt(params[1], params[2]);
+	return ::RandomInt(params[1], params[2]);
 }
 
 static cell_t IsMapValid(IPluginContext *pContext, const cell_t *params)

core/sourcemm_api.cpp

@@ -45,13 +45,13 @@ ISmmPluginManager *g_pMMPlugins = NULL;
 CGlobalVars *gpGlobals = NULL;
 ICvar *icvar = NULL;
 IGameEventManager2 *gameevents = NULL;
-IUniformRandomStream *engrandom = NULL;
 CallClass<IVEngineServer> *enginePatch = NULL;
 CallClass<IServerGameDLL> *gamedllPatch = NULL;
 IPlayerInfoManager *playerinfo = NULL;
 IBaseFileSystem *basefilesystem = NULL;
 IFileSystem *filesystem = NULL;
 IEngineSound *enginesound = NULL;
+IServerTools *servertools = NULL;
 IServerPluginHelpers *serverpluginhelpers = NULL;
 IServerPluginCallbacks *vsp_interface = NULL;
 int vsp_version = 0;
@@ -67,10 +67,10 @@ bool SourceMod_Core::Load(PluginId id, ISmmAPI *ismm, char *error, size_t maxlen
 	GET_V_IFACE_CURRENT(GetServerFactory, serverClients, IServerGameClients, INTERFACEVERSION_SERVERGAMECLIENTS);
 	GET_V_IFACE_CURRENT(GetEngineFactory, icvar, ICvar, CVAR_INTERFACE_VERSION);
 	GET_V_IFACE_CURRENT(GetEngineFactory, gameevents, IGameEventManager2, INTERFACEVERSION_GAMEEVENTSMANAGER2);
-	GET_V_IFACE_CURRENT(GetEngineFactory, engrandom, IUniformRandomStream, VENGINE_SERVER_RANDOM_INTERFACE_VERSION);
 	GET_V_IFACE_CURRENT(GetFileSystemFactory, basefilesystem, IBaseFileSystem, BASEFILESYSTEM_INTERFACE_VERSION);
 	GET_V_IFACE_CURRENT(GetFileSystemFactory, filesystem, IFileSystem, FILESYSTEM_INTERFACE_VERSION);
 	GET_V_IFACE_CURRENT(GetEngineFactory, enginesound, IEngineSound, IENGINESOUND_SERVER_INTERFACE_VERSION);
+	GET_V_IFACE_CURRENT(GetServerFactory, servertools, IServerTools, VSERVERTOOLS_INTERFACE_VERSION);
 #if SOURCE_ENGINE != SE_DOTA
 	GET_V_IFACE_CURRENT(GetEngineFactory, serverpluginhelpers, IServerPluginHelpers, INTERFACEVERSION_ISERVERPLUGINHELPERS);
 #endif

core/sourcemm_api.h

@@ -47,9 +47,9 @@
 #include <eiface.h>
 #include <igameevents.h>
 #include <iplayerinfo.h>
-#include <random.h>
 #include <filesystem.h>
 #include <IEngineSound.h>
+#include <toolframework/itoolentity.h>
 
 #ifndef METAMOD_PLAPI_VERSION
 	#include <metamod_wrappers.h>
@@ -98,11 +98,11 @@ extern CGlobalVars *gpGlobals;
 extern IGameEventManager2 *gameevents;
 extern SourceHook::CallClass<IVEngineServer> *enginePatch;
 extern SourceHook::CallClass<IServerGameDLL> *gamedllPatch;
-extern IUniformRandomStream *engrandom;
 extern IPlayerInfoManager *playerinfo;
 extern IBaseFileSystem *basefilesystem;
 extern IFileSystem *filesystem;
 extern IEngineSound *enginesound;
+extern IServerTools *servertools;
 extern IServerPluginHelpers *serverpluginhelpers;
 extern IServerPluginCallbacks *vsp_interface;
 extern int vsp_version;

extensions/sdktools/tempents.cpp

@@ -285,36 +285,46 @@ void TempEntityManager::Initialize()
 	int offset;
 	m_Loaded = false;
 
-#if SOURCE_ENGINE == SE_TF2
+#if SOURCE_ENGINE == SE_TF2      \
-	m_ListHead = servertools->GetTempEntList();
+	|| SOURCE_ENGINE == SE_DODS  \
-#else
+	|| SOURCE_ENGINE == SE_HL2DM \
-	/*
+	|| SOURCE_ENGINE == SE_CSS   \
-	 * First try to lookup s_pTempEntities directly for platforms with symbols.
+	|| SOURCE_ENGINE == SE_SDK2013
-	 * If symbols aren't present (Windows or stripped Linux/Mac), 
-	 * attempt find via CBaseTempEntity ctor + offset
-	 */
 
-	/* Read our sigs and offsets from the config file */
+	if (g_SMAPI->GetServerFactory(false)("VSERVERTOOLS003", NULL))
-	if (g_pGameConf->GetMemSig("s_pTempEntities", &addr) && addr)
 	{
-		
+		m_ListHead = servertools->GetTempEntList();
-		/* Store the head of the TE linked list */
-		m_ListHead = *(void **)addr;
 	}
-	else if (g_pGameConf->GetMemSig("CBaseTempEntity", &addr) && addr)
+	else
+#endif
 	{
-		if (!g_pGameConf->GetOffset("s_pTempEntities", &offset))
+		/*
+		 * First try to lookup s_pTempEntities directly for platforms with symbols.
+		 * If symbols aren't present (Windows or stripped Linux/Mac),
+		 * attempt find via CBaseTempEntity ctor + offset
+		 */
+
+		/* Read our sigs and offsets from the config file */
+		if (g_pGameConf->GetMemSig("s_pTempEntities", &addr) && addr)
+		{
+
+			/* Store the head of the TE linked list */
+			m_ListHead = *(void **) addr;
+		}
+		else if (g_pGameConf->GetMemSig("CBaseTempEntity", &addr) && addr)
+		{
+			if (!g_pGameConf->GetOffset("s_pTempEntities", &offset))
+			{
+				return;
+			}
+			/* Store the head of the TE linked list */
+			m_ListHead = **(void ***) ((unsigned char *) addr + offset);
+		}
+		else
 		{
 			return;
 		}
-		/* Store the head of the TE linked list */
-		m_ListHead = **(void ***)((unsigned char *)addr + offset);
 	}
-	else
-	{
-		return;
-	}
-#endif // == TF2
 
 	if (!g_pGameConf->GetOffset("GetTEName", &m_NameOffs))
 	{

extensions/sdktools/vglobals.cpp

@@ -130,9 +130,19 @@ bool UTIL_VerifySignature(const void *addr, const char *sig, size_t len)
 
 void GetIServer()
 {
-#if SOURCE_ENGINE == SE_TF2
+#if SOURCE_ENGINE == SE_TF2      \
-	iserver = engine->GetIServer();
+	|| SOURCE_ENGINE == SE_DODS  \
-#else
+	|| SOURCE_ENGINE == SE_HL2DM \
+	|| SOURCE_ENGINE == SE_CSS   \
+	|| SOURCE_ENGINE == SE_SDK2013
+
+	if (g_SMAPI->GetEngineFactory(false)("VEngineServer022", NULL))
+	{
+		iserver = engine->GetIServer();
+		return;
+	}
+#endif
+
 	void *addr;
 	const char *sigstr;
 	char sig[32];
@@ -191,7 +201,6 @@ void GetIServer()
 
 	/* Finally we have the interface we were looking for */
 	iserver = *reinterpret_cast<IServer **>(reinterpret_cast<unsigned char *>(vfunc) + offset);
-#endif // !TF2
 }
 
 void GetResourceEntity()

extensions/sdktools/vnatives.cpp

@@ -714,7 +714,7 @@ static cell_t GetClientEyeAngles(IPluginContext *pContext, const cell_t *params)
 	return got_angles ? 1 : 0;
 }
 
-#if SOURCE_ENGINE >= SE_ORANGEBOX && SOURCE_ENGINE != SE_TF2
+#if SOURCE_ENGINE >= SE_ORANGEBOX
 static cell_t NativeFindEntityByClassname(IPluginContext *pContext, const cell_t *params)
 {
 	char *searchname;
@@ -793,25 +793,35 @@ static cell_t NativeFindEntityByClassname(IPluginContext *pContext, const cell_t
 
 static cell_t FindEntityByClassname(IPluginContext *pContext, const cell_t *params)
 {
-#if SOURCE_ENGINE == SE_TF2
+#if SOURCE_ENGINE == SE_TF2      \
-	CBaseEntity *pStartEnt = NULL;
+	|| SOURCE_ENGINE == SE_DODS  \
-	if (params[1] != -1)
+	|| SOURCE_ENGINE == SE_HL2DM \
+	|| SOURCE_ENGINE == SE_CSS   \
+	|| SOURCE_ENGINE == SE_SDK2013
+
+	static bool bHasServerTools3 = !!g_SMAPI->GetServerFactory(false)("VSERVERTOOLS003", NULL);
+	if (bHasServerTools3)
 	{
-		pStartEnt = gamehelpers->ReferenceToEntity(params[1]);
+		CBaseEntity *pStartEnt = NULL;
-		if (!pStartEnt)
+		if (params[1] != -1)
 		{
-			return pContext->ThrowNativeError("Entity %d (%d) is invalid",
+			pStartEnt = gamehelpers->ReferenceToEntity(params[1]);
-				gamehelpers->ReferenceToIndex(params[1]),
+			if (!pStartEnt)
-				params[1]);
+			{
+				return pContext->ThrowNativeError("Entity %d (%d) is invalid",
+					gamehelpers->ReferenceToIndex(params[1]),
+					params[1]);
+			}
 		}
+
+		char *searchname;
+		pContext->LocalToString(params[2], &searchname);
+
+		CBaseEntity *pEntity = servertools->FindEntityByClassname(pStartEnt, searchname);
+		return gamehelpers->EntityToBCompatRef(pEntity);
 	}
+#endif
 
-	char *searchname;
-	pContext->LocalToString(params[2], &searchname);
-
-	CBaseEntity *pEntity = servertools->FindEntityByClassname(pStartEnt, searchname);
-	return gamehelpers->EntityToBCompatRef(pEntity);
-#else
 	static ValveCall *pCall = NULL;
 	static bool bProbablyNoFEBC = false;
 
@@ -869,7 +879,6 @@ static cell_t FindEntityByClassname(IPluginContext *pContext, const cell_t *para
 	FINISH_CALL_SIMPLE(&pEntity);
 
 	return gamehelpers->EntityToBCompatRef(pEntity);
-#endif // == TF2
 }
 
 #if SOURCE_ENGINE >= SE_ORANGEBOX

gamedata/core.games/common.games.txt

@@ -159,6 +159,7 @@
 			"game"					"nucleardawn"
 			"game"					"csgo"
 			"game"					"berimbau"
+			"game"					"nmrih"
 		}
 
 		"Keys"
@@ -192,6 +193,7 @@
 			"game"					"csgo"
 			"game"					"berimbau"
 			"game"					"$INSURGENCY" // retail game
+			"game"					"nmrih"
 		}
 		
 		"Keys"

gamedata/sdkhooks.games/engine.csgo.txt

@@ -35,17 +35,17 @@
 				"mac"		"68"
 			}
 			"PreThink"
-			{
-				"windows"	"364"
-				"linux"		"365"
-				"mac"		"365"
-			}
-			"PostThink"
 			{
 				"windows"	"365"
 				"linux"		"366"
 				"mac"		"366"
 			}
+			"PostThink"
+			{
+				"windows"	"366"
+				"linux"		"367"
+				"mac"		"367"
+			}
 			"Reload"
 			{
 				"windows"	"308"
@@ -172,4 +172,4 @@
 			}
 		}
 	}
-}
+}

gamedata/sdkhooks.games/engine.ep2v.txt

@@ -36,22 +36,22 @@
 				"mac"		"63"
 			}
 			"PreThink"
-			{
-				"windows"	"331"
-				"linux"		"332"
-				"mac"		"332"
-			}
-			"PostThink"
 			{
 				"windows"	"332"
 				"linux"		"333"
 				"mac"		"333"
 			}
+			"PostThink"
+			{
+				"windows"	"333"
+				"linux"		"334"
+				"mac"		"334"
+			}
 			"Reload"
 			{
-				"windows"	"272"
+				"windows"	"273"
-				"linux"		"278"
+				"linux"		"279"
-				"mac"		"278"
+				"mac"		"279"
 			}
 			"SetTransmit"
 			{
@@ -109,34 +109,34 @@
 			}
 			"Weapon_CanSwitchTo"
 			{
-				"windows"	"265"
+				"windows"	"266"
-				"linux"		"266"
+				"linux"		"267"
-				"mac"		"266"
+				"mac"		"267"
 			}
 			"Weapon_CanUse"
-			{
-				"windows"	"259"
-				"linux"		"260"
-				"mac"		"260"
-			}
-			"Weapon_Drop"
-			{
-				"windows"	"262"
-				"linux"		"263"
-				"mac"		"263"
-			}
-			"Weapon_Equip"
 			{
 				"windows"	"260"
 				"linux"		"261"
 				"mac"		"261"
 			}
-			"Weapon_Switch"
+			"Weapon_Drop"
 			{
 				"windows"	"263"
 				"linux"		"264"
 				"mac"		"264"
 			}
+			"Weapon_Equip"
+			{
+				"windows"	"261"
+				"linux"		"262"
+				"mac"		"262"
+			}
+			"Weapon_Switch"
+			{
+				"windows"	"264"
+				"linux"		"265"
+				"mac"		"265"
+			}
 		}
 	}
 	

gamedata/sdkhooks.games/engine.insurgency.txt

@@ -6,136 +6,136 @@
 		{
 			"EndTouch"
 			{
-				"windows"	"104"
+				"windows"	"106"
-				"linux"		"105"
+				"linux"		"107"
-				"mac"		"105"
+				"mac"		"107"
 			}
 			"FireBullets"
 			{
-				"windows"	"117"
+				"windows"	"119"
-				"linux"		"118"
+				"linux"		"120"
-				"mac"		"118"
+				"mac"		"120"
 			}
 			"GetMaxHealth"
 			{
-				"windows"	"121"
+				"windows"	"123"
-				"linux"		"122"
+				"linux"		"124"
-				"mac"		"122"				
+				"mac"		"124"				
 			}
 			"GroundEntChanged"
 			{
-				"windows"	"175"
+				"windows"	"177"
-				"linux"		"177"
+				"linux"		"179"
-				"mac"		"177"
+				"mac"		"179"
 			}
 			"OnTakeDamage"
 			{
-				"windows"	"65"
+				"windows"	"67"
-				"linux"		"66"
+				"linux"		"68"
-				"mac"		"66"
+				"mac"		"68"
 			}
 			"PreThink"
 			{
-				"windows"	"357"
+				"windows"	"360"
-				"linux"		"358"
+				"linux"		"361"
-				"mac"		"358"
+				"mac"		"361"
 			}
 			"PostThink"
 			{
-				"windows"	"358"
+				"windows"	"361"
-				"linux"		"359"
+				"linux"		"362"
-				"mac"		"359"
+				"mac"		"362"
 			}
 			"Reload"
 			{
-				"windows"	"281"
+				"windows"	"284"
-				"linux"		"282"
+				"linux"		"285"
-				"mac"		"282"
+				"mac"		"285"
 			}
 			"SetTransmit"
-			{
-				"windows"	"20"
-				"linux"		"21"
-				"mac"		"21"
-			}
-			"ShouldCollide"
-			{
-				"windows"	"16"
-				"linux"		"17"
-				"mac"		"17"
-			}
-			"Spawn"
 			{
 				"windows"	"22"
 				"linux"		"23"
 				"mac"		"23"
 			}
+			"ShouldCollide"
+			{
+				"windows"	"17"
+				"linux"		"18"
+				"mac"		"18"
+			}
+			"Spawn"
+			{
+				"windows"	"24"
+				"linux"		"25"
+				"mac"		"25"
+			}
 			"StartTouch"
 			{
-				"windows"	"102"
+				"windows"	"104"
-				"linux"		"103"
+				"linux"		"105"
-				"mac"		"103"
+				"mac"		"105"
 			}
 			"Think"
 			{
-				"windows"	"49"
+				"windows"	"51"
-				"linux"		"50"
+				"linux"		"52"
-				"mac"		"50"
+				"mac"		"52"
 			}
 			"Touch"
+			{
+				"windows"	"105"
+				"linux"		"106"
+				"mac"		"106"
+			}
+			"TraceAttack"
+			{
+				"windows"	"65"
+				"linux"		"66"
+				"mac"		"66"
+			}
+			"Use"
 			{
 				"windows"	"103"
 				"linux"		"104"
 				"mac"		"104"
 			}
-			"TraceAttack"
-			{
-				"windows"	"63"
-				"linux"		"64"
-				"mac"		"64"
-			}
-			"Use"
-			{
-				"windows"	"101"
-				"linux"		"102"
-				"mac"		"102"
-			}
 			"VPhysicsUpdate"
 			{
-				"windows"	"154"
+				"windows"	"156"
-				"linux"		"155"
+				"linux"		"157"
-				"mac"		"155"
+				"mac"		"157"
 			}
 			"Weapon_CanSwitchTo"
 			{
-				"windows"	"282"
+				"windows"	"285"
-				"linux"		"283"
+				"linux"		"286"
-				"mac"		"283"
+				"mac"		"286"
 			}
 			"Weapon_CanUse"
-			{
-				"windows"	"276"
-				"linux"		"277"
-				"mac"		"277"
-			}
-			"Weapon_Drop"
 			{
 				"windows"	"279"
 				"linux"		"280"
 				"mac"		"280"
 			}
-			"Weapon_Equip"
+			"Weapon_Drop"
 			{
-				"windows"	"277"
+				"windows"	"282"
-				"linux"		"278"
+				"linux"		"283"
-				"mac"		"278"
+				"mac"		"283"
 			}
-			"Weapon_Switch"
+			"Weapon_Equip"
 			{
 				"windows"	"280"
 				"linux"		"281"
 				"mac"		"281"
 			}
+			"Weapon_Switch"
+			{
+				"windows"	"283"
+				"linux"		"284"
+				"mac"		"284"
+			}
 		}
 	}
 	

gamedata/sdkhooks.games/game.fof.txt

@@ -12,9 +12,9 @@
 			}
 			"FireBullets"
 			{
-				"windows"	"113"
+				"windows"	"112"
-				"linux"		"114"
+				"linux"		"113"
-				"mac"		"114"
+				"mac"		"113"
 			}
 			"OnTakeDamage"
 			{
@@ -24,15 +24,15 @@
 			}
 			"PreThink"
 			{
-				"windows"	"333"
+				"windows"	"332"
-				"linux"		"334"
+				"linux"		"333"
-				"mac"		"334"
+				"mac"		"333"
 			}
 			"PostThink"
 			{
-				"windows"	"334"
+				"windows"	"333"
-				"linux"		"335"
+				"linux"		"334"
-				"mac"		"335"
+				"mac"		"334"
 			}
 			"SetTransmit"
 			{
@@ -84,34 +84,34 @@
 			}
 			"Weapon_CanSwitchTo"
 			{
-				"windows"	"267"
+				"windows"	"266"
-				"linux"		"268"
+				"linux"		"267"
-				"mac"		"268"
+				"mac"		"267"
 			}
 			"Weapon_CanUse"
+			{
+				"windows"	"260"
+				"linux"		"261"
+				"mac"		"261"
+			}
+			"Weapon_Drop"
+			{
+				"windows"	"263"
+				"linux"		"264"
+				"mac"		"264"
+			}
+			"Weapon_Equip"
 			{
 				"windows"	"261"
 				"linux"		"262"
 				"mac"		"262"
 			}
-			"Weapon_Drop"
+			"Weapon_Switch"
 			{
 				"windows"	"264"
 				"linux"		"265"
 				"mac"		"265"
 			}
-			"Weapon_Equip"
-			{
-				"windows"	"262"
-				"linux"		"263"
-				"mac"		"263"
-			}
-			"Weapon_Switch"
-			{
-				"windows"	"265"
-				"linux"		"266"
-				"mac"		"266"
-			}
 		}
 	}
 }

gamedata/sdkhooks.games/game.nmrih.txt

@@ -6,21 +6,21 @@
 		{
 			"EndTouch"
 			{
-				"windows"	"101"
+				"windows"	"102"
-				"linux"		"102"
+				"linux"		"103"
-				"mac"		"102"
+				"mac"		"103"
 			}
 			"FireBullets"
 			{
-				"windows"	"113"
+				"windows"	"114"
-				"linux"		"114"
+				"linux"		"115"
-				"mac"		"114"
+				"mac"		"115"
 			}
 			"GroundEntChanged"
 			{
-				"windows"	"178"
+				"windows"	"179"
-				"linux"		"180"
+				"linux"		"181"
-				"mac"		"180"
+				"mac"		"181"
 			}
 			"OnTakeDamage"
 			{
@@ -30,21 +30,21 @@
 			}
 			"PreThink"
 			{
-				"windows"	"345"
+				"windows"	"346"
-				"linux"		"346"
+				"linux"		"347"
-				"mac"		"346"
+				"mac"		"347"
 			}
 			"PostThink"
 			{
-				"windows"	"325"
+				"windows"	"326"
-				"linux"		"326"
+				"linux"		"327"
-				"mac"		"325"
+				"mac"		"327"
 			}
 			"Reload"
 			{
-				"windows"	"269"
+				"windows"	"271"
-				"linux"		"270"
+				"linux"		"272"
-				"mac"		"270"
+				"mac"		"272"
 			}
 			"SetTransmit"
 			{
@@ -66,9 +66,9 @@
 			}
 			"StartTouch"
 			{
-				"windows"	"99"
+				"windows"	"100"
-				"linux"		"100"
+				"linux"		"101"
-				"mac"		"100"
+				"mac"		"101"
 			}
 			"Think"
 			{
@@ -78,9 +78,9 @@
 			}
 			"Touch"
 			{
-				"windows"	"100"
+				"windows"	"101"
-				"linux"		"101"
+				"linux"		"102"
-				"mac"		"101"
+				"mac"		"102"
 			}
 			"TraceAttack"
 			{
@@ -90,46 +90,46 @@
 			}
 			"Use"
 			{
-				"windows"	"97"
+				"windows"	"98"
-				"linux"		"98"
+				"linux"		"99"
-				"mac"		"98"
+				"mac"		"99"
 			}
 			"VPhysicsUpdate"
 			{
-				"windows"	"158"
+				"windows"	"159"
-				"linux"		"159"
+				"linux"		"160"
-				"mac"		"159"
+				"mac"		"160"
 			}
 			"Weapon_CanSwitchTo"
 			{
-				"windows"	"267"
+				"windows"	"268"
-				"linux"		"268"
+				"linux"		"269"
-				"mac"		"268"
+				"mac"		"269"
 			}
 			"Weapon_CanUse"
-			{
-				"windows"	"261"
-				"linux"		"262"
-				"mac"		"262"
-			}
-			"Weapon_Drop"
-			{
-				"windows"	"264"
-				"linux"		"265"
-				"mac"		"265"
-			}
-			"Weapon_Equip"
 			{
 				"windows"	"262"
 				"linux"		"263"
 				"mac"		"263"
 			}
-			"Weapon_Switch"
+			"Weapon_Drop"
 			{
 				"windows"	"265"
 				"linux"		"266"
 				"mac"		"266"
 			}
+			"Weapon_Equip"
+			{
+				"windows"	"263"
+				"linux"		"264"
+				"mac"		"264"
+			}
+			"Weapon_Switch"
+			{
+				"windows"	"266"
+				"linux"		"267"
+				"mac"		"267"
+			}
 		}
 	}
 }

gamedata/sdkhooks.games/game.pvkii.txt

@@ -1,119 +1,153 @@
 "Games"
 {
-	/* Pirates, Vikings and Knights II 2.3 */
+	/* Pirates, Vikings and Knights II */
 	"pvkii"
 	{
 		"Offsets"
 		{
+			"Blocked"
+			{
+				"windows"	"103"
+				"linux"		"104"
+				"mac"		"104"
+			}
 			"EndTouch"
 			{
-				"windows"	"93"
+				"windows"	"101"
-				"linux"		"94"
+				"linux"		"102"
+				"mac"		"102"
 			}
 			"FireBullets"
 			{
-				"windows"	"105"
+				"windows"	"113"
-				"linux"		"106"
+				"linux"		"114"
+				"mac"		"114"
+			}
+			"GetMaxHealth"
+			{
+				"windows"	"118"
+				"linux"		"119"
+				"mac"		"119"
+			}
+			"GroundEntChanged"
+			{
+				"windows"	"178"
+				"linux"		"180"
+				"mac"		"180"
 			}
 			"OnTakeDamage"
 			{
-				"windows"	"61"
+				"windows"	"63"
-				"linux"		"62"
+				"linux"		"64"
+				"mac"		"64"
+			}
+			"OnTakeDamage_Alive"
+			{
+				"windows"	"274"
+				"linux"		"275"
+				"mac"		"275"
 			}
 			"PreThink"
 			{
-				"windows"	"292"
+				"windows"	"335"
-				"linux"		"293"
+				"linux"		"336"
+				"mac"		"336"
 			}
 			"PostThink"
 			{
-				"windows"	"293"
+				"windows"	"336"
-				"linux"		"294"
+				"linux"		"337"
+				"mac"		"337"
+			}
+			"Reload"
+			{
+				"windows"	"272"
+				"linux"		"273"
+				"mac"		"273"
 			}
 			"SetTransmit"
 			{
-				"windows"	"20"
+				"windows"	"21"
-				"linux"		"21"
+				"linux"		"22"
+				"mac"		"22"
 			}
 			"ShouldCollide"
 			{
-				"windows"	"15"
+				"windows"	"16"
-				"linux"		"16"
+				"linux"		"17"
+				"mac"		"17"
 			}
 			"Spawn"
 			{
-				"windows"	"22"
+				"windows"	"23"
-				"linux"		"23"
+				"linux"		"24"
+				"mac"		"24"
 			}
 			"StartTouch"
 			{
-				"windows"	"91"
+				"windows"	"99"
-				"linux"		"92"
+				"linux"		"100"
+				"mac"		"100"
 			}
 			"Think"
 			{
-				"windows"	"46"
+				"windows"	"48"
-				"linux"		"47"
+				"linux"		"49"
+				"mac"		"49"
 			}
 			"Touch"
 			{
-				"windows"	"92"
+				"windows"	"100"
-				"linux"		"93"
+				"linux"		"101"
+				"mac"		"101"
 			}
 			"TraceAttack"
 			{
-				"windows"	"59"
+				"windows"	"61"
-				"linux"		"60"
+				"linux"		"62"
-			}
+				"mac"		"62"
-			"UpdateOnRemove"
-			{
-				"windows"	"98"
-				"linux"		"99"
 			}
 			"Use"
 			{
-				"windows"	"90"
+				"windows"	"98"
-				"linux"		"91"
+				"linux"		"99"
+				"mac"		"99"
 			}
 			"VPhysicsUpdate"
 			{
-				"windows"	"145"
+				"windows"	"158"
-				"linux"		"146"
+				"linux"		"159"
+				"mac"		"159"
 			}
 			"Weapon_CanSwitchTo"
 			{
-				"windows"	"237"
+				"windows"	"268"
-				"linux"		"238"
+				"linux"		"269"
+				"mac"		"269"
 			}
 			"Weapon_CanUse"
 			{
-				"windows"	"231"
+				"windows"	"262"
-				"linux"		"232"
+				"linux"		"263"
+				"mac"		"263"
 			}
 			"Weapon_Drop"
 			{
-				"windows"	"234"
+				"windows"	"265"
-				"linux"		"235"
+				"linux"		"266"
+				"mac"		"266"
 			}
 			"Weapon_Equip"
 			{
-				"windows"	"232"
+				"windows"	"263"
-				"linux"		"233"
+				"linux"		"264"
+				"mac"		"264"
 			}
 			"Weapon_Switch"
 			{
-				"windows"	"235"
+				"windows"	"266"
-				"linux"		"236"
+				"linux"		"267"
-			}
+				"mac"		"267"
-		}
-		
-		"Signatures"
-		{
-			"IEntityFactoryDictionary"
-			{
-				"library"	"server"
-				"windows"	"\xB8\x01\x00\x00\x00\x84\x2A\x2A\x2A\x2A\x2A\x75\x1D\x09\x2A\x2A\x2A\x2A\x2A\xB9\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x68\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x83\xC4\x04\xB8\x2A\x2A\x2A\x2A\xC3"
-				"linux"		"@_Z23EntityFactoryDictionaryv"
 			}
 		}
 	}

gamedata/sdktools.games/engine.csgo.txt

@@ -252,15 +252,15 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"444"
+				"windows"	"445"
-				"linux"		"445"
+				"linux"		"446"
-				"mac"		"445"
+				"mac"		"446"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"290"
+				"windows"	"291"
-				"linux"		"291"
+				"linux"		"292"
-				"mac"		"291"
+				"mac"		"292"
 			}
 			"Weapon_GetSlot"
 			{
@@ -288,9 +288,9 @@
 			}
 			"CommitSuicide"
 			{
-				"windows"	"494"
+				"windows"	"495"
-				"linux"		"494"
+				"linux"		"495"
-				"mac"		"494"
+				"mac"		"495"
 			}
 			"GetVelocity"
 			{
@@ -330,9 +330,9 @@
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"464"
+				"windows"	"465"
-				"linux"		"465"
+				"linux"		"466"
-				"mac"		"465"
+				"mac"		"466"
 			}
 			"GiveAmmo"
 			{

gamedata/sdktools.games/engine.ep2.txt

@@ -18,10 +18,8 @@
 		{
 			"game"		"ageofchivalry"
 			"game"		"bg2"
-			"game"		"pvkii"
 			"game"		"gesource"
 			"game"		"fas"
-			"game"		"fistful_of_frags"
 			"game"		"cspromod"
 			"game"		"ag2"
 		}
@@ -71,8 +69,6 @@
 		"#supported"
 		{
 			"game"		"ageofchivalry"
-			"game"		"pvkii"
-			"game"		"fistful_of_frags"
 			"game"		"cspromod"
 			"game"		"ag2"
 		}
@@ -97,12 +93,10 @@
 			"game"		"ageofchivalry"
 			"game"		"zps"
 			"game"		"bg2"
-			"game"		"pvkii"
 			"game"		"gesource"
 			"game"		"RnLBeta"
 			"game"		"obsidian"
 			"game"		"fas"
-			"game"		"fistful_of_frags"
 			"game"		"cspromod"
 			"game"		"ag2"
 		}

gamedata/sdktools.games/engine.insurgency.txt

@@ -237,87 +237,87 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"436"
+				"windows"	"439"
-				"linux"		"437"
+				"linux"		"440"
-				"mac"		"437"
+				"mac"		"440"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"286"
+				"windows"	"289"
-				"linux"		"287"
+				"linux"		"290"
-				"mac"		"287"
+				"mac"		"290"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"284"
+				"windows"	"287"
-				"linux"		"285"
+				"linux"		"288"
-				"mac"		"285"
+				"mac"		"288"
 			}
 			"Ignite"
-			{
-				"windows"	"220"
-				"linux"		"221"
-				"mac"		"221"
-			}
-			"Extinguish"
 			{
 				"windows"	"223"
 				"linux"		"224"
 				"mac"		"224"
 			}
+			"Extinguish"
+			{
+				"windows"	"226"
+				"linux"		"227"
+				"mac"		"227"
+			}
 			"Teleport"
 			{
-				"windows"	"113"
+				"windows"	"115"
-				"linux"		"114"
+				"linux"		"116"
-				"mac"		"114"
+				"mac"		"116"
 			}
 			"CommitSuicide"
 			{
-				"windows"	"484"
+				"windows"	"487"
-				"linux"		"484"
+				"linux"		"487"
-				"mac"		"484"
+				"mac"		"487"
 			}
 			"GetVelocity"
 			{
-				"windows"	"138"
+				"windows"	"140"
-				"linux"		"139"
+				"linux"		"141"
-				"mac"		"139"
+				"mac"		"141"
 			}
 			"EyeAngles"
 			{
-				"windows"	"129"
+				"windows"	"131"
-				"linux"		"130"
+				"linux"		"132"
-				"mac"		"130"
+				"mac"		"132"
 			}
 			"AcceptInput"
 			{
-				"windows"	"38"
+				"windows"	"40"
-				"linux"		"39"
+				"linux"		"41"
-				"mac"		"39"
+				"mac"		"41"
 			}
 			"SetEntityModel"
 			{
-				"windows"	"24"
+				"windows"	"26"
-				"linux"		"25"
+				"linux"		"27"
-				"mac"		"25"
+				"mac"		"27"
 			}
 			"WeaponEquip"
 			{
-				"windows"	"277"
+				"windows"	"280"
-				"linux"		"278"
+				"linux"		"281"
-				"mac"		"278"
+				"mac"		"281"
 			}
 			"Activate"
 			{
-				"windows"	"34"
+				"windows"	"36"
-				"linux"		"35"
+				"linux"		"37"
-				"mac"		"35"
+				"mac"		"37"
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"455"
+				"windows"	"458"
-				"linux"		"456"
+				"linux"		"459"
-				"mac"		"456"
+				"mac"		"459"
 			}
 		}
 	}

gamedata/sdktools.games/engine.sdk2013.txt

@@ -11,6 +11,32 @@
 
 "Games"
 {
+	/* General Temp Entities */
+	"#default"
+	{
+		"Offsets"
+		{
+			"GetTEName"
+			{
+				"windows"	"4"
+				"linux"		"4"
+				"mac"		"4"
+			}
+			"GetTENext"
+			{
+				"windows"	"8"
+				"linux"		"8"
+				"mac"		"8"
+			}
+			"TE_GetServerClass"
+			{
+				"windows"	"0"
+				"linux"		"0"
+				"mac"		"0"
+			}
+		}
+	}
+	
 	/* IServer interface pointer */
 	"#default"
 	{

gamedata/sdktools.games/game.fof.txt

@@ -131,57 +131,57 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"402"
+				"windows"	"401"
-				"linux"		"403"
+				"linux"		"402"
-				"mac"		"403"
+				"mac"		"402"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"271"
+				"windows"	"270"
-				"linux"		"272"
+				"linux"		"271"
-				"mac"		"272"
+				"mac"		"271"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"269"
+				"windows"	"268"
-				"linux"		"270"
+				"linux"		"279"
-				"mac"		"270"
+				"mac"		"279"
 			}
 			"Ignite"
 			{
-				"windows"	"210"
+				"windows"	"209"
-				"linux"		"211"
+				"linux"		"210"
-				"mac"		"211"
+				"mac"		"210"
 			}
 			"Extinguish"
 			{
-				"windows"	"214"
+				"windows"	"213"
-				"linux"		"215"
+				"linux"		"214"
-				"mac"		"215"
+				"mac"		"214"
 			}
 			"Teleport"
 			{
-				"windows"	"109"
+				"windows"	"108"
-				"linux"		"110"
+				"linux"		"109"
-				"mac"		"110"
+				"mac"		"109"
 			}
 			"CommitSuicide"
 			{
-				"windows"	"444"
+				"windows"	"443"
-				"linux"		"444"
+				"linux"		"443"
-				"mac"		"444"
+				"mac"		"443"
 			}
 			"GetVelocity"
 			{
-				"windows"	"141"
+				"windows"	"140"
-				"linux"		"142"
+				"linux"		"141"
-				"mac"		"142"
+				"mac"		"141"
 			}
 			"EyeAngles"
 			{
-				"windows"	"132"
+				"windows"	"131"
-				"linux"		"133"
+				"linux"		"132"
-				"mac"		"133"
+				"mac"		"132"
 			}
 			"AcceptInput"
 			{
@@ -197,9 +197,9 @@
 			}
 			"WeaponEquip"
 			{
-				"windows"	"262"
+				"windows"	"261"
-				"linux"		"263"
+				"linux"		"262"
-				"mac"		"263"
+				"mac"		"262"
 			}
 			"Activate"
 			{
@@ -209,15 +209,15 @@
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"420"
+				"windows"	"419"
-				"linux"		"421"
+				"linux"		"420"
-				"mac"		"421"
+				"mac"		"420"
 			}
 			"GiveAmmo"
 			{
-				"windows"	"253"
+				"windows"	"252"
-				"linux"		"254"
+				"linux"		"253"
-				"mac"		"254"
+				"mac"		"253"
 			}
 		}
 	}

gamedata/sdktools.games/game.nmrih.txt

@@ -19,7 +19,7 @@
 			/* Offset into CBaseTempEntity constructor */
 			"s_pTempEntities"
 			{
-				"windows"	"19"
+				"windows"	"16"
 			}
 			"GetTEName"
 			{
@@ -46,7 +46,7 @@
 			"CBaseTempEntity"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x8B\xC1\x8B\x4D\x2A\xC7\x00\x2A\x2A\x2A\x2A\x89\x48"
+				"windows"	"\x55\x8B\xEC\x8B\x45\x08\x89\x41\x04\xC7\x01\x2A\x2A\x2A\x2A\xA1"
 			}
 			"s_pTempEntities"
 			{
@@ -66,7 +66,7 @@
 			"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"
+				"windows"	"\x55\x8B\xEC\x53\x56\x57\x8B\xF9\x8B\x4D\x08\x85\xC9\x74\x15"
 				"linux"		"@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc"
 				"mac"		"@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc"
 			}
@@ -81,7 +81,7 @@
 			/* Offset into CreateGameRulesObject */
 			"g_pGameRules"
 			{
-				"windows"	"2"
+				"windows"	"5"
 			}
 		}
 		
@@ -98,7 +98,7 @@
 			"CreateGameRulesObject"
 			{
 				"library"	"server"
-				"windows"	"\x8B\x0D\x2A\x2A\x2A\x2A\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x2A\x6A\x01\xFF\xD2"
+				"windows"	"\x55\x8B\xEC\x8B\x0D\x2A\x2A\x2A\x2A\x85\xC9\x74\x07"
 			}
 			"g_pGameRules"
 			{
@@ -117,7 +117,7 @@
 			"FireOutput"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x81\x2A\x2A\x2A\x2A\x2A\x53\x56\x8B\x71\x2A\x57\x89"
+				"windows"	"\x55\x8B\xEC\x81\xEC\x2A\x2A\x2A\x2A\xA1\x2A\x2A\x2A\x2A\x33\xC5\x89\x45\xFC\x53\x8B\x5D\x20\x8B\xC1\x8B\x4D\x1C\x56\x57\x8B"
 				"linux"		"@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f"
 				"mac"		"@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f"
 			}
@@ -131,57 +131,57 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"413"
+				"windows"	"414"
-				"linux"		"414"
+				"linux"		"415"
-				"mac"		"414"
+				"mac"		"415"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"271"
+				"windows"	"272"
-				"linux"		"272"
+				"linux"		"273"
-				"mac"		"272"
+				"mac"		"273"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"269"
+				"windows"	"270"
-				"linux"		"270"
+				"linux"		"271"
-				"mac"		"270"
+				"mac"		"271"
 			}
 			"Ignite"
 			{
-				"windows"	"209"
+				"windows"	"210"
-				"linux"		"210"
+				"linux"		"211"
-				"mac"		"210"
+				"mac"		"211"
 			}
 			"Extinguish"
 			{
-				"windows"	"213"
+				"windows"	"214"
-				"linux"		"214"
+				"linux"		"215"
-				"mac"		"214"
+				"mac"		"215"
 			}
 			"Teleport"
 			{
-				"windows"	"109"
+				"windows"	"110"
-				"linux"		"110"
+				"linux"		"111"
-				"mac"		"110"
+				"mac"		"111"
 			}
 			"CommitSuicide"
 			{
-				"windows"	"452"
+				"windows"	"453"
-				"linux"		"452"
+				"linux"		"453"
-				"mac"		"452"
+				"mac"		"453"
 			}
 			"GetVelocity"
 			{
-				"windows"	"141"
+				"windows"	"142"
-				"linux"		"142"
+				"linux"		"143"
-				"mac"		"142"
+				"mac"		"143"
 			}
 			"EyeAngles"
 			{
-				"windows"	"132"
+				"windows"	"133"
-				"linux"		"133"
+				"linux"		"134"
-				"mac"		"133"
+				"mac"		"134"
 			}
 			"AcceptInput"
 			{
@@ -197,9 +197,9 @@
 			}
 			"WeaponEquip"
 			{
-				"windows"	"262"
+				"windows"	"263"
-				"linux"		"263"
+				"linux"		"264"
-				"mac"		"263"
+				"mac"		"264"
 			}
 			"Activate"
 			{
@@ -209,15 +209,15 @@
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"431"
+				"windows"	"432"
-				"linux"		"432"
+				"linux"		"433"
-				"mac"		"432"
+				"mac"		"433"
 			}
 			"GiveAmmo"
 			{
-				"windows"	"253"
+				"windows"	"254"
-				"linux"		"253"
+				"linux"		"255"
-				"mac"		"253"
+				"mac"		"255"
 			}
 		}
 	}

gamedata/sdktools.games/game.pvkii.txt

@@ -12,6 +12,59 @@
 "Games"
 {
 	/* Pirates, Vikings and Knights II */
+	
+	/* GameRules */
+	"#default"
+	{
+		"Offsets"
+		{
+			/* Offset into CreateGameRulesObject */
+			"g_pGameRules"
+			{
+				"windows"	"5"
+				"linux"		"9"
+			}
+		}
+		
+		"Signatures"
+		{
+			/* This signature sometimes has multiple matches, but this
+			 * does not matter as g_pGameRules is involved in all of them.
+			 * The same g_pGameRules offset applies to each match.
+			 *
+			 * Sometimes this block of bytes is at the beginning of the static
+			 * CreateGameRulesObject function and sometimes it is in the middle
+			 * of an entirely different function. This depends on the game.
+			 */
+			"CreateGameRulesObject"
+			{
+				"library"	"server"
+				"windows"	"\x55\x8B\xEC\x8B\x0D\x2A\x2A\x2A\x2A\x85\xC9\x74\x07"
+				"linux"		"\x55\x89\xE5\x56\x53\x83\xEC\x2A\xA1\x2A\x2A\x2A\x2A\x8B\x5D\x08\x85\xC0\x74\x08\x8B\x10\x89"
+			}
+			"g_pGameRules"
+			{
+				"library"	"server"
+				"mac"		"@g_pGameRules"
+			}
+		}
+	}
+	
+	/* CBaseEntityOutput::FireOutput */
+	"pvkii"
+	{
+		"Signatures"
+		{
+			"FireOutput"
+			{
+				"library"	"server"
+				"windows"	"\x55\x8B\xEC\x81\xEC\x2A\x2A\x2A\x2A\x53\x8B\xC1\xC7\x2A\x2A\x2A\x2A\x2A\x00\x56\x57\x89"
+				"linux"		"\x55\x89\xE5\x57\x56\x53\x81\xEC\x2A\x2A\x2A\x2A\x8B\x55\x08\x8B\x75\x14\x8B\x5A\x14\x85\xDB\x0F\x84"
+				"mac"		"@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f"
+			}
+		}
+	}
+	
 	"pvkii"
 	{
 		"Offsets"
@@ -19,80 +72,101 @@
 			/* CBasePlayer */
 			"GiveNamedItem"
 			{
-				"windows"	"354"
+				"windows"	"403"
-				"linux"		"355"
+				"linux"		"404"
+				"mac"		"404"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"241"
+				"windows"	"272"
-				"linux"		"242"
+				"linux"		"273"
+				"mac"		"273"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"239"
+				"windows"	"270"
-				"linux"		"240"
+				"linux"		"271"
+				"mac"		"271"
 			}
 			"Ignite"
 			{
-				"windows"	"196"
+				"windows"	"211"
-				"linux"		"197"
+				"linux"		"212"
+				"mac"		"212"
 			}
 			"Extinguish"
 			{
-				"windows"	"200"
+				"windows"	"215"
-				"linux"		"201"
+				"linux"		"216"
+				"mac"		"216"
 			}
 			"Teleport"
 			{
-				"windows"	"101"
+				"windows"	"109"
-				"linux"		"102"
+				"linux"		"110"
+				"mac"		"110"
 			}
 			"CommitSuicide"
 			{
-				"windows"	"395"
+				"windows"	"442"
-				"linux"		"395"
+				"linux"		"442"
+				"mac"		"442"
 			}
 			"GetVelocity"
 			{
-				"windows"	"131"
+				"windows"	"141"
-				"linux"		"132"
+				"linux"		"142"
+				"mac"		"142"
 			}
 			"EyeAngles"
 			{
-				"windows"	"123"
+				"windows"	"132"
-				"linux"		"124"
+				"linux"		"133"
+				"mac"		"133"
 			}
 			"AcceptInput"
 			{
-				"windows"	"35"
+				"windows"	"37"
-				"linux"		"36"
+				"linux"		"38"
+				"mac"		"38"
 			}
 			"SetEntityModel"
 			{
-				"windows"	"24"
+				"windows"	"25"
-				"linux"		"25"
+				"linux"		"26"
+				"mac"		"26"
 			}
 			"WeaponEquip"
 			{
-				"windows"	"232"
+				"windows"	"263"
-				"linux"		"233"
+				"linux"		"264"
+				"mac"		"264"
 			}
 			"Activate"
 			{
-				"windows"	"32"
+				"windows"	"34"
-				"linux"		"33"
+				"linux"		"35"
+				"mac"		"35"
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"374"
+				"windows"	"421"
-				"linux"		"375"
+				"linux"		"422"
+				"mac"		"422"
 			}
-			"FireOutputBackup"
+			"GiveAmmo"
 			{
-				"windows"	"6"
+				"windows"	"254"
-				"linux"		"10"
+				"linux"		"255"
+				"mac"		"255"
 			}
 		}
+		
+		"Keys"
+		{
+			"GameRulesProxy"	"CPVK2GameRulesProxy"
+		}
+		
 		"Signatures"
 		{
 			"FireOutput"

gamedata/sdktools.games/game.tf.txt

@@ -18,33 +18,33 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"396"
+				"windows"	"397"
-				"linux"		"400"
+				"linux"		"401"
-				"mac"		"400"
+				"mac"		"401"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"269"
+				"windows"	"270"
-				"linux"		"270"
+				"linux"		"271"
-				"mac"		"270"
+				"mac"		"271"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"267"
+				"windows"	"268"
-				"linux"		"268"
+				"linux"		"269"
-				"mac"		"268"
+				"mac"		"269"
 			}
 			"Ignite"
 			{
-				"windows"	"208"
+				"windows"	"209"
-				"linux"		"209"
+				"linux"		"210"
-				"mac"		"209"
+				"mac"		"210"
 			}
 			"Extinguish"
 			{
-				"windows"	"212"
+				"windows"	"213"
-				"linux"		"213"
+				"linux"		"214"
-				"mac"		"213"
+				"mac"		"214"
 			}
 			"Teleport"
 			{
@@ -54,9 +54,9 @@
 			}
 			"CommitSuicide"
 			{
-				"windows"	"440"
+				"windows"	"441"
-				"linux"		"440"
+				"linux"		"441"
-				"mac"		"440"
+				"mac"		"441"
 			}
 			"GetVelocity"
 			{
@@ -84,9 +84,9 @@
 			}
 			"WeaponEquip"
 			{
-				"windows"	"260"
+				"windows"	"261"
-				"linux"		"261"
+				"linux"		"262"
-				"mac"		"261"
+				"mac"		"262"
 			}
 			"Activate"
 			{
@@ -96,15 +96,15 @@
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"417"
+				"windows"	"418"
-				"linux"		"418"
+				"linux"		"419"
-				"mac"		"418"
+				"mac"		"419"
 			}
 			"GiveAmmo"
 			{
-				"windows"	"251"
+				"windows"	"252"
-				"linux"		"252"
+				"linux"		"253"
-				"mac"		"252"
+				"mac"		"253"
 			}
 		}
 		

gamedata/sm-cstrike.games/game.csgo.txt

@@ -118,7 +118,7 @@
 			"CheckWinLimit"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x83\xE4\xF8\x83\xEC\x64\x53\x56\x57\x8B\xF9\x8B\x0D\x2A\x2A\x2A\x2A\x81\xF9"
+				"windows"	"\x55\x8B\xEC\x83\xE4\xF8\x83\xEC\x2A\x53\x56\x57\x8B\xF9\x8B\x0D\x2A\x2A\x2A\x2A\x81\xF9"
 				"linux"		"@_ZN12CCSGameRules17CheckRestartRoundEv"
 				"mac"		"@_ZN12CCSGameRules17CheckRestartRoundEv"
 			}

gamedata/sm-tf2.games.txt

@@ -46,14 +46,14 @@
 			"AddCondition"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x56\x8B\xF1\x8B\x8E\x2A\x2A\x2A\x2A\x85\xC9\x0F\x84"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x08\x56\x8B\xF1\x8B\x8E\x2A\x2A\x2A\x2A\x85\xC9\x0F\x84\x2A\x2A\x2A\x2A\x8B\x01\x8B"
 				"linux"		"@_ZN15CTFPlayerShared7AddCondE7ETFCondfP11CBaseEntity"
 				"mac"		"@_ZN15CTFPlayerShared7AddCondE7ETFCondfP11CBaseEntity"
 			}
 			"RemoveCondition"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x53\x56\x8B\x75\x08\x57\x8B\xF9\x83\xFE\x40"
+				"windows"	"\x55\x8B\xEC\x53\x56\x8B\x75\x08\x57\x8B\xF9\x83\xFE\x2A\x7C\x2A\x8D"
 				"linux"		"@_ZN15CTFPlayerShared10RemoveCondE7ETFCondb"
 				"mac"		"@_ZN15CTFPlayerShared10RemoveCondE7ETFCondb"
 			}
@@ -81,7 +81,7 @@
 			"MakeBleed"
 			{
 				"library" 	"server"
-				"windows"	"\x55\x8B\xEC\x83\xEC\x20\x56\x8B\xF1\x89\x75\xF8"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x20\x56\x8B\xF1\x89\x75\xF8\x8B\x8E"
 				"linux"		"@_ZN15CTFPlayerShared9MakeBleedEP9CTFPlayerP13CTFWeaponBasefi"
 				"mac"		"@_ZN15CTFPlayerShared9MakeBleedEP9CTFPlayerP13CTFWeaponBasefi"
 			}
@@ -113,22 +113,22 @@
 		{
 			"ForceRespawn"
 			{
-				"windows"	"324"
+				"windows"	"325"
-				"linux"		"325"
+				"linux"		"326"
-				"mac"		"325"
+				"mac"		"326"
 			}
 			"CalcIsAttackCriticalHelper"
-			{
-				"windows"	"383"
-				"linux"		"390"
-				"mac"		"390"
-			}
-			"CalcIsAttackCriticalHelperNoCrits"
 			{
 				"windows"	"384"
 				"linux"		"391"
 				"mac"		"391"
 			}
+			"CalcIsAttackCriticalHelperNoCrits"
+			{
+				"windows"	"385"
+				"linux"		"392"
+				"mac"		"392"
+			}
 			
 			// CTFGameRules::IsHolidayActive
 			"IsHolidayActive"
@@ -140,9 +140,9 @@
 
 			"RemoveWearable"
 			{
-				"windows"	"426"
+				"windows"	"427"
-				"linux"		"427"
+				"linux"		"428"
-				"mac"		"427"
+				"mac"		"428"
 			}
 		}
 	}

plugins/include/tf2.inc

@@ -157,6 +157,13 @@ enum TFCond
 	TFCond_DodgeChance = 79,
 	TFCond_Parachute,
 	TFCond_BlastJumping,
+	TFCond_HalloweenKart,
+	TFCond_HalloweenKartDash,
+	TFCond_BalloonHead,
+	TFCond_MeleeOnly,
+	TFCond_SwimmingCurse,
+	TFCond_HalloweenKartNoTurn,
+	TFCond_HalloweenKartCage,
 };
 
 const Float:TFCondDuration_Infinite = -1.0;
@@ -168,6 +175,7 @@ enum TFHoliday
 	TFHoliday_Christmas,
 	TFHoliday_ValentinesDay,
 	TFHoliday_MeetThePyro,
+	TFHoliday_SpyVsEngyWar,
 	TFHoliday_FullMoon,
 	TFHoliday_HalloweenOrFullMoon,
 	TFHoliday_HalloweenOrFullMoonOrValentines,

product.version

@@ -1 +1 @@
-1.6.2
+1.6.3

pushbuild.txt

@@ -10,7 +10,7 @@ i
 D
 S
 !
-she calls it a mayonegg
+it's so cute, she calls it a mayonegg
 joys of buildbot, part 5: a watermelon's diatribes need not be cause for spilling the queen's tea
 crab
 joys of buildbot, part 6: a merry metal matchturtle mocks mostly and mainly in Madrid.
@@ -43,7 +43,7 @@ horrible is horrible is rukia
 i'm gonna get u good
 The Patty Winters show this morning was about how terrible sawce is, same as yesterday's show; however, things are looking up for tomorrow.
 IT'S CLOBBERIN' TIME ERRDAY
-vc2005 supremecy
+vc2005 supremecy :|
 clobstermonkey
 that thing
 clobber build because amx.h changed (sigh)