Bumped version to 1.3.3 for release.

.hgtags

@@ -5,3 +5,4 @@ b3ffa8a4511c4eadaf533fc790aa6b14f7f0c6ea sourcemod-1.1.2
 3a73bbf60f34befa9b66be03fa5974b394bb3411 sourcemod-1.2.0
 a71318396392e3c6d0ff31e069a60fbde59e0cea sourcemod-1.3.0
 3f33d01fcc28b509bed30f7be07ed215cc000538 sourcemod-1.3.1
+a3e8f7a7fdf7f012dd02ad491a2e1ccdad151687 sourcemod-1.3.2

changelog.txt

@@ -2,6 +2,32 @@ SourceMod Changelog
 
 ----------------------------
 
+SourceMod 1.3.3 [2010-06-23]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.3.3_Release_Notes
+
+User Changes:
+
+ - Added support for CS:S on Orange Box
+ - Added gamedata for Resistance and Liberation (bug 4418).
+ - Updated gamedata for SourceForts, Empires, Obsidian Conflict, Zombie Master.
+ - Fixed memory corruption and leaks with some voice functionality (bug 4415).
+ - Fixed UI bug in sm_motd (bug 4460). 
+
+Developer Changes:
+
+ - Added new player condition (TFCond_CritCola, bug 4447).
+ - Fixed clientprefs deleting cookies twice in rare cases (bug 4412).
+ - Fixed OnClientConnected forward not firing for bots (bug 4443).
+ - Fixed sm_dump_datamaps crash (bug 4424).
+ - Fixed switch case comparisons failing with large numbers (bug 4457).
+ - Fixed rare crash in output hooks (bug 4422).
+ - Fixed bug with dynamically sized arrays being sliced (bug 4428).
+ - Fixed SendConVarValue() on TF2, DOD:S, L4D, and L4D2 (bug 4273).
+ - Fixed TF2 natives not being marked optional (bug 4389). 
+
+----------------------------
+
 SourceMod 1.3.2 [2010-05-02]
 
 URL: http://wiki.alliedmods.net/SourceMod_1.3.2_Release_Notes

core/PlayerManager.cpp

@@ -466,7 +466,7 @@ bool PlayerManager::OnClientConnect_Post(edict_t *pEntity, const char *pszName,
 			pListener->OnClientConnected(client);
 			if (!pPlayer->IsConnected())
 			{
-				break;
+				return true;
 			}
 		}
 
@@ -520,6 +520,11 @@ void PlayerManager::OnClientPutInServer(edict_t *pEntity, const char *playername
 				return;
 			}
 		}
+
+		cell_t res;
+		OnClientConnected->PushCell(client);
+		OnClientConnected->Execute(&res, NULL);
+
 		/* Now do authorization */
 		for (iter=m_hooks.begin(); iter!=m_hooks.end(); iter++)
 		{

core/smn_console.cpp

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -46,6 +46,12 @@
 #include "Logger.h"
 #include "ConsoleDetours.h"
 
+#if SOURCE_ENGINE >= SE_ORANGEBOXVALVE
+#define NETMSG_BITS 6
+#else
+#define NETMSG_BITS 5
+#endif
+
 #if (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
 #define NET_SETCONVAR	6
 #else
@@ -189,7 +195,7 @@ static void ReplicateConVar(ConVar *pConVar)
 	char data[256];
 	bf_write buffer(data, sizeof(data));
 
-	buffer.WriteUBitLong(NET_SETCONVAR, 5);
+	buffer.WriteUBitLong(NET_SETCONVAR, NETMSG_BITS);
 	buffer.WriteByte(1);
 	buffer.WriteString(pConVar->GetName());
 	buffer.WriteString(pConVar->GetString());
@@ -1299,7 +1305,7 @@ static cell_t SendConVarValue(IPluginContext *pContext, const cell_t *params)
 	char data[256];
 	bf_write buffer(data, sizeof(data));
 
-	buffer.WriteUBitLong(NET_SETCONVAR, 5);
+	buffer.WriteUBitLong(NET_SETCONVAR, NETMSG_BITS);
 	buffer.WriteByte(1);
 	buffer.WriteString(pConVar->GetName());
 	buffer.WriteString(value);

extensions/clientprefs/cookie.cpp

@@ -313,8 +313,6 @@ void CookieManager::ClientConnectCallback(int serial, IQuery *data)
 			row->GetInt(3, (int *)&access);
 
 			parent = CreateCookie(name, desc, access);
-			cookieTrie.insert(name, parent);
-			cookieList.push_back(parent);
 		}
 
 		pData->parent = parent;

extensions/cstrike/AMBuilder

@@ -1,13 +1,14 @@
 # vim: set ts=2 sw=2 tw=99 noet ft=python: 
 import os
 
-sdk = SM.sdkInfo['ep1']
+sdk = SM.sdkInfo['ep2v']
-compiler = SM.DefaultHL2Compiler('extensions/cstrike', 'ep1')
+
+compiler = SM.DefaultHL2Compiler('extensions/cstrike', 'ep2v')
 
 name = 'game.cstrike.ext.' + sdk['ext']
 extension = AMBuild.AddJob(name)
 binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler)
