Updated changelog and versioning for version 1.4.3.

.hgtags

@@ -3,3 +3,6 @@ e6ef5ecdf8d75740ca2685a709bf321f8873bc3b sourcemod-1.1.0
 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

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)
-						self.sdkInfo[sdk] = info	
+						if head != None and head != oldhead:
+							(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,80 @@ SourceMod Changelog
 
 -----------------------------
 
+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
+
+User Changes:
+
+ - Updated support for latest OrangeBox engine changes (CS:S, DoD:S, TF2, HL2DM, GMod). 
+ - Added gamedata for Adrenaline Gamer 2 and No More Room in Hell. 
+ - Fixed "not connected" error in reserve slots plugin (bug 5158) (ostrel). 
+ - Fixed ff trigger output printing to all in triggerer's language (rather than viewer's language) (bug 5161). 
+ - Fixed typo in one of basebans ban reasons (bug 5188).
+ - Fixed formatting error in Swedish "Vote Count" phrase (bug 5174).
+
+Developer Changes:
+
+ - Fixed sp MaxClients not being updated on map changes after load (bug 5160). 
+ - Removed GLIBC_2.7 dependency from spcomp. 
+ - Increased buffer for sm_rcon command to fit larger responses (bug 5169). 
+ - BaseComm now properly registers a library allowing it to be required by other plugins (bug 5156). 
+ - Fixed TFHoliday enum values (bug 5155). 
+ - Updated TF2_OnIsHolidayActive ret behavior to match doc (bug 5155). 
+ - Added new TF2 deathflag and dmg custom defines (bug 5157).
+
+-----------------------------
+
 SourceMod 1.4.0 [2011-10-28]
 
 URL: http://wiki.alliedmods.net/SourceMod_1.4.0_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()
 {
@@ -748,6 +832,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 +846,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;
 		}

core/HalfLife2.h

@@ -44,6 +44,7 @@
 #include <server_class.h>
 #include <datamap.h>
 #include <ihandleentity.h>
+#include <tier0/icommandline.h>
 
 class CCommand;
 
@@ -136,6 +137,7 @@ public: //IGameHelpers
 	cell_t EntityToBCompatRef(CBaseEntity *pEntity);
 	void *GetGlobalEntityList();
 	int GetSendPropOffset(SendProp *prop);
+	ICommandLine *GetValveCommandLine();
 public:
 	void AddToFakeCliCmdQueue(int client, int userid, const char *cmd);
 	void ProcessFakeCliCmdQueue();
@@ -151,6 +153,9 @@ public:
 #endif
 private:
 	DataTableInfo *_FindServerClass(const char *classname);
+private:
+	void InitLogicalEntData();
+	void InitCommandLine();
 private:
 	Trie *m_pClasses;
 	List<DataTableInfo *> m_Tables;
@@ -163,6 +168,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/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());
@@ -263,10 +263,10 @@ void PlayerManager::OnServerActivate(edict_t *pEdictList, int edictCount, int cl
 		memset(m_AuthQueue, 0, sizeof(unsigned int) * (ABSOLUTE_PLAYER_LIMIT + 1));
 
 		g_NumPlayersToAuth = &m_AuthQueue[0];
-
-		g_PluginSys.SyncMaxClients(m_maxClients);
 	}
 
+	g_PluginSys.SyncMaxClients(m_maxClients);
+
 	g_OnMapStarted = true;
 
 	g_Extensions.CallOnCoreMapStart(pEdictList, edictCount, m_maxClients);
@@ -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, 
-				maxlength, 
-				"Unable to load plugin (error %d: %s)", 
-				err, 
-				g_pSourcePawn2->GetErrorString(err));
+			if (error)
+			{
+				UTIL_Format(error, 
+					maxlength, 
+					"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/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_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())
@@ -520,6 +525,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

@@ -202,6 +202,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];

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);

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)
 	{
@@ -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)
 	{

extensions/cstrike/RegNatives.cpp

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

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/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/holiday.cpp

@@ -51,7 +51,7 @@ DETOUR_DECL_STATIC1(IsHolidayActive, bool, int, holiday)
 	g_isHolidayForward->PushCellByRef(&newres);
 	g_isHolidayForward->Execute(&result);
 	
-	if (result == Pl_Changed)
+	if (result > Pl_Continue)
 	{
 		return (newres == 0) ? false : true;
 	}

gamedata/core.games/common.games.txt

@@ -216,6 +216,8 @@
 			"game"					"eye"
 			"game"					"nucleardawn"
 			"game"					"hl2ctf"
+			"game"					"ag2"
+			"game"					"nmrih"
 		}
 		
 		"Keys"

