Bumped versions again.

.hgtags

@@ -2,3 +2,4 @@
 e6ef5ecdf8d75740ca2685a709bf321f8873bc3b sourcemod-1.1.0
 e877885fac80be71822641f7a9122cebc9812521 sourcemod-1.1.1
 b3ffa8a4511c4eadaf533fc790aa6b14f7f0c6ea sourcemod-1.1.2
+3a73bbf60f34befa9b66be03fa5974b394bb3411 sourcemod-1.2.0

changelog.txt

@@ -2,6 +2,38 @@ SourceMod Changelog
 
 ----------------------------
 
+SourceMod 1.2.1 [2009-05-31]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.2.1_Release_Notes
+
+ - Updated SDKTools for latest Team Fortress update.
+ - Added L4D handling to GuessSDKVersion() (bug 3842).
+ - Updated Zombie Panic Source offsets (bug 3632).
+ - Fixed crash when clientprefs saw disconnect from 64th client (bug 3821).
+ - Fixed Plugin_Handled acting like a Stop in usermsg hooks (bug 3685).
+ - Fixed early tv_enable causing crashes (bug 3766).
+ - Fixed unhook event crash (bug 3814).
+ - Fixed compiler reading uninitialized strings while processing varargs (bug 3811).
+ - Fixed compiler choosing whether to emit stradjust.pri on dynamic arrays based on uninitialized memory (bug 3810).
+ - Fixed Windows L4D CreateFakeClient signature (bug 3792).
+ - Fixed sm_slap for EP1 games (bug 3768).
+ - Fixed casting problems in TextParsers breaking TrimString for non-ASCII characters (bug 3800).
+ - Fixed OnClientConnect rejectmsg handling, improved doc (bug 3690).
+ - Fixed clientprefs not loading cookies for clients on late load (bug 3735).
+ - Fixed GetCommandFlags on original engine games (bug 3759).
+ - Fixed compiler asserting when returning a string literal (bug 3836).
+ - Fixed compiler erroring when tagging functions for string return (bug 3837).
+ - Fixed compiler not handling constant chained relational operators correctly (bug 3838).
+ - Fixed revote bug and inflexibilities in RedrawClientVoteMenu (bug 3834).
+ - Fixed auto update URL being set too late (bug 3699).
+ - Disabled nextmap in Synergy and Dystopia (bug 3687, bug 3741).
+ - Removed unnecessary SSE optimizations from msvc9 project files (bug 3756).
+ - Removed short-lived tag system (bug 3751).
+ - Removed the alive check from sm_rename. (bug 3698).
+ - Switched FortressForever to Valve menus (bug 3819). 
+
+----------------------------
+
 SourceMod 1.2.0 [2009-03-05]
 
 URL: http://wiki.alliedmods.net/SourceMod_1.2.0_Release_Notes

core/EventManager.cpp

@@ -194,7 +194,7 @@ EventHookError EventManager::HookEvent(const char *name, IPluginFunction *pFunct
 		}
 
 		/* Cache the name for post hooks */
-		pHook->name = strdup(name);
+		pHook->name = sm_strdup(name);
 
 		/* Increase reference count */
 		pHook->refCount++;
@@ -300,7 +300,7 @@ EventHookError EventManager::UnhookEvent(const char *name, IPluginFunction *pFun
 		sm_trie_delete(m_EventHooks, name);
 
 		/* Free the cached name */
-		free(pHook->name);
+		delete pHook->name;
 
 		/* And finally free structure memory */
 		delete pHook;
@@ -472,7 +472,7 @@ bool EventManager::OnFireEvent_Post(IGameEvent *pEvent, bool bDontBroadcast)
 			assert(pHook->pPostHook == NULL);
 			assert(pHook->pPreHook == NULL);
 			sm_trie_delete(m_EventHooks, pHook->name);
-			free(pHook->name);
+			delete pHook->name;
 			delete pHook;
 		}
 	}

core/LibrarySys.cpp

@@ -285,14 +285,16 @@ void LibrarySystem::GetPlatformErrorEx(int code, char *error, size_t maxlength)
 	if (error && maxlength)
 	{
 #if defined PLATFORM_WINDOWS
-		FormatMessageA(
-			FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS,
-			NULL,
-			(DWORD)code,
-			MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-			(LPSTR)error,
-			maxlength,
-			NULL);
+		if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS,
+						   NULL,
+						   (DWORD)code,
+						   MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+						   (LPSTR)error,
+						   maxlength,
+						   NULL) == 0)
+		{
+			UTIL_Format(error, maxlength, "error code %08x", code);
+		}
 #elif defined PLATFORM_LINUX
 		const char *ae = strerror_r(code, error, maxlength);
 		if (ae != error)

core/Makefile

@@ -19,7 +19,7 @@ OBJECTS = AdminCache.cpp CDataPack.cpp ConCmdManager.cpp ConVarManager.cpp CoreC
 	sourcemm_api.cpp sourcemod.cpp MenuStyle_Base.cpp MenuStyle_Valve.cpp MenuManager.cpp \
 	MenuStyle_Radio.cpp ChatTriggers.cpp ADTFactory.cpp MenuVoting.cpp sm_crc32.cpp \
 	frame_hooks.cpp concmd_cleaner.cpp Profiler.cpp PhraseCollection.cpp NextMap.cpp \
-	NativeOwner.cpp TagsSystem.cpp
+	NativeOwner.cpp
 OBJECTS += smn_admin.cpp smn_bitbuffer.cpp smn_console.cpp smn_core.cpp \
 	smn_datapacks.cpp smn_entities.cpp smn_events.cpp smn_fakenatives.cpp \
 	smn_filesystem.cpp smn_float.cpp smn_functions.cpp smn_gameconfigs.cpp smn_halflife.cpp \

core/MenuManager.cpp

@@ -798,5 +798,11 @@ bool MenuManager::IsClientInVotePool(int client)
 
 bool MenuManager::RedrawClientVoteMenu(int client)
 {
-	return s_VoteHandler.RedrawToClient(client);
+	return RedrawClientVoteMenu2(client, true);
 }
+
+bool MenuManager::RedrawClientVoteMenu2(int client, bool revote)
+{
+	return s_VoteHandler.RedrawToClient(client, revote);
+}
+

core/MenuManager.h

@@ -91,6 +91,7 @@ public:
 	unsigned int GetRemainingVoteDelay();
 	bool IsClientInVotePool(int client);
 	bool RedrawClientVoteMenu(int client);
+	bool RedrawClientVoteMenu2(int client, bool revote);
 public: //IHandleTypeDispatch
 	void OnHandleDestroy(HandleType_t type, void *object);
 	bool GetHandleApproxSize(HandleType_t type, void *object, unsigned int *pSize);

core/MenuVoting.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2009 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -205,7 +205,7 @@ bool VoteMenuHandler::GetClientVoteChoice(int client, unsigned int *pItem)
 	return true;
 }
 
-bool VoteMenuHandler::RedrawToClient(int client)
+bool VoteMenuHandler::RedrawToClient(int client, bool revotes)
 {
 	unsigned int time_limit;
 
@@ -214,6 +214,18 @@ bool VoteMenuHandler::RedrawToClient(int client)
 		return false;
 	}
 
+	if (m_ClientVotes[client] >= 0)
+	{
+		if ((m_VoteFlags & VOTEFLAG_NO_REVOTES) == VOTEFLAG_NO_REVOTES || !revotes)
+		{
+			return false;
+		}
+		assert((unsigned)m_ClientVotes[client] < m_Items);
+		assert(m_Votes[m_ClientVotes[client]] > 0);
+		m_Votes[m_ClientVotes[client]]--;
+		m_ClientVotes[client] = -1;
+	}
+
 	if (m_nMenuTime == MENU_TIME_FOREVER)
 	{
 		time_limit = m_nMenuTime;
@@ -489,3 +501,4 @@ bool VoteMenuHandler::IsCancelling()
 {
 	return m_bCancelled;
 }
+

core/MenuVoting.h

@@ -74,7 +74,7 @@ public:
 	unsigned int GetRemainingVoteDelay();
 	bool IsClientInVotePool(int client);
 	bool GetClientVoteChoice(int client, unsigned int *pItem);
-	bool RedrawToClient(int client);
+	bool RedrawToClient(int client, bool revote);
 private:
 	void Reset(IMenuHandler *mh);
 	void DecrementPlayerCount();
@@ -102,3 +102,4 @@ private:
 };
 
 #endif //_INCLUDE_SOURCEMOD_MENUVOTING_H_
+

core/PlayerManager.cpp

