Final 1.2.4 checkin.

.hgtags

@@ -3,3 +3,6 @@ e6ef5ecdf8d75740ca2685a709bf321f8873bc3b sourcemod-1.1.0
 e877885fac80be71822641f7a9122cebc9812521 sourcemod-1.1.1
 b3ffa8a4511c4eadaf533fc790aa6b14f7f0c6ea sourcemod-1.1.2
 3a73bbf60f34befa9b66be03fa5974b394bb3411 sourcemod-1.2.0
+3c30a59c2296a13284a9f4eb42863b47db645adf sourcemod-1.2.1
+f55c735efeefe68863b96713fcd55a7774d8ceab sourcemod-1.2.2
+236a032c2a4da8f0af24b56b0539b1c574379be8 sourcemod-1.2.3

AMBuildScript

@@ -0,0 +1,288 @@
+# vim: set ts=2 sw=2 tw=99 noet ft=python:
+import os
+import sys
+from ambuild.command import SymlinkCommand
+
+class SM:
+	def __init__(self):
+		self.compiler = Cpp.Compiler()
+
+		#Build SDK info
+		self.sdkInfo = { }
+		self.sdkInfo['ep1'] =   {'sdk': 'HL2SDK',        'ext': '1.ep1',   'def': '1',
+		                         'name': 'EPISODEONE'}
+		self.sdkInfo['ep2'] =   {'sdk': 'HL2SDKOB',      'ext': '2.ep2',   'def': '3',
+		                         'name': 'ORANGEBOX'}
+		self.sdkInfo['ep2v'] =  {'sdk': 'HL2SDKOBVALVE', 'ext': '2.ep2v',  'def': '4',
+		                         'name': 'ORANGEBOXVALVE'}
+		self.sdkInfo['l4d'] =   {'sdk': 'HL2SDKL4D',     'ext': '2.l4d',   'def': '5',
+		                         'name': 'LEFT4DEAD'}
+		if AMBuild.target['platform'] == 'windows':
+			self.sdkInfo['darkm'] = {'sdk': 'HL2SDK-DARKM',  'ext': '2.darkm', 'def': '2',
+		                           'name': 'DARKMESSIAH'}
+
+		if AMBuild.mode == 'config':
+			#Detect compilers
+			self.compiler.DetectAll(AMBuild)
+
+			#Detect variables
+			envvars = { 'MMSOURCE17':    'mmsource-1.7',
+									'HL2SDK':        'hl2sdk',
+									'HL2SDKOB':      'hl2sdk-ob',
+									'HL2SDKL4D':     'hl2sdk-l4d',
+									'HL2SDKOBVALVE': 'hl2sdk-ob-valve',
+									'MYSQL5':        'mysql-5.0'
+			}
+
+			#Dark Messiah is Windows-only
+			if AMBuild.target['platform'] == 'windows':
+				envvars['HL2SDK-DARKM'] = 'hl2sdk-darkm'
+
+			#Must have a path for each envvar (file a bug if you don't like this)
+			for i in envvars:
+				if i in os.environ:
+					path = os.environ[i]
+					if not os.path.isdir(path):
+						raise Exception('Path for {0} was not found: {1}'.format(i, path))
+				else:
+					head = os.getcwd()
+					while head != None and head != '/':
+						path = os.path.join(head, envvars[i])
+						if os.path.isdir(path):
+							break
+						head, tail = os.path.split(head)
+					if head == None or head == '/':
+						raise Exception('Could not find a valid path for {0}'.format(i))
+				AMBuild.cache.CacheVariable(i, path)
+
+			#Set up defines
+			cxx = self.compiler.cxx
+			if isinstance(cxx, Cpp.GCC):
+				self.vendor = 'gcc'
+				self.compiler.AddToListVar('CDEFINES', 'stricmp=strcasecmp')
+				self.compiler.AddToListVar('CDEFINES', '_stricmp=strcasecmp')
+				self.compiler.AddToListVar('CDEFINES', '_snprintf=snprintf')
+				self.compiler.AddToListVar('CDEFINES', '_vsnprintf=vsnprintf')
+				self.compiler.AddToListVar('CFLAGS', '-pipe')
+				self.compiler.AddToListVar('CFLAGS', '-fno-strict-aliasing')
+				if cxx.majorVersion >= 4:
+					self.compiler.AddToListVar('CFLAGS', '-fvisibility=hidden')
+					self.compiler.AddToListVar('CXXFLAGS', '-fvisibility-inlines-hidden')
+				self.compiler.AddToListVar('CFLAGS', '-Wall')
+				self.compiler.AddToListVar('CFLAGS', '-Werror')
+				self.compiler.AddToListVar('CFLAGS', '-Wno-uninitialized')
+				self.compiler.AddToListVar('CFLAGS', '-Wno-unused')
+				self.compiler.AddToListVar('CFLAGS', '-Wno-switch')
+				self.compiler.AddToListVar('CFLAGS', '-mfpmath=sse')
+				self.compiler.AddToListVar('CFLAGS', '-msse')
+				self.compiler.AddToListVar('CFLAGS', '-m32')
+				self.compiler.AddToListVar('CFLAGS', '-static-libgcc')
+				self.compiler.AddToListVar('CXXFLAGS', '-fno-exceptions')
+				self.compiler.AddToListVar('CXXFLAGS', '-fno-rtti')
+				self.compiler.AddToListVar('CXXFLAGS', '-fno-threadsafe-statics')
+				self.compiler.AddToListVar('CXXFLAGS', '-Wno-non-virtual-dtor')
+				self.compiler.AddToListVar('CDEFINES', 'HAVE_STDINT_H')
+			elif isinstance(cxx, Cpp.MSVC):
+				self.vendor = 'msvc'
+				if AMBuild.options.debug == '1':
+					self.compiler.AddToListVar('CFLAGS', '/MTd')
+				else:
+					self.compiler.AddToListVar('CFLAGS', '/MT')
+				self.compiler.AddToListVar('CDEFINES', '_CRT_SECURE_NO_DEPRECATE')
+				self.compiler.AddToListVar('CDEFINES', '_CRT_SECURE_NO_WARNINGS')
+				self.compiler.AddToListVar('CDEFINES', '_CRT_NONSTDC_NO_DEPRECATE')
+				self.compiler.AddToListVar('CXXFLAGS', '/EHsc')
+				self.compiler.AddToListVar('CXXFLAGS', '/GR-')
+				self.compiler.AddToListVar('CFLAGS', '/W3')
+				self.compiler.AddToListVar('CFLAGS', '/nologo')
+				self.compiler.AddToListVar('CFLAGS', '/Zi')
+				self.compiler.AddToListVar('CXXFLAGS', '/TP')
+				self.compiler.AddToListVar('POSTLINKFLAGS', '/DEBUG')
+				self.compiler.AddToListVar('POSTLINKFLAGS', '/MACHINE:X86')
+				self.compiler.AddToListVar('POSTLINKFLAGS', '/SUBSYSTEM:WINDOWS')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'kernel32.lib')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'user32.lib')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'gdi32.lib')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'winspool.lib')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'comdlg32.lib')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'advapi32.lib')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'shell32.lib')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'ole32.lib')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'oleaut32.lib')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'uuid.lib')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'odbc32.lib')
+				self.compiler.AddToListVar('POSTLINKFLAGS', 'odbccp32.lib')
+
+			#Optimization
+			if AMBuild.options.opt == '1':
+				self.compiler.AddToListVar('CDEFINES', 'NDEBUG')
+				if self.vendor == 'gcc':
+					self.compiler.AddToListVar('CFLAGS', '-O3')
+				elif self.vendor == 'msvc':
+					self.compiler.AddToListVar('CFLAGS', '/Ot')
+					self.compiler.AddToListVar('POSTLINKFLAGS', '/OPT:ICF')
+
+			#Debugging
+			if AMBuild.options.debug == '1':
+				self.compiler.AddToListVar('CDEFINES', 'DEBUG')
+				self.compiler.AddToListVar('CDEFINES', '_DEBUG')
+				if self.vendor == 'gcc':
+					self.compiler.AddToListVar('CFLAGS', '-g3')
+				elif self.vendor == 'msvc':
+					self.compiler.AddToListVar('CFLAGS', '/Od')
+					self.compiler.AddToListVar('CFLAGS', '/RTC1')
+
+			#Platform-specifics
+			if AMBuild.target['platform'] == 'linux':
+				self.compiler.AddToListVar('CDEFINES', '_LINUX')
+			elif AMBuild.target['platform'] == 'windows':
+				self.compiler.AddToListVar('CDEFINES', 'WIN32')
+				self.compiler.AddToListVar('CDEFINES', '_WINDOWS')
+
+			#Finish up
+			self.compiler.AddToListVar('CDEFINES', 'SOURCEMOD_BUILD')
+			self.compiler.AddToListVar('CDEFINES', 'SM_GENERATED_BUILD')
+			self.compiler.AddToListVar('CINCLUDES',
+			                           os.path.join(AMBuild.outputFolder, 'includes'))
+			self.compiler.ToConfig(AMBuild, 'compiler')
+			AMBuild.cache.CacheVariable('vendor', self.vendor)
+			self.targetMap = { }
+			AMBuild.cache.CacheVariable('targetMap', self.targetMap)
+		else:
+			self.compiler.FromConfig(AMBuild, 'compiler')
+			self.targetMap = AMBuild.cache['targetMap']
+
+		if AMBuild.target['platform'] == 'windows':
+			self.compiler.AddToListVar('RCINCLUDES', os.path.join(AMBuild.sourceFolder, 'public'))
+		self.mmsPath = AMBuild.cache['MMSOURCE17']
+
+	def DefaultCompiler(self):
+		return self.compiler.Clone()
+
+	def JobMatters(self, jobname):
+		file = sys._getframe().f_code.co_filename
+		if AMBuild.mode == 'config':
+			self.targetMap[jobname] = file
+			return True
+		if len(AMBuild.args) == 0:
+			return True
+		if not jobname in AMBuild.args:
+			return False
+
+	def DefaultExtCompiler(self, path):
+		compiler = self.DefaultCompiler()
+		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, path))
+		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, path, 'sdk'))
+		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public'))
+		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'extensions'))
+		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'sourcepawn'))
+		return compiler
+
+	def AutoVersion(self, folder, binary):
+		if AMBuild.target['platform'] != 'windows':
+			return
+		env = {'RCDEFINES': ['BINARY_NAME="' + binary.binaryFile + '"']}
+		binary.AddResourceFile(os.path.join(folder, 'version.rc' ), env)
+
+	def PreSetupHL2Job(self, job, builder, sdk):
+		info = self.sdkInfo[sdk]
+		sdkPath = AMBuild.cache[info['sdk']]
+		if AMBuild.target['platform'] == 'linux':
+			if sdk == 'ep1':
+				staticLibs = os.path.join(sdkPath, 'linux_sdk')
+			else:
+				staticLibs = os.path.join(sdkPath, 'lib', 'linux')
+			workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
+			for i in ['tier1_i486.a', 'mathlib_i486.a', 'vstdlib_i486.so', 'tier0_i486.so']:
+				link = os.path.join(workFolder, i)
+				target = os.path.join(staticLibs, i)
+				try:
+					os.lstat(link)
+				except:
+					job.AddCommand(SymlinkCommand(link, target))
+		elif AMBuild.target['platform'] == 'windows':
+			for lib in ['tier0', 'tier1', 'vstdlib', 'mathlib']:
+				libPath = os.path.join(sdkPath, 'lib', 'public', lib) + '.lib'
+				builder.RebuildIfNewer(libPath)
+				builder['POSTLINKFLAGS'].append(libPath)
+
+	def PostSetupHL2Job(self, job, builder, sdk):
+		if AMBuild.target['platform'] == 'linux':
+			builder.AddObjectFiles(['tier1_i486.a', 'mathlib_i486.a'])
+
+	def DefaultHL2Compiler(self, path, sdk, noLink = False, oldMms = '-legacy'):
+		compiler = self.DefaultExtCompiler(path)
+
+		mms = 'core'
+		if sdk == 'ep1':
+			mms += oldMms
+
+		compiler['CXXINCLUDES'].append(os.path.join(self.mmsPath, mms))
+		compiler['CXXINCLUDES'].append(os.path.join(self.mmsPath, mms, 'sourcehook'))
+
+		info = self.sdkInfo
+		compiler['CDEFINES'].extend(['SE_' + info[i]['name'] + '=' + info[i]['def'] for i in info])
+		compiler['CDEFINES'].append('SE_DARKMESSIAH=2')
+
+		paths = [['public'], ['public', 'engine'], ['public', 'mathlib'], ['public', 'vstdlib'],
+						 ['public', 'tier0'], ['public', 'tier1']]
+		if sdk == 'ep1' or sdk == 'darkm':
+			paths.append(['public', 'dlls'])
+		else:
+			paths.append(['public', 'game', 'server'])
+			paths.append(['common'])
+
+		info = self.sdkInfo[sdk]
+		sdkPath = AMBuild.cache[info['sdk']]
+
+		compiler['CDEFINES'].append('SOURCE_ENGINE=' + info['def'])
+
+		if sdk == 'ep1':
+			if AMBuild.target['platform'] == 'linux':
+				staticLibs = os.path.join(sdkPath, 'linux_sdk')
+		else:
+			if AMBuild.target['platform'] == 'linux':
+				staticLibs = os.path.join(sdkPath, 'lib', 'linux')
+
+		for i in paths:
+			compiler['CXXINCLUDES'].append(os.path.join(sdkPath, *i))
+
+		if not noLink:
+			if AMBuild.target['platform'] == 'linux':
+				compiler['POSTLINKFLAGS'][0:0] = ['-lm']
+				compiler['POSTLINKFLAGS'][0:0] = ['tier0_i486.so']
+				compiler['POSTLINKFLAGS'][0:0] = ['vstdlib_i486.so']
+
+		return compiler
+
+sm = SM()
+globals = {
+	'SM': sm
+}
+
+AMBuild.Include(os.path.join('tools', 'buildbot', 'Versioning'), globals)
+
+FileList = [
+		['loader', 'AMBuilder'],
+		['core', 'AMBuilder'],
+		['extensions', 'bintools', 'AMBuilder'],
+		['extensions', 'clientprefs', 'AMBuilder'],
+		['extensions', 'cstrike', 'AMBuilder'],
+		['extensions', 'curl', 'AMBuilder'],
+		['extensions', 'geoip', 'AMBuilder'],
+		['extensions', 'mysql', 'AMBuilder'],
+		['extensions', 'sdktools', 'AMBuilder'],
+		['extensions', 'topmenus', 'AMBuilder'],
+		['extensions', 'updater', 'AMBuilder'],
+		['extensions', 'sqlite', 'AMBuilder'],
+		['extensions', 'regex', 'AMBuilder'],
+		['extensions', 'tf2', 'AMBuilder'],
+		['sourcepawn', 'jit', 'AMBuilder'],
+		['sourcepawn', 'compiler', 'AMBuilder'],
+		['plugins', 'AMBuilder'],
+		['tools', 'buildbot', 'PackageScript']
+	]
+
+for parts in FileList:
+	AMBuild.Include(os.path.join(*parts), globals)
+

changelog.txt

@@ -2,6 +2,87 @@ SourceMod Changelog
 
 ----------------------------
 
+SourceMod 1.2.4 [2009-10-03]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.2.4_Release_Notes
+
+ - Updated for L4D changes (bugs 4032, 4033, 4035).
+ - Updated GeoLite Country database for GeoIP extension.
+ - Fixed crash when block-loading more than eight plugins (bug 4034).
+ - Fixed rare crash in hudtext code on TF (bug 4016).
+ - Fixed crash when reloading a blocked plugin failed (bug 4038).
+ - Fixed Huntsman not firing critical callback on TF (bug 3927).
+ - Registering the "sm" command no longer has any effect (bug 4013).
+ - Fixed translation bug in extension API (bug 4010).
+
+----------------------------
+
+SourceMod 1.2.3 [2009-08-28]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.2.3_Release_Notes
+
+ - Fix extension filename lookup. (bug 3975).
+
+----------------------------
+
+SourceMod 1.2.2 [2009-08-28]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.2.2_Release_Notes
+
+ - Removed auto folders. (bug 3949).
+ - Added PointOutsideWorld native to sdktools. (bug 3906).
+ - Added "motd" chat trigger to basetriggers. (bug 2694).
+ - Added manual extension reloading command to root console menu. (bug 3934)
+ - Fixed 'list' type custom menu entries overwriting admin restrictions. (bug 3783).
+ - Added sm_resetcvar command to basecommands. (bug 3636).
+ - Updated gamedata for DOD:S. (bug 3948).
+ - Updated gamedata for TF2. (bug 3948).
+ - Added new .ep2v build config for valve OB based games. (bug 3948).
+ - Fixed incorrect escaping in clientprefs SQLite queries. (bug 3904)
+ - Updated gamedata for Synergy. (bug 3315).
+ - Upgraded to pcre-7.9 (bug 3923).
+ - Switched Insurgency chat printing to SayText. (bug 3738).
+ - Updated gamedata for Insurgency. (bug 3511).
+ - Updated gamedata for ZM. (bug 3746).
+ - Updated gamedata for Empires. (bug 3500).
+ - Updated gamedata for ZPS. (bug 3877).
+ - Updated gamedata for AoC. (bug 3891).
+ - Fixed RemovePlayerDisguise signature for TF2. (bug 3892). 
+
+----------------------------
+
+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