gamedata/core.games/engine.ep2.txt

@@ -28,6 +28,8 @@
 			"game"		"fas"
 			"game"		"fistful_of_frags"
 			"game"		"cspromod"
+			"game"		"ag2"
+			"game"		"nmrih"
 		}
 		
 		"Offsets"

gamedata/sdktools.games/engine.ep2.txt

@@ -26,6 +26,7 @@
 			"game"		"fas"
 			"game"		"fistful_of_frags"
 			"game"		"cspromod"
+			"game"		"ag2"
 		}
 
 		"Offsets"
@@ -76,6 +77,7 @@
 			"game"		"pvkii"
 			"game"		"fistful_of_frags"
 			"game"		"cspromod"
+			"game"		"ag2"
 		}
 		
 		"Signatures"
@@ -107,6 +109,8 @@
 			"game"		"fas"
 			"game"		"fistful_of_frags"
 			"game"		"cspromod"
+			"game"		"ag2"
+			"game"		"nmrih"
 		}
 		
 		"Offsets"
@@ -198,6 +202,7 @@
 		{
 			"game"		"ageofchivalry"
 			"game"		"cspromod"
+			"game"		"ag2"
 		}
 		"Signatures"
 		{

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,8 @@
 		{
 			"game"		"dod"
 			"game"		"tf"
-			"game"		"cstrike"
 			"game"		"hl2mp"
+			"game"		"cstrike"
 		}
 		
 		"Signatures"
@@ -83,7 +82,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"
 			}
@@ -148,7 +147,7 @@
 			 * 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\x45\x2A\x50\xB9\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x85\xC0"
 		}
 		
 		"Offsets"
@@ -156,7 +155,7 @@
 			/* Offset into IVEngineServer::CreateFakeClient */
 			"sv"
 			{
-				"windows"	"6"
+				"windows"	"8"
 			}
 		}
 
@@ -194,15 +193,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 +211,15 @@
 	/* SetUserInfo data */
 	"#default"
 	{
+		"#supported"
+		{
+			"game"		"dod"
+			"game"		"tf"
+			"game"		"garrysmod"
+			"game"		"hl2mp"
+			"game"		"cstrike"
+		}
+		
 		"Offsets"
 		{
 			/**
@@ -222,9 +230,9 @@
 			 */
 			"SetUserCvar"
 			{
-				"windows"	"17"
-				"linux"		"57"
-				"mac"		"57"
+				"windows"	"18"
+				"linux"		"58"
+				"mac"		"58"
 			}
 			/**
 			 * Offset into CBaseClient - Used by CBaseServer::UpdateUserSettings to determine when changes have been made.

gamedata/sdktools.games/game.ag2.txt

@@ -0,0 +1,91 @@
+/**
+ * Do not edit this file.  Any changes will be overwritten by the gamedata
+ * updater or by upgrading your SourceMod install.
+ *
+ * To override data in this file, create a subdirectory named "custom" and
+ * place your own gamedata file(s) inside of it.  Such files will be parsed
+ * after SM's own.
+ *
+ * For more information, see http://wiki.alliedmods.net/Gamedata_Updating_(SourceMod)
+ */
+
+"Games"
+{
+	/* Adrenaline Gamer 2 v1.02 */
+	"ag2"
+	{
+		"Offsets"
+		{
+			"GiveNamedItem"
+			{
+				"windows"	"350"
+				"linux"		"351"
+			}
+			"RemovePlayerItem"
+			{
+				"windows"	"238"
+				"linux"		"239"
+			}
+			"Weapon_GetSlot"
+			{
+				"windows"	"236"
+				"linux"		"237"
+			}
+			"Ignite"
+			{
+				"windows"	"193"
+				"linux"		"194"
+			}
+			"Extinguish"
+			{
+				"windows"	"197"
+				"linux"		"198"
+			}
+			"Teleport"
+			{
+				"windows"	"100"
+				"linux"		"101"
+			}
+			"CommitSuicide"
+			{
+				"windows"	"391"
+				"linux"		"391"
+			}
+			"GetVelocity"
+			{
+				"windows"	"130"
+				"linux"		"131"
+			}
+			"EyeAngles"
+			{
+				"windows"	"122"
+				"linux"		"123"
+			}
+			"AcceptInput"
+			{
+				"windows"	"34"
+				"linux"		"35"
+			}
+			"SetEntityModel"
+			{
+				"windows"	"23"
+				"linux"		"24"
+			}
+			"WeaponEquip"
+			{
+				"windows"	"229"
+				"linux"		"230"
+			}
+			"Activate"
+			{
+				"windows"	"31"
+				"linux"		"32"
+			}
+			"PlayerRunCmd"
+			{
+				"windows"	"370"
+				"linux"		"371"
+			}
+		}
+	}
+}

gamedata/sdktools.games/game.cstrike.txt

@@ -28,21 +28,21 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"391"
-				"linux"		"392"
-				"mac"		"392"
+				"windows"	"392"
+				"linux"		"393"
+				"mac"		"393"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"262"
-				"linux"		"263"
-				"mac"		"263"
+				"windows"	"263"
+				"linux"		"264"
+				"mac"		"264"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"260"
-				"linux"		"261"
-				"mac"		"261"
+				"windows"	"261"
+				"linux"		"262"
+				"mac"		"262"
 			}
 			"Ignite"
 			{
@@ -64,9 +64,9 @@
 			}
 			"CommitSuicide"
 			{
-				"windows"	"432"
-				"linux"		"432"
-				"mac"		"432"
+				"windows"	"433"
+				"linux"		"433"
+				"mac"		"433"
 			}
 			"GetVelocity"
 			{
@@ -94,9 +94,9 @@
 			}
 			"WeaponEquip"
 			{
-				"windows"	"253"
-				"linux"		"254"
-				"mac"		"254"
+				"windows"	"254"
+				"linux"		"255"
+				"mac"		"255"
 			}
 			"Activate"
 			{
@@ -106,9 +106,9 @@
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"409"
-				"linux"		"410"
-				"mac"		"410"
+				"windows"	"410"
+				"linux"		"411"
+				"mac"		"411"
 			}
 		}
 	}