@@ -421,7 +421,7 @@ bool PlayerManager::OnClientConnect(edict_t *pEntity, const char *pszName, const
 
 	pPlayer->Initialize(pszName, pszAddress, pEntity);
 	m_clconnect->PushCell(client);
-	m_clconnect->PushStringEx(reject, maxrejectlen, SM_PARAM_STRING_UTF8, SM_PARAM_COPYBACK);
+	m_clconnect->PushStringEx(reject, maxrejectlen, SM_PARAM_STRING_UTF8 | SM_PARAM_STRING_COPY, SM_PARAM_COPYBACK);
 	m_clconnect->PushCell(maxrejectlen);
 	m_clconnect->Execute(&res);
 
@@ -1327,6 +1327,11 @@ void PlayerManager::OnSourceModMaxPlayersChanged( int newvalue )
 
 void PlayerManager::MaxPlayersChanged( int newvalue /*= -1*/ )
 {
+	if (!m_FirstPass)
+	{
+		return;
+	}
+
 	if (newvalue == -1)
 	{
 		newvalue = gpGlobals->maxClients;

core/TagsSystem.cpp

@@ -1,206 +0,0 @@
-/**
-* vim: set ts=4 :
-* =============================================================================
-* SourceMod
-* Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
-* =============================================================================
-*
-* This program is free software; you can redistribute it and/or modify it under
-* the terms of the GNU General Public License, version 3.0, as published by the
-* Free Software Foundation.
-* 
-* This program is distributed in the hope that it will be useful, but WITHOUT
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-* details.
-*
-* You should have received a copy of the GNU General Public License along with
-* this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* As a special exception, AlliedModders LLC gives you permission to link the
-* code of this program (as well as its derivative works) to "Half-Life 2," the
-* "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
-* by the Valve Corporation.  You must obey the GNU General Public License in
-* all respects for all other code used.  Additionally, AlliedModders LLC grants
-* this exception to all derivative works.  AlliedModders LLC defines further
-* exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
-* or <http://www.sourcemod.net/license.php>.
-*
-* Version: $Id$
-*/
-
-#include "TagsSystem.h"
-#include "sourcemod.h"
-#include "sourcemm_api.h"
-#include "sm_stringutil.h"
-#include "PluginSys.h"
-#include "compat_wrappers.h"
-
-TagHandler g_Tags;
-
-TagHandler::TagHandler()
-{
-	m_SvTags = NULL;
-}
-
-TagHandler::~TagHandler()
-{
-	SourceHook::List<char *>::iterator iter = m_TagList.begin();
-
-	while (iter != m_TagList.end())
-	{
-		g_pMemAlloc->Free(*iter);
-		iter = m_TagList.erase(iter);
-	}
-}
-
-void TagHandler::OnSourceModAllInitialized_Post()
-{
-	g_PluginSys.AddPluginsListener(this);
-
-	m_SvTags = icvar->FindVar("sv_tags");
-	AddTag("sourcemod");
-}
-
-void TagHandler::OnSourceModLevelActivated()
-{
-	SourceHook::List<char *>::iterator iter = m_TagList.begin();
-
-	while (iter != m_TagList.end())
-	{
-		ApplyTag(*iter);
-		iter++;
-	}
-}
-
-void TagHandler::OnSourceModShutdown()
-{
-	RemoveTag("sourcemod");
-}
-
-void TagHandler::OnPluginDestroyed(IPlugin *plugin)
-{
-	SourceHook::List<char *> *pList = NULL;
-
-	if (!plugin->GetProperty("ServerTags", (void **)&pList, false) || !pList)
-	{
-		return;
-	}
-
-	SourceHook::List<char *>::iterator iter = pList->begin();
-
-	while (iter != pList->end())
-	{
-		RemoveTag(*iter);
-		g_pMemAlloc->Free(*iter);
-		iter = pList->erase(iter);
-	}
-
-	delete pList;
-}
-
-bool TagHandler::AddTag(const char *addTag)
-{
-	SourceHook::List<char *>::iterator iter = m_TagList.begin();
-
-	while (iter != m_TagList.end())
-	{
-		if (strcmp(*iter, addTag) == 0)
-		{
-			return false;
-		}
-	}
-
-	m_TagList.push_back(strdup(addTag));
-	ApplyTag(addTag);
-
-	return true;
-}
-
-bool TagHandler::RemoveTag(const char *removeTag)
-{
-	SourceHook::List<char *>::iterator iter = m_TagList.begin();
-
-	while (iter != m_TagList.end())
-	{
-		if (strcmp(*iter, removeTag) == 0)
-		{
-			g_pMemAlloc->Free(*iter);
-			m_TagList.erase(iter);
-			StripTag(removeTag);
-
-			return true;
-		}
-	}
-
-	return false;
-}
-
-void TagHandler::ApplyTag(const char *addTag)
-{
-	if (m_SvTags == NULL)
-	{
-		return;
-	}
-
-	const char *curTags = m_SvTags->GetString();
-
-	if (strstr(curTags, addTag) != NULL)
-	{
-		/* Already tagged */
-		return;
-	}
-
-	if (curTags[0] == '\0')
-	{
-		m_SvTags->SetValue(addTag);
-		return;
-	}
-
-	/* New tags buffer (+2 for , and null char) */
-	size_t newLen = strlen(curTags) + strlen(addTag) + 2;
-	char *newTags = (char *)alloca(newLen);
-
-	g_SourceMod.Format(newTags, newLen, "%s,%s", curTags, addTag);
-
-	m_SvTags->SetValue(newTags);
-}
-
-void TagHandler::StripTag(const char *removeTag)
-{
-	if (m_SvTags == NULL)
-	{
-		return;
-	}
-
-	const char *curTags = m_SvTags->GetString();
-
-	if (strcmp(curTags, removeTag) == 0)
-	{
-		m_SvTags->SetValue("");
-		return;
-	}
-
-	char *newTags = strdup(curTags);
-	size_t searchLen = strlen(removeTag) + 2;
-	char *search = (char *)alloca(searchLen);
-
-	if (strncmp(curTags, removeTag, strlen(removeTag)) == 0)
-	{
-		strcpy(search, removeTag);
-		search[searchLen-2] = ',';
-		search[searchLen-1] = '\0';
-	}
-	else
-	{
-		strcpy(search+1, removeTag);
-		search[0] = ',';
-		search[searchLen-1] = '\0';
-	}
-
-	UTIL_ReplaceAll(newTags, strlen(newTags) + 1, search, "" , true);
-
-	m_SvTags->SetValue(newTags);
-
-	g_pMemAlloc->Free(newTags);
-}

core/TagsSystem.h

@@ -1,71 +0,0 @@
-/**
-* vim: set ts=4 :
-* =============================================================================
-* SourceMod
-* Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
-* =============================================================================
-*
-* This program is free software; you can redistribute it and/or modify it under
-* the terms of the GNU General Public License, version 3.0, as published by the
-* Free Software Foundation.
-* 
-* This program is distributed in the hope that it will be useful, but WITHOUT
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-* details.
-*
-* You should have received a copy of the GNU General Public License along with
-* this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* As a special exception, AlliedModders LLC gives you permission to link the
-* code of this program (as well as its derivative works) to "Half-Life 2," the
-* "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
-* by the Valve Corporation.  You must obey the GNU General Public License in
-* all respects for all other code used.  Additionally, AlliedModders LLC grants
-* this exception to all derivative works.  AlliedModders LLC defines further
-* exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
-* or <http://www.sourcemod.net/license.php>.
-*
-* Version: $Id$
-*/
-
-#ifndef _INCLUDE_SOURCEMOD_TAGSSYSTEM_H_
-#define _INCLUDE_SOURCEMOD_TAGSSYSTEM_H_
-
-#include "sm_globals.h"
-#include "sh_list.h"
-#include "convar.h"
-#include "IPluginSys.h"
-
-class TagHandler : 
-	public SMGlobalClass,
-	public IPluginsListener
-{
-public:
-	TagHandler();
-	~TagHandler();
-
-public: // SMGlobalClass
-	void OnSourceModAllInitialized_Post();
-	void OnSourceModLevelActivated();
-	void OnSourceModShutdown();
-
-public: // IPluginsListener
-	void OnPluginDestroyed(IPlugin *plugin);
-
-public:
-	bool AddTag(const char *addTag);
-	bool RemoveTag(const char *removeTag);
-
-private:
-	void ApplyTag(const char *addTag);
-	void StripTag(const char *removeTag);
-
-private:
-	SourceHook::List<char *>m_TagList;
-	ConVar *m_SvTags;
-};
-
-extern TagHandler g_Tags;
-
-#endif // _INCLUDE_SOURCEMOD_TAGSSYSTEM_H_

core/TextParsers.cpp

@@ -48,7 +48,7 @@ static int g_ws_chartable[255] = {0};
 
 bool TextParsers::IsWhitespace(const char *stream)
 {
-	return g_ws_chartable[(unsigned)*stream] == 1;
+	return g_ws_chartable[(unsigned char)*stream] == 1;
 }
 
 TextParsers::TextParsers()
@@ -508,7 +508,7 @@ SMCError TextParsers::ParseStream_SMC(void *stream,
 			else 
 			{
 				/* Check if we're whitespace or not */
-				if (!g_ws_chartable[(unsigned)c])
+				if (!g_ws_chartable[(unsigned char)c])
 				{
 					bool restage = false;
 					/* Check various special tokens:
@@ -823,7 +823,7 @@ bool TextParsers::ParseFile_INI(const char *file, ITextListener_INI *ini_listene
 		 ***************************************************/
 
 		/* First strip beginning whitespace */
-		while (*ptr != '\0' && g_ws_chartable[(unsigned)*ptr] != 0)
+		while (*ptr != '\0' && g_ws_chartable[(unsigned char)*ptr] != 0)
 		{
 			ptr++;
 		}
@@ -876,7 +876,7 @@ bool TextParsers::ParseFile_INI(const char *file, ITextListener_INI *ini_listene
 		/* Lastly, strip ending whitespace off */
 		for (size_t i=len-1; i>=0 && i<len; i--)
 		{
-			if (g_ws_chartable[(unsigned)ptr[i]])
+			if (g_ws_chartable[(unsigned char)ptr[i]])
 			{
 				ptr[i] = '\0';
 				len--;
@@ -917,7 +917,7 @@ bool TextParsers::ParseFile_INI(const char *file, ITextListener_INI *ini_listene
 						i += _GetUTF8CharBytes(&ptr[i]) - 1;
 					}
 				} else {
-					alnum = (isalnum(c) != 0) || (g_ini_chartable1[(unsigned)c] != 0);
+					alnum = (isalnum(c) != 0) || (g_ini_chartable1[(unsigned char)c] != 0);
 				}
 				if (!alnum)
 				{
@@ -970,12 +970,12 @@ bool TextParsers::ParseFile_INI(const char *file, ITextListener_INI *ini_listene
 						i += _GetUTF8CharBytes(&ptr[i]) - 1;
 					}
 				} else {
-					alnum = (isalnum(c) != 0) || (g_ini_chartable1[(unsigned)c] != 0);
+					alnum = (isalnum(c) != 0) || (g_ini_chartable1[(unsigned char)c] != 0);
 				}
 
 				if (!alnum)
 				{
-					if (g_ws_chartable[(unsigned)c])
+					if (g_ws_chartable[(unsigned char)c])
 					{
 						/* if it's a space, keep track of the first occurring space */
 						if (!first_space)
@@ -1014,7 +1014,7 @@ bool TextParsers::ParseFile_INI(const char *file, ITextListener_INI *ini_listene
 			if (val_ptr)
 			{
 				/* eat up spaces! there shouldn't be any h*/
-				while ((*val_ptr != '\0') && g_ws_chartable[(unsigned)*val_ptr] != 0)
+				while ((*val_ptr != '\0') && g_ws_chartable[(unsigned char)*val_ptr] != 0)
 				{
 					val_ptr++;
 				}

core/UserMessages.cpp

@@ -496,12 +496,7 @@ void UserMessages::OnMessageEnd_Pre()
 		iter++;
 	}
 
-	if (handled)
-	{
-		goto supercede;
-	}
-
-	if (intercepted)
+	if (!handled && intercepted)
 	{
 		bf_write *engine_bfw;
 

core/msvc9/sourcemod_mm.vcproj

@@ -1512,10 +1512,6 @@
 				RelativePath="..\sourcemod.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\TagsSystem.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\TextParsers.cpp"
 				>
@@ -1754,10 +1750,6 @@
 				RelativePath="..\sourcemod.h"
 				>
 			</File>
-			<File
-				RelativePath="..\TagsSystem.h"
-				>
-			</File>
 			<File
 				RelativePath="..\TextParsers.h"
 				>

core/sm_version.h

@@ -41,8 +41,8 @@
  */
 
 #define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2652:0ae7d8ab1de7" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.0" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,0,0
+#define SM_BUILD_UNIQUEID	"2708:69195a250d70" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.2.1" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,2,1,0
 
 #endif //_INCLUDE_SOURCEMOD_VERSION_H_

core/smn_console.cpp

@@ -43,7 +43,6 @@
 #include <inetchannel.h>
 #include <bitbuf.h>
 #include <sm_trie_tpl.h>
-#include "TagsSystem.h"
 
 #if SOURCE_ENGINE == SE_LEFT4DEAD
 #define NET_SETCONVAR	6
@@ -1307,55 +1306,11 @@ static cell_t SendConVarValue(IPluginContext *pContext, const cell_t *params)
 
 static cell_t AddServerTag(IPluginContext *pContext, const cell_t *params)
 {
-	char *value;
-	pContext->LocalToString(params[1], &value);
-
-	if (!g_Tags.AddTag(value))
-	{
-		return 0;
-	}
-
-	IPlugin *pPlugin = g_PluginSys.FindPluginByContext(pContext->GetContext());
-	SourceHook::List<char *> *pList = NULL;
-
-	if (!pPlugin->GetProperty("ServerTags", (void **)&pList, false) || !pList)
-	{
-		pList = new SourceHook::List<char *>;
-		pPlugin->SetProperty("ServerTags", pList);
-	}
-
-	pList->push_back(strdup(value));
-
-	return 1;
+	return 0;
 }
 
 static cell_t RemoveServerTag(IPluginContext *pContext, const cell_t *params)
 {
-	char *value;
-	pContext->LocalToString(params[1], &value);
-
-	IPlugin *pPlugin = g_PluginSys.FindPluginByContext(pContext->GetContext());
-	SourceHook::List<char *> *pList = NULL;
-
-	if (!pPlugin->GetProperty("ServerTags", (void **)&pList, false) || !pList)
-	{
-		pList = new SourceHook::List<char *>;
-		pPlugin->SetProperty("ServerTags", pList);
-	}
-
-	SourceHook::List<char *>::iterator iter = pList->begin();
-
-	while (iter != pList->end())
-	{
-		if (strcmp(*iter, value) == 0)
-		{
-			g_pMemAlloc->Free(*iter);
-			pList->erase(iter);
-
-			return g_Tags.RemoveTag(value);
-		}
-	}
-
 	return 0;
 }
 

core/smn_halflife.cpp

@@ -457,6 +457,10 @@ static cell_t GuessSDKVersion(IPluginContext *pContext, const cell_t *params)
 	{
 		return 30;
 	}
+	else if (version == SOURCE_ENGINE_LEFT4DEAD)
+	{
+		return 40;
+	}
 #else
 	if (g_HL2.IsOriginalEngine())
 	{

core/smn_menus.cpp

@@ -676,7 +676,13 @@ static cell_t VoteMenu(IPluginContext *pContext, const cell_t *params)
 	cell_t *addr;
 	pContext->LocalToPhysAddr(params[2], &addr);
 
-	if (!g_Menus.StartVote(menu, params[3], addr, params[4]))
+	cell_t flags = 0;
+	if (params[0] >= 5)
+	{
+		flags = params[5];
+	}
+
+	if (!g_Menus.StartVote(menu, params[3], addr, params[4], flags))
 	{
 		return 0;
 	}
@@ -1445,7 +1451,13 @@ static cell_t RedrawClientVoteMenu(IPluginContext *pContext, const cell_t *param
 		return pContext->ThrowNativeError("Client is not in the voting pool");
 	}
 
-	return g_Menus.RedrawClientVoteMenu(client) ? 1 : 0;
+	bool revote = true;
+	if (params[0] >= 2 && !params[2])
+	{
+		revote = false;
+	}
+
+	return g_Menus.RedrawClientVoteMenu2(client, revote) ? 1 : 0;
 }
 
 class EmptyMenuHandler : public IMenuHandler
@@ -1567,3 +1579,4 @@ REGISTER_NATIVES(menuNatives)
 	{"VoteMenu",				VoteMenu},
 	{NULL,						NULL},
 };
+

core/smn_usermsgs.cpp

@@ -130,7 +130,7 @@ void UsrMessageNatives::OnPluginUnloaded(IPlugin *plugin)
 		for (iter=pList->begin(); iter!=pList->end(); iter++)
 		{
 			pListener = (*iter);
-			if (g_UserMsgs.UnhookUserMessage(pListener->GetMessageId(), pListener, pListener->IsInterceptHook()))
+			if (g_UserMsgs.UnhookUserMessage2(pListener->GetMessageId(), pListener, pListener->IsInterceptHook()))
 			{
 				m_FreeListeners.push(pListener);
 			}

extensions/bintools/msvc9/bintools.vcproj

@@ -47,7 +47,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -127,7 +127,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\jit;..\..\..\public\jit\x86;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook";"$(HL2SDKOB)\public";"$(HL2SDKOB)\public\tier0";"$(HL2SDKOB)\public\tier1""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BINTOOLS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;HOOKING_ENABLED;SOURCE_ENGINE=3"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -209,7 +209,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
 			/>
@@ -282,7 +282,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
 			/>
@@ -355,7 +355,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
 			/>
@@ -428,7 +428,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\jit;..\..\..\public\jit\x86;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook";"$(HL2SDKL4D)\public";"$(HL2SDKL4D)\public\tier0";"$(HL2SDKL4D)\public\tier1""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BINTOOLS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;HOOKING_ENABLED;SOURCE_ENGINE=4"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -510,7 +510,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\jit;..\..\..\public\jit\x86;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(MMSOURCE17)\core\sourcehook";"$(HL2SDK)\public";"$(HL2SDK)\public\tier0";"$(HL2SDK)\public\tier1""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BINTOOLS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -592,7 +592,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\jit;..\..\..\public\jit\x86;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook";"$(HL2SDK)\public";"$(HL2SDK)\public\tier0";"$(HL2SDK)\public\tier1""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BINTOOLS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;HOOKING_ENABLED;SOURCE_ENGINE=2"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -674,7 +674,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
 			/>
@@ -747,7 +747,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\jit;..\..\..\public\jit\x86;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook";"$(HL2SDK-DARKM)\public";"$(HL2SDK-DARKM)\public\tier0";"$(HL2SDK-DARKM)\public\tier1""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BINTOOLS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;HOOKING_ENABLED;SOURCE_ENGINE=2"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

extensions/bintools/svn_version.h

@@ -37,8 +37,8 @@
 #define _INCLUDE_BINTOOLS_VERSION_H_
 
 #define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2652:0ae7d8ab1de7" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.0" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,0,0
+#define SM_BUILD_UNIQUEID	"2708:69195a250d70" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.2.1" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,2,1,0
 
 #endif //_INCLUDE_BINTOOLS_VERSION_H_

extensions/clientprefs/cookie.h

@@ -139,7 +139,7 @@ public:
 
 private:
 	KTrie<Cookie *> cookieTrie;
-	SourceHook::List<CookieData *> clientData[MAXCLIENTS];
+	SourceHook::List<CookieData *> clientData[MAXCLIENTS+1];
 
 	bool connected[MAXCLIENTS+1];
 	bool statsLoaded[MAXCLIENTS+1];

extensions/clientprefs/extension.cpp

@@ -132,6 +132,23 @@ bool ClientPrefs::SDK_OnLoad(char *error, size_t maxlength, bool late)
 	phrases->AddPhraseFile("clientprefs.phrases");
 	phrases->AddPhraseFile("common.phrases");
 
+	if (late)
+	{
+		int maxclients = playerhelpers->GetMaxClients();
+
+		for (int i = 1; i <= maxclients; i++)
+		{
+			IGamePlayer *pPlayer = playerhelpers->GetGamePlayer(i);
+
+			if (!pPlayer || !pPlayer->IsAuthorized())
+			{
+				continue;
+			}
+
+			g_CookieManager.OnClientAuthorized(i, pPlayer->GetAuthString());
+		}
+	}
+
 	return true;
 }
 

extensions/clientprefs/msvc9/clientprefs.vcproj

@@ -46,7 +46,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -124,7 +124,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

extensions/clientprefs/svn_version.h

@@ -37,8 +37,8 @@
 #define _INCLUDE_CLIENTPREFS_VERSION_H_
 
 #define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2652:0ae7d8ab1de7" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.0" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,0,0
+#define SM_BUILD_UNIQUEID	"2708:69195a250d70" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.2.1" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,2,1,0
 
 #endif //_INCLUDE_CLIENTPREFS_VERSION_H_

extensions/cstrike/msvc9/cstrike.vcproj

@@ -46,7 +46,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -125,7 +125,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;"$(HL2SDK)\public";"$(HL2SDK)\public\dlls";"$(HL2SDK)\public\engine";"$(HL2SDK)\public\tier0";"$(HL2SDK)\public\tier1";"$(MMSOURCE17)\core-legacy";"$(MMSOURCE17)\core-legacy\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -207,7 +207,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -286,7 +286,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;"$(HL2SDKOB)\public";"$(HL2SDKOB)\public\engine";"$(HL2SDKOB)\public\game\server";"$(HL2SDKOB)\public\tier0";"$(HL2SDKOB)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -368,7 +368,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -447,7 +447,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;"$(HL2SDK)\public";"$(HL2SDK)\public\dlls";"$(HL2SDK)\public\engine";"$(HL2SDK)\public\tier0";"$(HL2SDK)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

extensions/cstrike/svn_version.h

@@ -37,8 +37,8 @@
 #define _INCLUDE_SDKTOOLS_VERSION_H_
 
 #define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2652:0ae7d8ab1de7" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.0" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,0,0
+#define SM_BUILD_UNIQUEID	"2708:69195a250d70" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.2.1" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,2,1,0
 
 #endif //_INCLUDE_SDKTOOLS_VERSION_H_

extensions/curl/curl-src/lib/build_libcurl.vcproj

@@ -136,7 +136,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".,..\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB"
+				PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;CURL_DISABLE_LDAP"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"

extensions/curl/msvc9/curl.vcproj

@@ -46,7 +46,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -64,7 +64,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\curl-src\lib\LIB-Release\libcurl.lib ws2_32.lib"
+				AdditionalDependencies="..\curl-src\lib\LIB-Debug\libcurld.lib ws2_32.lib"
 				OutputFile="$(OutDir)\webternet.ext.dll"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
@@ -125,7 +125,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\curl-src\include;..\..\..\public\extensions"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;ORANGEBOX_BUILD;CURL_STATICLIB"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -208,7 +208,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -288,7 +288,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..;..\..\sourcepawn;&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\dlls&quot;;&quot;$(HL2SDK)\public\engine&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;;&quot;$(MMSOURCE17)\core-legacy&quot;;&quot;$(MMSOURCE17)\core-legacy\sourcehook&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -371,7 +371,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -451,7 +451,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..;..\..\sourcepawn;&quot;$(HL2SDKOB)\public&quot;;&quot;$(HL2SDKOB)\public\engine&quot;;&quot;$(HL2SDKOB)\public\game\server&quot;;&quot;$(HL2SDKOB)\public\tier0&quot;;&quot;$(HL2SDKOB)\public\tier1&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=3"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -534,7 +534,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -614,7 +614,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..;..\..\sourcepawn;&quot;$(HL2SDKL4D)\public&quot;;&quot;$(HL2SDKL4D)\public\engine&quot;;&quot;$(HL2SDKL4D)\public\game\server&quot;;&quot;$(HL2SDKL4D)\public\tier0&quot;;&quot;$(HL2SDKL4D)\public\tier1&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=4"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -697,7 +697,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -777,7 +777,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..;..\..\sourcepawn;&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\dlls&quot;;&quot;$(HL2SDK)\public\engine&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

extensions/curl/svn_version.h

@@ -37,8 +37,8 @@
 #define _INCLUDE_GEOIP_VERSION_H_
 
 #define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2652:0ae7d8ab1de7" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.0" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,0,0
+#define SM_BUILD_UNIQUEID	"2708:69195a250d70" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.2.1" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,2,1,0
 
 #endif //_INCLUDE_GEOIP_VERSION_H_

extensions/geoip/msvc9/geoip.vcproj

@@ -46,7 +46,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -125,7 +125,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;geoip_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

extensions/geoip/svn_version.h

@@ -37,8 +37,8 @@
 #define _INCLUDE_GEOIP_VERSION_H_
 
 #define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2652:0ae7d8ab1de7" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.0" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,0,0
+#define SM_BUILD_UNIQUEID	"2708:69195a250d70" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.2.1" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,2,1,0
 
 #endif //_INCLUDE_GEOIP_VERSION_H_

extensions/mysql/msvc9/sm_mysql.vcproj

@@ -47,7 +47,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				StructMemberAlignment="3"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -127,7 +127,7 @@
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
 				RuntimeLibrary="0"
 				StructMemberAlignment="3"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

extensions/mysql/svn_version.h

@@ -37,8 +37,8 @@
 #define _INCLUDE_MYSQLEXT_VERSION_H_
 
 #define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2652:0ae7d8ab1de7" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.0" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,0,0
+#define SM_BUILD_UNIQUEID	"2708:69195a250d70" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.2.1" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,2,1,0
 
 #endif //_INCLUDE_MYSQLEXT_VERSION_H_

extensions/regex/msvc9/regex.vcproj

@@ -46,7 +46,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -125,7 +125,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;ORANGEBOX_BUILD"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

extensions/regex/svn_version.h

@@ -37,8 +37,8 @@
 #define _INCLUDE_REGEXEXT_VERSION_H_
 
 #define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2652:0ae7d8ab1de7" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.0" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,0,0
+#define SM_BUILD_UNIQUEID	"2708:69195a250d70" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.2.1" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,2,1,0
 
 #endif //_INCLUDE_REGEXEXT_VERSION_H_

extensions/sdktools/msvc9/sdktools.vcproj

@@ -43,11 +43,11 @@
 				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
 				Optimization="0"
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDK)\public";"$(HL2SDK)\public\dlls";"$(HL2SDK)\public\engine";"$(HL2SDK)\public\mathlib";"$(HL2SDK)\public\tier0";"$(HL2SDK)\public\tier1";"$(MMSOURCE17)\core-legacy";"$(MMSOURCE17)\core-legacy\sourcehook""
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -125,9 +125,9 @@
 				AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
 				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDK)\public";"$(HL2SDK)\public\dlls";"$(HL2SDK)\public\engine";"$(HL2SDK)\public\mathlib";"$(HL2SDK)\public\tier0";"$(HL2SDK)\public\tier1";"$(MMSOURCE17)\core-legacy";"$(MMSOURCE17)\core-legacy\sourcehook""
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=1"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -210,7 +210,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -290,7 +290,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKOB)\common";"$(HL2SDKOB)\public";"$(HL2SDKOB)\public\engine";"$(HL2SDKOB)\public\game\server";"$(HL2SDKOB)\public\mathlib";"$(HL2SDKOB)\public\tier0";"$(HL2SDKOB)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=3"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -369,11 +369,11 @@
 				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
 				Optimization="0"
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDK)\public";"$(HL2SDK)\public\dlls";"$(HL2SDK)\public\engine";"$(HL2SDK)\public\mathlib";"$(HL2SDK)\public\tier0";"$(HL2SDK)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -451,9 +451,9 @@
 				AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
 				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDK)\public";"$(HL2SDK)\public\dlls";"$(HL2SDK)\public\engine";"$(HL2SDK)\public\mathlib";"$(HL2SDK)\public\tier0";"$(HL2SDK)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=1"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -536,7 +536,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -616,7 +616,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKL4D)\common";"$(HL2SDKL4D)\public";"$(HL2SDKL4D)\public\engine";"$(HL2SDKL4D)\public\game\server";"$(HL2SDKL4D)\public\mathlib";"$(HL2SDKL4D)\public\tier0";"$(HL2SDKL4D)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=4"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -699,7 +699,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -779,7 +779,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDK-DARKM)\public";"$(HL2SDK-DARKM)\public\dlls";"$(HL2SDK-DARKM)\public\engine";"$(HL2SDK-DARKM)\public\mathlib";"$(HL2SDK-DARKM)\public\tier0";"$(HL2SDK-DARKM)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

extensions/sdktools/svn_version.h

@@ -37,8 +37,8 @@
 #define _INCLUDE_SDKTOOLS_VERSION_H_
 
 #define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2652:0ae7d8ab1de7" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.0" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,0,0
+#define SM_BUILD_UNIQUEID	"2708:69195a250d70" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.2.1" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,2,1,0
 
 #endif //_INCLUDE_SDKTOOLS_VERSION_H_

extensions/sqlite/msvc9/sm_sqlite.vcproj

@@ -46,7 +46,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -124,7 +124,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SQLITE_THREADSAFE;SQLITE_OMIT_LOAD_EXTENSION;_WIN32_WINNT=0x0400"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

extensions/sqlite/svn_version.h

@@ -37,8 +37,8 @@
 #define _INCLUDE_SQLITEEXT_VERSION_H_
 
 #define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2652:0ae7d8ab1de7" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.0" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,0,0
+#define SM_BUILD_UNIQUEID	"2708:69195a250d70" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.2.1" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,2,1,0
 
 #endif //_INCLUDE_SQLITEEXT_VERSION_H_

extensions/structs/msvc9/structs.vcproj

@@ -46,7 +46,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -125,7 +125,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;"$(HL2SDK)\public";"$(HL2SDK)\public\dlls";"$(HL2SDK)\public\engine";"$(HL2SDK)\public\mathlib";"$(HL2SDK)\public\tier0";"$(HL2SDK)\public\tier1";"$(MMSOURCE17)\core-legacy";"$(MMSOURCE17)\core-legacy\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -207,7 +207,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -286,7 +286,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;"$(HL2SDKOB)\public";"$(HL2SDKOB)\public\engine";"$(HL2SDKOB)\public\mathlib";"$(HL2SDKOB)\public\game\server";"$(HL2SDKOB)\public\tier0";"$(HL2SDKOB)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;ORANGEBOX_BUILD"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -368,7 +368,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -447,7 +447,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;"$(HL2SDK)\public";"$(HL2SDK)\public\dlls";"$(HL2SDK)\public\engine";"$(HL2SDK)\public\mathlib";"$(HL2SDK)\public\tier0";"$(HL2SDK)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

extensions/tf2/criticals.cpp

@@ -35,7 +35,6 @@ IServerGameEnts *gameents = NULL;
 
 CDetour *calcIsAttackCriticalDetour = NULL;
 CDetour *calcIsAttackCriticalMeleeDetour = NULL;
-CDetour *calcIsAttackCriticalKnifeDetour = NULL;
 
 IForward *g_critForward = NULL;
 
@@ -152,24 +151,6 @@ DETOUR_DECL_MEMBER0(CalcIsAttackCriticalHelperMelee, bool)
 	}
 }
 
-DETOUR_DECL_MEMBER0(CalcIsAttackCriticalHelperKnife, bool)
-{
-	DetourResult result = DetourCallback((CBaseEntity *)this);
-
-	if (result == Result_Ignore)
-	{
-		return DETOUR_MEMBER_CALL(CalcIsAttackCriticalHelperKnife)();
-	}
-	else if (result == Result_NoCrit)
-	{
-		return 0;
-	}
-	else
-	{
-		return 1;
-	}
-}
-
 DETOUR_DECL_MEMBER0(CalcIsAttackCriticalHelper, bool)
 {
 	DetourResult result = DetourCallback((CBaseEntity *)this);
@@ -192,7 +173,6 @@ void InitialiseDetours()
 {
 	calcIsAttackCriticalDetour = DETOUR_CREATE_MEMBER(CalcIsAttackCriticalHelper, "CalcCritical");
 	calcIsAttackCriticalMeleeDetour = DETOUR_CREATE_MEMBER(CalcIsAttackCriticalHelperMelee, "CalcCriticalMelee");
-	calcIsAttackCriticalKnifeDetour = DETOUR_CREATE_MEMBER(CalcIsAttackCriticalHelperKnife, "CalcCriticalKnife");
 
 	bool HookCreated = false;
 
@@ -208,12 +188,6 @@ void InitialiseDetours()
 		HookCreated = true;
 	}
 
-	if (calcIsAttackCriticalKnifeDetour != NULL)
-	{
-		calcIsAttackCriticalKnifeDetour->EnableDetour();
-		HookCreated = true;
-	}
-
 	if (!HookCreated)
 	{
 		g_pSM->LogError(myself, "No critical hit forwards could be initialized - Disabled critical hit hooks");
@@ -226,5 +200,4 @@ void RemoveDetours()
 {
 	calcIsAttackCriticalDetour->Destroy();
 	calcIsAttackCriticalMeleeDetour->Destroy();
-	calcIsAttackCriticalKnifeDetour->Destroy();
 }

extensions/tf2/msvc9/tf2.vcproj

@@ -46,7 +46,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -124,7 +124,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKOB)";"$(HL2SDKOB)\public";"$(HL2SDKOB)\public\engine";"$(HL2SDKOB)\public\game\server";"$(HL2SDKOB)\public\tier0";"$(HL2SDKOB)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;ORANGEBOX_BUILD"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

extensions/tf2/natives.cpp

@@ -40,7 +40,7 @@ cell_t TF2_Burn(IPluginContext *pContext, const cell_t *params)
 {
 	static ICallWrapper *pWrapper = NULL;
 
-	// CTFPlayerShared::Burn(CTFPlayer*)
+	// CTFPlayerShared::Burn(CTFPlayer*, CTFWeaponBase*)
 	if (!pWrapper)
 	{
 		REGISTER_NATIVE_ADDR("Burn", 
@@ -68,7 +68,7 @@ cell_t TF2_Burn(IPluginContext *pContext, const cell_t *params)
 
 	void *obj = (void *)((uint8_t *)pEntity + playerSharedOffset->actual_offset);
 
-	unsigned char vstk[sizeof(void *) + sizeof(CBaseEntity *)];
+	unsigned char vstk[sizeof(void *) + 2*sizeof(CBaseEntity *)];
 	unsigned char *vptr = vstk;
 
 	*(void **)vptr = obj;

extensions/tf2/svn_version.h

@@ -37,8 +37,8 @@
 #define _INCLUDE_SDKTOOLS_VERSION_H_
 
 #define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2652:0ae7d8ab1de7" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.0" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,0,0
+#define SM_BUILD_UNIQUEID	"2708:69195a250d70" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.2.1" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,2,1,0
 
 #endif //_INCLUDE_SDKTOOLS_VERSION_H_

extensions/topmenus/svn_version.h

@@ -37,8 +37,8 @@
 #define _INCLUDE_SQLITEEXT_VERSION_H_
 
 #define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2652:0ae7d8ab1de7" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.0" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,0,0
+#define SM_BUILD_UNIQUEID	"2708:69195a250d70" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.2.1" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,2,1,0
 
 #endif //_INCLUDE_SQLITEEXT_VERSION_H_

extensions/updater/extension.cpp

@@ -55,6 +55,13 @@ bool SmUpdater::SDK_OnLoad(char *error, size_t maxlength, bool late)
 	sharesys->AddDependency(myself, "webternet.ext", true, true);
 
 	SM_GET_IFACE(WEBTERNET, webternet);
+
+	const char *url = smutils->GetCoreConfigValue("AutoUpdateURL");
+	if (url == NULL)
+	{
+		url = DEFAULT_UPDATE_URL;
+	}
+	update_url.assign(url);
 	
 	ThreadParams params;
 	params.flags = Thread_Default;
@@ -67,13 +74,6 @@ bool SmUpdater::SDK_OnLoad(char *error, size_t maxlength, bool late)
 		return false;
 	}
 
-	const char *url = smutils->GetCoreConfigValue("AutoUpdateURL");
-	if (url == NULL)
-	{
-		url = DEFAULT_UPDATE_URL;
-	}
-	update_url.assign(url);
-
 	return true;
 }
 
@@ -139,7 +139,7 @@ static void PumpUpdate(void *data)
 			smutils->BuildPath(Path_SM, path, sizeof(path), "gamedata/%s", part->file);
 			if (libsys->IsPathDirectory(path))
 			{
-				continue;
+				goto skip_create;
 			}
 			if (!libsys->CreateFolder(path))
 			{
@@ -157,7 +157,7 @@ static void PumpUpdate(void *data)
 			if (fp == NULL)
 			{
 				AddUpdateError("Could not open %s for writing", path);
-				return;
+				goto skip_create;
 			}
 			if (fwrite(part->data, 1, part->length, fp) != part->length)
 			{

extensions/updater/msvc9/updater.vcproj

@@ -46,7 +46,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -124,7 +124,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;ORANGEBOX_BUILD;_CRT_NONSTDC_NO_DEPRECATE"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -206,7 +206,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -286,7 +286,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..;..\..\sourcepawn;"$(HL2SDK)\public";"$(HL2SDK)\public\dlls";"$(HL2SDK)\public\engine";"$(HL2SDK)\public\tier0";"$(HL2SDK)\public\tier1";"$(MMSOURCE17)\core-legacy";"$(MMSOURCE17)\core-legacy\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -369,7 +369,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -449,7 +449,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..;..\..\sourcepawn;"$(HL2SDKOB)\public";"$(HL2SDKOB)\public\engine";"$(HL2SDKOB)\public\game\server";"$(HL2SDKOB)\public\tier0";"$(HL2SDKOB)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=3"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -532,7 +532,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -612,7 +612,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..;..\..\sourcepawn;"$(HL2SDKL4D)\public";"$(HL2SDKL4D)\public\engine";"$(HL2SDKL4D)\public\game\server";"$(HL2SDKL4D)\public\tier0";"$(HL2SDKL4D)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=4"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -695,7 +695,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -775,7 +775,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..;..\..\sourcepawn;"$(HL2SDK)\public";"$(HL2SDK)\public\dlls";"$(HL2SDK)\public\engine";"$(HL2SDK)\public\tier0";"$(HL2SDK)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

extensions/updater/svn_version.h

@@ -37,8 +37,8 @@
 #define _INCLUDE_UPDATER_VERSION_H_
 
 #define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2652:0ae7d8ab1de7" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.0" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,0,0
+#define SM_BUILD_UNIQUEID	"2708:69195a250d70" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.2.1" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,2,1,0
 
 #endif //_INCLUDE_UPDATER_VERSION_H_

gamedata/core.games/common.games.txt

@@ -36,11 +36,6 @@
 			"engine"			"original"
 		}
 		
-		"Keys"
-		{
-			"m_iHealth"			"m_fHealth"
-		}
-		
 		"Offsets"
 		{
 			"GetDataDescMap"
@@ -120,7 +115,6 @@
 			"game"					"pvkii"
 			"game"					"diprip"
 			"game"					"synergy"
-			"game"					"FortressForever"
 			"game"					"left4dead"
 			"game"					"obsidian"
 			"game"					"ageofchivalry"

gamedata/sdktools.games/engine.l4d.txt

@@ -176,7 +176,7 @@
 			 * the expected code. A pointer to sv (IServer interface) is used
 			 * here.
 			 */
-			"CreateFakeClient_Windows"	"\x55\x8B\xEC\x83\xEC\x08\x89\x4D\xF8\x8B\x45\x08\x50\xB9\x2A\x2A\x2A\x2A\xE8"
+			"CreateFakeClient_Windows"	"\x8B\x44\x24\x2A\x50\xB9\x2A\x2A\x2A\x2A\xE8"
 		}
 		
 		"Offsets"
@@ -184,7 +184,7 @@
 			/* Offset into IVEngineServer::CreateFakeClient */
 			"sv"
 			{
-				"windows"	"14"
+				"windows"	"6"
 			}
 		}
 

gamedata/sdktools.games/game.dod.txt

@@ -37,8 +37,8 @@
 			}
 			"CommitSuicide"
 			{
-				"windows"	"388"
-				"linux"		"388"
+				"windows"	"390"
+				"linux"		"390"
 			}
 			"GetVelocity"
 			{

gamedata/sdktools.games/game.tf.txt

@@ -7,48 +7,48 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"406"
-				"linux"		"410"
+				"windows"	"421"
+				"linux"		"426"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"238"
-				"linux"		"239"
+				"windows"	"243"
+				"linux"		"244"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"236"
-				"linux"		"237"
+				"windows"	"241"
+				"linux"		"242"
 			}
 			"Ignite"
 			{
-				"windows"	"193"
-				"linux"		"194"
+				"windows"	"198"
+				"linux"		"199"
 			}
 			"Extinguish"
 			{
-				"windows"	"197"
-				"linux"		"198"
+				"windows"	"202"
+				"linux"		"203"
 			}
 			"Teleport"
 			{
-				"windows"	"100"
-				"linux"		"101"
+				"windows"	"105"
+				"linux"		"106"
 			}
 			"CommitSuicide"
 			{
-				"windows"	"390"
-				"linux"		"390"
+				"windows"	"397"
+				"linux"		"397"
 			}
 			"GetVelocity"
 			{
-				"windows"	"130"
-				"linux"		"131"
+				"windows"	"135"
+				"linux"		"136"
 			}
 			"EyeAngles"
 			{
-				"windows"	"122"
-				"linux"		"123"
+				"windows"	"127"
+				"linux"		"128"
 			}
 			"DispatchKeyValue"
 			{
@@ -77,8 +77,8 @@
 			}
 			"WeaponEquip"
 			{
-				"windows"	"229"
-				"linux"		"230"
+				"windows"	"234"
+				"linux"		"235"
 			}
 			"Activate"
 			{
@@ -87,4 +87,4 @@
 			}
 		}
 	}
-}
+}

gamedata/sdktools.games/game.zpanic.txt

@@ -1,120 +1,126 @@
 "Games"
 {
-	/* Zombie Panic! Source 1.2b 
-	 * Note: This mod is not fully supported yet. 
+	/* Zombie Panic! Source 1.3-1.5
 	 * The definitions below were supplied by a third party.
 	 * (thanks "noob cannon lol")
 	 */
-	"ZPS"
+	"zps"
 	{
 		"Offsets"
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"333"
-				"linux"		"334"
+				"windows"	"355"
+				"linux"		"356"
 			}
 			"RemovePlayerItem"
+			{
+				"windows"	"242"
+				"linux"		"243"
+			}
+			"Weapon_GetSlot"
+			{
+				"windows"	"237"
+				"linux"		"238"
+			}
+			"Ignite"
+			{
+				"windows"	"194"
+				"linux"		"195"
+			}
+			"Extinguish"
+			{
+				"windows"	"198"
+				"linux"		"199"
+			}
+			"Teleport"
+			{
+				"windows"	"102"
+				"linux"		"103"
+			}
+			"CommitSuicide"
+			{
+				"windows"	"396"
+				"linux"		"396"
+			}
+			"GetVelocity"
+			{
+				"windows"	"131"
+				"linux"		"132"
+			}
+			"EyeAngles"
+			{
+				"windows"	"123"
+				"linux"		"124"
+			}
+			"AcceptInput"
+			{
+				"windows"	"34"
+				"linux"		"35"
+			}
+			"DispatchKeyValue"
+			{
+				"windows"	"29"
+				"linux"		"28"
+			}
+			"DispatchKeyValueFloat"
+			{
+				"windows"	"28"
+				"linux"		"29"
+			}
+			"DispatchKeyValueVector"
+			{
+				"windows"	"27"
+				"linux"		"30"
+			}
+			"SetEntityModel"
+			{
+				"windows"	"23"
+				"linux"		"24"
+			}
+			"WeaponEquip"
 			{
 				"windows"	"230"
 				"linux"		"231"
 			}
-			"Weapon_GetSlot"
-			{
-				"windows"	"226"
-				"linux"		"227"
-			}
-			"Ignite"
-			{
-				"windows"	"190"
-				"linux"		"191"
-			}
-			"Extinguish"
-			{
-				"windows"	"191"
-				"linux"		"192"
-			}
-			"Teleport"
-			{
-				"windows"	"100"
-				"linux"		"101"
-			}
-			"CommitSuicide"
-			{
-				"windows"	"361"
-				"linux"		"362"
-			}
-			"GetVelocity"
-			{
-				"windows"	"128"
-				"linux"		"129"
-			}
-			"EyeAngles"
-			{
-				"windows"	"120"
-				"linux"		"121"
-			}
-			"AcceptInput"
-			{
-				"windows"	"35"
-				"linux"		"36"
-			}
-			"DispatchKeyValue"
-			{
-				"windows"	"31"
-				"linux"		"30"
-			}
-			"DispatchKeyValueFloat"
-			{
-				"windows"	"30"
-				"linux"		"31"
-			}
-			"DispatchKeyValueVector"
-			{
-				"windows"	"29"
-				"linux"		"32"
-			}
-			"SetEntityModel"
-			{
-				"windows"	"25"
-				"linux"		"26"
-			}
-			"WeaponEquip"
-			{
-				"windows"	"219"
-				"linux"		"220"
-			}
 			"Activate"
 			{
-				"windows"	"32"
-				"linux"		"33"
+				"windows"	"31"
+				"linux"		"32"
 			}
 		}
 		"Signatures"
 		{
-			"CreateGameRulesObject"
+			"DispatchSpawn"
 			{
 				"library"	"server"
-				"windows"	"\x8B\x0D\x2A\x2A\x2A\x2A\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x2C\x6A\x01"
-			}
-			"FindEntityByClassname"
-			{
-				"library"	"server"
-				"windows"	"\x53\x55\x56\x8B\xF1\x8B\x4C\x24\x2A\x2A\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x2A\x2A\x2A\x8B\x00\x25\xFF\x0F\x00\x00\x40\xC1\xC1\xE0\x04\x8B\x2A\x2A\xEB\x2A\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74\x2A\x8B\x5C\x24\x2A\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\x2A\xEB\x2A\x39"								
-				"linux"		"@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc"
+				"linux"		"@_Z13DispatchSpawnP11CBaseEntity"
+				"windows"   
+"\x53\x55\x56\x8B\x74\x24\x10\x2A\x2A\x2A\x0F\x84\x2A\x2A\x2A\x2A\x8B\x1D\x2A\x2A\x2A\x2A\x8B\x03\x8B\x50\x64\x8B\xCB"
 			}
 			"CreateEntityByName"
 			{
 				"library"	"server"
 				"linux"		"@_Z18CreateEntityByNamePKci"
-				"windows"	"\x56\x8B\x74\x24\x2A\x57\x8B\x7C\x24\x2A\x83\xFE\xFF\x74\x2A\x8B\x0D\x2A\x2A\x2A\x2A\x8B\x01\x8B\x50\x2A\x56\xFF\xD2"
+				"windows"   
+"\x56\x8B\x74\x24\x0C\x57\x8B\x7C\x24\x0C\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x8B\x01\x8B\x50\x54\x56\xFF\xD2"
 			}
-			"DispatchSpawn"
+			"FindEntityByClassname"
 			{
 				"library"	"server"
-				"linux"		"@_Z13DispatchSpawnP11CBaseEntity"
-				"windows"	"\x53\x55\x56\x8B\x74\x24\x10\x2A\x85\xF6\x0F\x84\x2A\x2A\x2A\x2A\x8B\x1D\x2A\x2A\x2A\x2A\x8B\x03\x8B\x50\x60\x8B\xCB"
-			} 
+				"windows"   
+"\x53\x55\x56\x8B\xF1\x8B\x4C\x24\x10\x2A\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x08\xFF\xD2\x8B\x00\x25\xFF\x0F\x00\x00\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"
+				"linux"	   
+"@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc"
+			}
+			"FireOutput"
+			{
+				"library"	"server"
+				"windows"	"\x81\xEC\x1C\x01\x00\x00\x53\x55\x56\x8B\x71\x14"
+				"linux"	   
+"@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f"
+			}
 		}
 	}
 }
