Update versioning for 1.6.2 release.

Backport GetClientAuthId native to 1.6-dev (r=asherkin).

AMBuildScript

@@ -381,6 +381,9 @@ class SMConfig(object):
       if builder.target_platform in ['linux', 'mac']:
         compiler.defines += ['NO_HOOK_MALLOC', 'NO_MALLOC_OVERRIDE']
 
+    if sdk.name == 'csgo' and builder.target_platform == 'linux':
+      compiler.linkflags += ['-lstdc++']
+
     for path in paths:
       compiler.cxxincludes += [os.path.join(sdk.path, *path)]
 

changelog.txt

@@ -1,5 +1,19 @@
 SourceMod Changelog
 
+SourceMod 1.6.2 [2014-09-20]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.6.2_Release_Notes
+
+User Changes:
+ - Updated game support for TF2, CS:GO, No More Room in Hell and Fistful of Frags.
+ - Added compatibility shim to force Steam player auth strings to be in "Steam2" rendered format (PR 136).
+ - Fixed possible performance regression in DBI handling.
+
+Developer Changes:
+ - Added new GetClientAuthId native to retrieve player auth strings in desired format (PR 159).
+ - Updated TF2 weapon and player condition enums (FlaminSarge).
+
+----------------------------------------------------------
 SourceMod 1.6.1 [2014-08-17]
 
 URL: http://wiki.alliedmods.net/SourceMod_1.6.1_Release_Notes

core/AMBuilder

@@ -52,17 +52,14 @@ for sdk_name in SM.sdks:
   compiler = binary.compiler
 
   if sdk.name == 'csgo':