gamedata/sdktools.games/game.dod.txt

@@ -18,21 +18,21 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"390"
-				"linux"		"391"
-				"mac"		"391"
+				"windows"	"391"
+				"linux"		"392"
+				"mac"		"392"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"262"
-				"linux"		"263"
-				"mac"		"263"
+				"windows"	"263"
+				"linux"		"264"
+				"mac"		"264"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"260"
-				"linux"		"261"
-				"mac"		"261"
+				"windows"	"261"
+				"linux"		"262"
+				"mac"		"262"
 			}
 			"Ignite"
 			{
@@ -54,9 +54,9 @@
 			}
 			"CommitSuicide"
 			{
-				"windows"	"428"
-				"linux"		"429"
-				"mac"		"429"
+				"windows"	"429"
+				"linux"		"430"
+				"mac"		"430"
 			}
 			"GetVelocity"
 			{
@@ -84,9 +84,9 @@
 			}
 			"WeaponEquip"
 			{
-				"windows"	"253"
-				"linux"		"254"
-				"mac"		"254"
+				"windows"	"254"
+				"linux"		"255"
+				"mac"		"255"
 			}
 			"Activate"
 			{
@@ -96,9 +96,9 @@
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"408"
-				"linux"		"409"
-				"mac"		"409"
+				"windows"	"409"
+				"linux"		"410"
+				"mac"		"410"
 			}
 		}
 		

gamedata/sdktools.games/game.garrysmod.txt

@@ -11,28 +11,28 @@
 
 "Games"
 {
-	/* Garry's Mod - No symbol names in linux bin */
+	/* Garry's Mod */
 	"garrysmod"
 	{
 		"Offsets"
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"432"
-				"linux"		"433"
-				"mac"		"433"
+				"windows"	"433"
+				"linux"		"434"
+				"mac"		"434"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"304"
-				"linux"		"305"
-				"mac"		"305"
+				"windows"	"305"
+				"linux"		"306"
+				"mac"		"306"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"302"
-				"linux"		"303"
-				"mac"		"303"
+				"windows"	"303"
+				"linux"		"304"
+				"mac"		"304"
 			}
 			"Ignite"
 			{
@@ -54,9 +54,9 @@
 			}
 			"CommitSuicide"
 			{
-				"windows"	"471"
-				"linux"		"471"
-				"mac"		"471"
+				"windows"	"472"
+				"linux"		"472"
+				"mac"		"472"
 			}
 			"GetVelocity"
 			{
@@ -84,9 +84,9 @@
 			}
 			"WeaponEquip"
 			{
-				"windows"	"295"
-				"linux"		"296"
-				"mac"		"296"
+				"windows"	"296"
+				"linux"		"297"
+				"mac"		"297"
 			}
 			"Activate"
 			{
@@ -96,9 +96,9 @@
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"450"
-				"linux"		"451"
-				"mac"		"451"
+				"windows"	"451"
+				"linux"		"452"
+				"mac"		"452"
 			}
 		}
 		"Signatures"
