Merge.

.hgtags

@@ -4,3 +4,7 @@ e877885fac80be71822641f7a9122cebc9812521 sourcemod-1.1.1
 b3ffa8a4511c4eadaf533fc790aa6b14f7f0c6ea sourcemod-1.1.2
 3a73bbf60f34befa9b66be03fa5974b394bb3411 sourcemod-1.2.0
 ddd707c3454c382db5db9d28148cd19227f44759 sourcemod-1.4.0
+f74e1dea2ef2c5a12b5238badc0e877106804191 sourcemod-1.4.1
+0026e1394254c392244c7b140e3075974ab5a6db sourcemod-1.4.2
+608f4c94872e3624404a1d105284163bc57fadf7 sourcemod-1.4.3
+29186166cc99e73c61995a0bd0450fc6c36466bc sourcemod-1.4.4

AMBuildScript

@@ -79,8 +79,9 @@ class SM:
 						oldhead = head
 						head, tail = os.path.split(head)
 					if i.startswith('HL2SDK'):
-						(info, sdk) = findDictByKey(self.possibleSdks, 'sdk', i)
+						if head != None and head != oldhead:
-						self.sdkInfo[sdk] = info	
+							(info, sdk) = findDictByKey(self.possibleSdks, 'sdk', i)
+							self.sdkInfo[sdk] = info
 					elif head == None or head == oldhead:
 						raise Exception('Could not find a valid path for {0}'.format(i))
 				AMBuild.cache.CacheVariable(i, path)
@@ -119,6 +120,9 @@ class SM:
 				self.compiler.AddToListVar('CXXFLAGS', '-fno-threadsafe-statics')
 				self.compiler.AddToListVar('CXXFLAGS', '-Wno-non-virtual-dtor')
 				self.compiler.AddToListVar('CXXFLAGS', '-Wno-overloaded-virtual')
+				if (self.vendor == 'gcc' and cxx.majorVersion >= 4 and cxx.minorVersion >= 3) or \
+						(self.vendor == 'clang' and cxx.majorVersion >= 3):
+					self.compiler.AddToListVar('CXXFLAGS', '-Wno-delete-non-virtual-dtor')
 				self.compiler.AddToListVar('CDEFINES', 'HAVE_STDINT_H')
 				self.compiler.AddToListVar('CDEFINES', 'GNUC')
 				if self.vendor == 'gcc':
@@ -183,8 +187,6 @@ class SM:
 				if self.vendor == 'clang':
 					self.compiler.AddToListVar('POSTLINKFLAGS', '-lgcc_eh')
 			elif AMBuild.target['platform'] == 'darwin':
-				self.compiler.AddToListVar('CFLAGS', ['-isysroot',
-				                                      '/Developer/SDKs/MacOSX10.5.sdk'])
 				self.compiler.AddToListVar('POSTLINKFLAGS', '-mmacosx-version-min=10.5')
 				self.compiler.AddToListVar('POSTLINKFLAGS', ['-arch', 'i386'])
 				self.compiler.AddToListVar('POSTLINKFLAGS', '-lstdc++')

changelog.txt

@@ -2,6 +2,96 @@ SourceMod Changelog
 
 -----------------------------
 
+SourceMod 1.4.5 [2012-09-03]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.4.5_Release_Notes
+
+User Changes:
+
+ - Updated support for latest Source 2009 engine changes (CS:S, DoD:S, TF2, HL2DM, GMod). 
+ - Updated Nuclear Dawn, Dino D-Day, and Zombie Panic gamedata. 
+ - Added compatibility for running on Metamod:Source 1.9.0.
+ - Fixed very minor memory leaks in CStrike extension (bug 5456) (KyleS).
+ - Fixed crash from plugins accessing netprops too early (bug 5297) (KyleS).
+ - Fixed crash from plugins trying to access nested datadesc members (bug 5446).
+
+Developer Changes:
+
+ - Added new TF2 weapon and custom dmg defines. 
+ - Added new TF2 TFHoliday value (bug 5436) (Powerlord). 
+ - Fixed IClientListener::InterceptClientConnect not being able to properly block connections (bug 5461) (PimpinJuice).
+ - Fixed PrepSDKCall_SetSignature native not working with symbol names on L4D2 linux (bug 5440).
+ - Fixed resolution of GetProfilerTime native on non-Windows platforms.
+
+-----------------------------
+
+SourceMod 1.4.4 [2012-07-03]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.4.4_Release_Notes
+
+User Changes:
+
+ - Updated support for latest Source 2009 engine changes (CS:S, DoD:S, TF2, HL2DM, GMod). 
+ - Updated Nuclear Dawn gamedata. 
+ - Fixed a crash that could occur when selecting an option on a clientprefs prefab menu (bug 5374).
+
+Developer Changes:
+
+ - Added new TF2 weapon and custom dmg defines. 
+ - Added new TF2 TFHoliday value (bug 5364) (Powerlord). 
+ - Updated sample extension to properly fill ninvoke with INativeInvoker ptr (bug 5340) (Afronanny).
+
+-----------------------------
+
+SourceMod 1.4.3 [2012-06-09]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.4.3_Release_Notes
+
+User Changes:
+
+ - Updated support for latest OrangeBox engine changes (CS:S, DoD:S, TF2, HL2DM, GMod).
+ - Made clientprefs attempt to reconnect to the database on map change (bug 4745). 
+ - Log functions now respect sv_logecho (bug 5135). 
+ - Fixed client console vote output (bug 5290, bug 5205) (FlaminSarge). 
+ - Fixed error when reloading dependant plugins using aliased natives (bug 5302). 
+ - Fixed intermittent crash when looking for an invalid signature (bug 5301). 
+ - Fixed possible crash when reloading a plugin with an invalid binary (bug 5288). 
+ - Exposed extensions list to clients (bug 5221) (VoiDeD). 
+ - Fixed intermittent crashes in clientprefs (bug 4660). 
+ - Fixed crash when passing an invalid entity reference to ReferenceToEntity (bug 5330). 
+ - Fixed cstrike extension crash on shutdown (bug 5328). 
+ - Lowered threading API think time to 20ms, making threaded MySQL queries complete faster (bug 4733).
+
+Developer Changes:
+
+ - Fixed client serials not being unique on Windows (bug 5285). 
+ - Fixed broken SourceTV detection on L4D1 (bug 5216). 
+ - Fixed Float negation operator (bug 5292). 
+ - Updated TF2 condition defines (bug 5259) (FlaminSarge). 
+ - Adding missing SetMenuNoVoteButton native declaration (bug 4522) (GoD-Tony). 
+ - Fixed erroneous const-qualification of name param of GetAdminUsername (bug 5267). 
+ - Added GetGameTickCount native (bug 5209) (GoD-Tony).
+ 
+-----------------------------
+
+SourceMod 1.4.2 [2011-04-13]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.4.2_Release_Notes
+
+User Changes:
+ - Updated support for latest OrangeBox engine changes (CS:S, DoD:S, TF2, HL2DM, GMod). 
+ - Fixed regression in SourceMod 1.4.0 causing SM to cause load errors on The Ship (bug 5216).
+ - Fixed toggling and player lag issues with sm_drug command (bugs 5217, 5218) (FlaminSarge).
+
+Developer Changes:
+ - Updated TF2-specific defines and enums (bug 5194).
+ - Fixed StoreToAddress always writing 32 bits and throwing an error (bug 5248) (ProdigySim).
+ - Fixed crash with StoreToAddress if memory wasn't writable (bug 5252) (Dr!fter).
+ - Fixed return value of VoteMenuToAll (bug 5254) (VoiDeD).
+ - Fixed bug in command lower-casing API guarantee
+
+-----------------------------
+
 SourceMod 1.4.1 [2011-12-07]
 
 URL: http://wiki.alliedmods.net/SourceMod_1.4.1_Release_Notes

core/ConsoleDetours.cpp

@@ -664,6 +664,11 @@ cell_t ConsoleDetours::InternalDispatch(int client, const CCommand& args)
 	char name[255];
 	const char *realname = args.Arg(0);
 	size_t len = strlen(realname);
+
+	// Disallow command strings that are too long, for now.
+	if (len >= sizeof(name) - 1)
+		return Pl_Continue;
+
 	for (size_t i = 0; i < len; i++)
 	{
 		if (realname[i] >= 'A' && realname[i] <= 'Z')

core/ExtensionSys.cpp

@@ -37,6 +37,7 @@
 #include "sourcemm_api.h"
 #include "sm_srvcmds.h"
 #include "sm_stringutil.h"
+#include "PlayerManager.h"
 
 CExtensionManager g_Extensions;
 IdentityType_t g_ExtType;
@@ -1284,6 +1285,94 @@ void CExtensionManager::OnRootConsoleCommand(const char *cmdname, const CCommand
 	g_RootMenu.DrawGenericOption("unload", "Unload an extension");
 }
 
+void CExtensionManager::ListExtensionsToClient(CPlayer *player, const CCommand &args)
+{
+	char buffer[256];
+	int numExtensions = m_Libs.size();
+	edict_t *edict = player->GetEdict();
+	unsigned int id = 0;
+	unsigned int start = 0;
+
+	if (!numExtensions)
+	{
+		ClientConsolePrint(edict, "[SM] No extensions found.");
+		return;
+	}
+
+	if (args.ArgC() > 2)
+	{
+		start = atoi(args.Arg(2));
+	}
+
+	CExtension *ext;
+	SourceHook::List<CExtension *>::iterator iter;
+
+	for (iter = m_Libs.begin();
+		 iter != m_Libs.end();
+		 iter++)
+	{
+		ext = (*iter);
+
+		char error[255];
+		if (!ext->IsRunning(error, sizeof(error)))
+		{
+			continue;
+		}
+
+		id++;
+		if (id < start)
+		{
+			continue;
+		}
+
+		if (id - start > 10)
+		{
+			break;
+		}
+
+		IExtensionInterface *api = ext->GetAPI();
+
+		const char *name = api->GetExtensionName();
+		const char *version = api->GetExtensionVerString();
+		const char *author = api->GetExtensionAuthor();
+		const char *description = api->GetExtensionDescription();
+
+		size_t len = UTIL_Format(buffer, sizeof(buffer), " \"%s\"", name);
+
+		if (version != NULL && IS_STR_FILLED(version))
+		{
+			len += UTIL_Format(&buffer[len], sizeof(buffer)-len, " (%s)", version);
+		}
+
+		if (author != NULL && IS_STR_FILLED(author))
+		{
+			len += UTIL_Format(&buffer[len], sizeof(buffer)-len, " by %s", author);
+		}
+
+		if (description != NULL && IS_STR_FILLED(description))
+		{
+			len += UTIL_Format(&buffer[len], sizeof(buffer)-len, ": %s", description);
+		}
+
+
+		ClientConsolePrint(edict, "%s", buffer);
+	}
+
+	while (iter != m_Libs.end())
+	{
+		char error[255];
+		if ((*iter)->IsRunning(error, sizeof(error)))
+		{
+			break;
+		}
+	}
+
+	if (iter != m_Libs.end())
+	{
+		ClientConsolePrint(edict, "To see more, type \"sm exts %d\"", id);
+	}
+}
+
 CExtension *CExtensionManager::GetExtensionFromIdent(IdentityToken_t *ptr)
 {
 	if (ptr->type == g_ExtType)

core/ExtensionSys.h

@@ -45,6 +45,8 @@
 #include "PluginSys.h"
 #include "NativeOwner.h"
 
+class CPlayer;
+
 using namespace SourceMod;
 using namespace SourceHook;
 
@@ -175,6 +177,8 @@ public:
 	bool LibraryExists(const char *library);
 	void CallOnCoreMapStart(edict_t *pEdictList, int edictCount, int clientMax);
 	void AddRawDependency(IExtension *ext, IdentityToken_t *other, void *iface);
+public:
+	void ListExtensionsToClient(CPlayer *player, const CCommand &args);
 public:
 	CExtension *GetExtensionFromIdent(IdentityToken_t *ptr);
 	void Shutdown();

core/HalfLife2.cpp

@@ -38,8 +38,28 @@
 #include <IGameConfigs.h>
 #include <compat_wrappers.h>
 #include <Logger.h>
+#include "LibrarySys.h"
 #include "logic_bridge.h"
 
+
+typedef ICommandLine *(*FakeGetCommandLine)();
+
+#if defined _WIN32
+#define TIER0_NAME			"tier0.dll"
+#define VSTDLIB_NAME		"vstdlib.dll"
+#elif defined __APPLE__
+#define TIER0_NAME			"libtier0.dylib"
+#define VSTDLIB_NAME		"libvstdlib.dylib"
+#elif defined __linux__
+#if SOURCE_ENGINE == SE_ORANGEBOXVALVE || SOURCE_ENGINE == SE_LEFT4DEAD || SOURCE_ENGINE == SE_LEFT4DEAD2
+#define TIER0_NAME			"libtier0.so"
+#define VSTDLIB_NAME		"libvstdlib.so"
+#else
+#define TIER0_NAME			"tier0_i486.so"
+#define VSTDLIB_NAME		"vstdlib_i486.so"
+#endif
+#endif
+
 CHalfLife2 g_HL2;
 ConVar *sv_lan = NULL;
 
@@ -131,6 +151,12 @@ void CHalfLife2::OnSourceModAllInitialized()
 }
 
 void CHalfLife2::OnSourceModAllInitialized_Post()
+{
+	InitLogicalEntData();
+	InitCommandLine();
+}
+
+void CHalfLife2::InitLogicalEntData()
 {
 	char *addr = NULL;
 
@@ -196,6 +222,64 @@ void CHalfLife2::OnSourceModAllInitialized_Post()
 	}
 }
 