+

gamedata/sm-tf2.games.txt

@@ -34,21 +34,14 @@
 				"linux"		"@_ZN18CTFWeaponBaseMelee26CalcIsAttackCriticalHelperEv"
 				"windows"	"\x83\xEC\x08\x53\x57\x8B\xF9\xE8\x2A\x2A\x2A\x2A\x8B\xD8"
 			}
-			"CalcCriticalKnife"
-			{
-				"library"	"server"
-				"linux"		"@_ZN8CTFKnife26CalcIsAttackCriticalHelperEv"
-				"windows"	"\x8B\x81\xF0\x13\x00\x00\x83\xF8\xFF\x74\x29\x8B\x15"
-			}
-
 		}
 		"Offsets"
 		{
 			"ForceRespawn"
 			{
-				"windows"	"281"
-				"linux"		"282"
+				"windows"	"287"
+				"linux"		"288"
 			}
 		}
 	}
-}
+}

loader/msvc9/loader.vcproj

@@ -46,7 +46,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -124,7 +124,7 @@
 				AdditionalIncludeDirectories="..;"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LOADER_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

loader/svn_version.h

@@ -41,8 +41,8 @@
  */
 
 #define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2652:0ae7d8ab1de7" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.0" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,0,0
+#define SM_BUILD_UNIQUEID	"2708:69195a250d70" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.2.1" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,2,1,0
 
 #endif //_INCLUDE_SOURCEMOD_VERSION_H_