@@ -106,17 +106,61 @@
 			"FindEntityByClassname"
 			{
 				"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"	"\x53\x55\x56\x8B\xF1\x8B\x2A\x2A\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\x2A\x8B\x3C\x30\xEB\x2A\x8B\x2A\x2A\x2A\x2A\x2A\x85\xFF\x74\x2A\x8B\x2A\x2A\x2A\x8B\x2A\x2A\x2A\x2A\x2A\xEB\x2A\x8D\x2A\x2A\x8B\x37\x85\xF6\x75\x2A\x68\x2A\x2A\x2A\x2A\xFF\x2A\x83\x2A\x2A\xEB\x2A\x39"
 				"linux"		"@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc"
 				"mac"		"@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc"
 			}
 			"FireOutput"
 			{
 				"library"	"server"
-				"windows"	"\x81\xEC\x2A\x2A\x2A\x2A\x53\x55\x56\x8B\x71\x2A\x57\x89"
+				"windows"	"\x81\xEC\x2A\x2A\x2A\x2A\x53\x55\x56\x8B\x71\x2A\x85\xF6"
 				"linux"		"@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f"
 				"mac"		"@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f"
 			}
 		}
 	}
+	
+	"#default"
+	{
+		"Offsets"
+		{
+			"s_pTempEntities"
+			{
+				"windows"	"17"
+			}
+			"GetTEName"
+			{
+				"windows"	"4"
+				"linux"		"4"
+				"mac"		"4"
+			}
+			"GetTENext"
+			{
+				"windows"	"8"
+				"linux"		"8"
+				"mac"		"8"
+			}
+			"TE_GetServerClass"
+			{
+				"windows"	"0"
+				"linux"		"0"
+				"mac"		"0"
+			}
+		}
+
+		"Signatures"
+		{
+			"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"
+			}
+			"s_pTempEntities"
+			{
+				"library"	"server"
+				"linux"		"@_ZN15CBaseTempEntity15s_pTempEntitiesE"
+				"mac"		"@_ZN15CBaseTempEntity15s_pTempEntitiesE"
+			}
+		}
+	}
 }

gamedata/sdktools.games/game.hl2mp.txt

@@ -18,21 +18,21 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"390"
-				"linux"		"391"
-				"mac"		"391"
+				"windows"	"391"
+				"linux"		"392"
+				"mac"		"392"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"262"
-				"linux"		"263"
-				"mac"		"263"
+				"windows"	"263"
+				"linux"		"264"
+				"mac"		"264"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"260"
-				"linux"		"261"
-				"mac"		"261"
+				"windows"	"261"
+				"linux"		"262"
+				"mac"		"262"
 			}
 			"Ignite"
 			{
@@ -54,9 +54,9 @@
 			}
 			"CommitSuicide"
 			{
-				"windows"	"429"
-				"linux"		"429"
-				"mac"		"429"
+				"windows"	"430"
+				"linux"		"430"
+				"mac"		"430"
 			}
 			"GetVelocity"
 			{
@@ -84,9 +84,9 @@
 			}
 			"WeaponEquip"
 			{
-				"windows"	"253"
-				"linux"		"254"
-				"mac"		"254"
+				"windows"	"254"
+				"linux"		"255"
+				"mac"		"255"
 			}
 			"Activate"
 			{
@@ -96,9 +96,9 @@
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"408"
-				"linux"		"409"
-				"mac"		"409"
+				"windows"	"409"
+				"linux"		"410"
+				"mac"		"410"
 			}
 		}
 	}

gamedata/sdktools.games/game.nmrih.txt