+void CHalfLife2::InitCommandLine()
+{
+	char path[PLATFORM_MAX_PATH];
+	char error[256];
+	
+	g_SourceMod.BuildPath(Path_Game, path, sizeof(path), "../bin/" TIER0_NAME);
+
+	if (!g_LibSys.IsPathFile(path))
+	{
+		g_Logger.LogError("Could not find path for: " TIER0_NAME);
+		return;
+	}
+
+	ILibrary *lib = g_LibSys.OpenLibrary(path, error, sizeof(error));
+	m_pGetCommandLine = lib->GetSymbolAddress("CommandLine_Tier0");
+
+	/* '_Tier0' dropped on Alien Swarm version */
+	if (m_pGetCommandLine == NULL)
+	{
+		m_pGetCommandLine = lib->GetSymbolAddress("CommandLine");
+	}
+
+	if (m_pGetCommandLine == NULL)
+	{
+		/* We probably have a Ship engine. */
+		lib->CloseLibrary();
+		g_SourceMod.BuildPath(Path_Game, path, sizeof(path), "../bin/" VSTDLIB_NAME);
+		if (!g_LibSys.IsPathFile(path))
+		{
+			g_Logger.LogError("Could not find path for: " VSTDLIB_NAME);
+			return;
+		}
+
+		if ((lib = g_LibSys.OpenLibrary(path, error, sizeof(error))) == NULL)
+		{
+			g_Logger.LogError("Could not load %s: %s", path, error);
+			return;
+		}
+
+		m_pGetCommandLine = lib->GetSymbolAddress("CommandLine");
+
+		if (m_pGetCommandLine == NULL)
+		{
+			g_Logger.LogError("Could not locate any command line functionality");
+		}
+
+		lib->CloseLibrary();
+	}
+}
+
+ICommandLine *CHalfLife2::GetValveCommandLine()
+{
+	if (!m_pGetCommandLine)
+		return NULL;
+
+	return ((FakeGetCommandLine)((FakeGetCommandLine *)m_pGetCommandLine))();
+}
+
 #if !defined METAMOD_PLAPI_VERSION || PLAPI_VERSION < 11
 bool CHalfLife2::IsOriginalEngine()
 {
@@ -245,8 +329,13 @@ bool UTIL_FindInSendTable(SendTable *pTable,
 	return false;
 }
 
-typedescription_t *UTIL_FindInDataMap(datamap_t *pMap, const char *name)
+typedescription_t *UTIL_FindInDataMap(datamap_t *pMap, const char *name, bool *isNested)
 {
+	if (isNested)
+	{
+		*isNested = false;
+	}
+	
 	while (pMap)
 	{
 		for (int i=0; i<pMap->dataNumFields; i++)
@@ -261,10 +350,16 @@ typedescription_t *UTIL_FindInDataMap(datamap_t *pMap, const char *name)
 			}
 			if (pMap->dataDesc[i].td)
 			{
-				typedescription_t *_td;
+				if (isNested)
-				if ((_td=UTIL_FindInDataMap(pMap->dataDesc[i].td, name)) != NULL)
 				{
-					return _td;
+					*isNested = true;
+					return NULL;
+				} else { // Use the old behaviour, we dont want to spring this on extensions - even if they're doing bad things.
+					typedescription_t *_td;
+					if ((_td=UTIL_FindInDataMap(pMap->dataDesc[i].td, name, isNested)) != NULL)
+					{
+						return _td;
+					}
 				}
 			}
 		}
@@ -357,6 +452,11 @@ SendProp *CHalfLife2::FindInSendTable(const char *classname, const char *offset)
 }
 
 typedescription_t *CHalfLife2::FindInDataMap(datamap_t *pMap, const char *offset)
+{
+	return this->FindInDataMap(pMap, offset, NULL);
+}
+
+typedescription_t *CHalfLife2::FindInDataMap(datamap_t *pMap, const char *offset, bool *isNested)
 {
 	typedescription_t *td = NULL;
 	DataMapTrie &val = m_Maps[pMap];
@@ -367,7 +467,7 @@ typedescription_t *CHalfLife2::FindInDataMap(datamap_t *pMap, const char *offset
 	}
 	if (!sm_trie_retrieve(val.trie, offset, (void **)&td))
 	{
-		if ((td = UTIL_FindInDataMap(pMap, offset)) != NULL)
+		if ((td = UTIL_FindInDataMap(pMap, offset, isNested)) != NULL)
 		{
 			sm_trie_insert(val.trie, offset, td);
 		}
@@ -748,6 +848,11 @@ cell_t CHalfLife2::EntityToReference(CBaseEntity *pEntity)
 
 CBaseEntity *CHalfLife2::ReferenceToEntity(cell_t entRef)
 {
+	if ((unsigned)entRef == INVALID_EHANDLE_INDEX)
+	{
+		return NULL;
+	}
+
 	CEntInfo *pInfo = NULL;
 
 	if (entRef & (1<<31))
@@ -757,7 +862,7 @@ CBaseEntity *CHalfLife2::ReferenceToEntity(cell_t entRef)
 		CBaseHandle hndl(hndlValue);
 
 		pInfo = LookupEntity(hndl.GetEntryIndex());
-		if (pInfo->m_SerialNumber != hndl.GetSerialNumber())
+		if (!pInfo || pInfo->m_SerialNumber != hndl.GetSerialNumber())
 		{
 			return NULL;
 		}
@@ -920,3 +1025,38 @@ int CHalfLife2::GetSendPropOffset(SendProp *prop)
 	return prop->GetOffset();
 }
 
+const char *CHalfLife2::GetEntityClassname(edict_t * pEdict)
+{
+	if (pEdict == NULL || pEdict->IsFree())
+	{
+		return NULL;
+	}
+	
+	IServerUnknown *pUnk = pEdict->GetUnknown();
+	if (pUnk == NULL)
+	{
+		return NULL;
+	}
+	
+	CBaseEntity * pEntity = pUnk->GetBaseEntity();
+	
+	if (pEntity == NULL)
+	{
+		return NULL;
+	}
+	
+	return GetEntityClassname(pEntity);
+}
+
+const char *CHalfLife2::GetEntityClassname(CBaseEntity *pEntity)
+{
+	static int offset = -1;
+	if (offset == -1)
+	{
+		datamap_t *pMap = GetDataMap(pEntity);
+		typedescription_t *pDesc = FindInDataMap(pMap, "m_iClassname");
+		offset = GetTypeDescOffs(pDesc);
+	}
+
+	return *(const char **)(((unsigned char *)pEntity) + offset);
+}

core/HalfLife2.h

@@ -44,6 +44,7 @@
 #include <server_class.h>
 #include <datamap.h>
 #include <ihandleentity.h>
+#include <tier0/icommandline.h>
 
 class CCommand;
 
@@ -114,6 +115,7 @@ public: //IGameHelpers
 	datamap_t *GetDataMap(CBaseEntity *pEntity);
 	ServerClass *FindServerClass(const char *classname);
 	typedescription_t *FindInDataMap(datamap_t *pMap, const char *offset);
+	typedescription_t *FindInDataMap(datamap_t *pMap, const char *offset, bool *isNested);
 	void SetEdictStateChanged(edict_t *pEdict, unsigned short offset);
 	bool TextMsg(int client, int dest, const char *msg);
 	bool HintTextMsg(int client, const char *msg);
@@ -136,6 +138,9 @@ public: //IGameHelpers
 	cell_t EntityToBCompatRef(CBaseEntity *pEntity);
 	void *GetGlobalEntityList();
 	int GetSendPropOffset(SendProp *prop);
+	ICommandLine *GetValveCommandLine();
+	const char *GetEntityClassname(edict_t *pEdict);
+	const char *GetEntityClassname(CBaseEntity *pEntity);
 public:
 	void AddToFakeCliCmdQueue(int client, int userid, const char *cmd);
 	void ProcessFakeCliCmdQueue();
@@ -151,6 +156,9 @@ public:
 #endif
 private:
 	DataTableInfo *_FindServerClass(const char *classname);
+private:
+	void InitLogicalEntData();
+	void InitCommandLine();
 private:
 	Trie *m_pClasses;
 	List<DataTableInfo *> m_Tables;
@@ -163,6 +171,7 @@ private:
 	CStack<DelayedFakeCliCmd *> m_FreeCmds;
 	CStack<CachedCommandInfo> m_CommandStack;
 	Queue<DelayedKickInfo> m_DelayedKicks;
+	void *m_pGetCommandLine;
 };
 
 extern CHalfLife2 g_HL2;

core/Logger.cpp

@@ -265,6 +265,8 @@ void Logger::LogToOpenFileEx(FILE *fp, const char *msg, va_list ap)
 		return;
 	}
 
+	static ConVar *sv_logecho = icvar->FindVar("sv_logecho");
+
 	char buffer[3072];
 	UTIL_FormatArgs(buffer, sizeof(buffer), msg, ap);
 
@@ -275,7 +277,11 @@ void Logger::LogToOpenFileEx(FILE *fp, const char *msg, va_list ap)
 	strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
 
 	fprintf(fp, "L %s: %s\n", date, buffer);
-	g_SMAPI->ConPrintf("L %s: %s\n", date, buffer);
+
+	if (!sv_logecho || sv_logecho->GetBool())
+	{
+		g_SMAPI->ConPrintf("L %s: %s\n", date, buffer);
+	}
 }
 
 void Logger::LogToFileOnlyEx(FILE *fp, const char *msg, va_list ap)

core/MenuStyle_Base.cpp

@@ -331,6 +331,9 @@ void BaseMenuStyle::ClientPressedKey(int client, unsigned int key_press)
 							ATTN_NORM, 
 							0, 
 							PITCH_NORM, 
+#if SOURCE_ENGINE == SE_ORANGEBOXVALVE
+							0, 
+#endif
 							&pos);
 					}
 				}

core/MenuVoting.cpp