-SM.PreSetupHL2Job(extension, binary, 'ep1')
+SM.PreSetupHL2Job(extension, binary, 'ep2v')
 binary.AddSourceFiles('extensions/cstrike', [
 	'extension.cpp',
 	'natives.cpp',
@@ -15,7 +16,6 @@ binary.AddSourceFiles('extensions/cstrike', [
 	'timeleft.cpp',
 	'sdk/smsdk_ext.cpp'
 	])
-SM.PostSetupHL2Job(extension, binary, 'ep1')
+SM.PostSetupHL2Job(extension, binary, 'ep2v')
 SM.AutoVersion('extensions/cstrike', binary)
-binary.SendToJob()
+binary.SendToJob()
-

extensions/cstrike/Makefile

@@ -2,11 +2,11 @@
 # Makefile written by David "BAILOPAN" Anderson
 
 SMSDK = ../..
-SRCDS_BASE = ~/srcds
 HL2SDK_ORIG = ../../../hl2sdk
 HL2SDK_OB = ../../../hl2sdk-ob
 HL2SDK_OB_VALVE = ../../../hl2sdk-ob-valve
 HL2SDK_L4D = ../../../hl2sdk-l4d
+HL2SDK_L4D2 = ../../../hl2sdk-l4d2
 MMSOURCE17 = ../../../mmsource-1.7
 
 #####################################
@@ -31,75 +31,97 @@ CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
 CPP = gcc
 
 override ENGSET = false
-ifeq "$(ENGINE)" "original"
+
-	HL2SDK = $(HL2SDK_ORIG)
+# Check for valid list of engines
-	HL2PUB = $(HL2SDK)/public
+ifneq (,$(filter original orangebox orangeboxvalve left4dead left4dead2,$(ENGINE)))
-	HL2LIB = $(HL2SDK)/linux_sdk
-	CFLAGS += -DSOURCE_ENGINE=1
-	METAMOD = $(MMSOURCE17)/core-legacy
-	INCLUDE += -I$(HL2SDK)/public/dlls
-	SRCDS = $(SRCDS_BASE)
-	GAMEFIX = 1.ep1
-	override ENGSET = true
-endif
-ifeq "$(ENGINE)" "orangebox"
-	HL2SDK = $(HL2SDK_OB)
-	HL2PUB = $(HL2SDK)/public
-	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=3
-	METAMOD = $(MMSOURCE17)/core
-	INCLUDE += -I$(HL2SDK)/public/game/server
-	SRCDS = $(SRCDS_BASE)/orangebox
-	GAMEFIX = 2.ep2
-	override ENGSET = true
-endif
-ifeq "$(ENGINE)" "orangeboxvalve"
-	HL2SDK = $(HL2SDK_OB_VALVE)
-	HL2PUB = $(HL2SDK)/public
-	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=4
-	METAMOD = $(MMSOURCE17)/core
-	INCLUDE += -I$(HL2SDK)/public/game/server
-	SRCDS = $(SRCDS_BASE)/orangebox
-	GAMEFIX = 2.ep2v
-	override ENGSET = true
-endif
-ifeq "$(ENGINE)" "left4dead"
-	HL2SDK = $(HL2SDK_L4D)
-	HL2PUB = $(HL2SDK)/public
-	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=5
-	METAMOD = $(MMSOURCE17)/core
-	INCLUDE += -I$(HL2SDK)/public/game/server
-	SRCDS = $(SRCDS_BASE)/l4d
-	GAMEFIX = 2.l4d
 	override ENGSET = true
 endif
 
+ifeq "$(ENGINE)" "original"
+	HL2SDK = $(HL2SDK_ORIG)
+	CFLAGS += -DSOURCE_ENGINE=1
+	GAMEFIX = 1.ep1
+endif
+ifeq "$(ENGINE)" "orangebox"
+	HL2SDK = $(HL2SDK_OB)
+	CFLAGS += -DSOURCE_ENGINE=3
+	GAMEFIX = 2.ep2
+endif
+ifeq "$(ENGINE)" "orangeboxvalve"
+	HL2SDK = $(HL2SDK_OB_VALVE)
+	CFLAGS += -DSOURCE_ENGINE=4
+	GAMEFIX = 2.ep2v
+endif
+ifeq "$(ENGINE)" "left4dead"
+	HL2SDK = $(HL2SDK_L4D)
+	CFLAGS += -DSOURCE_ENGINE=5
+	GAMEFIX = 2.l4d
+endif
+ifeq "$(ENGINE)" "left4dead2"
+	HL2SDK = $(HL2SDK_L4D2)
+	CFLAGS += -DSOURCE_ENGINE=6
+	GAMEFIX = 2.l4d2
+endif
+
+HL2PUB = $(HL2SDK)/public
+
+ifeq "$(ENGINE)" "original"
+	INCLUDE += -I$(HL2SDK)/public/dlls
+	METAMOD = $(MMSOURCE17)/core-legacy
+else
+	INCLUDE += -I$(HL2SDK)/public/game/server
+	METAMOD = $(MMSOURCE17)/core
+endif
+
+OS := $(shell uname -s)
+
+ifeq "$(OS)" "Darwin"
+	LIB_EXT = dylib
+	HL2LIB = $(HL2SDK)/lib/mac
+else
+	LIB_EXT = so
+	ifeq "$(ENGINE)" "original"
+		HL2LIB = $(HL2SDK)/linux_sdk
+	else
+		HL2LIB = $(HL2SDK)/lib/linux
+	endif
+endif
+
+# if ENGINE is orig, OB, or L4D
+ifneq (,$(filter original orangebox left4dead,$(ENGINE)))
+	LIB_SUFFIX = _i486.$(LIB_EXT)
+else
+	LIB_PREFIX = lib
+	LIB_SUFFIX = .$(LIB_EXT)
+endif
+
 ifeq "$(USEMETA)" "true"
-	LINK_HL2 = $(HL2LIB)/tier1_i486.a tier0_i486.so
+	LINK_HL2 = $(LIB_PREFIX)vstdlib$(LIB_SUFFIX) $(LIB_PREFIX)tier0$(LIB_SUFFIX)
 
 	LINK += $(LINK_HL2)
 
 	INCLUDE += -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \
 		-I$(METAMOD) -I$(METAMOD)/sourcehook -I$(SMSDK)/public -I$(SMSDK)/public/extensions \
 		-I$(SMSDK)/public/sourcepawn
-	CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 -DSE_LEFT4DEAD=5
+	CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 \
+		-DSE_LEFT4DEAD=5 -DSE_LEFT4DEAD2=6
 else
 	INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn
 endif
 
 LINK += -m32 -ldl -lm
 
-CFLAGS += -D_LINUX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp \
+CFLAGS += -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp \
-	-D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Werror -mfpmath=sse \
+	-D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Werror \
-	-msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H -m32
+	-mfpmath=sse -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H -m32
 CPPFLAGS += -Wno-non-virtual-dtor -fno-exceptions -fno-rtti
 
 ################################################
 ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ###
 ################################################
 
+BINARY = $(PROJECT).ext.$(GAMEFIX).$(LIB_EXT)
+
 ifeq "$(DEBUG)" "true"
 	BIN_DIR = Debug
 	CFLAGS += $(C_DEBUG_FLAGS)
@@ -112,13 +134,14 @@ ifeq "$(USEMETA)" "true"
 	BIN_DIR := $(BIN_DIR).$(ENGINE)
 endif
 
-OS := $(shell uname -s)
 ifeq "$(OS)" "Darwin"
-	LINK += -dynamiclib
+	LIB_EXT = dylib
-	BINARY = $(PROJECT).ext.$(GAMEFIX).dylib
+	CFLAGS += -isysroot /Developer/SDKs/MacOSX10.5.sdk
+	LINK += -dynamiclib -lstdc++ -mmacosx-version-min=10.5
 else
-	LINK += -static-libgcc -shared
+	LIB_EXT = so
-	BINARY = $(PROJECT).ext.$(GAMEFIX).so
+	CFLAGS += -D_LINUX
+	LINK += -shared
 endif
 
 GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
@@ -127,7 +150,7 @@ ifeq "$(GCC_VERSION)" "4"
 	CPPFLAGS += $(CPP_GCC4_FLAGS)
 endif
 
-OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
+OBJ_BIN := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
 
 $(BIN_DIR)/%.o: %.cpp
 	$(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
@@ -135,18 +158,20 @@ $(BIN_DIR)/%.o: %.cpp
 all: check
 	mkdir -p $(BIN_DIR)/sdk
 	if [ "$(USEMETA)" = "true" ]; then \
-		ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so; \
+		ln -sf $(HL2LIB)/$(LIB_PREFIX)vstdlib$(LIB_SUFFIX); \
+		ln -sf $(HL2LIB)/$(LIB_PREFIX)tier0$(LIB_SUFFIX); \
 	fi
 	$(MAKE) -f Makefile extension
 
 check:
 	if [ "$(USEMETA)" = "true" ] && [ "$(ENGSET)" = "false" ]; then \
-		echo "You must supply ENGINE=left4dead or ENGINE=orangebox or ENGINE=original"; \
+		echo "You must supply one of the following values for ENGINE:"; \
+		echo "left4dead2, left4dead, orangeboxvalve, orangebox, or original"; \
 		exit 1; \
 	fi
 
-extension: check $(OBJ_LINUX)
+extension: check $(OBJ_BIN)
-	$(CPP) $(INCLUDE) $(OBJ_LINUX) $(LINK) -o $(BIN_DIR)/$(BINARY)
+	$(CPP) $(INCLUDE) $(OBJ_BIN) $(LINK) -o $(BIN_DIR)/$(BINARY)
 
 debug:
 	$(MAKE) -f Makefile all DEBUG=true

extensions/cstrike/extension.cpp

@@ -76,11 +76,6 @@ bool CStrike::SDK_OnLoad(char *error, size_t maxlength, bool late)
 	sharesys->AddNatives(myself, g_CSNatives);
 	sharesys->RegisterLibrary(myself, "cstrike");
 
-	if ((g_msgHintText = usermsgs->GetMessageIndex("HintText")) != -1)
-	{
-		sharesys->OverrideNatives(myself, g_CS_PrintHintText);
-	}
-
 	playerhelpers->RegisterCommandTargetProcessor(this);
 
 	return true;

extensions/cstrike/extension.h

@@ -130,6 +130,5 @@ public:
 extern IBinTools *g_pBinTools;
 extern IGameConfig *g_pGameConf;
 extern int g_msgHintText;
-extern sp_nativeinfo_t g_CS_PrintHintText[];
 
 #endif // _INCLUDE_SOURCEMOD_EXTENSION_PROPER_H_

extensions/cstrike/msvc9/cstrike.sln

@@ -8,9 +8,11 @@ Global
 		Debug - Episode1|Win32 = Debug - Episode1|Win32
 		Debug - Old Metamod|Win32 = Debug - Old Metamod|Win32
 		Debug - Orange Box|Win32 = Debug - Orange Box|Win32
+		Debug - Orange Box Valve|Win32 = Debug - Orange Box Valve|Win32
 		Release - Episode 1|Win32 = Release - Episode 1|Win32
 		Release - Old Metamod|Win32 = Release - Old Metamod|Win32
 		Release - Orange Box|Win32 = Release - Orange Box|Win32
+		Release - Orange Box Valve|Win32 = Release - Orange Box Valve|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Episode1|Win32.ActiveCfg = Debug - Episode1|Win32
@@ -19,12 +21,16 @@ Global
 		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Old Metamod|Win32.Build.0 = Debug - Old Metamod|Win32
 		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Orange Box|Win32.ActiveCfg = Debug - Orange Box|Win32
 		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Orange Box|Win32.Build.0 = Debug - Orange Box|Win32
+		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Orange Box Valve|Win32.ActiveCfg = Debug - Orange Box Valve|Win32
+		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Orange Box Valve|Win32.Build.0 = Debug - Orange Box Valve|Win32
 		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Episode 1|Win32.ActiveCfg = Release - Episode 1|Win32
 		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Episode 1|Win32.Build.0 = Release - Episode 1|Win32
 		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Old Metamod|Win32.ActiveCfg = Release - Old Metamod|Win32
 		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Old Metamod|Win32.Build.0 = Release - Old Metamod|Win32
 		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Orange Box|Win32.ActiveCfg = Release - Orange Box|Win32
 		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Orange Box|Win32.Build.0 = Release - Orange Box|Win32
+		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Orange Box Valve|Win32.ActiveCfg = Release - Orange Box Valve|Win32
+		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Orange Box Valve|Win32.Build.0 = Release - Orange Box Valve|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

extensions/cstrike/msvc9/cstrike.vcproj

@@ -343,6 +343,169 @@
 			/>
 		</Configuration>
 		<Configuration
+			Name="Debug - Orange Box Valve|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;&quot;$(HL2SDKOBVALVE)\public&quot;;&quot;$(HL2SDKOBVALVE)\public\game\server&quot;;&quot;$(HL2SDKOBVALVE)\public\engine&quot;;&quot;$(HL2SDKOBVALVE)\public\tier0&quot;;&quot;$(HL2SDKOBVALVE)\public\tier1&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				EnableEnhancedInstructionSet="0"
+				RuntimeTypeInfo="false"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="&quot;$(HL2SDKOBVALVE)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOBVALVE)\lib\public\tier1.lib&quot;"
+				OutputFile="$(OutDir)\game.cstrike.ext.2.ep2v.dll"
+				LinkIncremental="2"
+				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release - Orange Box Valve|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;&quot;$(HL2SDKOBVALVE)\public&quot;;&quot;$(HL2SDKOBVALVE)\public\game\server&quot;;&quot;$(HL2SDKOBVALVE)\public\engine&quot;;&quot;$(HL2SDKOBVALVE)\public\tier0&quot;;&quot;$(HL2SDKOBVALVE)\public\tier1&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
+				RuntimeLibrary="0"
+				EnableEnhancedInstructionSet="0"
+				RuntimeTypeInfo="false"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="&quot;$(HL2SDKOBVALVE)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOBVALVE)\lib\public\tier1.lib&quot;"
+				OutputFile="$(OutDir)\game.cstrike.ext.2.ep2v.dll"
+				LinkIncremental="1"
+				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration		
 			Name="Debug - Episode1|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"

extensions/cstrike/natives.cpp

@@ -71,45 +71,6 @@ inline CBaseEntity *GetCBaseEntity(int num, bool isplayer)
 	return pUnk->GetBaseEntity();
 }
 
-static cell_t CS_PrintHintText(IPluginContext *pContext, const cell_t *params)
-{
-	int client = params[1];
-	IGamePlayer *pPlayer = playerhelpers->GetGamePlayer(params[1]);
-
-	if (!pPlayer)
-	{
-		return pContext->ThrowNativeError("Client index %d is invalid", client);
-	}
-
-	if (!pPlayer->IsInGame())
-	{
-		return pContext->ThrowNativeError("Client %d is not in game", client);
-	}
-
-	g_pSM->SetGlobalTarget(client);
-
-	char buffer[192];
-	g_pSM->FormatString(buffer, sizeof(buffer), pContext, params, 2);
-
-	/* Check for an error before printing to the client */
-	if (pContext->GetLastNativeError() != SP_ERROR_NONE)
-	{
-		return 0;
-	}
-
-	bf_write *pBitBuf = usermsgs->StartMessage(g_msgHintText, &params[1], 1, USERMSG_RELIABLE);
-	if (pBitBuf == NULL)
-	{
-		return pContext->ThrowNativeError("Could not send a usermessage");
-	}
-	pBitBuf->WriteByte(1);
-	pBitBuf->WriteString(buffer);
-	usermsgs->EndMessage();
-
-	return 1;
-}
-
-
 static cell_t CS_RespawnPlayer(IPluginContext *pContext, const cell_t *params)
 {
 	static ICallWrapper *pWrapper = NULL;
@@ -166,8 +127,3 @@ sp_nativeinfo_t g_CSNatives[] =
 	{NULL,							NULL}
 };
 
-sp_nativeinfo_t g_CS_PrintHintText[] = 
-{
-	{"PrintHintText",				CS_PrintHintText},
-	{NULL,							NULL},
-};

extensions/sdktools/output.cpp

@@ -217,6 +217,11 @@ void EntityOutputManager::FireEventDetour(void *pOutput, CBaseEntity *pActivator
 	{
 		const char *classname = GetEntityClassname(pCaller);
 		const char *outputname = FindOutputName(pOutput, pCaller);
+		
+		if (!outputname)
+		{
+			return;
+		}
 
 		pOutputName = FindOutputPointer(classname, outputname, false);
 

extensions/sdktools/vhelpers.cpp

@@ -811,6 +811,11 @@ CON_COMMAND(sm_dump_datamaps, "Dumps the data map list as a text file")
 
 		typedescription_t *datamap = gamehelpers->FindInDataMap(pMap, "m_iEFlags");
 		
+		if (!datamap)
+		{
+			continue;
+		}
+		
 		int *eflags = (int *)((char *)entity->GetBaseEntity() + datamap->fieldOffset[TD_OFFSET_NORMAL]);
 		*eflags |= (1<<0); // EFL_KILLME
 	}

extensions/sdktools/voice.cpp

@@ -199,13 +199,13 @@ void SDKTools::OnClientDisconnecting(int client)
 			g_VoiceMap[i][client] = Listen_Default;
 			if (DecHookCount())
 			{
-				return;
+				break;
 			}
 		}
 	}
 
-	/* Reset this client's mutes, just in case */
+	/* Reset this client's mutes */
-	memset(&g_ClientMutes[client], 0, sizeof(int) * 65);
+	memset(&g_ClientMutes[client], 0, sizeof(bool) * 65);
 
 	/* Reset other clients who send to this client */
 	if (g_ClientOverrides[client] > 0)
@@ -213,7 +213,6 @@ void SDKTools::OnClientDisconnecting(int client)
 		DecHookCount(g_ClientOverrides[client]);
 		g_ClientOverrides[client] = 0;
 		memset(&g_VoiceMap[client], false, sizeof(ListenOverride) * 65);
-		memset(&g_ClientMutes[client], false, sizeof(bool) * 65);
 	}
 
 	if (g_VoiceFlags[client])