@@ -0,0 +1,137 @@
+/**
+ * Do not edit this file.  Any changes will be overwritten by the gamedata
+ * updater or by upgrading your SourceMod install.
+ *
+ * To override data in this file, create a subdirectory named "custom" and
+ * place your own gamedata file(s) inside of it.  Such files will be parsed
+ * after SM's own.
+ *
+ * For more information, see http://wiki.alliedmods.net/Gamedata_Updating_(SourceMod)
+ */
+
+"Games"
+{
+	/* No More Room in Hell 1.02 */
+	"nmrih"
+	{
+		"Offsets"
+		{
+			"GiveNamedItem"
+			{
+				"windows"	"361"
+				"linux"		"362"
+			}
+			"RemovePlayerItem"
+			{
+				"windows"	"240"
+				"linux"		"241"
+			}
+			"Weapon_GetSlot"
+			{
+				"windows"	"238"
+				"linux"		"239"
+			}
+			"Ignite"
+			{
+				"windows"	"195"
+				"linux"		"196"
+			}
+			"Extinguish"
+			{
+				"windows"	"199"
+				"linux"		"200"
+			}
+			"Teleport"
+			{
+				"windows"	"102"
+				"linux"		"103"
+			}
+			"CommitSuicide"
+			{
+				"windows"	"402"
+				"linux"		"402"
+			}
+			"GetVelocity"
+			{
+				"windows"	"132"
+				"linux"		"133"
+			}
+			"EyeAngles"
+			{
+				"windows"	"124"
+				"linux"		"125"
+			}
+			"AcceptInput"
+			{
+				"windows"	"34"
+				"linux"		"35"
+			}
+			"SetEntityModel"
+			{
+				"windows"	"23"
+				"linux"		"24"
+			}
+			"WeaponEquip"
+			{
+				"windows"	"231"
+				"linux"		"232"
+			}
+			"Activate"
+			{
+				"windows"	"31"
+				"linux"		"32"
+			}
+			"PlayerRunCmd"
+			{
+				"windows"	"381"
+				"linux"		"382"
+			}
+			
+			/* Offset into CBaseTempEntity constructor (vs2010 moved it!) */
+			"s_pTempEntities"
+			{
+				"windows"	"19"
+			}
+			"GetTEName"
+			{
+				"windows"	"4"
+				"linux"		"4"
+			}
+			"GetTENext"
+			{
+				"windows"	"8"
+				"linux"		"8"
+			}
+			"TE_GetServerClass"
+			{
+				"windows"	"0"
+				"linux"		"0"
+			}
+		}
+		"Signatures"
+		{
+			"CBaseTempEntity"
+			{
+				"library"	"server"
+				"windows"	"\x55\x8B\xEC\x8B\xC1\x8B\x2A\x2A\xC7\x2A\x2A\x2A\x2A\x2A\x89\x2A\x2A\x8B\x15\x2A\x2A\x2A\x2A\x89"
+			}
+			"s_pTempEntities"
+			{
+				"library"	"server"
+				"linux"		"@_ZN15CBaseTempEntity15s_pTempEntitiesE"
+			}
+			"FindEntityByClassname"
+			{
+				"library"	"server"
+				"windows"	"\x55\x8B\xEC\x53\x56\x8B\xF1\x8B\x2A\x2A\x57\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x2A\xFF\xD2\x8B\x00\x25\x2A\x2A\x2A\x2A\x40\x03\xC0\x8B\x3C\xC6\xEB\x2A\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74"
+				"linux"		"@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc"
+			}
+			"FireOutput"
+			{
+				"library"	"server"
+				"windows"	"\x55\x8B\xEC\x81\xEC\x2A\x2A\x2A\x2A\x53\x56\x8B\x2A\x2A\x57\x89"
+				"linux"		"@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f"
+			}
+		}
+	}
+}

gamedata/sdktools.games/game.tf.txt