modules.versions

@@ -1,7 +1,7 @@
 [PRODUCT]
 major = 1
 minor = 2
-revision = 0
+revision = 1
 
 [core]
 folder = core

plugins/include/clients.inc

@@ -63,6 +63,10 @@ public const MaxClients;	/**< Maximum number of players the server supports (dyn
  * If you return false (or return nothing), the client will be rejected.  If the client is 
  * rejected by this forward or any other, OnClientDisconnect will not be called.
  *
+ * Note: Do not write to rejectmsg if you plan on returning true.  If multiple plugins write
+ * to the string buffer, it is not defined which plugin's string will be shown to the client,
+ * but it is guaranteed one of them will.
+ *
  * @param client		Client index.
  * @param rejectmsg		Buffer to store the rejection message when the connection is refused.
  * @param maxlen		Maximum number of characters for rejection buffer.

plugins/include/console.inc

@@ -817,9 +817,11 @@ native bool:FindNextConCommand(Handle:search, String:buffer[], max_size, &bool:i
 native bool:SendConVarValue(client, Handle:convar, const String:value[]);
 
 /**
- * Appends a string to Valve's sv_tags convar and makes sure it remains after mapchanges.
+ * Adds an informational string to the server's public "tags".
+ * This string should be a short, unique identifier.
  *
- * Note: Tags are automatically removed on plugin unload
+ * Note: Tags are automatically removed when a plugin unloads.
+ * Note: Currently, this function does nothing because of bugs in the Valve master.
  *
  * @param tag			Tag string to append.
  * @noreturn
@@ -827,9 +829,7 @@ native bool:SendConVarValue(client, Handle:convar, const String:value[]);
 native AddServerTag(const String:tag[]);
 
 /**
- * Removes a string from valve's sv_tags convar.
- *
- * Note: You can only remove tags created by you.
+ * Removes a tag previously added by the calling plugin.
  *
  * @param tag			Tag string to remove.
  * @noreturn

plugins/include/entity_prop_stocks.inc

@@ -491,7 +491,7 @@ stock SetEntityHealth(entity, amount)
 		
 		if (!exists)
 		{
-			strcopy(prop, sizeof(prop), "m_iHeath");
+			strcopy(prop, sizeof(prop), "m_iHealth");
 		}
 		
 		gotconfig = true;

plugins/include/menus.inc

@@ -94,6 +94,8 @@ enum MenuAction
 #define VOTEINFO_ITEM_INDEX			0		/**< Item index */
 #define VOTEINFO_ITEM_VOTES			1		/**< Number of votes for the item */
 