configure.py

@@ -0,0 +1,10 @@
+# vim: set ts=2 sw=2 tw=99 noet:
+import sys
+import ambuild.runner as runner
+
+run = runner.Runner()
+run.options.add_option('--enable-debug', action='store_const', const='1', dest='debug',
+                       help='Enable debugging symbols')
+run.options.add_option('--enable-optimize', action='store_const', const='1', dest='opt',
+                       help='Enable optimization')
+run.Configure(sys.path[0])

core/AMBuilder

@@ -0,0 +1,108 @@
+# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+import os
+
+for i in SM.sdkInfo:
+	sdk = SM.sdkInfo[i]
+	name = 'sourcemod.' + sdk['ext']
+
+	compiler = SM.DefaultHL2Compiler('core', i)
+	compiler['CDEFINES'].append('SM_DEFAULT_THREADER')
+	if AMBuild.target['platform'] == 'linux':
+		compiler['POSTLINKFLAGS'].append('-lpthread')
+
+	extension = AMBuild.AddJob(name)
+	binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler)
+	SM.PreSetupHL2Job(extension, binary, i)
+	files = [
+		'AdminCache.cpp',
+		'ExtensionSys.cpp',
+		'MenuStyle_Valve.cpp',
+		'sm_crc32.cpp',
+		'smn_entities.cpp',
+		'smn_maplists.cpp',
+		'sm_stringutil.cpp',
+		'ADTFactory.cpp',
+		'ForwardSys.cpp',
+		'MenuVoting.cpp',
+		'sm_memtable.cpp',
+		'smn_events.cpp',
+		'smn_menus.cpp',
+		'sm_trie.cpp',
+		'CDataPack.cpp',
+		'frame_hooks.cpp',
+		'NativeInvoker.cpp',
+		'smn_admin.cpp',
+		'smn_fakenatives.cpp',
+		'smn_nextmap.cpp',
+		'sourcemm_api.cpp',
+		'ChatTriggers.cpp',
+		'GameConfigs.cpp',
+		'NativeOwner.cpp',
+		'smn_adt_array.cpp',
+		'smn_filesystem.cpp',
+		'smn_player.cpp',
+		'sourcemod.cpp',
+		'concmd_cleaner.cpp',
+		'HalfLife2.cpp',
+		'NextMap.cpp',
+		'smn_adt_stack.cpp',
+		'smn_float.cpp',
+		'smn_profiler.cpp',
+		'TextParsers.cpp',
+		'ConCmdManager.cpp',
+		'HandleSys.cpp',
+		'PhraseCollection.cpp',
+		'smn_adt_trie.cpp',
+		'smn_functions.cpp',
+		'smn_sorting.cpp',
+		'ThreadSupport.cpp',
+		'ConVarManager.cpp',
+		'LibrarySys.cpp',
+		'PlayerManager.cpp',
+		'smn_banning.cpp',
+		'smn_gameconfigs.cpp',
+		'smn_string.cpp',
+		'TimerSys.cpp',
+		'CoreConfig.cpp',
+		'Logger.cpp',
+		'PluginInfoDatabase.cpp',
+		'smn_bitbuffer.cpp',
+		'smn_halflife.cpp',
+		'smn_textparse.cpp',
+		'Translator.cpp',
+		'MemoryUtils.cpp',
+		'PluginSys.cpp',
+		'smn_console.cpp',
+		'smn_handles.cpp',
+		'smn_timers.cpp',
+		'UserMessages.cpp',
+		'Database.cpp',
+		'MenuManager.cpp',
+		'Profiler.cpp',
+		'smn_core.cpp',
+		'smn_hudtext.cpp',
+		'smn_usermsgs.cpp',
+		'DebugReporter.cpp',
+		'MenuStyle_Base.cpp',
+		'ShareSys.cpp',
+		'smn_database.cpp',
+		'smn_keyvalues.cpp',
+		'smn_vector.cpp',
+		'EventManager.cpp',
+		'MenuStyle_Radio.cpp',
+		'sm_autonatives.cpp',
+		'smn_datapacks.cpp',
+		'smn_lang.cpp',
+		'sm_srvcmds.cpp',
+		'thread/ThreadWorker.cpp',
+		'thread/BaseWorker.cpp'
+		]
+	if AMBuild.target['platform'] == 'windows':
+		files.append('thread/WinThreads.cpp')
+	else:
+		files.append('thread/PosixThreads.cpp')
+	binary.AddSourceFiles('core', files)
+	SM.PostSetupHL2Job(extension, binary, i)
+	SM.AutoVersion('core', binary)
+	binary.SendToJob()
+

core/CoreConfig.cpp

@@ -34,7 +34,7 @@
 #include "sourcemod.h"
 #include "sourcemm_api.h"
 #include "sm_srvcmds.h"
-#include "sm_version.h"
+#include <sourcemod_version.h>
 #include "sm_stringutil.h"
 #include "LibrarySys.h"
 #include "Logger.h"
@@ -381,7 +381,7 @@ bool SM_ExecuteConfig(CPlugin *pl, AutoConfig *cfg, bool can_create)
 			FILE *fp = fopen(file, "wt");
 			if (fp)
 			{
-				fprintf(fp, "// This file was auto-generated by SourceMod (v%s)\n", SVN_FULL_VERSION);
+				fprintf(fp, "// This file was auto-generated by SourceMod (v%s)\n", SM_FULL_VERSION);
 				fprintf(fp, "// ConVars for plugin \"%s\"\n", pl->GetFilename());
 				fprintf(fp, "\n\n");
 

core/ExtensionSys.cpp

@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
  * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
@@ -49,6 +49,9 @@ void CExtension::Initialize(const char *filename, const char *path)
 	m_bFullyLoaded = false;
 	m_File.assign(filename);
 	m_Path.assign(path);
+	char real_name[PLATFORM_MAX_PATH];
+	g_LibSys.GetFileFromPath(real_name, sizeof(real_name), m_Path.c_str());
+	m_RealFile.assign(real_name);
 }
 
 CRemoteExtension::CRemoteExtension(IExtensionInterface *pAPI, const char *filename, const char *path)
@@ -57,6 +60,22 @@ CRemoteExtension::CRemoteExtension(IExtensionInterface *pAPI, const char *filena
 	m_pAPI = pAPI;
 }
 
+#if defined METAMOD_PLAPI_VERSION
+#if SOURCE_ENGINE == SE_LEFT4DEAD
+#define GAMEFIX "2.l4d"
+#elif SOURCE_ENGINE == SE_ORANGEBOX
+#define GAMEFIX "2.ep2"
+#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE
+#define GAMEFIX "2.ep2v"
+#elif SOURCE_ENGINE == SE_DARKMESSIAH
+#define GAMEFIX "2.darkm"
+#else
+#define GAMEFIX "2.ep1"
+#endif //SOURCE_ENGINE == SE_LEFT4DEAD
+#else  //METAMOD_PLAPI_VERSION
+#define GAMEFIX "1.ep1"
+#endif //METAMOD_PLAPI_VERSION
+
 CLocalExtension::CLocalExtension(const char *filename)
 {
 	m_PlId = 0;
@@ -64,31 +83,36 @@ CLocalExtension::CLocalExtension(const char *filename)
 
 	char path[PLATFORM_MAX_PATH];
 
+	/* Zeroth, see if there is an engine specific build in the new place. */
+	g_SourceMod.BuildPath(Path_SM,
+		path,
+		PLATFORM_MAX_PATH,
+		"extensions/%s." GAMEFIX "." PLATFORM_LIB_EXT,
+		filename);
+
+	if (g_LibSys.IsPathFile(path))
+	{
+		goto found;
+	}
+
 	/* First see if there is an engine specific build! */
 	g_SourceMod.BuildPath(Path_SM, 
 		path, 
-		PLATFORM_MAX_PATH, 
-#if defined METAMOD_PLAPI_VERSION
-#if SOURCE_ENGINE == SE_LEFT4DEAD
-		"extensions/auto.2.l4d/%s",
-#elif SOURCE_ENGINE == SE_ORANGEBOX
-		"extensions/auto.2.ep2/%s",
-#elif SOURCE_ENGINE == SE_DARKMESSIAH
-		"extensions/auto.2.darkm/%s",
-#else
-		"extensions/auto.2.ep1/%s",
-#endif //SOURCE_ENGINE == SE_LEFT4DEAD
-#else  //METAMOD_PLAPI_VERSION
-		"extensions/auto.1.ep1/%s",
-#endif //METAMOD_PLAPI_VERSION
+		PLATFORM_MAX_PATH,
+		"extensions/auto." GAMEFIX "/%s." PLATFORM_LIB_EXT,
 		filename);
 
 	/* Try the "normal" version */
 	if (!g_LibSys.IsPathFile(path))
 	{
-		g_SourceMod.BuildPath(Path_SM, path, PLATFORM_MAX_PATH, "extensions/%s", filename);
+		g_SourceMod.BuildPath(Path_SM,
+			path,
+			PLATFORM_MAX_PATH,
+			"extensions/%s." PLATFORM_LIB_EXT,
+			filename);
 	}
 
+found:
 	Initialize(filename, path);
 }
 
@@ -187,6 +211,23 @@ void CLocalExtension::Unload()
 	}
 }
 
+bool CRemoteExtension::Reload(char *error, size_t maxlength)
+{
+	snprintf(error, maxlength, "Remote extensions do not support reloading");
+	return false;
+}
+
+bool CLocalExtension::Reload(char *error, size_t maxlength)
+{
+	if (m_pLib == NULL) // FIXME: just load it instead?
+		return false;
+	
+	m_pAPI->OnExtensionUnload();
+	Unload();
+	
+	return Load(error, maxlength);
+}
+
 bool CRemoteExtension::IsExternal()
 {
 	return true;
@@ -291,7 +332,7 @@ IExtensionInterface *CExtension::GetAPI()
 
 const char *CExtension::GetFilename()
 {
-	return m_File.c_str();
+	return m_RealFile.c_str();
 }
 
 IdentityToken_t *CExtension::GetIdentity()
@@ -494,7 +535,7 @@ void CExtensionManager::TryAutoload()
 
 		char file[PLATFORM_MAX_PATH];
 		len = UTIL_Format(file, sizeof(file), "%s", lfile);
-		strcpy(&file[len - 9], ".ext." PLATFORM_LIB_EXT);
+		strcpy(&file[len - 9], ".ext");
 
 		LoadAutoExtension(file);
 		
@@ -504,11 +545,14 @@ void CExtensionManager::TryAutoload()
 
 IExtension *CExtensionManager::LoadAutoExtension(const char *path)
 {
-	if (!strstr(path, "." PLATFORM_LIB_EXT))
+	/* Remove platform extension if it's there. Compat hack. */
+	const char *ext = g_LibSys.GetFileExtension(path);
+	if (strcmp(ext, PLATFORM_LIB_EXT) == 0)
 	{
-		char newpath[PLATFORM_MAX_PATH];
-		g_LibSys.PathFormat(newpath, sizeof(newpath), "%s.%s", path, PLATFORM_LIB_EXT);
-		return LoadAutoExtension(newpath);
+		char path2[PLATFORM_MAX_PATH];
+		UTIL_Format(path2, sizeof(path2), "%s", path);
+		path2[strlen(path) - strlen(PLATFORM_LIB_EXT) - 1] = '\0';
+		return LoadAutoExtension(path2);
 	}
 
 	IExtension *pAlready;
@@ -546,24 +590,12 @@ IExtension *CExtensionManager::FindExtensionByFile(const char *file)
 	for (iter=m_Libs.begin(); iter!=m_Libs.end(); iter++)
 	{
 		pExt = (*iter);
-		char short_file[PLATFORM_MAX_PATH];
-		g_LibSys.GetFileFromPath(short_file, sizeof(short_file), pExt->GetFilename());
-		if (strcmp(lookup, short_file) == 0)
+		if (pExt->IsSameFile(lookup))
 		{
 			return pExt;
 		}
 	}
 
-	/* If we got no results, test if there was a platform extension.
-	 * If not, add one.
-	 */
-	if (!strstr(file, "." PLATFORM_LIB_EXT))
-	{
-		char path[PLATFORM_MAX_PATH];
-		UTIL_Format(path, sizeof(path), "%s.%s", file, PLATFORM_LIB_EXT);
-		return FindExtensionByFile(path);
-	}
-
 	return NULL;
 }
 
@@ -601,6 +633,16 @@ IExtension *CExtensionManager::FindExtensionByName(const char *ext)
 
 IExtension *CExtensionManager::LoadExtension(const char *file, char *error, size_t maxlength)
 {
+	/* Remove platform extension if it's there. Compat hack. */
+	const char *ext = g_LibSys.GetFileExtension(file);
+	if (strcmp(ext, PLATFORM_LIB_EXT) == 0)
+	{
+		char path2[PLATFORM_MAX_PATH];
+		UTIL_Format(path2, sizeof(path2), "%s", file);
+		path2[strlen(file) - strlen(PLATFORM_LIB_EXT) - 1] = '\0';
+		return LoadExtension(path2, error, maxlength);
+	}
+
 	IExtension *pAlready;
 	if ((pAlready=FindExtensionByFile(file)) != NULL)
 	{
@@ -909,6 +951,37 @@ void CExtensionManager::OnRootConsoleCommand(const char *cmdname, const CCommand
 			}
 			return;
 		}
+		else if (strcmp(cmd, "load") == 0)
+		{
+			if (argcount < 4)
+			{
+				g_RootMenu.ConsolePrint("[SM] Usage: sm exts load <file>");
+				return;
+			}
+
+			const char *filename = command.Arg(3);
+			char path[PLATFORM_MAX_PATH];
+			char error[256];
+
+			UTIL_Format(path, sizeof(path), "%s%s%s", filename, !strstr(filename, ".ext") ? ".ext" : "",
+				!strstr(filename, "." PLATFORM_LIB_EXT) ? "." PLATFORM_LIB_EXT : "");
+			
+			if (FindExtensionByFile(path) != NULL)
+			{
+				g_RootMenu.ConsolePrint("[SM] Extension %s is already loaded.", path);
+				return;
+			}
+			
+			if (LoadExtension(path, error, sizeof(error)))
+			{
+				g_RootMenu.ConsolePrint("[SM] Loaded extension %s successfully.", path);
+			} else
+			{
+				g_RootMenu.ConsolePrint("[SM] Extension %s failed to load: %s", path, error);
+			}
+			
+			return;
+		}
 		else if (strcmp(cmd, "info") == 0)
 		{
 			if (argcount < 4)
@@ -1111,11 +1184,57 @@ void CExtensionManager::OnRootConsoleCommand(const char *cmdname, const CCommand
 				return;
 			}
 		}
+		else if (strcmp(cmd, "reload") == 0)
+		{
+			if (argcount < 4)
+			{
+				g_RootMenu.ConsolePrint("[SM] Usage: sm exts reload <#>");
+				return;
+			}
+			
+			const char *arg = command.Arg(3);
+			unsigned int num = atoi(arg);
+			CExtension *pExt = FindByOrder(num);
+
+			if (!pExt)
+			{
+				g_RootMenu.ConsolePrint("[SM] Extension number %d was not found.", num);
+				return;
+			}
+			
+			if (pExt->IsLoaded())
+			{
+				char filename[PLATFORM_MAX_PATH];
+				char error[255];
+				
+				snprintf(filename, PLATFORM_MAX_PATH, "%s", pExt->GetFilename());
+				
+				if (pExt->Reload(error, sizeof(error)))
+				{
+					g_RootMenu.ConsolePrint("[SM] Extension %s is now reloaded.", filename);
+				}
+				else
+				{
+					g_RootMenu.ConsolePrint("[SM] Extension %s failed to reload: %s", filename, error);
+				}
+					
+				return;
+			} 
+			else
+			{
+				g_RootMenu.ConsolePrint("[SM] Extension %s is not loaded.", pExt->GetFilename());
+				
+				return;
+			}
+			
+		}
 	}
 
 	g_RootMenu.ConsolePrint("SourceMod Extensions Menu:");
 	g_RootMenu.DrawGenericOption("info", "Extra extension information");
 	g_RootMenu.DrawGenericOption("list", "List extensions");
+	g_RootMenu.DrawGenericOption("load", "Load an extension");
+	g_RootMenu.DrawGenericOption("reload", "Reload an extension");
 	g_RootMenu.DrawGenericOption("unload", "Unload an extension");
 }
 
@@ -1210,3 +1329,16 @@ void CExtensionManager::CallOnCoreMapStart(edict_t *pEdictList, int edictCount,
 		}
 	}
 }