gamedata/core.games/common.games.txt

@@ -139,6 +139,7 @@
 			"game"					"FortressForever"
 			"game"					"zps"
 			"game"					"gesource"
+			"game"					"RnLBeta"
 		}
 
 		"Keys"
@@ -164,6 +165,8 @@
 			"game"					"zps"
 			"game"					"gesource"
 			"game"					"obsidian"
+			"game"					"cstrike"
+			"game"					"RnLBeta"
 		}
 		
 		"Keys"
@@ -191,6 +194,7 @@
 			"game"					"pvkii"
 			"game"					"zps"
 			"game"					"gesource"
+			"game"					"RnLBeta"
 		}
 		
 		"Keys"
@@ -199,12 +203,16 @@
 		}
 	}
 
-	"cstrike"
+	"#default"
 	{
+		"#supported"
+		{
+			"game"		"cstrike"
+		}
+		
 		"Keys"
 		{
-			"HintTextPreByte"		"yes"
+			"GameExtension"		"game.cstrike"
-			"GameExtension"			"game.cstrike"
 		}
 	}
 

gamedata/core.games/engine.ep1.txt

@@ -16,7 +16,6 @@
 	{
 		"#supported"
 		{
-			"game"		"cstrike"
 			"game"		"hl2mp"
 			"game"		"ship"
 			"game"		"insurgency"

gamedata/core.games/engine.ep2.txt

@@ -22,6 +22,9 @@
 			"game"		"garrysmod"
 			"game"		"pvkii"
 			"game"		"gesource"
+			"game"		"empires"
+			"game"		"RnLBeta"
+			"game"		"obsidian"
 		}
 		
 		"Offsets"

gamedata/core.games/engine.ep2valve.txt

@@ -18,6 +18,7 @@
 		{
 			"game"		"dod"
 			"game"		"tf"
+			"game"		"cstrike"
 		}
 		
 		"Offsets"

gamedata/sdktools.games/engine.ep1.txt

@@ -16,7 +16,6 @@
 	{
 		"#supported"
 		{
-			"game"		"cstrike"
 			"game"		"hl2mp"
 			"game"		"ship"
 			"game"		"!Dystopia"
@@ -74,7 +73,6 @@
 	{
 		"#supported"
 		{
-			"game"		"cstrike"
 			"game"		"garrysmod"
 			"game"		"hl2mp"
 			"game"		"ship"
@@ -123,7 +121,6 @@
 	{
 		"#supported"
 		{
-			"game"		"cstrike"
 			"game"		"garrysmod"
 			"game"		"hl2mp"
 			"game"		"ship"
@@ -152,7 +149,6 @@
 	{
 		"#supported"
 		{
-			"game"		"cstrike"
 			"game"		"hl2mp"
 			"game"		"sourceforts"
 			"game"		"synergy"
@@ -232,9 +228,9 @@
 	{
 		"#supported"
 		{
-			"game"		"cstrike"
 			"game"		"hl2mp"
 			"game"		"NeotokyoSource"
+			"game"		"zombie_master"
 		}
 		"Signatures"
 		{

gamedata/sdktools.games/engine.ep2.txt

@@ -24,7 +24,6 @@
 			"game"		"garrysmod"
 			"game"		"pvkii"
 			"game"		"gesource"
-			"game"		"obsidian"
 		}
 
 		"Offsets"
@@ -128,6 +127,8 @@
 			"game"		"garrysmod"
 			"game"		"pvkii"
 			"game"		"gesource"
+			"game"		"RnLBeta"
+			"game"		"obsidian"
 		}
 		
 		"Offsets"

gamedata/sdktools.games/engine.ep2valve.txt

@@ -18,6 +18,7 @@
 		{
 			"game"		"dod"
 			"game"		"tf"
+			"game"		"cstrike"
 		}
 
 		"Offsets"
@@ -66,6 +67,7 @@
 		{
 			"game"		"dod"
 			"game"		"tf"
+			"game"		"cstrike"
 		}
 
 		"Signatures"
@@ -92,6 +94,7 @@
 		{
 			"game"		"dod"
 			"game"		"tf"
+			"game"		"cstrike"
 		}
 		
 		"Signatures"
@@ -113,6 +116,7 @@
 		{
 			"game"		"dod"
 			"game"		"tf"
+			"game"		"cstrike"
 		}
 		
 		"Offsets"
@@ -204,6 +208,7 @@
 		{
 			"game"		"dod"
 			"game"		"tf"
+			"game"		"cstrike"
 		}
 		"Signatures"
 		{

gamedata/sdktools.games/game.cstrike.txt

@@ -26,88 +26,88 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"329"
+				"windows"	"386"
-				"linux"		"330"
+				"linux"		"387"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"226"
+				"windows"	"259"
-				"linux"		"227"
+				"linux"		"260"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"224"
+				"windows"	"257"
-				"linux"		"225"
+				"linux"		"258"
 			}
 			"Ignite"
 			{
-				"windows"	"188"
+				"windows"	"202"
-				"linux"		"189"
+				"linux"		"203"
 			}
 			"Extinguish"
 			{
-				"windows"	"189"
+				"windows"	"206"
-				"linux"		"190"
+				"linux"		"207"
 			}
 			"Teleport"
 			{
-				"windows"	"98"
+				"windows"	"105"
-				"linux"		"99"
+				"linux"		"106"
 			}
 			"CommitSuicide"
 			{
-				"windows"	"357"
+				"windows"	"426"
-				"linux"		"358"
+				"linux"		"426"
 			}
 			"GetVelocity"
 			{
-				"windows"	"126"
+				"windows"	"137"
-				"linux"		"127"
+				"linux"		"138"
 			}
 			"EyeAngles"
 			{
-				"windows"	"118"
+				"windows"	"128"
-				"linux"		"119"
+				"linux"		"129"
 			}
 			"AcceptInput"
 			{
-				"windows"	"35"
+				"windows"	"34"
-				"linux"		"36"
+				"linux"		"35"
 			}
 			"DispatchKeyValue"
 			{
-				"windows"	"31"
+				"windows"	"29"
-				"linux"		"30"
+				"linux"		"28"
 			}
 			"DispatchKeyValueFloat"
 			{
-				"windows"	"30"
+				"windows"	"28"
-				"linux"		"31"
+				"linux"		"29"
 			}
 			"DispatchKeyValueVector"
 			{
-				"windows"	"29"
+				"windows"	"27"
-				"linux"		"32"
+				"linux"		"30"
 			}
 			"SetEntityModel"
 			{
-				"windows"	"25"
+				"windows"	"23"
-				"linux"		"26"
+				"linux"		"24"
 			}
 			"WeaponEquip"
 			{
-				"windows"	"217"
+				"windows"	"250"
-				"linux"		"218"
+				"linux"		"251"
 			}
 			"Activate"
 			{
-				"windows"	"32"
+				"windows"	"31"
-				"linux"		"33"
+				"linux"		"32"
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"347"
+				"windows"	"404"
-				"linux"		"348"
+				"linux"		"405"
 			}
 		}
 	}

gamedata/sdktools.games/game.empires.txt

@@ -11,7 +11,7 @@
 
 "Games"
 {
-	/* Empires 2.25 */
+	/* Empires 2.25b */
 	"empires"
 	{
 
@@ -19,48 +19,48 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"354"
+				"windows"	"353"
-				"linux"		"355"
+				"linux"		"354"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"241"
+				"windows"	"240"
-				"linux"		"242"
+				"linux"		"241"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"239"
+				"windows"	"238"
-				"linux"		"240"
+				"linux"		"239"
 			}
 			"Ignite"
 			{
-				"windows"	"196"
+				"windows"	"195"
-				"linux"		"197"
+				"linux"		"196"
 			}
 			"Extinguish"
 			{
-				"windows"	"200"
+				"windows"	"199"
-				"linux"		"201"
+				"linux"		"200"
 			}
 			"Teleport"
 			{
-				"windows"	"104"
+				"windows"	"103"
-				"linux"		"105"
+				"linux"		"104"
 			}
 			"CommitSuicide"
 			{
-				"windows"	"401"
+				"windows"	"392"
-				"linux"		"402"
+				"linux"		"392"
 			}
 			"GetVelocity"
 			{
-				"windows"	"133"
+				"windows"	"132"
-				"linux"		"134"
+				"linux"		"133"
 			}
 			"EyeAngles"
 			{
-				"windows"	"125"
+				"windows"	"124"
-				"linux"		"126"
+				"linux"		"125"
 			}
 			"DispatchKeyValue"
 			{
@@ -79,33 +79,28 @@
 			}
 			"AcceptInput"
 			{
-				"windows"	"35"
+				"windows"	"34"
-				"linux"		"36"
+				"linux"		"35"
 			}
 			"Activate"
 			{
 				"windows"	"31"
 				"linux"		"32"
 			}
-			"TakeHealth"
-			{
-				"windows"	"62"
-				"linux"		"63"
-			}
-			"ChangeTeam"
-			{
-				"windows"	"87"
-				"linux"		"88"
-			}
 			"SetEntityModel"
 			{
 				"windows"	"23"
 				"linux"		"24"
 			}
+			"WeaponEquip"
+			{
+				"windows"	"231"
+				"linux"		"232"
+			}
 			"PlayerRunCmd"
 			{
-				"windows"	"373"
+				"windows"	"372"
-				"linux"		"374"
+				"linux"		"373"
 			}
 			"FireOutputBackup"
 			{

gamedata/sdktools.games/game.obsidian.txt

@@ -11,90 +11,128 @@
 
 "Games"
 {
-	/* Obsidian Conflict 1.3 */
+	/* Obsidian Conflict 1.35 */
 	"obsidian"
 	{
 		"Offsets"
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"350"
+				"windows"	"351"
-				"linux"		"351"
 			}
 			"RemovePlayerItem"
 			{
 				"windows"	"237"
-				"linux"		"238"
 			}
 			"Weapon_GetSlot"
 			{
 				"windows"	"235"
-				"linux"		"236"
 			}
 			"Ignite"
 			{
 				"windows"	"190"
-				"linux"		"191"
 			}
 			"Extinguish"
 			{
 				"windows"	"194"
-				"linux"		"195"
 			}
 			"Teleport"
 			{
 				"windows"	"100"
-				"linux"		"101"
 			}
 			"CommitSuicide"
 			{
-				"windows"	"395"
+				"windows"	"396"
-				"linux"		"395"
 			}
 			"GetVelocity"
 			{
 				"windows"	"127"
-				"linux"		"128"
 			}
 			"EyeAngles"
 			{
 				"windows"	"119"
-				"linux"		"120"
 			}
 			"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"	"228"
-				"linux"		"229"
 			}
 			"Activate"
 			{
 				"windows"	"31"
-				"linux"		"32"
+			}
+			"PlayerRunCmd"
+			{
+				"windows"	"371"
+			}
+			
+			/* Offset into CBaseTempEntity constructor (vs2010 moved it!) */
+			"s_pTempEntities"
+			{
+				"windows"	"19"
+			}
+			"GetTEName"
+			{
+				"windows"	"4"
+			}
+			"GetTENext"
+			{
+				"windows"	"8"
+			}
+			"TE_GetServerClass"
+			{
+				"windows"	"0"
+			}
+			"FireOutputBackup"
+			{
+				"windows"	"9"
+			}
+		}
+		"Signatures"
+		{
+			"CBaseTempEntity"
+			{
+				"library"	"server"
+				"windows"	"\x55\x8B\xEC\x8B\xC1\x8B\x2A\x2A\xC7\x2A\x2A\x2A\x2A\x2A\x89\x2A\x2A\x8B\x15\x2A\x2A\x2A\x2A\x89"
+			}
+			"DispatchSpawn"
+			{
+				"library"	"server"
+				"windows"	"\x55\x8B\xEC\x51\x53\x56\x8B\x75\x2A\x57\x85\xF6\x0F\x2A\x2A\x2A\x2A\x2A\x8B\x2A\x2A\x2A\x2A\x2A\x8B\x2A\x8B"
+			}
+			"CreateEntityByName"
+			{
+				"library"	"server"
+				"windows"	"\x55\x8B\xEC\x56\x8B\x2A\x2A\x57\x8B\x2A\x2A\x83\x2A\x2A\x74\x2A\x8B\x2A\x2A\x2A\x2A\x2A\x8B\x01\x8B\x50\x2A\x56\xFF\xD2"
+			}
+			"FindEntityByClassname"
+			{
+				"library"	"server"
+				"windows"	"\x55\x8B\xEC\x53\x56\x8B\xF1\x8B\x2A\x2A\x57\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x2A\xFF\xD2\x8B\x00\x25\x2A\x2A\x2A\x2A\x40\x03\xC0\x8B\x3C\xC6\xEB\x2A\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74"
+			}
+			"FireOutput"
+			{
+				"library"	"server"
+				"windows"	"\x55\x8B\xEC\x81\xEC\x2A\x2A\x2A\x2A\x53\x56\x8B\x2A\x2A\x57\x89"
 			}
 		}
 	}

gamedata/sdktools.games/game.rnlbeta.txt

@@ -0,0 +1,128 @@
+"Games"
+{
+	/* Resistance and Liberation Open Beta 1.1 */
+	"RnLBeta"
+	{
+		"Offsets"
+		{
+			"GiveNamedItem"
+			{
+				"windows"	"356"
+			}
+			"RemovePlayerItem"
+			{
+				"windows"	"238"
+			}
+			"Weapon_GetSlot"
+			{
+				"windows"	"236"
+			}
+			"Ignite"
+			{
+				"windows"	"193"
+			}
+			"Extinguish"
+			{
+				"windows"	"197"
+			}
+			"Teleport"
+			{
+				"windows"	"100"
+			}
+			"CommitSuicide"
+			{
+				"windows"	"397"
+			}
+			"GetVelocity"
+			{
+				"windows"	"130"
+			}
+			"EyeAngles"
+			{
+				"windows"	"122"
+			}
+			"AcceptInput"
+			{
+				"windows"	"34"
+			}
+			"DispatchKeyValue"
+			{
+				"windows"	"29"
+			}
+			"DispatchKeyValueFloat"
+			{
+				"windows"	"28"
+			}
+			"DispatchKeyValueVector"
+			{
+				"windows"	"27"
+			}
+			"SetEntityModel"
+			{
+				"windows"	"23"
+			}
+			"WeaponEquip"
+			{
+				"windows"	"229"
+			}
+			"Activate"
+			{
+				"windows"	"31"
+			}
+			"PlayerRunCmd"
+			{
+				"windows"	"376"
+			}
+			
+			/* Offset into CBaseTempEntity constructor (vs2010 moved it!) */
+			"s_pTempEntities"
+			{
+				"windows"	"19"
+			}
+			"GetTEName"
+			{
+				"windows"	"4"
+			}
+			"GetTENext"
+			{
+				"windows"	"8"
+			}
+			"TE_GetServerClass"
+			{
+				"windows"	"0"
+			}
+			"FireOutputBackup"
+			{
+				"windows"	"9"
+			}
+		}
+		"Signatures"
+		{
+			"CBaseTempEntity"
+			{
+				"library"	"server"
+				"windows"	"\x55\x8B\xEC\x8B\xC1\x8B\x2A\x2A\xC7\x2A\x2A\x2A\x2A\x2A\x89\x2A\x2A\x8B\x15\x2A\x2A\x2A\x2A\x89"
+			}
+			"DispatchSpawn"
+			{
+				"library"	"server"
+				"windows"	"\x55\x8B\xEC\x51\x53\x56\x8B\x75\x2A\x57\x85\xF6\x0F\x2A\x2A\x2A\x2A\x2A\x8B\x2A\x2A\x2A\x2A\x2A\x8B\x2A\x8B"
+			}
+			"CreateEntityByName"
+			{
+				"library"	"server"
+				"windows"	"\x55\x8B\xEC\x56\x8B\x2A\x2A\x57\x8B\x2A\x2A\x83\x2A\x2A\x74\x2A\x8B\x2A\x2A\x2A\x2A\x2A\x8B\x01\x8B\x50\x2A\x56\xFF\xD2"
+			}
+			"FindEntityByClassname"
+			{
+				"library"	"server"
+				"windows"	"\x55\x8B\xEC\x53\x56\x8B\xF1\x8B\x2A\x2A\x57\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x2A\xFF\xD2\x8B\x00\x25\x2A\x2A\x2A\x2A\x40\x03\xC0\x8B\x3C\xC6\xEB\x2A\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74"
+			}
+			"FireOutput"
+			{
+				"library"	"server"
+				"windows"	"\x81\xEC\x1C\x01\x00\x00\x53\x55\x56\x8B\x71\x14\x85\xF6"
+			}
+		}
+	}
+}

gamedata/sdktools.games/game.sourceforts.txt

@@ -12,7 +12,7 @@
 "Games"
 {
 	/* SourceForts */
-	"SourceForts"
+	"sourceforts"
 	{
 		"Offsets"
 		{
@@ -97,6 +97,11 @@
 				"windows"	"32"
 				"linux"		"33"
 			}
+			"PlayerRunCmd"
+			{
+				"windows"	"346"
+				"linux"		"347"
+			}
 		}
 	}
 }

gamedata/sdktools.games/game.zm.txt

@@ -101,6 +101,11 @@
 				"windows"	"32"
 				"linux"		"33"
 			}
+			"PlayerRunCmd"
+			{
+				"windows"	"347"
+				"linux"		"348"
+			}
 		}
 
 		"Signatures"

gamedata/sdktools.games/master.games.txt

@@ -150,4 +150,8 @@
 	{
 		"game"		"gesource"
 	}
+	"game.rnlbeta.txt"
+	{
+		"game"		"RnLBeta"
+	}
 }

gamedata/sm-cstrike.games.txt

@@ -18,13 +18,13 @@
 			"RoundRespawn"
 			{
 				"library"	"server"
-				"windows"	"\x56\x8B\xF1\x8B\x06\xFF\x90\x2A\x04\x00\x00\x8B\x86\x2A\x0D\x00"
+				"windows"	"\x56\x8B\xF1\x8B\x06\x8B\x2A\x2A\x2A\x2A\x2A\xFF\xD2\x8B\x2A\x2A\x2A\x2A\x2A\x85"
 				"linux"		"@_ZN9CCSPlayer12RoundRespawnEv"
 			}
 			"SwitchTeam"
 			{
 				"library"	"server"
-				"windows"	"\x83\xEC\x10\x56\x57\x8B\x7C\x24\x1C\x57\x8B\xF1\xE8\x2A\x2A\x2A\x2A\x83\xC4\x04\x85\xC0\x0F\x84\xEA\x00\x00\x00\x83\xFF\x03\x74\x09\x83\xFF\x02\x0F\x85\xDC\x00\x00\x00\x8B\xCE\xE8\x2A\x2A\x2A\x2A\x3B\xF8\x0F\x84\xDC\x00\x00\x00\x57\x8B\xCE\xC6\x86\x2A\x2A"
+				"windows"	"\x83\xEC\x10\x56\x57\x8B\x7C\x24\x1C\x57\x8B\xF1\xE8\x2A\x2A\x2A\x2A\x83\xC4\x04\x85\xC0\x0F\x2A\x2A\x2A\x2A\x2A\x83\xFF\x03\x74\x09\x83\xFF\x02\x0F\x2A\x2A\x2A\x2A\x2A\x8B\xCE\xE8\x2A\x2A\x2A\x2A\x3B"
 				"linux"		"@_ZN9CCSPlayer10SwitchTeamEi"
 			}
 		}

gamedata/sm-tf2.games.txt

@@ -18,7 +18,7 @@
 			"Burn"
 			{
 				"library"	"server"
-				"windows"	"\x56\x8B\xF1\x8B\x8E\x2A\x2A\x00\x00\x8B\x01\x8B\x90\x2A\x2A\x00\x00\xFF\xD2\x84\xC0"
+				"windows"	"\x56\x8B\xF1\x8B\x8E\x2A\x2A\x00\x00\x8B\x01\x8B\x90\x2A\x2A\x00\x00\xFF\xD2\x84\xC0\x0F\x2A\x2A\x2A\x2A\x2A\x8B"
 				"linux"		"@_ZN15CTFPlayerShared4BurnEP9CTFPlayerP13CTFWeaponBase"
 			}
 			"RemoveDisguise"

plugins/basetriggers.sp

@@ -210,6 +210,12 @@ public Action:Command_Nextmap(client, args)
 
 public Action:Command_Motd(client, args)
 {
+	if (client == 0)
+	{
+		ReplyToCommand(client, "[SM] %t", "Command is in-game only");
+		return Plugin_Handled;
+	}
+
 	ShowMOTDPanel(client, "Message Of The Day", "motd", MOTDPANEL_TYPE_INDEX);
 
 	return Plugin_Handled;

plugins/include/adt_array.inc

@@ -199,7 +199,7 @@ native GetArrayArray(Handle:array, index, any:buffer[], size=-1);
  * @noreturn
  * @error				Invalid Handle, invalid index, or invalid block.
  */
-native any:SetArrayCell(Handle:array, index, any:value, block=0, bool:asChar=false);
+native SetArrayCell(Handle:array, index, any:value, block=0, bool:asChar=false);
 
 /**
  * Sets a string value in an array.

plugins/include/console.inc

@@ -839,7 +839,11 @@ native RemoveServerTag(const String:tag[]);
 /**
  * Callback for command listeners. This is invoked whenever any command
  * reaches the server, from the server console itself or a player.
-
+ *
+ * Clients may be in the process of connecting when they are executing commands
+ * IsClientConnected(client) is not guaranteed to return true.  Other functions
+ * such as GetClientIP() may not work at this point either.
+ *
  * Returning Plugin_Handled or Plugin_Stop will prevent the original,
  * baseline code from running.
  *
@@ -849,8 +853,8 @@ native RemoveServerTag(const String:tag[]);
  *  * C++ command dispatch hooks from Metamod:Source plugins
  *  * Reg*Cmd() hooks that did not create new commands.
  *
- * @param client        Client, or 0 for server. Client will be connected but
+ * @param client        Client, or 0 for server.
- *                      not necessarily in game.
+ *                      Client may not be connected or in game.
  * @param command       Command name, lower case. To get name as typed, use
  *                      GetCmdArg() and specify argument 0.
  * @param argc          Argument count.

plugins/include/tf2.inc

@@ -92,6 +92,7 @@ enum TFCond
 	TFCond_Buffed,
 	TFCond_Charging,
 	TFCond_DemoBuff,
+	TFCond_CritCola,
 	TFCond_Healing,
 	TFCond_OnFire,
 	TFCond_Overhealed,
@@ -230,10 +231,27 @@ public Extension:__ext_tf2 =
 {
 	name = "TF2 Tools",
 	file = "game.tf2.ext",
-	autoload = 1,
+	autoload = 0,
 #if defined REQUIRE_EXTENSIONS
 	required = 1,
 #else
 	required = 0,
 #endif
 };
+
+#if !defined REQUIRE_EXTENSIONS
+public __ext_tf2_SetNTVOptional()
+{
+	MarkNativeAsOptional("TF2_IgnitePlayer");
+	MarkNativeAsOptional("TF2_RespawnPlayer");
+	MarkNativeAsOptional("TF2_RegeneratePlayer");
+	MarkNativeAsOptional("TF2_AddCondition");
+	MarkNativeAsOptional("TF2_RemoveCondition");
+	MarkNativeAsOptional("TF2_SetPlayerPowerPlay");
+	MarkNativeAsOptional("TF2_DisguisePlayer");
+	MarkNativeAsOptional("TF2_RemovePlayerDisguise");
+	MarkNativeAsOptional("TF2_StunPlayer");
+	MarkNativeAsOptional("TF2_GetResourceEntity");
+	MarkNativeAsOptional("TF2_GetClass");
+}
+#endif

plugins/include/tf2_stocks.inc

@@ -56,10 +56,11 @@
 #define TF_CONDFLAG_BUFFED          (1 << 16)
 #define TF_CONDFLAG_CHARGING        (1 << 17)
 #define TF_CONDFLAG_DEMOBUFF        (1 << 18)
-#define TF_CONDFLAG_HEALING         (1 << 19)
+#define TF_CONDFLAG_CRITCOLA        (1 << 19)
-#define TF_CONDFLAG_ONFIRE          (1 << 20)
+#define TF_CONDFLAG_HEALING         (1 << 20)
-#define TF_CONDFLAG_OVERHEALED      (1 << 21)
+#define TF_CONDFLAG_ONFIRE          (1 << 21)
-#define TF_CONDFLAG_JARATED         (1 << 22)
+#define TF_CONDFLAG_OVERHEALED      (1 << 22)
+#define TF_CONDFLAG_JARATED         (1 << 23)
 
 #define TF_DEATHFLAG_KILLERDOMINATION   (1 << 0)
 #define TF_DEATHFLAG_ASSISTERDOMINATION (1 << 1)

plugins/include/version.inc

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

product.version

@@ -1 +1 @@
-1.3.2
+1.3.3

pushbuild.txt

@@ -18,3 +18,6 @@ joys of buildbot, part nana: if you don't do as you are told, buildbot-san, you
 DS saves us from Valve again.
 Invaders' blood marches through my veins, like GIANT RADIOACTIVE RUBBER PANTS!
  THE PANTS COMMAND COMMAND ME! DO NOT IGNORE MY VEINS.
+This text is written in invisible ink.
+
+o

sourcepawn/compiler/sc1.c

@@ -2341,7 +2341,10 @@ static int declloc(int fstatic)
           stradjust(sPRI);
         }
         pushreg(sPRI);
+		/* No idea why this is here, but it throws away dimension info which
+		   would otherwise be used by addvariable2 below.  
         memset(dim, 0, sizeof(int)*sDIMEN_MAX);
+		*/
         ident = iREFARRAY;
         genarray(numdim, autozero);
       }

sourcepawn/jit/x86/jit_x86.cpp

@@ -1733,13 +1733,8 @@ inline void WriteOp_Switch(JitWriter *jit)
 			for (cell_t i=0; i<num_cases; i++)
 			{
 				val = cases[i].val;
-				//cmp eax, <val> OR cmp al, <val>
+				//cmp eax, <val>
-				if (val >= SCHAR_MIN && val <= SCHAR_MAX)
+				IA32_Cmp_Eax_Imm32(jit, val);
-				{
-					IA32_Cmp_Al_Imm8(jit, val);
-				} else {
-					IA32_Cmp_Eax_Imm32(jit, cases[i].val);
-				}
 				IA32_Jump_Cond_Imm32_Rel(jit, CC_E, RelocLookup(jit, cases[i].offs, false));
 			}
 			/* After all this, jump to the default case! */

tools/buildbot/PackageScript

@@ -209,7 +209,7 @@ AddNormalLibrary('sourcepawn.jit.x86', 'bin')
 AddNormalLibrary('geoip.ext', 'extensions')
 AddNormalLibrary('dbi.mysql.ext', 'extensions')
 AddNormalLibrary('dbi.sqlite.ext', 'extensions')
-AddNormalLibrary('game.cstrike.ext.1.ep1', 'extensions')
+AddNormalLibrary('game.cstrike.ext.2.ep2v', 'extensions')
 AddNormalLibrary('game.tf2.ext.2.ep2v', 'extensions')
 AddNormalLibrary('topmenus.ext', 'extensions')
 AddNormalLibrary('regex.ext', 'extensions')