+#define VOTEFLAG_NO_REVOTES			(1<<0)	/**< Players cannot change their votes */
+
 /**
  * Reasons a menu can be cancelled (MenuAction_Cancel).
  */
@@ -469,22 +471,24 @@ native CancelVote();
  * @param clients			Array of clients to broadcast to.
  * @param numClients		Number of clients in the array.
  * @param time				Maximum time to leave menu on the screen.
+ * @param flags				Optional voting flags.
  * @return					True on success, false if this menu already has a vote session
  *							in progress.
  * @error					Invalid Handle, or a vote is already in progress.
  */
-native bool:VoteMenu(Handle:menu, clients[], numClients, time);
+native bool:VoteMenu(Handle:menu, clients[], numClients, time, flags=0);
 
 /**
  * Sends a vote menu to all clients.  See VoteMenu() for more information.
  *
  * @param menu				Menu Handle.
  * @param time				Maximum time to leave menu on the screen.
+ * @param flags				Optional voting flags.
  * @return					True on success, false if this menu already has a vote session
  *							in progress.
  * @error					Invalid Handle.
  */
-stock VoteMenuToAll(Handle:menu, time)
+stock VoteMenuToAll(Handle:menu, time, flags=0)
 {
 	new num = GetMaxClients();
 	new total;
@@ -499,7 +503,7 @@ stock VoteMenuToAll(Handle:menu, time)
 		players[total++] = i;
 	}
 	