-    # Protobuf 2.3 headers have some signed/unsigned compares. I believe that it's fixed in later versions, but Valve.
-    if compiler.cxx.behavior == 'gcc':
-      compiler.cflags += ['-Wno-sign-compare']
     compiler.cxxincludes += [
-      os.path.join(sdk.path, 'common', 'protobuf-2.3.0', 'src'),
+      os.path.join(sdk.path, 'common', 'protobuf-2.5.0', 'src'),
       os.path.join(sdk.path, 'public', 'engine', 'protobuf'),
       os.path.join(sdk.path, 'public', 'game', 'shared', 'csgo', 'protobuf')
     ]
   elif sdk.name == 'dota':
     compiler.cxxincludes += [
-      os.path.join(sdk.path, 'common', 'protobuf-2.4.1', 'src'),
+      os.path.join(sdk.path, 'common', 'protobuf-2.5.0', 'src'),
       os.path.join(sdk.path, 'public', 'engine', 'protobuf'),
       os.path.join(sdk.path, 'public', 'game', 'shared', 'protobuf'),
       os.path.join(sdk.path, 'public', 'game', 'shared', 'dota', 'protobuf')
@@ -109,6 +106,7 @@ for sdk_name in SM.sdks:
     binary.sources += [
       os.path.join(sdk.path, 'public', 'engine', 'protobuf', 'networkbasetypes.pb.cc'),
       os.path.join(sdk.path, 'public', 'engine', 'protobuf', 'netmessages.pb.cc'),
+      os.path.join(sdk.path, 'public', 'engine', 'protobuf', 'network_connection.pb.cc'),
       os.path.join(sdk.path, 'public', 'game', 'shared', 'protobuf', 'ai_activity.pb.cc'),
       os.path.join(sdk.path, 'public', 'game', 'shared', 'protobuf', 'usermessages.pb.cc'),
       os.path.join(sdk.path, 'public', 'game', 'shared', 'dota', 'protobuf', 'dota_commonmessages.pb.cc'),

core/EventManager.cpp

@@ -155,7 +155,7 @@ void EventManager::FireGameEvent(IGameEvent *pEvent)
 	   Just need to add ourselves as a listener to make our hook on IGameEventManager2::FireEvent work */
 }
 
-#if SOURCE_ENGINE >= SE_LEFT4DEAD
+#if SOURCE_ENGINE >= SE_LEFT4DEAD && SOURCE_ENGINE != SE_DOTA
 int EventManager::GetEventDebugID()
 {
 	return EVENT_DEBUG_ID_INIT;

core/EventManager.h

@@ -110,7 +110,7 @@ public: // IPluginsListener
 	void OnPluginUnloaded(IPlugin *plugin);
 public: // IGameEventListener2
 	void FireGameEvent(IGameEvent *pEvent);
-#if SOURCE_ENGINE >= SE_LEFT4DEAD
+#if SOURCE_ENGINE >= SE_LEFT4DEAD && SOURCE_ENGINE != SE_DOTA
 	int GetEventDebugID();
 #endif
 public:

core/PlayerManager.cpp

@@ -47,6 +47,12 @@
 #include "logic_bridge.h"
 #include <sourcemod_version.h>
 
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+#include <steam/steamclientpublic.h>
+#endif
+
+class CSteamID;
+
 PlayerManager g_Players;
 bool g_OnMapStarted = false;
 IForward *PreAdminCheck = NULL;
@@ -399,15 +405,28 @@ void PlayerManager::RunAuthChecks()
 {
 	CPlayer *pPlayer;
 	const char *authstr;
+	const CSteamID *steamid = NULL;
 	unsigned int removed = 0;
 	for (unsigned int i=1; i<=m_AuthQueue[0]; i++)
 	{
 		pPlayer = &m_Players[m_AuthQueue[i]];
 #if SOURCE_ENGINE == SE_DOTA
+		steamid = engine->GetClientSteamID(pPlayer->m_iIndex);
 		authstr = engine->GetPlayerNetworkIDString(pPlayer->m_iIndex - 1);
+#elif SOURCE_ENGINE >= SE_ORANGEBOX
+		steamid = engine->GetClientSteamID(pPlayer->m_pEdict);
+		authstr = engine->GetPlayerNetworkIDString(pPlayer->m_pEdict);
 #else
 		authstr = engine->GetPlayerNetworkIDString(pPlayer->m_pEdict);
 #endif
+
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+		if (authstr && authstr[0] == '[' && steamid)
+		{
+			authstr = steamid->Render();
+		}
+#endif
+
 		pPlayer->SetAuthString(authstr);
 
 		if (!pPlayer->IsAuthStringValidated())
@@ -2436,3 +2455,28 @@ void CPlayer::PrintToConsole(const char *pMsg)
 	engine->ClientPrintf(m_pEdict, pMsg);
 #endif
 }
+
+#if SOURCE_ENGINE >= SE_LEFT4DEAD
+const EUniverse kCurrentSteamUniverse = k_EUniversePublic;
+#elif SOURCE_ENGINE >= SE_ORANGEBOX
+const EUniverse kCurrentSteamUniverse = k_EUniverseInvalid;
+#endif
+
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+const char *CSteamID::Render() const
+{
+	static char szSteamID[64];
+
+	switch (GetEAccountType())
+	{
+	case k_EAccountTypeInvalid:
+	case k_EAccountTypeIndividual:
+		snprintf(szSteamID, sizeof(szSteamID), "STEAM_%u:%u:%u", kCurrentSteamUniverse, GetAccountID() % 2, GetAccountID() >> 1);
+		break;
+	default:
+		szSteamID[0] = '\0';
+	}
+
+	return szSteamID;
+}
+#endif

core/logic/AMBuilder

@@ -19,6 +19,12 @@ if builder.target_platform == 'linux':
 elif builder.target_platform == 'mac':
   binary.compiler.cflags += ['-Wno-deprecated-declarations']
   binary.compiler.postlink += ['-framework', 'CoreServices']
+
+if binary.compiler.vendor == 'gcc' or binary.compiler.vendor == 'clang':
+  binary.compiler.cxxflags += ['-fno-rtti']
+elif binary.compiler.vendor == 'msvc':
+  binary.compiler.cxxflags += ['/GR-']
+
 binary.sources += [
   'common_logic.cpp',
   'smn_adt_array.cpp',

core/logic/Database.cpp

@@ -615,6 +615,17 @@ void DBManager::ThreadMain()
 				ke::AutoLock lock(&m_ThinkLock);
 				m_ThinkQueue.push(op);
 			}
+			
+			
+			if (!m_Terminate)
+			{
+				ke::AutoUnlock unlock(&m_QueueEvent);
+#ifdef _WIN32
+				Sleep(20);
+#else
+				usleep(20000);
+#endif
+			}
 		}
 
 		if (m_Terminate)

core/smn_player.cpp

@@ -37,6 +37,15 @@
 #include <inetchannel.h>
 #include <iclient.h>
 
+#ifndef PRIu64
+#ifdef _WIN32
+#define PRIu64 "I64u"
+#else
+#define PRIu64 "llu"
+#endif
+#endif
+
+
 static cell_t sm_GetMaxHumanPlayers(IPluginContext *pCtx, const cell_t *params)
 {
 	int maxHumans = -1;
@@ -380,6 +389,124 @@ static cell_t RunAdminCacheChecks(IPluginContext *pContext, const cell_t *params
 	return (id != pPlayer->GetAdminId()) ? 1 : 0;
 }
 
+// Must match clients.inc
+enum AuthIdType
+{
+	AuthType_Engine = 0,
+	AuthType_Steam2,
+	AuthType_Steam3,
+	AuthType_SteamId64,
+};
+
+static cell_t GetClientAuthId(IPluginContext *pContext, const cell_t *params)
+{
+	CPlayer *pPlayer = g_Players.GetPlayerByIndex(params[1]);
+	if (!pPlayer)
+	{
+		return pContext->ThrowNativeError("Client index %d is invalid", params[1]);
+	}
+	else if (!pPlayer->IsConnected())
+	{
+		return pContext->ThrowNativeError("Client %d is not connected", params[1]);
+	}
+	
+	bool validate = !!params[5];
+	
+	switch (params[2])
+	{
+	case AuthType_Engine:
+		{
+			const char *authstr;
+			if (validate)
+			{
+				// Keep this as a validation check
+				authstr = pPlayer->GetAuthString(params[5]);
+				if (!authstr || authstr[0] == '\0')
+				{
+					return 0;
+				}
+			}
+
+#if SOURCE_ENGINE == SE_DOTA			
+			authstr = engine->GetPlayerNetworkIDString(pPlayer->GetIndex());
+#else
+			authstr = engine->GetPlayerNetworkIDString(pPlayer->GetEdict());
+#endif
+			pContext->StringToLocal(params[3], params[4], authstr);
+		}
+		break;
+	case AuthType_Steam2:
+	case AuthType_Steam3:
+		{
+			if (pPlayer->IsFakeClient())
+			{
+				pContext->StringToLocal(params[3], params[4], "BOT");
+				return 1;
+			}
+			
+			static char authstr[64];
+			unsigned int acctId = pPlayer->GetSteamAccountID(validate);
+			if (acctId == 0)
+			{
+				if (g_HL2.IsLANServer())
+				{
+					pContext->StringToLocal(params[3], params[4], "STEAM_ID_LAN");
+					return 1;
+				}
+				else if (!params[5])
+				{
+					pContext->StringToLocal(params[3], params[4], "STEAM_ID_PENDING");
+					return 1;
+				}
+				
+				return 0;
+			}
+			
+			if (params[2] == AuthType_Steam2)
+			{
+#if SOURCE_ENGINE <= SE_LEFT4DEAD
+				unsigned int universe = 0;
+#else
+				unsigned int universe = 1;
+#endif
+				_snprintf(authstr, sizeof(authstr), "STEAM_%u:%u:%u", universe, acctId & 1, acctId >> 1);
+				pContext->StringToLocal(params[3], params[4], authstr);
+				break;
+			}
+			else
+			{
+				_snprintf(authstr, sizeof(authstr), "[U:1:%u]", acctId);
+				pContext->StringToLocal(params[3], params[4], authstr);
+			}
+		}
+		break;
+	case AuthType_SteamId64:
+		{
+			if (pPlayer->IsFakeClient() || g_HL2.IsLANServer())
+			{
+				return 0;
+			}
+			unsigned int acctId = pPlayer->GetSteamAccountID(validate);
+			if (acctId == 0)
+			{
+				return 0;
+			}
+			
+			uint64_t steamId = acctId;
+			steamId |= ((uint64_t)1<<32); // Instance (1/Desktop)
+			steamId |= ((uint64_t)1<<52); // Type (1/Individual)
+			steamId |= ((uint64_t)1<<56); // Universe (1/Public)
+			
+			static char authstr[64];
+			snprintf(authstr, sizeof(authstr), "%" PRIu64, steamId);
+			pContext->StringToLocal(params[3], params[4], authstr);
+		}
+		break;
+	}
+	
+	return 1;
+}
+
 REGISTER_NATIVES(playernatives)
 {
 	{"GetMaxHumanPlayers",		sm_GetMaxHumanPlayers},
@@ -393,6 +520,7 @@ REGISTER_NATIVES(playernatives)
 	{"GetClientAvgData",		GetAvgData},
 	{"GetClientAvgPackets",		GetAvgPackets},
 	{"RunAdminCacheChecks",		RunAdminCacheChecks},
+	{"GetClientAuthId",			GetClientAuthId},
 	{NULL,						NULL}
 };
 

extensions/bintools/AMBuilder

@@ -8,6 +8,10 @@ binary.compiler.cxxincludes += [
   os.path.join(builder.sourcePath, 'public', 'jit'),
   os.path.join(builder.sourcePath, 'public', 'jit', 'x86'),
 ]
+if binary.compiler.vendor == 'gcc' or binary.compiler.vendor == 'clang':
+  binary.compiler.cxxflags += ['-fno-rtti']
+elif binary.compiler.vendor == 'msvc':
+  binary.compiler.cxxflags += ['/GR-']
 
 binary.sources += [
   'extension.cpp',

extensions/clientprefs/AMBuilder

@@ -5,6 +5,10 @@ binary = SM.ExtLibrary(builder, 'clientprefs.ext')
 binary.compiler.cxxincludes += [
   os.path.join(SM.mms_root, 'core', 'sourcehook'),
 ]
+if binary.compiler.vendor == 'gcc' or binary.compiler.vendor == 'clang':
+  binary.compiler.cxxflags += ['-fno-rtti']
+elif binary.compiler.vendor == 'msvc':
+  binary.compiler.cxxflags += ['/GR-']
 
 binary.sources += [
   'extension.cpp',

extensions/curl/AMBuilder

@@ -8,6 +8,10 @@ binary.compiler.includes += [
   os.path.join(builder.sourcePath, 'extensions', 'curl', 'curl-src', 'include')
 ]
 binary.compiler.defines += ['CURL_STATICLIB']
+if binary.compiler.vendor == 'gcc' or binary.compiler.vendor == 'clang':
+  binary.compiler.cxxflags += ['-fno-rtti']
+elif binary.compiler.vendor == 'msvc':
+  binary.compiler.cxxflags += ['/GR-']
 binary.compiler.postlink += [libcurl.binary]
 if builder.target_platform == 'linux':
   binary.compiler.postlink += ['-lrt']

extensions/geoip/AMBuilder

@@ -2,6 +2,10 @@
 import os
 
 binary = SM.ExtLibrary(builder, 'geoip.ext')
+if binary.compiler.vendor == 'gcc' or binary.compiler.vendor == 'clang':
+  binary.compiler.cxxflags += ['-fno-rtti']
+elif binary.compiler.vendor == 'msvc':
+  binary.compiler.cxxflags += ['/GR-']
 if builder.target_platform == 'windows':
   binary.compiler.postlink += ['wsock32.lib']
 

extensions/mysql/AMBuilder

@@ -7,6 +7,10 @@ if SM.mysql_root:
     os.path.join(SM.mysql_root, 'include'),
     os.path.join(SM.mms_root, 'core', 'sourcehook')
   ]
+  if binary.compiler.vendor == 'gcc' or binary.compiler.vendor == 'clang':
+    binary.compiler.cxxflags += ['-fno-rtti']
+  elif binary.compiler.vendor == 'msvc':
+    binary.compiler.cxxflags += ['/GR-']
 
   if builder.target_platform == 'linux' or builder.target_platform == 'mac':
     binary.compiler.postlink += [

extensions/regex/AMBuilder

@@ -5,6 +5,10 @@ binary = SM.ExtLibrary(builder, 'regex.ext')
 binary.compiler.cxxincludes += [
   os.path.join(SM.mms_root, 'core', 'sourcehook'),
 ]
+if binary.compiler.vendor == 'gcc' or binary.compiler.vendor == 'clang':
+  binary.compiler.cxxflags += ['-fno-rtti']
+elif binary.compiler.vendor == 'msvc':
+  binary.compiler.cxxflags += ['/GR-']
 
 if builder.target_platform == 'linux':
   path = os.path.join(builder.sourcePath, 'extensions', 'regex', 'lib_linux', 'libpcre.a')

extensions/sqlite/AMBuilder

@@ -5,6 +5,10 @@ binary = SM.ExtLibrary(builder, 'dbi.sqlite.ext')
 binary.compiler.cxxincludes += [
   os.path.join(SM.mms_root, 'core', 'sourcehook'),
 ]
+if binary.compiler.vendor == 'gcc' or binary.compiler.vendor == 'clang':
+  binary.compiler.cxxflags += ['-fno-rtti']
+elif binary.compiler.vendor == 'msvc':
+  binary.compiler.cxxflags += ['/GR-']
 
 binary.compiler.defines += [
   'SQLITE_OMIT_LOAD_EXTENSION',

extensions/topmenus/AMBuilder

@@ -5,6 +5,10 @@ binary = SM.ExtLibrary(builder, 'topmenus.ext')
 binary.compiler.cxxincludes += [
   os.path.join(SM.mms_root, 'core', 'sourcehook'),
 ]
+if binary.compiler.vendor == 'gcc' or binary.compiler.vendor == 'clang':
+  binary.compiler.cxxflags += ['-fno-rtti']
+elif binary.compiler.vendor == 'msvc':
+  binary.compiler.cxxflags += ['/GR-']
 
 binary.sources += [
   'extension.cpp',

extensions/updater/AMBuilder

@@ -5,6 +5,10 @@ binary = SM.ExtLibrary(builder, 'updater.ext')
 binary.compiler.cxxincludes += [
   os.path.join(SM.mms_root, 'core', 'sourcehook'),
 ]
+if binary.compiler.vendor == 'gcc' or binary.compiler.vendor == 'clang':
+  binary.compiler.cxxflags += ['-fno-rtti']
+elif binary.compiler.vendor == 'msvc':
+  binary.compiler.cxxflags += ['/GR-']
 
 binary.sources += [
   'extension.cpp',

gamedata/core.games/blacklist.plugins.txt

@@ -24,9 +24,11 @@
 			"plugin_f99d77668e7aa0adb6a960322ab05568"	""	/* UCP Server (Endi) - Version 7.8 */
 			"plugin_7b3ce69f15e61cc896228cb8424be589"	""	/* UCP Server (Endi) - Version 7.8.2 */
 			"plugin_24602c74f183cfcd157b3d50dee96c52"	""	/* UCP Server (Endi) - Version 7.8.3 */
+			"plugin_43bd225c5fdcd3af35729ca9d481b20d"	""	/* UCP Server (Endi) - Version 8.3 */
 			"plugin_78140f1a0f26cd3297767d0598eac4b1"	""	/* [Any] PReplay (DarthNinja) - Version 1.0.0 */
 			"plugin_55923ba6bfe41569a3e4fbd7ca4606e5"	""	/* VIP Plugin (World-Source.Ru) - Version 2.0 */
-			"plugin_4bf983e1d5b61ba0b1ab9a7e53bfda27"	""	/* WarMod CS:GO (Twelve-60)  */
+			"plugin_4bf983e1d5b61ba0b1ab9a7e53bfda27"	""	/* WarMod CS:GO (Twelve-60) */
+			"plugin_08574c4295afdaa5f613b8ceef96ecc3"	""	/* AlliedBans (TommY) - Version 3.140902A */
 		}
 	}
 }

gamedata/sdkhooks.games/game.fof.txt

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

gamedata/sdkhooks.games/game.nmrih.txt

@@ -30,9 +30,9 @@
 			}
 			"PreThink"
 			{
-				"windows"	"344"
-				"linux"		"345"
-				"mac"		"345"
+				"windows"	"345"
+				"linux"		"346"
+				"mac"		"346"
 			}
 			"PostThink"
 			{

gamedata/sdktools.games/engine.sdk2013.txt

@@ -48,21 +48,6 @@
 		}
 	}
 	
-	/* No longer necessary. Remove later. */
-	"#default"
-	{
-		"Signatures"
-		{
-			"EntityFactory"
-			{
-				"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"
-				"mac"		"@_Z23EntityFactoryDictionaryv"
-			}
-		}
-	}
-	
 	/* SetUserInfo data */
 	"#default"
 	{

gamedata/sdktools.games/game.fof.txt

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

gamedata/sdktools.games/game.nmrih.txt

@@ -131,9 +131,9 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"412"
-				"linux"		"413"
-				"mac"		"413"
+				"windows"	"413"
+				"linux"		"414"
+				"mac"		"414"
 			}
 			"RemovePlayerItem"
 			{
@@ -167,9 +167,9 @@
 			}
 			"CommitSuicide"
 			{
-				"windows"	"451"
-				"linux"		"451"
-				"mac"		"451"
+				"windows"	"452"
+				"linux"		"452"
+				"mac"		"452"
 			}
 			"GetVelocity"
 			{
@@ -209,9 +209,9 @@
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"430"
-				"linux"		"431"
-				"mac"		"431"
+				"windows"	"431"
+				"linux"		"432"
+				"mac"		"432"
 			}
 			"GiveAmmo"
 			{

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

@@ -33,27 +33,27 @@
 			"CTTeamScoreOffset"
 			{
 				"windows"	"98"
-				"linux"		"124"
+				"linux"		"109"
 				"mac"		"150"
 			}
 			//Offset into CheckRestartRound
 			"TTeamScoreOffset"
 			{
 				"windows"	"122"
-				"linux"		"159"
+				"linux"		"142"
 				"mac"		"185"
 			}
 			"ClanTagOffset"
 			{
 				"windows"	"12"
-				"linux"		"41"
+				"linux"		"29"
 				"mac"		"22"
 			}
 			//Offset into HandleCommand_Buy_Internal
 			"CCSPlayerInventoryOffset"
 			{
 				"windows"	"285"
-				"linux"		"87"
+				"linux"		"32"
 				"mac"		"109"
 			}
 			"GetItemInLoadout"

loader/AMBuilder

@@ -13,6 +13,10 @@ binary.compiler.cxxincludes += [
   os.path.join(SM.mms_root, 'core'),
   os.path.join(SM.mms_root, 'sourcehook')
 ]
+if binary.compiler.vendor == 'gcc' or binary.compiler.vendor == 'clang':
+  binary.compiler.cxxflags += ['-fno-rtti']
+elif binary.compiler.vendor == 'msvc':
+  binary.compiler.cxxflags += ['/GR-']
 binary.compiler.linkflags += extra_ldflags
 binary.sources = [
   'loader.cpp'

plugins/include/clients.inc

@@ -45,6 +45,25 @@ enum NetFlow
 	NetFlow_Both,			/**< Both values added together */
 };
 
+/**
+ * Auth string types.
+ *
+ * Note that for the Steam2 and Steam3 types, the following ids are
+ * also valid values:
+ * "STEAM_ID_PENDING" - Authentication is pending.
+ * "STEAM_ID_LAN" - Authentication is disabled because of being on a LAN server.
+ * "BOT" - The client is a bot.
+ */
+enum AuthIdType
+{
+	AuthId_Engine = 0, /**< The game-specific auth string as returned from the engine */
+
+	// The following are only available on games that support Steam authentication.
+	AuthId_Steam2, /**< Steam2 rendered format, ex "STEAM_1:1:4153990" */
+	AuthId_Steam3, /**< Steam3 rendered format, ex "[U:1:8307981]" */
+	AuthId_SteamID64, /**< A SteamID64 (uint64) as a String, ex "76561197968573709" */
+};
+
 /**
  * MAXPLAYERS is not the same as MaxClients.
  * MAXPLAYERS is a hardcoded value as an upper limit.  MaxClients changes based on the server.
@@ -261,14 +280,29 @@ native bool:GetClientIP(client, String:ip[], maxlen, bool:remport=true);
  * @param client		Player index.
  * @param auth			Buffer to store the client's auth string.
  * @param maxlen		Maximum length of string buffer (includes NULL terminator).
- * @param validate		Check backend validation status.
- * 				DO NOT PASS FALSE UNLESS YOU UNDERSTAND THE CONSEQUENCES,
+ * @param validate		Check backend validation status.
+ * 				DO NOT PASS FALSE UNLESS YOU UNDERSTAND THE CONSEQUENCES,
  *			        You WILL KNOW if you need to use this, MOST WILL NOT.
  * @return				True on success, false otherwise.
  * @error				If the client is not connected or the index is invalid.
  */
 native bool:GetClientAuthString(client, String:auth[], maxlen, bool:validate=true);
 
+/**
+ * Retrieves a client's authentication string (SteamID).
+ *
+ * @param client		Player index.
+ * @param authType		Auth id type and format to use.
+ * @param auth			Buffer to store the client's auth id.
+ * @param maxlen		Maximum length of string buffer (includes NULL terminator).
+ * @param validate		Check backend validation status.
+ * 				DO NOT PASS FALSE UNLESS YOU UNDERSTAND THE CONSEQUENCES,
+ *			        You WILL KNOW if you need to use this, MOST WILL NOT.
+ * @return				True on success, false otherwise.
+ * @error				If the client is not connected or the index is invalid.
+ */
+native bool:GetClientAuthId(client, AuthIdType:authType, String:auth[], maxlen, bool:validate=true);
+
 /**
  * Returns the client's Steam account ID.
  *

plugins/include/tf2.inc

@@ -153,6 +153,10 @@ enum TFCond
 	TFCond_HalloweenTiny,
 	TFCond_HalloweenInHell,
 	TFCond_HalloweenGhostMode,
+
+	TFCond_DodgeChance = 79,
+	TFCond_Parachute,
+	TFCond_BlastJumping,
 };
 
 const Float:TFCondDuration_Infinite = -1.0;

plugins/include/tf2_stocks.inc

@@ -249,6 +249,7 @@ enum {
 	TF_WEAPON_SPELLBOOK,
 	TF_WEAPON_SPELLBOOK_PROJECTILE,
 	TF_WEAPON_SNIPERRIFLE_CLASSIC,
+	TF_WEAPON_PARACHUTE,
 };
 
 // TF2 Weapon Loadout Slots

product.version

@@ -1 +1 @@
-1.6.1
+1.6.2

pushbuild.txt

@@ -10,6 +10,7 @@ i
 D
 S
 !
+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.

sourcepawn/jit/AMBuilder

@@ -14,6 +14,11 @@ binary.compiler.includes += [
   os.path.join(builder.sourcePath, 'knight', 'shared'),
 ]
 
+if binary.compiler.vendor == 'gcc' or binary.compiler.vendor == 'clang':
+  binary.compiler.cxxflags += ['-fno-rtti']
+elif binary.compiler.vendor == 'msvc':
+  binary.compiler.cxxflags += ['/GR-']
+
 if builder.target_platform == 'linux':
   binary.compiler.postlink += ['-lpthread', '-lrt']