@@ -18,33 +18,33 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"392"
-				"linux"		"393"
-				"mac"		"393"
+				"windows"	"391"
+				"linux"		"392"
+				"mac"		"392"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"264"
-				"linux"		"265"
-				"mac"		"265"
+				"windows"	"263"
+				"linux"		"264"
+				"mac"		"264"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"262"
-				"linux"		"263"
-				"mac"		"263"
+				"windows"	"261"
+				"linux"		"262"
+				"mac"		"262"
 			}
 			"Ignite"
 			{
-				"windows"	"205"
-				"linux"		"206"
-				"mac"		"206"
+				"windows"	"204"
+				"linux"		"205"
+				"mac"		"205"
 			}
 			"Extinguish"
 			{
-				"windows"	"209"
-				"linux"		"210"
-				"mac"		"210"
+				"windows"	"208"
+				"linux"		"209"
+				"mac"		"209"
 			}
 			"Teleport"
 			{
@@ -54,21 +54,21 @@
 			}
 			"CommitSuicide"
 			{
-				"windows"	"433"
-				"linux"		"433"
-				"mac"		"433"
+				"windows"	"432"
+				"linux"		"432"
+				"mac"		"432"
 			}
 			"GetVelocity"
 			{
-				"windows"	"139"
-				"linux"		"140"
-				"mac"		"140"
+				"windows"	"138"
+				"linux"		"139"
+				"mac"		"139"
 			}
 			"EyeAngles"
 			{
-				"windows"	"130"
-				"linux"		"131"
-				"mac"		"131"
+				"windows"	"129"
+				"linux"		"130"
+				"mac"		"130"
 			}
 			"SetEntityModel"
 			{
@@ -84,9 +84,9 @@
 			}
 			"WeaponEquip"
 			{
-				"windows"	"255"
-				"linux"		"256"
-				"mac"		"256"
+				"windows"	"254"
+				"linux"		"255"
+				"mac"		"255"
 			}
 			"Activate"
 			{
@@ -96,9 +96,9 @@
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"410"
-				"linux"		"411"
-				"mac"		"411"
+				"windows"	"409"
+				"linux"		"410"
+				"mac"		"410"
 			}
 		}
 		

gamedata/sdktools.games/master.games.txt

@@ -205,4 +205,12 @@
 	{
 		"game"		"hl2ctf"
 	}
+	"game.ag2.txt"
+	{
+		"game"		"ag2"
+	}
+	"game.nmrih.txt"
+	{
+		"game"		"nmrih"
+	}
 }

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\x2A\x56\x8B\xF1\x8B\x2A\x2A\x2A\x2A\x2A\x57\x8B"
 				"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\x10\x05\x2A\x2A\x2A\x2A\x53\x56\x8B\xF1\x8B\x86"
 				"linux"		"@_ZN9CTFPlayer10RegenerateEv"
 				"mac"		"@_ZN9CTFPlayer10RegenerateEv"
 			}
 			"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"
 				"mac"		"@_ZN15CTFPlayerShared9MakeBleedEP9CTFPlayerP13CTFWeaponBasef"
 			}
 			"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"	"319"
-				"linux"		"320"
-				"mac"		"320"
+				"windows"	"318"
+				"linux"		"319"
+				"mac"		"319"
 			}
 		}
 	}

plugins/basebans/ban.sp

@@ -134,7 +134,7 @@ DisplayBanReasonMenu(client)
 	AddMenuItem(menu, "Aimbot", "Aimbot");
 	AddMenuItem(menu, "Speedhacking", "Speedhacking");
 	AddMenuItem(menu, "Mic spamming", "Mic spamming");
-	AddMenuItem(menu, "Admin disrepect", "Admin disrepect");
+	AddMenuItem(menu, "Admin disrespect", "Admin disrespect");
 	AddMenuItem(menu, "Camping", "Camping");
 	AddMenuItem(menu, "Team killing", "Team killing");
 	AddMenuItem(menu, "Unacceptable Spray", "Unacceptable Spray");

plugins/basecomm.sp

@@ -67,6 +67,7 @@ public APLRes:AskPluginLoad2(Handle:myself, bool:late, String:error[], err_max)
 	CreateNative("BaseComm_IsClientMuted",  Native_IsClientMuted);
 	CreateNative("BaseComm_SetClientGag",   Native_SetClientGag);
 	CreateNative("BaseComm_SetClientMute",  Native_SetClientMute);
+	RegPluginLibrary("basecomm");
 	
 	return APLRes_Success;
 }

plugins/basecommands.sp

@@ -421,7 +421,7 @@ public Action:Command_Rcon(client, args)
 	{
 		ServerCommand("%s", argstring);
 	} else {
-		new String:responseBuffer[1024];
+		new String:responseBuffer[4096];
 		ServerCommandEx(responseBuffer, sizeof(responseBuffer), "%s", argstring);
 		ReplyToCommand(client, responseBuffer);
 	}