-	return VoteMenu(menu, players, total, time);
+	return VoteMenu(menu, players, total, time, flags);
 }
 /**
  * Callback for when a vote has ended and results are available.
@@ -543,7 +547,7 @@ native CheckVoteDelay();
 /**
  * Returns whether a client is in the pool of clients allowed 
  * to participate in the current vote.  This is determined by 
- * the client list passed to StartVote().
+ * the client list passed to VoteMenu().
  *
  * @param client			Client index.
  * @return					True if client is allowed to vote, false otherwise.
@@ -555,12 +559,13 @@ native bool:IsClientInVotePool(client);
  * Redraws the current vote menu to a client in the voting pool.
  *
  * @param client			Client index.
+ * @param revotes			True to allow revotes, false otherwise.
  * @return					True on success, false if the client is in the vote pool 
  *							but cannot vote again.
  * @error					No vote in progress, client is not in the voting pool, 
  *							or client index is invalid.
  */
-native bool:RedrawClientVoteMenu(client);
+native bool:RedrawClientVoteMenu(client, bool:revotes=true);
 
 /**
  * Returns a style's global Handle.
@@ -807,3 +812,4 @@ stock bool:IsNewVoteAllowed()
 	
 	return true;
 }
+

plugins/include/tf2.inc

@@ -57,6 +57,14 @@ enum TFTeam
 	TFTeam_Blue = 3	
 };
 
+/**
+ * Sets a client on fire for 10 seconds.
+ *
+ * @param client		Player's index.
+ * @noreturn
+ * @error				Invalid client index, client not in game, or no mod support.
+ */
+native TF2_IgnitePlayer(client, target);
 
 /**
  * Respawns a client

plugins/include/version.inc

@@ -37,6 +37,6 @@
 
 #define SOURCEMOD_V_MAJOR		1				/**< SourceMod Major version */
 #define SOURCEMOD_V_MINOR		2				/**< SourceMod Minor version */