+
+bool CLocalExtension::IsSameFile(const char *file)
+{
+	/* Only care about the shortened name. */
+	return strcmp(file, m_File.c_str()) == 0;
+}
+
+bool CRemoteExtension::IsSameFile(const char *file)
+{
+	/* :TODO: this could be better, but no one uses this API anyway. */
+	return strcmp(file, m_Path.c_str()) == 0;
+}
+

core/ExtensionSys.h

@@ -83,6 +83,8 @@ public:
 	virtual bool Load(char *error, size_t maxlength);
 	virtual bool IsLoaded() =0;
 	virtual void Unload() =0;
+	virtual bool Reload(char *error, size_t maxlength) =0;
+	virtual bool IsSameFile(const char* file) =0;
 protected:
 	void Initialize(const char *filename, const char *path);
 	bool PerformAPICheck(char *error, size_t maxlength);
@@ -92,6 +94,7 @@ protected:
 	IdentityToken_t *m_pIdentToken;
 	IExtensionInterface *m_pAPI;
 	String m_File;
+	String m_RealFile;
 	String m_Path;
 	String m_Error;
 	List<IfaceInfo> m_Deps;			/** Dependencies */
@@ -110,7 +113,9 @@ public:
 	bool Load(char *error, size_t maxlength);
 	bool IsLoaded();
 	void Unload();
+	bool Reload(char *error, size_t maxlength);
 	bool IsExternal();
+	bool IsSameFile(const char *file);
 private:
 	PluginId m_PlId;
 	ILibrary *m_pLib;
@@ -124,7 +129,9 @@ public:
 	bool Load(char *error, size_t maxlength);
 	bool IsLoaded();
 	void Unload();
+	bool Reload(char *error, size_t maxlength);
 	bool IsExternal();
+	bool IsSameFile(const char *file);
 };
 
 class CExtensionManager : 

core/GameConfigs.cpp

@@ -109,6 +109,8 @@ static bool DoesEngineMatch(const char *value)
 	if (strcmp(value, "darkmessiah") == 0)
 #elif SOURCE_ENGINE == SE_ORANGEBOX
 	if (strcmp(value, "orangebox") == 0)
+#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE
+	if (strcmp(value, "orangebox_valve") == 0)
 #elif SOURCE_ENGINE == SE_LEFT4DEAD
 	if (strcmp(value, "left4dead") == 0)
 #else

core/Logger.cpp

@@ -36,7 +36,7 @@
 #include "Logger.h"
 #include "LibrarySys.h"
 #include "TimerSys.h"
-#include "sm_version.h"
+#include <sourcemod_version.h>
 
 Logger g_Logger;
 
@@ -149,7 +149,7 @@ void Logger::_NewMapFile()
 	} else {
 		char date[32];
 		strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
-		fprintf(fp, "L %s: SourceMod log file started (file \"L%02d%02d%03d.log\") (Version \"%s\")\n", date, curtime->tm_mon + 1, curtime->tm_mday, i, SVN_FULL_VERSION);
+		fprintf(fp, "L %s: SourceMod log file started (file \"L%02d%02d%03d.log\") (Version \"%s\")\n", date, curtime->tm_mon + 1, curtime->tm_mday, i, SM_FULL_VERSION);
 		fclose(fp);
 	}
 }
@@ -356,7 +356,7 @@ void Logger::LogMessage(const char *vafmt, ...)
 			char date[32];
 			m_DailyPrintHdr = false;
 			strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
-			fprintf(fp, "L %s: SourceMod log file session started (file \"L%04d%02d%02d.log\") (Version \"%s\")\n", date, curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday, SVN_FULL_VERSION);
+			fprintf(fp, "L %s: SourceMod log file session started (file \"L%04d%02d%02d.log\") (Version \"%s\")\n", date, curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday, SM_FULL_VERSION);
 	 	}
 		va_list ap;
 		va_start(ap, vafmt);

core/Makefile

@@ -5,6 +5,7 @@ SMSDK = ..
 SRCDS_BASE = ~/srcds
 HL2SDK_ORIG = ../../hl2sdk
 HL2SDK_OB = ../../hl2sdk-ob
+HL2SDK_OB_VALVE = ../../hl2sdk-ob-valve
 HL2SDK_L4D = ../../hl2sdk-l4d
 MMSOURCE17 = ../../mmsource-1.7
 
@@ -70,11 +71,22 @@ ifeq "$(ENGINE)" "orangebox"
 	BINARY = sourcemod.2.ep2.so
 	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
+	BINARY = sourcemod.2.ep2v.so
+	override ENGSET = true
+endif
 ifeq "$(ENGINE)" "left4dead"
 	HL2SDK = $(HL2SDK_L4D)
 	HL2PUB = $(HL2SDK)/public
 	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=4
+	CFLAGS += -DSOURCE_ENGINE=5
 	METAMOD = $(MMSOURCE17)/core
 	INCLUDE += -I$(HL2SDK)/public/game/server
 	SRCDS = $(SRCDS_BASE)/l4d
@@ -82,7 +94,7 @@ ifeq "$(ENGINE)" "left4dead"
 	override ENGSET = true
 endif
 
-CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4
+CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 -DSE_LEFT4DEAD=5
 
 LINK += $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a vstdlib_i486.so \
 	tier0_i486.so -lpthread -static-libgcc

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

@@ -47,7 +47,7 @@
 #include <iclient.h>
 #include "GameConfigs.h"
 #include "ExtensionSys.h"
-#include "sm_version.h"
+#include <sourcemod_version.h>
 
 PlayerManager g_Players;
 bool g_OnMapStarted = false;