plugins/basetriggers.sp

@@ -270,23 +270,23 @@ public Action:Command_Say(client, const String:command[], argc)
 	{
 		if (g_Cvar_FriendlyFire != INVALID_HANDLE)
 		{
-			decl String:message[64];
+			decl String:phrase[24];
 			if (GetConVarBool(g_Cvar_FriendlyFire))
 			{
-				Format(message, sizeof(message), "%T", "Friendly Fire On", client);
+				strcopy(phrase, sizeof(phrase), "Friendly Fire On");
 			}
 			else
 			{
-				Format(message, sizeof(message), "%T", "Friendly Fire Off", client);
+				strcopy(phrase, sizeof(phrase), "Friendly Fire Off");
 			}
 		
 			if(GetConVarInt(g_Cvar_TriggerShow))
 			{
-				PrintToChatAll("[SM] %s", message);
+				PrintToChatAll("[SM] %t", phrase);
 			}
 			else
 			{
-				PrintToChat(client,"[SM] %s", message);		
+				PrintToChat(client,"[SM] %t", phrase);
 			}
 		}
 	}

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/adt_array.inc

@@ -88,7 +88,7 @@ native ClearArray(Handle:array);
  * @return				New handle to the cloned array object
  * @error				Invalid Handle
  */
- native Handle:CloneArray(Handle:array);
+native Handle:CloneArray(Handle:array);
 
 /**
  * Resizes an array.  If the size is smaller than the current size,

plugins/include/cstrike.inc

@@ -189,7 +189,7 @@ native CS_DropWeapon(client, weaponIndex, bool:toss, bool:blockhook = false);
  *						forward from being called.
  * @noreturn
  */
- native CS_TerminateRound(Float:delay, CSRoundEndReason:reason, bool:blockhook = false);
+native CS_TerminateRound(Float:delay, CSRoundEndReason:reason, bool:blockhook = false);
  
 /**
  * Gets a weapon name from a weapon alias
@@ -201,7 +201,7 @@ native CS_DropWeapon(client, weaponIndex, bool:toss, bool:blockhook = false);
  *
  * @note				Will set the buffer to the original alias if it is not an alias to a weapon.
  */
- native CS_GetTranslatedWeaponAlias(const String:alias[], String:weapon[], size);
+native CS_GetTranslatedWeaponAlias(const String:alias[], String:weapon[], size);
  
 /**
  * Gets a weapon's price
@@ -214,7 +214,7 @@ native CS_DropWeapon(client, weaponIndex, bool:toss, bool:blockhook = false);
  * @error				Invalid client, failing to get weapon info, or failing to get price offset.
  * @note				c4, knife and shield will always return 0. vest, vest helmet and night vision will always return default price.
  */
- native CS_GetWeaponPrice(client, CSWeaponID:id, bool:defaultprice = false);
+native CS_GetWeaponPrice(client, CSWeaponID:id, bool:defaultprice = false);
  
 /**
  * Gets a clients clan tag
@@ -225,7 +225,7 @@ native CS_DropWeapon(client, weaponIndex, bool:toss, bool:blockhook = false);
  *
  * @error				Invalid client.
  */
- native CS_GetClientClanTag(client, String:buffer[], size);
+native CS_GetClientClanTag(client, String:buffer[], size);
 
 /**
  * Sets a clients clan tag
@@ -235,7 +235,7 @@ native CS_DropWeapon(client, weaponIndex, bool:toss, bool:blockhook = false);
  *
  * @error				Invalid client.
  */