-#define SOURCEMOD_V_RELEASE		0				/**< SourceMod Release version */
+#define SOURCEMOD_V_RELEASE		1				/**< SourceMod Release version */
 
-#define SOURCEMOD_VERSION	"1.2.0"	/**< SourceMod version string (major.minor.release.build) */
+#define SOURCEMOD_VERSION	"1.2.1"	/**< SourceMod version string (major.minor.release.build) */

plugins/nextmap.sp

@@ -54,10 +54,12 @@ new g_CurrentMapStartTime;
  
 public OnPluginStart()
 {
-	decl String:desc[128];
-	GetGameFolderName(desc, sizeof(desc));
+	decl String:game[128];
+	GetGameFolderName(game, sizeof(game));
 
-	if (StrEqual(desc, "left4dead", false))
+	if (StrEqual(game, "left4dead", false)
+			|| StrEqual(game, "dystopia", false)
+			|| StrEqual(game, "synergy", false))
 		return;
 
 	LoadTranslations("common.phrases");
@@ -81,10 +83,12 @@ public OnMapStart()
  
 public OnConfigsExecuted()
 {
-	decl String:desc[128];
-	GetGameFolderName(desc, sizeof(desc));
+	decl String:game[128];
+	GetGameFolderName(game, sizeof(game));
 
-	if (StrEqual(desc, "left4dead", false))
+	if (StrEqual(game, "left4dead", false)
+			|| StrEqual(game, "dystopia", false)
+			|| StrEqual(game, "synergy", false))
 		return;
 
 	decl String:lastMap[64], String:currentMap[64];

plugins/playercommands.sp

@@ -49,6 +49,10 @@ public Plugin:myinfo =
 
 new Handle:hTopMenu = INVALID_HANDLE;
 
+/* Used to get the SDK / Engine version. */
+/* This is used in sm_rename. */
+new g_ModVersion = 0;
+
 #include "playercommands/slay.sp"
 #include "playercommands/slap.sp"
 #include "playercommands/rename.sp"
@@ -62,6 +66,8 @@ public OnPluginStart()
 	RegAdminCmd("sm_slay", Command_Slay, ADMFLAG_SLAY, "sm_slay <#userid|name>");
 	RegAdminCmd("sm_rename", Command_Rename, ADMFLAG_SLAY, "sm_rename <#userid|name>");
 	
+	g_ModVersion = GuessSDKVersion();
+
 	/* Account for late loading */
 	new Handle:topmenu;
 	if (LibraryExists("adminmenu") && ((topmenu = GetAdminTopMenu()) != INVALID_HANDLE))

plugins/playercommands/rename.sp

@@ -36,7 +36,17 @@ new String:g_NewName[MAXPLAYERS+1][MAX_NAME_LENGTH];
 PerformRename(client, target)
 {
 	LogAction(client, target, "\"%L\" renamed \"%L\" to \"%s\")", client, target, g_NewName[target]);
-	SetClientInfo(target, "name", g_NewName[target]);
+
+	/* Used on OB / L4D engine */
+	if (g_ModVersion > SOURCE_SDK_EPISODE1)
+	{
+		SetClientInfo(target, "name", g_NewName[target]);
+	}
+	else /* Used on CSS and EP1 / older engine */
+	{
+		ClientCommand(target, "name %s", g_NewName[target]);
+	}
+	g_NewName[target][0] = '\0';
 }
 
 public AdminMenu_Rename(Handle:topmenu, 
@@ -156,7 +166,7 @@ public Action:Command_Rename(client, args)
 			client,
 			target_list,
 			MAXPLAYERS,
-			COMMAND_FILTER_ALIVE,
+			COMMAND_TARGET_NONE,
 			target_name,
 			sizeof(target_name),
 			tn_is_ml)) > 0)

product.version

@@ -1 +1 @@
-1.2.0
+1.2.1

public/IMenuManager.h

@@ -36,7 +36,7 @@
 #include <IHandleSys.h>
 
 #define SMINTERFACE_MENUMANAGER_NAME		"IMenuManager"
-#define SMINTERFACE_MENUMANAGER_VERSION		15
+#define SMINTERFACE_MENUMANAGER_VERSION		16
 
 /**
  * @file IMenuManager.h
@@ -179,6 +179,8 @@ namespace SourceMod
 	#define MENUFLAG_BUTTON_EXITBACK	(1<<1)	/**< Menu has an "exit back" button */
 	#define MENUFLAG_NO_SOUND			(1<<2)	/**< Menu will not have any select sounds */
 
+	#define VOTEFLAG_NO_REVOTES			(1<<0)	/**< Players cannot change their votes */
+
 	/**
 	 * @brief Extended menu options.
 	 */
@@ -869,7 +871,7 @@ namespace SourceMod
 		 * @param num_clients	Number of clients to display to.
 		 * @param clients		Client index array.
 		 * @param max_time		Maximum time to hold menu for.
-		 * @param flags			Vote flags (currently unused).
+		 * @param flags			Vote flags.
 		 * @return				True on success, false if a vote is in progress.
 		 */
 		virtual bool StartVote(IBaseMenu *menu,
@@ -914,7 +916,17 @@ namespace SourceMod
 		 * @return				True on success, false if client is not allowed to vote.
 		 */
 		virtual bool RedrawClientVoteMenu(int client) =0;
+
+		/**
+		 * @brief Redraws the current vote menu to a client in the voting pool.
+		 *
+		 * @param client		Client index.
+		 * @param revotes		True to allow revotes, false otherwise.
+		 * @return				True on success, false if client is not allowed to vote.
+		 */
+		virtual bool RedrawClientVoteMenu2(int client, bool revotes) =0;
 	};
 }
 
 #endif //_INCLUDE_SOURCEMOD_MENU_SYSTEM_H_
+

public/IPlayerHelpers.h

@@ -41,7 +41,7 @@
 #include <IAdminSystem.h>
 
 #define SMINTERFACE_PLAYERMANAGER_NAME		"IPlayerManager"
-#define SMINTERFACE_PLAYERMANAGER_VERSION	9
+#define SMINTERFACE_PLAYERMANAGER_VERSION	10
 
 struct edict_t;
 class IPlayerInfo;
@@ -190,6 +190,13 @@ namespace SourceMod
 		 * @return	Serial number.
 		 */
 		virtual unsigned int GetSerial() =0;