@@ -698,7 +698,7 @@ void PlayerManager::OnClientCommand(edict_t *pEntity)
 		}
 
 		ClientConsolePrint(pEntity,
-			"SourceMod %s, by AlliedModders LLC", SVN_FULL_VERSION);
+			"SourceMod %s, by AlliedModders LLC", SM_FULL_VERSION);
 		ClientConsolePrint(pEntity,
 			"To see running plugins, type \"sm plugins\"");
 		ClientConsolePrint(pEntity,

core/PluginInfoDatabase.cpp

@@ -276,7 +276,7 @@ SMCResult CPluginInfoDatabase::ReadSMC_LeavingSection(const SMCStates *states)
 					{
 						m_infodb_size *= 2;
 					}
-					int newidx = memtab->CreateMem(m_infodb_size, (void **)&table);
+					int newidx = memtab->CreateMem(m_infodb_size * sizeof(int), (void **)&table);
 					if (m_infodb != -1)
 					{
 						void *oldtable = (int *)memtab->GetAddress(m_infodb);

core/PluginSys.cpp

@@ -60,7 +60,7 @@ CPlugin::CPlugin(const char *file)
 	m_serial = ++MySerial;
 	m_pRuntime = NULL;
 	m_errormsg[256] = '\0';
-	snprintf(m_filename, sizeof(m_filename), "%s", file);
+	UTIL_Format(m_filename, sizeof(m_filename), "%s", file);
 	m_handle = 0;
 	m_ident = NULL;
 	m_pProps = sm_trie_create();
@@ -164,7 +164,7 @@ CPlugin *CPlugin::CreatePlugin(const char *file, char *error, size_t maxlength)
 	{
 		if (error)
 		{
-			snprintf(error, maxlength, "Unable to open file");
+			UTIL_Format(error, maxlength, "Unable to open file");
 		}
 		pPlugin->m_status = Plugin_BadLoad;
 		return pPlugin;
@@ -210,7 +210,7 @@ void CPlugin::SetErrorState(PluginStatus status, const char *error_fmt, ...)
 
 	va_list ap;
 	va_start(ap, error_fmt);
-	vsnprintf(m_errormsg, sizeof(m_errormsg), error_fmt, ap);
+	UTIL_FormatArgs(m_errormsg, sizeof(m_errormsg), error_fmt, ap);
 	va_end(ap);
 
 	if (m_pRuntime != NULL)
@@ -851,7 +851,7 @@ void CPluginManager::LoadPluginsFromDir(const char *basedir, const char *localpa
 			if (localpath == NULL)
 			{
 				/* If no path yet, don't add a former slash */
-				snprintf(new_local, sizeof(new_local), "%s", dir->GetEntryName());
+				UTIL_Format(new_local, sizeof(new_local), "%s", dir->GetEntryName());
 			} else {
 				g_LibSys.PathFormat(new_local, sizeof(new_local), "%s/%s", localpath, dir->GetEntryName());
 			}
@@ -866,7 +866,7 @@ void CPluginManager::LoadPluginsFromDir(const char *basedir, const char *localpa
 				char plugin[PLATFORM_MAX_PATH];
 				if (localpath == NULL)
 				{
-					snprintf(plugin, sizeof(plugin), "%s", name);
+					UTIL_Format(plugin, sizeof(plugin), "%s", name);
 				} else {
 					g_LibSys.PathFormat(plugin, sizeof(plugin), "%s/%s", localpath, name);
 				}
@@ -965,7 +965,7 @@ LoadRes CPluginManager::_LoadPlugin(CPlugin **_plugin, const char *path, bool de
 				{
 					if (error)
 					{
-						snprintf(error, maxlength, "Unable to set JIT option (key \"%s\") (value \"%s\")", key, val);
+						UTIL_Format(error, maxlength, "Unable to set JIT option (key \"%s\") (value \"%s\")", key, val);
 					}
 					co->Abort();
 					co = NULL;
@@ -984,7 +984,7 @@ LoadRes CPluginManager::_LoadPlugin(CPlugin **_plugin, const char *path, bool de
 		pPlugin->m_pRuntime = g_pSourcePawn2->LoadPlugin(co, fullpath, &err);
 		if (pPlugin->m_pRuntime == NULL)
 		{
-			snprintf(error, 
+			UTIL_Format(error, 
 				maxlength, 
 				"Unable to load plugin (error %d: %s)", 
 				err, 
@@ -1053,13 +1053,16 @@ IPlugin *CPluginManager::LoadPlugin(const char *path, bool debug, PluginType typ
 
 	if (res == LoadRes_NeverLoad)
 	{
-		if (m_LoadingLocked)
+		if (error)
 		{
-			UTIL_Format(error, maxlength, "There is a global plugin loading lock in effect");
-		}
-		else
-		{
-			UTIL_Format(error, maxlength, "This plugin is blocked from loading (see plugin_settings.cfg)");
+			if (m_LoadingLocked)
+			{
+				UTIL_Format(error, maxlength, "There is a global plugin loading lock in effect");
+			}
+			else
+			{
+				UTIL_Format(error, maxlength, "This plugin is blocked from loading (see plugin_settings.cfg)");
+			}
 		}
 		return NULL;
 	}
@@ -1189,7 +1192,7 @@ bool CPluginManager::FindOrRequirePluginDeps(CPlugin *pPlugin, char *error, size
 					{
 						if (error)
 						{
-							snprintf(error, maxlength, "Fatal error during initializing plugin load");
+							UTIL_Format(error, maxlength, "Fatal error during initializing plugin load");
 						}
 						return false;
 					}
@@ -1222,7 +1225,7 @@ bool CPluginManager::FindOrRequirePluginDeps(CPlugin *pPlugin, char *error, size
 				{
 					if (error)
 					{
-						snprintf(error, maxlength, "Could not find required plugin \"%s\"", name);
+						UTIL_Format(error, maxlength, "Could not find required plugin \"%s\"", name);
 					}
 					return false;
 				}
@@ -1293,7 +1296,7 @@ bool CPluginManager::LoadOrRequireExtensions(CPlugin *pPlugin, unsigned int pass
 					{
 						if (error)
 						{
-							snprintf(error, maxlength, "Required extension \"%s\" file(\"%s\") not running", name, file);
+							UTIL_Format(error, maxlength, "Required extension \"%s\" file(\"%s\") not running", name, file);
 						}
 						return false;
 					}
@@ -1361,7 +1364,7 @@ bool CPluginManager::RunSecondPass(CPlugin *pPlugin, char *error, size_t maxleng
 		{
 			if (error)
 			{
-				snprintf(error, maxlength, "Native \"%s\" was not found", native->name);
+				UTIL_Format(error, maxlength, "Native \"%s\" was not found", native->name);
 			}
 			return false;
 		}

core/PluginSys.h

@@ -49,7 +49,7 @@
 #include <IRootConsoleMenu.h>
 #if SOURCE_ENGINE == SE_LEFT4DEAD
 #include "convar_sm_l4d.h"
-#elif SOURCE_ENGINE == SE_ORANGEBOX
+#elif (SOURCE_ENGINE == SE_ORANGEBOX) || (SOURCE_ENGINE == SE_ORANGEBOXVALVE)
 #include "convar_sm_ob.h"
 #else
 #include "convar_sm.h"

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.sln

@@ -9,16 +9,19 @@ Global
 		CrazyDebug - Episode 1|Win32 = CrazyDebug - Episode 1|Win32
 		CrazyDebug - Left 4 Dead|Win32 = CrazyDebug - Left 4 Dead|Win32
 		CrazyDebug - Old Metamod|Win32 = CrazyDebug - Old Metamod|Win32
+		CrazyDebug - Orange Box Valve|Win32 = CrazyDebug - Orange Box Valve|Win32
 		CrazyDebug - Orange Box|Win32 = CrazyDebug - Orange Box|Win32
 		Debug - Dark Messiah|Win32 = Debug - Dark Messiah|Win32
 		Debug - Episode 1|Win32 = Debug - Episode 1|Win32
 		Debug - Left 4 Dead|Win32 = Debug - Left 4 Dead|Win32
 		Debug - Old Metamod|Win32 = Debug - Old Metamod|Win32
+		Debug - Orange Box Valve|Win32 = Debug - Orange Box Valve|Win32
 		Debug - Orange Box|Win32 = Debug - Orange Box|Win32
 		Release - Dark Messiah|Win32 = Release - Dark Messiah|Win32
 		Release - Episode 1|Win32 = Release - Episode 1|Win32
 		Release - Left 4 Dead|Win32 = Release - Left 4 Dead|Win32
 		Release - Old Metamod|Win32 = Release - Old Metamod|Win32
+		Release - Orange Box Valve|Win32 = Release - Orange Box Valve|Win32
 		Release - Orange Box|Win32 = Release - Orange Box|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
@@ -30,6 +33,8 @@ Global
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Left 4 Dead|Win32.Build.0 = CrazyDebug - Left 4 Dead|Win32
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Old Metamod|Win32.ActiveCfg = CrazyDebug - Old Metamod|Win32
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Old Metamod|Win32.Build.0 = CrazyDebug - Old Metamod|Win32
+		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Orange Box Valve|Win32.ActiveCfg = CrazyDebug - Orange Box Valve|Win32
+		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Orange Box Valve|Win32.Build.0 = CrazyDebug - Orange Box Valve|Win32
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Orange Box|Win32.ActiveCfg = CrazyDebug - Orange Box|Win32
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Orange Box|Win32.Build.0 = CrazyDebug - Orange Box|Win32
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Dark Messiah|Win32.ActiveCfg = Debug - Dark Messiah|Win32
@@ -40,6 +45,8 @@ Global
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Left 4 Dead|Win32.Build.0 = Debug - Left 4 Dead|Win32
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Old Metamod|Win32.ActiveCfg = Debug - Old Metamod|Win32
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Old Metamod|Win32.Build.0 = Debug - Old Metamod|Win32
+		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Orange Box Valve|Win32.ActiveCfg = Debug - Orange Box Valve|Win32
+		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Orange Box Valve|Win32.Build.0 = Debug - Orange Box Valve|Win32
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Orange Box|Win32.ActiveCfg = Debug - Orange Box|Win32
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Orange Box|Win32.Build.0 = Debug - Orange Box|Win32
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Dark Messiah|Win32.ActiveCfg = Release - Dark Messiah|Win32
@@ -50,6 +57,8 @@ Global
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Left 4 Dead|Win32.Build.0 = Release - Left 4 Dead|Win32
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Old Metamod|Win32.ActiveCfg = Release - Old Metamod|Win32
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Old Metamod|Win32.Build.0 = Release - Old Metamod|Win32
+		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Orange Box Valve|Win32.ActiveCfg = Release - Orange Box Valve|Win32
+		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Orange Box Valve|Win32.Build.0 = Release - Orange Box Valve|Win32
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Orange Box|Win32.ActiveCfg = Release - Orange Box|Win32
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Orange Box|Win32.Build.0 = Release - Orange Box|Win32
 	EndGlobalSection

core/msvc9/sourcemod_mm.vcproj

@@ -40,7 +40,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\;..\systems;..\..\public;..\..\public\sourcepawn;&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\dlls&quot;;&quot;$(HL2SDK)\public\engine&quot;;&quot;$(HL2SDK)\public\mathlib&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;;&quot;$(HL2SDK)\public\vstdlib&quot;;&quot;$(MMSOURCE17)\core-legacy&quot;;&quot;$(MMSOURCE17)\core-legacy\sourcehook&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMOD_MM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SOURCEMOD_BUILD;SM_DEFAULT_THREADER;SOURCE_ENGINE=1"
@@ -122,7 +122,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\;..\systems;..\..\public;..\..\public\sourcepawn;&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\dlls&quot;;&quot;$(HL2SDK)\public\engine&quot;;&quot;$(HL2SDK)\public\mathlib&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;;&quot;$(HL2SDK)\public\vstdlib&quot;;&quot;$(MMSOURCE17)\core-legacy&quot;;&quot;$(MMSOURCE17)\core-legacy\sourcehook&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMOD_MM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SOURCEMOD_BUILD;SM_DEFAULT_THREADER;SOURCE_ENGINE=1"
@@ -205,7 +205,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..\;..\systems;..\..\public;..\..\public\sourcepawn;&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\dlls&quot;;&quot;$(HL2SDK)\public\engine&quot;;&quot;$(HL2SDK)\public\mathlib&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;;&quot;$(HL2SDK)\public\vstdlib&quot;;&quot;$(MMSOURCE17)\core-legacy&quot;;&quot;$(MMSOURCE17)\core-legacy\sourcehook&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMOD_MM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SOURCEMOD_BUILD;SM_DEFAULT_THREADER;SOURCE_ENGINE=1"
@@ -287,7 +287,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\;..\systems;..\..\public;..\..\public\sourcepawn;&quot;$(HL2SDK-DARKM)\public&quot;;&quot;$(HL2SDK-DARKM)\public\dlls&quot;;&quot;$(HL2SDK-DARKM)\public\engine&quot;;&quot;$(HL2SDK-DARKM)\public\mathlib&quot;;&quot;$(HL2SDK-DARKM)\public\tier0&quot;;&quot;$(HL2SDK-DARKM)\public\tier1&quot;;&quot;$(HL2SDK-DARKM)\public\vstdlib&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMOD_MM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SOURCEMOD_BUILD;SM_DEFAULT_THREADER;SOURCE_ENGINE=2"
@@ -369,7 +369,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\;..\systems;..\..\public;..\..\public\sourcepawn;&quot;$(HL2SDK-DARKM)\public&quot;;&quot;$(HL2SDK-DARKM)\public\dlls&quot;;&quot;$(HL2SDK-DARKM)\public\engine&quot;;&quot;$(HL2SDK-DARKM)\public\mathlib&quot;;&quot;$(HL2SDK-DARKM)\public\tier0&quot;;&quot;$(HL2SDK-DARKM)\public\tier1&quot;;&quot;$(HL2SDK-DARKM)\public\vstdlib&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMOD_MM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SOURCEMOD_BUILD;SM_DEFAULT_THREADER;SOURCE_ENGINE=2"
@@ -452,7 +452,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..\;..\systems;..\..\public;..\..\public\sourcepawn;&quot;$(HL2SDK-DARKM)\public&quot;;&quot;$(HL2SDK-DARKM)\public\dlls&quot;;&quot;$(HL2SDK-DARKM)\public\engine&quot;;&quot;$(HL2SDK-DARKM)\public\mathlib&quot;;&quot;$(HL2SDK-DARKM)\public\tier0&quot;;&quot;$(HL2SDK-DARKM)\public\tier1&quot;;&quot;$(HL2SDK-DARKM)\public\vstdlib&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMOD_MM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SOURCEMOD_BUILD;SM_DEFAULT_THREADER;SOURCE_ENGINE=2"
@@ -534,7 +534,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\;..\systems;..\..\public;..\..\public\sourcepawn;&quot;$(HL2SDKOB)\public&quot;;&quot;$(HL2SDKOB)\public\engine&quot;;&quot;$(HL2SDKOB)\public\game\server&quot;;&quot;$(HL2SDKOB)\public\mathlib&quot;;&quot;$(HL2SDKOB)\public\tier0&quot;;&quot;$(HL2SDKOB)\public\tier1&quot;;&quot;$(HL2SDKOB)\public\vstdlib&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMOD_MM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SOURCEMOD_BUILD;SM_DEFAULT_THREADER;SOURCE_ENGINE=3"
@@ -616,7 +616,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\;..\systems;..\..\public;..\..\public\sourcepawn;&quot;$(HL2SDKOB)\public&quot;;&quot;$(HL2SDKOB)\public\engine&quot;;&quot;$(HL2SDKOB)\public\game\server&quot;;&quot;$(HL2SDKOB)\public\mathlib&quot;;&quot;$(HL2SDKOB)\public\tier0&quot;;&quot;$(HL2SDKOB)\public\tier1&quot;;&quot;$(HL2SDKOB)\public\vstdlib&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMOD_MM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SOURCEMOD_BUILD;SM_DEFAULT_THREADER;SOURCE_ENGINE=3"
@@ -699,7 +699,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..\;..\systems;..\..\public;..\..\public\sourcepawn;&quot;$(HL2SDKOB)\public&quot;;&quot;$(HL2SDKOB)\public\engine&quot;;&quot;$(HL2SDKOB)\public\game\server&quot;;&quot;$(HL2SDKOB)\public\mathlib&quot;;&quot;$(HL2SDKOB)\public\tier0&quot;;&quot;$(HL2SDKOB)\public\tier1&quot;;&quot;$(HL2SDKOB)\public\vstdlib&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMOD_MM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SOURCEMOD_BUILD;SM_DEFAULT_THREADER;SOURCE_ENGINE=3"
@@ -781,7 +781,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\;..\systems;..\..\public;..\..\public\sourcepawn;&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\dlls&quot;;&quot;$(HL2SDK)\public\engine&quot;;&quot;$(HL2SDK)\public\mathlib&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;;&quot;$(HL2SDK)\public\vstdlib&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMOD_MM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SOURCEMOD_BUILD;SM_DEFAULT_THREADER;SOURCE_ENGINE=1"
@@ -863,7 +863,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\;..\systems;..\..\public;..\..\public\sourcepawn;&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\dlls&quot;;&quot;$(HL2SDK)\public\engine&quot;;&quot;$(HL2SDK)\public\mathlib&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;;&quot;$(HL2SDK)\public\vstdlib&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMOD_MM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SOURCEMOD_BUILD;SM_DEFAULT_THREADER;SOURCE_ENGINE=1"
@@ -946,7 +946,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..\;..\systems;..\..\public;..\..\public\sourcepawn;&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\dlls&quot;;&quot;$(HL2SDK)\public\engine&quot;;&quot;$(HL2SDK)\public\mathlib&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;;&quot;$(HL2SDK)\public\vstdlib&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMOD_MM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SOURCEMOD_BUILD;SM_DEFAULT_THREADER;SOURCE_ENGINE=1"
@@ -1028,10 +1028,10 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\;..\systems;..\..\public;..\..\public\sourcepawn;&quot;$(HL2SDKL4D)\public&quot;;&quot;$(HL2SDKL4D)\public\engine&quot;;&quot;$(HL2SDKL4D)\public\game\server&quot;;&quot;$(HL2SDKL4D)\public\mathlib&quot;;&quot;$(HL2SDKL4D)\public\tier0&quot;;&quot;$(HL2SDKL4D)\public\tier1&quot;;&quot;$(HL2SDKL4D)\public\vstdlib&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMOD_MM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SOURCEMOD_BUILD;SM_DEFAULT_THREADER;SOURCE_ENGINE=4"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMOD_MM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SOURCEMOD_BUILD;SM_DEFAULT_THREADER;SOURCE_ENGINE=5"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -1110,10 +1110,10 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\;..\systems;..\..\public;..\..\public\sourcepawn;&quot;$(HL2SDKL4D)\public&quot;;&quot;$(HL2SDKL4D)\public\engine&quot;;&quot;$(HL2SDKL4D)\public\game\server&quot;;&quot;$(HL2SDKL4D)\public\mathlib&quot;;&quot;$(HL2SDKL4D)\public\tier0&quot;;&quot;$(HL2SDKL4D)\public\tier1&quot;;&quot;$(HL2SDKL4D)\public\vstdlib&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMOD_MM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SOURCEMOD_BUILD;SM_DEFAULT_THREADER;SOURCE_ENGINE=4"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMOD_MM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SOURCEMOD_BUILD;SM_DEFAULT_THREADER;SOURCE_ENGINE=5"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -1193,10 +1193,10 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..\;..\systems;..\..\public;..\..\public\sourcepawn;&quot;$(HL2SDKL4D)\public&quot;;&quot;$(HL2SDKL4D)\public\engine&quot;;&quot;$(HL2SDKL4D)\public\game\server&quot;;&quot;$(HL2SDKL4D)\public\mathlib&quot;;&quot;$(HL2SDKL4D)\public\tier0&quot;;&quot;$(HL2SDKL4D)\public\tier1&quot;;&quot;$(HL2SDKL4D)\public\vstdlib&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMOD_MM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SOURCEMOD_BUILD;SM_DEFAULT_THREADER;SOURCE_ENGINE=4"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMOD_MM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SOURCEMOD_BUILD;SM_DEFAULT_THREADER;SOURCE_ENGINE=5"
 				RuntimeLibrary="0"
 				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
@@ -1251,6 +1251,253 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="CrazyDebug - 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"
+				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\;..\systems;..\..\public;..\..\public\sourcepawn;&quot;$(HL2SDKOBVALVE)\public&quot;;&quot;$(HL2SDKOBVALVE)\public\engine&quot;;&quot;$(HL2SDKOBVALVE)\public\game\server&quot;;&quot;$(HL2SDKOBVALVE)\public\mathlib&quot;;&quot;$(HL2SDKOBVALVE)\public\tier0&quot;;&quot;$(HL2SDKOBVALVE)\public\tier1&quot;;&quot;$(HL2SDKOBVALVE)\public\vstdlib&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMOD_MM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SOURCEMOD_BUILD;SM_DEFAULT_THREADER;SOURCE_ENGINE=4"
+				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; &quot;$(HL2SDKOBVALVE)\lib\public\vstdlib.lib&quot; &quot;$(HL2SDKOBVALVE)\lib\public\mathlib.lib&quot; dbghelp.lib &quot;Wsock32.lib&quot;"
+				OutputFile="$(OutDir)\sourcemod.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="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"
+				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\;..\systems;..\..\public;..\..\public\sourcepawn;&quot;$(HL2SDKOBVALVE)\public&quot;;&quot;$(HL2SDKOBVALVE)\public\engine&quot;;&quot;$(HL2SDKOBVALVE)\public\game\server&quot;;&quot;$(HL2SDKOBVALVE)\public\mathlib&quot;;&quot;$(HL2SDKOBVALVE)\public\tier0&quot;;&quot;$(HL2SDKOBVALVE)\public\tier1&quot;;&quot;$(HL2SDKOBVALVE)\public\vstdlib&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMOD_MM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SOURCEMOD_BUILD;SM_DEFAULT_THREADER;SOURCE_ENGINE=4"
+				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; &quot;$(HL2SDKOBVALVE)\lib\public\vstdlib.lib&quot; &quot;$(HL2SDKOBVALVE)\lib\public\mathlib.lib&quot; &quot;Wsock32.lib&quot;"
+				OutputFile="$(OutDir)\sourcemod.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"
+				AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="..\;..\systems;..\..\public;..\..\public\sourcepawn;&quot;$(HL2SDKOBVALVE)\public&quot;;&quot;$(HL2SDKOBVALVE)\public\engine&quot;;&quot;$(HL2SDKOBVALVE)\public\game\server&quot;;&quot;$(HL2SDKOBVALVE)\public\mathlib&quot;;&quot;$(HL2SDKOBVALVE)\public\tier0&quot;;&quot;$(HL2SDKOBVALVE)\public\tier1&quot;;&quot;$(HL2SDKOBVALVE)\public\vstdlib&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMOD_MM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SOURCEMOD_BUILD;SM_DEFAULT_THREADER;SOURCE_ENGINE=4"
+				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; &quot;$(HL2SDKOBVALVE)\lib\public\vstdlib.lib&quot; &quot;$(HL2SDKOBVALVE)\lib\public\mathlib.lib&quot; &quot;Wsock32.lib&quot;"
+				OutputFile="$(OutDir)\sourcemod.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>
 	</Configurations>
 	<References>
 	</References>
@@ -1375,6 +1622,22 @@
 						Name="VCCLCompilerTool"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug - Orange Box Valve|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release - Orange Box Valve|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\Database.cpp"

core/sm_srvcmds.cpp

@@ -30,7 +30,7 @@
  */
 
 #include "sm_srvcmds.h"
-#include "sm_version.h"
+#include <sourcemod_version.h>
 #include "sm_stringutil.h"
 #include "HandleSys.h"
 #include "CoreConfig.h"
@@ -39,7 +39,7 @@
 
 RootConsoleMenu g_RootMenu;
 
-ConVar sourcemod_version("sourcemod_version", SVN_FULL_VERSION, FCVAR_SPONLY|FCVAR_REPLICATED|FCVAR_NOTIFY, "SourceMod Version");
+ConVar sourcemod_version("sourcemod_version", SM_FULL_VERSION, FCVAR_SPONLY|FCVAR_REPLICATED|FCVAR_NOTIFY, "SourceMod Version");
 
 RootConsoleMenu::RootConsoleMenu()
 {
@@ -280,7 +280,7 @@ void RootConsoleMenu::OnRootConsoleCommand(const char *cmdname, const CCommand &
 	else if (strcmp(cmdname, "version") == 0)
 	{
 		ConsolePrint(" SourceMod Version Information:");
-		ConsolePrint("    SourceMod Version: %s", SVN_FULL_VERSION);
+		ConsolePrint("    SourceMod Version: %s", SM_FULL_VERSION);
 		ConsolePrint("    SourcePawn Engine: %s (build %s)", g_pSourcePawn2->GetEngineName(), g_pSourcePawn2->GetVersionString());
 		ConsolePrint("    SourcePawn API: v1 = %d, v2 = %d", g_pSourcePawn->GetEngineAPIVersion(), g_pSourcePawn2->GetAPIVersion());
 		ConsolePrint("    Compiled on: %s %s", __DATE__, __TIME__);

core/sm_stringutil.cpp

@@ -857,7 +857,7 @@ try_again:
 					memcpy(new_params, params, sizeof(void *) * numparams);
 					for (i = 0; i < trans.fmt_count; i++)
 					{
-						new_params[i] = const_cast<void *>(params[curparam + trans.fmt_order[i]]);
+						new_params[curparam + i] = const_cast<void *>(params[curparam + trans.fmt_order[i]]);
 					}
 
 					if (!gnprintf(buf_p,

core/sm_version.tpl

@@ -1,48 +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$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_SOURCEMOD_VERSION_H_
-#define _INCLUDE_SOURCEMOD_VERSION_H_
-
-/**
- * @file Contains SourceMod version information.
- */
-
-#define SM_BUILD_STRING		"$BUILD_STRING$"
-#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
-
-#endif //_INCLUDE_SOURCEMOD_VERSION_H_

core/smn_console.cpp

@@ -665,6 +665,12 @@ static cell_t sm_RegServerCmd(IPluginContext *pContext, const cell_t *params)
 	IPluginFunction *pFunction;
 
 	pContext->LocalToString(params[1], &name);
+
+	if (strcasecmp(name, "sm") == 0)
+	{
+		return 0;
+	}
+
 	pContext->LocalToString(params[3], &help);
 	pFunction = pContext->GetFunctionById(params[2]);
 
@@ -687,6 +693,12 @@ static cell_t sm_RegConsoleCmd(IPluginContext *pContext, const cell_t *params)
 	IPluginFunction *pFunction;
 
 	pContext->LocalToString(params[1], &name);
+
+	if (strcasecmp(name, "sm") == 0)
+	{
+		return 0;
+	}
+
 	pContext->LocalToString(params[3], &help);
 	pFunction = pContext->GetFunctionById(params[2]);
 
@@ -712,6 +724,12 @@ static cell_t sm_RegAdminCmd(IPluginContext *pContext, const cell_t *params)
 	int cmdflags = params[6];
 
 	pContext->LocalToString(params[1], &name);
+
+	if (strcasecmp(name, "sm") == 0)
+	{
+		return 0;
+	}
+
 	pContext->LocalToString(params[4], &help);
 	pContext->LocalToString(params[5], (char **)&group);
 	pFunction = pContext->GetFunctionById(params[2]);

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_hudtext.cpp

@@ -42,7 +42,7 @@ int g_HudMsgNum = -1;
 
 struct hud_syncobj_t
 {
-	int *player_channels;
+	int player_channels[256 + 1];
 };
 
 struct player_chaninfo_t
@@ -116,7 +116,6 @@ public:
 	{
 		hud_syncobj_t *obj = (hud_syncobj_t *)object;
 
-		delete [] obj->player_channels;
 		delete obj;
 	}
 
@@ -138,27 +137,19 @@ public:
 	Handle_t CreateHudSyncObj(IdentityToken_t *pIdent)
 	{
 		Handle_t hndl;
-		int max_clients;
 		HandleError err;
 		hud_syncobj_t *obj;
 		HandleSecurity sec;
 
-		if ((max_clients = g_Players.MaxClients()) == 0)
-		{
-			max_clients = 256+1;
-		}
-
 		obj = new hud_syncobj_t;
-		obj->player_channels = new int[max_clients];
 
-		memset(obj->player_channels, 0, sizeof(int) * max_clients);
+		memset(obj->player_channels, 0, sizeof(obj->player_channels));
 
 		sec = HandleSecurity(pIdent, g_pCoreIdent);
 		
 		if ((hndl = g_HandleSys.CreateHandleEx(m_hHudSyncObj, obj, &sec, NULL, &err))
 			== BAD_HANDLE)
 		{
-			delete [] obj->player_channels;
 			delete obj;
 		}
 

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_profiler.cpp

@@ -34,9 +34,7 @@
 
 //Note: Do not add this to Linux yet, i haven't done the HPET timing research (if even available)
 //nonetheless we need accurate counting
-#if defined PLATFORM_LINUX
-#error "Not supported"
-#endif
+#if !defined PLATFORM_LINUX
 
 struct Profiler
 {
@@ -183,3 +181,5 @@ REGISTER_NATIVES(profilerNatives)
 	{"StopProfiling",			StopProfiling},
 	{NULL,						NULL},
 };
+#endif
+

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

core/sourcemm_api.cpp

@@ -31,7 +31,7 @@
 
 #include "sourcemod.h"
 #include "sourcemm_api.h"
-#include "sm_version.h"
+#include <sourcemod_version.h>
 #include "Logger.h"
 #include "ExtensionSys.h"
 #include "concmd_cleaner.h"
@@ -145,7 +145,7 @@ const char *SourceMod_Core::GetLicense()
 
 const char *SourceMod_Core::GetVersion()
 {
-	return SVN_FULL_VERSION;
+	return SM_FULL_VERSION;
 }
 
 const char *SourceMod_Core::GetDate()

core/sourcemm_api.h

@@ -34,7 +34,7 @@
 
 #if SOURCE_ENGINE == SE_LEFT4DEAD
 #include "convar_sm_l4d.h"
-#elif SOURCE_ENGINE == SE_ORANGEBOX
+#elif (SOURCE_ENGINE == SE_ORANGEBOX) || (SOURCE_ENGINE == SE_ORANGEBOXVALVE)
 #include "convar_sm_ob.h"
 #else
 #include "convar_sm.h"

core/version.rc

@@ -9,7 +9,7 @@
 //
 #include "winres.h"
 
-#include "sm_version.h"
+#include <sourcemod_version.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  SVN_FILE_VERSION
- PRODUCTVERSION SVN_FILE_VERSION
+ FILEVERSION  SM_FILE_VERSION
+ PRODUCTVERSION SM_FILE_VERSION
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,12 +47,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "SourceMod"
             VALUE "FileDescription", "SourceMod Core"
-            VALUE "FileVersion", SVN_FULL_VERSION
+            VALUE "FileVersion", SM_FULL_VERSION
             VALUE "InternalName", "sourcemod"
             VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
             VALUE "OriginalFilename", BINARY_NAME
             VALUE "ProductName", "SourceMod"
-            VALUE "ProductVersion", SVN_FULL_VERSION
+            VALUE "ProductVersion", SM_FULL_VERSION
         END
     END
     BLOCK "VarFileInfo"

extensions/bintools/AMBuilder

@@ -0,0 +1,30 @@
+# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+import os
+
+for i in SM.sdkInfo:
+	sdk = SM.sdkInfo[i]
+	name = 'bintools.ext.' + sdk['ext']
+	
+	compiler = SM.DefaultHL2Compiler('extensions/bintools', i, True, '')
+	compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'jit'))
+	compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'jit', 'x86'))
+
+	if i != 'ep1':
+		compiler['CDEFINES'].append('HOOKING_ENABLED')
+
+	extension = AMBuild.AddJob(name)
+	binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler)
+	SM.PreSetupHL2Job(extension, binary, i)
+	binary.AddSourceFiles('extensions/bintools', [
+		'extension.cpp',
+		'CallMaker.cpp',
+		'CallWrapper.cpp',
+		'HookWrapper.cpp',
+		'jit_call.cpp',
+		'jit_hook.cpp',
+		'sdk/smsdk_ext.cpp'
+		])
+	SM.PostSetupHL2Job(extension, binary, i)
+	SM.AutoVersion('extensions/bintools', binary)
+	binary.SendToJob()
+

extensions/bintools/CallWrapper.cpp

@@ -180,7 +180,7 @@ const SourceHook::PassInfo * CallWrapper::GetSHParamInfo(unsigned int num)
 
 unsigned int CallWrapper::GetParamOffset(unsigned int num)
 {
-	assert(num <= GetParamCount() && num > 0);
+	assert(num < GetParamCount() && num >= 0);
 
 	return m_Params[num].offset;
 }

extensions/bintools/Makefile

@@ -5,6 +5,7 @@ SMSDK = ../..
 SRCDS_BASE = ~/srcds
 HL2SDK_ORIG = ../../../hl2sdk
 HL2SDK_OB = ../../../hl2sdk-ob
+HL2SDK_OB_VALVE = ../../../hl2sdk-ob-valve
 HL2SDK_L4D = ../../../hl2sdk-l4d
 MMSOURCE17 = ../../../mmsource-1.7
 
@@ -36,6 +37,7 @@ ifeq "$(ENGINE)" "original"
 	INCLUDE += -I$(HL2SDK)/public/dlls
 	INCLUDE += -I$(MMSOURCE17)/core -I$(MMSOURCE17)/core/sourcehook
 	SRCDS = $(SRCDS_BASE)
+	GAMEFIX = 1.ep1
 	override ENGSET = true
 endif
 ifeq "$(ENGINE)" "orangebox"
@@ -46,6 +48,20 @@ ifeq "$(ENGINE)" "orangebox"
 	METAMOD = $(MMSOURCE17)/core
 	INCLUDE += -I$(HL2SDK)/public/game/server
 	SRCDS = $(SRCDS_BASE)/orangebox
+	GAMEFIX = 2.ep2
+	override ENGSET = true
+	USEMETA = true
+	CFLAGS += -DHOOKING_ENABLED
+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
 	USEMETA = true
 	CFLAGS += -DHOOKING_ENABLED
@@ -54,10 +70,11 @@ ifeq "$(ENGINE)" "left4dead"
 	HL2SDK = $(HL2SDK_L4D)
 	HL2PUB = $(HL2SDK)/public
 	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=4
+	CFLAGS += -DSOURCE_ENGINE=5
 	METAMOD = $(MMSOURCE17)/core
 	INCLUDE += -I$(HL2SDK)/public/game/server
 	SRCDS = $(SRCDS_BASE)/l4d
+	GAMEFIX = 2.l4d
 	override ENGSET = true
 	USEMETA = true
 	CFLAGS += -DHOOKING_ENABLED
@@ -71,7 +88,7 @@ ifeq "$(USEMETA)" "true"
 	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/sourcepawn \
 		-I$(SMSDK)/public/extensions -I$(SMSDK)/public/jit -I$(SMSDK)/public/jit/x86
-	CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4
+	CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 -DSE_LEFT4DEAD=5  
 else
 	INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/extensions -I$(SMSDK)/public/jit \
 		-I$(SMSDK)/public/jit/x86 -I$(SMSDK)/public/sourcepawn
@@ -105,10 +122,10 @@ endif
 OS := $(shell uname -s)
 ifeq "$(OS)" "Darwin"
 	LINK += -dynamiclib
-	BINARY = $(PROJECT).ext.dylib
+	BINARY = $(PROJECT).ext.$(GAMEFIX).dylib
 else
 	LINK += -static-libgcc -shared
-	BINARY = $(PROJECT).ext.so
+	BINARY = $(PROJECT).ext.$(GAMEFIX).so
 endif
 
 GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)

extensions/bintools/extension.cpp

@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet:
  * =============================================================================
  * SourceMod BinTools Extension
  * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
@@ -29,6 +29,7 @@
  * Version: $Id$
  */
 
+#include <sourcemod_version.h>
 #include "extension.h"
 #include "CallMaker.h"
 
@@ -54,3 +55,14 @@ bool BinTools::SDK_OnLoad(char *error, size_t maxlength, bool late)
 
 	return true;
 }
+
+const char *BinTools::GetExtensionVerString()
+{
+	return SM_FULL_VERSION;
+}
+
+const char *BinTools::GetExtensionDateString()
+{
+	return SM_BUILD_TIMESTAMP;
+}
+

extensions/bintools/extension.h

@@ -81,6 +81,8 @@ public:
 	 * @return			True if working, false otherwise.
 	 */
 	//virtual bool QueryRunning(char *error, size_t maxlength);
+	const char *GetExtensionVerString();
+	const char *GetExtensionDateString();
 public:
 #if defined SMEXT_CONF_METAMOD
 	/**

extensions/bintools/msvc9/bintools.sln

@@ -9,11 +9,13 @@ Global
 		Debug - Episode 1|Win32 = Debug - Episode 1|Win32
 		Debug - Left 4 Dead|Win32 = Debug - Left 4 Dead|Win32
 		Debug - Old Metamod|Win32 = Debug - Old Metamod|Win32
+		Debug - Orange Box Valve|Win32 = Debug - Orange Box Valve|Win32
 		Debug - Orange Box|Win32 = Debug - Orange Box|Win32
 		Release - Dark Messiah|Win32 = Release - Dark Messiah|Win32
 		Release - Episode 1|Win32 = Release - Episode 1|Win32
 		Release - Left 4 Dead|Win32 = Release - Left 4 Dead|Win32
 		Release - Old Metamod|Win32 = Release - Old Metamod|Win32
+		Release - Orange Box Valve|Win32 = Release - Orange Box Valve|Win32
 		Release - Orange Box|Win32 = Release - Orange Box|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
@@ -25,6 +27,8 @@ Global
 		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Debug - Left 4 Dead|Win32.Build.0 = Debug - Left 4 Dead|Win32
 		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Debug - Old Metamod|Win32.ActiveCfg = Debug - Old Metamod|Win32
 		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Debug - Old Metamod|Win32.Build.0 = Debug - Old Metamod|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Debug - Orange Box Valve|Win32.ActiveCfg = Debug - Orange Box Valve|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Debug - Orange Box Valve|Win32.Build.0 = Debug - Orange Box Valve|Win32
 		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Debug - Orange Box|Win32.ActiveCfg = Debug - Orange Box|Win32
 		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Debug - Orange Box|Win32.Build.0 = Debug - Orange Box|Win32
 		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Release - Dark Messiah|Win32.ActiveCfg = Release - Dark Messiah|Win32
@@ -35,6 +39,8 @@ Global
 		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Release - Left 4 Dead|Win32.Build.0 = Release - Left 4 Dead|Win32
 		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Release - Old Metamod|Win32.ActiveCfg = Release - Old Metamod|Win32
 		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Release - Old Metamod|Win32.Build.0 = Release - Old Metamod|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Release - Orange Box Valve|Win32.ActiveCfg = Release - Orange Box Valve|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Release - Orange Box Valve|Win32.Build.0 = Release - Orange Box Valve|Win32
 		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Release - Orange Box|Win32.ActiveCfg = Release - Orange Box|Win32
 		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Release - Orange Box|Win32.Build.0 = Release - Orange Box|Win32
 	EndGlobalSection

extensions/bintools/msvc9/bintools.vcproj

@@ -40,7 +40,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D SE_EPISODEONE=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/D SE_EPISODEONE=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				Optimization="0"
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\jit;..\..\..\public\jit\x86;..\..\..\public\extensions;..\..\..\public\sourcepawn;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;;&quot;$(HL2SDKOB)\public&quot;;&quot;$(HL2SDKOB)\public\tier0&quot;;&quot;$(HL2SDKOB)\public\tier1&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BINTOOLS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;ORANGEBOX_BUILD;HOOKING_ENABLED;SOURCE_ENGINE=3"
@@ -59,6 +59,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -66,7 +67,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(HL2SDKOB)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier1.lib&quot; &quot;$(HL2SDKOB)\lib\public\vstdlib.lib&quot; &quot;$(HL2SDKOB)\lib\public\mathlib.lib&quot;"
-				OutputFile="$(OutDir)\bintools.ext.dll"
+				OutputFile="$(OutDir)\bintools.ext.2.ep2.dll"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
 				GenerateDebugInformation="true"
@@ -122,7 +123,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP /D SE_EPISODEONE=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/MP /D SE_EPISODEONE=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\jit;..\..\..\public\jit\x86;..\..\..\public\extensions;..\..\..\public\sourcepawn;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;;&quot;$(HL2SDKOB)\public&quot;;&quot;$(HL2SDKOB)\public\tier0&quot;;&quot;$(HL2SDKOB)\public\tier1&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BINTOOLS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;HOOKING_ENABLED;SOURCE_ENGINE=3"
@@ -139,6 +140,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -146,7 +148,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(HL2SDKOB)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier1.lib&quot; &quot;$(HL2SDKOB)\lib\public\vstdlib.lib&quot; &quot;$(HL2SDKOB)\lib\public\mathlib.lib&quot;"
-				OutputFile="$(OutDir)\bintools.ext.dll"
+				OutputFile="$(OutDir)\bintools.ext.2.ep2.dll"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
 				GenerateDebugInformation="true"
@@ -203,9 +205,9 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D SE_EPISODEONE=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/D SE_EPISODEONE=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\jit;..\..\..\public\jit\x86;..\..\..\public\extensions;..\..\..\public\sourcepawn;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;;&quot;$(HL2SDKL4D)\public&quot;;&quot;$(HL2SDKL4D)\public\tier0&quot;;&quot;$(HL2SDKL4D)\public\tier1&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BINTOOLS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;HOOKING_ENABLED;SOURCE_ENGINE=4"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BINTOOLS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;HOOKING_ENABLED;SOURCE_ENGINE=5"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -218,6 +220,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -225,7 +228,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(HL2SDKL4D)\lib\public\tier0.lib&quot; &quot;$(HL2SDKL4D)\lib\public\tier1.lib&quot; &quot;$(HL2SDKL4D)\lib\public\vstdlib.lib&quot; &quot;$(HL2SDKL4D)\lib\public\mathlib.lib&quot;"
-				OutputFile="$(OutDir)\bintools.ext.dll"
+				OutputFile="$(OutDir)\bintools.ext.2.l4d.dll"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
 				GenerateDebugInformation="true"
@@ -276,7 +279,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D SE_EPISODEONE=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/D SE_EPISODEONE=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\jit;..\..\..\public\jit\x86;..\..\..\public\extensions;..\..\..\public\sourcepawn;&quot;$(MMSOURCE17)\core\sourcehook&quot;;&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BINTOOLS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2"
 				MinimalRebuild="true"
@@ -291,6 +294,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -298,7 +302,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(HL2SDK)\lib\public\tier0.lib&quot; &quot;$(HL2SDK)\lib\public\tier1.lib&quot; &quot;$(HL2SDK)\lib\public\vstdlib.lib&quot; &quot;$(HL2SDK)\lib\public\mathlib.lib&quot;"
-				OutputFile="$(OutDir)\bintools.ext.dll"
+				OutputFile="$(OutDir)\bintools.ext.1.ep1.dll"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
 				GenerateDebugInformation="true"
@@ -349,7 +353,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D SE_EPISODEONE=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/D SE_EPISODEONE=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\jit;..\..\..\public\jit\x86;..\..\..\public\extensions;..\..\..\public\sourcepawn;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;;&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BINTOOLS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;HOOKING_ENABLED;SOURCE_ENGINE=2"
 				MinimalRebuild="true"
@@ -364,6 +368,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -371,7 +376,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(HL2SDK)\lib\public\tier0.lib&quot; &quot;$(HL2SDK)\lib\public\tier1.lib&quot; &quot;$(HL2SDK)\lib\public\vstdlib.lib&quot; &quot;$(HL2SDK)\lib\public\mathlib.lib&quot;"
-				OutputFile="$(OutDir)\bintools.ext.dll"
+				OutputFile="$(OutDir)\bintools.ext.1.ep1.dll"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
 				GenerateDebugInformation="true"
@@ -423,10 +428,10 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D SE_EPISODEONE=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/D SE_EPISODEONE=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\jit;..\..\..\public\jit\x86;..\..\..\public\extensions;..\..\..\public\sourcepawn;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;;&quot;$(HL2SDKL4D)\public&quot;;&quot;$(HL2SDKL4D)\public\tier0&quot;;&quot;$(HL2SDKL4D)\public\tier1&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BINTOOLS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;HOOKING_ENABLED;SOURCE_ENGINE=4"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BINTOOLS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;HOOKING_ENABLED;SOURCE_ENGINE=5"
 				RuntimeLibrary="0"
 				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="false"
@@ -440,6 +445,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -447,7 +453,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(HL2SDKL4D)\lib\public\tier0.lib&quot; &quot;$(HL2SDKL4D)\lib\public\tier1.lib&quot; &quot;$(HL2SDKL4D)\lib\public\vstdlib.lib&quot; &quot;$(HL2SDKL4D)\lib\public\mathlib.lib&quot;"
-				OutputFile="$(OutDir)\bintools.ext.dll"
+				OutputFile="$(OutDir)\bintools.ext.2.l4d.dll"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
 				GenerateDebugInformation="true"
@@ -505,7 +511,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D SE_EPISODEONE=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/D SE_EPISODEONE=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\jit;..\..\..\public\jit\x86;..\..\..\public\extensions;..\..\..\public\sourcepawn;&quot;$(MMSOURCE17)\core\sourcehook&quot;;&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BINTOOLS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2"
@@ -522,6 +528,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -529,7 +536,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(HL2SDK)\lib\public\tier0.lib&quot; &quot;$(HL2SDK)\lib\public\tier1.lib&quot; &quot;$(HL2SDK)\lib\public\vstdlib.lib&quot; &quot;$(HL2SDK)\lib\public\mathlib.lib&quot;"
-				OutputFile="$(OutDir)\bintools.ext.dll"
+				OutputFile="$(OutDir)\bintools.ext.1.ep1.dll"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
 				GenerateDebugInformation="true"
@@ -587,7 +594,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D SE_EPISODEONE=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/D SE_EPISODEONE=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\jit;..\..\..\public\jit\x86;..\..\..\public\extensions;..\..\..\public\sourcepawn;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;;&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BINTOOLS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;HOOKING_ENABLED;SOURCE_ENGINE=2"
@@ -604,6 +611,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -611,7 +619,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(HL2SDK)\lib\public\tier0.lib&quot; &quot;$(HL2SDK)\lib\public\tier1.lib&quot; &quot;$(HL2SDK)\lib\public\vstdlib.lib&quot; &quot;$(HL2SDK)\lib\public\mathlib.lib&quot;"
-				OutputFile="$(OutDir)\bintools.ext.dll"
+				OutputFile="$(OutDir)\bintools.ext.1.ep1.dll"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
 				GenerateDebugInformation="true"
@@ -668,7 +676,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D SE_EPISODEONE=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/D SE_EPISODEONE=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\jit;..\..\..\public\jit\x86;..\..\..\public\extensions;..\..\..\public\sourcepawn;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;;&quot;$(HL2SDK-DARKM)\public&quot;;&quot;$(HL2SDK-DARKM)\public\tier0&quot;;&quot;$(HL2SDK-DARKM)\public\tier1&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BINTOOLS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;HOOKING_ENABLED;SOURCE_ENGINE=2"
 				MinimalRebuild="true"
@@ -683,6 +691,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -690,7 +699,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(HL2SDK-DARKM)\lib\public\tier0.lib&quot; &quot;$(HL2SDK-DARKM)\lib\public\tier1.lib&quot; &quot;$(HL2SDK-DARKM)\lib\public\vstdlib.lib&quot; &quot;$(HL2SDK-DARKM)\lib\public\mathlib.lib&quot;"
-				OutputFile="$(OutDir)\bintools.ext.dll"
+				OutputFile="$(OutDir)\bintools.ext.2.darkm.dll"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
 				GenerateDebugInformation="true"
@@ -742,7 +751,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D SE_EPISODEONE=2 /D SE_ORANGEBOX=3 /D SE_LEFT4DEAD=4"
+				AdditionalOptions="/D SE_EPISODEONE=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
 				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\jit;..\..\..\public\jit\x86;..\..\..\public\extensions;..\..\..\public\sourcepawn;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;;&quot;$(HL2SDK-DARKM)\public&quot;;&quot;$(HL2SDK-DARKM)\public\tier0&quot;;&quot;$(HL2SDK-DARKM)\public\tier1&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BINTOOLS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;HOOKING_ENABLED;SOURCE_ENGINE=2"
@@ -759,6 +768,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -766,7 +776,172 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(HL2SDK-DARKM)\lib\public\tier0.lib&quot; &quot;$(HL2SDK-DARKM)\lib\public\tier1.lib&quot; &quot;$(HL2SDK-DARKM)\lib\public\vstdlib.lib&quot; &quot;$(HL2SDK-DARKM)\lib\public\mathlib.lib&quot;"
-				OutputFile="$(OutDir)\bintools.ext.dll"
+				OutputFile="$(OutDir)\bintools.ext.2.darkm.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 - 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"
+				AdditionalOptions="/D SE_EPISODEONE=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
+				Optimization="0"
+				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\jit;..\..\..\public\jit\x86;..\..\..\public\extensions;..\..\..\public\sourcepawn;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;;&quot;$(HL2SDKOBVALVE)\public&quot;;&quot;$(HL2SDKOBVALVE)\public\tier0&quot;;&quot;$(HL2SDKOBVALVE)\public\tier1&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BINTOOLS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;ORANGEBOX_BUILD;HOOKING_ENABLED;SOURCE_ENGINE=4"
+				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; &quot;$(HL2SDKOBVALVE)\lib\public\vstdlib.lib&quot; &quot;$(HL2SDKOBVALVE)\lib\public\mathlib.lib&quot;"
+				OutputFile="$(OutDir)\bintools.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"
+				AdditionalOptions="/MP /D SE_EPISODEONE=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\jit;..\..\..\public\jit\x86;..\..\..\public\extensions;..\..\..\public\sourcepawn;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;;&quot;$(HL2SDKOBVALVE)\public&quot;;&quot;$(HL2SDKOBVALVE)\public\tier0&quot;;&quot;$(HL2SDKOBVALVE)\public\tier1&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BINTOOLS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;HOOKING_ENABLED;SOURCE_ENGINE=4"
+				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; &quot;$(HL2SDKOBVALVE)\lib\public\vstdlib.lib&quot; &quot;$(HL2SDKOBVALVE)\lib\public\mathlib.lib&quot;"
+				OutputFile="$(OutDir)\bintools.ext.2.ep2v.dll"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
 				GenerateDebugInformation="true"
@@ -828,6 +1003,10 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
 			UniqueIdentifier="{C06F7BFF-18EE-4994-8572-D6383011354B}"
 			>
+			<File
+				RelativePath="..\..\..\public\extensions\IBinTools.h"
+				>
+			</File>
 			<File
 				RelativePath="..\version.rc"
 				>
@@ -907,10 +1086,6 @@
 			Name="Interfaces"
 			UniqueIdentifier="{7DE81EA3-99D9-4f34-823A-B314791F3514}"
 			>
-			<File
-				RelativePath="..\..\..\public\extensions\IBinTools.h"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

extensions/bintools/sdk/smsdk_config.h

@@ -31,7 +31,6 @@
 
 #ifndef _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_
 #define _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_
-#include "svn_version.h"
 
 /**
  * @file smsdk_config.h
@@ -41,12 +40,12 @@
 /* Basic information exposed publicly */
 #define SMEXT_CONF_NAME			"BinTools"
 #define SMEXT_CONF_DESCRIPTION	"Low-level C/C++ Calling API"
-#define SMEXT_CONF_VERSION		SVN_FULL_VERSION
+#define SMEXT_CONF_VERSION		""
 #define SMEXT_CONF_AUTHOR		"AlliedModders LLC"
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"SAMPLE"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
+#define SMEXT_CONF_DATESTRING	""
 
 /** 
  * @brief Exposes plugin's main interface.

extensions/bintools/svn_version.h

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod BinTools Extension
- * 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$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_BINTOOLS_VERSION_H_
-#define _INCLUDE_BINTOOLS_VERSION_H_
-
-#define SM_BUILD_STRING		"-dev"
-#define SM_BUILD_UNIQUEID	"2655:fb3f7371c612" 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/bintools/svn_version.tpl

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod BinTools Extension
- * 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$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_BINTOOLS_VERSION_H_
-#define _INCLUDE_BINTOOLS_VERSION_H_
-
-#define SM_BUILD_STRING		"$BUILD_STRING$"
-#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
-
-#endif //_INCLUDE_BINTOOLS_VERSION_H_

extensions/bintools/version.rc

@@ -9,7 +9,7 @@
 //
 #include "winres.h"
 
-#include "svn_version.h"
+#include <sourcemod_version.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  SVN_FILE_VERSION
- PRODUCTVERSION SVN_FILE_VERSION
+ FILEVERSION  SM_FILE_VERSION
+ PRODUCTVERSION SM_FILE_VERSION
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,12 +47,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "BinTools Extension"
             VALUE "FileDescription", "SourceMod BinTools Extension"
-            VALUE "FileVersion", SVN_FULL_VERSION
+            VALUE "FileVersion", SM_FULL_VERSION
             VALUE "InternalName", "SourceMod BinTools Extension"
             VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
-            VALUE "OriginalFilename", "bintools.ext.dll"
+            VALUE "OriginalFilename", BINARY_NAME
             VALUE "ProductName", "SourceMod BinTools Extension"
-            VALUE "ProductVersion", SVN_FULL_VERSION
+            VALUE "ProductVersion", SM_FULL_VERSION
         END
     END
     BLOCK "VarFileInfo"

extensions/clientprefs/AMBuilder

@@ -0,0 +1,19 @@
+# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+import os
+
+compiler = SM.DefaultExtCompiler('extensions/clientprefs')
+compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook'))
+
+extension = AMBuild.AddJob('clientprefs.ext')
+binary = Cpp.LibraryBuilder('clientprefs.ext', AMBuild, extension, compiler)
+binary.AddSourceFiles('extensions/clientprefs', [
+	'extension.cpp',
+	'cookie.cpp',
+	'menus.cpp',
+	'natives.cpp',
+	'query.cpp',
+	'sdk/smsdk_ext.cpp'
+	])
+SM.AutoVersion('extensions/clientprefs', binary)
+binary.SendToJob()
+

extensions/clientprefs/Makefile

@@ -5,6 +5,7 @@ SMSDK = ../..
 SRCDS_BASE = ~/srcds
 HL2SDK_ORIG = ../../../hl2sdk
 HL2SDK_OB = ../../../hl2sdk-ob
+HL2SDK_OB_VALVE = ../../../hl2sdk-ob-valve
 HL2SDK_L4D = ../../../hl2sdk-l4d
 MMSOURCE17 = ../../../mmsource-1.7
 
@@ -50,11 +51,21 @@ ifeq "$(ENGINE)" "orangebox"
 	SRCDS = $(SRCDS_BASE)/orangebox
 	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
+	override ENGSET = true
+endif
 ifeq "$(ENGINE)" "left4dead"
 	HL2SDK = $(HL2SDK_L4D)
 	HL2PUB = $(HL2SDK)/public
 	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=4
+	CFLAGS += -DSOURCE_ENGINE=5
 	METAMOD = $(MMSOURCE17)/core
 	INCLUDE += -I$(HL2SDK)/public/game/server
 	SRCDS = $(SRCDS_BASE)/l4d
@@ -68,7 +79,7 @@ ifeq "$(USEMETA)" "true"
 
 	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/sourcepawn 
-	CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4
+	CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 -DSE_LEFT4DEAD=5 
 else
 	INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions \
 		-I$(MMSOURCE17)/core/sourcehook

extensions/clientprefs/cookie.h

@@ -33,6 +33,7 @@
 #define _INCLUDE_SOURCEMOD_CLIENTPREFS_COOKIE_H_
 
 #include "extension.h"
+#include <IPlayerHelpers.h>
 #include "sh_list.h"
 #include "sm_trie_tpl.h"
 

extensions/clientprefs/extension.cpp

@@ -29,6 +29,7 @@
  * Version: $Id$
  */
 
+#include <sourcemod_version.h>
 #include "extension.h"
 
 /**
@@ -430,5 +431,13 @@ bool Translate(char *buffer,
 	return true;
 }
 
+const char *ClientPrefs::GetExtensionVerString()
+{
+	return SM_FULL_VERSION;
+}
 
+const char *ClientPrefs::GetExtensionDateString()
+{
+	return SM_BUILD_TIMESTAMP;
+}
 

extensions/clientprefs/extension.h

@@ -84,6 +84,9 @@ public:
 
 	virtual void NotifyInterfaceDrop(SMInterface *pInterface);
 
+	const char *GetExtensionVerString();
+	const char *GetExtensionDateString();
+
 	void DatabaseConnect();
 
 	bool AddQueryToQueue(TQueryOp *query);

extensions/clientprefs/msvc9/clientprefs.vcproj

@@ -58,6 +58,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -136,6 +137,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"

extensions/clientprefs/query.cpp

@@ -175,7 +175,7 @@ bool TQueryOp::BindParamsAndRun()
 				UTIL_Format(query,
 					sizeof(query),
 					"INSERT OR IGNORE INTO sm_cookies (name, description, access) \
-					 VALUES (\"%s\", \"%s\", %d)",
+					 VALUES ('%s', '%s', %d)",
 					 safe_name,
 					 safe_desc,
 					 m_params.cookie->access);
@@ -204,7 +204,7 @@ bool TQueryOp::BindParamsAndRun()
 				FROM sm_cookies				\
 				JOIN sm_cookie_cache		\
 				ON sm_cookies.id = sm_cookie_cache.cookie_id \
-				WHERE player = \"%s\"",
+				WHERE player = '%s'",
 				safe_str);
 
 			m_pResult = m_database->DoQuery(query);
@@ -248,7 +248,7 @@ bool TQueryOp::BindParamsAndRun()
 					sizeof(query),
 					"INSERT OR REPLACE INTO sm_cookie_cache						\
 					 (player, cookie_id, value, timestamp)						\
-					 VALUES (\"%s\", %d, \"%s\", %d)",
+					 VALUES ('%s', %d, '%s', %d)",
 					safe_id,
 					m_params.cookieId,
 					safe_val,
@@ -277,7 +277,7 @@ bool TQueryOp::BindParamsAndRun()
 
 			UTIL_Format(query, 
 				sizeof(query),
-				"SELECT id FROM sm_cookies WHERE name = \"%s\"",
+				"SELECT id FROM sm_cookies WHERE name = '%s'",
 				safe_name);
 
 			m_pResult = m_database->DoQuery(query);

extensions/clientprefs/sdk/smsdk_config.h

@@ -37,17 +37,15 @@
  * @brief Contains macros for configuring basic extension information.
  */
 
-#include "svn_version.h"
-
 /* Basic information exposed publicly */
 #define SMEXT_CONF_NAME			"Client Preferences"
 #define SMEXT_CONF_DESCRIPTION	"Saves client preference settings"
-#define SMEXT_CONF_VERSION		SVN_FULL_VERSION
+#define SMEXT_CONF_VERSION		""
 #define SMEXT_CONF_AUTHOR		"AlliedModders"
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"CLIENTPREFS"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
+#define SMEXT_CONF_DATESTRING	""
 
 /** 
  * @brief Exposes plugin's main interface.

extensions/clientprefs/svn_version.h

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod SDKTools Extension
- * 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$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_CLIENTPREFS_VERSION_H_
-#define _INCLUDE_CLIENTPREFS_VERSION_H_
-
-#define SM_BUILD_STRING		"-dev"
-#define SM_BUILD_UNIQUEID	"2655:fb3f7371c612" 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/clientprefs/svn_version.tpl

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod SDKTools Extension
- * 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$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_CLIENTPREFS_VERSION_H_
-#define _INCLUDE_CLIENTPREFS_VERSION_H_
-
-#define SM_BUILD_STRING		"$BUILD_STRING$"
-#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
-
-#endif //_INCLUDE_CLIENTPREFS_VERSION_H_

extensions/clientprefs/version.rc

@@ -9,7 +9,7 @@
 //
 #include "winres.h"
 
-#include "svn_version.h"
+#include <sourcemod_version.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  SVN_FILE_VERSION
- PRODUCTVERSION SVN_FILE_VERSION
+ FILEVERSION  SM_FILE_VERSION
+ PRODUCTVERSION SM_FILE_VERSION
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,12 +47,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "Client Preferences Extension"
             VALUE "FileDescription", "SourceMod Client Preferences Extension"
-            VALUE "FileVersion", SVN_FULL_VERSION
+            VALUE "FileVersion", SM_FULL_VERSION
             VALUE "InternalName", "SourceMod Client Preferences Extension"
             VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
-            VALUE "OriginalFilename", "clientprefs.ext.dll"
+            VALUE "OriginalFilename", BINARY_NAME
             VALUE "ProductName", "SourceMod Client Preferences Extension"
-            VALUE "ProductVersion", SVN_FULL_VERSION
+            VALUE "ProductVersion", SM_FULL_VERSION
         END
     END
     BLOCK "VarFileInfo"

extensions/cstrike/AMBuilder

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

extensions/cstrike/Makefile

@@ -5,6 +5,7 @@ SMSDK = ../..
 SRCDS_BASE = ~/srcds
 HL2SDK_ORIG = ../../../hl2sdk
 HL2SDK_OB = ../../../hl2sdk-ob
+HL2SDK_OB_VALVE = ../../../hl2sdk-ob-valve
 HL2SDK_L4D = ../../../hl2sdk-l4d
 MMSOURCE17 = ../../../mmsource-1.7
 
@@ -38,6 +39,7 @@ ifeq "$(ENGINE)" "original"
 	METAMOD = $(MMSOURCE17)/core-legacy
 	INCLUDE += -I$(HL2SDK)/public/dlls
 	SRCDS = $(SRCDS_BASE)
+	GAMEFIX = 1.ep1
 	override ENGSET = true
 endif
 ifeq "$(ENGINE)" "orangebox"
@@ -48,16 +50,29 @@ ifeq "$(ENGINE)" "orangebox"
 	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=4
+	CFLAGS += -DSOURCE_ENGINE=5
 	METAMOD = $(MMSOURCE17)/core
 	INCLUDE += -I$(HL2SDK)/public/game/server
 	SRCDS = $(SRCDS_BASE)/l4d
+	GAMEFIX = 2.l4d
 	override ENGSET = true
 endif
 
@@ -69,7 +84,7 @@ ifeq "$(USEMETA)" "true"
 	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_LEFT4DEAD=4
+	CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 -DSE_LEFT4DEAD=5
 else
 	INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn
 endif
@@ -100,10 +115,10 @@ endif
 OS := $(shell uname -s)
 ifeq "$(OS)" "Darwin"
 	LINK += -dynamiclib
-	BINARY = $(PROJECT).ext.dylib
+	BINARY = $(PROJECT).ext.$(GAMEFIX).dylib
 else
 	LINK += -static-libgcc -shared
-	BINARY = $(PROJECT).ext.so
+	BINARY = $(PROJECT).ext.$(GAMEFIX).so
 endif
 
 GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
@@ -112,8 +127,6 @@ ifeq "$(GCC_VERSION)" "4"
 	CPPFLAGS += $(CPP_GCC4_FLAGS)
 endif
 
-BINARY = $(PROJECT).ext.so
-
 OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
 
 $(BIN_DIR)/%.o: %.cpp

extensions/cstrike/extension.cpp

@@ -29,6 +29,7 @@
  * Version: $Id$
  */
 
+#include <sourcemod_version.h>
 #include "extension.h"
 #include "RegNatives.h"
 #include "timeleft.h"
@@ -250,3 +251,14 @@ bool CStrike::ProcessCommandTarget(cmd_target_info_t *info)
 
 	return true;
 }
+
+const char *CStrike::GetExtensionVerString()
+{
+	return SM_FULL_VERSION;
+}
+
+const char *CStrike::GetExtensionDateString()
+{
+	return SM_BUILD_TIMESTAMP;
+}
+

extensions/cstrike/extension.h

@@ -86,6 +86,9 @@ public:
 
 	void NotifyInterfaceDrop(SMInterface *pInterface);
 	bool QueryInterfaceDrop(SMInterface *pInterface);
+
+	const char *GetExtensionVerString();
+	const char *GetExtensionDateString();
 public:
 	bool ProcessCommandTarget(cmd_target_info_t *info);
 public:

extensions/cstrike/msvc9/cstrike.vcproj

@@ -58,6 +58,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -65,7 +66,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(HL2SDK)\lib\public\tier0.lib&quot; &quot;$(HL2SDK)\lib\public\tier1.lib&quot;"
-				OutputFile="$(OutDir)\game.cstrike.ext.dll"
+				OutputFile="$(OutDir)\game.cstrike.ext.1.ep1.dll"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
 				GenerateDebugInformation="true"
@@ -137,6 +138,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -144,7 +146,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(HL2SDK)\lib\public\tier0.lib&quot; &quot;$(HL2SDK)\lib\public\tier1.lib&quot;"
-				OutputFile="$(OutDir)\game.cstrike.ext.dll"
+				OutputFile="$(OutDir)\game.cstrike.ext.1.ep1.dll"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
 				GenerateDebugInformation="true"
@@ -219,6 +221,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -226,7 +229,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(HL2SDKOB)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier1.lib&quot;"
-				OutputFile="$(OutDir)\game.cstrike.ext.dll"
+				OutputFile="$(OutDir)\game.cstrike.ext.2.ep2.dll"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
 				GenerateDebugInformation="true"
@@ -298,6 +301,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -305,7 +309,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(HL2SDKOB)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier1.lib&quot;"
-				OutputFile="$(OutDir)\game.cstrike.ext.dll"
+				OutputFile="$(OutDir)\game.cstrike.ext.2.ep2.dll"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
 				GenerateDebugInformation="true"
@@ -380,6 +384,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -387,7 +392,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(HL2SDK)\lib\public\tier0.lib&quot; &quot;$(HL2SDK)\lib\public\tier1.lib&quot;"
-				OutputFile="$(OutDir)\game.cstrike.ext.dll"
+				OutputFile="$(OutDir)\game.cstrike.ext.1.ep1.dll"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
 				GenerateDebugInformation="true"
@@ -459,6 +464,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -466,7 +472,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(HL2SDK)\lib\public\tier0.lib&quot; &quot;$(HL2SDK)\lib\public\tier1.lib&quot;"
-				OutputFile="$(OutDir)\game.cstrike.ext.dll"
+				OutputFile="$(OutDir)\game.cstrike.ext.1.ep1.dll"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
 				GenerateDebugInformation="true"

extensions/cstrike/sdk/smsdk_config.h

@@ -37,17 +37,15 @@
  * @brief Contains macros for configuring basic extension information.
  */
 
-#include "svn_version.h"
-
 /* Basic information exposed publicly */
 #define SMEXT_CONF_NAME			"CS:S Tools"
 #define SMEXT_CONF_DESCRIPTION	"CS:S extended functionality"
-#define SMEXT_CONF_VERSION		SVN_FULL_VERSION
+#define SMEXT_CONF_VERSION		""
 #define SMEXT_CONF_AUTHOR		"AlliedModders LLC"
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"CSTRIKE"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
+#define SMEXT_CONF_DATESTRING	""
 
 /** 
  * @brief Exposes plugin's main interface.

extensions/cstrike/svn_version.h

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod Counter-Strike:Source Extension
- * 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$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_SDKTOOLS_VERSION_H_
-#define _INCLUDE_SDKTOOLS_VERSION_H_
-
-#define SM_BUILD_STRING		"-dev"
-#define SM_BUILD_UNIQUEID	"2655:fb3f7371c612" 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/cstrike/svn_version.tpl

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod Counter-Strike:Source Extension
- * 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$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_SDKTOOLS_VERSION_H_
-#define _INCLUDE_SDKTOOLS_VERSION_H_
-
-#define SM_BUILD_STRING		"$BUILD_STRING$"
-#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
-
-#endif //_INCLUDE_SDKTOOLS_VERSION_H_

extensions/cstrike/version.rc

@@ -9,7 +9,7 @@
 //
 #include "winres.h"
 
-#include "svn_version.h"
+#include <sourcemod_version.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  SVN_FILE_VERSION
- PRODUCTVERSION SVN_FILE_VERSION
+ FILEVERSION  SM_FILE_VERSION
+ PRODUCTVERSION SM_FILE_VERSION
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,12 +47,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "SourceMod CS:S Extension"
             VALUE "FileDescription", "SourceMod CS:S Extension"
-            VALUE "FileVersion", SVN_FULL_VERSION
+            VALUE "FileVersion", SM_FULL_VERSION
             VALUE "InternalName", "SourceMod CS:S Extension"
             VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
-            VALUE "OriginalFilename", "game.cstrike.ext.dll"
+            VALUE "OriginalFilename", BINARY_NAME
             VALUE "ProductName", "SourceMod CS:S Extension"
-            VALUE "ProductVersion", SVN_FULL_VERSION
+            VALUE "ProductVersion", SM_FULL_VERSION
         END
     END
     BLOCK "VarFileInfo"

extensions/curl/AMBuilder

@@ -0,0 +1,67 @@
+# vim: set ts=2 sw=2 tw=99 noet ft=python : 
+import os.path
+import ambuild.command as command
+import ambuild.osutil as osutil
+
+def BuildCURL():
+	curl = AMBuild.AddJob('curl')
+	if AMBuild.target['platform'] == 'linux':
+		if not osutil.FileExists(os.path.join(AMBuild.outputFolder, 'curl', 'Makefile')):
+			args = ['/bin/bash',
+							os.path.join(AMBuild.sourceFolder, 'extensions', 'curl', 'curl-src', 'configure'),
+							'--enable-static',
+							'--disable-shared',
+							'--disable-ldap',
+							'--without-ssl',
+							'--without-libidn',
+							'--without-libssh2',
+							'--without-zlib']
+			curl.AddCommand(command.DirectCommand(args))
+			curl.AddCommand(command.DirectCommand(['make']))
+	else:
+		args = ['vcbuild',
+		        os.path.join(AMBuild.sourceFolder, 'extensions', 'curl', 'curl-src', 'lib',
+		                     'build_libcurl.vcproj'),
+						'LIB Release']
+		curl.AddCommand(command.DirectCommand(args))
+		#die "Unable to find libcurl.lib!\n" unless (-f "LIB-Release\\libcurl.lib");
+
+BuildCURL()
+
+compiler = SM.DefaultExtCompiler('extensions/curl')
+extension = AMBuild.AddJob('webternet.ext')
+binary = Cpp.LibraryBuilder('webternet.ext', AMBuild, extension, compiler)
+
+curlPath = [AMBuild.sourceFolder, 'extensions', 'curl', 'curl-src', 'include']
+compiler['CXXINCLUDES'].append(os.path.join(*curlPath))
+compiler['CDEFINES'].append('CURL_STATICLIB')
+                                          
+binary.AddSourceFiles('extensions/curl', [
+	'extension.cpp',
+	'curlapi.cpp',
+	'sdk/smsdk_ext.cpp',
+	])
+
+if AMBuild.target['platform'] == 'linux':
+	path = os.path.join(AMBuild.outputFolder,
+                      'curl',
+                      'lib',
+                      '.libs',
+                      'libcurl.a')
+	binary['POSTLINKFLAGS'].append('-lrt')
+	binary.AddObjectFiles([path])
+elif AMBuild.target['platform'] == 'windows':
+	path = os.path.join(AMBuild.sourceFolder,
+	                    'extensions',
+	                    'curl',
+	                    'curl-src',
+	                    'lib',
+	                    'LIB-Release',
+	                    'libcurl.lib')
+	if os.path.isfile(path):
+		binary.RelinkIfNewer(path)
+	binary['POSTLINKFLAGS'].extend([path, 'ws2_32.lib'])
+
+SM.AutoVersion('extensions/curl', binary)
+binary.SendToJob()
+

extensions/curl/Makefile

@@ -5,6 +5,7 @@ SMSDK = ../..
 SRCDS_BASE = ~/srcds
 HL2SDK_ORIG = ../../../hl2sdk
 HL2SDK_OB = ../../../hl2sdk-ob
+HL2SDK_OB_VALVE = ../../../hl2sdk-ob-valve
 HL2SDK_L4D = ../../../hl2sdk-l4d
 MMSOURCE17 = ../../../mmsource-1.7
 
@@ -53,11 +54,21 @@ ifeq "$(ENGINE)" "orangebox"
 	SRCDS = $(SRCDS_BASE)/orangebox
 	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
+	override ENGSET = true
+endif
 ifeq "$(ENGINE)" "left4dead"
 	HL2SDK = $(HL2SDK_L4D)
 	HL2PUB = $(HL2SDK)/public
 	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=4
+	CFLAGS += -DSOURCE_ENGINE=5
 	METAMOD = $(MMSOURCE17)/core
 	INCLUDE += -I$(HL2SDK)/public/game/server
 	SRCDS = $(SRCDS_BASE)/l4d
@@ -71,7 +82,7 @@ ifeq "$(USEMETA)" "true"
 
 	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/sourcepawn
-	CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4
+	CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 -DSE_LEFT4DEAD=5
 else
 	INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn
 endif

extensions/curl/curl-src/docs/libcurl/curl_version.html

@@ -1,55 +0,0 @@
-<html><head>
-<title>curl_version man page</title>
-<meta name="generator" content="roffit 0.7">
-<STYLE type="text/css">
-P.level0 {
- padding-left: 2em;
-}
-
-P.level1 {
- padding-left: 4em;
-}
-
-P.level2 {
- padding-left: 6em;
-}
-
-span.emphasis {
- font-style: italic;
-}
-
-span.bold {
- font-weight: bold;
-}
-
-span.manpage {
- font-weight: bold;
-}
-
-h2.nroffsh {
- background-color: #e0e0e0;
-}
-
-span.nroffip {
- font-weight: bold;
- font-size: 120%;
- font-family: monospace;
-}
-
-p.roffit {
- text-align: center;
- font-size: 80%;
-}
-</STYLE>
-</head><body>
-
-<p class="level0"><a name="NAME"></a><h2 class="nroffsh">NAME</h2>
-<p class="level0">curl_version - returns the libcurl version string <a name="SYNOPSIS"></a><h2 class="nroffsh">SYNOPSIS</h2>
-<p class="level0"><span Class="bold">#include &lt;curl/curl.h&gt;</span> 
-<p class="level0"><span Class="bold">char *curl_version( );</span> 
-<p class="level0"><a name="DESCRIPTION"></a><h2 class="nroffsh">DESCRIPTION</h2>
-<p class="level0">Returns a human readable string with the version number of libcurl and some of its important components (like OpenSSL version). <a name="RETURN"></a><h2 class="nroffsh">RETURN VALUE</h2>
-<p class="level0">A pointer to a zero terminated string. <a name="SEE"></a><h2 class="nroffsh">SEE ALSO</h2>
-<p class="level0"><a class="manpage" href="./curl_version_info.html">curl_version_info (3)</a> <p class="roffit">
- This HTML page was made with <a href="http://daniel.haxx.se/projects/roffit/">roffit</a>.
-</body></html>

extensions/curl/curl-src/src/version.h

@@ -1,36 +0,0 @@
-#ifndef __VERSION_H
-#define __VERSION_H
-/***************************************************************************
- *                                  _   _ ____  _     
- *  Project                     ___| | | |  _ \| |    
- *                             / __| | | | |_) | |    
- *                            | (__| |_| |  _ <| |___ 
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- * 
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- * $Id: version.h,v 1.94 2008-01-24 14:15:49 gknauf Exp $
- ***************************************************************************/
-
-#include <curl/curlver.h>
-
-#define CURL_NAME "curl"
-#define CURL_COPYRIGHT LIBCURL_COPYRIGHT
-#define CURL_VERSION "7.19.2"
-#define CURL_VERSION_MAJOR LIBCURL_VERSION_MAJOR
-#define CURL_VERSION_MINOR LIBCURL_VERSION_MINOR
-#define CURL_VERSION_PATCH LIBCURL_VERSION_PATCH
-#define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") "
-
-#endif

extensions/curl/extension.cpp

@@ -29,6 +29,7 @@
  * Version: $Id$
  */
 
+#include <sourcemod_version.h>
 #include "extension.h"
 #include <stdarg.h>
 #include <sm_platform.h>
@@ -74,3 +75,14 @@ void CurlExt::SDK_OnUnload()
 {
 	curl_global_cleanup();
 }
+
+const char *CurlExt::GetExtensionVerString()
+{
+	return SM_FULL_VERSION;
+}
+
+const char *CurlExt::GetExtensionDateString()
+{
+	return SM_BUILD_TIMESTAMP;
+}
+

extensions/curl/extension.h

@@ -81,6 +81,8 @@ public:
 	 * @return			True if working, false otherwise.
 	 */
 	//virtual bool QueryRunning(char *error, size_t maxlength);
+	const char *GetExtensionVerString();
+	const char *GetExtensionDateString();
 public:
 #if defined SMEXT_CONF_METAMOD
 	/**

extensions/curl/msvc9/curl.vcproj

@@ -58,6 +58,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -137,6 +138,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -220,6 +222,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -300,6 +303,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -383,6 +387,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -463,6 +468,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -546,6 +552,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -626,6 +633,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -709,6 +717,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -789,6 +798,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"

extensions/curl/sdk/smsdk_config.h

@@ -31,7 +31,6 @@
 
 #ifndef _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_
 #define _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_
-#include "svn_version.h"
 
 /**
  * @file smsdk_config.h
@@ -41,12 +40,12 @@
 /* Basic information exposed publicly */
 #define SMEXT_CONF_NAME			"Webternet"
 #define SMEXT_CONF_DESCRIPTION	"Extension for interacting with URLs"
-#define SMEXT_CONF_VERSION		SVN_FULL_VERSION
+#define SMEXT_CONF_VERSION		""
 #define SMEXT_CONF_AUTHOR		"AlliedModders LLC"
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"WEB"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__
+#define SMEXT_CONF_DATESTRING	""
 
 /** 
  * @brief Exposes plugin's main interface.

extensions/curl/svn_version.h

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod GeoIP Extension
- * 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$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_GEOIP_VERSION_H_
-#define _INCLUDE_GEOIP_VERSION_H_
-
-#define SM_BUILD_STRING		"-dev"
-#define SM_BUILD_UNIQUEID	"2655:fb3f7371c612" 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/curl/svn_version.tpl

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod GeoIP Extension
- * 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$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_GEOIP_VERSION_H_
-#define _INCLUDE_GEOIP_VERSION_H_
-
-#define SM_BUILD_STRING		"$BUILD_STRING$"
-#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
-
-#endif //_INCLUDE_GEOIP_VERSION_H_

extensions/curl/version.rc

@@ -9,7 +9,7 @@
 //
 #include "winres.h"
 
-#include "svn_version.h"
+#include <sourcemod_version.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  SVN_FILE_VERSION
- PRODUCTVERSION SVN_FILE_VERSION
+ FILEVERSION  SM_FILE_VERSION
+ PRODUCTVERSION SM_FILE_VERSION
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,12 +47,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "Webternet Extension"
             VALUE "FileDescription", "SourceMod Webternet Extension"
-            VALUE "FileVersion", SVN_FULL_VERSION
+            VALUE "FileVersion", SM_FULL_VERSION
             VALUE "InternalName", "SourceMod Webternet Extension"
             VALUE "LegalCopyright", "Copyright (c) 2004-2009, AlliedModders LLC"
-            VALUE "OriginalFilename", "webternet.ext.dll"
+            VALUE "OriginalFilename", BINARY_NAME
             VALUE "ProductName", "SourceMod Webternet Extension"
-            VALUE "ProductVersion", SVN_FULL_VERSION
+            VALUE "ProductVersion", SM_FULL_VERSION
         END
     END
     BLOCK "VarFileInfo"

extensions/geoip/AMBuilder

@@ -0,0 +1,15 @@
+# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+compiler = SM.DefaultExtCompiler('extensions/geoip')
+
+extension = AMBuild.AddJob('geoip.ext')
+binary = Cpp.LibraryBuilder('geoip.ext', AMBuild, extension, compiler)
+binary.AddSourceFiles('extensions/geoip', [
+	'extension.cpp',
+	'GeoIP.c',
+	'sdk/smsdk_ext.cpp'
+	])
+if AMBuild.target['platform'] == 'windows':
+	binary['POSTLINKFLAGS'].append('wsock32.lib')
+SM.AutoVersion('extensions/geoip', binary)
+binary.SendToJob()
+

extensions/geoip/Makefile

@@ -5,6 +5,7 @@ SMSDK = ../..
 SRCDS_BASE = ~/srcds
 HL2SDK_ORIG = ../../../hl2sdk
 HL2SDK_OB = ../../../hl2sdk-ob
+HL2SDK_OB_VALVE = ../../../hl2sdk-ob-valve
 HL2SDK_L4D = ../../../hl2sdk-l4d
 MMSOURCE17 = ../../../mmsource-1.7
 
@@ -50,11 +51,21 @@ ifeq "$(ENGINE)" "orangebox"
 	SRCDS = $(SRCDS_BASE)/orangebox
 	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
+	override ENGSET = true
+endif
 ifeq "$(ENGINE)" "left4dead"
 	HL2SDK = $(HL2SDK_L4D)
 	HL2PUB = $(HL2SDK)/public
 	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=4
+	CFLAGS += -DSOURCE_ENGINE=5
 	METAMOD = $(MMSOURCE17)/core
 	INCLUDE += -I$(HL2SDK)/public/game/server
 	SRCDS = $(SRCDS_BASE)/l4d
@@ -68,7 +79,7 @@ ifeq "$(USEMETA)" "true"
 
 	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/sourcepawn
-	CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4
+	CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 -DSE_LEFT4DEAD=5 
 else
 	INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn
 endif

extensions/geoip/extension.cpp

@@ -29,6 +29,7 @@
  * Version: $Id$
  */
 
+#include <sourcemod_version.h>
 #include "extension.h"
 #include "GeoIP.h"
 
@@ -67,6 +68,16 @@ void GeoIP_Extension::SDK_OnUnload()
 	gi = NULL;
 }
 
+const char *GeoIP_Extension::GetExtensionVerString()
+{
+	return SM_FULL_VERSION;
+}
+
+const char *GeoIP_Extension::GetExtensionDateString()
+{
+	return SM_BUILD_TIMESTAMP;
+}
+
 /*******************************
 *                              *
 * GEOIP NATIVE IMPLEMENTATIONS *
@@ -131,3 +142,4 @@ const sp_nativeinfo_t geoip_natives[] =
 	{"GeoipCountry",		sm_Geoip_Country},
 	{NULL,					NULL},
 };
+

extensions/geoip/extension.h

@@ -62,6 +62,9 @@ public:
 	 */
 	virtual void SDK_OnUnload();
 
+	const char *GetExtensionVerString();
+	const char *GetExtensionDateString();
+
 	/**
 	 * @brief This is called once all known extensions have been loaded.
 	 * Note: It is is a good idea to add natives here, if any are provided.

extensions/geoip/msvc9/geoip.vcproj

@@ -58,6 +58,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -137,6 +138,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"

extensions/geoip/sdk/smsdk_config.h

@@ -31,7 +31,6 @@
 
 #ifndef _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_
 #define _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_
-#include "svn_version.h"
 
 /**
  * @file smsdk_config.h
@@ -41,12 +40,12 @@
 /* Basic information exposed publicly */
 #define SMEXT_CONF_NAME			"GeoIP"
 #define SMEXT_CONF_DESCRIPTION	"Geographical IP information"
-#define SMEXT_CONF_VERSION		SVN_FULL_VERSION
+#define SMEXT_CONF_VERSION		""
 #define SMEXT_CONF_AUTHOR		"AlliedModders LLC"
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"GEOIP"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
+#define SMEXT_CONF_DATESTRING	""
 
 /** 
  * @brief Exposes plugin's main interface.

extensions/geoip/svn_version.h

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod GeoIP Extension
- * 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$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_GEOIP_VERSION_H_
-#define _INCLUDE_GEOIP_VERSION_H_
-
-#define SM_BUILD_STRING		"-dev"
-#define SM_BUILD_UNIQUEID	"2655:fb3f7371c612" 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/svn_version.tpl

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod GeoIP Extension
- * 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$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_GEOIP_VERSION_H_
-#define _INCLUDE_GEOIP_VERSION_H_
-
-#define SM_BUILD_STRING		"$BUILD_STRING$"
-#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
-
-#endif //_INCLUDE_GEOIP_VERSION_H_

extensions/geoip/version.rc

@@ -9,7 +9,7 @@
 //
 #include "winres.h"
 
-#include "svn_version.h"
+#include <sourcemod_version.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  SVN_FILE_VERSION
- PRODUCTVERSION SVN_FILE_VERSION
+ FILEVERSION  SM_FILE_VERSION
+ PRODUCTVERSION SM_FILE_VERSION
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,12 +47,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "GeoIP Extension"
             VALUE "FileDescription", "SourceMod GeoIP Extension"
-            VALUE "FileVersion", SVN_FULL_VERSION
+            VALUE "FileVersion", SM_FULL_VERSION
             VALUE "InternalName", "SourceMod GeoIP Extension"
             VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
-            VALUE "OriginalFilename", "geoip.ext.dll"
+            VALUE "OriginalFilename", BINARY_NAME
             VALUE "ProductName", "SourceMod GeoIP Extension"
-            VALUE "ProductVersion", SVN_FULL_VERSION
+            VALUE "ProductVersion", SM_FULL_VERSION
         END
     END
     BLOCK "VarFileInfo"

extensions/mysql/AMBuilder

@@ -0,0 +1,38 @@
+# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+import os
+
+compiler = SM.DefaultExtCompiler('extensions/mysql')
+compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['MYSQL5'], 'include'))
+compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook'))
+
+extension = AMBuild.AddJob('dbi.mysql.ext')
+binary = Cpp.LibraryBuilder('dbi.mysql.ext', AMBuild, extension, compiler)
+
+if AMBuild.target['platform'] == 'linux':
+	lib = os.path.join(AMBuild.cache['MYSQL5'], 'lib', 'libmysqlclient_r.a')
+	link = [lib,
+          '-lz',
+          '-lpthread',
+          '-lm']
+	binary.RelinkIfNewer(lib)
+	binary['POSTLINKFLAGS'].extend(link)
+elif AMBuild.target['platform'] == 'windows':
+	mylib = os.path.join(AMBuild.cache['MYSQL5'], 'lib', 'opt', 'mysqlclient.lib')
+	zlib = os.path.join(AMBuild.cache['MYSQL5'], 'lib', 'opt', 'zlib.lib')
+	binary.RelinkIfNewer(mylib)
+	binary.RelinkIfNewer(zlib)
+	binary['POSTLINKFLAGS'].extend([mylib, zlib, 'wsock32.lib'])
+
+
+binary.AddSourceFiles('extensions/mysql', [
+	'sdk/smsdk_ext.cpp',
+	'mysql/MyBasicResults.cpp',
+	'mysql/MyBoundResults.cpp',
+	'mysql/MyDatabase.cpp',
+	'mysql/MyDriver.cpp',
+	'mysql/MyStatement.cpp',
+	'extension.cpp'
+	])
+SM.AutoVersion('extensions/mysql', binary)
+binary.SendToJob()
+

extensions/mysql/Makefile

@@ -5,6 +5,7 @@ SMSDK = ../..
 SRCDS_BASE = ~/srcds
 HL2SDK_ORIG = ../../../hl2sdk
 HL2SDK_OB = ../../../hl2sdk-ob
+HL2SDK_OB_VALVE = ../../../hl2sdk-ob-valve
 HL2SDK_L4D = ../../../hl2sdk-l4d
 MMSOURCE17 = ../../../mmsource-1.7
 MYSQL = ../../../mysql-5.0
@@ -54,11 +55,21 @@ ifeq "$(ENGINE)" "orangebox"
 	SRCDS = $(SRCDS_BASE)/orangebox
 	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
+	override ENGSET = true
+endif
 ifeq "$(ENGINE)" "left4dead"
 	HL2SDK = $(HL2SDK_L4D)
 	HL2PUB = $(HL2SDK)/public
 	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=4
+	CFLAGS += -DSOURCE_ENGINE=5
 	METAMOD = $(MMSOURCE17)/core
 	INCLUDE += -I$(HL2SDK)/public/game/server
 	SRCDS = $(SRCDS_BASE)/l4d
@@ -75,7 +86,7 @@ ifeq "$(USEMETA)" "true"
 else
 	INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(MMSOURCE17)/core/sourcehook \
 		-I$(MYSQL)/include
-	CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4
+	CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 -DSE_LEFT4DEAD=5 
 endif
 
 LINK += $(MYSQL)/lib/libmysqlclient_r.a -lz -lpthread

extensions/mysql/extension.cpp

@@ -29,6 +29,7 @@
  * Version: $Id$
  */
 
+#include <sourcemod_version.h>
 #include "extension.h"
 #include "mysql/MyDriver.h"
 #include <assert.h>
@@ -58,3 +59,14 @@ void DBI_MySQL::SDK_OnUnload()
 	//:TODO: is this needed?
 	//mysql_library_end();
 }
+
+const char *DBI_MySQL::GetVersion()
+{
+	return SM_FULL_VERSION;
+}
+
+const char *DBI_MySQL::GetDate()
+{
+	return SM_BUILD_TIMESTAMP;
+}
+

extensions/mysql/extension.h

@@ -81,6 +81,8 @@ public:
 	 * @return			True if working, false otherwise.
 	 */
 	//virtual bool QueryRunning(char *error, size_t maxlength);
+	const char *GetVersion();
+	const char *GetDate();
 public:
 #if defined SMEXT_CONF_METAMOD
 	/**

extensions/mysql/msvc9/sm_mysql.vcproj

@@ -59,6 +59,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -139,6 +140,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"

extensions/mysql/sdk/smsdk_config.h

@@ -37,17 +37,15 @@
  * @brief Contains macros for configuring basic extension information.
  */
 
-#include "svn_version.h"
-
 /* Basic information exposed publicly */
 #define SMEXT_CONF_NAME			"MySQL-DBI"
 #define SMEXT_CONF_DESCRIPTION	"MySQL driver implementation for DBI"
-#define SMEXT_CONF_VERSION		SVN_FULL_VERSION
+#define SMEXT_CONF_VERSION		""
 #define SMEXT_CONF_AUTHOR		"AlliedModders LLC"
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"MYSQL"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
+#define SMEXT_CONF_DATESTRING	""
 
 /** 
  * @brief Exposes plugin's main interface.

extensions/mysql/svn_version.h

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod MySQL Extension
- * 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$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_MYSQLEXT_VERSION_H_
-#define _INCLUDE_MYSQLEXT_VERSION_H_
-
-#define SM_BUILD_STRING		"-dev"
-#define SM_BUILD_UNIQUEID	"2655:fb3f7371c612" 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/mysql/svn_version.tpl

@@ -1,44 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod MySQL Extension
- * 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$
- */
-
-/**
- * Autogenerated by build scripts
- */
-
-#ifndef _INCLUDE_MYSQLEXT_VERSION_H_
-#define _INCLUDE_MYSQLEXT_VERSION_H_
-
-#define SM_BUILD_STRING		"$BUILD_STRING$"
-#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
-
-#endif //_INCLUDE_MYSQLEXT_VERSION_H_

extensions/mysql/version.rc

@@ -9,7 +9,7 @@
 //
 #include "winres.h"
 
-#include "svn_version.h"
+#include <sourcemod_version.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  SVN_FILE_VERSION
- PRODUCTVERSION SVN_FILE_VERSION
+ FILEVERSION  SM_FILE_VERSION
+ PRODUCTVERSION SM_FILE_VERSION
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,12 +47,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "MySQL Extension"
             VALUE "FileDescription", "SourceMod MySQL Extension"
-            VALUE "FileVersion", SVN_FULL_VERSION
+            VALUE "FileVersion", SM_FULL_VERSION
             VALUE "InternalName", "SourceMod MySQL Extension"
             VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
-            VALUE "OriginalFilename", "dbi.mysql.ext.dll"
+            VALUE "OriginalFilename", BINARY_NAME
             VALUE "ProductName", "SourceMod MySQL Extension"
-            VALUE "ProductVersion", SVN_FULL_VERSION
+            VALUE "ProductVersion", SM_FULL_VERSION
         END
     END
     BLOCK "VarFileInfo"

extensions/regex/AMBuilder

@@ -0,0 +1,25 @@
+# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+import os
+
+compiler = SM.DefaultExtCompiler('extensions/regex')
+compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook'))
+
+extension = AMBuild.AddJob('regex.ext')
+binary = Cpp.LibraryBuilder('regex.ext', AMBuild, extension, compiler)
+
+if AMBuild.target['platform'] == 'linux':
+	path = os.path.join(AMBuild.sourceFolder, 'extensions', 'regex', 'lib_linux', 'libpcre.a')
+elif AMBuild.target['platform'] == 'windows':
+	path = os.path.join(AMBuild.sourceFolder, 'extensions', 'regex', 'lib_win', 'pcre.lib')
+
+binary.RelinkIfNewer(path)
+binary['POSTLINKFLAGS'].append(path)
+
+binary.AddSourceFiles('extensions/regex', [
+	'extension.cpp',
+	'CRegEx.cpp',
+	'sdk/smsdk_ext.cpp',
+	])
+SM.AutoVersion('extensions/regex', binary)
+binary.SendToJob()
+

extensions/regex/Makefile

@@ -5,6 +5,7 @@ SMSDK = ../..
 SRCDS_BASE = ~/srcds
 HL2SDK_ORIG = ../../../hl2sdk
 HL2SDK_OB = ../../../hl2sdk-ob
+HL2SDK_OB_VALVE = ../../../hl2sdk-ob-valve
 HL2SDK_L4D = ../../../hl2sdk-l4d
 MMSOURCE17 = ../../../mmsource-1.7
 
@@ -50,11 +51,21 @@ ifeq "$(ENGINE)" "orangebox"
 	SRCDS = $(SRCDS_BASE)/orangebox
 	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
+	override ENGSET = true
+endif
 ifeq "$(ENGINE)" "left4dead"
 	HL2SDK = $(HL2SDK_L4D)
 	HL2PUB = $(HL2SDK)/public
 	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=4
+	CFLAGS += -DSOURCE_ENGINE=5
 	METAMOD = $(MMSOURCE17)/core
 	INCLUDE += -I$(HL2SDK)/public/game/server
 	SRCDS = $(SRCDS_BASE)/l4d
@@ -68,7 +79,7 @@ ifeq "$(USEMETA)" "true"
 
 	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/sourcepawn
-	CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4
+	CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 -DSE_LEFT4DEAD=5
 else
 	INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(MMSOURCE17)/core/sourcehook
 endif

extensions/regex/extension.cpp

@@ -29,8 +29,8 @@
  * Version: $Id$
  */
 
+#include <sourcemod_version.h>
 #include "extension.h"
-
 #include <sh_string.h>
 #include "pcre.h"
 #include "CRegEx.h"
@@ -63,6 +63,16 @@ void RegexExtension::SDK_OnUnload()
 
 }
 
+const char *RegexExtension::GetExtensionVerString()
+{
+	return SM_FULL_VERSION;
+}
+
+const char *RegexExtension::GetExtensionDateString()
+{
+	return SM_BUILD_TIMESTAMP;
+}
+
 static cell_t CompileRegex(IPluginContext *pCtx, const cell_t *params)
 {
 	char *regex;

extensions/regex/extension.h

@@ -62,6 +62,9 @@ public:
 	 */
 	virtual void SDK_OnUnload();
 
+	const char *GetExtensionVerString();
+	const char *GetExtensionDateString();
+
 	/**
 	 * @brief This is called once all known extensions have been loaded.
 	 * Note: It is is a good idea to add natives here, if any are provided.