- native CS_SetClientClanTag(client, const String:tag[]);
+native CS_SetClientClanTag(client, const String:tag[]);
  
 /**
  * Do not edit below this line!

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/tf2.inc

@@ -115,14 +115,17 @@ enum TFCond
 	TFCond_CritOnWin,
 	TFCond_CritOnFlagCapture,
 	TFCond_CritOnKill,
-	TFCond_RestrictToMelee
+	TFCond_RestrictToMelee,
+	
+	TFCond_CritMmmph = 44,
+	TFCond_DefenseBuffMmmph,
 };
 
 enum TFHoliday
 {
-	TFHoliday_None = 1,
-	TFHoliday_Birthday,
+	TFHoliday_Birthday = 1,
 	TFHoliday_Halloween,
+	TFHoliday_Christmas,
 	TFHoliday_FullMoon,
 	TFHoliday_HalloweenOrFullMoon,
 };

plugins/include/tf2_stocks.inc

@@ -78,6 +78,7 @@
 #define TF_DEATHFLAG_DEADRINGER         (1 << 5)
 #define TF_DEATHFLAG_INTERRUPTED        (1 << 6)
 #define TF_DEATHFLAG_GIBBED             (1 << 7)
+#define TF_DEATHFLAG_PURGATORY          (1 << 8)
 
 // Custom kill identifiers for the customkill property on the player_death event
 enum {
@@ -130,6 +131,7 @@ enum {
 	TF_CUSTOM_PLASMA_CHARGED,
 	TF_CUSTOM_PLASMA_GIB,
 	TF_CUSTOM_PRACTICE_STICKY,
+	TF_CUSTOM_EYEBALL_ROCKET,
 };
 
 // Weapon codes as used in some events, such as player_death
@@ -216,6 +218,10 @@ 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,
 };
 
 // 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		0				/**< SourceMod Release version */
+#define SOURCEMOD_V_RELEASE		3				/**< SourceMod Release version */
 
-#define SOURCEMOD_VERSION	"1.4.0"	/**< SourceMod version string (major.minor.release.build) */
+#define SOURCEMOD_VERSION	"1.4.3"	/**< SourceMod version string (major.minor.release.build) */

plugins/reservedslots.sp

@@ -86,6 +86,9 @@ public OnPluginStart()
 	{
 		for (new i = 1; i <= MaxClients; i++)
 		{
+			if (!IsClientConnected(i))
+				continue;
+			
 			if (IsClientSourceTV(i))
 			{
 				g_SourceTV = i;

product.version

@@ -1 +1 @@
-1.4.0
+1.4.3

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;
 	};
 }
 

sourcepawn/compiler/AMBuilder

@@ -16,7 +16,7 @@ elif compiler.cc.name == 'msvc':
 	compiler['POSTLINKFLAGS'].append('/SUBSYSTEM:CONSOLE')
 
 if AMBuild.target['platform'] == 'linux':
-	compiler['CDEFINES'].extend(['LINUX', 'HAVE_STDINT_H', 'AMX_ANSIONLY', 'ENABLE_BINRELOC'])
+	compiler['CDEFINES'].extend(['LINUX', 'HAVE_STDINT_H', 'AMX_ANSIONLY', 'ENABLE_BINRELOC', '_GNU_SOURCE'])
 elif AMBuild.target['platform'] == 'darwin':
 	compiler['CDEFINES'].extend(['DARWIN', 'HAVE_STDINT_H', 'AMX_ANSIONLY', 'ENABLE_BINRELOC'])
 

sourcepawn/compiler/Makefile

@@ -30,7 +30,7 @@ LINK = -lgcc -static-libgcc
 
 INCLUDE = -I. -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn
 
-CFLAGS += -DLINUX -DHAVE_STDINT_H -DAMX_ANSIONLY -DENABLE_BINRELOC -Dstricmp=strcasecmp -m32
+CFLAGS += -D_GNU_SOURCE -Wall -Werror -Wno-uninitialized -Wno-unused-result -Wno-unused -Wno-switch -Wno-parentheses -Wno-format -DLINUX -DHAVE_STDINT_H -DAMX_ANSIONLY -DENABLE_BINRELOC -Dstricmp=strcasecmp -m32
 CPPFLAGS += -Wno-non-virtual-dtor -fno-exceptions -fno-rtti
 
 ################################################

sourcepawn/compiler/sc1.c

@@ -2923,7 +2923,7 @@ static cell initvector(int ident,int tag,cell size,int fillzero,
         matchbrace=matchtoken('{');
       for ( ;; ) {
         prev2=prev1;
-        prev1=init(iVARIABLE,&ctag,errorfound);
+        prev1=init(ident,&ctag,errorfound);
         if (!matchbrace)
           break;
         if ((ellips=matchtoken(tELLIPS))!=0)

sourcepawn/compiler/sc2.c

@@ -59,7 +59,7 @@ static short skiplevel; /* level at which we started skipping (including nested
 static unsigned char term_expr[] = "";
 static int listline=-1; /* "current line" for the list file */
 
-#if defined __GNUC__
+#if defined DARWIN
 static double pow10(double d)
 {
   return pow(10, d);

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");
 }