+
+		/**
+		 * @brief Return whether the client is authorized.
+		 *
+		 * @return		True if authorized, false otherwise.
+		 */
+		virtual bool IsAuthorized() =0;
 	};
 
 	/**

public/compat_wrappers.h

@@ -84,7 +84,7 @@
 		{
 			if (strcmp(pBase->GetName(), name) == 0)
 			{
-				if (pBase->IsCommand())
+				if (!pBase->IsCommand())
 				{
 					return NULL;
 				}

public/sample_ext/msvc9/sdk.vcproj

@@ -46,7 +46,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -124,7 +124,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..;..\..\sourcepawn"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;ORANGEBOX_BUILD"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -206,7 +206,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -286,7 +286,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..;..\..\sourcepawn;"$(HL2SDK)\public";"$(HL2SDK)\public\dlls";"$(HL2SDK)\public\engine";"$(HL2SDK)\public\tier0";"$(HL2SDK)\public\tier1";"$(MMSOURCE17)\core-legacy";"$(MMSOURCE17)\core-legacy\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -369,7 +369,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -449,7 +449,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..;..\..\sourcepawn;"$(HL2SDK-DARKM)\public";"$(HL2SDK-DARKM)\public\dlls";"$(HL2SDK-DARKM)\public\engine";"$(HL2SDK-DARKM)\public\tier0";"$(HL2SDK-DARKM)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -532,7 +532,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -612,7 +612,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..;..\..\sourcepawn;"$(HL2SDKOB)\public";"$(HL2SDKOB)\public\engine";"$(HL2SDKOB)\public\game\server";"$(HL2SDKOB)\public\tier0";"$(HL2SDKOB)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=3"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -695,7 +695,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -775,7 +775,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..;..\..\sourcepawn;"$(HL2SDKL4D)\public";"$(HL2SDKL4D)\public\engine";"$(HL2SDKL4D)\public\game\server";"$(HL2SDKL4D)\public\tier0";"$(HL2SDKL4D)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=4"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -858,7 +858,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -938,7 +938,7 @@
 				AdditionalIncludeDirectories="..;..\sdk;..\..;..\..\sourcepawn;"$(HL2SDK)\public";"$(HL2SDK)\public\dlls";"$(HL2SDK)\public\engine";"$(HL2SDK)\public\tier0";"$(HL2SDK)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

pushbuild.txt

@@ -12,3 +12,6 @@ D
 S
 !
 joys of buildbot, part 5: a watermelon's diatribes need not be cause for spilling the queen's tea
+What the hell.
+<@predcrab> might need to click the do something button
+joys of buildbot, part 6: why you got to do a thing 

sourcepawn/compiler/Makefile

@@ -30,7 +30,7 @@ LINK = -lgcc -static-libgcc
 
 INCLUDE = -I. -I$(SMSDK)/public/sourcepawn
 
-CFLAGS += -DLINUX -DNDEBUG -DHAVE_STDINT_H -DAMX_ANSIONLY -DENABLE_BINRELOC -m32
+CFLAGS += -DLINUX -DHAVE_STDINT_H -DAMX_ANSIONLY -DENABLE_BINRELOC -m32
 CPPFLAGS += -Wno-non-virtual-dtor -fno-exceptions -fno-rtti
 
 ################################################

sourcepawn/compiler/sc1.c

@@ -2303,12 +2303,13 @@ static int declloc(int fstatic)
         if (matchtoken(']')) {
           idxtag[numdim] = 0;
           dim[numdim] = 0;
-		  numdim++;
+          numdim++;
           continue;
         }
         dim_ident = doexpr2(TRUE,FALSE,FALSE,FALSE,&idxtag[numdim],&dim_sym,0,&dim_val);
         if (dim_ident == iVARIABLE || dim_ident == iEXPRESSION || dim_ident == iARRAYCELL) {
           all_constant = 0;
+          dim[numdim] = 0;
         } else if (dim_ident == iCONSTEXPR) {
           dim[numdim] = dim_val.constval;
 		  /* :TODO: :URGENT: Make sure this still works */
@@ -2323,7 +2324,7 @@ static int declloc(int fstatic)
           error(29); /* invalid expression, assumed 0 */
         }
         numdim++;
-		needtoken(']');
+        needtoken(']');
       } while (matchtoken('['));
       if (all_constant) {
         /* Change the last dimension to be based on chars instead if we have a string */
@@ -2335,7 +2336,7 @@ static int declloc(int fstatic)
         ident = iARRAY;
         stgdel(_index, _code);
       } else {
-        if (tag == pc_tag_string && numdim && dim[numdim-1]) {
+        if (tag == pc_tag_string && numdim) {
           stradjust(sPRI);
         }
         pushreg(sPRI);
@@ -6361,6 +6362,11 @@ static void doreturn(void)
       error(78);                        /* mix "return;" and "return value;" */
     ident=doexpr(TRUE,FALSE,TRUE,FALSE,&tag,&sym,TRUE);
     needtoken(tTERM);
+    if (ident==iARRAY && sym==NULL) {
+      /* returning a literal string is not supported (it must be a variable) */
+      error(39);
+      ident=iCONSTEXPR;                 /* avoid handling an "array" case */
+    } /* if */
     /* see if this function already has a sub type (an array attached) */
     sub=finddepend(curfunc);
     assert(sub==NULL || sub->ident==iREFARRAY);
@@ -6406,7 +6412,7 @@ static void doreturn(void)
         } /* if */
       } else {
         int idxtag[sDIMEN_MAX];
-        int argcount;
+        int argcount, slength=0;
         /* this function does not yet have an array attached; clone the
          * returned symbol beneath the current function
          */
@@ -6424,6 +6430,8 @@ static void doreturn(void)
           if (dim[numdim]<=0)
             error(46,sym->name);
         } /* for */
+        if (sym->tag==pc_tag_string && numdim!=0)
+          slength=dim[numdim-1];
         /* the address of the array is stored in a hidden parameter; the address
          * of this parameter is 1 + the number of parameters (times the size of
          * a cell) + the size of the stack frame and the return address
@@ -6439,7 +6447,7 @@ static void doreturn(void)
         assert(curfunc->dim.arglist!=NULL);
         for (argcount=0; curfunc->dim.arglist[argcount].ident!=0; argcount++)
           /* nothing */;
-        sub=addvariable(curfunc->name,(argcount+3)*sizeof(cell),iREFARRAY,sGLOBAL,curfunc->tag,dim,numdim,idxtag);
+        sub=addvariable2(curfunc->name,(argcount+3)*sizeof(cell),iREFARRAY,sGLOBAL,curfunc->tag,dim,numdim,idxtag,slength);
         sub->parent=curfunc;
       } /* if */
       /* get the hidden parameter, copy the array (the array is on the heap;

sourcepawn/compiler/sc3.c

@@ -698,6 +698,7 @@ static int plnge_rel(int *opstr,int opoff,int (*hier)(value *lval),value *lval)
   int lvalue,opidx;
   value lval2={0};
   int count;
+  char boolresult;
 
   /* this function should only be called for relational operators */
   assert(op1[opoff]==os_le);
@@ -714,7 +715,9 @@ static int plnge_rel(int *opstr,int opoff,int (*hier)(value *lval),value *lval)
       error(212);
     if (count>0) {
       relop_prefix();
+      boolresult=lval->boolresult;
       *lval=lval2;      /* copy right hand expression of the previous iteration */
+      lval->boolresult=boolresult;
     } /* if */
     opidx+=opoff;
     plnge2(op1[opidx],hier,lval,&lval2);
@@ -2422,8 +2425,6 @@ static int nesting=0;
           if (!checktags_string(arg[argidx].tags, arg[argidx].numtags, &lval)
               && !checktag(arg[argidx].tags,arg[argidx].numtags,lval.tag))
             error(213);
-          if (lval.tag!=0)
-            append_constval(&taglst,arg[argidx].name,lval.tag,0);
           break;
         case iVARIABLE:
           if (lval.ident==iLABEL || lval.ident==iFUNCTN || lval.ident==iREFFUNC

sourcepawn/compiler/svn_version.h

@@ -20,8 +20,8 @@
  */
 
 #define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2652:0ae7d8ab1de7" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.0" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,0,0
+#define SM_BUILD_UNIQUEID	"2708:69195a250d70" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.2.1" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,2,1,0
 
 #endif //_INCLUDE_SOURCEMOD_VERSION_H_

sourcepawn/jit/jit_version.h

@@ -33,8 +33,8 @@
 #define _INCLUDE_JIT_VERSION_H_
 
 #define SM_BUILD_STRING		""
-#define SM_BUILD_UNIQUEID	"2652:0ae7d8ab1de7" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"1.2.0" SM_BUILD_STRING
-#define SVN_FILE_VERSION	1,2,0,0
+#define SM_BUILD_UNIQUEID	"2708:69195a250d70" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.2.1" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,2,1,0
 
 #endif //_INCLUDE_JIT_VERSION_H_

tools/buildbot/bootstrap.pl

@@ -57,7 +57,12 @@ if ($^O eq "linux")
     Build::Command("flip -u tools/versionchanger.pl");
     Build::Command("chmod +x tools/versionchanger.pl");
 }
-#Build::Command(Build::PathFormat('tools/versionchanger.pl') . ' --buildstring="-dev"');
+my ($build_type);
+$build_type = Build::GetBuildType(Build::PathFormat('tools/buildbot/build_type'));
+if ($build_type eq "dev")
+{
+	Build::Command(Build::PathFormat('tools/versionchanger.pl') . ' --buildstring="-dev"');
+}
 
 #Bootstrap extensions that have complex dependencies
 

tools/buildbot/build_type

@@ -0,0 +1 @@
+rel

tools/buildbot/helpers.pm

@@ -142,4 +142,15 @@ sub SVN_Add
 	chdir($dir);
 }
 
+sub GetBuildType
+{
+	my ($file)=(@_);
+	my ($type);
+	open(TYPE, $file) or die("Could not open file: $!\n");
+	$type = <TYPE>;
+	close(TYPE);
+	chomp $type;
+	return $type;
+}
+
 return 1;

tools/buildbot/symstore.pl

@@ -22,13 +22,25 @@ my ($version);
 $version = Build::ProductVersion(Build::PathFormat('product.version'));
 $version .= '-hg' . Build::HgRevNum('.');
 
+my ($build_type);
+$build_type = Build::GetBuildType(Build::PathFormat('tools/buildbot/build_type'));
+
+if ($build_type eq "dev")
+{
+	$build_type = "buildbot";
+}
+elsif ($build_type eq "rel")
+{
+	$build_type = "release";
+}
+
 my ($line);
 while (<PDBLOG>)
 {
 	$line = $_;
 	$line =~ s/\.pdb/\*/;
 	chomp $line;
-	Build::Command("symstore add /r /f \"$line\" /s ..\\..\\symstore /t \"SourceMod\" /v \"$version\" /c \"buildbot\"");
+	Build::Command("symstore add /r /f \"$line\" /s ..\\..\\symstore /t \"SourceMod\" /v \"$version\" /c \"$build_type\"");
 }
 
 close(PDBLOG);

tools/builder/LinuxBuilder.cs

@@ -75,11 +75,11 @@ namespace builder
 			}
 			else if (lib.build_mode == BuildMode.BuildMode_OldMetamod)
 			{
-				makefile_args = "ENGINE=\"original\"";
+				makefile_args += "ENGINE=\"original\"";
 			}
 			else if (lib.build_mode == BuildMode.BuildMode_Left4Dead)
 			{
-				makefile_args = "ENGINE=\"left4dead\"";
+				makefile_args += "ENGINE=\"left4dead\"";
 			}
 
 			/* Clean the project first */