@@ -518,7 +518,7 @@ void VoteMenuHandler::OnMenuSelect(IBaseMenu *menu, int client, unsigned int ite
 		m_Votes[item]++;
 		m_NumVotes++;
 
-		if (sm_vote_chat.GetBool() || sm_vote_console.GetBool())
+		if (sm_vote_chat.GetBool() || sm_vote_console.GetBool() || sm_vote_client_console.GetBool())
 		{
 			static char buffer[1024];
 			ItemDrawInfo dr;
@@ -560,7 +560,7 @@ void VoteMenuHandler::OnMenuSelect(IBaseMenu *menu, int client, unsigned int ite
 
 						if (sm_vote_client_console.GetBool())
 						{
-							engine->ClientPrintf(pPlayer->GetEdict(), buffer);
+							ClientConsolePrint(pPlayer->GetEdict(), buffer);
 						}		
 					}
 				}

core/PlayerManager.cpp

@@ -44,7 +44,6 @@
 #include "HalfLife2.h"
 #include <inetchannel.h>
 #include <iclient.h>
-#include <tier0/icommandline.h>
 #include <IGameConfigs.h>
 #include "ExtensionSys.h"
 #include <sourcemod_version.h>
@@ -244,7 +243,8 @@ void PlayerManager::OnServerActivate(edict_t *pEdictList, int edictCount, int cl
 	// clientMax will not necessarily be correct here (such as on late SourceTV enable)
 	m_maxClients = gpGlobals->maxClients;
 
-	m_bIsSourceTVActive = (tv_enable && tv_enable->GetBool() && CommandLine()->FindParm("-nohltv") == 0);
+	ICommandLine *commandLine = g_HL2.GetValveCommandLine();
+	m_bIsSourceTVActive = (tv_enable && tv_enable->GetBool() && (!commandLine || commandLine->FindParm("-nohltv") == 0));
 	m_bIsReplayActive = false;
 #if SOURCE_ENGINE == SE_ORANGEBOXVALVE
 	m_bIsReplayActive = (replay_enable && replay_enable->GetBool());
@@ -451,7 +451,7 @@ bool PlayerManager::OnClientConnect(edict_t *pEntity, const char *pszName, const
 		pListener = (*iter);
 		if (!pListener->InterceptClientConnect(client, reject, maxrejectlen))
 		{
-			return false;
+			RETURN_META_VALUE(MRES_SUPERCEDE, false);
 		}
 	}
 
@@ -745,6 +745,11 @@ void PlayerManager::OnClientCommand(edict_t *pEntity)
 			g_PluginSys.ListPluginsToClient(pPlayer, args);
 			RETURN_META(MRES_SUPERCEDE);
 		}
+		else if (args.ArgC() > 1 && strcmp(args.Arg(1), "exts") == 0)
+		{
+			g_Extensions.ListExtensionsToClient(pPlayer, args);
+			RETURN_META(MRES_SUPERCEDE);
+		}
 		else if (args.ArgC() > 1 && strcmp(args.Arg(1), "credits") == 0)
 		{
 			ClientConsolePrint(pEntity,
@@ -854,6 +859,20 @@ void PlayerManager::OnClientSettingsChanged(edict_t *pEntity)
 	const char *new_name = info ? info->GetName() : engine->GetClientConVarValue(client, "name");
 	const char *old_name = pPlayer->m_Name.c_str();
 
+#if SOURCE_ENGINE >= SE_LEFT4DEAD
+	const char *networkid_force;
+	if ((networkid_force = engine->GetClientConVarValue(client, "networkid_force")) && networkid_force[0] != '\0')
+	{
+		unsigned long long *steamId = (unsigned long long *)engine->GetClientSteamID(pEntity);
+		unsigned int accountId = steamId ? (*steamId & 0xFFFFFFFF) : 0;
+		g_Logger.LogMessage("\"%s<%d><STEAM_1:%d:%d><>\" has bad networkid (id \"%s\") (ip \"%s\")",
+			new_name, pPlayer->GetUserId(), accountId & 1, accountId >> 1, networkid_force, pPlayer->GetIPAddress());
+
+		pPlayer->Kick("NetworkID spoofing detected.");
+		RETURN_META(MRES_IGNORED);
+	}
+#endif
+
 	if (strcmp(old_name, new_name) != 0)
 	{
 		AdminId id = g_Admins.FindAdminByIdentity("name", new_name);

core/PlayerManager.h

@@ -56,7 +56,7 @@ union serial_t
 	uint32_t   value;
 	struct
 	{
-		uint8_t  index;
+		uint32_t index  :  8;
 		uint32_t serial : 24;
 	} bits;
 };

core/PluginSys.cpp

@@ -1005,11 +1005,14 @@ LoadRes CPluginManager::_LoadPlugin(CPlugin **_plugin, const char *path, bool de
 		pPlugin->m_pRuntime = g_pSourcePawn2->LoadPlugin(co, fullpath, &err);
 		if (pPlugin->m_pRuntime == NULL)
 		{
-			UTIL_Format(error, 
+			if (error)
-				maxlength, 
+			{
-				"Unable to load plugin (error %d: %s)", 
+				UTIL_Format(error, 
-				err, 
+					maxlength, 
-				g_pSourcePawn2->GetErrorString(err));
+					"Unable to load plugin (error %d: %s)", 
+					err, 
+					g_pSourcePawn2->GetErrorString(err));
+			}
 			pPlugin->m_status = Plugin_BadLoad;
 		}
 		else
@@ -1020,7 +1023,10 @@ LoadRes CPluginManager::_LoadPlugin(CPlugin **_plugin, const char *path, bool de
 			}
 			else
 			{
-				UTIL_Format(error, maxlength, "%s", pPlugin->m_errormsg);
+				if (error)
+				{
+					UTIL_Format(error, maxlength, "%s", pPlugin->m_errormsg);
+				}
 			}
 		}
 	}
@@ -1504,7 +1510,9 @@ void CPluginManager::TryRefreshDependencies(CPlugin *pPlugin)
 		{
 			break;
 		}
-		if (native->status == SP_NATIVE_UNBOUND && !(native->flags & SP_NTVFLAG_OPTIONAL))
+		if (native->status == SP_NATIVE_UNBOUND
+			&& native->name[0] != '@'
+			&& !(native->flags & SP_NTVFLAG_OPTIONAL))
 		{
 			pPlugin->SetErrorState(Plugin_Error, "Native not found: %s", native->name);
 			return;

core/logic/MemoryUtils.cpp

@@ -116,7 +116,7 @@ void *MemoryUtils::FindPattern(const void *libPtr, const char *pattern, size_t l
 	}
 
 	ptr = reinterpret_cast<char *>(lib.baseAddress);
-	end = ptr + lib.memorySize;
+	end = ptr + lib.memorySize - 1;
 
 	while (ptr < end)
 	{

core/logic/common_logic.cpp

@@ -62,7 +62,7 @@ IGameHelpers *gamehelpers;
 
 static void AddCorePhraseFile(const char *filename)
 {
-	g_pCorePhrases->AddPhraseFile("antiflood.phrases");
+	g_pCorePhrases->AddPhraseFile(filename);
 }
 
 static IGameConfig *GetCoreGameConfig()

core/logic/smn_profiler.cpp

@@ -179,7 +179,7 @@ static cell_t GetProfilerTime(IPluginContext *pContext, const cell_t *params)
 #else
 	int64_t start_us = int64_t(prof->start.tv_sec) * 1000000 + prof->start.tv_usec;
 	int64_t stop_us = int64_t(prof->end.tv_sec) * 1000000 + prof->end.tv_usec;
-	fTime = double((stop_us - start_us) / 1000) / 1000.0;
+	fTime = double(stop_us - start_us) / 1000000.0;
 #endif
 
 	return sp_ftoc(fTime);

core/logic/thread/ThreadWorker.h

@@ -34,7 +34,7 @@
 
 #include "BaseWorker.h"
 
-#define DEFAULT_THINK_TIME_MS	50
+#define DEFAULT_THINK_TIME_MS	20
 
 class ThreadWorker : public BaseWorker, public IThread
 {

core/smn_core.cpp

@@ -43,6 +43,7 @@
 #include "Logger.h"
 #include "ExtensionSys.h"
 #include <sm_trie_tpl.h>
+#include <sh_memory.h>
 
 #if defined PLATFORM_WINDOWS
 #include <windows.h>
@@ -729,11 +730,17 @@ static cell_t StoreToAddress(IPluginContext *pContext, const cell_t *params)
 	switch(size)
 	{
 	case NumberType_Int8:
+		SourceHook::SetMemAccess(addr, sizeof(uint8_t), SH_MEM_READ|SH_MEM_WRITE|SH_MEM_EXEC);
 		*reinterpret_cast<uint8_t*>(addr) = data;
+		break;
 	case NumberType_Int16:
+		SourceHook::SetMemAccess(addr, sizeof(uint16_t), SH_MEM_READ|SH_MEM_WRITE|SH_MEM_EXEC);
 		*reinterpret_cast<uint16_t*>(addr) = data;
+		break;
 	case NumberType_Int32:
+		SourceHook::SetMemAccess(addr, sizeof(uint32_t), SH_MEM_READ|SH_MEM_WRITE|SH_MEM_EXEC);
 		*reinterpret_cast<uint32_t*>(addr) = data;
+		break;
 	default:
 		pContext->ThrowNativeError("Invalid number types %d", size);
 	}

core/smn_entities.cpp

@@ -325,7 +325,7 @@ static cell_t GetEdictClassname(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Invalid edict (%d - %d)", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	const char *cls = pEdict->GetClassName();
+	const char *cls = g_HL2.GetEntityClassname(pEdict);
 
 	if (!cls || cls[0] == '\0')
 	{
@@ -812,9 +812,13 @@ static cell_t FindDataMapOffs(IPluginContext *pContext, const cell_t *params)
 	}
 
 	pContext->LocalToString(params[2], &offset);
-	if ((td=g_HL2.FindInDataMap(pMap, offset)) == NULL)
+	bool isNested = false;
+	if ((td=g_HL2.FindInDataMap(pMap, offset, &isNested)) == NULL)
 	{
-		return -1;
+		if (isNested)
+			return pContext->ThrowNativeError("Property \"%s\" is not safe to access for entity %d", offset, params[1]);
+		else
+			return -1;
 	}
 
 	if (params[0] == 4)
@@ -959,12 +963,22 @@ static cell_t SetEntDataString(IPluginContext *pContext, const cell_t *params)
 	{ \
 		return pContext->ThrowNativeError("Could not retrieve datamap"); \
 	} \
-	if ((td = g_HL2.FindInDataMap(pMap, prop)) == NULL) \
+	bool isNested = false; \
+	if ((td = g_HL2.FindInDataMap(pMap, prop, &isNested)) == NULL) \
 	{ \
-		return pContext->ThrowNativeError("Property \"%s\" not found (entity %d/%s)", \
+		const char *class_name = g_HL2.GetEntityClassname(pEntity); \
-			prop, \
+		if (isNested) \
-			params[1], \
+		{ \
-			class_name); \
+			return pContext->ThrowNativeError("Property \"%s\" not safe to access (entity %d/%s)", \
+				prop, \
+				params[1], \
+				((class_name) ? class_name : "")); \
+		} else { \
+			return pContext->ThrowNativeError("Property \"%s\" not found (entity %d/%s)", \
+				prop, \
+				params[1], \
+				((class_name) ? class_name : "")); \
+		} \
 	}
 
 #define CHECK_SET_PROP_DATA_OFFSET() \
@@ -988,10 +1002,11 @@ static cell_t SetEntDataString(IPluginContext *pContext, const cell_t *params)
 	} \
 	if (!g_HL2.FindSendPropInfo(pNet->GetServerClass()->GetName(), prop, &info)) \
 	{ \
+		const char *class_name = g_HL2.GetEntityClassname(pEntity); \
 		return pContext->ThrowNativeError("Property \"%s\" not found (entity %d/%s)", \
 			prop, \
 			params[1], \
-			class_name); \
+			((class_name) ? class_name : "")); \
 	} \
 	\
 	offset = info.actual_offset; \
@@ -1082,7 +1097,6 @@ static cell_t GetEntPropArraySize(IPluginContext *pContext, const cell_t *params
 {
 	CBaseEntity *pEntity;
 	char *prop;
-	const char *class_name;
 	edict_t *pEdict;
 
 	if (!IndexToAThings(params[1], &pEntity, &pEdict))
@@ -1090,11 +1104,6 @@ static cell_t GetEntPropArraySize(IPluginContext *pContext, const cell_t *params
 		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
-	{
-		class_name = "";
-	}
-
 	pContext->LocalToString(params[3], &prop);
 
 	switch (params[2])
@@ -1119,10 +1128,11 @@ static cell_t GetEntPropArraySize(IPluginContext *pContext, const cell_t *params
 			}
 			if (!g_HL2.FindSendPropInfo(pNet->GetServerClass()->GetName(), prop, &info))
 			{
+				const char *class_name = g_HL2.GetEntityClassname(pEntity);
 				return pContext->ThrowNativeError("Property \"%s\" not found (entity %d/%s)",
 					prop,
 					params[1],
-					class_name);
+					((class_name) ? class_name : ""));
 			}
 
 			if (info.prop->GetType() != DPT_DataTable)
@@ -1152,7 +1162,6 @@ static cell_t GetEntProp(IPluginContext *pContext, const cell_t *params)
 	CBaseEntity *pEntity;
 	char *prop;
 	int offset;
-	const char *class_name;
 	edict_t *pEdict;
 	int bit_count;
 	bool is_unsigned = false;
@@ -1168,12 +1177,6 @@ static cell_t GetEntProp(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	/* TODO: Find a way to lookup classname without having an edict - Is this a guaranteed prop? */
-	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
-	{
-		class_name = "";
-	}
-
 	pContext->LocalToString(params[3], &prop);
 
 	switch (params[2])
@@ -1251,7 +1254,6 @@ static cell_t SetEntProp(IPluginContext *pContext, const cell_t *params)
 	CBaseEntity *pEntity;
 	char *prop;
 	int offset;
-	const char *class_name;
 	edict_t *pEdict;
 	int bit_count;
 
@@ -1266,11 +1268,6 @@ static cell_t SetEntProp(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
-	{
-		class_name = "";
-	}
-
 	pContext->LocalToString(params[3], &prop);
 
 	switch (params[2])
@@ -1339,7 +1336,6 @@ static cell_t GetEntPropFloat(IPluginContext *pContext, const cell_t *params)
 	char *prop;
 	int offset;
 	int bit_count;
-	const char *class_name;
 	edict_t *pEdict;
 
 	int element = 0;
@@ -1353,11 +1349,6 @@ static cell_t GetEntPropFloat(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
-	{
-		class_name = "";
-	}
-
 	pContext->LocalToString(params[3], &prop);
 
 	switch (params[2])
@@ -1404,7 +1395,6 @@ static cell_t SetEntPropFloat(IPluginContext *pContext, const cell_t *params)
 	char *prop;
 	int offset;
 	int bit_count;
-	const char *class_name;
 	edict_t *pEdict;
 
 	int element = 0;
@@ -1418,11 +1408,6 @@ static cell_t SetEntPropFloat(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
-	{
-		class_name = "";
-	}
-
 	pContext->LocalToString(params[3], &prop);
 
 	switch (params[2])
@@ -1474,7 +1459,6 @@ static cell_t GetEntPropEnt(IPluginContext *pContext, const cell_t *params)
 	char *prop;
 	int offset;
 	int bit_count;
-	const char *class_name;
 	edict_t *pEdict;
 
 	int element = 0;
@@ -1488,11 +1472,6 @@ static cell_t GetEntPropEnt(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
-	{
-		class_name = "";
-	}
-
 	pContext->LocalToString(params[3], &prop);
 
 	switch (params[2])
@@ -1538,7 +1517,6 @@ static cell_t SetEntPropEnt(IPluginContext *pContext, const cell_t *params)
 	char *prop;
 	int offset;
 	int bit_count;
-	const char *class_name;
 	edict_t *pEdict;
 
 	int element = 0;
@@ -1552,11 +1530,6 @@ static cell_t SetEntPropEnt(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
-	{
-		class_name = "";
-	}
-
 	pContext->LocalToString(params[3], &prop);
 
 	switch (params[2])
@@ -1623,7 +1596,6 @@ static cell_t GetEntPropVector(IPluginContext *pContext, const cell_t *params)
 	char *prop;
 	int offset;
 	int bit_count;
-	const char *class_name;
 	edict_t *pEdict;
 
 	int element = 0;
@@ -1637,11 +1609,6 @@ static cell_t GetEntPropVector(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
-	{
-		class_name = "";
-	}
-
 	pContext->LocalToString(params[3], &prop);
 
 	switch (params[2])
@@ -1695,7 +1662,6 @@ static cell_t SetEntPropVector(IPluginContext *pContext, const cell_t *params)
 	char *prop;
 	int offset;
 	int bit_count;
-	const char *class_name;
 	edict_t *pEdict;
 
 	int element = 0;
@@ -1709,11 +1675,6 @@ static cell_t SetEntPropVector(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
-	{
-		class_name = "";
-	}
-
 	pContext->LocalToString(params[3], &prop);
 
 	switch (params[2])
@@ -1771,7 +1732,6 @@ static cell_t GetEntPropString(IPluginContext *pContext, const cell_t *params)
 	CBaseEntity *pEntity;
 	char *prop;
 	int offset;
-	const char *class_name;
 	edict_t *pEdict;
 	bool bIsStringIndex;
 
@@ -1786,11 +1746,6 @@ static cell_t GetEntPropString(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
-	{
-		class_name = "";
-	}
-
 	pContext->LocalToString(params[3], &prop);
 
 	bIsStringIndex = false;
@@ -1849,10 +1804,11 @@ static cell_t GetEntPropString(IPluginContext *pContext, const cell_t *params)
 			}
 			if (!g_HL2.FindSendPropInfo(pNet->GetServerClass()->GetName(), prop, &info))
 			{
+				const char *class_name = g_HL2.GetEntityClassname(pEntity);
 				return pContext->ThrowNativeError("Property \"%s\" not found (entity %d/%s)",
 					prop,
 					params[1],
-					class_name);
+					((class_name) ? class_name : ""));
 			}
 
 			offset = info.actual_offset;
@@ -1923,9 +1879,13 @@ static cell_t SetEntPropString(IPluginContext *pContext, const cell_t *params)
 				return pContext->ThrowNativeError("Unable to retrieve GetDataDescMap offset");
 			}
 			pContext->LocalToString(params[3], &prop);
-			if ((td=g_HL2.FindInDataMap(pMap, prop)) == NULL)
+			bool isNested = false;
+			if ((td=g_HL2.FindInDataMap(pMap, prop, &isNested)) == NULL)
 			{
-				return pContext->ThrowNativeError("Property \"%s\" not found for entity %d", prop, params[1]);
+				if (isNested)
+					return pContext->ThrowNativeError("Property \"%s\" is not safe to access for entity %d", prop, params[1]);
+				else
+					return pContext->ThrowNativeError("Property \"%s\" not found for entity %d", prop, params[1]);
 			}
 			if (td->fieldType != FIELD_CHARACTER)
 			{

core/smn_halflife.cpp

@@ -87,6 +87,11 @@ static cell_t GetGameTime(IPluginContext *pContext, const cell_t *params)
 	return sp_ftoc(gpGlobals->curtime);
 }
 
+static cell_t GetGameTickCount(IPluginContext *pContext, const cell_t *params)
+{
+	return gpGlobals->tickcount;
+}
+
 static cell_t CreateFakeClient(IPluginContext *pContext, const cell_t *params)
 {
 	if (!g_SourceMod.IsMapRunning())
@@ -446,6 +451,10 @@ static cell_t smn_IsPlayerAlive(IPluginContext *pContext, const cell_t *params)
 	}
 }
 
+#ifndef SOURCE_ENGINE_CSS
+#define SOURCE_ENGINE_CSS 13
+#endif
+
 static cell_t GuessSDKVersion(IPluginContext *pContext, const cell_t *params)
 {
 #if defined METAMOD_PLAPI_VERSION || PLAPI_VERSION >= 11
@@ -468,6 +477,7 @@ static cell_t GuessSDKVersion(IPluginContext *pContext, const cell_t *params)
 		return 32;
 	case SOURCE_ENGINE_EYE:
 		return 33;
+	case SOURCE_ENGINE_CSS:
 	case SOURCE_ENGINE_ORANGEBOXVALVE:
 		return 35;
 	case SOURCE_ENGINE_LEFT4DEAD:
@@ -520,6 +530,7 @@ REGISTER_NATIVES(halflifeNatives)
 	{"GetGameDescription",		GetGameDescription},
 	{"GetGameFolderName",		GetGameFolderName},
 	{"GetGameTime",				GetGameTime},
+	{"GetGameTickCount",		GetGameTickCount},
 	{"GetRandomFloat",			GetRandomFloat},
 	{"GetRandomInt",			GetRandomInt},
 	{"IsDedicatedServer",		IsDedicatedServer},

extensions/clientprefs/cookie.cpp

@@ -396,7 +396,7 @@ void CookieManager::OnPluginDestroyed(IPlugin *plugin)
 				{
 					ItemDrawInfo draw;
 					const char *info = clientMenu->GetItemInfo(i, &draw);
-					AutoMenuData *data = (AutoMenuData *)strtol(info, NULL, 16);
+					AutoMenuData *data = (AutoMenuData *)strtoul(info, NULL, 16);
 
 					if (data->handler->forward != NULL)
 					{

extensions/clientprefs/extension.cpp

@@ -105,6 +105,7 @@ bool ClientPrefs::SDK_OnLoad(char *error, size_t maxlength, bool late)
 
 	sharesys->AddNatives(myself, g_ClientPrefNatives);
 	sharesys->RegisterLibrary(myself, "clientprefs");
+	identity = sharesys->CreateIdentity(sharesys->CreateIdentType("ClientPrefs"), this);
 	g_CookieManager.cookieDataLoadedForward = forwards->CreateForward("OnClientCookiesCached", ET_Ignore, 1, NULL, Param_Cell);
 
 	g_CookieType = handlesys->CreateType("Cookie", 
@@ -124,7 +125,7 @@ bool ClientPrefs::SDK_OnLoad(char *error, size_t maxlength, bool late)
 		NULL);
 
 	IMenuStyle *style = menus->GetDefaultStyle();
-	g_CookieManager.clientMenu = style->CreateMenu(&g_Handler, NULL);
+	g_CookieManager.clientMenu = style->CreateMenu(&g_Handler, identity);
 	g_CookieManager.clientMenu->SetDefaultTitle("Client Settings:");
 
 	plsys->AddPluginsListener(&g_CookieManager);
@@ -191,10 +192,17 @@ void ClientPrefs::SDK_OnUnload()
 
 	forwards->ReleaseForward(g_CookieManager.cookieDataLoadedForward);
 
-	g_CookieManager.clientMenu->Destroy();
+	HandleSecurity sec = HandleSecurity(identity, identity);
+	HandleError err = handlesys->FreeHandle(g_CookieManager.clientMenu->GetHandle(), &sec);
+	if (HandleError_None != err)
+	{
+		g_pSM->LogError(myself, "Error %d when attempting to free client menu handle", err);
+	}
 
 	phrases->Destroy();
 
+	sharesys->DestroyIdentity( identity );
+
 	plsys->RemovePluginsListener(&g_CookieManager);
 	playerhelpers->RemoveClientListener(&g_CookieManager);
 
@@ -202,6 +210,19 @@ void ClientPrefs::SDK_OnUnload()
 	cookieMutex->DestroyThis();
 }
 
+void ClientPrefs::OnCoreMapStart(edict_t *pEdictList, int edictCount, int clientMax)
+{
+	if (Database == NULL && !databaseLoading)
+	{
+		g_pSM->LogMessage(myself, "Attempting to reconnect to database...");
+		
+		databaseLoading = true;
+		
+		TQueryOp *op = new TQueryOp(Query_Connect, 0);
+		dbi->AddToThreadQueue(op, PrioQueue_High);
+	}
+}
+
 void ClientPrefs::DatabaseConnect()
 {
 	char error[256];
@@ -457,6 +478,11 @@ bool Translate(char *buffer,
 	return true;
 }
 
+IdentityToken_t *ClientPrefs::GetIdentity() const
+{
+	return identity;
+}
+
 const char *ClientPrefs::GetExtensionVerString()
 {
 	return SM_FULL_VERSION;

extensions/clientprefs/extension.h

@@ -87,6 +87,8 @@ public:
 	const char *GetExtensionVerString();
 	const char *GetExtensionDateString();
 
+	virtual void OnCoreMapStart(edict_t *pEdictList, int edictCount, int clientMax);
+	
 	void DatabaseConnect();
 
 	bool AddQueryToQueue(TQueryOp *query);
@@ -138,6 +140,8 @@ public:
 	 */
 	//virtual bool SDK_OnMetamodPauseChange(bool paused, char *error, size_t maxlength);
 #endif
+public:
+	IdentityToken_t *GetIdentity() const;
 public:
 	IDBDriver *Driver;
 	IDatabase *Database;
@@ -150,6 +154,7 @@ public:
 private:
 	SourceHook::List<TQueryOp *> cachedQueries;
 	IMutex *queryMutex;
+	IdentityToken_t *identity;
 };
 
 class CookieTypeHandler : public IHandleTypeDispatch

extensions/clientprefs/menus.cpp

@@ -40,7 +40,7 @@ void ClientMenuHandler::OnMenuSelect(IBaseMenu *menu, int client, unsigned int i
 
 	const char *info = menu->GetItemInfo(item, &draw);
 
-	AutoMenuData *data = (AutoMenuData *)strtol(info, NULL, 16);
+	AutoMenuData *data = (AutoMenuData *)strtoul(info, NULL, 16);
 
 	if (data->handler->forward != NULL)
 	{
@@ -57,7 +57,7 @@ void ClientMenuHandler::OnMenuSelect(IBaseMenu *menu, int client, unsigned int i
 		return;
 	}
 
-	IBaseMenu *submenu = menus->GetDefaultStyle()->CreateMenu(&g_AutoHandler, NULL);
+	IBaseMenu *submenu = menus->GetDefaultStyle()->CreateMenu(&g_AutoHandler, g_ClientPrefs.GetIdentity());
 
 	char message[256];
 
@@ -94,7 +94,7 @@ unsigned int ClientMenuHandler::OnMenuDisplayItem(IBaseMenu *menu,
 
 	const char *info = menu->GetItemInfo(item, &draw);
 
-	AutoMenuData *data = (AutoMenuData *)strtol(info, NULL, 16);
+	AutoMenuData *data = (AutoMenuData *)strtoul(info, NULL, 16);
 
 	if (data->handler->forward != NULL)
 	{
@@ -122,7 +122,7 @@ void AutoMenuHandler::OnMenuSelect(SourceMod::IBaseMenu *menu, int client, unsig
 
 	const char *info = menu->GetItemInfo(item, &draw);
 
-	AutoMenuData *data = (AutoMenuData *)strtol(info, NULL, 16);
+	AutoMenuData *data = (AutoMenuData *)strtoul(info, NULL, 16);
 
 	switch (data->type)
 	{
@@ -175,5 +175,10 @@ void AutoMenuHandler::OnMenuSelect(SourceMod::IBaseMenu *menu, int client, unsig
 
 void AutoMenuHandler::OnMenuEnd(IBaseMenu *menu, MenuEndReason reason)
 {
-	menu->Destroy(true);
+	HandleSecurity sec = HandleSecurity(g_ClientPrefs.GetIdentity(), g_ClientPrefs.GetIdentity());
+	HandleError err = handlesys->FreeHandle(menu->GetHandle(), &sec);
+	if (HandleError_None != err)
+	{
+		g_pSM->LogError(myself, "Error %d when attempting to free automenu handle", err);
+	}
 }

extensions/cstrike/RegNatives.cpp

@@ -47,4 +47,6 @@ void RegNatives::UnregisterAll()
 	{
 		(*iter)->Destroy();
 	}
+	
+	m_List.clear();
 }

extensions/cstrike/natives.cpp

@@ -206,17 +206,17 @@ static cell_t CS_DropWeapon(IPluginContext *pContext, const cell_t *params)
 	}
 
 	//Psychonic is awesome for this
-	sm_sendprop_info_t *spi = new sm_sendprop_info_t;
+	sm_sendprop_info_t spi;
 	IServerUnknown *pUnk = (IServerUnknown *)pWeapon;
 	IServerNetworkable *pNet = pUnk->GetNetworkable();
 
-	if (!UTIL_FindDataTable(pNet->GetServerClass()->m_pTable, "DT_WeaponCSBase", spi, 0))
+	if (!UTIL_FindDataTable(pNet->GetServerClass()->m_pTable, "DT_WeaponCSBase", &spi, 0))
 		return pContext->ThrowNativeError("Entity index %d is not a weapon", params[2]);
 
-	if (!gamehelpers->FindSendPropInfo("CBaseCombatWeapon", "m_hOwnerEntity", spi))
+	if (!gamehelpers->FindSendPropInfo("CBaseCombatWeapon", "m_hOwnerEntity", &spi))
 		return pContext->ThrowNativeError("Invalid entity index %d for weapon", params[2]);
 
-	CBaseHandle &hndl = *(CBaseHandle *)((uint8_t *)pWeapon + spi->actual_offset);
+	CBaseHandle &hndl = *(CBaseHandle *)((uint8_t *)pWeapon + spi.actual_offset);
 	if (params[1] != hndl.GetEntryIndex())
 		return pContext->ThrowNativeError("Weapon %d is not owned by client %d", params[2], params[1]);
 
@@ -312,7 +312,7 @@ static cell_t CS_GetTranslatedWeaponAlias(IPluginContext *pContext, const cell_t
 	pContext->LocalToString(params[2], &dest);
 	pContext->LocalToString(params[1], &weapon);
 
-	char *ret = new char[128];
+	char *ret = NULL;
 
 	unsigned char vstk[sizeof(char *)];
 	unsigned char *vptr = vstk;

extensions/curl/AMBuilder

@@ -20,7 +20,6 @@ def BuildCURL():
 			env = os.environ.copy()
 			env['CFLAGS'] = '-m32'
 			if AMBuild.target['platform'] == 'darwin':
-				env['CFLAGS'] += ' -isysroot /Developer/SDKs/MacOSX10.5.sdk'
 				env['LDFLAGS'] = '-mmacosx-version-min=10.5'
 			else:
 				env['CFLAGS'] += ' -D_GNU_SOURCE'

extensions/sdktools/vcaller.cpp

@@ -129,7 +129,7 @@ static cell_t PrepSDKCall_SetSignature(IPluginContext *pContext, const cell_t *p
 		{
 			return 0;
 		}
-#if (SOURCE_ENGINE == SE_ORANGEBOXVALVE) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
+#if (SOURCE_ENGINE == SE_ORANGEBOXVALVE) || (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
 		s_call_addr = memutils->ResolveSymbol(handle, &sig[1]);
 #else
 		s_call_addr = dlsym(handle, &sig[1]);

extensions/sdktools/vglobals.cpp

@@ -125,6 +125,7 @@ void GetIServer()
 	int offset;
 	void *vfunc = NULL;
 
+#if SOURCE_ENGINE != SE_ORANGEBOXVALVE
 #if defined METAMOD_PLAPI_VERSION || PLAPI_VERSION >= 11
 	/* Get the CreateFakeClient function pointer */
 	if (!(vfunc=SH_GET_ORIG_VFNPTR_ENTRY(engine, &IVEngineServer::CreateFakeClient)))
@@ -142,7 +143,8 @@ void GetIServer()
 		void **vtable = *reinterpret_cast<void ***>(enginePatch->GetThisPtr() + info.thisptroffs + info.vtbloffs);
 		vfunc = vtable[info.vtblindex];
 	}
-#endif
+#endif // defined METAMOD_PLAPI_VERSION || PLAPI_VERSION >= 11
+#endif // SOURCE_ENGINE != SE_ORANGEBOXVALVE
 
 	/* Get signature string for IVEngineServer::CreateFakeClient() */
 	sigstr = g_pGameConf->GetKeyValue("CreateFakeClient_Windows");
@@ -154,12 +156,20 @@ void GetIServer()
 
 	/* Convert signature string to signature bytes */
 	siglen = UTIL_StringToSignature(sigstr, sig, sizeof(sig));
-
+	
+#if SOURCE_ENGINE == SE_ORANGEBOXVALVE
+	vfunc = memutils->FindPattern(engine, sig, siglen);
+	if (!vfunc)
+	{
+		return;
+	}
+#else
 	/* Check if we're on the expected function */
 	if (!UTIL_VerifySignature(vfunc, sig, siglen))
 	{
 		return;
 	}
+#endif
 
 	/* Get the offset into CreateFakeClient */
 	if (!g_pGameConf->GetOffset("sv", &offset))

extensions/sdktools/vnatives.cpp

@@ -528,7 +528,12 @@ static cell_t SlapPlayer(IPluginContext *pContext, const cell_t *params)
 			CellRecipientFilter rf;
 			rf.SetToReliable(true);
 			rf.Initialize(player_list, total_players);
+			
+#if SOURCE_ENGINE == SE_ORANGEBOXVALVE
+			engsound->EmitSound(rf, params[1], CHAN_AUTO, sound_name, VOL_NORM, ATTN_NORM, 0, PITCH_NORM, 0, &pos);
+#else
 			engsound->EmitSound(rf, params[1], CHAN_AUTO, sound_name, VOL_NORM, ATTN_NORM, 0, PITCH_NORM, &pos);
+#endif
 		}
 	}
 

extensions/sdktools/vsound.cpp

@@ -33,8 +33,13 @@
 #include <IForwardSys.h>
 
 SH_DECL_HOOK8_void(IVEngineServer, EmitAmbientSound, SH_NOATTRIB, 0, int, const Vector &, const char *, float, soundlevel_t, int, int, float);
+#if SOURCE_ENGINE == SE_ORANGEBOXVALVE
+SH_DECL_HOOK15_void(IEngineSound, EmitSound, SH_NOATTRIB, 0, IRecipientFilter &, int, int, const char *, float, float, int, int, int, const Vector *, const Vector *, CUtlVector<Vector> *, bool, float, int);
+SH_DECL_HOOK15_void(IEngineSound, EmitSound, SH_NOATTRIB, 1, IRecipientFilter &, int, int, const char *, float, soundlevel_t, int, int, int, const Vector *, const Vector *, CUtlVector<Vector> *, bool, float, int);
+#else
 SH_DECL_HOOK14_void(IEngineSound, EmitSound, SH_NOATTRIB, 0, IRecipientFilter &, int, int, const char *, float, float, int, int, const Vector *, const Vector *, CUtlVector<Vector> *, bool, float, int);
 SH_DECL_HOOK14_void(IEngineSound, EmitSound, SH_NOATTRIB, 1, IRecipientFilter &, int, int, const char *, float, soundlevel_t, int, int, const Vector *, const Vector *, CUtlVector<Vector> *, bool, float, int);
+#endif
 
 bool g_InSoundHook = false;
 
@@ -252,10 +257,17 @@ void SoundHooks::OnEmitAmbientSound(int entindex, const Vector &pos, const char
 	}
 }
 
+#if SOURCE_ENGINE == SE_ORANGEBOXVALVE
+void SoundHooks::OnEmitSound(IRecipientFilter &filter, int iEntIndex, int iChannel, const char *pSample, 
+							 float flVolume, soundlevel_t iSoundlevel, int iFlags, int iPitch, int iSpecialDSP, const Vector *pOrigin, 
+							 const Vector *pDirection, CUtlVector<Vector> *pUtlVecOrigins, bool bUpdatePositions, 
+							 float soundtime, int speakerentity)
+#else
 void SoundHooks::OnEmitSound(IRecipientFilter &filter, int iEntIndex, int iChannel, const char *pSample, 
 							 float flVolume, soundlevel_t iSoundlevel, int iFlags, int iPitch, const Vector *pOrigin, 
 							 const Vector *pDirection, CUtlVector<Vector> *pUtlVecOrigins, bool bUpdatePositions, 
 							 float soundtime, int speakerentity)
+#endif
 {
 	SoundHookIter iter;
 	IPluginFunction *pFunc;
@@ -293,6 +305,15 @@ void SoundHooks::OnEmitSound(IRecipientFilter &filter, int iEntIndex, int iChann
 			{
 				CellRecipientFilter crf;
 				crf.Initialize(players, size);
+#if SOURCE_ENGINE == SE_ORANGEBOXVALVE
+				RETURN_META_NEWPARAMS(
+					MRES_IGNORED,
+					static_cast<void (IEngineSound::*)(IRecipientFilter &, int, int, const char*, float, soundlevel_t, 
+					int, int, int, const Vector *, const Vector *, CUtlVector<Vector> *, bool, float, int)>(&IEngineSound::EmitSound), 
+					(crf, iEntIndex, iChannel, buffer, flVolume, iSoundlevel, iFlags, iPitch, iSpecialDSP, pOrigin, 
+					pDirection, pUtlVecOrigins, bUpdatePositions, soundtime, speakerentity)
+					);
+#else
 				RETURN_META_NEWPARAMS(
 					MRES_IGNORED,
 					static_cast<void (IEngineSound::*)(IRecipientFilter &, int, int, const char*, float, soundlevel_t, 
@@ -300,15 +321,23 @@ void SoundHooks::OnEmitSound(IRecipientFilter &filter, int iEntIndex, int iChann
 					(crf, iEntIndex, iChannel, buffer, flVolume, iSoundlevel, iFlags, iPitch, pOrigin, 
 					pDirection, pUtlVecOrigins, bUpdatePositions, soundtime, speakerentity)
 					);
+#endif
 			}
 		}
 	}
 }
 
+#if SOURCE_ENGINE == SE_ORANGEBOXVALVE
+void SoundHooks::OnEmitSound2(IRecipientFilter &filter, int iEntIndex, int iChannel, const char *pSample, 
+							 float flVolume, float flAttenuation, int iFlags, int iPitch, int iSpecialDSP, const Vector *pOrigin, 
+							 const Vector *pDirection, CUtlVector<Vector> *pUtlVecOrigins, bool bUpdatePositions, 
+							 float soundtime, int speakerentity)
+#else
 void SoundHooks::OnEmitSound2(IRecipientFilter &filter, int iEntIndex, int iChannel, const char *pSample, 
 							 float flVolume, float flAttenuation, int iFlags, int iPitch, const Vector *pOrigin, 
 							 const Vector *pDirection, CUtlVector<Vector> *pUtlVecOrigins, bool bUpdatePositions, 
 							 float soundtime, int speakerentity)
+#endif
 {
 	SoundHookIter iter;
 	IPluginFunction *pFunc;
@@ -347,6 +376,15 @@ void SoundHooks::OnEmitSound2(IRecipientFilter &filter, int iEntIndex, int iChan
 			{
 				CellRecipientFilter crf;
 				crf.Initialize(players, size);
+#if SOURCE_ENGINE == SE_ORANGEBOXVALVE
+				RETURN_META_NEWPARAMS(
+					MRES_IGNORED,
+					static_cast<void (IEngineSound::*)(IRecipientFilter &, int, int, const char*, float, float, 
+					int, int, int, const Vector *, const Vector *, CUtlVector<Vector> *, bool, float, int)>(&IEngineSound::EmitSound), 
+					(crf, iEntIndex, iChannel, buffer, flVolume, SNDLVL_TO_ATTN(static_cast<soundlevel_t>(sndlevel)), 
+					iFlags, iPitch, iSpecialDSP, pOrigin, pDirection, pUtlVecOrigins, bUpdatePositions, soundtime, speakerentity)
+					);
+#else
 				RETURN_META_NEWPARAMS(
 					MRES_IGNORED,
 					static_cast<void (IEngineSound::*)(IRecipientFilter &, int, int, const char*, float, float, 
@@ -354,6 +392,7 @@ void SoundHooks::OnEmitSound2(IRecipientFilter &filter, int iEntIndex, int iChan
 					(crf, iEntIndex, iChannel, buffer, flVolume, SNDLVL_TO_ATTN(static_cast<soundlevel_t>(sndlevel)), 
 					iFlags, iPitch, pOrigin, pDirection, pUtlVecOrigins, bUpdatePositions, soundtime, speakerentity)
 					);
+#endif
 			}
 		}
 	}
@@ -547,6 +586,48 @@ static cell_t EmitSound(IPluginContext *pContext, const cell_t *params)
 			player[0] = cl_array[i];
 			crf.Reset();
 			crf.Initialize(player, 1);
+#if SOURCE_ENGINE == SE_ORANGEBOXVALVE
+			if (g_InSoundHook)
+			{
+				SH_CALL(enginesoundPatch, 
+					static_cast<void (IEngineSound::*)(IRecipientFilter &, int, int, const char*, float, 
+					soundlevel_t, int, int, int, const Vector *, const Vector *, CUtlVector<Vector> *, bool, float, int)>
+					(&IEngineSound::EmitSound))
+					(crf, 
+					player[0], 
+					channel, 
+					sample, 
+					vol, 
+					(soundlevel_t)level, 
+					flags, 
+					pitch, 
+					0, 
+					pOrigin,
+					pDir,
+					pOrigVec,
+					updatePos,
+					soundtime,
+					speakerentity);
+			}
+			else
+			{
+				engsound->EmitSound(crf, 
+					player[0], 
+					channel, 
+					sample, 
+					vol, 
+					(soundlevel_t)level, 
+					flags, 
+					pitch, 
+					0, 
+					pOrigin,
+					pDir,
+					pOrigVec,
+					updatePos,
+					soundtime,
+					speakerentity);
+			}
+#else
 			if (g_InSoundHook)
 			{
 				SH_CALL(enginesoundPatch, 
@@ -585,8 +666,51 @@ static cell_t EmitSound(IPluginContext *pContext, const cell_t *params)
 					soundtime,
 					speakerentity);
 			}
+#endif
 		}
 	} else {
+#if SOURCE_ENGINE == SE_ORANGEBOXVALVE
+		if (g_InSoundHook)
+		{
+			SH_CALL(enginesoundPatch, 
+				static_cast<void (IEngineSound::*)(IRecipientFilter &, int, int, const char*, float, 
+				soundlevel_t, int, int, int, const Vector *, const Vector *, CUtlVector<Vector> *, bool, float, int)>
+				(&IEngineSound::EmitSound))
+				(crf, 
+				entity, 
+				channel, 
+				sample, 
+				vol, 
+				(soundlevel_t)level, 
+				flags, 
+				pitch, 
+				0, 
+				pOrigin,
+				pDir,
+				pOrigVec,
+				updatePos,
+				soundtime,
+				speakerentity);
+		}
+		else
+		{
+			engsound->EmitSound(crf, 
+				entity, 
+				channel, 
+				sample, 
+				vol, 
+				(soundlevel_t)level, 
+				flags, 
+				pitch, 
+				0, 
+				pOrigin,
+				pDir,
+				pOrigVec,
+				updatePos,
+				soundtime,
+				speakerentity);
+		}
+#else
 		if (g_InSoundHook)
 		{
 			SH_CALL(enginesoundPatch, 
@@ -625,6 +749,7 @@ static cell_t EmitSound(IPluginContext *pContext, const cell_t *params)
 				soundtime,
 				speakerentity);
 		}
+#endif
 	}
 
 	return 1;
@@ -714,6 +839,9 @@ static cell_t EmitSentence(IPluginContext *pContext, const cell_t *params)
 		(soundlevel_t)level, 
 		flags, 
 		pitch, 
+#if SOURCE_ENGINE == SE_ORANGEBOXVALVE
+		0, 
+#endif
 		pOrigin,
 		pDir,
 		pOrigVec,

extensions/sdktools/vsound.h

@@ -52,6 +52,16 @@ public:
 	bool RemoveHook(int type, IPluginFunction *pFunc);
 	void OnEmitAmbientSound(int entindex, const Vector &pos, const char *samp, float vol, 
 		soundlevel_t soundlevel, int fFlags, int pitch, float delay);
+#if SOURCE_ENGINE == SE_ORANGEBOXVALVE
+	void OnEmitSound(IRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample, float flVolume, 
+		soundlevel_t iSoundlevel, int iFlags, int iPitch, int iSpecialDSP, const Vector *pOrigin, 
+		const Vector *pDirection, CUtlVector<Vector> *pUtlVecOrigins, bool bUpdatePositions, 
+		float soundtime, int speakerentity);
+	void OnEmitSound2(IRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample, float flVolume, 
+		float flAttenuation, int iFlags, int iPitch, int iSpecialDSP, const Vector *pOrigin, 
+		const Vector *pDirection, CUtlVector<Vector> *pUtlVecOrigins, bool bUpdatePositions, 
+		float soundtime, int speakerentity);
+#else
 	void OnEmitSound(IRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample, float flVolume, 
 		soundlevel_t iSoundlevel, int iFlags, int iPitch, const Vector *pOrigin, 
 		const Vector *pDirection, CUtlVector<Vector> *pUtlVecOrigins, bool bUpdatePositions, 
@@ -60,6 +70,7 @@ public:
 		float flAttenuation, int iFlags, int iPitch, const Vector *pOrigin, 
 		const Vector *pDirection, CUtlVector<Vector> *pUtlVecOrigins, bool bUpdatePositions, 
 		float soundtime, int speakerentity);
+#endif
 private:
 	size_t _FillInPlayers(int *pl_array, IRecipientFilter *pFilter);
 	void _IncRefCounter(int type);

extensions/tf2/extension.cpp

@@ -451,6 +451,6 @@ TFClassType ClassnameToType(const char *classname)
 /**
  * A picture of a blue crab given to me as a gift and stored here for safe keeping
  *
- * http://www.democracycellproject.net/blog/archives/Clown%20car.jpg
+ * http://sourcemod.net/Clown%20car.jpg
  */
 

extensions/tf2/natives.cpp

@@ -39,11 +39,11 @@ cell_t TF2_MakeBleed(IPluginContext *pContext, const cell_t *params)
 {
 	static ICallWrapper *pWrapper = NULL;
 
-	// CTFPlayerShared::MakeBleed(CTFPlayer*, CTFWeaponBase*, float)
+	// CTFPlayerShared::MakeBleed(CTFPlayer*, CTFWeaponBase*, float, int=4)
 	if(!pWrapper)
 	{
 		REGISTER_NATIVE_ADDR("MakeBleed",
-			PassInfo pass[3]; \
+			PassInfo pass[4]; \
 			pass[0].flags = PASSFLAG_BYVAL; \
 			pass[0].size = sizeof(CBaseEntity *); \
 			pass[0].type = PassType_Basic; \
@@ -53,7 +53,10 @@ cell_t TF2_MakeBleed(IPluginContext *pContext, const cell_t *params)
 			pass[2].flags = PASSFLAG_BYVAL; \
 			pass[2].size = sizeof(float); \
 			pass[2].type = PassType_Basic; \
-			pWrapper = g_pBinTools->CreateCall(addr, CallConv_ThisCall, NULL, pass, 3))
+			pass[3].flags = PASSFLAG_BYVAL; \
+			pass[3].size = sizeof(int); \
+			pass[3].type = PassType_Basic; \
+			pWrapper = g_pBinTools->CreateCall(addr, CallConv_ThisCall, NULL, pass, 4))
 	}
 
 	CBaseEntity *pEntity;
@@ -80,6 +83,8 @@ cell_t TF2_MakeBleed(IPluginContext *pContext, const cell_t *params)
 	*(CBaseEntity **)vptr = NULL;
 	vptr += sizeof(CBaseEntity *);
 	*(float *)vptr = sp_ctof(params[3]);
+	vptr += sizeof(float);
+	*(int *)vptr = 4;
 
 	pWrapper->Execute(vstk, NULL);
 
@@ -449,12 +454,16 @@ cell_t TF2_Regenerate(IPluginContext *pContext, const cell_t *params)
 {
 	static ICallWrapper *pWrapper = NULL;
 
-	//CTFPlayer::Regenerate()
+	//CTFPlayer::Regenerate( bool=true )
 
 	if (!pWrapper)
 	{
 		REGISTER_NATIVE_ADDR("Regenerate", 
-			pWrapper = g_pBinTools->CreateCall(addr, CallConv_ThisCall, NULL, NULL, 0));
+			PassInfo pass[1]; \
+			pass[0].flags = PASSFLAG_BYVAL; \
+			pass[0].size = sizeof(bool); \
+			pass[0].type = PassType_Basic; \
+			pWrapper = g_pBinTools->CreateCall(addr, CallConv_ThisCall, NULL, pass, 1))
 	}
 
 	CBaseEntity *pEntity;
@@ -462,7 +471,15 @@ cell_t TF2_Regenerate(IPluginContext *pContext, const cell_t *params)
 	{
 		return pContext->ThrowNativeError("Client index %d is not valid", params[1]);
 	}
-	pWrapper->Execute(&pEntity, NULL);
+	
+	unsigned char vstk[sizeof(void *) + sizeof(bool)];
+	unsigned char *vptr = vstk;
+
+	*(void **)vptr = (void *)pEntity;
+	vptr += sizeof(void *);
+	*(bool *)vptr = true;
+
+	pWrapper->Execute(vstk, NULL);
 
 	return 1;
 }

gamedata/sdktools.games/engine.ep2valve.txt

@@ -18,9 +18,8 @@
 		{
 			"game"		"dod"
 			"game"		"tf"
-			"game"		"cstrike"
-			"game"		"garrysmod"
 			"game"		"hl2mp"
+			"game"		"cstrike"
 		}
 
 		"Offsets"
@@ -28,7 +27,7 @@
 			/* Offset into CBaseTempEntity constructor */
 			"s_pTempEntities"
 			{
-				"windows"	"17"
+				"windows"	"19"
 			}
 			"GetTEName"
 			{
@@ -55,7 +54,7 @@
 			"CBaseTempEntity"
 			{
 				"library"	"server"
-				"windows"	"\x8B\xC1\x8B\x4C\x24\x04\xC7\x00\x2A\x2A\x2A\x2A\x89\x48\x04\x8B\x15\x2A\x2A\x2A\x2A\x89\x50\x08\xA3\x2A\x2A\x2A\x2A\xC2\x04\x00"
+				"windows"	"\x55\x8B\xEC\x8B\xC1\x8B\x4D\x2A\xC7\x00\x2A\x2A\x2A\x2A\x89\x48"
 			}
 			"s_pTempEntities"
 			{
@@ -65,7 +64,7 @@
 			}
 		}
 	}
-
+	
 	/* CGlobalEntityList */
 	"#default"
 	{
@@ -73,8 +72,9 @@
 		{
 			"game"		"dod"
 			"game"		"tf"
-			"game"		"cstrike"
 			"game"		"hl2mp"
+			"game"		"cstrike"
+			"game"		"garrysmod"
 		}
 		
 		"Signatures"
@@ -83,7 +83,7 @@
 			"FindEntityByClassname"
 			{
 				"library"	"server"
-				"windows"	"\x53\x55\x56\x8B\xF1\x8B\x4C\x24\x10\x85\xC9\x57\x74\x19\x8B\x01\x8B\x50\x08\xFF\xD2\x8B\x00\x25\xFF\x0F\x00\x00\x83\xC0\x01\xC1\xE0\x04\x8B\x3C\x30\xEB\x06\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74\x39\x8B\x5C\x24\x18\x8B\x2D\x2A\x2A\x2A\x2A\xEB\x03"
+				"windows"	"\x55\x8B\xEC\x53\x56\x8B\xF1\x8B\x4D\x2A\x85\xC9\x57\x74\x2A\x8B\x01\x8B\x50\x2A\xFF\xD2\x8B\x00\x25\x2A\x2A\x2A\x2A\x83\xC0\x2A\xC1\xE0\x04\x8B\x3C\x30\xEB\x2A\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74\x2A\x8B\x5D\x2A\x8B\x37\x85\xF6\x75\x2A\x68\x2A\x2A\x2A\x2A\xFF\x15\x2A\x2A\x2A\x2A\x83\xC4\x2A\xEB\x2A\x39"
 				"linux"		"@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc"
 				"mac"		"@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc"
 			}
@@ -138,17 +138,21 @@
 	/* IServer interface pointer */
 	"#default"
 	{
+		"#supported"
+		{
+			"game"		"dod"
+			"game"		"tf"
+			"game"		"hl2mp"
+			"game"		"garrysmod"
+		}
+		
 		"Keys"
 		{
-			/* Signature for the beginning of IVEngineServer::CreateFakeClient.
+			/* Signature for the beginning of IVEngineServer::CreateFakeClientEx.
-			 *
+			 * (Must be unique!)
-			 * The engine binary is not actually scanned in order to look for
-			 * this. SourceHook is used to used to determine the address of the
-			 * function and this signature is used to verify that it contains
-			 * the expected code. A pointer to sv (IServer interface) is used
-			 * here.
 			 */
-			"CreateFakeClient_Windows"	"\x8B\x44\x24\x2A\x50\xB9\x2A\x2A\x2A\x2A\xE8"
+			
+			"CreateFakeClient_Windows"	"\x55\x8B\xEC\x8B\x2A\x2A\x50\xB9\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x85\xC0\x75"
 		}
 		
 		"Offsets"
@@ -156,7 +160,7 @@
 			/* Offset into IVEngineServer::CreateFakeClient */
 			"sv"
 			{
-				"windows"	"6"
+				"windows"	"8"
 			}
 		}
 
@@ -172,9 +176,50 @@
 		}
 	}
 	
+	"#default"
+	{
+		"#supported"
+		{
+			"game"	"cstrike"
+		}
+		
+		"Keys"
+		{
+			/* Signature for the beginning of IVEngineServer::CreateFakeClientEx.
+			 * (Must be unique!)
+			 */
+			"CreateFakeClient_Windows"	"\x55\x8B\xEC\x8B\x2A\x2A\x8A\x2A\x2A\x51\xB9\x2A\x2A\x2A\x2A\xA2"
+		}
+		
+		"Offsets"
+		{
+			"sv"
+			{
+				"windows"	"11"
+			}
+		}
+
+		"Signatures"
+		{
+			"sv"
+			{
+				"library"	"engine"
+				"linux"		"@sv"
+				"mac"		"@sv"
+			}
+		}
+	}
+	
 	/* EntityFactoryDictionary function */
 	"#default"
 	{
+		"#supported"
+		{
+			"game"		"tf"
+			"game"		"dod"
+			"game"		"hl2mp"
+		}
+		
 		"Signatures"
 		{
 			"EntityFactory"
@@ -194,15 +239,15 @@
 		{
 			"game"		"dod"
 			"game"		"tf"
-			"game"		"cstrike"
 			"game"		"hl2mp"
+			"game"		"cstrike"
 		}
 		"Signatures"
 		{
 			"FireOutput"
 			{
 				"library"	"server"
-				"windows"	"\x81\xEC\x2A\x2A\x00\x00\x53\x55\x56\x8B\x71\x14\x85\xF6"
+				"windows"	"\x55\x8B\xEC\x81\xEC\x2A\x2A\x2A\x2A\x53\x56\x8B\x71\x2A\x85\xF6"
 				"linux"		"@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f"
 				"mac"		"@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f"
 			}
@@ -212,6 +257,15 @@
 	/* SetUserInfo data */
 	"#default"
 	{
+		"#supported"
+		{
+			"game"		"dod"
+			"game"		"tf"
+			"game"		"garrysmod"
+			"game"		"hl2mp"
+			"game"		"cstrike"
+		}
+		
 		"Offsets"
 		{
 			/**
@@ -222,9 +276,9 @@
 			 */
 			"SetUserCvar"
 			{
-				"windows"	"17"
+				"windows"	"18"
-				"linux"		"57"
+				"linux"		"58"
-				"mac"		"57"
+				"mac"		"58"
 			}
 			/**
 			 * Offset into CBaseClient - Used by CBaseServer::UpdateUserSettings to determine when changes have been made.

gamedata/sdktools.games/game.cstrike.txt

@@ -28,87 +28,87 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"392"
+				"windows"	"396"
-				"linux"		"393"
+				"linux"		"397"
-				"mac"		"393"
+				"mac"		"397"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"263"
+				"windows"	"266"
-				"linux"		"264"
+				"linux"		"267"
-				"mac"		"264"
+				"mac"		"267"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"261"
+				"windows"	"264"
-				"linux"		"262"
+				"linux"		"265"
-				"mac"		"262"
+				"mac"		"265"
 			}
 			"Ignite"
 			{
-				"windows"	"204"
+				"windows"	"207"
-				"linux"		"205"
+				"linux"		"208"
-				"mac"		"205"
+				"mac"		"208"
 			}
 			"Extinguish"
 			{
-				"windows"	"208"
+				"windows"	"211"
-				"linux"		"209"
+				"linux"		"212"
-				"mac"		"209"
+				"mac"		"212"
 			}
 			"Teleport"
 			{
-				"windows"	"106"
+				"windows"	"107"
-				"linux"		"107"
+				"linux"		"108"
-				"mac"		"107"
+				"mac"		"108"
 			}
 			"CommitSuicide"
 			{
-				"windows"	"433"
+				"windows"	"437"
-				"linux"		"433"
+				"linux"		"437"
-				"mac"		"433"
+				"mac"		"437"
 			}
 			"GetVelocity"
 			{
-				"windows"	"138"
+				"windows"	"139"
-				"linux"		"139"
+				"linux"		"140"
-				"mac"		"139"
+				"mac"		"140"
 			}
 			"EyeAngles"
 			{
-				"windows"	"129"
+				"windows"	"130"
-				"linux"		"130"
+				"linux"		"131"
-				"mac"		"130"
+				"mac"		"131"
 			}
 			"AcceptInput"
 			{
-				"windows"	"35"
+				"windows"	"36"
-				"linux"		"36"
+				"linux"		"37"
-				"mac"		"36"
+				"mac"		"37"
 			}
 			"SetEntityModel"
 			{
-				"windows"	"23"
+				"windows"	"24"
-				"linux"		"24"
+				"linux"		"25"
-				"mac"		"24"
+				"mac"		"25"
 			}
 			"WeaponEquip"
 			{
-				"windows"	"254"
+				"windows"	"257"
-				"linux"		"255"
+				"linux"		"258"
-				"mac"		"255"
+				"mac"		"258"
 			}
 			"Activate"
 			{
-				"windows"	"32"
+				"windows"	"33"
-				"linux"		"33"
+				"linux"		"34"
-				"mac"		"33"
+				"mac"		"34"
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"410"
+				"windows"	"414"
-				"linux"		"411"
+				"linux"		"415"
-				"mac"		"411"
+				"mac"		"415"
 			}
 		}
 	}

gamedata/sdktools.games/game.dinodday.txt

@@ -7,7 +7,7 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"423"
+				"windows"	"424"
 			}
 			"RemovePlayerItem"
 			{
@@ -31,7 +31,7 @@
 			}
 			"CommitSuicide"
 			{
-				"windows"	"468"
+				"windows"	"469"
 			}
 			"GetVelocity"
 			{
@@ -59,7 +59,7 @@
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"444"
+				"windows"	"445"
 			}
 		}
 		

gamedata/sdktools.games/game.dod.txt

@@ -18,87 +18,87 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"391"
+				"windows"	"395"
-				"linux"		"392"
+				"linux"		"396"
-				"mac"		"392"
+				"mac"		"396"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"263"
+				"windows"	"266"
-				"linux"		"264"
+				"linux"		"267"
-				"mac"		"264"
+				"mac"		"267"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"261"
+				"windows"	"264"
-				"linux"		"262"
+				"linux"		"265"
-				"mac"		"262"
+				"mac"		"265"
 			}
 			"Ignite"
 			{
-				"windows"	"204"
+				"windows"	"207"
-				"linux"		"205"
+				"linux"		"208"
-				"mac"		"205"
+				"mac"		"208"
 			}
 			"Extinguish"
 			{
-				"windows"	"208"
+				"windows"	"211"
-				"linux"		"209"
+				"linux"		"212"
-				"mac"		"209"
+				"mac"		"212"
 			}
 			"Teleport"
 			{
-				"windows"	"106"
+				"windows"	"107"
-				"linux"		"107"
+				"linux"		"108"
-				"mac"		"107"
+				"mac"		"108"
 			}
 			"CommitSuicide"
 			{
-				"windows"	"429"
+				"windows"	"433"
-				"linux"		"430"
+				"linux"		"434"
-				"mac"		"430"
+				"mac"		"434"
 			}
 			"GetVelocity"
 			{
-				"windows"	"138"
+				"windows"	"139"
-				"linux"		"139"
+				"linux"		"140"
-				"mac"		"139"
+				"mac"		"140"
 			}
 			"EyeAngles"
 			{
-				"windows"	"129"
+				"windows"	"130"
-				"linux"		"130"
+				"linux"		"131"
-				"mac"		"130"
+				"mac"		"131"
 			}
 			"AcceptInput"
 			{
-				"windows"	"35"
+				"windows"	"36"
-				"linux"		"36"
+				"linux"		"37"
-				"mac"		"36"
+				"mac"		"37"
 			}
 			"SetEntityModel"
 			{
-				"windows"	"23"
+				"windows"	"24"
-				"linux"		"24"
+				"linux"		"25"
-				"mac"		"24"
+				"mac"		"25"
 			}
 			"WeaponEquip"
 			{
-				"windows"	"254"
+				"windows"	"257"
-				"linux"		"255"
+				"linux"		"258"
-				"mac"		"255"
+				"mac"		"258"
 			}
 			"Activate"
 			{
-				"windows"	"32"
+				"windows"	"33"
-				"linux"		"33"
+				"linux"		"34"
-				"mac"		"33"
+				"mac"		"34"
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"409"
+				"windows"	"413"
-				"linux"		"410"
+				"linux"		"414"
-				"mac"		"410"
+				"mac"		"414"
 			}
 		}
 		

gamedata/sdktools.games/game.garrysmod.txt

@@ -11,109 +11,168 @@
 
 "Games"
 {
-	/* Garry's Mod - No symbol names in linux bin */
+	/* Garry's Mod */
 	"garrysmod"
 	{
 		"Offsets"
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"433"
+				"windows"	"437"
-				"linux"		"434"
+				"linux"		"438"
-				"mac"		"434"
+				"mac"		"438"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"305"
+				"windows"	"308"
-				"linux"		"306"
+				"linux"		"309"
-				"mac"		"306"
+				"mac"		"309"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"303"
+				"windows"	"306"
-				"linux"		"304"
+				"linux"		"307"
-				"mac"		"304"
+				"mac"		"307"
 			}
 			"Ignite"
 			{
-				"windows"	"240"
+				"windows"	"243"
-				"linux"		"241"
+				"linux"		"244"
-				"mac"		"241"
+				"mac"		"244"
 			}
 			"Extinguish"
 			{
-				"windows"	"244"
+				"windows"	"247"
-				"linux"		"245"
+				"linux"		"248"
-				"mac"		"245"
+				"mac"		"248"
 			}
 			"Teleport"
 			{
-				"windows"	"107"
+				"windows"	"108"
-				"linux"		"108"
+				"linux"		"109"
-				"mac"		"108"
+				"mac"		"109"
 			}
 			"CommitSuicide"
 			{
-				"windows"	"472"
+				"windows"	"476"
-				"linux"		"472"
+				"linux"		"476"
-				"mac"		"472"
+				"mac"		"476"
 			}
 			"GetVelocity"
 			{
-				"windows"	"139"
+				"windows"	"140"
-				"linux"		"140"
+				"linux"		"141"
-				"mac"		"140"
+				"mac"		"141"
 			}
 			"EyeAngles"
 			{
-				"windows"	"130"
+				"windows"	"131"
-				"linux"		"131"
+				"linux"		"132"
-				"mac"		"131"
+				"mac"		"132"
 			}
 			"AcceptInput"
 			{
-				"windows"	"35"
+				"windows"	"36"
-				"linux"		"36"
+				"linux"		"37"
-				"mac"		"36"
+				"mac"		"37"
 			}
 			"SetEntityModel"
 			{
-				"windows"	"23"
+				"windows"	"24"
-				"linux"		"24"
+				"linux"		"25"
-				"mac"		"24"
+				"mac"		"25"
 			}
 			"WeaponEquip"
 			{
-				"windows"	"296"
+				"windows"	"299"
-				"linux"		"297"
+				"linux"		"300"
-				"mac"		"297"
+				"mac"		"300"
 			}
 			"Activate"
 			{
-				"windows"	"32"
+				"windows"	"33"
-				"linux"		"33"
+				"linux"		"34"
-				"mac"		"33"
+				"mac"		"34"
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"451"
+				"windows"	"455"
-				"linux"		"452"
+				"linux"		"456"
-				"mac"		"452"
+				"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"
 		{
-			"FindEntityByClassname"
+			/* 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"	"\x53\x55\x56\x8B\xF1\x8B\x4C\x24\x10\x57\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x08\xFF\xD2\x8B\x00\x25\xFF\x0F\x00\x00\x40\xC1\xE0\x04\x8B\x3C\x30\xEB\x06\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74\x2A\x8B\x5C\x24\x18\x8B\x2D\x2A\x2A\x2A\x2A\x8D\xA4\x24\x00\x00\x00\x00\x8B\x37\x85\xF6\x75\x2A\x68\x2A\x2A\x2A\x2A\xFF\x2A\x83\xC4\x04\xEB\x2A\x39\x2A\x2A\x74\x2A\x53"
+				"windows"	"\x55\x8B\xEC\x51\x0F\x57\xC0\xA1\x2A\x2A\x2A\x2A\x8D\x4D\xFC\xA3"
-				"linux"		"@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc"
-				"mac"		"@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc"
 			}
+			"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"	"\x81\xEC\x2A\x2A\x2A\x2A\x53\x55\x56\x8B\x71\x2A\x57\x89"
+				"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"
 			}

gamedata/sdktools.games/game.hl2mp.txt

@@ -18,87 +18,87 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"391"
+				"windows"	"395"
-				"linux"		"392"
+				"linux"		"396"
-				"mac"		"392"
+				"mac"		"396"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"263"
+				"windows"	"266"
-				"linux"		"264"
+				"linux"		"267"
-				"mac"		"264"
+				"mac"		"267"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"261"
+				"windows"	"264"
-				"linux"		"262"
+				"linux"		"265"
-				"mac"		"262"
+				"mac"		"265"
 			}
 			"Ignite"
 			{
-				"windows"	"204"
+				"windows"	"207"
-				"linux"		"205"
+				"linux"		"208"
-				"mac"		"205"
+				"mac"		"208"
 			}
 			"Extinguish"
 			{
-				"windows"	"208"
+				"windows"	"211"
-				"linux"		"209"
+				"linux"		"212"
-				"mac"		"209"
+				"mac"		"212"
 			}
 			"Teleport"
 			{
-				"windows"	"106"
+				"windows"	"107"
-				"linux"		"107"
+				"linux"		"108"
-				"mac"		"107"
+				"mac"		"108"
 			}
 			"CommitSuicide"
 			{
-				"windows"	"430"
+				"windows"	"434"
-				"linux"		"430"
+				"linux"		"434"
-				"mac"		"430"
+				"mac"		"434"
 			}
 			"GetVelocity"
 			{
-				"windows"	"138"
+				"windows"	"139"
-				"linux"		"139"
+				"linux"		"140"
-				"mac"		"139"
+				"mac"		"140"
 			}
 			"EyeAngles"
 			{
-				"windows"	"129"
+				"windows"	"130"
-				"linux"		"130"
+				"linux"		"131"
-				"mac"		"130"
+				"mac"		"131"
 			}
 			"AcceptInput"
 			{
-				"windows"	"35"
+				"windows"	"36"
-				"linux"		"36"
+				"linux"		"37"
-				"mac"		"36"
+				"mac"		"37"
 			}
 			"SetEntityModel"
 			{
-				"windows"	"23"
+				"windows"	"24"
-				"linux"		"24"
+				"linux"		"25"
-				"mac"		"24"
+				"mac"		"25"
 			}
 			"WeaponEquip"
 			{
-				"windows"	"254"
+				"windows"	"257"
-				"linux"		"255"
+				"linux"		"258"
-				"mac"		"255"
+				"mac"		"258"
 			}
 			"Activate"
 			{
-				"windows"	"32"
+				"windows"	"33"
-				"linux"		"33"
+				"linux"		"34"
-				"mac"		"33"
+				"mac"		"34"
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"409"
+				"windows"	"413"
-				"linux"		"410"
+				"linux"		"414"
-				"mac"		"410"
+				"mac"		"414"
 			}
 		}
 	}

gamedata/sdktools.games/game.tf.txt

@@ -18,87 +18,87 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"391"
+				"windows"	"395"
-				"linux"		"392"
+				"linux"		"396"
-				"mac"		"392"
+				"mac"		"396"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"263"
+				"windows"	"266"
-				"linux"		"264"
+				"linux"		"267"
-				"mac"		"264"
+				"mac"		"267"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"261"
+				"windows"	"264"
-				"linux"		"262"
+				"linux"		"265"
-				"mac"		"262"
+				"mac"		"265"
 			}
 			"Ignite"
 			{
-				"windows"	"204"
+				"windows"	"207"
-				"linux"		"205"
+				"linux"		"208"
-				"mac"		"205"
+				"mac"		"208"
 			}
 			"Extinguish"
 			{
-				"windows"	"208"
+				"windows"	"211"
-				"linux"		"209"
+				"linux"		"212"
-				"mac"		"209"
+				"mac"		"212"
 			}
 			"Teleport"
 			{
-				"windows"	"106"
+				"windows"	"107"
-				"linux"		"107"
+				"linux"		"108"
-				"mac"		"107"
+				"mac"		"108"
 			}
 			"CommitSuicide"
 			{
-				"windows"	"432"
+				"windows"	"436"
-				"linux"		"432"
+				"linux"		"436"
-				"mac"		"432"
+				"mac"		"436"
 			}
 			"GetVelocity"
 			{
-				"windows"	"138"
+				"windows"	"139"
-				"linux"		"139"
+				"linux"		"140"
-				"mac"		"139"
+				"mac"		"140"
 			}
 			"EyeAngles"
 			{
-				"windows"	"129"
+				"windows"	"130"
-				"linux"		"130"
+				"linux"		"131"
-				"mac"		"130"
+				"mac"		"131"
 			}
 			"SetEntityModel"
 			{
-				"windows"	"23"
+				"windows"	"24"
-				"linux"		"24"
+				"linux"		"25"
-				"mac"		"24"
+				"mac"		"25"
 			}
 			"AcceptInput"
 			{
-				"windows"	"35"
+				"windows"	"36"
-				"linux"		"36"
+				"linux"		"37"
-				"mac"		"36"
+				"mac"		"37"
 			}
 			"WeaponEquip"
 			{
-				"windows"	"254"
+				"windows"	"257"
-				"linux"		"255"
+				"linux"		"258"
-				"mac"		"255"
+				"mac"		"258"
 			}
 			"Activate"
 			{
-				"windows"	"32"
+				"windows"	"33"
-				"linux"		"33"
+				"linux"		"34"
-				"mac"		"33"
+				"mac"		"34"
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"409"
+				"windows"	"413"
-				"linux"		"410"
+				"linux"		"414"
-				"mac"		"410"
+				"mac"		"414"
 			}
 		}
 		

gamedata/sdktools.games/game.zpanic.txt

@@ -18,28 +18,28 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"356"
+				"windows"	"357"
-				"linux"		"357"
+				"linux"		"358"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"243"
+				"windows"	"246"
-				"linux"		"244"
+				"linux"		"247"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"238"
+				"windows"	"241"
-				"linux"		"239"
+				"linux"		"242"
 			}
 			"Ignite"
 			{
-				"windows"	"195"
+				"windows"	"198"
-				"linux"		"196"
+				"linux"		"199"
 			}
 			"Extinguish"
 			{
-				"windows"	"199"
+				"windows"	"202"
-				"linux"		"200"
+				"linux"		"203"
 			}
 			"Teleport"
 			{
@@ -48,8 +48,8 @@
 			}
 			"CommitSuicide"
 			{
-				"windows"	"399"
+				"windows"	"402"
-				"linux"		"399"
+				"linux"		"402"
 			}
 			"GetVelocity"
 			{
@@ -73,8 +73,8 @@
 			}
 			"WeaponEquip"
 			{
-				"windows"	"231"
+				"windows"	"234"
-				"linux"		"232"
+				"linux"		"235"
 			}
 			"Activate"
 			{
@@ -83,8 +83,8 @@
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"375"
+				"windows"	"376"
-				"linux"		"376"
+				"linux"		"377"
 			}
 		}
 		"Signatures"

gamedata/sm-cstrike.games.txt

@@ -32,7 +32,7 @@
 			"ClanTagOffset"
 			{
 				"windows"	"24"
-				"linux"		"41"
+				"linux"		"42"
 				"mac"		"29"
 			}
 		}
@@ -76,21 +76,21 @@
 			"TerminateRound"
 			{
 				"library"		"server"
-				"windows"		"\x83\xEC\x2A\x53\x8B\x5C\x2A\x2A\x55\x56\x57\x33\xF6\x8B\xE9\x33"
+				"windows"		"\x55\x8B\xEC\x83\xEC\x2A\x53\x8B\x2A\x2A\x56\x57\x33\xFF\x83"
 				"linux"			"@_ZN12CCSGameRules14TerminateRoundEfi"
 				"mac"			"@_ZN12CCSGameRules14TerminateRoundEfi"
 			}
 			"GetTranslatedWeaponAlias"
 			{
 				"library"		"server"
-				"windows"		"\x56\x57\x8B\x7C\x2A\x2A\x33\xF6\xEB\x2A\x2A\x2A\x00\x00\x00\x00\x8B\x04\x2A\x2A\x2A\x2A\x2A\x57\x50\xE8\x2A\x2A\x2A\x00\x83\xC4\x08\x85\xC0\x74\x2A\x83\x2A\x01\x83\x2A\x2A\x72\x2A\x8B\xC7\x5F\x5E"
+				"windows"		"\x55\x8B\xEC\x56\x57\x8B\x2A\x2A\x33\xF6\x8D\x2A\x00\x00\x00\x00\x8B\x04\xF5\x2A\x2A\x2A\x2A\x57\x50\xE8\x2A\x2A\x2A\x2A\x83\xC4\x2A\x85\xC0\x74\x2A\x83\xC6\x01\x83\x2A\x1A"
 				"linux"			"@_Z24GetTranslatedWeaponAliasPKc"
 				"mac"			"@_Z24GetTranslatedWeaponAliasPKc"
 			}
 			"GetWeaponInfo"
 			{
 				"library"		"server"
-				"windows"		"\x8B\x4C\x2A\x2A\x85\xC9\x75\x2A\x33\xC0\xC3"
+				"windows"		"\x55\x8B\xEC\x8B\x4D\x2A\x85\xC9\x75\x2A\x33\xC0\x5D\xC3\x83\xF9\x2A\x7C\x2A\x69\xC9\x2A\x2A\x00\x00"
 				"linux"			"@_Z13GetWeaponInfo10CSWeaponID"
 				"mac"			"@_Z13GetWeaponInfo10CSWeaponID"
 			}

gamedata/sm-tf2.games.txt

@@ -18,21 +18,21 @@
 			"Burn"
 			{
 				"library"	"server"
-				"windows"	"\x51\x56\x8B\xF1\x8B\x8E\x2A\x2A\x00\x00\x8B\x01\x8B\x90\x2A\x2A\x00\x00\xFF\xD2\x84\xC0\x0F\x2A\x2A\x2A\x2A\x2A\x57\x8D\xBE\x2A\x2A\x2A\x2A\x6A"
+				"windows"	"\x55\x8B\xEC\x51\x56\x8B\xF1\x8B\x2A\x2A\x2A\x2A\x2A\x8B\x01\x8B\x2A\x2A\x2A\x2A\x2A\xFF\xD2\x84\xC0\x0F\x2A\x2A\x2A\x2A\x2A\x57\x8D"
 				"linux"		"@_ZN15CTFPlayerShared4BurnEP9CTFPlayerP13CTFWeaponBase"
 				"mac"		"@_ZN15CTFPlayerShared4BurnEP9CTFPlayerP13CTFWeaponBase"
 			}
 			"RemoveDisguise"
 			{
 				"library"	"server"
-				"windows"	"\x51\x56\x8B\xF1\x8B\x8E\x2A\x2A\x2A\x2A\x57\x8B\xBE\x2A\x2A\x2A\x2A\xE8"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x08\x53\x56\x8B\xF1\x57\x8D\x9E"
 				"linux"		"@_ZN15CTFPlayerShared14RemoveDisguiseEv"
 				"mac"		"@_ZN15CTFPlayerShared14RemoveDisguiseEv"
 			}
 			"Disguise"
 			{
 				"library"	"server"
-				"windows"	"\x51\x53\x56\x8B\xF1\x8B\x8E\x2A\x2A\x00\x00\xE8\x2A\x2A\x2A\x2A\x8B\xD8\x8B\x86\x2A\x2A\x00\x00\x8B\x80"
+				"windows"	"\x55\x8B\xEC\x51\x53\x56\x8B\xF1\x8B\x2A\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x8B\xD8\x8B"
 				"linux"		"@_ZN15CTFPlayerShared8DisguiseEiiP9CTFPlayerb"
 				"mac"		"@_ZN15CTFPlayerShared8DisguiseEiiP9CTFPlayerb"
 			}
@@ -41,14 +41,14 @@
 				"library"	"server"
 				"linux"		"@_ZN13CTFWeaponBase26CalcIsAttackCriticalHelperEv"
 				"mac"		"@_ZN13CTFWeaponBase26CalcIsAttackCriticalHelperEv"
-				"windows"	"\x55\x8B\xEC\x83\x2A\x2A\x83\x2A\x2A\x53\x56\x57\x6A\x00\x68\x2A\x2A\x2A\x2A\x68\x2A\x2A\x2A\x2A\x6A"
+				"windows"	"\x53\x8B\xDC\x83\xEC\x08\x83\xE4\x2A\x83\xC4\x2A\x55\x8B\x6B\x2A\x89\x6C\x24\x2A\x8B\xEC\x83\xEC\x2A\x56\x57\x6A\x00"
 			}
 			"CalcCriticalMelee"
 			{
 				"library"	"server"
 				"linux"		"@_ZN18CTFWeaponBaseMelee26CalcIsAttackCriticalHelperEv"
 				"mac"		"@_ZN18CTFWeaponBaseMelee26CalcIsAttackCriticalHelperEv"
-				"windows"	"\x51\x53\x56\x8B\xF1\xE8\x2A\x2A\x2A\x2A\x8B\xD8\x85\xDB\x74\x2A\x8B\x03\x8B"
+				"windows"	"\x55\x8B\xEC\x51\x53\x56\x8B\xF1\xE8\x2A\x2A\x2A\x2A\x8B\xD8\x85\xDB\x74\x2A\x8B\x03"
 			}
 			"CalcCriticalBow"
 			{
@@ -60,63 +60,63 @@
 			"Regenerate"
 			{
 				"library"	"server"
-				"windows"	"\x83\xEC\x08\xF3\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x53\x55\x56\x8B\xF1\x8B"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x2A\xF3\x0F\x2A\x2A\x2A\x2A\x2A\x2A\x53\x56\x8B\xF1\x8B"
-				"linux"		"@_ZN9CTFPlayer10RegenerateEv"
+				"linux"		"@_ZN9CTFPlayer10RegenerateEb"
-				"mac"		"@_ZN9CTFPlayer10RegenerateEv"
+				"mac"		"@_ZN9CTFPlayer10RegenerateEb"
 			}
 			"AddCondition"
 			{
 				"library"	"server"
-				"windows"	"\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x83\xFF\x2A\x8B\xF1\x7C\x2A\x8D\x9E\x2A\x2A\x2A\x2A\x8D\x6F\x2A\xEB\x2A\x8D\x9E\x2A\x2A\x2A\x2A\x8B\xEF\x8B\x86\x2A\x2A\x2A\x2A\xD9"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x2A\x53\x56\x57\x8B\x7D\x2A\x83\xFF\x2A\x8B\xF1\x7C\x2A\x8D\x47\x2A\x8D\x9E\x2A\x2A\x2A\x2A\x89\x45\x2A\xEB\x2A\x8D\x9E\x2A\x2A\x2A\x2A\x89\x7D\x2A\x8B\x8E\x2A\x2A\x2A\x2A\xD9"
 				"linux"		"@_ZN15CTFPlayerShared7AddCondE7ETFCondf"
 				"mac"		"@_ZN15CTFPlayerShared7AddCondE7ETFCondf"
 			}
 			"RemoveCondition"
 			{
 				"library"	"server"
-				"windows"	"\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x83\xFF\x20\x8B\xF1\x7C\x2A\x8D\x9E\x2A\x2A\x2A\x2A\x8D\x6F\x2A\xEB\x2A\x8D\x9E\x2A\x2A\x2A\x2A\x8B\xEF\x8B\x2A\x2A\x2A\x50\x57\x8D"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x2A\x53\x56\x57\x8B\x7D\x2A\x83\xFF\x2A\x8B\xF1\x7C\x2A\x8D\x47\x2A\x8D\x9E\x2A\x2A\x2A\x2A\x89\x45\x2A\xEB\x2A\x8D\x9E\x2A\x2A\x2A\x2A\x89\x7D\x2A\x8B\x4D"
 				"linux"		"@_ZN15CTFPlayerShared10RemoveCondE7ETFCondb"
 				"mac"		"@_ZN15CTFPlayerShared10RemoveCondE7ETFCondb"
 			}
 			"SetPowerplayEnabled"
 			{
 				"library"	"server"
-				"windows"	"\x80\x7C\x2A\x2A\x2A\x56\x8B\xF1\x74\x2A\x57\x8D\x44\x24\x2A\x50"
+				"windows"	"\x55\x8B\xEC\x80\x7D\x2A\x2A\x56\x8B\xF1\x74\x2A\x57\x8D\x45"
 				"linux"		"@_ZN9CTFPlayer19SetPowerplayEnabledEb"
 				"mac"		"@_ZN9CTFPlayer19SetPowerplayEnabledEb"
 			}
 			"SetInWaitingForPlayers"
 			{
 				"library"	"server"
-				"windows"	"\x56\x8B\xF1\xE8\x2A\x2A\x2A\x2A\x84\xC0\x0F\x85\x2A\x2A\x2A\x2A\xA1"
+				"windows"	"\x55\x8B\xEC\x56\x8B\xF1\xE8\x2A\x2A\x2A\x2A\x84\xC0\x0F\x85\x2A\x2A\x2A\x2A\xA1\x2A\x2A\x2A\x2A"
 				"linux"		"@_ZN24CTeamplayRoundBasedRules22SetInWaitingForPlayersEb"
 				"mac"		"@_ZN24CTeamplayRoundBasedRules22SetInWaitingForPlayersEb"
 			}
 			"StunPlayer"
 			{
 				"library"	"server"
-				"windows"	"\x51\xD9\x2A\x2A\x2A\x2A\x2A\x56\x57\x83\xEC\x2A\xD9\x2A\x2A\x2A\x8B\xF1\xD9\xEE\xD9\x2A\x2A\x2A\xD9\xE8\xD9"
+				"windows"	"\x55\x8B\xEC\x51\xD9\x05\x2A\x2A\x2A\x2A\x56\x57\x83\xEC\x14"
 				"linux"		"@_ZN15CTFPlayerShared10StunPlayerEffiP9CTFPlayer"
 				"mac"		"@_ZN15CTFPlayerShared10StunPlayerEffiP9CTFPlayer"
 			}
 			"IsHolidayActive"
 			{
 				"library"	"server"
-				"windows"	"\x80\x2A\x2A\x2A\x2A\x2A\x00\x75\x2A\xE8\x2A\x2A\x2A\x2A\x8B\x54\x2A\x2A\x8B"
+				"windows"	"\x55\x8B\xEC\x80\x3D\x2A\x2A\x2A\x2A\x2A\x75\x2A\xE8"
 				"linux"		"@_Z20UTIL_IsHolidayActivei"
 				"mac"		"@_Z20UTIL_IsHolidayActivei"
 			}
 			"MakeBleed"
 			{
 				"library" 	"server"
-				"windows"	"\x51\x56\x8B\xF1\x8B\x8E\x2A\x2A\x2A\x2A\x8B\x01\x8B\x90\x2A\x2A\x2A\x2A\xFF\xD2\x84\xC0\x0F\x2A\x2A\x2A\x2A\x2A\x6A\x19\x8D"
+				"windows"	"\x55\x8B\xEC\x51\x56\x8B\xF1\x8B\x2A\x2A\x2A\x2A\x2A\x8B\x01\x8B\x2A\x2A\x2A\x2A\x2A\xFF\xD2\x84\xC0\x0F\x2A\x2A\x2A\x2A\x2A\x6A\x19"
-				"linux"		"@_ZN15CTFPlayerShared9MakeBleedEP9CTFPlayerP13CTFWeaponBasef"
+				"linux"		"@_ZN15CTFPlayerShared9MakeBleedEP9CTFPlayerP13CTFWeaponBasefi"
-				"mac"		"@_ZN15CTFPlayerShared9MakeBleedEP9CTFPlayerP13CTFWeaponBasef"
+				"mac"		"@_ZN15CTFPlayerShared9MakeBleedEP9CTFPlayerP13CTFWeaponBasefi"
 			}
 			"IsPlayerInDuel"
 			{
 				"library"	"server"
-				"windows"	"\x83\xEC\x08\x2A\x2A\x2A\x2A\x33\xC0\x89\x04\x24\x89\x44\x24\x04\x8D\x04\x24\x50\x2A\x2A\x2A\x2A\x2A\x84\xC0\x2A\x2A\x83\xC4\x08\xC3"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x2A\x8B\x4D\x2A\x33\xC0\x89\x45\x2A\x89\x45"
 				"linux"		"@_Z21DuelMiniGame_IsInDuelP9CTFPlayer"
 				"mac"		"@_Z21DuelMiniGame_IsInDuelP9CTFPlayer"
 			}
@@ -125,9 +125,9 @@
 		{
 			"ForceRespawn"
 			{
-				"windows"	"318"
+				"windows"	"321"
-				"linux"		"319"
+				"linux"		"322"
-				"mac"		"319"
+				"mac"		"322"
 			}
 		}
 	}

loader/loader.cpp

@@ -77,6 +77,11 @@
 #define FILENAME_1_6_BGT			"sourcemod.2.bgt" PLATFORM_EXT
 #define FILENAME_1_6_EYE			"sourcemod.2.eye" PLATFORM_EXT
 
+// Shim for compatibility with MM:S 1.9.0+
+#ifndef SOURCE_ENGINE_CSS
+#define SOURCE_ENGINE_CSS 13
+#endif
+
 HINSTANCE g_hCore = NULL;
 bool load_attempted = false;
 
@@ -257,6 +262,11 @@ DLL_EXPORT METAMOD_PLUGIN *CreateInterface_MMS(const MetamodVersionInfo *mvi, co
 			filename = FILENAME_1_6_EYE;
 			break;
 		}
+	case SOURCE_ENGINE_CSS:
+		{
+			filename = FILENAME_1_6_EP2VALVE;
+			break;
+		}
 	default:
 		{
 			return NULL;

plugins/funcommands/drug.sp

@@ -43,14 +43,12 @@ KillDrug(client)
 {
 	KillDrugTimer(client);
 	
-	new Float:pos[3];
-	GetClientAbsOrigin(client, pos);
 	new Float:angs[3];
 	GetClientEyeAngles(client, angs);
 	
 	angs[2] = 0.0;
 	
-	TeleportEntity(client, pos, angs, NULL_VECTOR);	
+	TeleportEntity(client, NULL_VECTOR, angs, NULL_VECTOR);	
 	
 	new clients[2];
 	clients[0] = client;	
@@ -144,15 +142,12 @@ public Action:Timer_Drug(Handle:timer, any:client)
 		return Plugin_Handled;
 	}
 	
-	new Float:pos[3];
-	GetClientAbsOrigin(client, pos);
-	
 	new Float:angs[3];
 	GetClientEyeAngles(client, angs);
 	
 	angs[2] = g_DrugAngles[GetRandomInt(0,100) % 20];
 	
-	TeleportEntity(client, pos, angs, NULL_VECTOR);
+	TeleportEntity(client, NULL_VECTOR, angs, NULL_VECTOR);
 	
 	new clients[2];
 	clients[0] = client;	
@@ -264,7 +259,7 @@ public Action:Command_Drug(client, args)
 	{
 		decl String:arg2[2];
 		GetCmdArg(2, arg2, sizeof(arg2));
-		if (arg2[0])
+		if (StringToInt(arg2))
 		{
 			toggle = 1;
 		}

plugins/include/admin.inc

@@ -347,7 +347,7 @@ native AdminId:CreateAdmin(const String:name[]="");
  * @param maxlength		Maximum size of string buffer.
  * @return				Number of bytes written.
  */
-native GetAdminUsername(AdminId:id, const String:name[], maxlength);
+native GetAdminUsername(AdminId:id, String:name[], maxlength);
 
 /**
  * Binds an admin to an identity for fast lookup later on.  The bind must be unique.

plugins/include/float.inc

@@ -263,7 +263,7 @@ stock Float:operator--(Float:oper)
 
 stock Float:operator-(Float:oper)
 {
-	return oper^Float:((-1)^((-1)/2));				/* IEEE values are sign/magnitude */
+	return oper^Float:cellmin;				/* IEEE values are sign/magnitude */
 }
 
 stock Float:operator*(Float:oper1, oper2)

plugins/include/halflife.inc

@@ -127,6 +127,13 @@ native Float:GetEngineTime();
  */
 native Float:GetGameTime();
 
+/** 
+ * Returns the game's internal tick count.
+ *
+ * @return				Game tick count.
+ */
+native GetGameTickCount();
+
 /**
  * Returns the game description from the mod.
  *

plugins/include/menus.inc

@@ -404,6 +404,16 @@ native bool:GetMenuExitBackButton(Handle:menu);
  */
 native SetMenuExitBackButton(Handle:menu, bool:button);
 
+/**
+ * Sets whether or not the menu has a "no vote" button in slot 1.
+ * By default, menus do not have a no vote button.
+ *
+ * @param menu				Menu Handle.
+ * @param button			True to enable the button, false to remove it.
+ * @return 					True if allowed; false on failure.
+ * @error					Invalid Handle.
+ */
+native bool:SetMenuNoVoteButton(Handle:menu, bool:button);
 
 /**
  * Cancels a menu from displaying on all clients.  While the
@@ -489,7 +499,7 @@ native bool:VoteMenu(Handle:menu, clients[], numClients, time, flags=0);
  *							in progress.
  * @error					Invalid Handle.
  */
-stock VoteMenuToAll(Handle:menu, time, flags=0)
+stock bool:VoteMenuToAll(Handle:menu, time, flags=0)
 {
 	new total;
 	decl players[MaxClients];

plugins/include/sdktools_gamerules.inc

@@ -66,6 +66,9 @@ enum RoundState {
 	
 	//Game is over, doing bonus round stuff
 	RoundState_Bonus,
+	
+	//Between rounds
+	RoundState_BetweenRounds,
 };
 
 /**

plugins/include/tf2.inc

@@ -115,13 +115,19 @@ enum TFCond
 	TFCond_CritOnWin,
 	TFCond_CritOnFlagCapture,
 	TFCond_CritOnKill,
-	TFCond_RestrictToMelee
+	TFCond_RestrictToMelee,
+	
+	TFCond_CritMmmph = 44,
+	TFCond_DefenseBuffMmmph,
 };
 
 enum TFHoliday
 {
 	TFHoliday_Birthday = 1,
 	TFHoliday_Halloween,
+	TFHoliday_Christmas,
+	TFHoliday_MeetThePyro,
+	TFHoliday_MannVsMachine,
 	TFHoliday_FullMoon,
 	TFHoliday_HalloweenOrFullMoon,
 };

plugins/include/tf2_stocks.inc

@@ -132,6 +132,12 @@ enum {
 	TF_CUSTOM_PLASMA_GIB,
 	TF_CUSTOM_PRACTICE_STICKY,
 	TF_CUSTOM_EYEBALL_ROCKET,
+	TF_CUSTOM_HEADSHOT_DECAPITATION,
+	TF_CUSTOM_TAUNT_ARMAGEDDON,
+	TF_CUSTOM_FLARE_PELLET,
+	TF_CUSTOM_CLEAVER,
+	TF_CUSTOM_CLEAVER_CRIT,
+	TF_CUSTOM_SAPPER_RECORDER_DEATH,
 };
 
 // Weapon codes as used in some events, such as player_death
@@ -218,6 +224,14 @@ enum {
 	TF_WEAPON_RAYGUN,
 	TF_WEAPON_PARTICLE_CANNON,
 	TF_WEAPON_MECHANICAL_ARM,
+	TF_WEAPON_DRG_POMSON,
+	TF_WEAPON_BAT_GIFTWRAP,
+	TF_WEAPON_GRENADE_ORNAMENT,
+	TF_WEAPON_RAYGUN_REVENGE,
+	TF_WEAPON_PEP_BRAWLER_BLASTER,
+	TF_WEAPON_CLEAVER,
+	TF_WEAPON_GRENADE_CLEAVER,
+	TF_WEAPON_ROCKETPACK,
 };
 
 // TF2 Weapon Slots for GetPlayerWeaponSlot

plugins/include/version.inc

@@ -37,6 +37,6 @@
 
 #define SOURCEMOD_V_MAJOR		1				/**< SourceMod Major version */
 #define SOURCEMOD_V_MINOR		4				/**< SourceMod Minor version */
-#define SOURCEMOD_V_RELEASE		1				/**< SourceMod Release version */
+#define SOURCEMOD_V_RELEASE		5				/**< SourceMod Release version */
 
-#define SOURCEMOD_VERSION	"1.4.1"	/**< SourceMod version string (major.minor.release.build) */
+#define SOURCEMOD_VERSION	"1.4.5"	/**< SourceMod version string (major.minor.release.build) */

product.version

@@ -1 +1 @@
-1.4.1
+1.4.5

public/IGameHelpers.h

@@ -40,12 +40,13 @@
  */
 
 #define SMINTERFACE_GAMEHELPERS_NAME		"IGameHelpers"
-#define SMINTERFACE_GAMEHELPERS_VERSION		7
+#define SMINTERFACE_GAMEHELPERS_VERSION		8
 
 class CBaseEntity;
 class CBaseHandle;
 class SendProp;
 class ServerClass;
+class ICommandLine;
 struct edict_t;
 struct datamap_t;
 struct typedescription_t;
@@ -284,6 +285,13 @@ namespace SourceMod
 		 * @return				True on success, false on failure.
 		 */
 		virtual bool HintTextMsg(int client, const char *msg) =0;
+
+		/**
+		 * @brief Retrieves the Valve command line pointer.
+		 *
+		 * @return				ICommandLine ptr or NULL if not found.
+		 */
+		virtual ICommandLine *GetValveCommandLine() =0;
 	};
 }
 

public/sample_ext/sdk/smsdk_ext.cpp

@@ -191,6 +191,9 @@ bool SDKExtension::OnExtensionLoad(IExtension *me, IShareSys *sys, char *error,
 #if defined SMEXT_ENABLE_TRANSLATOR
 	SM_GET_IFACE(TRANSLATOR, translator);
 #endif
+#if defined SMEXT_ENABLE_NINVOKE
+	SM_GET_IFACE(NINVOKE, ninvoke);
+#endif
 #if defined SMEXT_ENABLE_ROOTCONSOLEMENU
 	SM_GET_IFACE(ROOTCONSOLE, rootconsole);
 #endif

pushbuild.txt

@@ -20,7 +20,7 @@ Pants will save us from certain death.
 Invaders' blood marches through my veins, like GIANT RADIOACTIVE RUBBER PANTS!
  THE PANTS COMMAND COMMAND ME! DO NOT IGNORE MY VEINS.
 This file sure has gotten big.
-sawce loves anime, sushi, and macs
+applesawce loves anime, sushi, and macs
 u
 not me
 skull man was here
@@ -34,7 +34,7 @@ On The Patty Winters Show this morning were descendants of members of the Donner
 Everything outside of this is like a movie I once saw.
 THIS IS NOT AN EXIT.
 ABANDON ALL HOPE YE WHO ENTER HERE.
-egg!
+egg!!
 blimey
 crab
 jibbly jibbly jibbly
@@ -51,3 +51,5 @@ clobstermonkey
 that thing
 clobber build because amx.h changed (sigh)
 a dead fish
+BuildBot is very well-written, stable, enterprise software.
+I'm on a plane.

tools/buildbot/bootstrap.pl

@@ -47,12 +47,12 @@ if ($reconf) {
 	$argn = $#ARGV + 1;
 	print "Attempting to reconfigure...\n";
 	if ($argn > 0 && $^O !~ /MSWin/) {
-		$result = `CC=$ARGV[0] CXX=$ARGV[0] python3.1 ../build/configure.py --enable-optimize`;
+		$result = `CC=$ARGV[0] CXX=$ARGV[0] python3 ../build/configure.py --enable-optimize`;
 	} else {
 		if ($^O eq "linux") {
-			$result = `CC=gcc-4.4 CXX=gcc-4.4 python3.1 ../build/configure.py --enable-optimize`;
+			$result = `CC=gcc-4.4 CXX=gcc-4.4 python3 ../build/configure.py --enable-optimize`;
 		} elsif ($^O eq "darwin") {
-			$result = `CC=gcc-4.2 CXX=gcc-4.2 python3.1 ../build/configure.py --enable-optimize`;
+			$result = `CC=clang CXX=clang python3 ../build/configure.py --enable-optimize`;
 		} else {
 			$result = `C:\\Python31\\Python.exe ..\\build\\configure.py --enable-optimize`;
 		}

tools/buildbot/startbuild.pl

@@ -11,7 +11,7 @@ require 'helpers.pm';
 chdir('../../../OUTPUT');
 
 if ($^O eq "linux" || $^O eq "darwin") {
-	system("python3.1 build.py 2>&1");
+	system("python3 build.py 2>&1");
 } else {
 	system("C:\\Python31\\python.exe build.py 2>&1");
 }