Strip -dev tags for release.

This should fix sm_kick.

.hgignore

@@ -6,6 +6,7 @@
 # Files generated by Visual Studio
 \.aps$
 \.ncb$
+\.sdf$
 \.suo$
 \.user$
 
@@ -13,3 +14,10 @@
 /CrazyDebug.*
 /Debug.*
 /Release.*
+
+# Files generated by Mac OS X Finder
+(^|/)\.DS_Store$
+
+# Files generated by Windows Explorer
+(^|/)[dD]esktop\.ini$
+(^|/)[tT]humbs\.db$

.hgtags

@@ -3,3 +3,9 @@ e6ef5ecdf8d75740ca2685a709bf321f8873bc3b sourcemod-1.1.0
 e877885fac80be71822641f7a9122cebc9812521 sourcemod-1.1.1
 b3ffa8a4511c4eadaf533fc790aa6b14f7f0c6ea sourcemod-1.1.2
 3a73bbf60f34befa9b66be03fa5974b394bb3411 sourcemod-1.2.0
+a71318396392e3c6d0ff31e069a60fbde59e0cea sourcemod-1.3.0
+3f33d01fcc28b509bed30f7be07ed215cc000538 sourcemod-1.3.1
+a3e8f7a7fdf7f012dd02ad491a2e1ccdad151687 sourcemod-1.3.2
+c5062ca8283033cf33f45da6f19e486ca10835ff sourcemod-1.3.3
+4d6afc42522c8f416dc45be7af7b145507b00630 sourcemod-1.3.4
+9de8baa40cc593d8ca5f976a3357772e804ae9e8 sourcemod-1.3.5

AMBuildScript

@@ -0,0 +1,323 @@
+# 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'}
+		self.sdkInfo['l4d2'] =   {'sdk': 'HL2SDKL4D2',     'ext': '2.l4d2',   'def': '6',
+		                         'name': 'LEFT4DEAD2'}
+		if AMBuild.target['platform'] == 'windows':
+			self.sdkInfo['darkm'] = {'sdk': 'HL2SDK-DARKM',  'ext': '2.darkm', 'def': '2',
+		                           'name': 'DARKMESSIAH'}
+			self.sdkInfo['swarm'] = {'sdk': 'HL2SDK-SWARM',  'ext': '2.swarm', 'def': '7',
+		                           'name': 'ALIENSWARM'}
+
+		if AMBuild.mode == 'config':
+			#Detect compilers
+			self.compiler.DetectAll(AMBuild)
+
+			#Detect variables
+			envvars = { 'MMSOURCE18':    'mmsource-1.8',
+									'HL2SDK':        'hl2sdk',
+									'HL2SDKOB':      'hl2sdk-ob',
+									'HL2SDKL4D':     'hl2sdk-l4d',
+									'HL2SDKOBVALVE': 'hl2sdk-ob-valve',
+									'HL2SDKL4D2': 	 'hl2sdk-l4d2',
+									'MYSQL5':        'mysql-5.0'
+			}
+
+			#Dark Messiah is Windows-only
+			if AMBuild.target['platform'] == 'windows':
+				envvars['HL2SDK-DARKM'] = 'hl2sdk-darkm'
+				envvars['HL2SDK-SWARM'] = 'hl2sdk-swarm'
+
+			#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()
+					oldhead = None
+					while head != None and head != oldhead:
+						path = os.path.join(head, envvars[i])
+						if os.path.isdir(path):
+							break
+						oldhead = head
+						head, tail = os.path.split(head)
+					if head == None or head == oldhead:
+						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')
+					self.compiler.AddToListVar('POSTLINKFLAGS', '/NODEFAULTLIB:libcmt')
+				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', '/Ox')
+					self.compiler.AddToListVar('POSTLINKFLAGS', '/OPT:ICF')
+					self.compiler.AddToListVar('POSTLINKFLAGS', '/OPT:REF')
+
+			#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.compiler.AddToListVar('RCINCLUDES',
+			                           os.path.join(AMBuild.outputFolder, 'includes'))
+		self.mmsPath = AMBuild.cache['MMSOURCE18']
+
+	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 + '"', 'SM_GENERATED_BUILD']}
+		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)
+			if sdk in ['ep2v', 'l4d', 'l4d2']:
+				for i in ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.so', 'libtier0.so']:
+					link = os.path.join(workFolder, i)
+					target = os.path.join(staticLibs, i)
+					try:
+						os.lstat(link)
+					except:
+						job.AddCommand(SymlinkCommand(link, target))
+			else:
+				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':
+			libs = ['tier0', 'tier1', 'vstdlib', 'mathlib']
+			if sdk == 'swarm':
+				libs.append('interfaces')
+			for lib in libs:
+				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])
+		if AMBuild.target['platform'] != 'windows':
+			compiler['CDEFINES'].extend(['SE_DARKMESSIAH=2', 'SE_ALIENSWARM=7'])
+
+		paths = [['public'], ['public', 'engine'], ['public', 'mathlib'], ['public', 'vstdlib'],
+						 ['public', 'tier0'], ['public', 'tier1']]
+		if sdk == 'ep1' or sdk == 'darkm':
+			paths.append(['public', 'dlls'])
+			paths.append(['game_shared'])
+		else:
+			paths.append(['public', 'game', 'server'])
+			paths.append(['game', 'shared'])
+			paths.append(['common'])
+
+		info = self.sdkInfo[sdk]
+		sdkPath = AMBuild.cache[info['sdk']]
+
+		compiler['CDEFINES'].append('SOURCE_ENGINE=' + info['def'])
+
+		if sdk == 'swarm' and AMBuild.target['platform'] == 'windows':
+			compiler['CDEFINES'].extend(['COMPILER_MSVC', 'COMPILER_MSVC32'])
+
+		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']
+				if sdk in ['ep2v', 'l4d', 'l4d2']:
+					compiler['POSTLINKFLAGS'][0:0] = ['libtier0.so']
+					compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib.so']
+				else:
+					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'],
+		['core', 'logic', '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,259 @@ SourceMod Changelog
 
 ----------------------------
 
+SourceMod 1.3.6 [2010-10-31]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.3.6_Release_Notes
+
+User Changes:
+
+ - Updated support for latest Left 4 Dead 1 (bug 4682).
+
+Developer Changes:
+
+ - Updated TF2 custom kill defines (bug 4681).
+
+----------------------------
+
+SourceMod 1.3.5 [2010-10-17]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.3.5_Release_Notes
+
+User Changes:
+
+ - Updated support for CS:S, Garry's Mod, DoD:S, TF2, HL2DM.
+ - Added support for Firearms: Source (bug 4537).
+ - Added support for Fistful of Frags (bug 3883).
+ - Added support for Alien Swarm (bug 4530).
+ - Fixed living players hearing dead players if alltalk is disabled while deadtalk is on (bug 4533, thanks Zach Callear).
+ - Fixed timeleft not getting reset on Game_Commencing in CS:S (bug 4557).
+ - Fixed PlayerRunCmd being hooked when not used (bug 3990).
+ - Fixed errors and missing effects caused by missing sprites on L4D2 (bug 4512).
+ - Fixed 'sm plugins' public command skipping plugins in recommended listing (bug 4501).
+ - Fixed corruption with large database.cfg files (bug 4286).
+
+Developer Changes:
+
+ - Added TF2 object stocks (bug 4536).
+ - Added TF2_MakeBleed native to TF2 ext (bug 4542).
+ - Added support for logical entities in Synergy (bug 4534).
+ - Updated TF2 conditions enum and defines (bug 4526).
+ - Fixed potential crash with IMemUtils::FindPattern on Linux (bug 4554).
+
+----------------------------
+
+SourceMod 1.3.4 [2010-07-18]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.3.4_Release_Notes
+
+User Changes:
+
+ - Support for latest TF update (bug 4506).
+ - Support for latest L4D2 update (bug 4509).
+
+Developer Changes:
+
+ - Added FindFlagChar native (bug 3776).
+ - Added GetConVarDefault native (bug 4502).
+ - Added forward for TF's GetHoliday function (bug 4462). 
+
+----------------------------
+
+SourceMod 1.3.3 [2010-06-23]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.3.3_Release_Notes
+
+User Changes:
+
+ - Added support for CS:S on Orange Box
+ - Added gamedata for Resistance and Liberation (bug 4418).
+ - Updated gamedata for SourceForts, Empires, Obsidian Conflict, Zombie Master.
+ - Fixed memory corruption and leaks with some voice functionality (bug 4415).
+ - Fixed UI bug in sm_motd (bug 4460). 
+
+Developer Changes:
+
+ - Added new player condition (TFCond_CritCola, bug 4447).
+ - Fixed clientprefs deleting cookies twice in rare cases (bug 4412).
+ - Fixed OnClientConnected forward not firing for bots (bug 4443).
+ - Fixed sm_dump_datamaps crash (bug 4424).
+ - Fixed switch case comparisons failing with large numbers (bug 4457).
+ - Fixed rare crash in output hooks (bug 4422).
+ - Fixed bug with dynamically sized arrays being sliced (bug 4428).
+ - Fixed SendConVarValue() on TF2, DOD:S, L4D, and L4D2 (bug 4273).
+ - Fixed TF2 natives not being marked optional (bug 4389). 
+
+----------------------------
+
+SourceMod 1.3.2 [2010-05-02]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.3.2_Release_Notes
+
+User Changes:
+
+ - Support for recent TF, DoD, and L4D2 updates (bug 4356, bug 4361, bug 4371, bug 4374, bug 4375).
+ - Fixed rare crash when replicating cvars to clients (bug 4315).
+ - Lots of extra game support for Insurgency, ZPS, CSProMod, PVKII, and FortressForever (thanks
+   Nicholas "psychonic" hastings). 
+
+Developer Changes:
+
+ - Added TF functions for stunning, conditions, regeneration, and power play (bug 4166, bug 4331).
+
+----------------------------
+
+SourceMod 1.3.1 [2010-02-09]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.3.1_Release_Notes
+
+User Changes:
+
+ - Added extended support for CSProMod (bug 4255).
+ - Fixed client disconnect crash on many third party games (bug 4231).
+ - Improved support for Battlegrounds 2 (bug 4146).
+ - Improved support for Insurgency (bug 4180).
+ - Improved support for Garry's Mod (bug 4230, bug 4268).
+ - Improved support for Synergy (bug 4235).
+ - Updated Day of Defeat support for 20010123 update (bug 4262).
+ - Fixed Webternet extension not loading on Windows 2000 (bug 4234). 
+
+Developer Changes:
+
+ - Fixed compiler complaints when using |any| tag on array arguments (bug 4274).
+ - Fixed GetClientCookieTime not being exported (bug 4237).
+ - Fixed potential crash in entity handling code (bug 4249). 
+
+----------------------------
+
+SourceMod 1.3.0 [2010-01-15]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.3.0_Release_Notes
+
+Major Features:
+ * Left 4 Dead 2 support
+ * Non-networked entity support
+
+User Changes:
+
+ - Added Left 4 Dead 2 support (bug 4075).
+ - Added much richer voting progress feedback (bug 1997).
+ - Improved support for various third-party games (Nicholas "psychonic" Hastings).
+ - Added @spec target (bug 2718).
+ - Added sm_resetcvar command (bug 3636).
+ - Added "motd" chat trigger (bug 2694).
+ - Updated GeoIP to OCT-2009.
+ - Fixed rare map vote error (bug 3905).
+ - Fixed small leak in the nominations plugin (bug 4104).
+ - Fixed last client being excluded from some command effects (bug 3984).
+ - Fixed crashes in plugin [|un|re]loading (bug 4034, bug 4038, bug 4044, bug 4153).
+ - Special target "@me" is now filtered for certain statuses properly (bug 4000).
+ - Improved non-admin to admin chat (bug 3844).
+ - Removed "auto.*" extension folders (bug 3949). 
+
+Developer Changes:
+
+ - Added non-networked entity support (bug 2459).
+ - Added improved random number generator (bug 3831).
+ - Added GetClientCookieTime native (bug 3736).
+ - Added AskPluginLoad2 callback (bug 3716).
+ - Added PlayerRunCmd callback (bug 3289).
+ - Added PointOutsideWorld native (bug 3906).
+ - Added API for "blanket" command hooks (bug 4015).
+ - Added ability to test for SourceMod features (bug 4021).
+ - Added ability to change broadcast status on hooked events (bug 3886).
+ - OnClientCommand no longer receives unconnected clients (bug 3732).
+ - Fixed various bugs in client listening API (bug 3818).
+ - Fixed crash in BanClient (bug 3912).
+ - Fixed various crashes in self-removing callbacks (bug 4059).
+ - Fixed rare HUD text crash on TF (bug 4016).
+ - Fixed OnConfigsExecuted not running on EP1 games with large configs (bug 3828).
+ - Fixed entity output hooks not working (bug 3988).
+ - Gamedata folder matches are now case-insensitive (bug 3913).
+ - Blocked plugins from hooking "sm" command (bug 4013). 
+
+----------------------------
+
+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

configs/cfg/sm_warmode_on.cfg

@@ -1,6 +1,7 @@
 //This file unloads all plugins, re-loads a few "safe" ones, and then prevents 
 //any more plugins from being loaded.
 sm plugins unload_all
+sm plugins load_unlock
 sm plugins load basebans.smx
 sm plugins load basecommands.smx
 sm plugins load admin-flatfile.smx

configs/cfg/sourcemod.cfg

@@ -80,21 +80,21 @@ sm_reserve_type 0
 sm_reserved_slots 0
 
 // Specifies whether or not reserved slots will be hidden (subtracted from max
-// slot count). Valid values are 0 (visible) or 1 (hidden).
+// slot count). Valid values are 0 (Visible) or 1 (Hidden).
 // --
 // Requires: reservedslots.smx
 // Default: 0
 sm_hide_slots 0
 
 // Specifies whether or not non-admins can send messages to admins using
-// say_team @<message>. Valid values are 0 (disabled) or 1 (enabled)
+// say_team @<message>. Valid values are 0 (Disabled) or 1 (Enabled)
 // --
 // Requires: basechat.smx
 // Default: 1
 sm_chat_mode 1
 
 // Specifies whether or not "timeleft" will automaticly be triggered every
-// x seconds. Valid values are 0 (disabled) to 1800 seconds.
+// x seconds. Valid values are 0 (Disabled) to 1800 seconds.
 // --
 // Requires: basetriggers.smx
 // Default: 0
@@ -107,3 +107,28 @@ sm_timeleft_interval 0
 // Requires: basetriggers.smx
 // Default: 1
 sm_trigger_show 1
+
+// Specifies whether or not to display vote progress to clients in the
+// "hint" box (near the bottom of the screen in most games).
+// Valid values are 0 (Disabled) or 1 (Enabled).
+// --
+// Default: 0
+sm_vote_progress_hintbox 0
+
+// Specifies whether or not to display vote progress to clients in the
+// chat area. Valid values are 0 (Disabled) or 1 (Enabled).
+// --
+// Default: 0
+sm_vote_progress_chat 0
+
+// Specifies whether or not to display vote progress in the server console.
+// Valid values are 0 (Disabled) or 1 (Enabled).
+// --
+// Default: 0
+sm_vote_progress_console 0
+
+// Specifies whether or not to display vote progress to clients in the
+// client console. Valid values are 0 (Disabled) or 1 (Enabled).
+// --
+// Default: 0
+sm_vote_progress_client_console 0

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,90 @@
+# 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)
+
+	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',
+		'logic_bridge.cpp',
+		'smn_entities.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_filesystem.cpp',
+		'smn_player.cpp',
+		'sourcemod.cpp',
+		'concmd_cleaner.cpp',
+		'HalfLife2.cpp',
+		'NextMap.cpp',
+		'smn_profiler.cpp',
+		'ConCmdManager.cpp',
+		'HandleSys.cpp',
+		'PhraseCollection.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',
+		'Translator.cpp',
+		'MemoryUtils.cpp',
+		'PluginSys.cpp',
+		'smn_console.cpp',
+		'smn_handles.cpp',
+		'smn_timers.cpp',
+		'UserMessages.cpp',
+		'Database.cpp',
+		'MenuManager.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',
+		'ConsoleDetours.cpp'
+		]
+	binary.AddSourceFiles('core', files)
+	SM.PostSetupHL2Job(extension, binary, i)
+	SM.AutoVersion('core', binary)
+	binary.SendToJob()
+

core/ConCmdManager.h

@@ -159,3 +159,4 @@ private:
 extern ConCmdManager g_ConCmds;
 
 #endif // _INCLUDE_SOURCEMOD_CONCMDMANAGER_H_
+

core/ConCommandBaseIterator.h

@@ -1,14 +1,14 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
  * 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
@@ -28,21 +28,62 @@
  *
  * Version: $Id$
  */
+#ifndef _INCLUDE_SOURCEMOD_CON_COMMAND_BASE_ITERATOR_H_
+#define _INCLUDE_SOURCEMOD_CON_COMMAND_BASE_ITERATOR_H_
 
-/**
- * Autogenerated by build scripts
- */
+#if SOURCE_ENGINE >= SE_LEFT4DEAD
+class ConCommandBaseIterator
+{
+public:
+	inline ConCommandBaseIterator() : iter(icvar)
+	{
+		iter.SetFirst();
+	}
 
-#ifndef _INCLUDE_SOURCEMOD_VERSION_H_
-#define _INCLUDE_SOURCEMOD_VERSION_H_
+	inline bool IsValid()
+	{
+		return iter.IsValid();
+	}
 
-/**
- * @file Contains SourceMod version information.
- */
+	inline void Next()
+	{
+		iter.Next();
+	}
 
-#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
+	inline ConCommandBase *Get()
+	{
+		return iter.Get();
+	}
+private:
+	ICvar::Iterator iter;
+};
+#else
+class ConCommandBaseIterator
+{
+public:
+	inline ConCommandBaseIterator()
+	{
+		iter = icvar->GetCommands();
+	}
+
+	inline bool IsValid()
+	{
+		return iter != NULL;
+	}
+
+	inline void Next()
+	{
+		iter = const_cast<ConCommandBase *>(iter->GetNext());
+	}
+
+	inline ConCommandBase *Get()
+	{
+		return iter;
+	}
+private:
+	ConCommandBase *iter;
+};
+#endif
+
+#endif /* _INCLUDE_SOURCEMOD_CON_COMMAND_BASE_ITERATOR_H_ */
 
-#endif //_INCLUDE_SOURCEMOD_VERSION_H_

core/ConVarManager.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * 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
@@ -25,8 +25,6 @@
  * this exception to all derivative works.  AlliedModders LLC defines further
  * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
  * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
  */
 
 #include "ConVarManager.h"
@@ -60,6 +58,40 @@ const ParamType CONVARCHANGE_PARAMS[] = {Param_Cell, Param_String, Param_String}
 typedef List<const ConVar *> ConVarList;
 KTrie<ConVarInfo *> convar_cache;
 
+class ConVarReentrancyGuard
+{
+	ConVar *cvar;
+	ConVarReentrancyGuard *up;
+public:
+	static ConVarReentrancyGuard *chain;
+
+	ConVarReentrancyGuard(ConVar *cvar)
+		: cvar(cvar), up(chain)
+	{
+		chain = this;
+	}
+
+	~ConVarReentrancyGuard()
+	{
+		assert(chain == this);
+		chain = up;
+	}
+
+	static bool IsCvarInChain(ConVar *cvar)
+	{
+		ConVarReentrancyGuard *guard = chain;
+		while (guard != NULL)
+		{
+			if (guard->cvar == cvar)
+				return true;
+			guard = guard->up;
+		}
+		return false;
+	}
+};
+
+ConVarReentrancyGuard *ConVarReentrancyGuard::chain = NULL;
+
 ConVarManager::ConVarManager() : m_ConVarType(0), m_bIsDLLQueryHooked(false), m_bIsVSPQueryHooked(false)
 {
 }
@@ -96,6 +128,8 @@ void ConVarManager::OnSourceModAllInitialized()
 
 	SH_ADD_HOOK_STATICFUNC(ICvar, CallGlobalChangeCallbacks, icvar, OnConVarChanged, false);
 
+	g_PluginSys.AddPluginsListener(this);
+
 	/* Add the 'convars' option to the 'sm' console command */
 	g_RootMenu.AddRootConsoleCommand("cvars", "View convars created by a plugin", this);
 }
@@ -162,6 +196,8 @@ void ConVarManager::OnSourceModShutdown()
 	/* Remove the 'convars' option from the 'sm' console command */
 	g_RootMenu.RemoveRootConsoleCommand("cvars", this);
 
+	g_PluginSys.RemovePluginsListener(this);
+
 	/* Remove the 'ConVar' handle type */
 	g_HandleSys.RemoveType(m_ConVarType, g_pCoreIdent);
 }
@@ -180,7 +216,7 @@ void ConVarManager::OnSourceModVSPReceived()
 	}
 
 	/* For later MM:S versions, use the updated API, since it's cleaner. */
-#if defined METAMOD_PLAPI_VERSION
+#if defined METAMOD_PLAPI_VERSION || PLAPI_VERSION >= 11
 	int engine = g_SMAPI->GetSourceEngineBuild();
 	if (engine == SOURCE_ENGINE_ORIGINAL || vsp_version < 2)
 	{
@@ -252,12 +288,23 @@ void ConVarManager::OnUnlinkConCommandBase(ConCommandBase *pBase, const char *na
 void ConVarManager::OnPluginUnloaded(IPlugin *plugin)
 {
 	ConVarList *pConVarList;
+	List<ConVarQuery>::iterator iter;
 
 	/* If plugin has a convar list, free its memory */
 	if (plugin->GetProperty("ConVarList", (void **)&pConVarList, true))
 	{
 		delete pConVarList;
 	}
+
+	/* Remove convar queries for this plugin that haven't returned results yet */
+	for (iter = m_ConVarQueries.begin(); iter != m_ConVarQueries.end(); iter++)
+	{
+		ConVarQuery &query = (*iter);
+		if (query.pCallback->GetParentRuntime() == plugin->GetRuntime())
+		{
+			m_ConVarQueries.erase(iter);
+		}
+	}
 }
 
 void ConVarManager::OnHandleDestroy(HandleType_t type, void *object)
@@ -315,7 +362,7 @@ void ConVarManager::OnRootConsoleCommand(const char *cmdname, const CCommand &co
 	}
 
 	/* Display usage of subcommand */
-	g_RootMenu.ConsolePrint("[SM] Usage: sm convars <plugin #>");
+	g_RootMenu.ConsolePrint("[SM] Usage: sm cvars <plugin #>");
 }
 
 Handle_t ConVarManager::CreateConVar(IPluginContext *pContext, const char *name, const char *defaultVal, const char *description, int flags, bool hasMin, float min, bool hasMax, float max)
@@ -523,7 +570,8 @@ void ConVarManager::UnhookConVarChange(ConVar *pConVar, IPluginFunction *pFuncti
 		}
 
 		/* If the forward now has 0 functions in it... */
-		if (pForward->GetFunctionCount() == 0)
+		if (pForward->GetFunctionCount() == 0 &&
+			!ConVarReentrancyGuard::IsCvarInChain(pConVar))
 		{
 			/* Free this forward */
 			g_Forwards.ReleaseForward(pForward);
@@ -634,6 +682,8 @@ void ConVarManager::OnConVarChanged(ConVar *pConVar, const char *oldValue)
 
 	if (pForward != NULL)
 	{
+		ConVarReentrancyGuard guard(pConVar);
+
 		/* Now call forwards in plugins that have hooked this */
 		pForward->PushCell(pInfo->handle);
 		pForward->PushString(oldValue);

core/ConsoleDetours.cpp

@@ -0,0 +1,742 @@
+/**
+ * vim: set ts=4 sw=4 tw=99 noet :
+ * =============================================================================
+ * SourceMod
+ * Copyright (C) 2004-2009 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$
+ */
+
+/**
+ * On SourceHook v4.3 or lower, there are no DVP hooks. Very sad, right?
+ * Only do this on newer versions. For the older code, we'll do an incredibly
+ * hacky detour.
+ *
+ * The idea of the "non-hacky" (yeah... no) code is that every unique
+ * ConCommand vtable gets its own DVP hook. We watch for unloading and
+ * loading commands to remove stale hooks from SH.
+ */
+
+#include "sourcemod.h"
+#include "sourcemm_api.h"
+#include "Logger.h"
+#include "compat_wrappers.h"
+#include "ConsoleDetours.h"
+#include "GameConfigs.h"
+#include "sm_stringutil.h"
+#include "ConCmdManager.h"
+#include "HalfLife2.h"
+#include "ConCommandBaseIterator.h"
+#include "ShareSys.h"
+
+#if defined PLATFORM_LINUX
+# include <dlfcn.h>
+# include <sys/mman.h>
+# include <stdint.h>
+# include <unistd.h>
+#endif
+
+#if SH_IMPL_VERSION >= 5
+# if SOURCE_ENGINE >= SE_ORANGEBOX
+	SH_DECL_EXTERN1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &);
+# else
+	SH_DECL_EXTERN0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
+# endif
+#else
+# if SH_IMPL_VERSION >= 4
+ extern int __SourceHook_FHVPAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>,bool);
+ extern int __SourceHook_FHAddConCommandDispatch(void *, bool, class fastdelegate::FastDelegate0<void>);
+# else
+ extern bool __SourceHook_FHAddConCommandDispatch(void *, bool, class fastdelegate::FastDelegate0<void>);
+# endif
+extern bool __SourceHook_FHRemoveConCommandDispatch(void *, bool, class fastdelegate::FastDelegate0<void>);
+#endif
+
+#if SH_IMPL_VERSION >= 4
+
+class GenericCommandHooker : public IConCommandLinkListener
+{
+	struct HackInfo
+	{
+		void **vtable;
+		int hook;
+		unsigned int refcount;
+	};
+	CVector<HackInfo> vtables;
+	bool enabled;
+	SourceHook::MemFuncInfo dispatch;
+
+	inline void **GetVirtualTable(ConCommandBase *pBase)
+	{
+		return *reinterpret_cast<void***>(reinterpret_cast<char*>(pBase) +
+		                                  dispatch.thisptroffs +
+		                                  dispatch.vtbloffs);
+	}
+
+	inline bool FindVtable(void **ptr, size_t& index)
+	{
+		for (size_t i = 0; i < vtables.size(); i++)
+		{
+			if (vtables[i].vtable == ptr)
+			{
+				index = i;
+				return true;
+			}
+		}
+		return false;
+	}
+
+	void MakeHookable(ConCommandBase *pBase)
+	{
+		if (!pBase->IsCommand())
+			return;
+
+		ConCommand *cmd = (ConCommand*)pBase;
+		void **vtable = GetVirtualTable(cmd);
+
+		size_t index;
+		if (!FindVtable(vtable, index))
+		{
+			HackInfo hack;
+			hack.vtable = vtable;
+			hack.hook = SH_ADD_VPHOOK(ConCommand, Dispatch, cmd, SH_MEMBER(this, &GenericCommandHooker::Dispatch), false);
+			hack.refcount = 1;
+			vtables.push_back(hack);
+		}
+		else
+		{
+			vtables[index].refcount++;
+		}
+	}
+
+# if SOURCE_ENGINE >= SE_ORANGEBOX
+	void Dispatch(const CCommand& args)
+# else
+	void Dispatch()
+# endif
+	{
+		cell_t res = ConsoleDetours::Dispatch(META_IFACEPTR(ConCommand)
+# if SOURCE_ENGINE >= SE_ORANGEBOX
+			, args
+# endif
+			);
+		if (res >= Pl_Handled)
+			RETURN_META(MRES_SUPERCEDE);
+	}
+
+	void ReparseCommandList()
+	{
+		for (size_t i = 0; i < vtables.size(); i++)
+			vtables[i].refcount = 0;
+		for (ConCommandBaseIterator iter; iter.IsValid(); iter.Next())
+			MakeHookable(iter.Get());
+		CVector<HackInfo>::iterator iter = vtables.begin();
+		while (iter != vtables.end())
+		{
+			if ((*iter).refcount)
+			{
+				iter++;
+				continue;
+			}
+			/* Damn it. This event happens AFTER the plugin has unloaded!
+			 * There's two options. Remove the hook now and hope SH's memory
+			 * protection will prevent a crash. Otherwise, we can wait until
+			 * the server shuts down and more likely crash then.
+			 *
+			 * This situation only arises if:
+			 * 1) Someone has used AddCommandFilter()
+			 * 2) ... on a Dark Messiah server (mm:s new api)
+			 * 3) ... and another MM:S plugin that uses ConCommands has unloaded.
+			 *
+			 * Even though the impact is really small, we'll wait until the
+			 * server shuts down, so normal operation isn't interrupted.
+			 *
+			 * See bug 4018.
+			 */
+			iter = vtables.erase(iter);
+		}
+	}
+
+	void UnhookCommand(ConCommandBase *pBase)
+	{
+		if (!pBase->IsCommand())
+			return;
+
+		ConCommand *cmd = (ConCommand*)pBase;
+		void **vtable = GetVirtualTable(cmd);
+
+		size_t index;
+		if (!FindVtable(vtable, index))
+		{
+			g_Logger.LogError("Console detour tried to unhook command \"%s\" but it wasn't found", pBase->GetName());
+			return;
+		}
+
+		assert(vtables[index].refcount > 0);
+		vtables[index].refcount--;
+		if (vtables[index].refcount == 0)
+		{
+			SH_REMOVE_HOOK_ID(vtables[index].hook);
+			vtables.erase(vtables.iterAt(index));
+		}
+	}
+
+public:
+	GenericCommandHooker() : enabled(false)
+	{
+	}
+
+	bool Enable()
+	{
+		SourceHook::GetFuncInfo(&ConCommand::Dispatch, dispatch);
+
+		if (dispatch.thisptroffs < 0)
+		{
+			g_Logger.LogError("Command filter could not determine ConCommand layout");
+			return false;
+		}
+
+		for (ConCommandBaseIterator iter; iter.IsValid(); iter.Next())
+			MakeHookable(iter.Get());
+
+		if (!vtables.size())
+		{
+			g_Logger.LogError("Command filter could not find any cvars!");
+			return false;
+		}
+
+		enabled = true;
+
+		return true;
+	}
+
+	void Disable()
+	{
+		for (size_t i = 0; i < vtables.size(); i++)
+			SH_REMOVE_HOOK_ID(vtables[i].hook);
+		vtables.clear();
+	}
+
+	virtual void OnLinkConCommand(ConCommandBase *pBase)
+	{
+		if (!enabled)
+			return;
+		MakeHookable(pBase);
+	}
+
+	virtual void OnUnlinkConCommand(ConCommandBase *pBase)
+	{
+		if (!enabled)
+			return;
+		if (pBase == NULL)
+			ReparseCommandList();
+		else
+			UnhookCommand(pBase);
+	}
+};
+
+/**
+ * END DVP HOOK VERSION
+ */
+
+#else /* SH_IMPL_VERSION >= 4 */
+
+/**
+ * BEGIN ENGINE DETOUR VERSION
+ */
+
+# include <jit/jit_helpers.h>
+# include <jit/x86/x86_macros.h>
+
+class GenericCommandHooker
+{
+	struct Patch
+	{
+		Patch() : applied(false)
+		{
+		}
+
+		bool applied;
+		void *base;
+		unsigned char search[16];
+		size_t search_len;
+		size_t offset;
+		size_t saveat;
+		int regparam;
+		void *detour;
+	};
+	
+	Patch ces;
+	Patch cgc;
+
+public:
+ 	static void DelayedActivation(void *inparam)
+ 	{
+ 		GenericCommandHooker *cdtrs = reinterpret_cast<GenericCommandHooker*>(inparam);
+ 		/* Safe to re-enter because the frame queue is lock+swapped. */
+ 		if ((!cdtrs->ces.applied || !cdtrs->cgc.applied) &&
+ 		    g_HL2.PeekCommandStack() != NULL)
+ 		{
+ 			g_SourceMod.AddFrameAction(GenericCommandHooker::DelayedActivation, cdtrs);
+ 			return;
+ 		}
+ 
+ 		if (!cdtrs->ces.applied)
+ 			cdtrs->ApplyPatch(&cdtrs->ces);
+ 		if (!cdtrs->cgc.applied)
+ 			cdtrs->ApplyPatch(&cdtrs->cgc);
+ 	}
+
+	bool Enable()
+	{
+		const char *platform = NULL;
+# if defined(PLATFORM_WINDOWS)
+		platform = "Windows";
+# else	
+		void *addrInBase = (void *)g_SMAPI->GetEngineFactory(false);
+		Dl_info info;
+		if (!dladdr(addrInBase, &info))
+		{
+			g_Logger.LogError("Command filter could not find engine name");
+			return false;
+		}
+		if (strstr(info.dli_fname, "engine_i486"))
+		{
+			platform = "Linux_486";
+		}
+		else if (strstr(info.dli_fname, "engine_i686"))
+		{
+			platform = "Linux_686";
+		}
+		else if (strstr(info.dli_fname, "engine_amd"))
+		{
+			platform = "Linux_AMD";
+		}
+		else
+		{
+			g_Logger.LogError("Command filter could not determine engine (%s)", info.dli_fname);
+			return false;
+		}
+# endif
+
+		if (!PrepPatch("Cmd_ExecuteString", "CES", platform, &ces))
+			return false;
+		if (!PrepPatch("CGameClient::ExecuteString", "CGC", platform, &cgc))
+			return false;
+
+ 		if (g_HL2.PeekCommandStack() != NULL)
+ 		{
+ 			g_SourceMod.AddFrameAction(GenericCommandHooker::DelayedActivation, this);
+ 			return true;
+ 		}
+
+		ApplyPatch(&ces);
+		ApplyPatch(&cgc);
+
+		return true;
+	}
+
+	void Disable()
+	{
+		UndoPatch(&ces);
+		UndoPatch(&cgc);
+	}
+
+private:
+
+# if !defined PLATFORM_WINDOWS
+#  define PAGE_READWRITE     PROT_READ|PROT_WRITE
+#  define PAGE_EXECUTE_READ  PROT_READ|PROT_EXEC
+
+	static inline uintptr_t AddrToPage(uintptr_t address)
+	{
+		return (address & ~(uintptr_t(sysconf(_SC_PAGE_SIZE) - 1)));
+	}
+
+# endif
+
+	void Protect(void *addr, size_t length, int prot)
+	{
+# if defined PLATFORM_WINDOWS
+		DWORD ignore;
+		VirtualProtect(addr, length, prot, &ignore);
+# else
+		uintptr_t startPage = AddrToPage(uintptr_t(addr));
+		length += (uintptr_t(addr) - startPage);
+		mprotect((void*)startPage, length, prot);
+# endif
+	}
+
+	void UndoPatch(Patch *patch)
+	{
+		if (!patch->applied || patch->detour == NULL)
+			return;
+
+		g_pSourcePawn->FreePageMemory(patch->detour);
+
+		unsigned char *source = (unsigned char *)patch->base + patch->offset;
+		Protect(source, patch->search_len, PAGE_READWRITE);
+		for (size_t i = 0; i < patch->search_len; i++)
+			source[i] = patch->search[i];
+		Protect(source, patch->search_len, PAGE_EXECUTE_READ);
+	}
+
+	void ApplyPatch(Patch *patch)
+	{
+		assert(!patch->applied);
+
+		size_t length = 0;
+		void *callback = (void*)&ConsoleDetours::Dispatch;
+
+		/* Bogus assignment to make compiler is doing the right thing. */
+		patch->detour = callback;
+
+		/* Assemgle the detour. */
+		JitWriter writer;
+		writer.outbase = NULL;
+		writer.outptr = NULL;
+		do
+		{
+			/* Need a specific register, or value on stack? */
+			if (patch->regparam != -1)
+				IA32_Push_Reg(&writer, patch->regparam);
+			/* Call real function. */
+			IA32_Write_Jump32_Abs(&writer, IA32_Call_Imm32(&writer, 0), callback);
+			/* Restore stack. */
+			if (patch->regparam != -1)
+				IA32_Pop_Reg(&writer, patch->regparam);
+			/* Copy any saved bytes */
+			if (patch->saveat)
+			{
+				for (size_t i = patch->saveat; i < patch->search_len; i++)
+				{
+					writer.write_ubyte(patch->search[i]);
+				}
+			}
+			/* Jump back to the caller. */
+			unsigned char *target = (unsigned char *)patch->base + patch->offset + patch->search_len;
+			IA32_Jump_Imm32_Abs(&writer, target);
+			/* Assemble, if we can. */
+			if (writer.outbase == NULL)
+			{
+				length = writer.outptr - writer.outbase;
+				patch->detour = g_pSourcePawn->AllocatePageMemory(length);
+				if (patch->detour == NULL)
+				{
+					g_Logger.LogError("Ran out of memory!");
+					return;
+				}
+				g_pSourcePawn->SetReadWrite(patch->detour);
+				writer.outbase = (jitcode_t)patch->detour;
+				writer.outptr = writer.outbase;
+			}
+			else
+			{
+				break;
+			}
+		} while (true);
+
+		g_pSourcePawn->SetReadExecute(patch->detour);
+
+		unsigned char *source = (unsigned char *)patch->base + patch->offset;
+		Protect(source, 6, PAGE_READWRITE);
+		source[0] = 0xFF;
+		source[1] = 0x25;
+		*(void **)&source[2] = &patch->detour;
+		Protect(source, 6, PAGE_EXECUTE_READ);
+
+		patch->applied = true;
+	}
+
+	bool PrepPatch(const char *signature, const char *name, const char *platform, Patch *patch)
+	{
+		/* Get the base address of the function. */
+		if (!g_pGameConf->GetMemSig(signature, &patch->base) || patch->base == NULL)
+		{
+			g_Logger.LogError("Command filter could not find signature: %s", signature);
+			return false;
+		}
+
+		const char *value;
+		char keyname[255];
+
+		/* Get the verification bytes that will be written over. */
+		UTIL_Format(keyname, sizeof(keyname), "%s_Patch_%s", name, platform);
+		if ((value = g_pGameConf->GetKeyValue(keyname)) == NULL)
+		{
+			g_Logger.LogError("Command filter could not find key: %s", keyname);
+			return false;
+		}
+		patch->search_len = UTIL_DecodeHexString(patch->search, sizeof(patch->search), value);
+		if (patch->search_len < 6)
+		{
+			g_Logger.LogError("Error decoding %s value, or not long enough", keyname);
+			return false;
+		}
+
+		/* Get the offset into the function. */
+		UTIL_Format(keyname, sizeof(keyname), "%s_Offset_%s", name, platform);
+		if ((value = g_pGameConf->GetKeyValue(keyname)) == NULL)
+		{
+			g_Logger.LogError("Command filter could not find key: %s", keyname);
+			return false;
+		}
+		patch->offset = atoi(value);
+		if (patch->offset > 20000)
+		{
+			g_Logger.LogError("Command filter %s value is bogus", keyname);
+			return false;
+		}
+
+		/* Get the number of bytes to save from what was written over. */
+		patch->saveat = 0;
+		UTIL_Format(keyname, sizeof(keyname), "%s_Save_%s", name, platform);
+		if ((value = g_pGameConf->GetKeyValue(keyname)) != NULL)
+		{
+			patch->saveat = atoi(value);
+			if (patch->saveat >= patch->search_len)
+			{
+				g_Logger.LogError("Command filter %s value is too large", keyname);
+				return false;
+			}
+		}
+
+		/* Get register for parameter, if any. */
+		patch->regparam = -1;
+		UTIL_Format(keyname, sizeof(keyname), "%s_Reg_%s", name, platform);
+		if ((value = g_pGameConf->GetKeyValue(keyname)) != NULL)
+		{
+			patch->regparam = atoi(value);
+		}
+
+		/* Everything loaded from gamedata, make sure the patch will succeed. */
+		unsigned char *address = (unsigned char *)patch->base + patch->offset;
+		for (size_t i = 0; i < patch->search_len; i++)
+		{
+			if (address[i] != patch->search[i])
+			{
+				g_Logger.LogError("Command filter %s has changed (byte %x is not %x sub-offset %d)",
+				                  name, address[i], patch->search[i], i);
+				return false;
+			}
+		}
+
+		return true;
+	}
+};
+
+static bool dummy_hook_set = false;
+void DummyHook()
+{
+	if (dummy_hook_set)
+	{
+		dummy_hook_set = false;
+		RETURN_META(MRES_SUPERCEDE);
+	}
+}
+
+#endif
+
+/**
+ * BEGIN THE ACTUALLY GENERIC CODE.
+ */
+
+#define FEATURECAP_COMMANDLISTENER  "command listener"
+
+static GenericCommandHooker s_GenericHooker;
+ConsoleDetours g_ConsoleDetours;
+
+ConsoleDetours::ConsoleDetours() : status(FeatureStatus_Unknown)
+{
+}
+
+void ConsoleDetours::OnSourceModAllInitialized()
+{
+	m_pForward = g_Forwards.CreateForwardEx("OnAnyCommand", ET_Hook, 3, NULL, Param_Cell,
+	                                        Param_String, Param_Cell);
+	g_ShareSys.AddCapabilityProvider(NULL, this, FEATURECAP_COMMANDLISTENER);
+}
+
+void ConsoleDetours::OnSourceModShutdown()
+{
+	List<Listener*>::iterator iter = m_Listeners.begin();
+	while (iter != m_Listeners.end())
+	{
+		Listener *listener = (*iter);
+		g_Forwards.ReleaseForward(listener->forward);
+		delete listener;
+		iter = m_Listeners.erase(iter);
+	}
+
+	g_Forwards.ReleaseForward(m_pForward);
+	s_GenericHooker.Disable();
+}
+
+FeatureStatus ConsoleDetours::GetFeatureStatus(FeatureType type, const char *name)
+{
+	return GetStatus();
+}
+
+FeatureStatus ConsoleDetours::GetStatus()
+{
+	if (status == FeatureStatus_Unknown)
+	{
+		status = s_GenericHooker.Enable() ? FeatureStatus_Available : FeatureStatus_Unavailable;
+	}
+	return status;
+}
+
+bool ConsoleDetours::AddListener(IPluginFunction *fun, const char *command)
+{
+	if (GetStatus() != FeatureStatus_Available)
+		return false;
+
+	if (command == NULL)
+	{
+		m_pForward->AddFunction(fun);
+	}
+	else
+	{
+		const char *str = UTIL_ToLowerCase(command);
+		Listener *listener;
+		Listener **plistener = m_CmdLookup.retrieve(str);
+		if (plistener == NULL)
+		{
+			listener = new Listener;
+			listener->forward = g_Forwards.CreateForwardEx(NULL, ET_Hook, 3, NULL, Param_Cell,
+			                                               Param_String, Param_Cell);
+			m_CmdLookup.insert(str, listener);
+		}
+		else
+		{
+			listener = *plistener;
+		}
+		listener->forward->AddFunction(fun);
+		delete [] str;
+	}
+
+	return true;
+}
+
+bool ConsoleDetours::RemoveListener(IPluginFunction *fun, const char *command)
+{
+	if (command == NULL)
+	{
+		return m_pForward->RemoveFunction(fun);
+	}
+	else
+	{
+		const char *str = UTIL_ToLowerCase(command);
+		Listener *listener;
+		Listener **plistener = m_CmdLookup.retrieve(str);
+		delete [] str;
+		if (plistener == NULL)
+			return false;
+		listener = *plistener;
+		return listener->forward->RemoveFunction(fun);
+	}
+}
+
+cell_t ConsoleDetours::InternalDispatch(int client, const CCommand& args)
+{
+	char name[255];
+	const char *realname = args.Arg(0);
+	size_t len = strlen(realname);
+	for (size_t i = 0; i < len; i++)
+	{
+		if (realname[i] >= 'A' && realname[i] <= 'Z')
+			name[i] = tolower(realname[i]);
+		else
+			name[i] = realname[i];
+	}
+	name[len] = '\0';
+
+	cell_t result = Pl_Continue;
+	m_pForward->PushCell(client);
+	m_pForward->PushString(name);
+	m_pForward->PushCell(args.ArgC() - 1);
+	m_pForward->Execute(&result, NULL);
+
+	/* Don't let plugins block this. */
+	if (strcmp(name, "sm") == 0)
+		result = Pl_Continue;
+
+	if (result >= Pl_Stop)
+		return result;
+	
+	Listener **plistener = m_CmdLookup.retrieve(name);
+	if (plistener == NULL)
+		return result;
+	Listener *listener = *plistener;
+	if (listener->forward->GetFunctionCount() == 0)
+		return result;
+
+	cell_t result2 = Pl_Continue;
+	listener->forward->PushCell(client);
+	listener->forward->PushString(name);
+	listener->forward->PushCell(args.ArgC() - 1);
+	listener->forward->Execute(&result2, NULL);
+
+	if (result2 > result)
+		result = result2;
+
+	/* "sm" should not have flown through the above. */
+	assert(strcmp(name, "sm") != 0 || result == Pl_Continue);
+
+	return result;
+}
+
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+cell_t ConsoleDetours::Dispatch(ConCommand *pBase, const CCommand& args)
+{
+#else
+cell_t ConsoleDetours::Dispatch(ConCommand *pBase)
+{
+	CCommand args;
+#endif
+	g_HL2.PushCommandStack(&args);
+	cell_t res = g_ConsoleDetours.InternalDispatch(g_ConCmds.GetCommandClient(), args);
+	g_HL2.PopCommandStack();
+
+#if SH_IMPL_VERSION < 4
+	if (res >= Pl_Handled)
+	{
+		/* See bug 4020 - we can't optimize this because looking at the vtable
+		 * is probably more expensive, since there's no SH_GET_ORIG_VFNPTR_ENTRY.
+		 */
+		SH_ADD_HOOK_STATICFUNC(ConCommand, Dispatch, pBase, DummyHook, false);
+		dummy_hook_set = true;
+		pBase->Dispatch();
+		SH_REMOVE_HOOK_STATICFUNC(ConCommand, Dispatch, pBase, DummyHook, false);
+	}
+	else
+	{
+		/* Make sure the command gets invoked. See bug 4019 on making this better. */
+		pBase->Dispatch();
+	}
+#endif
+
+	return res;
+}

core/ConsoleDetours.h

@@ -0,0 +1,83 @@
+/**
+ * vim: set ts=4 sw=4 tw=99 noet :
+ * =============================================================================
+ * SourceMod
+ * Copyright (C) 2004-2009 AlliedModders LLC.  All rights reserved.
+ * =============================================================================
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3.0, as published by the
+ * Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * As a special exception, AlliedModders LLC gives you permission to link the
+ * code of this program (as well as its derivative works) to "Half-Life 2," the
+ * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+ * by the Valve Corporation.  You must obey the GNU General Public License in
+ * all respects for all other code used.  Additionally, AlliedModders LLC grants
+ * this exception to all derivative works.  AlliedModders LLC defines further
+ * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+ * or <http://www.sourcemod.net/license.php>.
+ *
+ * Version: $Id$
+ */
+#ifndef _INCLUDE_SOURCEMOD_CONSOLE_DETOURS_H_
+#define _INCLUDE_SOURCEMOD_CONSOLE_DETOURS_H_
+
+#include "sm_globals.h"
+#include "sourcemm_api.h"
+#include "ForwardSys.h"
+#include <sm_trie_tpl.h>
+
+class ConsoleDetours :
+	public SMGlobalClass,
+	public IFeatureProvider
+{
+	friend class PlayerManager;
+	friend class GenericCommandHooker;
+
+	struct Listener
+	{
+		IChangeableForward *forward;
+	};
+public:
+	ConsoleDetours();
+public: //SMGlobalClass
+	void OnSourceModAllInitialized();
+	void OnSourceModShutdown();
+public: //IFeatureProvider
+	FeatureStatus GetFeatureStatus(FeatureType type, const char *name);
+public:
+	bool AddListener(IPluginFunction *fun, const char *command);
+	bool RemoveListener(IPluginFunction *fun, const char *command);
+private:
+	cell_t InternalDispatch(int client, const CCommand& args);
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+	static cell_t Dispatch(ConCommand *pBase, const CCommand& args);
+#else
+	static cell_t Dispatch(ConCommand *pBase);
+#endif
+public:
+	FeatureStatus GetStatus();
+	bool IsEnabled()
+	{
+		return status == FeatureStatus_Available;
+	}
+private:
+	FeatureStatus status;
+	IChangeableForward *m_pForward;
+	KTrie<Listener*> m_CmdLookup;
+	List<Listener*> m_Listeners;
+};
+
+extern ConsoleDetours g_ConsoleDetours;
+
+#endif /* _INCLUDE_SOURCEMOD_CONSOLE_DETOURS_H_ */
+

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"
@@ -68,7 +68,11 @@ void Hook_ExecDispatchPre(const CCommand &cmd)
 SH_DECL_EXTERN0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
 void Hook_ExecDispatchPre()
 #else
-extern bool __SourceHook_FHAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
+# if SH_IMPL_VERSION >= 4
+ extern int __SourceHook_FHAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
+# else
+ extern bool __SourceHook_FHAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
+# endif
 extern bool __SourceHook_FHRemoveConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
 void Hook_ExecDispatchPre()
 #endif
@@ -103,11 +107,7 @@ void CheckAndFinalizeConfigs()
 {
 	if ((g_bServerExecd || g_ServerCfgFile == NULL) && g_bGotServerStart)
 	{
-#if SOURCE_ENGINE >= SE_ORANGEBOX
         g_PendingInternalPush = true;
-#else
-        SM_InternalCmdTrigger();
-#endif
 	}
 }
 
@@ -214,14 +214,28 @@ void CoreConfig::Initialize()
 	/* Try to get command line value of core config convar */
 	const char *corecfg = icvar->GetCommandLineValue("sm_corecfgfile");
 
-	/* If sm_corecfgfile not specified on command line, use default value */
-	if (!corecfg)
+	/* If sm_corecfgfile is on the command line, use that
+	 * If sm_corecfgfile isn't there, check sm_basepath on the command line and build the path off that
+	 * If sm_basepath isn't there, just use the default path for the cfg
+	 */
+	if (corecfg)
 	{
-		corecfg = sm_corecfgfile.GetDefault();
+		g_LibSys.PathFormat(filePath, sizeof(filePath), "%s/%s", g_SourceMod.GetGamePath(), corecfg);
 	}
+	else
+	{
+		const char *basepath = icvar->GetCommandLineValue("sm_basepath");
 
-	/* Format path to config file */
-	g_LibSys.PathFormat(filePath, sizeof(filePath), "%s/%s", g_SourceMod.GetGamePath(), corecfg);
+		/* Format path to config file */
+		if (basepath)
+		{
+			g_LibSys.PathFormat(filePath, sizeof(filePath), "%s/%s/%s", g_SourceMod.GetGamePath(), basepath, "configs/core.cfg");
+		}
+		else
+		{
+			g_LibSys.PathFormat(filePath, sizeof(filePath), "%s/%s", g_SourceMod.GetGamePath(), sm_corecfgfile.GetDefault());
+		}
+	}
 
 	/* Reset cached key values */
 	m_KeyValues.clear();
@@ -381,7 +395,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/Database.cpp

@@ -37,7 +37,7 @@
 #include "Logger.h"
 #include "ExtensionSys.h"
 #include <stdlib.h>
-#include "ThreadSupport.h"
+#include <IThreader.h>
 
 #define DBPARSE_LEVEL_NONE		0
 #define DBPARSE_LEVEL_MAIN		1
@@ -47,7 +47,7 @@ DBManager g_DBMan;
 static bool s_OneTimeThreaderErrorMsg = false;
 
 DBManager::DBManager() 
-: m_StrTab(512), m_ParseLevel(0), m_ParseState(0), m_pDefault(NULL)
+: m_ParseLevel(0), m_ParseState(0), m_pDefault(NULL)
 {
 }
 
@@ -104,6 +104,7 @@ void DBManager::OnSourceModShutdown()
 	m_pQueueLock->DestroyThis();
 	g_HandleSys.RemoveType(m_DatabaseType, g_pCoreIdent);
 	g_HandleSys.RemoveType(m_DriverType, g_pCoreIdent);
+	ClearConfigs();
 }
 
 unsigned int DBManager::GetInterfaceVersion()
@@ -133,13 +134,20 @@ void DBManager::OnHandleDestroy(HandleType_t type, void *object)
 
 void DBManager::ReadSMC_ParseStart()
 {
-	m_confs.clear();
+	ClearConfigs();
 	m_ParseLevel = 0;
 	m_ParseState = DBPARSE_LEVEL_NONE;
-	m_StrTab.Reset();
 	m_DefDriver.clear();
 }
 
+void DBManager::ClearConfigs()
+{
+	List<ConfDbInfo *>::iterator iter;
+	for (iter=m_confs.begin(); iter!=m_confs.end(); iter++)
+		delete (*iter);
+	m_confs.clear();
+}
+
 ConfDbInfo s_CurInfo;
 SMCResult DBManager::ReadSMC_NewSection(const SMCStates *states, const char *name)
 {
@@ -159,7 +167,7 @@ SMCResult DBManager::ReadSMC_NewSection(const SMCStates *states, const char *nam
 		}
 	} else if (m_ParseState == DBPARSE_LEVEL_MAIN) {
 		s_CurInfo = ConfDbInfo();
-		s_CurInfo.name = m_StrTab.AddString(name);
+		s_CurInfo.name = name;
 		m_ParseState = DBPARSE_LEVEL_DATABASE;
 	} else if (m_ParseState == DBPARSE_LEVEL_DATABASE) {
 		m_ParseLevel++;
@@ -186,16 +194,16 @@ SMCResult DBManager::ReadSMC_KeyValue(const SMCStates *states, const char *key,
 		{
 			if (strcmp(value, "default") != 0)
 			{
-				s_CurInfo.driver = m_StrTab.AddString(value);
+				s_CurInfo.driver = value;
 			}
 		} else if (strcmp(key, "database") == 0) {
-			s_CurInfo.database = m_StrTab.AddString(value);
+			s_CurInfo.database = value;
 		} else if (strcmp(key, "host") == 0) {
-			s_CurInfo.host = m_StrTab.AddString(value);
+			s_CurInfo.host = value;
 		} else if (strcmp(key, "user") == 0) {
-			s_CurInfo.user = m_StrTab.AddString(value);
+			s_CurInfo.user = value;
 		} else if (strcmp(key, "pass") == 0) {
-			s_CurInfo.pass = m_StrTab.AddString(value);
+			s_CurInfo.pass = value;
 		} else if (strcmp(key, "timeout") == 0) {
 			s_CurInfo.info.maxTimeout = atoi(value);
 		} else if (strcmp(key, "port") == 0) {
@@ -206,13 +214,6 @@ SMCResult DBManager::ReadSMC_KeyValue(const SMCStates *states, const char *key,
 	return SMCResult_Continue;
 }
 
-#define ASSIGN_VAR(var) \
-	if (s_CurInfo.var == -1) { \
-		s_CurInfo.info.var = ""; \
-	} else { \
-		s_CurInfo.info.var = m_StrTab.GetString(s_CurInfo.var); \
-	}
-
 SMCResult DBManager::ReadSMC_LeavingSection(const SMCStates *states)
 {
 	if (m_ParseLevel)
@@ -223,17 +224,26 @@ SMCResult DBManager::ReadSMC_LeavingSection(const SMCStates *states)
 
 	if (m_ParseState == DBPARSE_LEVEL_DATABASE)
 	{
-		/* Set all of the info members to either a blank string
-		 * or the string pointer from the string table.
-		 */
-		ASSIGN_VAR(driver);
-		ASSIGN_VAR(database);
-		ASSIGN_VAR(host);
-		ASSIGN_VAR(user);
-		ASSIGN_VAR(pass);
+		ConfDbInfo *cdb = new ConfDbInfo();
+
+		cdb->name = s_CurInfo.name;
+		cdb->driver = s_CurInfo.driver;
+		cdb->host = s_CurInfo.host;
+		cdb->user = s_CurInfo.user;
+		cdb->pass = s_CurInfo.pass;
+		cdb->database = s_CurInfo.database;
+		cdb->realDriver = s_CurInfo.realDriver;
+		cdb->info.maxTimeout = s_CurInfo.info.maxTimeout;
+		cdb->info.port = s_CurInfo.info.port;
+
+		cdb->info.driver = cdb->driver.c_str();
+		cdb->info.database = cdb->database.c_str();
+		cdb->info.host = cdb->host.c_str();
+		cdb->info.user = cdb->user.c_str();
+		cdb->info.pass = cdb->pass.c_str();
 		
 		/* Save it.. */
-		m_confs.push_back(s_CurInfo);
+		m_confs.push_back(cdb);
 
 		/* Go up one level */
 		m_ParseState = DBPARSE_LEVEL_MAIN;
@@ -244,7 +254,6 @@ SMCResult DBManager::ReadSMC_LeavingSection(const SMCStates *states)
 
 	return SMCResult_Continue;
 }
-#undef ASSIGN_VAR
 
 void DBManager::ReadSMC_ParseEnd(bool halted, bool failed)
 {
@@ -333,10 +342,10 @@ void DBManager::RemoveDriver(IDBDriver *pDriver)
 	}
 
 	/* Make sure NOTHING references this! */
-	List<ConfDbInfo>::iterator iter;
+	List<ConfDbInfo *>::iterator iter;
 	for (iter=m_confs.begin(); iter!=m_confs.end(); iter++)
 	{
-		ConfDbInfo &db = (*iter);
+		ConfDbInfo &db = *(*iter);
 		if (db.realDriver == pDriver)
 		{
 			db.realDriver = NULL;
@@ -448,12 +457,12 @@ const DatabaseInfo *DBManager::FindDatabaseConf(const char *name)
 
 ConfDbInfo *DBManager::GetDatabaseConf(const char *name)
 {
-	List<ConfDbInfo>::iterator iter;
+	List<ConfDbInfo *>::iterator iter;
 
 	for (iter=m_confs.begin(); iter!=m_confs.end(); iter++)
 	{
-		ConfDbInfo &conf = (*iter);
-		if (strcmp(m_StrTab.GetString(conf.name), name) == 0)
+		ConfDbInfo &conf = *(*iter);
+		if (conf.name == name)
 		{
 			return &conf;
 		}

core/Database.h

@@ -47,16 +47,15 @@ using namespace SourceHook;
 
 struct ConfDbInfo
 {
-	ConfDbInfo() : name(-1), driver(-1), host(-1), user(-1), pass(-1), 
-		database(-1), realDriver(NULL)
+	ConfDbInfo() : realDriver(NULL)
 	{
 	}
-	int name;
-	int driver;
-	int host;
-	int user;
-	int pass;
-	int database;
+	String name;
+	String driver;
+	String host;
+	String user;
+	String pass;
+	String database;
 	IDBDriver *realDriver;
 	DatabaseInfo info;
 };
@@ -121,6 +120,7 @@ public:
 		return m_DatabaseType;
 	}
 private:
+	void ClearConfigs();
 	void KillWorkerThread();
 private:
 	CVector<IDBDriver *> m_drivers;
@@ -134,11 +134,10 @@ private:
 	IMutex *m_pQueueLock;				/* Queue safety lock */
 	IMutex *m_pThinkLock;				/* Think-queue lock */
 
-	List<ConfDbInfo> m_confs;
+	List<ConfDbInfo *> m_confs;
 	HandleType_t m_DriverType;
 	HandleType_t m_DatabaseType;
 	String m_DefDriver;
-	BaseStringTable m_StrTab;
 	char m_Filename[PLATFORM_MAX_PATH];
 	unsigned int m_ParseLevel;
 	unsigned int m_ParseState;

core/EventManager.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -42,6 +42,20 @@ SH_DECL_HOOK2(IGameEventManager2, FireEvent, SH_NOATTRIB, 0, bool, IGameEvent *,
 const ParamType GAMEEVENT_PARAMS[] = {Param_Cell, Param_String, Param_Cell};
 typedef List<EventHook *> EventHookList;
 
+class EventForwardFilter : public IForwardFilter
+{
+	EventInfo *pEventInfo;
+public:
+	EventForwardFilter(EventInfo *pEventInfo) : pEventInfo(pEventInfo)
+	{
+	}
+
+	void Preprocess(IPluginFunction *fun, FwdParamInfo *params)
+	{
+		params[2].val = pEventInfo->bDontBroadcast ? 1 : 0;
+	}
+};
+
 EventManager::EventManager() : m_EventType(0)
 {
 	/* Create an event lookup trie */
@@ -147,6 +161,13 @@ void EventManager::FireGameEvent(IGameEvent *pEvent)
 	   Just need to add ourselves as a listener to make our hook on IGameEventManager2::FireEvent work */
 }
 
+#if SOURCE_ENGINE >= SE_LEFT4DEAD
+int EventManager::GetEventDebugID()
+{
+	return EVENT_DEBUG_ID_INIT;
+}
+#endif
+
 EventHookError EventManager::HookEvent(const char *name, IPluginFunction *pFunction, EventHookMode mode)
 {
 	EventHook *pHook;
@@ -327,6 +348,7 @@ EventInfo *EventManager::CreateEvent(IPluginContext *pContext, const char *name,
 
 		pInfo->pEvent = pEvent;
 		pInfo->pOwner = pContext->GetIdentity();
+		pInfo->bDontBroadcast = false;
 
 		return pInfo;
 	}
@@ -365,6 +387,7 @@ bool EventManager::OnFireEvent(IGameEvent *pEvent, bool bDontBroadcast)
 	IChangeableForward *pForward;
 	const char *name;
 	cell_t res = Pl_Continue;
+	bool broadcast = bDontBroadcast;
 
 	/* The engine accepts NULL without crashing, so to prevent a crash in SM we ignore these */
 	if (!pEvent)
@@ -390,10 +413,16 @@ bool EventManager::OnFireEvent(IGameEvent *pEvent, bool bDontBroadcast)
 			HandleSecurity sec(NULL, g_pCoreIdent);
 			Handle_t hndl = g_HandleSys.CreateHandle(m_EventType, &info, NULL, g_pCoreIdent, NULL);
 
+			info.bDontBroadcast = bDontBroadcast;
+
+			EventForwardFilter filter(&info);
+
 			pForward->PushCell(hndl);
 			pForward->PushString(name);
 			pForward->PushCell(bDontBroadcast);
-			pForward->Execute(&res, NULL);
+			pForward->Execute(&res, &filter);
+
+			broadcast = info.bDontBroadcast;
 
 			g_HandleSys.FreeHandle(hndl, &sec);
 		}
@@ -414,6 +443,9 @@ bool EventManager::OnFireEvent(IGameEvent *pEvent, bool bDontBroadcast)
 		m_EventStack.push(NULL);
 	}
 
+	if (broadcast != bDontBroadcast)
+		RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, true, &IGameEventManager2::FireEvent, (pEvent, broadcast));
+
 	RETURN_META_VALUE(MRES_IGNORED, true);
 }
 
@@ -441,6 +473,7 @@ bool EventManager::OnFireEvent_Post(IGameEvent *pEvent, bool bDontBroadcast)
 		{
 			if (pHook->postCopy)
 			{
+				info.bDontBroadcast = bDontBroadcast;
 				info.pEvent = m_EventCopies.front();
 				info.pOwner = NULL;
 				hndl = g_HandleSys.CreateHandle(m_EventType, &info, NULL, g_pCoreIdent, NULL);

core/EventManager.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -53,6 +53,7 @@ struct EventInfo
 	}
 	IGameEvent *pEvent;
 	IdentityToken_t *pOwner;
+	bool bDontBroadcast;
 };
 
 struct EventHook
@@ -104,6 +105,9 @@ public: // IPluginsListener
 	void OnPluginUnloaded(IPlugin *plugin);
 public: // IGameEventListener2
 	void FireGameEvent(IGameEvent *pEvent);
+#if SOURCE_ENGINE >= SE_LEFT4DEAD
+	int GetEventDebugID();
+#endif
 public:
 	/**
 	 * Get the 'GameEvent' handle type ID.

core/ExtensionSys.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -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,26 @@ 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_LEFT4DEAD2
+#define GAMEFIX "2.l4d2"
+#elif SOURCE_ENGINE == SE_ALIENSWARM
+#define GAMEFIX "2.swarm"
+#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) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
+#else  //METAMOD_PLAPI_VERSION
+#define GAMEFIX "1.ep1"
+#endif //METAMOD_PLAPI_VERSION
+
 CLocalExtension::CLocalExtension(const char *filename)
 {
 	m_PlId = 0;
@@ -64,31 +87,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 +215,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 +336,7 @@ IExtensionInterface *CExtension::GetAPI()
 
 const char *CExtension::GetFilename()
 {
-	return m_File.c_str();
+	return m_RealFile.c_str();
 }
 
 IdentityToken_t *CExtension::GetIdentity()
@@ -494,7 +539,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 +549,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 +594,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 +637,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,11 +955,42 @@ 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)
 			{
-				g_RootMenu.ConsolePrint("[SM] Usage: sm info <#>");
+				g_RootMenu.ConsolePrint("[SM] Usage: sm exts info <#>");
 				return;
 			}
 
@@ -921,7 +998,7 @@ void CExtensionManager::OnRootConsoleCommand(const char *cmdname, const CCommand
 			unsigned int id = atoi(sId);
 			if (id <= 0)
 			{
-				g_RootMenu.ConsolePrint("[SM] Usage: sm info <#>");
+				g_RootMenu.ConsolePrint("[SM] Usage: sm exts info <#>");
 				return;
 			}
 
@@ -998,7 +1075,7 @@ void CExtensionManager::OnRootConsoleCommand(const char *cmdname, const CCommand
 		{
 			if (argcount < 4)
 			{
-				g_RootMenu.ConsolePrint("[SM] Usage: sm unload <#> [code]");
+				g_RootMenu.ConsolePrint("[SM] Usage: sm exts unload <#> [code]");
 				return;
 			}
 
@@ -1111,11 +1188,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 +1333,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/ForwardSys.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.
@@ -255,6 +255,7 @@ CForward *CForward::CreateForward(const char *name, ExecType et, unsigned int nu
 	}
 
 	CForward *pForward = g_Forwards.ForwardMake();
+	pForward->m_IterGuard = NULL;
 	pForward->m_curparam = 0;
 	pForward->m_ExecType = et;
 	snprintf(pForward->m_name, FORWARDS_NAME_MAX, "%s", name ? name : "");
@@ -294,7 +295,7 @@ int CForward::Execute(cell_t *result, IForwardFilter *filter)
 	cell_t high_result = 0;
 	cell_t low_result = 0;
 	int err;
-	unsigned int failed=0, success=0;
+	unsigned int success=0;
 	unsigned int num_params = m_curparam;
 	FwdParamInfo temp_info[SP_MAX_EXEC_PARAMS];
 	FwdParamInfo *param;
@@ -304,10 +305,15 @@ int CForward::Execute(cell_t *result, IForwardFilter *filter)
 	memcpy(temp_info, m_params, sizeof(m_params));
 	m_curparam = 0;
 
-	for (iter=m_functions.begin(); iter!=m_functions.end(); iter++)
+	FuncIteratorGuard guard(&m_IterGuard, &iter);
+
+	while (iter != m_functions.end())
 	{
 		func = (*iter);
 
+		if (filter)
+			filter->Preprocess(func, temp_info);
+
 		for (unsigned int i=0; i<num_params; i++)
 		{
 			int err = SP_ERROR_PARAM;
@@ -359,11 +365,7 @@ int CForward::Execute(cell_t *result, IForwardFilter *filter)
 		}
 		
 		/* Call the function and deal with the return value. */
-		if ((err=func->Execute(&cur_result)) != SP_ERROR_NONE)
-		{
-			failed++;
-		}
-		else
+		if ((err=func->Execute(&cur_result)) == SP_ERROR_NONE)
 		{
 			success++;
 			switch (m_ExecType)
@@ -403,6 +405,9 @@ int CForward::Execute(cell_t *result, IForwardFilter *filter)
 				}
 			}
 		}
+
+		if (!guard.Triggered())
+			iter++;
 	}
 
 done:
@@ -682,6 +687,7 @@ bool CForward::RemoveFunction(IPluginFunction *func)
 	{
 		if ((*iter) == func)
 		{
+			m_IterGuard->FixIteratorChain(iter);
 			found = true;
 			lst->erase(iter);
 			break;

core/ForwardSys.h

@@ -61,6 +61,58 @@ struct FwdParamInfo
 	ParamType pushedas;
 };
 
+class SourceMod::IForwardFilter
+{
+public:
+	virtual void Preprocess(IPluginFunction *fun, FwdParamInfo *params)
+	{
+	}
+};
+
+class FuncIteratorGuard
+{
+	bool triggered;
+	FuncIteratorGuard **pprev;
+	FuncIter *iter;
+	FuncIteratorGuard *next;
+public:
+	FuncIteratorGuard(FuncIteratorGuard **pprev, FuncIter *iter)
+		: triggered(false), pprev(pprev), iter(iter), next(*pprev)
+	{
+		*pprev = this;
+	}
+
+	~FuncIteratorGuard()
+	{
+		*pprev = next;
+	}
+
+	inline bool Triggered()
+	{
+		bool t = triggered;
+		triggered = false;
+		return t;
+	}
+
+	/**
+	 * This should not read from |this| before the NULL check, because FwdSys
+	 * can call (NULL)->FixIteratorChain().
+	 */
+	void FixIteratorChain(FuncIter &other)
+	{
+		FuncIteratorGuard *guard = this;
+		while (guard != NULL)
+		{
+			if (*guard->iter == other)
+			{
+				*(guard->iter) = ++(*(guard->iter));
+				guard->triggered = true;
+			}
+			guard = guard->next;
+		}
+	}
+};
+
 class CForward : public IChangeableForward
 {
 public: //ICallable
@@ -103,6 +155,7 @@ protected:
 	 */
 	mutable List<IPluginFunction *> m_functions;
 	mutable List<IPluginFunction *> m_paused;
+	FuncIteratorGuard *m_IterGuard;
 
 	/* Type and name information */
 	FwdParamInfo m_params[SP_MAX_EXEC_PARAMS];

core/GameConfigs.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * 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
@@ -25,8 +25,6 @@
  * this exception to all derivative works.  AlliedModders LLC defines further
  * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
  * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
  */
 
 #include <string.h>
@@ -92,7 +90,11 @@ bool s_ServerBinCRC_Ok = false;
 
 static bool DoesGameMatch(const char *value)
 {
+#if defined PLATFORM_WINDOWS
+	if (strcasecmp(value, g_Game) == 0 ||
+#else
 	if (strcmp(value, g_Game) == 0 ||
+#endif
 		strcmp(value, g_GameDesc) == 0 ||
 		strcmp(value, g_GameName) == 0)
 	{
@@ -109,8 +111,14 @@ 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)
+#elif SOURCE_ENGINE == SE_LEFT4DEAD2
+	if (strcmp(value, "left4dead2") == 0)
+#elif SOURCE_ENGINE == SE_ALIENSWARM
+	if (strcmp(value, "alienswarm") == 0)
 #else
 #error "Unknown engine type"
 #endif
@@ -498,7 +506,11 @@ SMCResult CGameConfig::ReadSMC_LeavingSection(const SMCStates *states)
 						void *handle = dlopen(info.dli_fname, RTLD_NOW);
 						if (handle)
 						{
+#if (SOURCE_ENGINE == SE_ORANGEBOXVALVE) || (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
+							final_addr = g_MemUtils.ResolveSymbol(handle, &s_TempSig.sig[1]);
+#else
 							final_addr = dlsym(handle, &s_TempSig.sig[1]);
+#endif
 							dlclose(handle);
 						} else {
 							g_Logger.LogError("[SM] Unable to load library \"%s\" (gameconf \"%s\")",
@@ -517,45 +529,18 @@ SMCResult CGameConfig::ReadSMC_LeavingSection(const SMCStates *states)
 				}
 #endif
 				/* First, preprocess the signature */
-				char real_sig[511];
+				unsigned char real_sig[511];
 				size_t real_bytes;
 				size_t length;
 
 				real_bytes = 0;
 				length = strlen(s_TempSig.sig);
 
-				for (size_t i=0; i<length; i++)
-				{
-					if (real_bytes >= sizeof(real_sig))
-					{
-						break;
-					}
-					real_sig[real_bytes++] = s_TempSig.sig[i];
-					if (s_TempSig.sig[i] == '\\'
-						&& s_TempSig.sig[i+1] == 'x')
-					{
-						if (i + 3 >= length)
-						{
-							continue;
-						}
-						/* Get the hex part */
-						char s_byte[3];
-						int r_byte;
-						s_byte[0] = s_TempSig.sig[i+2];
-						s_byte[1] = s_TempSig.sig[i+3];
-						s_byte[2] = '\0';
-						/* Read it as an integer */
-						sscanf(s_byte, "%x", &r_byte);
-						/* Save the value */
-						real_sig[real_bytes-1] = r_byte;
-						/* Adjust index */
-						i += 3;
-					}
-				}
+				real_bytes = UTIL_DecodeHexString(real_sig, sizeof(real_sig), s_TempSig.sig);
 
 				if (real_bytes >= 1)
 				{
-					final_addr = g_MemUtils.FindPattern(addrInBase, real_sig, real_bytes);
+					final_addr = g_MemUtils.FindPattern(addrInBase, (char*)real_sig, real_bytes);
 				}
 			}
 

core/GameConfigs.h

@@ -39,7 +39,6 @@
 #include "sm_globals.h"
 #include "sm_memtable.h"
 #include "sm_trie_tpl.h"
-#include "ThreadSupport.h"
 
 using namespace SourceMod;
 using namespace SourceHook;

core/HalfLife2.cpp

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -37,10 +37,14 @@
 #include "sm_stringutil.h"
 #include "GameConfigs.h"
 #include <compat_wrappers.h>
+#include <Logger.h>
 
 CHalfLife2 g_HL2;
 ConVar *sv_lan = NULL;
 
+static void *g_EntList = NULL;
+static int entInfoOffset = -1;
+
 namespace SourceHook
 {
 	template<>
@@ -92,14 +96,16 @@ CHalfLife2::~CHalfLife2()
 CSharedEdictChangeInfo *g_pSharedChangeInfo = NULL;
 #endif
 
+#if !defined METAMOD_PLAPI_VERSION || PLAPI_VERSION < 11
 bool is_original_engine = false;
+#endif
 
 void CHalfLife2::OnSourceModStartup(bool late)
 {
 #if SOURCE_ENGINE != SE_DARKMESSIAH
 
 	/* The Ship currently is the only known game to use an older version of the engine */
-#if defined METAMOD_PLAPI_VERSION
+#if defined METAMOD_PLAPI_VERSION || PLAPI_VERSION >= 11
 	if (g_SMAPI->GetSourceEngineBuild() == SOURCE_ENGINE_ORIGINAL)
 #else
 	if (strcasecmp(g_SourceMod.GetGameFolderName(), "ship") == 0)
@@ -123,7 +129,52 @@ void CHalfLife2::OnSourceModAllInitialized()
 	g_ShareSys.AddInterface(NULL, this);
 }
 
-#if !defined METAMOD_PLAPI_VERSION
+void CHalfLife2::OnSourceModAllInitialized_Post()
+{
+	char *addr = NULL;
+#ifdef PLATFORM_WINDOWS
+	int offset;
+
+	/* gEntList and/or g_pEntityList */
+	if (!g_pGameConf->GetMemSig("LevelShutdown", (void **)&addr))
+	{
+		g_Logger.LogError("Logical Entities not supported by this mod (LevelShutdown) - Reverting to networkable entities only");
+		return;
+	}
+	if (!addr)
+	{
+		g_Logger.LogError("Failed lookup of LevelShutdown - Reverting to networkable entities only");
+		return;
+	}
+	if (!g_pGameConf->GetOffset("gEntList", &offset))
+	{
+		g_Logger.LogError("Logical Entities not supported by this mod (gEntList) - Reverting to networkable entities only");
+		return;
+	}
+	g_EntList = *reinterpret_cast<void **>(addr + offset);
+#elif defined PLATFORM_LINUX
+	/* gEntList and/or g_pEntityList */
+	if (!g_pGameConf->GetMemSig("gEntList", (void **)&addr))
+	{
+		g_Logger.LogError("Logical Entities not supported by this mod (gEntList) - Reverting to networkable entities only");
+		return;
+	}
+	if (!addr)
+	{
+		g_Logger.LogError("Failed lookup of gEntList - Reverting to networkable entities only");
+		return;
+	}
+	g_EntList = reinterpret_cast<void *>(addr);
+#endif
+
+	if (!g_pGameConf->GetOffset("EntInfo", &entInfoOffset))
+	{
+		g_Logger.LogError("Logical Entities not supported by this mod (EntInfo) - Reverting to networkable entities only");
+		return;
+	}
+}
+
+#if !defined METAMOD_PLAPI_VERSION || PLAPI_VERSION < 11
 bool CHalfLife2::IsOriginalEngine()
 {
 	return is_original_engine;
@@ -388,6 +439,26 @@ bool CHalfLife2::HintTextMsg(int client, const char *msg)
 	return true;
 }
 
+bool CHalfLife2::HintTextMsg(cell_t *players, int count, const char *msg)
+{
+	bf_write *pBitBuf = NULL;
+
+	if ((pBitBuf = g_UserMsgs.StartMessage(m_HinTextMsg, players, count, USERMSG_RELIABLE)) == NULL)
+	{
+		return false;
+	}
+
+	const char *pre_byte = g_pGameConf->GetKeyValue("HintTextPreByte");
+	if (pre_byte != NULL && strcmp(pre_byte, "yes") == 0)
+	{
+		pBitBuf->WriteByte(1);
+	}
+	pBitBuf->WriteString(msg);
+	g_UserMsgs.EndMessage();
+
+	return true;
+}
+
 bool CHalfLife2::ShowVGUIMenu(int client, const char *name, KeyValues *data, bool show)
 {
 	bf_write *pBitBuf = NULL;
@@ -474,7 +545,7 @@ bool CHalfLife2::IsLANServer()
 
 bool CHalfLife2::KVLoadFromFile(KeyValues *kv, IBaseFileSystem *filesystem, const char *resourceName, const char *pathID)
 {
-#if defined METAMOD_PLAPI_VERSION
+#if defined METAMOD_PLAPI_VERSION || PLAPI_VERSION >= 11
 	if (g_SMAPI->GetSourceEngineBuild() == SOURCE_ENGINE_ORIGINAL)
 #else
 	if (strcasecmp(g_SourceMod.GetGameFolderName(), "ship") == 0)
@@ -599,7 +670,10 @@ edict_t *CHalfLife2::GetHandleEntity(CBaseHandle &hndl)
 	edict_t *pStoredEdict;
 	CBaseEntity *pStoredEntity;
 
-	pStoredEdict = GetEntity(index, &pStoredEntity);
+	if (!IndexToAThings(index, &pStoredEntity, &pStoredEdict))
+	{
+		return NULL;
+	}
 
 	if (pStoredEdict == NULL || pStoredEntity == NULL)
 	{
@@ -642,3 +716,173 @@ void CHalfLife2::ServerCommand(const char *buffer)
 {
 	engine->ServerCommand(buffer);
 }
+
+cell_t CHalfLife2::EntityToReference(CBaseEntity *pEntity)
+{
+	IServerUnknown *pUnknown = (IServerUnknown *)pEntity;
+	CBaseHandle hndl = pUnknown->GetRefEHandle();
+	return (hndl.ToInt() | (1<<31));
+}
+
+CBaseEntity *CHalfLife2::ReferenceToEntity(cell_t entRef)
+{
+	CEntInfo *pInfo = NULL;
+
+	if (entRef & (1<<31))
+	{
+		/* Proper ent reference */
+		int hndlValue = entRef & ~(1<<31);
+		CBaseHandle hndl(hndlValue);
+
+		pInfo = LookupEntity(hndl.GetEntryIndex());
+		if (pInfo->m_SerialNumber != hndl.GetSerialNumber())
+		{
+			return NULL;
+		}
+	}
+	else
+	{
+		/* Old style index only */
+		pInfo = LookupEntity(entRef);
+	}
+
+	if (!pInfo)
+	{
+		return NULL;
+	}
+
+	IServerUnknown *pUnk = static_cast<IServerUnknown *>(pInfo->m_pEntity);
+	if (pUnk)
+	{
+		return pUnk->GetBaseEntity();
+	}
+
+	return NULL;
+}
+
+/**
+ * Retrieves the CEntInfo pointer from g_EntList for a given entity index
+ */
+CEntInfo *CHalfLife2::LookupEntity(int entIndex)
+{
+	if (!g_EntList || entInfoOffset == -1)
+	{
+		/* Attempt to use engine interface instead */
+		static CEntInfo tempInfo;
+		tempInfo.m_pNext = NULL;
+		tempInfo.m_pPrev = NULL;
+
+		edict_t *pEdict = PEntityOfEntIndex(entIndex);
+
+		if (!pEdict)
+		{
+			return NULL;
+		}
+
+		IServerUnknown *pUnk = pEdict->GetUnknown();
+
+		if (!pUnk)
+		{
+			return NULL;
+		}
+
+		tempInfo.m_pEntity = pUnk;
+		tempInfo.m_SerialNumber = pUnk->GetRefEHandle().GetSerialNumber();
+
+		return &tempInfo;
+	}
+
+	CEntInfo *pArray = (CEntInfo *)(((unsigned char *)g_EntList) + entInfoOffset);
+	return &pArray[entIndex];
+}
+
+/**
+	SERIAL_MASK = 0x7fff (15 bits)
+
+	#define	MAX_EDICT_BITS				11
+	#define NUM_ENT_ENTRY_BITS		(MAX_EDICT_BITS + 1)
+	m_Index = iEntry | (iSerialNumber << NUM_ENT_ENTRY_BITS); 
+	
+	Top 5 bits of a handle are unused.
+	Bit 31 - Our 'reference' flag indicator
+*/
+
+cell_t CHalfLife2::IndexToReference(int entIndex)
+{
+	CBaseEntity *pEnt = ReferenceToEntity(entIndex);
+	if (!pEnt)
+	{
+		return INVALID_EHANDLE_INDEX;
+	}
+
+	return EntityToReference(pEnt);
+}
+
+int CHalfLife2::ReferenceToIndex(cell_t entRef)
+{
+	if ((unsigned)entRef == INVALID_EHANDLE_INDEX)
+	{
+		return INVALID_EHANDLE_INDEX;
+	}
+
+	if (entRef & (1<<31))
+	{
+		/* Proper ent reference */
+		int hndlValue = entRef & ~(1<<31);
+		CBaseHandle hndl(hndlValue);
+
+		CEntInfo *pInfo = LookupEntity(hndl.GetEntryIndex());
+
+		if (pInfo->m_SerialNumber != hndl.GetSerialNumber())
+		{
+			return INVALID_EHANDLE_INDEX;
+		}
+
+		return hndl.GetEntryIndex();
+	}
+
+	return entRef;
+}
+
+cell_t CHalfLife2::EntityToBCompatRef(CBaseEntity *pEntity)
+{
+	if (pEntity == NULL)
+	{
+		return INVALID_EHANDLE_INDEX;
+	}
+
+	IServerUnknown *pUnknown = (IServerUnknown *)pEntity;
+	CBaseHandle hndl = pUnknown->GetRefEHandle();
+
+	if (hndl.GetEntryIndex() >= MAX_EDICTS)
+	{
+		return (hndl.ToInt() | (1<<31));
+	}
+	else
+	{
+		return hndl.GetEntryIndex();
+	}
+}
+
+cell_t CHalfLife2::ReferenceToBCompatRef(cell_t entRef)
+{
+	if ((unsigned)entRef == INVALID_EHANDLE_INDEX)
+	{
+		return INVALID_EHANDLE_INDEX;
+	}
+
+	int hndlValue = entRef & ~(1<<31);
+	CBaseHandle hndl(hndlValue);
+
+	if (hndl.GetEntryIndex() < MAX_EDICTS)
+	{
+		return hndl.GetEntryIndex();
+	}
+
+	return entRef;
+}
+
+void *CHalfLife2::GetGlobalEntityList()
+{
+	return g_EntList;
+}

core/HalfLife2.h

@@ -43,6 +43,7 @@
 #include <KeyValues.h>
 #include <server_class.h>
 #include <datamap.h>
+#include <ihandleentity.h>
 
 class CCommand;
 
@@ -86,6 +87,15 @@ struct DelayedKickInfo
 	char buffer[384];
 };
 
+class CEntInfo
+{
+public:
+	IHandleEntity	*m_pEntity;
+	int				m_SerialNumber;
+	CEntInfo		*m_pPrev;
+	CEntInfo		*m_pNext;
+};
+
 class CHalfLife2 : 
 	public SMGlobalClass,
 	public IGameHelpers
@@ -96,6 +106,7 @@ public:
 public:
 	void OnSourceModStartup(bool late);
 	void OnSourceModAllInitialized();
+	void OnSourceModAllInitialized_Post();
 	/*void OnSourceModAllShutdown();*/
 public: //IGameHelpers
 	SendProp *FindInSendTable(const char *classname, const char *offset);
@@ -106,6 +117,7 @@ public: //IGameHelpers
 	void SetEdictStateChanged(edict_t *pEdict, unsigned short offset);
 	bool TextMsg(int client, int dest, const char *msg);
 	bool HintTextMsg(int client, const char *msg);
+	bool HintTextMsg(cell_t *players, int count, const char *msg);
 	bool ShowVGUIMenu(int client, const char *name, KeyValues *data, bool show);
 	bool IsLANServer();
 	bool KVLoadFromFile(KeyValues *kv, IBaseFileSystem *filesystem, const char *resourceName, const char *pathID = NULL);
@@ -115,6 +127,14 @@ public: //IGameHelpers
 	void SetHandleEntity(CBaseHandle &hndl, edict_t *pEnt);
 	const char *GetCurrentMap();
 	void ServerCommand(const char *buffer);
+	CBaseEntity *ReferenceToEntity(cell_t entRef);
+	cell_t EntityToReference(CBaseEntity *pEntity);
+	cell_t IndexToReference(int entIndex);
+	int ReferenceToIndex(cell_t entRef);
+	cell_t ReferenceToBCompatRef(cell_t entRef);
+	CEntInfo *LookupEntity(int entIndex);
+	cell_t EntityToBCompatRef(CBaseEntity *pEntity);
+	void *GetGlobalEntityList();
 public:
 	void AddToFakeCliCmdQueue(int client, int userid, const char *cmd);
 	void ProcessFakeCliCmdQueue();
@@ -125,7 +145,7 @@ public:
 	const char *CurrentCommandName();
 	void AddDelayedKick(int client, int userid, const char *msg);
 	void ProcessDelayedKicks();
-#if !defined METAMOD_PLAPI_VERSION
+#if !defined METAMOD_PLAPI_VERSION || PLAPI_VERSION < 11
 	bool IsOriginalEngine();
 #endif
 private:
@@ -146,6 +166,6 @@ private:
 
 extern CHalfLife2 g_HL2;
 
-edict_t *GetEntity(cell_t num, CBaseEntity **pData);
+bool IndexToAThings(cell_t, CBaseEntity **pEntData, edict_t **pEdictData);
 
 #endif //_INCLUDE_SOURCEMOD_CHALFLIFE2_H_

core/Logger.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
@@ -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);
@@ -378,6 +378,14 @@ print_error:
 }
 
 void Logger::LogError(const char *vafmt, ...)
+{
+	va_list ap;
+	va_start(ap, vafmt);
+	LogErrorEx(vafmt, ap);
+	va_end(ap);
+}
+
+void Logger::LogErrorEx(const char *vafmt, va_list ap)
 {
 	if (!m_Active)
 	{
@@ -408,10 +416,7 @@ void Logger::LogError(const char *vafmt, ...)
 			fprintf(fp, "L %s: Info (map \"%s\") (file \"errors_%04d%02d%02d.log\")\n", date, m_CurMapName.c_str(), curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday);
 			m_ErrMapStart = true;
 		}
-		va_list ap;
-		va_start(ap, vafmt);
 		LogToOpenFileEx(fp, vafmt, ap);
-		va_end(ap);
 		fclose(fp);
 	}
 	else

core/Logger.h

@@ -75,6 +75,7 @@ public:
 	void DisableLogging();
 	void LogMessage(const char *msg, ...);
 	void LogError(const char *msg, ...);
+	void LogErrorEx(const char *msg, va_list ap); 
 	void LogFatal(const char *msg, ...);
 	void LogToOpenFile(FILE *fp, const char *msg, ...);
 	void LogToOpenFileEx(FILE *fp, const char *msg, va_list ap);

core/Makefile

@@ -5,8 +5,10 @@ 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
+HL2SDK_L4D2 = ../../hl2sdk-l4d2
+MMSOURCE17 = ../../mmsource-central
 
 #####################################
 ### EDIT BELOW FOR OTHER PROJECTS ###
@@ -14,19 +16,19 @@ MMSOURCE17 = ../../mmsource-1.7
 
 OBJECTS = AdminCache.cpp CDataPack.cpp ConCmdManager.cpp ConVarManager.cpp CoreConfig.cpp \
 	Database.cpp DebugReporter.cpp EventManager.cpp GameConfigs.cpp HalfLife2.cpp Logger.cpp \
-	MemoryUtils.cpp PlayerManager.cpp TextParsers.cpp TimerSys.cpp Translator.cpp UserMessages.cpp \
+	MemoryUtils.cpp PlayerManager.cpp TimerSys.cpp Translator.cpp UserMessages.cpp \
 	sm_autonatives.cpp sm_memtable.cpp sm_srvcmds.cpp sm_stringutil.cpp sm_trie.cpp \
 	sourcemm_api.cpp sourcemod.cpp MenuStyle_Base.cpp MenuStyle_Valve.cpp MenuManager.cpp \
 	MenuStyle_Radio.cpp ChatTriggers.cpp ADTFactory.cpp MenuVoting.cpp sm_crc32.cpp \
-	frame_hooks.cpp concmd_cleaner.cpp Profiler.cpp PhraseCollection.cpp NextMap.cpp \
-	NativeOwner.cpp
+	frame_hooks.cpp concmd_cleaner.cpp PhraseCollection.cpp NextMap.cpp \
+	NativeOwner.cpp logic_bridge.cpp ConsoleDetours.cpp
 OBJECTS += smn_admin.cpp smn_bitbuffer.cpp smn_console.cpp smn_core.cpp \
 	smn_datapacks.cpp smn_entities.cpp smn_events.cpp smn_fakenatives.cpp \
-	smn_filesystem.cpp smn_float.cpp smn_functions.cpp smn_gameconfigs.cpp smn_halflife.cpp \
-	smn_handles.cpp smn_keyvalues.cpp smn_banning.cpp smn_maplists.cpp \
-	smn_lang.cpp smn_player.cpp smn_string.cpp smn_sorting.cpp smn_textparse.cpp smn_timers.cpp \
-	smn_usermsgs.cpp smn_menus.cpp smn_database.cpp smn_vector.cpp smn_adt_array.cpp \
-	smn_adt_trie.cpp smn_hudtext.cpp smn_adt_stack.cpp smn_nextmap.cpp
+	smn_filesystem.cpp smn_gameconfigs.cpp smn_halflife.cpp \
+	smn_handles.cpp smn_keyvalues.cpp smn_banning.cpp \
+	smn_lang.cpp smn_player.cpp smn_string.cpp smn_timers.cpp \
+	smn_usermsgs.cpp smn_menus.cpp smn_database.cpp smn_vector.cpp \
+	smn_hudtext.cpp smn_nextmap.cpp
 OBJECTS += ExtensionSys.cpp 		\
 		   ForwardSys.cpp 			\
 		   HandleSys.cpp 			\
@@ -35,7 +37,6 @@ OBJECTS += ExtensionSys.cpp 		\
 		   PluginSys.cpp 			\
 		   ShareSys.cpp				\
 		   NativeInvoker.cpp
-OBJECTS += thread/ThreadWorker.cpp thread/BaseWorker.cpp thread/PosixThreads.cpp ThreadSupport.cpp
 
 ##############################################
 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
@@ -70,22 +71,49 @@ 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 -I$(HL2SDK)/common
+	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
 	BINARY = sourcemod.2.l4d.so
 	override ENGSET = true
 endif
+ifeq "$(ENGINE)" "left4dead2"
+	HL2SDK = $(HL2SDK_L4D2)
+	HL2PUB = $(HL2SDK)/public
+	HL2LIB = $(HL2SDK)/lib/linux
+	CFLAGS += -DSOURCE_ENGINE=6
+	METAMOD = $(MMSOURCE17)/core
+	INCLUDE += -I$(HL2SDK)/public/game/server
+	SRCDS = $(SRCDS_BASE)/left4dead2
+	BINARY = sourcemod.2.l4d2.so
+	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 -DSE_LEFT4DEAD2=6
 
+ifeq "$(ENGINE)" "left4dead2"
+LINK += $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a libvstdlib.so \
+	libtier0.so -static-libgcc
+else
 LINK += $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a vstdlib_i486.so \
-	tier0_i486.so -lpthread -static-libgcc
+	tier0_i486.so -static-libgcc
+endif
 	
 INCLUDE += -I. -I.. -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/mathlib -I$(HL2PUB)/vstdlib \
 	-I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 -I$(METAMOD) -I$(METAMOD)/sourcehook \
@@ -124,10 +152,14 @@ $(BIN_DIR)/%.o: %.c
 	$(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
 
 all: check
-	mkdir -p $(BIN_DIR)/systems
-	mkdir -p $(BIN_DIR)/thread
+	mkdir -p $(BIN_DIR)
+ifeq "$(ENGINE)" "left4dead2"
+	ln -sf $(SRCDS)/bin/libvstdlib.so libvstdlib.so;
+	ln -sf $(SRCDS)/bin/libtier0.so libtier0.so;
+else
 	ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so;
 	ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so;
+endif
 	$(MAKE) -f Makefile sourcemod
 
 check:
@@ -146,6 +178,4 @@ default: all
 
 clean: check
 	rm -rf $(BIN_DIR)/*.o
-	rm -rf $(BIN_DIR)/systems/*.o
-	rm -rf $(BIN_DIR)/thread/*.o
 	rm -rf $(BIN_DIR)/$(BINARY)

core/MemoryUtils.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -25,15 +25,17 @@
  * this exception to all derivative works.  AlliedModders LLC defines further
  * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
  * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
  */
 
 #include "MemoryUtils.h"
 #include "ShareSys.h"
 #ifdef PLATFORM_LINUX
-#include <string.h>
-#include <elf.h>
+#include <fcntl.h>
+#include <link.h>
+#include <sys/mman.h>
+
+#define PAGE_SIZE			4096
+#define PAGE_ALIGN_UP(x)	((x + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1))
 #endif
 
 MemoryUtils g_MemUtils;
@@ -56,6 +58,17 @@ MemoryUtils::MemoryUtils()
 }
 #endif
 
+MemoryUtils::~MemoryUtils()
+{
+#ifdef PLATFORM_LINUX
+	for (size_t i = 0; i < m_SymTables.size(); i++)
+	{
+		delete m_SymTables[i];
+	}
+	m_SymTables.clear();
+#endif
+}
+
 void MemoryUtils::OnSourceModAllInitialized()
 {
 	g_ShareSys.AddInterface(NULL, this);
@@ -98,6 +111,149 @@ void *MemoryUtils::FindPattern(const void *libPtr, const char *pattern, size_t l
 	return NULL;
 }
 
+void *MemoryUtils::ResolveSymbol(void *handle, const char *symbol)
+{
+#ifdef PLATFORM_WINDOWS
+
+	return GetProcAddress((HMODULE)handle, symbol);
+
+#elif defined PLATFORM_LINUX
+
+	struct link_map *dlmap;
+	struct stat dlstat;
+	int dlfile;
+	uintptr_t map_base;
+	Elf32_Ehdr *file_hdr;
+	Elf32_Shdr *sections, *shstrtab_hdr, *symtab_hdr, *strtab_hdr;
+	Elf32_Sym *symtab;
+	const char *shstrtab, *strtab;
+	uint16_t section_count;
+	uint32_t symbol_count;
+	LibSymbolTable *libtable;
+	SymbolTable *table;
+	Symbol *symbol_entry;
+
+	dlmap = (struct link_map *)handle;
+	symtab_hdr = NULL;
+	strtab_hdr = NULL;
+	table = NULL;
+	
+	/* See if we already have a symbol table for this library */
+	for (size_t i = 0; i < m_SymTables.size(); i++)
+	{
+		libtable = m_SymTables[i];
+		if (libtable->lib_base == dlmap->l_addr)
+		{
+			table = &libtable->table;
+			break;
+		}
+	}
+
+	/* If we don't have a symbol table for this library, then create one */
+	if (table == NULL)
+	{
+		libtable = new LibSymbolTable();
+		libtable->table.Initialize();
+		libtable->lib_base = dlmap->l_addr;
+		libtable->last_pos = 0;
+		table = &libtable->table;
+		m_SymTables.push_back(libtable);
+	}
+
+	/* See if the symbol is already cached in our table */
+	symbol_entry = table->FindSymbol(symbol, strlen(symbol));
+	if (symbol_entry != NULL)
+	{
+		return symbol_entry->address;
+	}
+
+	/* If symbol isn't in our table, then we have open the actual library */
+	dlfile = open(dlmap->l_name, O_RDONLY);
+	if (dlfile == -1 || fstat(dlfile, &dlstat) == -1)
+	{
+		close(dlfile);
+		return NULL;
+	}
+
+	/* Map library file into memory */
+	file_hdr = (Elf32_Ehdr *)mmap(NULL, dlstat.st_size, PROT_READ, MAP_PRIVATE, dlfile, 0);
+	map_base = (uintptr_t)file_hdr;
+	if (file_hdr == MAP_FAILED)
+	{
+		close(dlfile);
+		return NULL;
+	}
+	close(dlfile);
+
+	if (file_hdr->e_shoff == 0 || file_hdr->e_shstrndx == SHN_UNDEF)
+	{
+		munmap(file_hdr, dlstat.st_size);
+		return NULL;
+	}
+
+	sections = (Elf32_Shdr *)(map_base + file_hdr->e_shoff);
+	section_count = file_hdr->e_shnum;
+	/* Get ELF section header string table */
+	shstrtab_hdr = &sections[file_hdr->e_shstrndx];
+	shstrtab = (const char *)(map_base + shstrtab_hdr->sh_offset);
+
+	/* Iterate sections while looking for ELF symbol table and string table */
+	for (uint16_t i = 0; i < section_count; i++)
+	{
+		Elf32_Shdr &hdr = sections[i];
+		const char *section_name = shstrtab + hdr.sh_name;
+
+		if (strcmp(section_name, ".symtab") == 0)
+		{
+			symtab_hdr = &hdr;
+		}
+		else if (strcmp(section_name, ".strtab") == 0)
+		{
+			strtab_hdr = &hdr;
+		}
+	}
+
+	/* Uh oh, we don't have a symbol table or a string table */
+	if (symtab_hdr == NULL || strtab_hdr == NULL)
+	{
+		munmap(file_hdr, dlstat.st_size);
+		return NULL;
+	}
+
+	symtab = (Elf32_Sym *)(map_base + symtab_hdr->sh_offset);
+	strtab = (const char *)(map_base + strtab_hdr->sh_offset);
+	symbol_count = symtab_hdr->sh_size / symtab_hdr->sh_entsize;
+
+	/* Iterate symbol table starting from the position we were at last time */
+	for (uint32_t i = libtable->last_pos; i < symbol_count; i++)
+	{
+		Elf32_Sym &sym = symtab[i];
+		unsigned char sym_type = ELF32_ST_TYPE(sym.st_info);
+		const char *sym_name = strtab + sym.st_name;
+		Symbol *cur_sym;
+
+		/* Skip symbols that are undefined or do not refer to functions or objects */
+		if (sym.st_shndx == SHN_UNDEF || (sym_type != STT_FUNC && sym_type != STT_OBJECT))
+		{
+			continue;
+		}
+
+		/* Caching symbols as we go along */
+		cur_sym = table->InternSymbol(sym_name, strlen(sym_name), (void *)(dlmap->l_addr + sym.st_value));
+		if (strcmp(symbol, sym_name) == 0)
+		{
+			symbol_entry = cur_sym;
+			libtable->last_pos = ++i;
+			break;
+		}
+	}
+
+	munmap(file_hdr, dlstat.st_size);
+	return symbol_entry ? symbol_entry->address : NULL;
+
+#endif
+}
+
 bool MemoryUtils::GetLibraryInfo(const void *libPtr, DynLibInfo &lib)
 {
 	unsigned long baseAddr;
@@ -201,14 +357,22 @@ bool MemoryUtils::GetLibraryInfo(const void *libPtr, DynLibInfo &lib)
 	phdrCount = file->e_phnum;
 	phdr = reinterpret_cast<Elf32_Phdr *>(baseAddr + file->e_phoff);
 	
-	/* Add up the memory sizes of segments marked as PT_LOAD as those are the only ones that should be in memory */
 	for (uint16_t i = 0; i < phdrCount; i++)
 	{
 		Elf32_Phdr &hdr = phdr[i];
 
-		if (hdr.p_type == PT_LOAD)
+		/* We only really care about the segment with executable code */
+		if (hdr.p_type == PT_LOAD && hdr.p_flags == (PF_X|PF_R))
 		{
-			lib.memorySize += hdr.p_memsz;
+			/* From glibc, elf/dl-load.c:
+			 * c->mapend = ((ph->p_vaddr + ph->p_filesz + GLRO(dl_pagesize) - 1) 
+			 *             & ~(GLRO(dl_pagesize) - 1));
+			 *
+			 * In glibc, the segment file size is aligned up to the nearest page size and
+			 * added to the virtual address of the segment. We just want the size here.
+			 */
+			lib.memorySize = PAGE_ALIGN_UP(hdr.p_filesz);
+			break;
 		}
 	}
 

core/MemoryUtils.h

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2000 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -25,8 +25,6 @@
  * this exception to all derivative works.  AlliedModders LLC defines further
  * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
  * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
  */
 
 #ifndef _INCLUDE_SOURCEMOD_MEMORYUTILS_H_
@@ -34,6 +32,12 @@
 
 #include <IMemoryUtils.h>
 #include "sm_globals.h"
+#ifdef PLATFORM_LINUX
+#include <sh_vector.h>
+#include "sm_symtable.h"
+
+using namespace SourceHook;
+#endif
 
 using namespace SourceMod;
 
@@ -43,16 +47,34 @@ struct DynLibInfo
 	size_t memorySize;
 };
 
+#ifdef PLATFORM_LINUX
+typedef uint32_t Elf32_Addr;
+
+struct LibSymbolTable
+{
+	SymbolTable table;
+	Elf32_Addr lib_base;
+	uint32_t last_pos;
+};
+#endif
+
 class MemoryUtils : 
 	public IMemoryUtils,
 	public SMGlobalClass
 {
+public:
+	~MemoryUtils();
 public: // SMGlobalClass
 	void OnSourceModAllInitialized();
 public: // IMemoryUtils
 	void *FindPattern(const void *libPtr, const char *pattern, size_t len);
-private:
+	void *ResolveSymbol(void *handle, const char *symbol);
+public:
 	bool GetLibraryInfo(const void *libPtr, DynLibInfo &lib);
+#ifdef PLATFORM_LINUX
+private:
+	CVector<LibSymbolTable *> m_SymTables;
+#endif
 };
 
 extern MemoryUtils g_MemUtils;

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
@@ -34,9 +34,55 @@
 #include "MenuVoting.h"
 #include "PlayerManager.h"
 #include "sourcemm_api.h"
+#include <sourcemod.h>
+#include <Logger.h>
+#include <HalfLife2.h>
+#include <mathlib.h>
+#include <const.h>
+#include <Translator.h>
 
 float g_next_vote = 0.0f;
 
+#define VOTE_NOT_VOTING -2
+#define VOTE_PENDING -1
+
+ConVar sm_vote_hintbox("sm_vote_progress_hintbox", 
+					   "0", 
+					   0, 
+					   "Show current vote progress in a hint box",
+					   true,
+					   0.0,
+					   true,
+					   1.0);
+
+ConVar sm_vote_chat("sm_vote_progress_chat", 
+					   "0", 
+					   0, 
+					   "Show current vote progress as chat messages",
+					   true,
+					   0.0,
+					   true,
+					   1.0);
+
+ConVar sm_vote_console("sm_vote_progress_console", 
+					   "0", 
+					   0, 
+					   "Show current vote progress as console messages",
+					   true,
+					   0.0,
+					   true,
+					   1.0);
+
+ConVar sm_vote_client_console("sm_vote_progress_client_console", 
+					   "0", 
+					   0, 
+					   "Show current vote progress as console messages to clients",
+					   true,
+					   0.0,
+					   true,
+					   1.0);
+
+
 #if SOURCE_ENGINE >= SE_ORANGEBOX
 void OnVoteDelayChange(IConVar *cvar, const char *value, float flOldValue);
 #else
@@ -117,7 +163,7 @@ void VoteMenuHandler::OnClientDisconnected(int client)
 	 * newly connected client is not allowed to vote. 
 	 */
 	int item;
-	if ((item = m_ClientVotes[client]) >= -1)
+	if ((item = m_ClientVotes[client]) >= VOTE_PENDING)
 	{
 		if (item >= 0)
 		{
@@ -125,7 +171,7 @@ void VoteMenuHandler::OnClientDisconnected(int client)
 			assert(m_Votes[item] > 0);
 			m_Votes[item]--;
 		}
-		m_ClientVotes[client] = -2;
+		m_ClientVotes[client] = VOTE_NOT_VOTING;
 	}
 }
 
@@ -189,13 +235,13 @@ bool VoteMenuHandler::IsClientInVotePool(int client)
 		return false;
 	}
 
-	return (m_ClientVotes[client] > -2);
+	return (m_ClientVotes[client] > VOTE_NOT_VOTING);
 }
 
 bool VoteMenuHandler::GetClientVoteChoice(int client, unsigned int *pItem)
 {
 	if (!IsClientInVotePool(client)
-		|| m_ClientVotes[client] == -1)
+		|| m_ClientVotes[client] == VOTE_PENDING)
 	{
 		return false;
 	}
@@ -205,7 +251,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 +260,20 @@ 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] = VOTE_PENDING;
+		m_Revoting[client] = true;
+		m_NumVotes--;
+	}
+
 	if (m_nMenuTime == MENU_TIME_FOREVER)
 	{
 		time_limit = m_nMenuTime;
@@ -247,7 +307,8 @@ bool VoteMenuHandler::InitializeVoting(IBaseMenu *menu,
 	/* Mark all clients as not voting */
 	for (int i=1; i<=gpGlobals->maxClients; i++)
 	{
-		m_ClientVotes[i] = -2;
+		m_ClientVotes[i] = VOTE_NOT_VOTING;
+		m_Revoting[i] = false;
 	}
 
 	m_Items = menu->GetItemCount();
@@ -291,6 +352,8 @@ void VoteMenuHandler::StartVoting()
 
 	m_pHandler->OnMenuVoteStart(m_pCurMenu);
 
+	m_displayTimer = g_Timers.CreateTimer(this, 1.0, NULL, TIMER_FLAG_REPEAT|TIMER_FLAG_NO_MAPCHANGE);
+
 	/* By now we know how many clients were set.  
 	 * If there are none, we should end IMMEDIATELY.
 	 */
@@ -298,6 +361,8 @@ void VoteMenuHandler::StartVoting()
 	{
 		EndVoting();
 	}
+
+	m_TotalClients = m_Clients;
 }
 
 void VoteMenuHandler::DecrementPlayerCount()
@@ -334,6 +399,11 @@ void VoteMenuHandler::EndVoting()
 		g_next_vote = gpGlobals->curtime + fVoteDelay;
 	}
 
+	if (m_displayTimer)
+	{
+		g_Timers.KillTimer(m_displayTimer);
+	}
+
 	if (m_bCancelled)
 	{
 		/* If we were cancelled, don't bother tabulating anything.
@@ -380,7 +450,7 @@ void VoteMenuHandler::EndVoting()
 	/* Build the client list */
 	for (int i=1; i<=gpGlobals->maxClients; i++)
 	{
-		if (m_ClientVotes[i] >= -1)
+		if (m_ClientVotes[i] >= VOTE_PENDING)
 		{
 			client_vote[vote.num_clients].client = i;
 			client_vote[vote.num_clients].item = m_ClientVotes[i];
@@ -424,7 +494,7 @@ void VoteMenuHandler::OnMenuCancel(IBaseMenu *menu, int client, MenuCancelReason
 
 void VoteMenuHandler::OnMenuDisplay(IBaseMenu *menu, int client, IMenuPanel *display)
 {
-	m_ClientVotes[client] = -1;
+	m_ClientVotes[client] = VOTE_PENDING;
 	m_pHandler->OnMenuDisplay(menu, client, display);
 }
 
@@ -446,6 +516,55 @@ void VoteMenuHandler::OnMenuSelect(IBaseMenu *menu, int client, unsigned int ite
 		m_ClientVotes[client] = item;
 		m_Votes[item]++;
 		m_NumVotes++;
+
+		if (sm_vote_chat.GetBool() || sm_vote_console.GetBool())
+		{
+			static char buffer[1024];
+			ItemDrawInfo dr;
+			menu->GetItemInfo(item, &dr);
+
+			if (sm_vote_console.GetBool())
+			{
+				int target = SOURCEMOD_SERVER_LANGUAGE;
+				CoreTranslate(buffer, sizeof(buffer), "[SM] %T", 4, NULL, "Voted For", &target, g_Players.GetPlayerByIndex(client)->GetName(), dr.display);
+				Engine_LogPrintWrapper(buffer);
+			}
+			
+			if (sm_vote_chat.GetBool() || sm_vote_client_console.GetBool())
+			{
+				int maxclients = g_Players.GetMaxClients();
+				for (int i=1; i<=maxclients; i++)
+				{	
+					CPlayer *pPlayer = g_Players.GetPlayerByIndex(i);
+					assert(pPlayer);
+
+					if (pPlayer->IsInGame())
+					{
+						if (m_Revoting[client])
+						{
+							CoreTranslate(buffer, sizeof(buffer), "[SM] %T", 4, NULL, "Changed Vote", &i, g_Players.GetPlayerByIndex(client)->GetName(), dr.display);
+						}
+						else
+						{
+							CoreTranslate(buffer, sizeof(buffer), "[SM] %T", 4, NULL, "Voted For", &i, g_Players.GetPlayerByIndex(client)->GetName(), dr.display);
+						}
+
+						if (sm_vote_chat.GetBool())
+						{
+							g_HL2.TextMsg(i, HUD_PRINTTALK, buffer);
+						}
+
+						if (sm_vote_client_console.GetBool())
+						{
+							engine->ClientPrintf(pPlayer->GetEdict(), buffer);
+						}		
+					}
+				}
+			}
+		}
+
+		BuildVoteLeaders();
+		DrawHintProgress();
 	}
 
 	m_pHandler->OnMenuSelect(menu, client, item);
@@ -468,6 +587,9 @@ void VoteMenuHandler::InternalReset()
 	m_NumVotes = 0;
 	m_bCancelled = false;
 	m_pHandler = NULL;
+	m_leaderList[0] = '\0';
+	m_displayTimer = NULL;
+	m_TotalClients = 0;
 }
 
 void VoteMenuHandler::CancelVoting()
@@ -489,3 +611,86 @@ bool VoteMenuHandler::IsCancelling()
 {
 	return m_bCancelled;
 }
+
+void VoteMenuHandler::DrawHintProgress()
+{
+	if (!sm_vote_hintbox.GetBool())
+	{
+		return;
+	}
+
+	static char buffer[1024];
+
+	float timeRemaining = (m_fStartTime + m_nMenuTime) - gpGlobals->curtime;
+	if (timeRemaining < 0)
+	{
+		timeRemaining = 0.0;
+	}
+
+	int iTimeRemaining = RoundFloatToInt(timeRemaining);
+	
+	int maxclients = g_Players.GetMaxClients();
+	for (int i=1; i<=maxclients; i++)
+	{
+		if (g_Players.GetPlayerByIndex(i)->IsInGame())
+		{
+			CoreTranslate(buffer, sizeof(buffer), "%T%s", 6, NULL, "Vote Count", &i, &m_NumVotes, &m_TotalClients, &iTimeRemaining, &m_leaderList);
+			g_HL2.HintTextMsg(i, buffer);
+		}
+	}
+}
+
+void VoteMenuHandler::BuildVoteLeaders()
+{
+	if (m_NumVotes == 0 || !sm_vote_hintbox.GetBool())
+	{
+		return;
+	}
+
+	menu_vote_result_t vote;
+	menu_vote_result_t::menu_item_vote_t item_vote[256];
+
+	memset(&vote, 0, sizeof(vote));
+
+	/* Build the item list */
+	for (unsigned int i=0; i<m_Items; i++)
+	{
+		if (m_Votes[i] > 0)
+		{
+			item_vote[vote.num_items].count = m_Votes[i];
+			item_vote[vote.num_items].item = i;
+			vote.num_votes += m_Votes[i];
+			vote.num_items++;
+		}
+	}
+	vote.item_list = item_vote;
+	assert(vote.num_votes);
+
+	/* Sort the item list descending */
+	qsort(item_vote,
+		vote.num_items,
+		sizeof(menu_vote_result_t::menu_item_vote_t),
+		SortVoteItems);
+
+	/* Take the top 3 (if applicable) and draw them */
+	int len = 0;
+	for (unsigned int i=0; i<vote.num_items && i<3; i++)
+	{
+		int curItem = vote.item_list[i].item;
+		ItemDrawInfo dr;
+		m_pCurMenu->GetItemInfo(curItem, &dr);
+		len += g_SourceMod.Format(m_leaderList + len, sizeof(m_leaderList) - len, "\n%i. %s: (%i)", i+1, dr.display, vote.item_list[i].count);
+	}
+}
+
+SourceMod::ResultType VoteMenuHandler::OnTimer(ITimer *pTimer, void *pData)
+{
+	DrawHintProgress();
+
+	return Pl_Continue;
+}
+
+void VoteMenuHandler::OnTimerEnd(ITimer *pTimer, void *pData)
+{
+	m_displayTimer = NULL;
+}

core/MenuVoting.h

@@ -36,6 +36,7 @@
 #include <IPlayerHelpers.h>
 #include <sh_vector.h>
 #include "sm_globals.h"
+#include <TimerSys.h>
 
 using namespace SourceHook;
 using namespace SourceMod;
@@ -43,7 +44,8 @@ using namespace SourceMod;
 class VoteMenuHandler : 
 	public IMenuHandler, 
 	public SMGlobalClass,
-	public IClientListener
+	public IClientListener,
+	public ITimedEvent
 {
 public: //SMGlobalClass
 	void OnSourceModAllInitialized();
@@ -61,6 +63,9 @@ public: //IMenuHandler
 	void OnMenuEnd(IBaseMenu *menu, MenuEndReason reason);
 	void OnMenuDrawItem(IBaseMenu *menu, int client, unsigned int item, unsigned int &style);
 	unsigned int OnMenuDisplayItem(IBaseMenu *menu, int client, IMenuPanel *panel, unsigned int item, const ItemDrawInfo &dr);
+public: //ITimedEvent
+	ResultType OnTimer(ITimer *pTimer, void *pData);
+	void OnTimerEnd(ITimer *pTimer, void *pData);
 public:
 	bool StartVote(IBaseMenu *menu,
 		unsigned int num_clients,
@@ -74,7 +79,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();
@@ -85,9 +90,12 @@ private:
 		unsigned int time,
 		unsigned int flags);
 	void StartVoting();
+	void DrawHintProgress();
+	void BuildVoteLeaders();
 private:
 	IMenuHandler *m_pHandler;
 	unsigned int m_Clients;
+	unsigned int m_TotalClients;
 	unsigned int m_Items;
 	CVector<unsigned int> m_Votes;
 	IBaseMenu *m_pCurMenu;
@@ -99,6 +107,10 @@ private:
 	float m_fStartTime;
 	unsigned int m_nMenuTime;
 	int m_ClientVotes[256+1];
+	bool m_Revoting[256+1];
+	char m_leaderList[1024];
+	ITimer *m_displayTimer;
 };
 
 #endif //_INCLUDE_SOURCEMOD_MENUVOTING_H_
+

core/NextMap.cpp

@@ -49,7 +49,11 @@ SH_DECL_EXTERN1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &)
 #elif SOURCE_ENGINE == SE_DARKMESSIAH
 SH_DECL_EXTERN0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
 #else
-extern bool __SourceHook_FHAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
+# if SH_IMPL_VERSION >= 4
+ extern int __SourceHook_FHAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
+# else
+ extern bool __SourceHook_FHAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
+#endif
 extern bool __SourceHook_FHRemoveConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
 #endif
 

core/PlayerManager.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * 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
@@ -47,7 +47,8 @@
 #include <iclient.h>
 #include "GameConfigs.h"
 #include "ExtensionSys.h"
-#include "sm_version.h"
+#include <sourcemod_version.h>
+#include "ConsoleDetours.h"
 
 PlayerManager g_Players;
 bool g_OnMapStarted = false;
@@ -75,7 +76,11 @@ SH_DECL_EXTERN1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &)
 #elif SOURCE_ENGINE == SE_DARKMESSIAH
 SH_DECL_EXTERN0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
 #else
-extern bool __SourceHook_FHAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
+# if SH_IMPL_VERSION >= 4
+ extern int __SourceHook_FHAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
+# else
+ extern bool __SourceHook_FHAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
+# endif
 extern bool __SourceHook_FHRemoveConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
 #endif
 
@@ -461,7 +466,7 @@ bool PlayerManager::OnClientConnect_Post(edict_t *pEntity, const char *pszName,
 			pListener->OnClientConnected(client);
 			if (!pPlayer->IsConnected())
 			{
-				break;
+				return true;
 			}
 		}
 
@@ -515,6 +520,11 @@ void PlayerManager::OnClientPutInServer(edict_t *pEntity, const char *playername
 				return;
 			}
 		}
+
+		cell_t res;
+		OnClientConnected->PushCell(client);
+		OnClientConnected->Execute(&res, NULL);
+
 		/* Now do authorization */
 		for (iter=m_hooks.begin(); iter!=m_hooks.end(); iter++)
 		{
@@ -689,7 +699,7 @@ void PlayerManager::OnClientCommand(edict_t *pEntity)
 			ClientConsolePrint(pEntity,
 				" David \"BAILOPAN\" Anderson, Borja \"faluco\" Ferrer");
 			ClientConsolePrint(pEntity,
-				" Scott \"Damaged Soul\" Ehlert, Matt \"pRED\" Woodrow");
+				" Scott \"DS\" Ehlert, Matt \"pRED\" Woodrow");
 			ClientConsolePrint(pEntity,
 				" Michael \"ferret\" McKoy, Pavol \"PM OnoTo\" Marko");
 			ClientConsolePrint(pEntity,
@@ -698,7 +708,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,
@@ -725,10 +735,27 @@ void PlayerManager::OnClientCommand(edict_t *pEntity)
 		}
 	}
 
+	if (g_ConsoleDetours.IsEnabled())
+	{
+		cell_t res2 = g_ConsoleDetours.InternalDispatch(client, args);
+		if (res2 >= Pl_Stop)
+		{
+			g_HL2.PopCommandStack();
+			RETURN_META(MRES_SUPERCEDE);
+		}
+		else if (res2 > res)
+		{
+			res = res2;
+		}
+	}
+
 	cell_t res2 = Pl_Continue;
-	m_clcommand->PushCell(client);
-	m_clcommand->PushCell(argcount);
-	m_clcommand->Execute(&res2, NULL);
+	if (pPlayer->IsInGame())
+	{
+		m_clcommand->PushCell(client);
+		m_clcommand->PushCell(argcount);
+		m_clcommand->Execute(&res2, NULL);
+	}
 
 	if (res2 > res)
 	{
@@ -1153,10 +1180,18 @@ void PlayerManager::ProcessCommandTarget(cmd_target_info_t *info)
 
 	if (strcmp(info->pattern, "@me") == 0 && info->admin != 0)
 	{
-		info->targets[0] = info->admin;
-		info->num_targets = 1;
-		strncopy(info->target_name, pAdmin->GetName(), info->target_name_maxlength);
-		info->target_name_style = COMMAND_TARGETNAME_RAW;
+		info->reason = FilterCommandTarget(pAdmin, pAdmin, info->flags);
+		if (info->reason == COMMAND_TARGET_VALID)
+		{
+			info->targets[0] = info->admin;
+			info->num_targets = 1;
+			strncopy(info->target_name, pAdmin->GetName(), info->target_name_maxlength);
+			info->target_name_style = COMMAND_TARGETNAME_RAW;
+		}
+		else
+		{
+			info->num_targets = 0;
+		}
 		return;
 	}
 
@@ -1411,6 +1446,7 @@ CPlayer::CPlayer()
 	m_TempAdmin = false;
 	m_Info = NULL;
 	m_bAdminCheckSignalled = false;
+	m_UserId = -1;
 	m_bIsInKickQueue = false;
 	m_LastPassword.clear();
 	m_LangId = SOURCEMOD_LANGUAGE_ENGLISH;
@@ -1588,8 +1624,22 @@ void CPlayer::Kick(const char *str)
 {
 	MarkAsBeingKicked();
 	INetChannel *pNetChan = static_cast<INetChannel *>(engine->GetPlayerNetInfo(m_iIndex));
-	IClient *pClient = static_cast<IClient *>(pNetChan->GetMsgHandler());
-	pClient->Disconnect("%s", str);
+	if (pNetChan == NULL)
+	{
+		/* What does this even mean? Hell if I know. */
+		int userid = GetUserId();
+		if (userid > 0)
+		{
+			char buffer[255];
+			UTIL_Format(buffer, sizeof(buffer), "kickid %d %s\n", userid, str);
+			engine->ServerCommand(buffer);
+		}
+	}
+	else
+	{
+		IClient *pClient = static_cast<IClient *>(pNetChan->GetMsgHandler());
+		pClient->Disconnect("%s", str);
+	}
 }
 
 void CPlayer::Authorize_Post()

core/PlayerManager.h

@@ -79,6 +79,7 @@ public:
 	void SetAdminId(AdminId id, bool temporary);
 	AdminId GetAdminId();
 	void Kick(const char *str);
+	bool IsInKickQueue();
 	IPlayerInfo *GetPlayerInfo();
 	unsigned int GetLanguageId();
 	int GetUserId();
@@ -87,7 +88,6 @@ public:
 	unsigned int GetSerial();
 public:
 	void DoBasicAdminChecks();
-	bool IsInKickQueue();
 	void MarkAsBeingKicked();
 	int GetLifeState();
 private:

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

@@ -37,7 +37,6 @@
 #include "ForwardSys.h"
 #include "sourcemm_api.h"
 #include "sourcemod.h"
-#include "TextParsers.h"
 #include "Logger.h"
 #include "ExtensionSys.h"
 #include "sm_srvcmds.h"
@@ -57,10 +56,11 @@ CPlugin::CPlugin(const char *file)
 
 	m_type = PluginType_Private;
 	m_status = Plugin_Uncompiled;
+	m_bSilentlyFailed = false;
 	m_serial = ++MySerial;
 	m_pRuntime = NULL;
-	m_errormsg[256] = '\0';
-	snprintf(m_filename, sizeof(m_filename), "%s", file);
+	m_errormsg[sizeof(m_errormsg) - 1] = '\0';
+	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)
@@ -386,22 +386,27 @@ void CPlugin::Call_OnAllPluginsLoaded()
 	}
 }
 
-bool CPlugin::Call_AskPluginLoad(char *error, size_t maxlength)
+APLRes CPlugin::Call_AskPluginLoad(char *error, size_t maxlength)
 {
 	if (m_status != Plugin_Created)
 	{
-		return false;
+		return APLRes_Failure;
 	}
 
 	m_status = Plugin_Loaded;
 
 	int err;
 	cell_t result;
-	IPluginFunction *pFunction = m_pRuntime->GetFunctionByName("AskPluginLoad");
+	bool haveNewAPL = false;
+	IPluginFunction *pFunction = m_pRuntime->GetFunctionByName("AskPluginLoad2");
 
-	if (!pFunction)
+	if (pFunction) 
 	{
-		return true;
+		haveNewAPL = true;
+	}
+	else if (!(pFunction = m_pRuntime->GetFunctionByName("AskPluginLoad")))
+	{
+		return APLRes_Success;
 	}
 
 	pFunction->PushCell(m_handle);
@@ -410,15 +415,21 @@ bool CPlugin::Call_AskPluginLoad(char *error, size_t maxlength)
 	pFunction->PushCell(maxlength);
 	if ((err=pFunction->Execute(&result)) != SP_ERROR_NONE)
 	{
-		return false;
+		return APLRes_Failure;
 	}
 
-	if (!result || m_status != Plugin_Loaded)
+	if (haveNewAPL) 
 	{
-		return false;
+		return (APLRes)result;
+	}
+	else if (result)
+	{
+		return APLRes_Success;
+	}
+	else
+	{
+		return APLRes_Failure;
 	}
-
-	return true;
 }
 
 void *CPlugin::GetPluginStructure()
@@ -470,6 +481,11 @@ PluginStatus CPlugin::GetStatus()
 	return m_status;
 }
 
+bool CPlugin::IsSilentlyFailed()
+{
+	return m_bSilentlyFailed;
+}
+
 bool CPlugin::IsDebugging()
 {
 	if (m_pRuntime == NULL)
@@ -480,6 +496,11 @@ bool CPlugin::IsDebugging()
 	return true;
 }
 
+void CPlugin::SetSilentlyFailed(bool sf)
+{
+	m_bSilentlyFailed = sf;
+}
+
 void CPlugin::LibraryActions(bool dropping)
 {
 	List<String>::iterator iter;
@@ -851,7 +872,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 +887,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 +986,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 +1005,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, 
@@ -1004,20 +1025,31 @@ LoadRes CPluginManager::_LoadPlugin(CPlugin **_plugin, const char *path, bool de
 		}
 	}
 
+	LoadRes loadFailure = LoadRes_Failure;
 	/* Get the status */
 	if (pPlugin->GetStatus() == Plugin_Created)
 	{
 		/* First native pass - add anything from Core */
 		g_ShareSys.BindNativesToPlugin(pPlugin, true);
 		pPlugin->InitIdentity();
-		if (pPlugin->Call_AskPluginLoad(error, maxlength))
+		APLRes result = pPlugin->Call_AskPluginLoad(error, maxlength);  
+		switch (result)
 		{
+		case APLRes_Success:
 			/* Autoload any modules */
 			LoadOrRequireExtensions(pPlugin, 1, error, maxlength);
-		}
-		else
-		{
+			break;
+		case APLRes_Failure:
 			pPlugin->SetErrorState(Plugin_Failed, "%s", error);
+			loadFailure = LoadRes_Failure;
+			break;
+		case APLRes_SilentFailure:
+			pPlugin->SetErrorState(Plugin_Failed, "%s", error);
+			loadFailure = LoadRes_SilentFailure;
+			pPlugin->SetSilentlyFailed(true);
+			break;
+		default:
+			assert(false);
 		}
 	}
 
@@ -1030,7 +1062,7 @@ LoadRes CPluginManager::_LoadPlugin(CPlugin **_plugin, const char *path, bool de
 		*_plugin = pPlugin;
 	}
 
-	return (pPlugin->GetStatus() == Plugin_Loaded) ? LoadRes_Successful : LoadRes_Failure;
+	return (pPlugin->GetStatus() == Plugin_Loaded) ? LoadRes_Successful : loadFailure;
 }
 
 IPlugin *CPluginManager::LoadPlugin(const char *path, bool debug, PluginType type, char error[], size_t maxlength, bool *wasloaded)
@@ -1053,13 +1085,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;
 	}
@@ -1090,12 +1125,12 @@ void CPluginManager::LoadAutoPlugin(const char *plugin)
 	{
 		g_Logger.LogError("[SM] Failed to load plugin \"%s\": %s", plugin, error);
 		pl->SetErrorState(
-			pl->GetStatus() == Plugin_BadLoad ? Plugin_BadLoad : Plugin_Failed, 
+			pl->GetStatus() <= Plugin_Created ? Plugin_BadLoad : pl->GetStatus(), 
 			"%s",
 			error);
 	}
 
-	if (res == LoadRes_Successful || res == LoadRes_Failure)
+	if (res == LoadRes_Successful || res == LoadRes_Failure || res == LoadRes_SilentFailure)
 	{
 		AddPlugin(pl);
 	}
@@ -1189,7 +1224,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 +1257,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 +1328,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 +1396,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;
 		}
@@ -1951,7 +1986,7 @@ void CPluginManager::OnRootConsoleCommand(const char *cmdname, const CCommand &c
 				assert(pl->GetStatus() != Plugin_Created);
 				int len = 0;
 				const sm_plugininfo_t *info = pl->GetPublicInfo();
-				if (pl->GetStatus() != Plugin_Running)
+				if (pl->GetStatus() != Plugin_Running && !pl->IsSilentlyFailed())
 				{
 					len += UTIL_Format(buffer, sizeof(buffer), "  %02d <%s>", id, GetStatusText(pl->GetStatus()));
 
@@ -1967,6 +2002,8 @@ void CPluginManager::OnRootConsoleCommand(const char *cmdname, const CCommand &c
 				}
 				if (pl->GetStatus() < Plugin_Created)
 				{
+					if (pl->IsSilentlyFailed())
+						len += UTIL_Format(&buffer[len], sizeof(buffer)-len, " Disabled:");
 					len += UTIL_Format(&buffer[len], sizeof(buffer)-len, " \"%s\"", (IS_STR_FILLED(info->name)) ? info->name : pl->GetFilename());
 					if (IS_STR_FILLED(info->version))
 					{
@@ -2015,7 +2052,7 @@ void CPluginManager::OnRootConsoleCommand(const char *cmdname, const CCommand &c
 
 			char pluginfile[256];
 			const char *ext = g_LibSys.GetFileExtension(filename) ? "" : ".smx";
-			UTIL_Format(pluginfile, sizeof(pluginfile), "%s%s", filename, ext);
+			g_SourceMod.BuildPath(Path_None, pluginfile, sizeof(pluginfile), "%s%s", filename, ext);
 
 			IPlugin *pl = LoadPlugin(pluginfile, false, PluginType_MapUpdated, error, sizeof(error), &wasloaded);
 
@@ -2062,7 +2099,7 @@ void CPluginManager::OnRootConsoleCommand(const char *cmdname, const CCommand &c
 			{
 				char pluginfile[256];
 				const char *ext = g_LibSys.GetFileExtension(arg) ? "" : ".smx";
-				UTIL_Format(pluginfile, sizeof(pluginfile), "%s%s", arg, ext);
+				g_SourceMod.BuildPath(Path_None, pluginfile, sizeof(pluginfile), "%s%s", arg, ext);
 
 				if (!sm_trie_retrieve(m_LoadLookup, pluginfile, (void **)&pl))
 				{
@@ -2152,7 +2189,7 @@ void CPluginManager::OnRootConsoleCommand(const char *cmdname, const CCommand &c
 			{
 				char pluginfile[256];
 				const char *ext = g_LibSys.GetFileExtension(arg) ? "" : ".smx";
-				UTIL_Format(pluginfile, sizeof(pluginfile), "%s%s", arg, ext);
+				g_SourceMod.BuildPath(Path_None, pluginfile, sizeof(pluginfile), "%s%s", arg, ext);
 
 				if (!sm_trie_retrieve(m_LoadLookup, pluginfile, (void **)&pl))
 				{
@@ -2273,7 +2310,7 @@ void CPluginManager::OnRootConsoleCommand(const char *cmdname, const CCommand &c
 			{
 				char pluginfile[256];
 				const char *ext = g_LibSys.GetFileExtension(arg) ? "" : ".smx";
-				UTIL_Format(pluginfile, sizeof(pluginfile), "%s%s", arg, ext);
+				g_SourceMod.BuildPath(Path_None, pluginfile, sizeof(pluginfile), "%s%s", arg, ext);
 
 				if (!sm_trie_retrieve(m_LoadLookup, pluginfile, (void **)&pl))
 				{
@@ -2284,7 +2321,10 @@ void CPluginManager::OnRootConsoleCommand(const char *cmdname, const CCommand &c
 
 			char name[PLATFORM_MAX_PATH];
 			const sm_plugininfo_t *info = pl->GetPublicInfo();
-			strcpy(name, (IS_STR_FILLED(info->name)) ? info->name : pl->GetFilename());
+			if (pl->GetStatus() <= Plugin_Paused) 
+				strcpy(name, (IS_STR_FILLED(info->name)) ? info->name : pl->GetFilename());
+			else
+				strcpy(name, pl->GetFilename());
 
 			if (ReloadPlugin(pl))
 			{
@@ -2701,6 +2741,6 @@ void CPluginManager::ListPluginsToClient(CPlayer *player, const CCommand &args)
 	/* Do we actually have more plugins? */
 	if (iter != m_plugins.end())
 	{
-		ClientConsolePrint(e, "To see more, type \"sm plugins %d\"", id + 1);
+		ClientConsolePrint(e, "To see more, type \"sm plugins %d\"", id);
 	}
 }

core/PluginSys.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -47,9 +47,11 @@
 #include "sm_trie.h"
 #include "sourcemod.h"
 #include <IRootConsoleMenu.h>
-#if SOURCE_ENGINE == SE_LEFT4DEAD
+#if SOURCE_ENGINE == SE_ALIENSWARM
+#include "convar_sm_swarm.h"
+#elif (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
 #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"
@@ -117,9 +119,17 @@ enum LoadRes
 	LoadRes_Successful,
 	LoadRes_AlreadyLoaded,
 	LoadRes_Failure,
+	LoadRes_SilentFailure,
 	LoadRes_NeverLoad
 };
 
+enum APLRes
+{
+	APLRes_Success,
+	APLRes_Failure,
+	APLRes_SilentFailure
+};
+
 struct AutoConfig
 {
 	String autocfg;
@@ -146,6 +156,8 @@ public:
 	const char *GetFilename();
 	bool IsDebugging();
 	PluginStatus GetStatus();
+	bool IsSilentlyFailed();
+	void SetSilentlyFailed(bool sf);
 	const sm_plugininfo_t *GetPublicInfo();
 	bool SetPauseState(bool paused);
 	unsigned int GetSerial();
@@ -183,7 +195,7 @@ public:
 	 *
 	 * If the error buffer is NULL, the error message is cached locally.
 	 */
-	bool Call_AskPluginLoad(char *error, size_t maxlength);
+	APLRes Call_AskPluginLoad(char *error, size_t maxlength);
 
 	/**
 	 * Calls the OnPluginStart function.
@@ -247,6 +259,7 @@ private:
 	PluginType m_type;
 	char m_filename[PLATFORM_MAX_PATH];
 	PluginStatus m_status;
+	bool m_bSilentlyFailed;
 	unsigned int m_serial;
 	sm_plugininfo_t m_info;
 	char m_errormsg[256];

core/ShareSys.cpp

@@ -527,3 +527,85 @@ NativeEntry *ShareSystem::AddFakeNative(IPluginFunction *pFunc, const char *name
 
 	return pEntry;
 }
+
+void ShareSystem::AddCapabilityProvider(IExtension *myself, IFeatureProvider *provider,
+		                                const char *name)
+{
+	if (m_caps.retrieve(name) != NULL)
+		return;
+
+	Capability cap;
+	cap.ext = myself;
+	cap.provider = provider;
+
+	m_caps.insert(name, cap);
+}
+
+void ShareSystem::DropCapabilityProvider(IExtension *myself, IFeatureProvider *provider,
+		                                 const char *name)
+{
+	Capability *pCap = m_caps.retrieve(name);
+	if (pCap == NULL)
+		return;
+
+	if (pCap->ext != myself || pCap->provider != provider)
+		return;
+
+	m_caps.remove(name);
+}
+
+FeatureStatus ShareSystem::TestFeature(IPluginRuntime *pRuntime, FeatureType feature, 
+                                       const char *name)
+{
+	switch (feature)
+	{
+	case FeatureType_Native:
+		return TestNative(pRuntime, name);
+	case FeatureType_Capability:
+		return TestCap(name);
+	default:
+		break;
+	}
+
+	return FeatureStatus_Unknown;
+}
+
+FeatureStatus ShareSystem::TestNative(IPluginRuntime *pRuntime, const char *name)
+{
+	uint32_t index;
+
+	if (pRuntime->FindNativeByName(name, &index) == SP_ERROR_NONE)
+	{
+		sp_native_t *native;
+		if (pRuntime->GetNativeByIndex(index, &native) == SP_ERROR_NONE)
+		{
+			if (native->status == SP_NATIVE_BOUND)
+				return FeatureStatus_Available;
+			else
+				return FeatureStatus_Unknown;
+		}
+	}
+
+	NativeEntry *entry = FindNative(name);
+	if (entry == NULL)
+		return FeatureStatus_Unknown;
+
+	if ((entry->replacement.owner != NULL || entry->owner != NULL) &&
+		(entry->replacement.func != NULL || entry->func != NULL))
+	{
+		return FeatureStatus_Available;
+	}
+	else
+	{
+		return FeatureStatus_Unavailable;
+	}
+}
+
+FeatureStatus ShareSystem::TestCap(const char *name)
+{
+	Capability *cap = m_caps.retrieve(name);
+	if (cap == NULL)
+		return FeatureStatus_Unknown;
+
+	return cap->provider->GetFeatureStatus(FeatureType_Capability, name);
+}

core/ShareSys.h

@@ -87,7 +87,13 @@ struct NativeEntry
 	FakeNative *fake;
 };
 
-class ShareSystem : 
+struct Capability
+{
+	IExtension *ext;
+	IFeatureProvider *provider;
+};
+
+class ShareSystem :
 	public IShareSys,
 	public SMGlobalClass,
 	public IHandleTypeDispatch
@@ -110,6 +116,10 @@ public: //IShareSys
 	void AddDependency(IExtension *myself, const char *filename, bool require, bool autoload);
 	void RegisterLibrary(IExtension *myself, const char *name);
 	void OverrideNatives(IExtension *myself, const sp_nativeinfo_t *natives);
+	void AddCapabilityProvider(IExtension *myself, IFeatureProvider *provider,
+		                       const char *name);
+	void DropCapabilityProvider(IExtension *myself, IFeatureProvider *provider,
+		                        const char *name);
 public: //SMGlobalClass
 	/* Pre-empt in case anything tries to register idents early */
 	void Initialize();
@@ -119,6 +129,9 @@ public: //IHandleTypeDispatch
 public:
 	IdentityToken_t *CreateCoreIdentity();
 	void RemoveInterfaces(IExtension *pExtension);
+	FeatureStatus TestFeature(IPluginRuntime *pRuntime, FeatureType feature, const char *name);
+	FeatureStatus TestNative(IPluginRuntime *pRuntime, const char *name);
+	FeatureStatus TestCap(const char *name);
 public:
 	inline IdentityToken_t *GetIdentRoot()
 	{
@@ -143,6 +156,7 @@ private:
 	HandleType_t m_IfaceType;
 	IdentityType_t m_CoreType;
 	KTrie<NativeEntry *> m_NtvCache;
+	KTrie<Capability> m_caps;
 };
 
 extern ShareSystem g_ShareSys;

core/UserMessages.cpp

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -34,7 +34,7 @@
 
 UserMessages g_UserMsgs;
 
-#if SOURCE_ENGINE == SE_LEFT4DEAD
+#if SOURCE_ENGINE >= SE_LEFT4DEAD
 SH_DECL_HOOK3(IVEngineServer, UserMessageBegin, SH_NOATTRIB, 0, bf_write *, IRecipientFilter *, int, const char *);
 #else
 SH_DECL_HOOK2(IVEngineServer, UserMessageBegin, SH_NOATTRIB, 0, bf_write *, IRecipientFilter *, int);
@@ -168,13 +168,13 @@ bf_write *UserMessages::StartMessage(int msg_id, const cell_t players[], unsigne
 
 	if (m_CurFlags & USERMSG_BLOCKHOOKS)
 	{
-#if SOURCE_ENGINE == SE_LEFT4DEAD
+#if SOURCE_ENGINE >= SE_LEFT4DEAD
 		buffer = ENGINE_CALL(UserMessageBegin)(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id, g_SMAPI->GetUserMessage(msg_id));
 #else
 		buffer = ENGINE_CALL(UserMessageBegin)(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id);
 #endif
 	} else {
-#if SOURCE_ENGINE == SE_LEFT4DEAD
+#if SOURCE_ENGINE >= SE_LEFT4DEAD
 		buffer = engine->UserMessageBegin(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id, g_SMAPI->GetUserMessage(msg_id));
 #else
 		buffer = engine->UserMessageBegin(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id);
@@ -316,7 +316,7 @@ void UserMessages::_DecRefCounter()
 	}
 }
 
-#if SOURCE_ENGINE == SE_LEFT4DEAD
+#if SOURCE_ENGINE >= SE_LEFT4DEAD
 bf_write *UserMessages::OnStartMessage_Pre(IRecipientFilter *filter, int msg_type, const char *msg_name)
 #else
 bf_write *UserMessages::OnStartMessage_Pre(IRecipientFilter *filter, int msg_type)
@@ -346,7 +346,7 @@ bf_write *UserMessages::OnStartMessage_Pre(IRecipientFilter *filter, int msg_typ
 	RETURN_META_VALUE(MRES_IGNORED, NULL);
 }
 
-#if SOURCE_ENGINE == SE_LEFT4DEAD
+#if SOURCE_ENGINE >= SE_LEFT4DEAD
 bf_write *UserMessages::OnStartMessage_Post(IRecipientFilter *filter, int msg_type, const char *msg_name)
 #else
 bf_write *UserMessages::OnStartMessage_Post(IRecipientFilter *filter, int msg_type)
@@ -496,16 +496,11 @@ void UserMessages::OnMessageEnd_Pre()
 		iter++;
 	}
 
-	if (handled)
-	{
-		goto supercede;
-	}
-
-	if (intercepted)
+	if (!handled && intercepted)
 	{
 		bf_write *engine_bfw;
 
-#if SOURCE_ENGINE == SE_LEFT4DEAD
+#if SOURCE_ENGINE >= SE_LEFT4DEAD
 		engine_bfw = ENGINE_CALL(UserMessageBegin)(m_CurRecFilter, m_CurId, g_SMAPI->GetUserMessage(m_CurId));
 #else
 		engine_bfw = ENGINE_CALL(UserMessageBegin)(m_CurRecFilter, m_CurId);

core/UserMessages.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -79,7 +79,7 @@ public: //IUserMessages
 		IUserMessageListener *pListener,
 		bool intercept=false);
 public:
-#if SOURCE_ENGINE == SE_LEFT4DEAD
+#if SOURCE_ENGINE >= SE_LEFT4DEAD
 	bf_write *OnStartMessage_Pre(IRecipientFilter *filter, int msg_type, const char *msg_name);
 	bf_write *OnStartMessage_Post(IRecipientFilter *filter, int msg_type, const char *msg_name);
 #else

core/concmd_cleaner.cpp

@@ -39,6 +39,9 @@
 
 #if SOURCE_ENGINE >= SE_ORANGEBOX
 SH_DECL_HOOK1_void(ICvar, UnregisterConCommand, SH_NOATTRIB, 0, ConCommandBase *);
+SH_DECL_HOOK1_void(ICvar, RegisterConCommand, SH_NOATTRIB, 0, ConCommandBase *);
+#else
+SH_DECL_HOOK1_void(ICvar, RegisterConCommandBase, SH_NOATTRIB, 0, ConCommandBase *);
 #endif
 
 using namespace SourceHook;
@@ -51,29 +54,55 @@ struct ConCommandInfo
 };
 
 List<ConCommandInfo *> tracked_bases;
+IConCommandLinkListener *IConCommandLinkListener::head = NULL;
 
 ConCommandBase *FindConCommandBase(const char *name);
 
 class ConCommandCleaner : public SMGlobalClass
 {
 public:
-#if SOURCE_ENGINE >= SE_ORANGEBOX
 	void OnSourceModAllInitialized()
 	{
+#if SOURCE_ENGINE >= SE_ORANGEBOX
 		SH_ADD_HOOK_MEMFUNC(ICvar, UnregisterConCommand, icvar, this, &ConCommandCleaner::UnlinkConCommandBase, false);
+		SH_ADD_HOOK_MEMFUNC(ICvar, RegisterConCommand, icvar, this, &ConCommandCleaner::LinkConCommandBase, false);
+#else
+		SH_ADD_HOOK_MEMFUNC(ICvar, RegisterConCommandBase, icvar, this, &ConCommandCleaner::LinkConCommandBase, false);
+#endif
 	}
 
 	void OnSourceModShutdown()
 	{
+#if SOURCE_ENGINE >= SE_ORANGEBOX
 		SH_REMOVE_HOOK_MEMFUNC(ICvar, UnregisterConCommand, icvar, this, &ConCommandCleaner::UnlinkConCommandBase, false);
-	}
+		SH_REMOVE_HOOK_MEMFUNC(ICvar, RegisterConCommand, icvar, this, &ConCommandCleaner::LinkConCommandBase, false);
+#else
+		SH_REMOVE_HOOK_MEMFUNC(ICvar, RegisterConCommandBase, icvar, this, &ConCommandCleaner::LinkConCommandBase, false);
 #endif
+	}
+
+	void LinkConCommandBase(ConCommandBase *pBase)
+	{
+		IConCommandLinkListener *listener = IConCommandLinkListener::head;
+		while (listener)
+		{
+			listener->OnLinkConCommand(pBase);
+			listener = listener->next;
+		}
+	}
 
 	void UnlinkConCommandBase(ConCommandBase *pBase)
 	{
 		ConCommandInfo *pInfo;
 		List<ConCommandInfo *>::iterator iter = tracked_bases.begin();
 
+		IConCommandLinkListener *listener = IConCommandLinkListener::head;
+		while (listener)
+		{
+			listener->OnUnlinkConCommand(pBase);
+			listener = listener->next;
+		}
+
 		if (pBase)
 		{
 			while (iter != tracked_bases.end())

core/concmd_cleaner.h

@@ -42,4 +42,26 @@ void TrackConCommandBase(ConCommandBase *pBase, IConCommandTracker *me);
 void UntrackConCommandBase(ConCommandBase *pBase, IConCommandTracker *me);
 void Global_OnUnlinkConCommandBase(ConCommandBase *pBase);
 
+class IConCommandLinkListener
+{
+	friend class ConCommandCleaner;
+
+	static IConCommandLinkListener *head;
+	IConCommandLinkListener *next;
+public:
+	IConCommandLinkListener()
+	{
+		next = head;
+		head = this;
+	}
+
+	virtual void OnLinkConCommand(ConCommandBase *pBase)
+	{
+	}
+
+	virtual void OnUnlinkConCommand(ConCommandBase *pBase)
+	{
+	}
+};
+
 #endif //_INCLUDE_CONCMD_TRACKER_H_

core/convar_sm_l4d.h

@@ -386,6 +386,9 @@ public:
 	virtual void				SetValue( const char *value );
 	virtual void				SetValue( float value );
 	virtual void				SetValue( int value );
+#if SOURCE_ENGINE >= SE_LEFT4DEAD2
+	virtual void				SetValue( Color value );
+#endif
 	
 	// Reset to default value
 	void						Revert( void );
@@ -401,6 +404,9 @@ private:
 	// For CVARs marked FCVAR_NEVER_AS_STRING
 	virtual void				InternalSetFloatValue( float fNewValue );
 	virtual void				InternalSetIntValue( int nValue );
+#if SOURCE_ENGINE >= SE_LEFT4DEAD2
+	virtual void				InternalSetColorValue( Color value );
+#endif
 
 	virtual bool				ClampValue( float& value );
 	virtual void				ChangeStringValue( const char *tempVal, float flOldValue );

core/frame_hooks.cpp

@@ -37,7 +37,7 @@
 #include "PlayerManager.h"
 #include "CoreConfig.h"
 #include <sm_queue.h>
-#include "ThreadSupport.h"
+#include <IThreader.h>
 
 static IMutex *frame_mutex;
 static Queue<FrameAction> *frame_queue;

core/logic/AMBuilder

@@ -0,0 +1,41 @@
+# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+import os
+
+compiler = SM.DefaultCompiler()
+base = AMBuild.sourceFolder
+compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook'))
+compiler['CXXINCLUDES'].append(os.path.join(base, 'core', 'logic'))
+compiler['CXXINCLUDES'].append(os.path.join(base, 'public'))
+compiler['CXXINCLUDES'].append(os.path.join(base, 'public', 'sourcepawn'))
+compiler['CDEFINES'].append('SM_DEFAULT_THREADER')
+compiler['CDEFINES'].append('SM_LOGIC')
+
+if AMBuild.target['platform'] == 'linux':
+	compiler['POSTLINKFLAGS'].append('-lpthread')
+
+extension = AMBuild.AddJob('sourcemod.logic')
+binary = Cpp.LibraryBuilder('sourcemod.logic', AMBuild, extension, compiler)
+files = [
+	'common_logic.cpp',
+	'smn_adt_array.cpp',
+	'smn_sorting.cpp',
+	'smn_maplists.cpp',
+	'smn_adt_stack.cpp',
+	'thread/ThreadWorker.cpp',
+	'thread/BaseWorker.cpp',
+	'ThreadSupport.cpp',
+	'smn_float.cpp',
+	'TextParsers.cpp',
+	'smn_textparse.cpp',
+	'smn_adt_trie.cpp',
+	'Profiler.cpp',
+	'smn_functions.cpp'
+	]
+if AMBuild.target['platform'] == 'windows':
+	files.append('thread/WinThreads.cpp')
+else:
+	files.append('thread/PosixThreads.cpp')
+binary.AddSourceFiles('core/logic', files)
+SM.AutoVersion('core/logic', binary)
+binary.SendToJob()
+

core/logic/CellArray.h

@@ -29,6 +29,9 @@
  * Version: $Id$
  */
 
+#ifndef _INCLUDE_SOURCEMOD_CELLARRAY_H_
+#define _INCLUDE_SOURCEMOD_CELLARRAY_H_
+
 #include <stdlib.h>
 #include <string.h>
 
@@ -204,3 +207,6 @@ private:
 	size_t m_AllocSize;
 	size_t m_Size;
 };
+
+#endif /* _INCLUDE_SOURCEMOD_CELLARRAY_H_ */
+

core/logic/Makefile

@@ -0,0 +1,92 @@
+# (C)2004-2008 SourceMod Development Team
+# Makefile written by David "BAILOPAN" Anderson
+
+SMSDK = ../..
+MMSOURCE17 = ../../../mmsource-1.7
+
+#####################################
+### EDIT BELOW FOR OTHER PROJECTS ###
+#####################################
+
+BINARY = sourcemod.logic.so
+
+OBJECTS = \
+	common_logic.cpp	\
+	smn_adt_array.cpp	\
+	smn_sorting.cpp		\
+	smn_maplists.cpp	\
+	smn_adt_stack.cpp	\
+	thread/ThreadWorker.cpp \
+	thread/BaseWorker.cpp 	\
+	thread/PosixThreads.cpp \
+	ThreadSupport.cpp	\
+	smn_float.cpp		\
+	TextParsers.cpp		\
+	smn_textparse.cpp	\
+	smn_adt_trie.cpp	\
+	Profiler.cpp		\
+	smn_functions.cpp
+
+##############################################
+### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
+##############################################
+
+C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -pipe -fno-strict-aliasing
+C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
+C_GCC4_FLAGS = -fvisibility=hidden
+CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
+CPP = gcc
+
+LINK += -lpthread -static-libgcc
+	
+INCLUDE += -I. -I$(MMSOURCE17)/core/sourcehook -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn
+
+CFLAGS += -D_LINUX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp \
+	-D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Werror \
+	-Wno-uninitialized -mfpmath=sse -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H -DSM_DEFAULT_THREADER -m32 \
+	-DSM_LOGIC
+CPPFLAGS += -Wno-non-virtual-dtor -fno-exceptions -fno-rtti
+
+################################################
+### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ###
+################################################
+
+ifeq "$(DEBUG)" "true"
+	BIN_DIR = Debug
+	CFLAGS += $(C_DEBUG_FLAGS)
+else
+	BIN_DIR = Release
+	CFLAGS += $(C_OPT_FLAGS)
+endif
+
+GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
+ifeq "$(GCC_VERSION)" "4"
+	CFLAGS += $(C_GCC4_FLAGS)
+	CPPFLAGS += $(CPP_GCC4_FLAGS)
+endif
+
+OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
+OBJ_LINUX := $(OBJ_LINUX:%.c=$(BIN_DIR)/%.o)
+
+$(BIN_DIR)/%.o: %.cpp
+	$(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+$(BIN_DIR)/%.o: %.c
+	$(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
+
+all: 
+	mkdir -p $(BIN_DIR)/thread
+	$(MAKE) -f Makefile sourcemod
+
+sourcemod: $(OBJ_LINUX)
+	$(CPP) $(INCLUDE) $(OBJ_LINUX) $(LINK) -m32 -shared -ldl -lm -o $(BIN_DIR)/$(BINARY)
+
+debug:
+	$(MAKE) -f Makefile all DEBUG=true
+
+default: all
+
+clean: 
+	rm -rf $(BIN_DIR)/*.o
+	rm -rf $(BIN_DIR)/thread/*.o
+	rm -rf $(BIN_DIR)/$(BINARY)

core/logic/MersenneTwister.h

@@ -0,0 +1,399 @@
+// MersenneTwister.h
+// Mersenne Twister random number generator -- a C++ class MTRand
+// Based on code by Makoto Matsumoto, Takuji Nishimura, and Shawn Cokus
+// Richard J. Wagner  v1.0  15 May 2003  [email protected]
+
+// The Mersenne Twister is an algorithm for generating random numbers.  It
+// was designed with consideration of the flaws in various other generators.
+// The period, 2^19937-1, and the order of equidistribution, 623 dimensions,
+// are far greater.  The generator is also fast; it avoids multiplication and
+// division, and it benefits from caches and pipelines.  For more information
+// see the inventors' web page at http://www.math.keio.ac.jp/~matumoto/emt.html
+
+// Reference
+// M. Matsumoto and T. Nishimura, "Mersenne Twister: A 623-Dimensionally
+// Equidistributed Uniform Pseudo-Random Number Generator", ACM Transactions on
+// Modeling and Computer Simulation, Vol. 8, No. 1, January 1998, pp 3-30.
+
+// Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+// Copyright (C) 2000 - 2003, Richard J. Wagner
+// All rights reserved.                          
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+//
+//   1. Redistributions of source code must retain the above copyright
+//      notice, this list of conditions and the following disclaimer.
+//
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+//
+//   3. The names of its contributors may not be used to endorse or promote 
+//      products derived from this software without specific prior written 
+//      permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// The original code included the following notice:
+//
+//     When you use this, send an email to: [email protected]
+//     with an appropriate reference to your work.
+//
+// It would be nice to CC: [email protected] and [email protected]
+// when you write.
+
+#ifndef MERSENNETWISTER_H
+#define MERSENNETWISTER_H
+
+// Not thread safe (unless auto-initialization is avoided and each thread has
+// its own MTRand object)
+
+#include <limits.h>
+#include <stdio.h>
+#include <time.h>
+#include <math.h>
+
+class MTRand {
+// Data
+public:
+	typedef unsigned long uint32;  // unsigned integer type, at least 32 bits
+	
+	enum { N = 624 };       // length of state vector
+	enum { SAVE = N + 1 };  // length of array for save()
+
+protected:
+	enum { M = 397 };  // period parameter
+	
+	uint32 state[N];   // internal state
+	uint32 *pNext;     // next value to get from state
+	int left;          // number of values left before reload needed
+
+
+//Methods
+public:
+	MTRand( const uint32& oneSeed );  // initialize with a simple uint32
+	MTRand( uint32 *const bigSeed, uint32 const seedLength = N );  // or an array
+	MTRand();  // auto-initialize with /dev/urandom or time() and clock()
+	
+	// Do NOT use for CRYPTOGRAPHY without securely hashing several returned
+	// values together, otherwise the generator state can be learned after
+	// reading 624 consecutive values.
+	
+	// Access to 32-bit random numbers
+	double rand();                          // real number in [0,1]
+	double rand( const double& n );         // real number in [0,n]
+	double randExc();                       // real number in [0,1)
+	double randExc( const double& n );      // real number in [0,n)
+	double randDblExc();                    // real number in (0,1)
+	double randDblExc( const double& n );   // real number in (0,n)
+	uint32 randInt();                       // integer in [0,2^32-1]
+	uint32 randInt( const uint32& n );      // integer in [0,n] for n < 2^32
+	double operator()() { return rand(); }  // same as rand()
+	
+	// Access to 53-bit random numbers (capacity of IEEE double precision)
+	double rand53();  // real number in [0,1)
+	
+	// Access to nonuniform random number distributions
+	double randNorm( const double& mean = 0.0, const double& variance = 0.0 );
+	
+	// Re-seeding functions with same behavior as initializers
+	void seed( const uint32 oneSeed );
+	void seed( uint32 *const bigSeed, const uint32 seedLength = N );
+	void seed();
+	
+	// Saving and loading generator state
+	void save( uint32* saveArray ) const;  // to array of size SAVE
+	void load( uint32 *const loadArray );  // from such array
+protected:
+	void initialize( const uint32 oneSeed );
+	void reload();
+	uint32 hiBit( const uint32& u ) const { return u & 0x80000000UL; }
+	uint32 loBit( const uint32& u ) const { return u & 0x00000001UL; }
+	uint32 loBits( const uint32& u ) const { return u & 0x7fffffffUL; }
+	uint32 mixBits( const uint32& u, const uint32& v ) const
+		{ return hiBit(u) | loBits(v); }
+	uint32 twist( const uint32& m, const uint32& s0, const uint32& s1 ) const
+		{ return m ^ (mixBits(s0,s1)>>1) ^ (-loBit(s1) & 0x9908b0dfUL); }
+	static uint32 hash( time_t t, clock_t c );
+};
+
+
+inline MTRand::MTRand( const uint32& oneSeed )
+	{ seed(oneSeed); }
+
+inline MTRand::MTRand( uint32 *const bigSeed, const uint32 seedLength )
+	{ seed(bigSeed,seedLength); }
+
+inline MTRand::MTRand()
+	{ seed(); }
+
+inline double MTRand::rand()
+	{ return double(randInt()) * (1.0/4294967295.0); }
+
+inline double MTRand::rand( const double& n )
+	{ return rand() * n; }
+
+inline double MTRand::randExc()
+	{ return double(randInt()) * (1.0/4294967296.0); }
+
+inline double MTRand::randExc( const double& n )
+	{ return randExc() * n; }
+
+inline double MTRand::randDblExc()
+	{ return ( double(randInt()) + 0.5 ) * (1.0/4294967296.0); }
+
+inline double MTRand::randDblExc( const double& n )
+	{ return randDblExc() * n; }
+
+inline double MTRand::rand53()
+{
+	uint32 a = randInt() >> 5, b = randInt() >> 6;
+	return ( a * 67108864.0 + b ) * (1.0/9007199254740992.0);  // by Isaku Wada
+}
+
+inline double MTRand::randNorm( const double& mean, const double& variance )
+{
+	// Return a real number from a normal (Gaussian) distribution with given
+	// mean and variance by Box-Muller method
+	double r = sqrt( -2.0 * log( 1.0-randDblExc()) ) * variance;
+	double phi = 2.0 * 3.14159265358979323846264338328 * randExc();
+	return mean + r * cos(phi);
+}
+
+inline MTRand::uint32 MTRand::randInt()
+{
+	// Pull a 32-bit integer from the generator state
+	// Every other access function simply transforms the numbers extracted here
+	
+	if( left == 0 ) reload();
+	--left;
+		
+	register uint32 s1;
+	s1 = *pNext++;
+	s1 ^= (s1 >> 11);
+	s1 ^= (s1 <<  7) & 0x9d2c5680UL;
+	s1 ^= (s1 << 15) & 0xefc60000UL;
+	return ( s1 ^ (s1 >> 18) );
+}
+
+inline MTRand::uint32 MTRand::randInt( const uint32& n )
+{
+	// Find which bits are used in n
+	// Optimized by Magnus Jonsson ([email protected])
+	uint32 used = n;
+	used |= used >> 1;
+	used |= used >> 2;
+	used |= used >> 4;
+	used |= used >> 8;
+	used |= used >> 16;
+	
+	// Draw numbers until one is found in [0,n]
+	uint32 i;
+	do
+		i = randInt() & used;  // toss unused bits to shorten search
+	while( i > n );
+	return i;
+}
+
+
+inline void MTRand::seed( const uint32 oneSeed )
+{
+	// Seed the generator with a simple uint32
+	initialize(oneSeed);
+	reload();
+}
+
+
+inline void MTRand::seed( uint32 *const bigSeed, const uint32 seedLength )
+{
+	// Seed the generator with an array of uint32's
+	// There are 2^19937-1 possible initial states.  This function allows
+	// all of those to be accessed by providing at least 19937 bits (with a
+	// default seed length of N = 624 uint32's).  Any bits above the lower 32
+	// in each element are discarded.
+	// Just call seed() if you want to get array from /dev/urandom
+	initialize(19650218UL);
+	register int i = 1;
+	register uint32 j = 0;
+	register int k = ( N > seedLength ? N : seedLength );
+	for( ; k; --k )
+	{
+		state[i] =
+			state[i] ^ ( (state[i-1] ^ (state[i-1] >> 30)) * 1664525UL );
+		state[i] += ( bigSeed[j] & 0xffffffffUL ) + j;
+		state[i] &= 0xffffffffUL;
+		++i;  ++j;
+		if( i >= N ) { state[0] = state[N-1];  i = 1; }
+		if( j >= seedLength ) j = 0;
+	}
+	for( k = N - 1; k; --k )
+	{
+		state[i] =
+			state[i] ^ ( (state[i-1] ^ (state[i-1] >> 30)) * 1566083941UL );
+		state[i] -= i;
+		state[i] &= 0xffffffffUL;
+		++i;
+		if( i >= N ) { state[0] = state[N-1];  i = 1; }
+	}
+	state[0] = 0x80000000UL;  // MSB is 1, assuring non-zero initial array
+	reload();
+}
+
+
+inline void MTRand::seed()
+{
+	// Seed the generator with an array from /dev/urandom if available
+	// Otherwise use a hash of time() and clock() values
+	
+	// First try getting an array from /dev/urandom
+	FILE* urandom = fopen( "/dev/urandom", "rb" );
+	if( urandom )
+	{
+		uint32 bigSeed[N];
+		register uint32 *s = bigSeed;
+		register int i = N;
+		register bool success = true;
+		while( success && i-- )
+			success = fread( s++, sizeof(uint32), 1, urandom );
+		fclose(urandom);
+		if( success ) { seed( bigSeed, N );  return; }
+	}
+	
+	// Was not successful, so use time() and clock() instead
+	seed( hash( time(NULL), clock() ) );
+}
+
+
+inline void MTRand::initialize( const uint32 seed )
+{
+	// Initialize generator state with seed
+	// See Knuth TAOCP Vol 2, 3rd Ed, p.106 for multiplier.
+	// In previous versions, most significant bits (MSBs) of the seed affect
+	// only MSBs of the state array.  Modified 9 Jan 2002 by Makoto Matsumoto.
+	register uint32 *s = state;
+	register uint32 *r = state;
+	register int i = 1;
+	*s++ = seed & 0xffffffffUL;
+	for( ; i < N; ++i )
+	{
+		*s++ = ( 1812433253UL * ( *r ^ (*r >> 30) ) + i ) & 0xffffffffUL;
+		r++;
+	}
+}
+
+
+inline void MTRand::reload()
+{
+	// Generate N new values in state
+	// Made clearer and faster by Matthew Bellew ([email protected])
+	register uint32 *p = state;
+	register int i;
+	for( i = N - M; i--; ++p )
+		*p = twist( p[M], p[0], p[1] );
+	for( i = M; --i; ++p )
+		*p = twist( p[M-N], p[0], p[1] );
+	*p = twist( p[M-N], p[0], state[0] );
+
+	left = N, pNext = state;
+}
+
+
+inline MTRand::uint32 MTRand::hash( time_t t, clock_t c )
+{
+	// Get a uint32 from t and c
+	// Better than uint32(x) in case x is floating point in [0,1]
+	// Based on code by Lawrence Kirby ([email protected])
+
+	static uint32 differ = 0;  // guarantee time-based seeds will change
+
+	uint32 h1 = 0;
+	unsigned char *p = (unsigned char *) &t;
+	for( size_t i = 0; i < sizeof(t); ++i )
+	{
+		h1 *= UCHAR_MAX + 2U;
+		h1 += p[i];
+	}
+	uint32 h2 = 0;
+	p = (unsigned char *) &c;
+	for( size_t j = 0; j < sizeof(c); ++j )
+	{
+		h2 *= UCHAR_MAX + 2U;
+		h2 += p[j];
+	}
+	return ( h1 + differ++ ) ^ h2;
+}
+
+
+inline void MTRand::save( uint32* saveArray ) const
+{
+	register uint32 *sa = saveArray;
+	register const uint32 *s = state;
+	register int i = N;
+	for( ; i--; *sa++ = *s++ ) {}
+	*sa = left;
+}
+
+
+inline void MTRand::load( uint32 *const loadArray )
+{
+	register uint32 *s = state;
+	register uint32 *la = loadArray;
+	register int i = N;
+	for( ; i--; *s++ = *la++ ) {}
+	left = *la;
+	pNext = &state[N-left];
+}
+
+#endif  // MERSENNETWISTER_H
+
+// Change log:
+//
+// v0.1 - First release on 15 May 2000
+//      - Based on code by Makoto Matsumoto, Takuji Nishimura, and Shawn Cokus
+//      - Translated from C to C++
+//      - Made completely ANSI compliant
+//      - Designed convenient interface for initialization, seeding, and
+//        obtaining numbers in default or user-defined ranges
+//      - Added automatic seeding from /dev/urandom or time() and clock()
+//      - Provided functions for saving and loading generator state
+//
+// v0.2 - Fixed bug which reloaded generator one step too late
+//
+// v0.3 - Switched to clearer, faster reload() code from Matthew Bellew
+//
+// v0.4 - Removed trailing newline in saved generator format to be consistent
+//        with output format of built-in types
+//
+// v0.5 - Improved portability by replacing static const int's with enum's and
+//        clarifying return values in seed(); suggested by Eric Heimburg
+//      - Removed MAXINT constant; use 0xffffffffUL instead
+//
+// v0.6 - Eliminated seed overflow when uint32 is larger than 32 bits
+//      - Changed integer [0,n] generator to give better uniformity
+//
+// v0.7 - Fixed operator precedence ambiguity in reload()
+//      - Added access for real numbers in (0,1) and (0,n)
+//
+// v0.8 - Included time.h header to properly support time_t and clock_t
+//
+// v1.0 - Revised seeding to match 26 Jan 2002 update of Nishimura and Matsumoto
+//      - Allowed for seeding with arrays of any length
+//      - Added access for real numbers in [0,1) with 53-bit resolution
+//      - Added access for real numbers from normal (Gaussian) distributions
+//      - Increased overall speed by optimizing twist()
+//      - Doubled speed of integer [0,n] generation
+//      - Fixed out-of-range number generation on 64-bit machines
+//      - Improved portability by substituting literal constants for long enum's
+//      - Changed license from GNU LGPL to BSD

core/logic/Profiler.cpp

@@ -30,13 +30,12 @@
  */
 
 #include "Profiler.h"
-#include "PluginSys.h"
-#include "sm_stringutil.h"
-#include "Logger.h"
+#include <ISourceMod.h>
 #if defined PLATFORM_POSIX
 #include <sys/time.h>
 #include <time.h>
 #endif
+#include <IPluginSys.h>
 
 ProfileEngine g_Profiler;
 IProfiler *sm_profiler = &g_Profiler;
@@ -314,28 +313,28 @@ void ProfileEngine::Clear()
 
 void ProfileEngine::OnSourceModAllInitialized()
 {
-	g_RootMenu.AddRootConsoleCommand("profiler", "Profiler commands", this);
+	rootmenu->AddRootConsoleCommand2("profiler", "Profiler commands", this);
 }
 
 void ProfileEngine::OnSourceModShutdown()
 {
-	g_RootMenu.RemoveRootConsoleCommand("profiler", this);
+	rootmenu->RemoveRootConsoleCommand("profiler", this);
 }
 
-void ProfileEngine::OnRootConsoleCommand(const char *cmdname, const CCommand &command)
+void ProfileEngine::OnRootConsoleCommand2(const char *cmdname, const ICommandArgs *command)
 {
-	if (command.ArgC() >= 3)
+	if (command->ArgC() >= 3)
 	{
-		if (strcmp(command.Arg(2), "flush") == 0)
+		if (strcmp(command->Arg(2), "flush") == 0)
 		{
 			FILE *fp;
 			char path[256];
 
-			g_SourceMod.BuildPath(Path_SM, path, sizeof(path), "logs/profile_%d.xml", (int)time(NULL));
+			g_pSM->BuildPath(Path_SM, path, sizeof(path), "logs/profile_%d.xml", (int)time(NULL));
 
 			if ((fp = fopen(path, "wt")) == NULL)
 			{
-				g_RootMenu.ConsolePrint("Failed, could not open file for writing: %s", path);
+				rootmenu->ConsolePrint("Failed, could not open file for writing: %s", path);
 				return;
 			}
 
@@ -343,14 +342,14 @@ void ProfileEngine::OnRootConsoleCommand(const char *cmdname, const CCommand &co
 
 			fclose(fp);
 
-			g_RootMenu.ConsolePrint("Profiler report generated as: %s\n", path);
+			rootmenu->ConsolePrint("Profiler report generated as: %s\n", path);
 
 			return;
 		}
 	}
 
-	g_RootMenu.ConsolePrint("Profiler commands:");
-	g_RootMenu.DrawGenericOption("flush", "Flushes statistics to disk and starts over");
+	rootmenu->ConsolePrint("Profiler commands:");
+	rootmenu->DrawGenericOption("flush", "Flushes statistics to disk and starts over");
 }
 
 bool ProfileEngine::GenerateReport(FILE *fp)
@@ -387,9 +386,9 @@ void ProfileEngine::WriteReport(FILE *fp, ProfileReport *report, const char *nam
 	{
 		ar = report->GetReport(i);
 
-		strncopy(new_name, ar->atom_name, sizeof(new_name));
-		UTIL_ReplaceAll(new_name, sizeof(new_name), "<", "&lt;");
-		UTIL_ReplaceAll(new_name, sizeof(new_name), ">", "&gt;");
+		smcore.strncopy(new_name, ar->atom_name, sizeof(new_name));
+		smcore.ReplaceAll(new_name, sizeof(new_name), "<", "&lt;", true);
+		smcore.ReplaceAll(new_name, sizeof(new_name), ">", "&gt;", true);
 
 		fprintf(fp, "  <item name=\"%s\" numcalls=\"%d\" mintime=\"%f\" maxtime=\"%f\" totaltime=\"%f\"/>\n", 
 			new_name,
@@ -438,20 +437,20 @@ void ProfileReport::SaveAtom(const prof_atom_t &atom)
 
 	if (atom.atom_type == SP_PROF_NATIVES)
 	{
-		strncopy(full_name, atom.name, sizeof(full_name));
+		smcore.strncopy(full_name, atom.name, sizeof(full_name));
 	}
 	else
 	{
-		CPlugin *pl;
+		IPlugin *pl;
 		const char *file;
 
 		file = "unknown";
-		if ((pl = g_PluginSys.GetPluginByCtx(atom.ctx)) != NULL)
+		if ((pl = pluginsys->FindPluginByContext(atom.ctx)) != NULL)
 		{
 			file = pl->GetFilename();
 		}
 
-		UTIL_Format(full_name, sizeof(full_name), "%s!%s", file, atom.name);
+		smcore.Format(full_name, sizeof(full_name), "%s!%s", file, atom.name);
 	}
 
 	atom_time = CalcAtomTime(atom);
@@ -460,7 +459,7 @@ void ProfileReport::SaveAtom(const prof_atom_t &atom)
 	{
 		report = new prof_atom_report_t;
 
-		strncopy(report->atom_name, full_name, sizeof(report->atom_name));
+		smcore.strncopy(report->atom_name, full_name, sizeof(report->atom_name));
 		report->max_time = atom_time;
 		report->min_time = atom_time;
 		report->num_calls = 1;

core/logic/Profiler.h

@@ -38,8 +38,8 @@
 #include <sh_vector.h>
 #include <sh_stack.h>
 #include <stdio.h>
-#include "sm_globals.h"
-#include "sm_srvcmds.h"
+#include "common_logic.h"
+#include <IRootConsoleMenu.h>
 
 using namespace SourcePawn;
 using namespace SourceHook;
@@ -103,7 +103,7 @@ public: //SMGlobalClass
 	void OnSourceModAllInitialized();
 	void OnSourceModShutdown();
 public: //IRootConsoleCommand
-	void OnRootConsoleCommand(const char *cmdname, const CCommand &command);
+	void OnRootConsoleCommand2(const char *cmdname, const ICommandArgs *command);
 public: //IProfiler
 	void OnNativeBegin(IPluginContext *pContext, sp_native_t *native);
 	void OnNativeEnd() ;
@@ -126,6 +126,6 @@ private:
 	prof_point_t m_ProfStart;
 };
 
-extern ProfileEngine g_Profiler;
+extern IProfiler *sm_profiler;
 
 #endif //_INCLUDE_SOURCEMOD_PLUGIN_PROFILER_H_

core/logic/TextParsers.cpp

@@ -36,9 +36,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include "TextParsers.h"
-#include "ShareSys.h"
-#include "sm_stringutil.h"
-#include "LibrarySys.h"
+#include <ILibrarySys.h>
 
 TextParsers g_TextParser;
 ITextParsers *textparsers = &g_TextParser;
@@ -71,7 +69,7 @@ TextParsers::TextParsers()
 
 void TextParsers::OnSourceModAllInitialized()
 {
-	g_ShareSys.AddInterface(NULL, this);
+	sharesys->AddInterface(NULL, this);
 }
 
 unsigned int TextParsers::GetUTF8CharBytes(const char *stream)
@@ -135,8 +133,8 @@ SMCError TextParsers::ParseSMCFile(const char *file,
 			states->line = 0;
 			states->col = 0;
 		}
-		g_LibSys.GetPlatformError(error, sizeof(error));
-		UTIL_Format(buffer, maxsize, "File could not be opened: %s", error);
+		libsys->GetPlatformError(error, sizeof(error));
+		smcore.Format(buffer, maxsize, "File could not be opened: %s", error);
 		return SMCError_StreamOpen;
 	}
 
@@ -145,7 +143,7 @@ SMCError TextParsers::ParseSMCFile(const char *file,
 	fclose(fp);
 
 	errstr = GetSMCErrorString(result);
-	UTIL_Format(buffer, maxsize, "%s", errstr != NULL ? errstr : "Unknown error");
+	smcore.Format(buffer, maxsize, "%s", errstr != NULL ? errstr : "Unknown error");
 
 	return result;
 }
@@ -196,7 +194,7 @@ SMCError TextParsers::ParseSMCStream(const char *stream,
 	result = ParseStream_SMC(&rs, RawStreamReader, smc_listener, states);
 
 	const char *errstr = GetSMCErrorString(result);
-	UTIL_Format(buffer, maxsize, "%s", errstr != NULL ? errstr : "Unknown error");
+	smcore.Format(buffer, maxsize, "%s", errstr != NULL ? errstr : "Unknown error");
 
 	return result;
 }

core/logic/TextParsers.h

@@ -33,7 +33,7 @@
 #define _INCLUDE_SOURCEMOD_TEXTPARSERS_H_
 
 #include <ITextParsers.h>
-#include "sm_globals.h"
+#include "common_logic.h"
 
 using namespace SourceMod;
 

core/logic/ThreadSupport.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
@@ -28,10 +28,9 @@
  *
  * Version: $Id$
  */
-
+#include <sm_platform.h>
 #include "ThreadSupport.h"
-#include "sm_globals.h"
-#include "ShareSys.h"
+#include "common_logic.h"
 
 #if defined PLATFORM_POSIX
 #include "thread/PosixThreads.h"
@@ -47,6 +46,7 @@ class RegThreadStuff : public SMGlobalClass
 public:
 	void OnSourceModAllInitialized()
 	{
-		g_ShareSys.AddInterface(NULL, g_pThreader);
+		sharesys->AddInterface(NULL, g_pThreader);
 	}
 } s_RegThreadStuff;
+

core/logic/common_logic.cpp

@@ -0,0 +1,124 @@
+/**
+ * vim: set ts=4 sw=4 :
+ * =============================================================================
+ * SourceMod
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * =============================================================================
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3.0, as published by the
+ * Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * As a special exception, AlliedModders LLC gives you permission to link the
+ * code of this program (as well as its derivative works) to "Half-Life 2," the
+ * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+ * by the Valve Corporation.  You must obey the GNU General Public License in
+ * all respects for all other code used.  Additionally, AlliedModders LLC grants
+ * this exception to all derivative works.  AlliedModders LLC defines further
+ * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+ * or <http://www.sourcemod.net/license.php>.
+ *
+ * Version: $Id$
+ */
+#include <new>
+#include <stdlib.h>
+#include <sm_platform.h>
+#include <string.h>
+#include "common_logic.h"
+#include "ThreadSupport.h"
+#include "TextParsers.h"
+#include "Profiler.h"
+
+sm_core_t smcore;
+IHandleSys *handlesys;
+IdentityToken_t *g_pCoreIdent;
+SMGlobalClass *SMGlobalClass::head = NULL;
+ISourceMod *g_pSM;
+ILibrarySys *libsys;
+ITextParsers *textparser = &g_TextParser;
+IVEngineServer *engine;
+IShareSys *sharesys;
+IRootConsole *rootmenu;
+IPluginManager *pluginsys;
+IForwardManager *forwardsys;
+
+static sm_logic_t logic =
+{
+	NULL,
+	g_pThreader,
+	sm_profiler
+};
+
+static void logic_init(const sm_core_t* core, sm_logic_t* _logic)
+{
+	logic.head = SMGlobalClass::head;
+
+	memcpy(&smcore, core, sizeof(sm_core_t));
+	memcpy(_logic, &logic, sizeof(sm_logic_t));
+
+	handlesys = core->handlesys;
+	libsys = core->libsys;
+	engine = core->engine;
+	g_pCoreIdent = core->core_ident;
+	g_pSM = core->sm;
+	sharesys = core->sharesys;
+	rootmenu = core->rootmenu;
+	pluginsys = core->pluginsys;
+	forwardsys = core->forwardsys;
+}
+
+PLATFORM_EXTERN_C ITextParsers *get_textparsers()
+{
+	return &g_TextParser;
+}
+
+PLATFORM_EXTERN_C LogicInitFunction logic_load(uint32_t magic)
+{
+	if (magic != SM_LOGIC_MAGIC)
+	{
+		return NULL;
+	}
+
+	return logic_init;
+}
+
+void CoreNativesToAdd::OnSourceModAllInitialized()
+{
+	smcore.AddNatives(m_NativeList);
+}
+
+/* Overload a few things to prevent libstdc++ linking */
+#if defined __linux__ || defined __APPLE__
+extern "C" void __cxa_pure_virtual(void)
+{
+}
+
+void *operator new(size_t size)
+{
+	return malloc(size);
+}
+
+void *operator new[](size_t size) 
+{
+	return malloc(size);
+}
+
+void operator delete(void *ptr) 
+{
+	free(ptr);
+}
+
+void operator delete[](void * ptr)
+{
+	free(ptr);
+}
+#endif
+

core/logic/common_logic.h

@@ -2,7 +2,7 @@
  * vim: set ts=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
@@ -29,20 +29,24 @@
  * Version: $Id$
  */
 
-/**
- * Autogenerated by build scripts
- */
+#ifndef _INCLUDE_SOURCEMOD_COMMON_LOGIC_H_
+#define _INCLUDE_SOURCEMOD_COMMON_LOGIC_H_
 
-#ifndef _INCLUDE_SOURCEMOD_VERSION_H_
-#define _INCLUDE_SOURCEMOD_VERSION_H_
+#include <IHandleSys.h>
 
-/**
- * @file Contains SourceMod version information.
- */
+#include "../sm_globals.h"
+#include "intercom.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
+extern sm_core_t smcore;
+extern IHandleSys *handlesys;
+extern ISourceMod *g_pSM;
+extern ILibrarySys *libsys;
+extern ITextParsers *textparser;
+extern IVEngineServer *engine;
+extern IShareSys *sharesys;
+extern IRootConsole *rootmenu;
+extern IPluginManager *pluginsys;
+extern IForwardManager *forwardsys;
+
+#endif /* _INCLUDE_SOURCEMOD_COMMON_LOGIC_H_ */
 
-#endif //_INCLUDE_SOURCEMOD_VERSION_H_

core/logic/intercom.h

@@ -0,0 +1,106 @@
+/**
+ * vim: set ts=4 :
+ * =============================================================================
+ * SourceMod
+ * Copyright (C) 2004-2009 AlliedModders LLC.  All rights reserved.
+ * =============================================================================
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3.0, as published by the
+ * Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * As a special exception, AlliedModders LLC gives you permission to link the
+ * code of this program (as well as its derivative works) to "Half-Life 2," the
+ * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+ * by the Valve Corporation.  You must obey the GNU General Public License in
+ * all respects for all other code used.  Additionally, AlliedModders LLC grants
+ * this exception to all derivative works.  AlliedModders LLC defines further
+ * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+ * or <http://www.sourcemod.net/license.php>.
+ *
+ * Version: $Id$
+ */
+
+#include <sp_vm_api.h>
+#include <IHandleSys.h>
+#include <IShareSys.h>
+
+#ifndef _INCLUDE_SOURCEMOD_INTERCOM_H_
+#define _INCLUDE_SOURCEMOD_INTERCOM_H_
+
+using namespace SourceMod;
+
+/**
+ * Add 1 to the RHS of this expression to bump the intercom file
+ * This is to prevent mismatching core/logic binaries
+ */
+#define SM_LOGIC_MAGIC		(0x0F47C0DE - 2)
+
+#if defined SM_LOGIC
+class IVEngineServer
+#else
+class IVEngineServer_Logic
+#endif
+{
+public:
+	virtual bool IsMapValid(const char *map) = 0;
+};
+
+namespace SourceMod
+{
+	class ISourceMod;
+	class ILibrarySys;
+	class ITextParsers;
+	class IThreader;
+	class IRootConsole;
+	class IPluginManager;
+	class IForwardManager;
+}
+
+class IVEngineServer;
+class ConVar;
+
+struct sm_core_t
+{
+	/* Objects */
+	IHandleSys 		*handlesys;
+	IdentityToken_t *core_ident;
+	ISourceMod		*sm;
+	ILibrarySys		*libsys;
+	IVEngineServer	*engine;
+	IShareSys		*sharesys;
+	IRootConsole	*rootmenu;
+	IPluginManager	*pluginsys;
+	IForwardManager	*forwardsys;
+	/* Functions */
+	void			(*AddNatives)(sp_nativeinfo_t* nlist);
+	ConVar *		(*FindConVar)(const char*);
+	unsigned int	(*strncopy)(char*, const char*, size_t);
+	char *			(*TrimWhitespace)(char *, size_t &);
+	void			(*LogError)(const char*, ...);
+	const char *	(*GetCvarString)(ConVar*);
+	size_t			(*Format)(char*, size_t, const char*, ...);
+	unsigned int	(*ReplaceAll)(char*, size_t, const char *, const char *, bool);
+};
+
+struct sm_logic_t
+{
+	SMGlobalClass	*head;
+	IThreader		*threader;
+	IProfiler		*profiler;
+};
+
+typedef void (*LogicInitFunction)(const sm_core_t *core, sm_logic_t *logic);
+typedef LogicInitFunction (*LogicLoadFunction)(uint32_t magic);
+typedef ITextParsers *(*GetITextParsers)();
+
+#endif /* _INCLUDE_SOURCEMOD_INTERCOM_H_ */
+

core/logic/msvc9/logic.sln

@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "logic", "logic.vcproj", "{6EF06E6E-0ED5-4E2D-A8F3-01DD1EC25BA7}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6EF06E6E-0ED5-4E2D-A8F3-01DD1EC25BA7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6EF06E6E-0ED5-4E2D-A8F3-01DD1EC25BA7}.Debug|Win32.Build.0 = Debug|Win32
+		{6EF06E6E-0ED5-4E2D-A8F3-01DD1EC25BA7}.Release|Win32.ActiveCfg = Release|Win32
+		{6EF06E6E-0ED5-4E2D-A8F3-01DD1EC25BA7}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

core/logic/msvc9/logic.vcproj

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
-	Name="installer"
-	ProjectGUID="{B2479B33-A265-423B-A996-F994546644F9}"
-	RootNamespace="installer"
+	Version="9.00"
+	Name="logic"
+	ProjectGUID="{6EF06E6E-0ED5-4E2D-A8F3-01DD1EC25BA7}"
+	RootNamespace="jitx86"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -19,8 +20,8 @@
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
+			ConfigurationType="2"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -40,13 +41,16 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE"
+				AdditionalIncludeDirectories="..;&quot;$(MMSOURCE17)\core\sourcehook&quot;;..\..\..\public;..\..\..\public\sourcepawn"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;JITX86_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SM_DEFAULT_THREADER"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
+				EnableEnhancedInstructionSet="0"
+				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -60,10 +64,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib"
+				OutputFile="$(OutDir)\sourcepawn.jit.x86.dll"
 				LinkIncremental="2"
+				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -84,9 +91,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -95,8 +99,8 @@
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
+			ConfigurationType="2"
+			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
 			<Tool
@@ -116,11 +120,15 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="2"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="..;&quot;$(MMSOURCE17)\core\sourcehook&quot;;..\..\..\public;..\..\..\public\sourcepawn"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;JITX86_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SM_LOGIC;SM_DEFAULT_THREADER"
+				RuntimeLibrary="0"
+				EnableEnhancedInstructionSet="0"
+				RuntimeTypeInfo="false"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -134,11 +142,15 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\sourcemod.logic.dll"
 				LinkIncremental="1"
+				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -159,9 +171,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -176,19 +185,51 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\CFileList.cpp"
+				RelativePath="..\smn_functions.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\GamesList.cpp"
+				RelativePath="..\smn_adt_trie.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\InstallerUtil.cpp"
+				RelativePath="..\Profiler.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\LocalCopyMethod.cpp"
+				RelativePath="..\common_logic.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\smn_adt_array.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\smn_adt_stack.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\smn_float.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\smn_maplists.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\smn_sorting.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\smn_textparse.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\TextParsers.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\ThreadSupport.cpp"
 				>
 			</File>
 		</Filter>
@@ -198,35 +239,31 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath=".\CCriticalSection.h"
+				RelativePath="..\CellArray.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CFileList.h"
+				RelativePath="..\common_logic.h"
 				>
 			</File>
 			<File
-				RelativePath=".\GamesList.h"
+				RelativePath="..\intercom.h"
 				>
 			</File>
 			<File
-				RelativePath=".\ICopyMethod.h"
+				RelativePath="..\svn_version.h"
 				>
 			</File>
 			<File
-				RelativePath=".\InstallerUtil.h"
+				RelativePath="..\TextParsers.h"
 				>
 			</File>
 			<File
-				RelativePath=".\LocalCopyMethod.h"
+				RelativePath="..\ThreadSupport.h"
 				>
 			</File>
 			<File
-				RelativePath=".\platform_headers.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Resource.h"
+				RelativePath="..\Profiler.h"
 				>
 			</File>
 		</Filter>
@@ -236,61 +273,49 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\installer.ico"
+				RelativePath="..\svn_version.tpl"
 				>
 			</File>
 			<File
-				RelativePath=".\installer.rc"
+				RelativePath="..\version.rc"
 				>
 			</File>
 		</Filter>
 		<Filter
-			Name="Window Headers"
+			Name="Threads"
 			>
-			<File
-				RelativePath=".\ChooseMethod.h"
+			<Filter
+				Name="Header Files"
 				>
-			</File>
-			<File
-				RelativePath=".\InstallerMain.h"
+				<File
+					RelativePath="..\thread\BaseWorker.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thread\ThreadWorker.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thread\WinThreads.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Source Files"
 				>
-			</File>
-			<File
-				RelativePath=".\PerformInstall.h"
-				>
-			</File>
-			<File
-				RelativePath=".\SelectGame.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Welcome.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Window Source"
-			>
-			<File
-				RelativePath=".\ChooseMethod.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\InstallerMain.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\PerformInstall.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\SelectGame.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Welcome.cpp"
-				>
-			</File>
+				<File
+					RelativePath="..\thread\BaseWorker.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\thread\ThreadWorker.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\thread\WinThreads.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 	</Files>
 	<Globals>

core/logic/smn_adt_array.cpp

@@ -30,10 +30,8 @@
  */
 
 #include <stdlib.h>
-#include "sm_globals.h"
-#include "sm_stringutil.h"
+#include "common_logic.h"
 #include "CellArray.h"
-#include "HandleSys.h"
 
 HandleType_t htCellArray;
 
@@ -44,11 +42,11 @@ class CellArrayHelpers :
 public: //SMGlobalClass
 	void OnSourceModAllInitialized()
 	{
-		htCellArray = g_HandleSys.CreateType("CellArray", this, 0, NULL, NULL, g_pCoreIdent, NULL);
+		htCellArray = handlesys->CreateType("CellArray", this, 0, NULL, NULL, g_pCoreIdent, NULL);
 	}
 	void OnSourceModShutdown()
 	{
-		g_HandleSys.RemoveType(htCellArray, g_pCoreIdent);
+		handlesys->RemoveType(htCellArray, g_pCoreIdent);
 	}
 public: //IHandleTypeDispatch
 	void OnHandleDestroy(HandleType_t type, void *object)
@@ -78,7 +76,7 @@ static cell_t CreateArray(IPluginContext *pContext, const cell_t *params)
 		array->resize(params[2]);
 	}
 	
-	Handle_t hndl = g_HandleSys.CreateHandle(htCellArray, array, pContext->GetIdentity(), g_pCoreIdent, NULL);
+	Handle_t hndl = handlesys->CreateHandle(htCellArray, array, pContext->GetIdentity(), g_pCoreIdent, NULL);
 	if (!hndl)
 	{
 		delete array;
@@ -93,7 +91,7 @@ static cell_t ClearArray(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -110,7 +108,7 @@ static cell_t ResizeArray(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -130,7 +128,7 @@ static cell_t GetArraySize(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -145,7 +143,7 @@ static cell_t PushArrayCell(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -168,7 +166,7 @@ static cell_t PushArrayString(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -183,7 +181,7 @@ static cell_t PushArrayString(IPluginContext *pContext, const cell_t *params)
 	char *str;
 	pContext->LocalToString(params[2], &str);
 
-	strncopy((char *)blk, str, array->blocksize() * sizeof(cell_t));
+	smcore.strncopy((char *)blk, str, array->blocksize() * sizeof(cell_t));
 
 	return (cell_t)(array->size() - 1);
 }
@@ -194,7 +192,7 @@ static cell_t PushArrayArray(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -226,7 +224,7 @@ static cell_t GetArrayCell(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -265,7 +263,7 @@ static cell_t GetArrayString(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -291,7 +289,7 @@ static cell_t GetArrayArray(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -324,7 +322,7 @@ static cell_t SetArrayCell(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -363,7 +361,7 @@ static cell_t SetArrayString(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -380,7 +378,7 @@ static cell_t SetArrayString(IPluginContext *pContext, const cell_t *params)
 	char *str;
 	pContext->LocalToString(params[3], &str);
 
-	return strncopy((char *)blk, str, array->blocksize() * sizeof(cell_t));
+	return smcore.strncopy((char *)blk, str, array->blocksize() * sizeof(cell_t));
 }
 
 static cell_t SetArrayArray(IPluginContext *pContext, const cell_t *params)
@@ -389,7 +387,7 @@ static cell_t SetArrayArray(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -422,7 +420,7 @@ static cell_t ShiftArrayUp(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -445,7 +443,7 @@ static cell_t RemoveFromArray(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -468,7 +466,7 @@ static cell_t SwapArrayItems(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -496,7 +494,7 @@ static cell_t CloneArray(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellArray, &sec, (void **)&oldArray)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellArray, &sec, (void **)&oldArray)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -504,7 +502,7 @@ static cell_t CloneArray(IPluginContext *pContext, const cell_t *params)
 
 	CellArray *array = oldArray->clone();
 	
-	Handle_t hndl = g_HandleSys.CreateHandle(htCellArray, array, pContext->GetIdentity(), g_pCoreIdent, NULL);
+	Handle_t hndl = handlesys->CreateHandle(htCellArray, array, pContext->GetIdentity(), g_pCoreIdent, NULL);
 	if (!hndl)
 	{
 		delete array;
@@ -519,7 +517,7 @@ static cell_t FindStringInArray(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -546,7 +544,7 @@ static cell_t FindValueInArray(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellArray, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);

core/logic/smn_adt_stack.cpp

@@ -30,10 +30,8 @@
 */
 
 #include <stdlib.h>
-#include "sm_globals.h"
-#include "sm_stringutil.h"
+#include "common_logic.h"
 #include "CellArray.h"
-#include "HandleSys.h"
 
 HandleType_t htCellStack;
 
@@ -44,11 +42,11 @@ class CellStackHelpers :
 public: //SMGlobalClass
 	void OnSourceModAllInitialized()
 	{
-		htCellStack = g_HandleSys.CreateType("CellStack", this, 0, NULL, NULL, g_pCoreIdent, NULL);
+		htCellStack = handlesys->CreateType("CellStack", this, 0, NULL, NULL, g_pCoreIdent, NULL);
 	}
 	void OnSourceModShutdown()
 	{
-		g_HandleSys.RemoveType(htCellStack, g_pCoreIdent);
+		handlesys->RemoveType(htCellStack, g_pCoreIdent);
 	}
 public: //IHandleTypeDispatch
 	void OnHandleDestroy(HandleType_t type, void *object)
@@ -73,7 +71,7 @@ static cell_t CreateStack(IPluginContext *pContext, const cell_t *params)
 
 	CellArray *array = new CellArray(params[1]);
 
-	Handle_t hndl = g_HandleSys.CreateHandle(htCellStack, array, pContext->GetIdentity(), g_pCoreIdent, NULL);
+	Handle_t hndl = handlesys->CreateHandle(htCellStack, array, pContext->GetIdentity(), g_pCoreIdent, NULL);
 	if (!hndl)
 	{
 		delete array;
@@ -88,7 +86,7 @@ static cell_t PushStackCell(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellStack, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellStack, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -111,7 +109,7 @@ static cell_t PushStackString(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellStack, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellStack, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -126,7 +124,7 @@ static cell_t PushStackString(IPluginContext *pContext, const cell_t *params)
 	char *str;
 	pContext->LocalToString(params[2], &str);
 
-	strncopy((char *)blk, str, array->blocksize() * sizeof(cell_t));
+	smcore.strncopy((char *)blk, str, array->blocksize() * sizeof(cell_t));
 
 	return 1;
 }
@@ -137,7 +135,7 @@ static cell_t PushStackArray(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellStack, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellStack, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -171,7 +169,7 @@ static cell_t PopStackCell(IPluginContext *pContext, const cell_t *params)
 	cell_t *blk, *buffer;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellStack, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellStack, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -217,7 +215,7 @@ static cell_t PopStackString(IPluginContext *pContext, const cell_t *params)
 	cell_t *blk, *pWritten;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellStack, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellStack, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -248,7 +246,7 @@ static cell_t PopStackArray(IPluginContext *pContext, const cell_t *params)
 	CellArray *array;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellStack, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellStack, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -281,7 +279,7 @@ static cell_t IsStackEmpty(IPluginContext *pContext, const cell_t *params)
 	CellArray *array;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellStack, &sec, (void **)&array)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellStack, &sec, (void **)&array)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);

core/logic/smn_adt_trie.cpp

@@ -30,10 +30,8 @@
  */
 
 #include <stdlib.h>
-#include "sm_globals.h"
-#include "sm_stringutil.h"
-#include "HandleSys.h"
-#include "sm_trie_tpl.h"
+#include "common_logic.h"
+#include <sm_trie_tpl.h>
 
 HandleType_t htCellTrie;
 
@@ -85,11 +83,11 @@ class TrieHelpers :
 public: //SMGlobalClass
 	void OnSourceModAllInitialized()
 	{
-		htCellTrie = g_HandleSys.CreateType("Trie", this, 0, NULL, NULL, g_pCoreIdent, NULL);
+		htCellTrie = handlesys->CreateType("Trie", this, 0, NULL, NULL, g_pCoreIdent, NULL);
 	}
 	void OnSourceModShutdown()
 	{
-		g_HandleSys.RemoveType(htCellTrie, g_pCoreIdent);
+		handlesys->RemoveType(htCellTrie, g_pCoreIdent);
 	}
 public: //IHandleTypeDispatch
 	static void DestroySmartTrieNode(SmartTrieNode *pNode)
@@ -119,7 +117,7 @@ static cell_t CreateTrie(IPluginContext *pContext, const cell_t *params)
 
 	pTrie->mem_usage = 0;
 
-	if ((hndl = g_HandleSys.CreateHandle(htCellTrie, pTrie, pContext->GetIdentity(), g_pCoreIdent, NULL))
+	if ((hndl = handlesys->CreateHandle(htCellTrie, pTrie, pContext->GetIdentity(), g_pCoreIdent, NULL))
 		== BAD_HANDLE)
 	{
 		delete pTrie;
@@ -191,7 +189,7 @@ static cell_t SetTrieValue(IPluginContext *pContext, const cell_t *params)
 
 	hndl = params[1];
 
-	if ((err = g_HandleSys.ReadHandle(hndl, htCellTrie, &sec, (void **)&pTrie))
+	if ((err = handlesys->ReadHandle(hndl, htCellTrie, &sec, (void **)&pTrie))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error %d)", hndl, err);
@@ -227,7 +225,7 @@ static cell_t SetTrieArray(IPluginContext *pContext, const cell_t *params)
 
 	hndl = params[1];
 
-	if ((err = g_HandleSys.ReadHandle(hndl, htCellTrie, &sec, (void **)&pTrie))
+	if ((err = handlesys->ReadHandle(hndl, htCellTrie, &sec, (void **)&pTrie))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error %d)", hndl, err);
@@ -275,7 +273,7 @@ static cell_t SetTrieString(IPluginContext *pContext, const cell_t *params)
 
 	hndl = params[1];
 
-	if ((err = g_HandleSys.ReadHandle(hndl, htCellTrie, &sec, (void **)&pTrie))
+	if ((err = handlesys->ReadHandle(hndl, htCellTrie, &sec, (void **)&pTrie))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error %d)", hndl, err);
@@ -317,7 +315,7 @@ static cell_t RemoveFromTrie(IPluginContext *pContext, const cell_t *params)
 
 	hndl = params[1];
 
-	if ((err = g_HandleSys.ReadHandle(hndl, htCellTrie, &sec, (void **)&pTrie))
+	if ((err = handlesys->ReadHandle(hndl, htCellTrie, &sec, (void **)&pTrie))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error %d)", hndl, err);
@@ -347,7 +345,7 @@ static cell_t ClearTrie(IPluginContext *pContext, const cell_t *params)
 
 	hndl = params[1];
 
-	if ((err = g_HandleSys.ReadHandle(hndl, htCellTrie, &sec, (void **)&pTrie))
+	if ((err = handlesys->ReadHandle(hndl, htCellTrie, &sec, (void **)&pTrie))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error %d)", hndl, err);
@@ -368,7 +366,7 @@ static cell_t GetTrieValue(IPluginContext *pContext, const cell_t *params)
 
 	hndl = params[1];
 
-	if ((err = g_HandleSys.ReadHandle(hndl, htCellTrie, &sec, (void **)&pTrie))
+	if ((err = handlesys->ReadHandle(hndl, htCellTrie, &sec, (void **)&pTrie))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error %d)", hndl, err);
@@ -403,7 +401,7 @@ static cell_t GetTrieArray(IPluginContext *pContext, const cell_t *params)
 
 	hndl = params[1];
 
-	if ((err = g_HandleSys.ReadHandle(hndl, htCellTrie, &sec, (void **)&pTrie))
+	if ((err = handlesys->ReadHandle(hndl, htCellTrie, &sec, (void **)&pTrie))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error %d)", hndl, err);
@@ -460,7 +458,7 @@ static cell_t GetTrieString(IPluginContext *pContext, const cell_t *params)
 
 	hndl = params[1];
 
-	if ((err = g_HandleSys.ReadHandle(hndl, htCellTrie, &sec, (void **)&pTrie))
+	if ((err = handlesys->ReadHandle(hndl, htCellTrie, &sec, (void **)&pTrie))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error %d)", hndl, err);
@@ -507,7 +505,7 @@ static cell_t GetTrieSize(IPluginContext *pContext, const cell_t *params)
 
 	hndl = params[1];
 
-	if ((err = g_HandleSys.ReadHandle(hndl, htCellTrie, &sec, (void **)&pTrie))
+	if ((err = handlesys->ReadHandle(hndl, htCellTrie, &sec, (void **)&pTrie))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error %d)", hndl, err);

core/logic/smn_float.cpp

@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 :
  * =============================================================================
  * SourceMod
  * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
@@ -32,7 +32,9 @@
 #include <math.h>
 #include <string.h>
 #include <stdlib.h>
-#include "sm_globals.h"
+#include "common_logic.h"
+#include "MersenneTwister.h"
+#include <IPluginSys.h>
 
 /****************************************
 *                                       *
@@ -285,6 +287,68 @@ static cell_t sm_FloatRound(IPluginContext *pCtx, const cell_t *params)
 }
 #endif
 
+class RandomHelpers :
+	public SMGlobalClass,
+	public IPluginsListener
+{
+public:
+	void OnSourceModAllInitialized()
+	{
+		pluginsys->AddPluginsListener(this);
+	}
+
+	void OnSourceModShutdown()
+	{
+		pluginsys->RemovePluginsListener(this);
+	}
+
+	void OnPluginDestroyed(IPlugin *plugin)
+	{
+		MTRand *mtrand;
+		if (plugin->GetProperty("core.logic.mtrand", (void**)&mtrand, true))
+		{
+			delete mtrand;
+		}
+	}
+	
+	MTRand *RandObjForPlugin(IPluginContext *ctx)
+	{
+		IPlugin *plugin = pluginsys->FindPluginByContext(ctx->GetContext());
+		MTRand *mtrand;	
+		if (!plugin->GetProperty("core.logic.mtrand", (void**)&mtrand))
+		{
+			mtrand = new MTRand();
+			plugin->SetProperty("core.logic.mtrand", mtrand);
+		}
+		return mtrand;
+	}
+} s_RandHelpers;
+
+static cell_t GetURandomInt(IPluginContext *ctx, const cell_t *params)
+{
+	MTRand *randobj = s_RandHelpers.RandObjForPlugin(ctx);
+	/* Note the sign bit must be stripped off because cell_t is signed,
+	 * and this guarantees a range of [0,max_int]
+	 */
+	return randobj->randInt() & 0x7FFFFFFF;
+}
+
+static cell_t GetURandomFloat(IPluginContext *ctx, const cell_t *params)
+{
+	MTRand *randobj = s_RandHelpers.RandObjForPlugin(ctx);
+	return sp_ftoc((float)randobj->rand());
+}
+
+static cell_t SetURandomSeed(IPluginContext *ctx, const cell_t *params)
+{
+	MTRand *randobj = s_RandHelpers.RandObjForPlugin(ctx);
+	cell_t *addr;
+	ctx->LocalToPhysAddr(params[1], &addr);
+	/* We're 32-bit only. */
+	randobj->seed((MTRand::uint32*)addr, params[2]);
+	return 1;
+}
+
 REGISTER_NATIVES(floatnatives)
 {
 	{"float",			sm_float},
@@ -310,5 +374,9 @@ REGISTER_NATIVES(floatnatives)
 	{"ArcCosine",		sm_ArcCosine},
 	{"ArcSine",			sm_ArcSine},
 	{"ArcTangent2",		sm_ArcTangent2},
+	{"GetURandomInt",	GetURandomInt},
+	{"GetURandomFloat",	GetURandomFloat},
+	{"SetURandomSeed",	SetURandomSeed},
 	{NULL,				NULL}
 };
+

core/logic/smn_functions.cpp

@@ -29,10 +29,10 @@
  * Version: $Id$
  */
 
-#include "sm_globals.h"
-#include "PluginSys.h"
-#include "ForwardSys.h"
-#include "HandleSys.h"
+#include "common_logic.h"
+#include <IPluginSys.h>
+#include <IHandleSys.h>
+#include <IForwardSys.h>
 
 HandleType_t g_GlobalFwdType = 0;
 HandleType_t g_PrivateFwdType = 0;
@@ -52,36 +52,36 @@ public:
 		HandleAccess sec;
 
 		/* Set GlobalFwd handle access security */
-		g_HandleSys.InitAccessDefaults(NULL, &sec);
+		handlesys->InitAccessDefaults(NULL, &sec);
 		sec.access[HandleAccess_Read] = 0;
 		sec.access[HandleAccess_Clone] = HANDLE_RESTRICT_IDENTITY | HANDLE_RESTRICT_OWNER;
 
 		/* Create 'GlobalFwd' handle type */
-		g_GlobalFwdType = g_HandleSys.CreateType("GlobalFwd", this, 0, NULL, &sec, g_pCoreIdent, NULL);
+		g_GlobalFwdType = handlesys->CreateType("GlobalFwd", this, 0, NULL, &sec, g_pCoreIdent, NULL);
 
 		/* Private forwards are cloneable */
 		sec.access[HandleAccess_Clone] = 0;
 
 		/* Create 'PrivateFwd' handle type */
-		g_PrivateFwdType = g_HandleSys.CreateType("PrivateFwd", this, g_GlobalFwdType, NULL, &sec, g_pCoreIdent, NULL);
+		g_PrivateFwdType = handlesys->CreateType("PrivateFwd", this, g_GlobalFwdType, NULL, &sec, g_pCoreIdent, NULL);
 	}
 
 	void OnSourceModShutdown()
 	{
-		g_HandleSys.RemoveType(g_PrivateFwdType, g_pCoreIdent);
-		g_HandleSys.RemoveType(g_GlobalFwdType, g_pCoreIdent);
+		handlesys->RemoveType(g_PrivateFwdType, g_pCoreIdent);
+		handlesys->RemoveType(g_GlobalFwdType, g_pCoreIdent);
 	}
 
 	void OnHandleDestroy(HandleType_t type, void *object)
 	{
 		IForward *pForward = static_cast<IForward *>(object);
 
-		g_Forwards.ReleaseForward(pForward);
+		forwardsys->ReleaseForward(pForward);
 	}
 
 	bool GetHandleApproxSize(HandleType_t type, void *object, unsigned int *pSize)
 	{
-		*pSize = sizeof(CForward) + (((IForward *)object)->GetFunctionCount() * 12);
+		*pSize = sizeof(IForward*) + (((IForward *)object)->GetFunctionCount() * 12);
 		return true;
 	}
 } g_ForwardNativeHelpers;
@@ -112,9 +112,9 @@ static cell_t sm_GetFunctionByName(IPluginContext *pContext, const cell_t *param
 
 	if (hndl == 0)
 	{
-		pPlugin = g_PluginSys.FindPluginByContext(pContext->GetContext());
+		pPlugin = pluginsys->FindPluginByContext(pContext->GetContext());
 	} else {
-		pPlugin = g_PluginSys.PluginFromHandle(hndl, &err);
+		pPlugin = pluginsys->PluginFromHandle(hndl, &err);
 
 		if (!pPlugin)
 		{
@@ -155,9 +155,9 @@ static cell_t sm_CreateGlobalForward(IPluginContext *pContext, const cell_t *par
 		forwardParams[i - 3] = static_cast<ParamType>(*addr);
 	}
 
-	IForward *pForward = g_Forwards.CreateForward(name, static_cast<ExecType>(params[2]), count - 2, forwardParams);
+	IForward *pForward = forwardsys->CreateForward(name, static_cast<ExecType>(params[2]), count - 2, forwardParams);
 
-	return g_HandleSys.CreateHandle(g_GlobalFwdType, pForward, pContext->GetIdentity(), g_pCoreIdent, NULL);
+	return handlesys->CreateHandle(g_GlobalFwdType, pForward, pContext->GetIdentity(), g_pCoreIdent, NULL);
 }
 
 static cell_t sm_CreateForward(IPluginContext *pContext, const cell_t *params)
@@ -177,9 +177,9 @@ static cell_t sm_CreateForward(IPluginContext *pContext, const cell_t *params)
 		forwardParams[i - 2] = static_cast<ParamType>(*addr);
 	}
 
-	IChangeableForward *pForward = g_Forwards.CreateForwardEx(NULL, static_cast<ExecType>(params[1]), count - 1, forwardParams);
+	IChangeableForward *pForward = forwardsys->CreateForwardEx(NULL, static_cast<ExecType>(params[1]), count - 1, forwardParams);
 
-	return g_HandleSys.CreateHandle(g_PrivateFwdType, pForward, pContext->GetIdentity(), g_pCoreIdent, NULL);
+	return handlesys->CreateHandle(g_PrivateFwdType, pForward, pContext->GetIdentity(), g_pCoreIdent, NULL);
 }
 
 static cell_t sm_GetForwardFunctionCount(IPluginContext *pContext, const cell_t *params)
@@ -188,7 +188,7 @@ static cell_t sm_GetForwardFunctionCount(IPluginContext *pContext, const cell_t
 	HandleError err;
 	IForward *pForward;
 
-	if ((err=g_HandleSys.ReadHandle(hndl, g_GlobalFwdType, NULL, (void **)&pForward))
+	if ((err=handlesys->ReadHandle(hndl, g_GlobalFwdType, NULL, (void **)&pForward))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid forward handle %x (error %d)", hndl, err);
@@ -205,7 +205,7 @@ static cell_t sm_AddToForward(IPluginContext *pContext, const cell_t *params)
 	IChangeableForward *pForward;
 	IPlugin *pPlugin;
 
-	if ((err=g_HandleSys.ReadHandle(fwdHandle, g_PrivateFwdType, NULL, (void **)&pForward))
+	if ((err=handlesys->ReadHandle(fwdHandle, g_PrivateFwdType, NULL, (void **)&pForward))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid private forward handle %x (error %d)", fwdHandle, err);
@@ -213,9 +213,9 @@ static cell_t sm_AddToForward(IPluginContext *pContext, const cell_t *params)
 
 	if (plHandle == 0)
 	{
-		pPlugin = g_PluginSys.FindPluginByContext(pContext->GetContext());
+		pPlugin = pluginsys->FindPluginByContext(pContext->GetContext());
 	} else {
-		pPlugin = g_PluginSys.PluginFromHandle(plHandle, &err);
+		pPlugin = pluginsys->PluginFromHandle(plHandle, &err);
 
 		if (!pPlugin)
 		{
@@ -241,7 +241,7 @@ static cell_t sm_RemoveFromForward(IPluginContext *pContext, const cell_t *param
 	IChangeableForward *pForward;
 	IPlugin *pPlugin;
 
-	if ((err=g_HandleSys.ReadHandle(fwdHandle, g_PrivateFwdType, NULL, (void **)&pForward))
+	if ((err=handlesys->ReadHandle(fwdHandle, g_PrivateFwdType, NULL, (void **)&pForward))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid private forward handle %x (error %d)", fwdHandle, err);
@@ -249,9 +249,9 @@ static cell_t sm_RemoveFromForward(IPluginContext *pContext, const cell_t *param
 
 	if (plHandle == 0)
 	{
-		pPlugin = g_PluginSys.FindPluginByContext(pContext->GetContext());
+		pPlugin = pluginsys->FindPluginByContext(pContext->GetContext());
 	} else {
-		pPlugin = g_PluginSys.PluginFromHandle(plHandle, &err);
+		pPlugin = pluginsys->PluginFromHandle(plHandle, &err);
 
 		if (!pPlugin)
 		{
@@ -277,7 +277,7 @@ static cell_t sm_RemoveAllFromForward(IPluginContext *pContext, const cell_t *pa
 	IChangeableForward *pForward;
 	IPlugin *pPlugin;
 
-	if ((err=g_HandleSys.ReadHandle(fwdHandle, g_PrivateFwdType, NULL, (void **)&pForward))
+	if ((err=handlesys->ReadHandle(fwdHandle, g_PrivateFwdType, NULL, (void **)&pForward))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid private forward handle %x (error %d)", fwdHandle, err);
@@ -285,9 +285,9 @@ static cell_t sm_RemoveAllFromForward(IPluginContext *pContext, const cell_t *pa
 
 	if (plHandle == 0)
 	{
-		pPlugin = g_PluginSys.FindPluginByContext(pContext->GetContext());
+		pPlugin = pluginsys->FindPluginByContext(pContext->GetContext());
 	} else {
-		pPlugin = g_PluginSys.PluginFromHandle(plHandle, &err);
+		pPlugin = pluginsys->PluginFromHandle(plHandle, &err);
 
 		if (!pPlugin)
 		{
@@ -310,9 +310,9 @@ static cell_t sm_CallStartFunction(IPluginContext *pContext, const cell_t *param
 
 	if (hndl == 0)
 	{
-		pPlugin = g_PluginSys.FindPluginByContext(pContext->GetContext());
+		pPlugin = pluginsys->FindPluginByContext(pContext->GetContext());
 	} else {
-		pPlugin = g_PluginSys.PluginFromHandle(hndl, &err);
+		pPlugin = pluginsys->PluginFromHandle(hndl, &err);
 
 		if (!pPlugin)
 		{
@@ -344,7 +344,7 @@ static cell_t sm_CallStartForward(IPluginContext *pContext, const cell_t *params
 
 	hndl = static_cast<Handle_t>(params[1]);
 
-	if ((err=g_HandleSys.ReadHandle(hndl, g_GlobalFwdType, NULL, (void **)&pForward))
+	if ((err=handlesys->ReadHandle(hndl, g_GlobalFwdType, NULL, (void **)&pForward))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid forward handle %x (error %d)", hndl, err);

core/logic/smn_maplists.cpp

@@ -30,17 +30,12 @@
  */
 
 #include <sh_list.h>
-#include "sm_globals.h"
-#include "sm_trie_tpl.h"
+#include <sm_trie_tpl.h>
+#include "common_logic.h"
 #include "CellArray.h"
-#include "convar.h"
-#include "sourcemm_api.h"
-#include "LibrarySys.h"
-#include "TextParsers.h"
-#include "sm_stringutil.h"
-#include "sourcemod.h"
-#include "Logger.h"
-#include "HandleSys.h"
+#include <ILibrarySys.h>
+#include <ITextParsers.h>
+#include <ISourceMod.h>
 
 using namespace SourceHook;
 
@@ -77,7 +72,7 @@ public:
 	}
 	void OnSourceModAllInitialized()
 	{
-		g_SourceMod.BuildPath(Path_SM, m_ConfigFile, sizeof(m_ConfigFile), "configs/maplists.cfg");
+		g_pSM->BuildPath(Path_SM, m_ConfigFile, sizeof(m_ConfigFile), "configs/maplists.cfg");
 	}
 	void OnSourceModShutdown()
 	{
@@ -94,13 +89,9 @@ public:
 			pMapList->bIsCompat = true;
 			pMapList->bIsPath = true;
 			pMapList->last_modified_time = 0;
-			strncopy(pMapList->name, name, sizeof(pMapList->name));
+			smcore.strncopy(pMapList->name, name, sizeof(pMapList->name));
 			pMapList->pArray = NULL;
-			g_SourceMod.BuildPath(Path_Game, 
-				pMapList->path,
-				sizeof(pMapList->path),
-				"%s",
-				file);
+			g_pSM->BuildPath(Path_Game, pMapList->path, sizeof(pMapList->path), "%s", file);
 			pMapList->serial = 0;
 			m_ListLookup.insert(name, pMapList);
 			m_MapLists.push_back(pMapList);
@@ -115,11 +106,7 @@ public:
 			return;
 		}
 
-		g_SourceMod.BuildPath(Path_Game,
-			path,
-			sizeof(path),
-			"%s",
-			file);
+		g_pSM->BuildPath(Path_Game, path, sizeof(path), "%s", file);
 
 		/* If the path matches, don't reset the serial/time */
 		if (strcmp(path, pMapList->path) == 0)
@@ -127,7 +114,7 @@ public:
 			return;
 		}
 
-		strncopy(pMapList->path, path, sizeof(pMapList->path));
+		smcore.strncopy(pMapList->path, path, sizeof(pMapList->path));
 		pMapList->bIsPath = true;
 		pMapList->last_modified_time = 0;
 		pMapList->serial = 0;
@@ -139,7 +126,7 @@ public:
 		time_t fileTime;
 		SMCStates states = {0, 0};
 		
-		fileFound = g_LibSys.FileTime(m_ConfigFile, FileTime_LastChange, &fileTime);
+		fileFound = libsys->FileTime(m_ConfigFile, FileTime_LastChange, &fileTime);
 
 		/* If the file is found and hasn't changed, bail out now. */
 		if (fileFound && fileTime == m_ConfigLastChanged)
@@ -156,7 +143,7 @@ public:
 			return;
 		}
 
-		m_pMapCycleFile = icvar->FindVar("mapcyclefile");
+		m_pMapCycleFile = smcore.FindConVar("mapcyclefile");
 
 		/* Dump everything we know about. */
 		List<maplist_info_t *> compat;
@@ -166,12 +153,12 @@ public:
 		maplist_info_t *pDefList = new maplist_info_t;
 
 		pDefList->bIsPath = true;
-		strncopy(pDefList->name, "mapcyclefile", sizeof(pDefList->name));
-		g_SourceMod.BuildPath(Path_Game,
+		smcore.strncopy(pDefList->name, "mapcyclefile", sizeof(pDefList->name));
+		g_pSM->BuildPath(Path_Game,
 			pDefList->path, 
 			sizeof(pDefList->path),
 			"%s",
-			m_pMapCycleFile ? m_pMapCycleFile->GetString() : "mapcycle.txt");
+			m_pMapCycleFile ? smcore.GetCvarString(m_pMapCycleFile) : "mapcycle.txt");
 		pDefList->last_modified_time = 0;
 		pDefList->pArray = NULL;
 		pDefList->serial = 0;
@@ -182,19 +169,16 @@ public:
 		/* Now parse the config file even if we don't know about it.
 		 * This will give us a nice error message.
 		 */
-		if ((error = g_TextParser.ParseFile_SMC(m_ConfigFile, this, &states))
+		if ((error = textparser->ParseFile_SMC(m_ConfigFile, this, &states))
 			!= SMCError_Okay)
 		{
-			const char *errmsg = g_TextParser.GetSMCErrorString(error);
+			const char *errmsg = textparser->GetSMCErrorString(error);
 			if (errmsg == NULL)
 			{
 				errmsg = "Unknown error";
 			}
-			g_Logger.LogError("[SM] Could not parse file \"%s\"", m_ConfigFile);
-			g_Logger.LogError("[SM] Error on line %d (col %d): %s",
-				states.line,
-				states.col,
-				errmsg);
+			smcore.LogError("[SM] Could not parse file \"%s\"", m_ConfigFile);
+			smcore.LogError("[SM] Error on line %d (col %d): %s", states.line, states.col, errmsg);
 		}
 		else
 		{
@@ -249,7 +233,7 @@ public:
 			m_pCurMapList = new maplist_info_t;
 
 			memset(m_pCurMapList, 0, sizeof(maplist_info_t));
-			strncopy(m_pCurMapList->name, name, sizeof(m_pCurMapList->name));
+			smcore.strncopy(m_pCurMapList->name, name, sizeof(m_pCurMapList->name));
 
 			m_CurState = MPS_MAPLIST;
 		}
@@ -269,7 +253,7 @@ public:
 
 		if (strcmp(key, "file") == 0)
 		{
-			g_SourceMod.BuildPath(Path_Game, 
+			g_pSM->BuildPath(Path_Game, 
 				m_pCurMapList->path,
 				sizeof(m_pCurMapList->path),
 				"%s",
@@ -278,7 +262,7 @@ public:
 		}
 		else if (strcmp(key, "target") == 0)
 		{
-			strncopy(m_pCurMapList->path, value, sizeof(m_pCurMapList->path));
+			smcore.strncopy(m_pCurMapList->path, value, sizeof(m_pCurMapList->path));
 			m_pCurMapList->bIsPath = false;
 		}
 
@@ -369,9 +353,9 @@ public:
 
 			pNewArray = new CellArray(64);
 			free_new_array = true;
-			g_SourceMod.BuildPath(Path_Game, path, sizeof(path), "maps");
+			g_pSM->BuildPath(Path_Game, path, sizeof(path), "maps");
 
-			if ((pDir = g_LibSys.OpenDirectory(path)) != NULL)
+			if ((pDir = libsys->OpenDirectory(path)) != NULL)
 			{
 				char *ptr;
 				cell_t *blk;
@@ -386,7 +370,7 @@ public:
 						pDir->NextEntry();
 						continue;
 					}
-					strncopy(buffer, pDir->GetEntryName(), sizeof(buffer));
+					smcore.strncopy(buffer, pDir->GetEntryName(), sizeof(buffer));
 					if ((ptr = strstr(buffer, ".bsp")) == NULL || ptr[4] != '\0')
 					{
 						pDir->NextEntry();
@@ -403,10 +387,10 @@ public:
 						pDir->NextEntry();
 						continue;
 					}
-					strncopy((char *)blk, buffer, 255);
+					smcore.strncopy((char *)blk, buffer, 255);
 					pDir->NextEntry();
 				}
-				g_LibSys.CloseDirectory(pDir);
+				libsys->CloseDirectory(pDir);
 			}
 
 			/* Remove the array if there were no items. */
@@ -461,7 +445,7 @@ public:
 		{
 			blk_dst = pUseArray->push();
 			blk_src = pNewArray->at(i);
-			strncopy((char *)blk_dst, (char *)blk_src, pUseArray->blocksize() * sizeof(cell_t));
+			smcore.strncopy((char *)blk_dst, (char *)blk_src, pUseArray->blocksize() * sizeof(cell_t));
 		}
 
 		/* Free resources if necessary. */
@@ -501,20 +485,20 @@ private:
 		if (m_pMapCycleFile != NULL && strcmp(name, "mapcyclefile") == 0)
 		{
 			char path[PLATFORM_MAX_PATH];
-			g_SourceMod.BuildPath(Path_Game,
+			g_pSM->BuildPath(Path_Game,
 				path, 
 				sizeof(path),
 				"%s",
-				m_pMapCycleFile ? m_pMapCycleFile->GetString() : "mapcycle.txt");
+				m_pMapCycleFile ? smcore.GetCvarString(m_pMapCycleFile) : "mapcycle.txt");
 
 			if (strcmp(path, pMapList->path) != 0)
 			{
-				strncopy(pMapList->path, path, sizeof(pMapList->path));
+				smcore.strncopy(pMapList->path, path, sizeof(pMapList->path));
 				pMapList->last_modified_time = 0;
 			}
 		}
 
-		if (!g_LibSys.FileTime(pMapList->path, FileTime_LastChange, &last_time)
+		if (!libsys->FileTime(pMapList->path, FileTime_LastChange, &last_time)
 			|| last_time > pMapList->last_modified_time)
 		{
 			/* Reparse */
@@ -533,7 +517,7 @@ private:
 			while (!feof(fp) && fgets(buffer, sizeof(buffer), fp) != NULL)
 			{
 				size_t len = strlen(buffer);
-				char *ptr = UTIL_TrimWhitespace(buffer, len);
+				char *ptr = smcore.TrimWhitespace(buffer, len);
 				if (*ptr == '\0'
 					|| *ptr == ';'
 					|| strncmp(ptr, "//", 2) == 0)
@@ -546,7 +530,7 @@ private:
 				}
 				if ((blk = pMapList->pArray->push()) != NULL)
 				{
-					strncopy((char *)blk, ptr, 255);
+					smcore.strncopy((char *)blk, ptr, 255);
 				}
 			}
 
@@ -616,7 +600,7 @@ static cell_t LoadMapList(IPluginContext *pContext, const cell_t *params)
 		HandleError err;
 		HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-		if ((err = g_HandleSys.ReadHandle(hndl, htCellArray, &sec, (void **)&pArray))
+		if ((err = handlesys->ReadHandle(hndl, htCellArray, &sec, (void **)&pArray))
 			!= HandleError_None)
 		{
 			return pContext->ThrowNativeError("Invalid Handle %x (error %d)", hndl, err);
@@ -635,7 +619,7 @@ static cell_t LoadMapList(IPluginContext *pContext, const cell_t *params)
 	/* If the user wanted a new array, create it now. */
 	if (hndl == BAD_HANDLE)
 	{
-		if ((hndl = g_HandleSys.CreateHandle(htCellArray, pNewArray, pContext->GetIdentity(), g_pCoreIdent, NULL))
+		if ((hndl = handlesys->CreateHandle(htCellArray, pNewArray, pContext->GetIdentity(), g_pCoreIdent, NULL))
 			== BAD_HANDLE)
 		{
 			*addr = -1;

core/logic/smn_sorting.cpp

@@ -29,11 +29,10 @@
  * Version: $Id$
  */
 
-#include "sm_globals.h"
-#include <IHandleSys.h>
 #include <stdlib.h>
 #include <string.h>
-#include "HandleSys.h"
+#include <time.h>
+#include "common_logic.h"
 #include "CellArray.h"
 
 /***********************************
@@ -448,7 +447,7 @@ static cell_t sm_SortADTArray(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellArray, &sec, (void **)&cArray)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellArray, &sec, (void **)&cArray)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
@@ -535,7 +534,7 @@ static cell_t sm_SortADTArrayCustom(IPluginContext *pContext, const cell_t *para
 	HandleError err;
 	HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
 
-	if ((err = g_HandleSys.ReadHandle(params[1], htCellArray, &sec, (void **)&cArray)) 
+	if ((err = handlesys->ReadHandle(params[1], htCellArray, &sec, (void **)&cArray)) 
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);

core/logic/smn_textparse.cpp

@@ -29,9 +29,9 @@
  * Version: $Id$
  */
 
-#include "sm_globals.h"
+#include "common_logic.h"
 #include <ITextParsers.h>
-#include "HandleSys.h"
+#include <ISourceMod.h>
 
 HandleType_t g_TypeSMC = 0;
 
@@ -152,16 +152,16 @@ public:
 		/* These cannot be cloned, because they are locked to a specific plugin.
 		 * However, we let anyone read them because we don't care.
 		 */
-		g_HandleSys.InitAccessDefaults(NULL, &sec);
+		handlesys->InitAccessDefaults(NULL, &sec);
 		sec.access[HandleAccess_Clone] = HANDLE_RESTRICT_IDENTITY;
 		sec.access[HandleAccess_Read] = 0;
 
-		g_TypeSMC = g_HandleSys.CreateType("SMCParser", this, 0, NULL, &sec, g_pCoreIdent, NULL);
+		g_TypeSMC = handlesys->CreateType("SMCParser", this, 0, NULL, &sec, g_pCoreIdent, NULL);
 	}
 
 	void OnSourceModShutdown()
 	{
-		g_HandleSys.RemoveType(g_TypeSMC, g_pCoreIdent);
+		handlesys->RemoveType(g_TypeSMC, g_pCoreIdent);
 	}
 
 	void OnHandleDestroy(HandleType_t type, void *object)
@@ -183,7 +183,7 @@ static cell_t SMC_CreateParser(IPluginContext *pContext, const cell_t *params)
 {
 	ParseInfo *pInfo = new ParseInfo();
 
-	Handle_t hndl = g_HandleSys.CreateHandle(g_TypeSMC, pInfo, pContext->GetIdentity(), g_pCoreIdent, NULL);
+	Handle_t hndl = handlesys->CreateHandle(g_TypeSMC, pInfo, pContext->GetIdentity(), g_pCoreIdent, NULL);
 
 	/* Should never happen */
 	if (!hndl)
@@ -203,7 +203,7 @@ static cell_t SMC_SetParseStart(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	ParseInfo *parse;
 
-	if ((err=g_HandleSys.ReadHandle(hndl, g_TypeSMC, NULL, (void **)&parse))
+	if ((err=handlesys->ReadHandle(hndl, g_TypeSMC, NULL, (void **)&parse))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid SMC Parse Handle %x (error %d)", hndl, err);
@@ -220,7 +220,7 @@ static cell_t SMC_SetParseEnd(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	ParseInfo *parse;
 
-	if ((err=g_HandleSys.ReadHandle(hndl, g_TypeSMC, NULL, (void **)&parse))
+	if ((err=handlesys->ReadHandle(hndl, g_TypeSMC, NULL, (void **)&parse))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid SMC Parse Handle %x (error %d)", hndl, err);
@@ -237,7 +237,7 @@ static cell_t SMC_SetReaders(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	ParseInfo *parse;
 
-	if ((err=g_HandleSys.ReadHandle(hndl, g_TypeSMC, NULL, (void **)&parse))
+	if ((err=handlesys->ReadHandle(hndl, g_TypeSMC, NULL, (void **)&parse))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid SMC Parse Handle %x (error %d)", hndl, err);
@@ -256,7 +256,7 @@ static cell_t SMC_SetRawLine(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	ParseInfo *parse;
 
-	if ((err=g_HandleSys.ReadHandle(hndl, g_TypeSMC, NULL, (void **)&parse))
+	if ((err=handlesys->ReadHandle(hndl, g_TypeSMC, NULL, (void **)&parse))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid SMC Parse Handle %x (error %d)", hndl, err);
@@ -273,7 +273,7 @@ static cell_t SMC_ParseFile(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	ParseInfo *parse;
 
-	if ((err=g_HandleSys.ReadHandle(hndl, g_TypeSMC, NULL, (void **)&parse))
+	if ((err=handlesys->ReadHandle(hndl, g_TypeSMC, NULL, (void **)&parse))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid SMC Parse Handle %x (error %d)", hndl, err);
@@ -283,7 +283,7 @@ static cell_t SMC_ParseFile(IPluginContext *pContext, const cell_t *params)
 	pContext->LocalToString(params[2], &file);
 
 	char path[PLATFORM_MAX_PATH];
-	g_SourceMod.BuildPath(Path_Game, path, sizeof(path), "%s", file);
+	g_pSM->BuildPath(Path_Game, path, sizeof(path), "%s", file);
 
 	SMCStates states;
 	SMCError p_err = textparsers->ParseFile_SMC(path, parse, &states);

core/logic/version.rc

@@ -0,0 +1,104 @@
+// Microsoft Visual C++ generated resource script.
+//
+//#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+#include <sourcemod_version.h>
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION  SM_FILE_VERSION
+ PRODUCTVERSION SM_FILE_VERSION
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004b0"
+        BEGIN
+            VALUE "Comments", "SourceMod"
+            VALUE "FileDescription", "SourceMod Core Logic"
+            VALUE "FileVersion", SM_FULL_VERSION
+            VALUE "InternalName", "sourcemod"
+            VALUE "LegalCopyright", "Copyright (c) 2004-2009, AlliedModders LLC"
+            VALUE "OriginalFilename", "sourcemod.logic.dll"
+            VALUE "ProductName", "SourceMod"
+            VALUE "ProductVersion", SM_FULL_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

core/logic_bridge.cpp

@@ -0,0 +1,176 @@
+/**
+ * vim: set ts=4 sw=4 :
+ * =============================================================================
+ * SourceMod
+ * Copyright (C) 2004-2009 AlliedModders LLC.  All rights reserved.
+ * =============================================================================
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3.0, as published by the
+ * Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * As a special exception, AlliedModders LLC gives you permission to link the
+ * code of this program (as well as its derivative works) to "Half-Life 2," the
+ * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+ * by the Valve Corporation.  You must obey the GNU General Public License in
+ * all respects for all other code used.  Additionally, AlliedModders LLC grants
+ * this exception to all derivative works.  AlliedModders LLC defines further
+ * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+ * or <http://www.sourcemod.net/license.php>.
+ *
+ * Version: $Id$
+ */
+#include <stdio.h>
+#include <assert.h>
+#include "sourcemod.h"
+#include "sourcemm_api.h"
+#include "sm_globals.h"
+#include "NativeOwner.h"
+#include "sm_autonatives.h"
+#include "logic/intercom.h"
+#include "LibrarySys.h"
+#include "HandleSys.h"
+#include "sm_stringutil.h"
+#include "Logger.h"
+#include "ShareSys.h"
+#include "sm_srvcmds.h"
+#include "ForwardSys.h"
+
+static ILibrary *g_pLogic = NULL;
+static LogicInitFunction logic_init_fn;
+
+IThreader *g_pThreader;
+ITextParsers *textparsers;
+
+class VEngineServer_Logic : public IVEngineServer_Logic
+{
+public:
+	virtual bool IsMapValid(const char *map)
+	{
+		return engine->IsMapValid(map);
+	}
+};
+
+static VEngineServer_Logic logic_engine;
+
+static void add_natives(sp_nativeinfo_t *natives)
+{
+	g_pCoreNatives->AddNatives(natives);
+}
+
+static ConVar *find_convar(const char *name)
+{
+	return icvar->FindVar(name);
+}
+
+static void log_error(const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	g_Logger.LogErrorEx(fmt, ap);
+	va_end(ap);
+}
+
+static const char *get_cvar_string(ConVar* cvar)
+{
+	return cvar->GetString();
+}
+
+static sm_core_t core_bridge =
+{
+	/* Objects */
+	&g_HandleSys,
+	NULL,
+	&g_SourceMod,
+	&g_LibSys,
+	reinterpret_cast<IVEngineServer*>(&logic_engine),
+	&g_ShareSys,
+	&g_RootMenu,
+	&g_PluginSys,
+	&g_Forwards,
+	/* Functions */
+	add_natives,
+	find_convar,
+	strncopy,
+	UTIL_TrimWhitespace,
+	log_error,
+	get_cvar_string,
+	UTIL_Format,
+	UTIL_ReplaceAll
+};
+
+void InitLogicBridge()
+{
+	sm_logic_t logic;
+
+	core_bridge.core_ident = g_pCoreIdent;
+	logic_init_fn(&core_bridge, &logic);
+
+	/* Add SMGlobalClass instances */
+	SMGlobalClass* glob = SMGlobalClass::head;
+	while (glob->m_pGlobalClassNext != NULL)
+	{
+		glob = glob->m_pGlobalClassNext;
+	}
+	assert(glob->m_pGlobalClassNext == NULL);
+	glob->m_pGlobalClassNext = logic.head;
+
+	g_pThreader = logic.threader;
+	g_pSourcePawn2->SetProfiler(logic.profiler);
+}
+
+bool StartLogicBridge(char *error, size_t maxlength)
+{
+	char file[PLATFORM_MAX_PATH];
+
+	/* Now it's time to load the logic binary */
+	g_SMAPI->PathFormat(file,
+		sizeof(file),
+		"%s/bin/sourcemod.logic." PLATFORM_LIB_EXT,
+		g_SourceMod.GetSourceModPath());
+
+	char myerror[255];
+	g_pLogic = g_LibSys.OpenLibrary(file, myerror, sizeof(myerror));
+
+	if (!g_pLogic)
+	{
+		if (error && maxlength)
+		{
+			UTIL_Format(error, maxlength, "failed to load %s: %s", file, myerror);
+		}
+		return false;
+	}
+
+	LogicLoadFunction llf = (LogicLoadFunction)g_pLogic->GetSymbolAddress("logic_load");
+	if (llf == NULL)
+	{
+		g_pLogic->CloseLibrary();
+		if (error && maxlength)
+		{
+			UTIL_Format(error, maxlength, "could not find logic_load function");
+		}
+		return false;
+	}
+
+	GetITextParsers getitxt = (GetITextParsers)g_pLogic->GetSymbolAddress("get_textparsers");
+	textparsers = getitxt();
+
+	logic_init_fn = llf(SM_LOGIC_MAGIC);
+
+	return true;
+}
+
+void ShutdownLogicBridge()
+{
+	g_pLogic->CloseLibrary();
+}
+

core/logic_bridge.h

@@ -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
@@ -28,13 +28,12 @@
  *
  * Version: $Id$
  */
+#ifndef _INCLUDE_SOURCEMOD_LOGIC_BRIDGE_H_
+#define _INCLUDE_SOURCEMOD_LOGIC_BRIDGE_H_
 
-#ifndef _INCLUDE_JIT_VERSION_H_
-#define _INCLUDE_JIT_VERSION_H_
+void InitLogicBridge();
+bool StartLogicBridge(char *error, size_t maxlength);
+void ShutdownLogicBridge();
 
-#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_SOURCEMOD_LOGIC_BRIDGE_H_ */
 
-#endif //_INCLUDE_JIT_VERSION_H_

core/msvc9/sourcemod_mm.sln

@@ -7,18 +7,24 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		CrazyDebug - Dark Messiah|Win32 = CrazyDebug - Dark Messiah|Win32
 		CrazyDebug - Episode 1|Win32 = CrazyDebug - Episode 1|Win32
+		CrazyDebug - Left 4 Dead 2|Win32 = CrazyDebug - Left 4 Dead 2|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 2|Win32 = Debug - Left 4 Dead 2|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 2|Win32 = Release - Left 4 Dead 2|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
@@ -26,30 +32,42 @@ Global
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Dark Messiah|Win32.Build.0 = CrazyDebug - Dark Messiah|Win32
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Episode 1|Win32.ActiveCfg = CrazyDebug - Episode 1|Win32
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Episode 1|Win32.Build.0 = CrazyDebug - Episode 1|Win32
+		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Left 4 Dead 2|Win32.ActiveCfg = CrazyDebug - Left 4 Dead 2|Win32
+		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Left 4 Dead 2|Win32.Build.0 = CrazyDebug - Left 4 Dead 2|Win32
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Left 4 Dead|Win32.ActiveCfg = CrazyDebug - Left 4 Dead|Win32
 		{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
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Dark Messiah|Win32.Build.0 = Debug - Dark Messiah|Win32
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Episode 1|Win32.ActiveCfg = Debug - Episode 1|Win32
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Episode 1|Win32.Build.0 = Debug - Episode 1|Win32
+		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Left 4 Dead 2|Win32.ActiveCfg = Debug - Left 4 Dead 2|Win32
+		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Left 4 Dead 2|Win32.Build.0 = Debug - Left 4 Dead 2|Win32
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Left 4 Dead|Win32.ActiveCfg = Debug - Left 4 Dead|Win32
 		{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
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Dark Messiah|Win32.Build.0 = Release - Dark Messiah|Win32
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Episode 1|Win32.ActiveCfg = Release - Episode 1|Win32
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Episode 1|Win32.Build.0 = Release - Episode 1|Win32
+		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Left 4 Dead 2|Win32.ActiveCfg = Release - Left 4 Dead 2|Win32
+		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Left 4 Dead 2|Win32.Build.0 = Release - Left 4 Dead 2|Win32
 		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Left 4 Dead|Win32.ActiveCfg = Release - Left 4 Dead|Win32
 		{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"
@@ -60,6 +60,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="..\..\public"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -122,7 +123,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"
@@ -142,6 +143,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="..\..\public"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -205,7 +207,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"
@@ -223,6 +225,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="..\..\public"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -287,7 +290,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"
@@ -307,6 +310,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="..\..\public"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -369,7 +373,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"
@@ -389,6 +393,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="..\..\public"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -452,7 +457,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"
@@ -470,6 +475,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="..\..\public"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -534,7 +540,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"
@@ -554,6 +560,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="..\..\public"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -616,7 +623,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"
@@ -636,6 +643,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="..\..\public"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -699,7 +707,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"
@@ -717,6 +725,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="..\..\public"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -781,7 +790,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"
@@ -801,6 +810,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="..\..\public"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -863,7 +873,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"
@@ -883,6 +893,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="..\..\public"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -946,7 +957,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"
@@ -964,6 +975,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="..\..\public"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -1028,10 +1040,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"
@@ -1048,6 +1060,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="..\..\public"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -1110,10 +1123,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"
@@ -1130,6 +1143,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="..\..\public"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -1193,10 +1207,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"
@@ -1211,6 +1225,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="..\..\public"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -1251,6 +1266,507 @@
 				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;"
+				AdditionalIncludeDirectories="..\..\public"
+			/>
+			<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;"
+				AdditionalIncludeDirectories="..\..\public"
+			/>
+			<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"
+				AssemblerOutput="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="..\..\public"
+			/>
+			<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>
+		<Configuration
+			Name="CrazyDebug - Left 4 Dead 2|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 /D SE_LEFT4DEAD2=6"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\;..\systems;..\..\public;..\..\public\sourcepawn;&quot;$(HL2SDKL4D2)\public&quot;;&quot;$(HL2SDKL4D2)\public\engine&quot;;&quot;$(HL2SDKL4D2)\public\game\server&quot;;&quot;$(HL2SDKL4D2)\public\mathlib&quot;;&quot;$(HL2SDKL4D2)\public\tier0&quot;;&quot;$(HL2SDKL4D2)\public\tier1&quot;;&quot;$(HL2SDKL4D2)\public\vstdlib&quot;;&quot;$(MMSOURCE18)\core&quot;;&quot;$(MMSOURCE18)\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=6"
+				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;"
+				AdditionalIncludeDirectories="..\..\public"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="&quot;$(HL2SDKL4D2)\lib\public\tier0.lib&quot; &quot;$(HL2SDKL4D2)\lib\public\tier1.lib&quot; &quot;$(HL2SDKL4D2)\lib\public\vstdlib.lib&quot; &quot;$(HL2SDKL4D2)\lib\public\mathlib.lib&quot; dbghelp.lib &quot;Wsock32.lib&quot;"
+				OutputFile="$(OutDir)\sourcemod.2.l4d2.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 - Left 4 Dead 2|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 /D SE_LEFT4DEAD2=6"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\;..\systems;..\..\public;..\..\public\sourcepawn;&quot;$(HL2SDKL4D2)\public&quot;;&quot;$(HL2SDKL4D2)\public\engine&quot;;&quot;$(HL2SDKL4D2)\public\game\server&quot;;&quot;$(HL2SDKL4D2)\public\mathlib&quot;;&quot;$(HL2SDKL4D2)\public\tier0&quot;;&quot;$(HL2SDKL4D2)\public\tier1&quot;;&quot;$(HL2SDKL4D2)\public\vstdlib&quot;;&quot;$(MMSOURCE18)\core&quot;;&quot;$(MMSOURCE18)\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=6"
+				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;"
+				AdditionalIncludeDirectories="..\..\public"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="&quot;$(HL2SDKL4D2)\lib\public\tier0.lib&quot; &quot;$(HL2SDKL4D2)\lib\public\tier1.lib&quot; &quot;$(HL2SDKL4D2)\lib\public\vstdlib.lib&quot; &quot;$(HL2SDKL4D2)\lib\public\mathlib.lib&quot; &quot;Wsock32.lib&quot;"
+				OutputFile="$(OutDir)\sourcemod.2.l4d2.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 - Left 4 Dead 2|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 /D SE_LEFT4DEAD2=6"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="..\;..\systems;..\..\public;..\..\public\sourcepawn;&quot;$(HL2SDKL4D2)\public&quot;;&quot;$(HL2SDKL4D2)\public\engine&quot;;&quot;$(HL2SDKL4D2)\public\game\server&quot;;&quot;$(HL2SDKL4D2)\public\mathlib&quot;;&quot;$(HL2SDKL4D2)\public\tier0&quot;;&quot;$(HL2SDKL4D2)\public\tier1&quot;;&quot;$(HL2SDKL4D2)\public\vstdlib&quot;;&quot;$(MMSOURCE18)\core&quot;;&quot;$(MMSOURCE18)\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=6"
+				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;"
+				AdditionalIncludeDirectories="..\..\public"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="&quot;$(HL2SDKL4D2)\lib\public\tier0.lib&quot; &quot;$(HL2SDKL4D2)\lib\public\tier1.lib&quot; &quot;$(HL2SDKL4D2)\lib\public\vstdlib.lib&quot; &quot;$(HL2SDKL4D2)\lib\public\mathlib.lib&quot; &quot;Wsock32.lib&quot;"
+				OutputFile="$(OutDir)\sourcemod.2.l4d2.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>
@@ -1284,6 +1800,10 @@
 				RelativePath="..\ConCmdManager.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\ConsoleDetours.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\ConVarManager.cpp"
 				>
@@ -1375,6 +1895,38 @@
 						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>
+				<FileConfiguration
+					Name="Debug - Left 4 Dead 2|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release - Left 4 Dead 2|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\Database.cpp"
@@ -1420,6 +1972,10 @@
 				RelativePath="..\Logger.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\logic_bridge.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\MemoryUtils.cpp"
 				>
@@ -1472,10 +2028,6 @@
 				RelativePath="..\PluginSys.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\Profiler.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\ShareSys.cpp"
 				>
@@ -1512,14 +2064,6 @@
 				RelativePath="..\sourcemod.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\TextParsers.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\ThreadSupport.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\TimerSys.cpp"
 				>
@@ -1574,6 +2118,14 @@
 				RelativePath="..\ConCmdManager.h"
 				>
 			</File>
+			<File
+				RelativePath="..\ConCommandBaseIterator.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ConsoleDetours.h"
+				>
+			</File>
 			<File
 				RelativePath="..\ConVarManager.h"
 				>
@@ -1626,6 +2178,10 @@
 				RelativePath="..\Logger.h"
 				>
 			</File>
+			<File
+				RelativePath="..\logic_bridge.h"
+				>
+			</File>
 			<File
 				RelativePath="..\MemoryUtils.h"
 				>
@@ -1678,10 +2234,6 @@
 				RelativePath="..\PluginSys.h"
 				>
 			</File>
-			<File
-				RelativePath="..\Profiler.h"
-				>
-			</File>
 			<File
 				RelativePath="..\ShareSys.h"
 				>
@@ -1726,6 +2278,10 @@
 				RelativePath="..\sm_stringutil.h"
 				>
 			</File>
+			<File
+				RelativePath="..\sm_symtable.h"
+				>
+			</File>
 			<File
 				RelativePath="..\sm_trie.h"
 				>
@@ -1750,14 +2306,6 @@
 				RelativePath="..\sourcemod.h"
 				>
 			</File>
-			<File
-				RelativePath="..\TextParsers.h"
-				>
-			</File>
-			<File
-				RelativePath="..\ThreadSupport.h"
-				>
-			</File>
 			<File
 				RelativePath="..\TimerSys.h"
 				>
@@ -1906,18 +2454,6 @@
 				RelativePath="..\smn_admin.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\smn_adt_array.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\smn_adt_stack.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\smn_adt_trie.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\smn_banning.cpp"
 				>
@@ -1958,14 +2494,6 @@
 				RelativePath="..\smn_filesystem.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\smn_float.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\smn_functions.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\smn_gameconfigs.cpp"
 				>
@@ -1990,10 +2518,6 @@
 				RelativePath="..\smn_lang.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\smn_maplists.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\smn_menus.cpp"
 				>
@@ -2010,18 +2534,10 @@
 				RelativePath="..\smn_profiler.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\smn_sorting.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\smn_string.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\smn_textparse.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\smn_timers.cpp"
 				>
@@ -2045,42 +2561,6 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="Threader"
-			>
-			<Filter
-				Name="Header Files"
-				>
-				<File
-					RelativePath="..\thread\BaseWorker.h"
-					>
-				</File>
-				<File
-					RelativePath="..\thread\ThreadWorker.h"
-					>
-				</File>
-				<File
-					RelativePath="..\thread\WinThreads.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Source Files"
-				>
-				<File
-					RelativePath="..\thread\BaseWorker.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\thread\ThreadWorker.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\thread\WinThreads.cpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>

core/sm_globals.h

@@ -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
@@ -76,7 +76,11 @@ class SMGlobalClass
 	friend class CExtensionManager;
 	friend class PlayerManager;
 public:
-	SMGlobalClass();
+	SMGlobalClass()
+	{
+		m_pGlobalClassNext = SMGlobalClass::head;
+		SMGlobalClass::head = this;
+	}
 public:
 	/**
 	 * @brief Called when SourceMod is initially loading
@@ -184,7 +188,7 @@ public:
 	virtual void OnSourceModMaxPlayersChanged(int newvalue)
 	{
 	}
-private:
+public:
 	SMGlobalClass *m_pGlobalClassNext;
 	static SMGlobalClass *head;
 };
@@ -193,6 +197,16 @@ extern ISourcePawnEngine *g_pSourcePawn;
 extern ISourcePawnEngine2 *g_pSourcePawn2;
 extern IdentityToken_t *g_pCoreIdent;
 
+namespace SourceMod
+{
+	class IThreader;
+	class ITextParsers;
+}
+
+extern IThreader *g_pThreader;
+extern ITextParsers *textparsers;
+
 #include "sm_autonatives.h"
 
 #endif //_INCLUDE_SOURCEMOD_GLOBALS_H_
+

core/sm_srvcmds.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
@@ -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()
 {
@@ -116,14 +116,25 @@ void RootConsoleMenu::ConsolePrint(const char *fmt, ...)
 }
 
 bool RootConsoleMenu::AddRootConsoleCommand(const char *cmd, const char *text, IRootConsoleCommand *pHandler)
+{
+	return _AddRootConsoleCommand(cmd, text, pHandler, false);
+}
+
+bool RootConsoleMenu::AddRootConsoleCommand2(const char *cmd, const char *text, IRootConsoleCommand *pHandler)
+{
+	return _AddRootConsoleCommand(cmd, text, pHandler, true);
+}
+
+bool RootConsoleMenu::_AddRootConsoleCommand(const char *cmd,
+											 const char *text,
+											 IRootConsoleCommand *pHandler,
+											 bool version2)
 {
 	if (sm_trie_retrieve(m_pCommands, cmd, NULL))
 	{
 		return false;
 	}
 
-	sm_trie_insert(m_pCommands, cmd, pHandler);
-
 	/* Sort this into the menu */
 	List<ConsoleEntry *>::iterator iter = m_Menu.begin();
 	ConsoleEntry *pEntry;
@@ -136,6 +147,9 @@ bool RootConsoleMenu::AddRootConsoleCommand(const char *cmd, const char *text, I
 			ConsoleEntry *pNew = new ConsoleEntry;
 			pNew->command.assign(cmd);
 			pNew->description.assign(text);
+			pNew->version2 = version2;
+			pNew->cmd = pHandler;
+			sm_trie_insert(m_pCommands, cmd, pNew);
 			m_Menu.insert(iter, pNew);
 			inserted = true;
 			break;
@@ -148,6 +162,9 @@ bool RootConsoleMenu::AddRootConsoleCommand(const char *cmd, const char *text, I
 		ConsoleEntry *pNew = new ConsoleEntry;
 		pNew->command.assign(cmd);
 		pNew->description.assign(text);
+		pNew->version2 = version2;
+		pNew->cmd = pHandler;
+		sm_trie_insert(m_pCommands, cmd, pNew);
 		m_Menu.push_back(pNew);
 	}
 
@@ -156,18 +173,6 @@ bool RootConsoleMenu::AddRootConsoleCommand(const char *cmd, const char *text, I
 
 bool RootConsoleMenu::RemoveRootConsoleCommand(const char *cmd, IRootConsoleCommand *pHandler)
 {
-	/* Sanity tests */
-	IRootConsoleCommand *object;
-	if (sm_trie_retrieve(m_pCommands, cmd, (void **)&object))
-	{
-		if (object != pHandler)
-		{
-			return false;
-		}
-	} else {
-		return false;
-	}
-
 	sm_trie_delete(m_pCommands, cmd);
 
 	List<ConsoleEntry *>::iterator iter;
@@ -214,6 +219,49 @@ unsigned int RootConsoleMenu::GetInterfaceVersion()
 	return SMINTERFACE_ROOTCONSOLE_VERSION;
 }
 
+#if SOURCE_ENGINE==SE_EPISODEONE || SOURCE_ENGINE==SE_DARKMESSIAH
+class CCommandArgs : public ICommandArgs
+{
+public:
+	CCommandArgs(const CCommand& _cmd)
+	{
+	}
+	const char *Arg(int n) const
+	{
+		return engine->Cmd_Argv(n);
+	}
+	int ArgC() const
+	{
+		return engine->Cmd_Argc();
+	}
+	const char *ArgS() const
+	{
+		return engine->Cmd_Args();
+	}
+};
+#else
+class CCommandArgs : public ICommandArgs
+{
+	const CCommand *cmd;
+public:
+	CCommandArgs(const CCommand& _cmd) : cmd(&_cmd)
+	{
+	}
+	const char *Arg(int n) const
+	{
+		return cmd->Arg(n);
+	}
+	int ArgC() const
+	{
+		return cmd->ArgC();
+	}
+	const char *ArgS() const
+	{
+		return cmd->ArgS();
+	}
+};
+#endif
+
 void RootConsoleMenu::GotRootCmd(const CCommand &cmd)
 {
 	unsigned int argnum = cmd.ArgC();
@@ -241,10 +289,19 @@ void RootConsoleMenu::GotRootCmd(const CCommand &cmd)
 			return;
 		}
 
-		IRootConsoleCommand *pHandler;
-		if (sm_trie_retrieve(m_pCommands, cmdname, (void **)&pHandler))
+		CCommandArgs ocmd(cmd);
+
+		ConsoleEntry *entry;
+		if (sm_trie_retrieve(m_pCommands, cmdname, (void **)&entry))
 		{
-			pHandler->OnRootConsoleCommand(cmdname, cmd);
+			if (entry->version2)
+			{
+				entry->cmd->OnRootConsoleCommand2(cmdname, &ocmd);
+			}
+			else
+			{
+				entry->cmd->OnRootConsoleCommand(cmdname, cmd);
+			}
 			return;
 		}
 	}
@@ -267,20 +324,21 @@ void RootConsoleMenu::OnRootConsoleCommand(const char *cmdname, const CCommand &
 	{
 		ConsolePrint(" SourceMod was developed by AlliedModders, LLC.");
 		ConsolePrint(" Development would not have been possible without the following people:");
-		ConsolePrint("  David \"BAILOPAN\" Anderson, lead developer");
-		ConsolePrint("  Borja \"faluco\" Ferrer, core developer");
-		ConsolePrint("  Scott \"Damaged Soul\" Ehlert, core developer");
-		ConsolePrint("  Matt \"pRED\" Woodrow, core developer");
-		ConsolePrint("  Michael \"ferret\" McKoy, plugin developer");
-		ConsolePrint("  Pavol \"PM OnoTo\" Marko, SourceHook developer");
-		ConsolePrint(" Special thanks to Viper of GameConnect");
-		ConsolePrint(" Special thanks to Mani of Mani-Admin-Plugin");
+		ConsolePrint("  David \"BAILOPAN\" Anderson");
+		ConsolePrint("  Matt \"pRED\" Woodrow");
+		ConsolePrint("  Scott \"DS\" Ehlert");
+		ConsolePrint("  Fyren");
+		ConsolePrint("  Nicholas \"psychonic\" Hastings");
+		ConsolePrint("  Borja \"faluco\" Ferrer");
+		ConsolePrint("  Pavol \"PM OnoTo\" Marko");
+		ConsolePrint(" Special thanks to Liam, ferret, and Mani");
+		ConsolePrint(" Special thanks to Viper and SteamFriends");
 		ConsolePrint(" http://www.sourcemod.net/");
 	}
 	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__);
@@ -357,3 +415,4 @@ CON_COMMAND(sm_dump_handles, "Dumps Handle usage to a file for finding Handle le
 		g_HandleSys.Dump(write_handles_to_game);
 	}
 }
+

core/sm_srvcmds.h

@@ -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
@@ -48,6 +48,8 @@ struct ConsoleEntry
 {
 	String command;
 	String description;
+	bool   version2;
+	IRootConsoleCommand *cmd;
 };
 
 class RootConsoleMenu : 
@@ -75,6 +77,13 @@ public: //IRootConsole
 	bool RemoveRootConsoleCommand(const char *cmd, IRootConsoleCommand *pHandler);
 	void ConsolePrint(const char *fmt, ...);
 	void DrawGenericOption(const char *cmd, const char *text);
+	bool AddRootConsoleCommand2(const char *cmd,
+								const char *text,
+								IRootConsoleCommand *pHandler);
+	bool _AddRootConsoleCommand(const char *cmd,
+								const char *text,
+								IRootConsoleCommand *pHandler,
+								bool version2);
 public:
 	void GotRootCmd(const CCommand &cmd);
 private:

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,
@@ -1580,3 +1580,50 @@ char *UTIL_TrimWhitespace(char *str, size_t &len)
 	return str;
 }
 
+size_t UTIL_DecodeHexString(unsigned char *buffer, size_t maxlength, const char *hexstr)
+{
+	size_t written = 0;
+	size_t length = strlen(hexstr);
+
+	for (size_t i = 0; i < length; i++)
+	{
+		if (written >= maxlength)
+			break;
+		buffer[written++] = hexstr[i];
+		if (hexstr[i] == '\\' && hexstr[i + 1] == 'x')
+		{
+			if (i + 3 >= length)
+				continue;
+			/* Get the hex part. */
+			char s_byte[3];
+			int r_byte;
+			s_byte[0] = hexstr[i + 2];
+			s_byte[1] = hexstr[i + 3];
+			s_byte[2] = '\0';
+			/* Read it as an integer */
+			sscanf(s_byte, "%x", &r_byte);
+			/* Save the value */
+			buffer[written - 1] = r_byte;
+			/* Adjust index */
+			i += 3;
+		}
+	}
+
+	return written;
+}
+
+char *UTIL_ToLowerCase(const char *str)
+{
+	size_t len = strlen(str);
+	char *buffer = new char[len + 1];
+	for (size_t i = 0; i < len; i++)
+	{
+		if (str[i] >= 'A' && str[i] <= 'Z')
+			buffer[i] = tolower(str[i]);
+		else
+			buffer[i] = str[i];
+	}
+	buffer[len] = '\0';
+	return buffer;
+}
+

core/sm_stringutil.h

@@ -60,5 +60,8 @@ char *sm_strdup(const char *str);
 unsigned int UTIL_ReplaceAll(char *subject, size_t maxlength, const char *search, const char *replace, bool caseSensitive = true);
 char *UTIL_ReplaceEx(char *subject, size_t maxLen, const char *search, size_t searchLen, const char *replace, size_t replaceLen, bool caseSensitive = true);
 char *UTIL_TrimWhitespace(char *str, size_t &len);
+size_t UTIL_DecodeHexString(unsigned char *buffer, size_t maxlength, const char *hexstr);
+char *UTIL_ToLowerCase(const char *str);
 
 #endif // _INCLUDE_SOURCEMOD_STRINGUTIL_H_
+

core/sm_symtable.h

@@ -0,0 +1,231 @@
+/**
+ * vim: set ts=4 sw=4 tw=99 noet :
+ * =============================================================================
+ * SourceMod
+ * Copyright (C) 2004-2009 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>.
+ */
+
+#ifndef _INCLUDE_SOURCEMOD_CORE_SYMBOLTABLE_H_
+#define _INCLUDE_SOURCEMOD_CORE_SYMBOLTABLE_H_
+
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+
+#define KESTRING_TABLE_START_SIZE 65536
+
+struct Symbol
+{
+	size_t length;
+	uint32_t hash;
+	void *address;
+	Symbol *tbl_next;
+
+	inline char *buffer()
+	{
+		return reinterpret_cast<char *>(this + 1);
+	}
+};
+
+class SymbolTable
+{
+public:
+	~SymbolTable()
+	{
+		for (uint32_t i = 0; i < nbuckets; i++)
+		{
+			Symbol *sym = buckets[i];
+			while (sym != NULL)
+			{
+				Symbol *next = sym->tbl_next;
+				free(sym);
+				sym = next;
+			}
+		}
+		free(buckets);
+	}
+
+	bool Initialize()
+	{
+		buckets = (Symbol **)malloc(sizeof(Symbol *) * KESTRING_TABLE_START_SIZE);
+		if (buckets == NULL)
+		{
+			return false;
+		}
+		memset(buckets, 0, sizeof(Symbol *) * KESTRING_TABLE_START_SIZE);
+
+		nbuckets = KESTRING_TABLE_START_SIZE;
+		nused = 0;
+		bucketmask = KESTRING_TABLE_START_SIZE - 1;
+		return true;
+	}
+
+	static inline uint32_t HashString(const char *data, size_t len)
+	{
+		#undef get16bits
+		#if (defined(__GNUC__) && defined(__i386__)) || defined(__WATCOMC__) \
+				|| defined(_MSC_VER) || defined (__BORLANDC__) || defined (__TURBOC__)
+			#define get16bits(d) (*((const uint16_t *) (d)))
+		#endif
+		#if !defined (get16bits)
+			#define get16bits(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8)\
+											 +(uint32_t)(((const uint8_t *)(d))[0]) )
+		#endif
+		uint32_t hash = len, tmp;
+		int rem;
+
+		if (len <= 0 || data == NULL)
+		{
+			return 0;
+		}
+
+		rem = len & 3;
+		len >>= 2;
+
+		/* Main loop */
+		for (;len > 0; len--) {
+				hash	+= get16bits (data);
+				tmp		= (get16bits (data+2) << 11) ^ hash;
+				hash	 = (hash << 16) ^ tmp;
+				data	+= 2 * sizeof (uint16_t);
+				hash	+= hash >> 11;
+		}
+
+		/* Handle end cases */
+		switch (rem) {
+				case 3: hash += get16bits (data);
+								hash ^= hash << 16;
+								hash ^= data[sizeof (uint16_t)] << 18;
+								hash += hash >> 11;
+								break;
+				case 2: hash += get16bits (data);
+								hash ^= hash << 11;
+								hash += hash >> 17;
+								break;
+				case 1: hash += *data;
+								hash ^= hash << 10;
+								hash += hash >> 1;
+		}
+
+		/* Force "avalanching" of final 127 bits */
+		hash ^= hash << 3;
+		hash += hash >> 5;
+		hash ^= hash << 4;
+		hash += hash >> 17;
+		hash ^= hash << 25;
+		hash += hash >> 6;
+
+		return hash;
+
+		#undef get16bits
+	}
+
+	Symbol **FindSymbolBucket(const char *str, size_t len, uint32_t hash)
+	{
+		uint32_t bucket = hash & bucketmask;
+		Symbol **pkvs = &buckets[bucket];
+
+		Symbol *kvs = *pkvs;
+		while (kvs != NULL)
+		{
+			if (len == kvs->length && memcmp(str, kvs->buffer(), len * sizeof(char)) == 0)
+			{
+				return pkvs;
+			}
+			pkvs = &kvs->tbl_next;
+			kvs = *pkvs;
+		}
+
+		return pkvs;
+	}
+
+	void ResizeSymbolTable()
+	{
+		uint32_t xnbuckets = nbuckets * 2;
+		Symbol **xbuckets = (Symbol **)malloc(sizeof(Symbol *) * xnbuckets);
+		if (xbuckets == NULL)
+		{
+			return;
+		}
+		memset(xbuckets, 0, sizeof(Symbol *) * xnbuckets);
+		uint32_t xbucketmask = xnbuckets - 1;
+		for (uint32_t i = 0; i < nbuckets; i++)
+		{
+			Symbol *sym = buckets[i];
+			while (sym != NULL)
+			{
+				Symbol *next = sym->tbl_next;
+				uint32_t bucket = sym->hash & xbucketmask;
+				sym->tbl_next = xbuckets[bucket];
+				xbuckets[bucket] = sym;
+				sym = next;
+			}
+		}
+		free(buckets);
+		buckets = xbuckets;
+		nbuckets = xnbuckets;
+		bucketmask = xbucketmask;
+	}
+
+	Symbol *FindSymbol(const char *str, size_t len)
+	{
+		uint32_t hash = HashString(str, len);
+		Symbol **pkvs = FindSymbolBucket(str, len, hash);
+		return *pkvs;
+	}
+
+	Symbol *InternSymbol(const char* str, size_t len, void *address)
+	{
+		uint32_t hash = HashString(str, len);
+		Symbol **pkvs = FindSymbolBucket(str, len, hash);
+		if (*pkvs != NULL)
+		{
+			return *pkvs;
+		}
+
+		Symbol *kvs = (Symbol *)malloc(sizeof(Symbol) + sizeof(char) * (len + 1));
+		kvs->length = len;
+		kvs->hash = hash;
+		kvs->address = address;
+		kvs->tbl_next = NULL;
+		memcpy(kvs + 1, str, sizeof(char) * (len + 1));
+		*pkvs = kvs;
+		nused++;
+
+		if (nused > nbuckets && nbuckets <= INT_MAX / 2)
+		{
+			ResizeSymbolTable();
+		}
+
+		return kvs;
+	}
+private:
+	uint32_t nbuckets;
+	uint32_t nused;
+	uint32_t bucketmask;
+	Symbol **buckets;
+};
+
+#endif //_INCLUDE_SOURCEMOD_CORE_SYMBOLTABLE_H_

core/smn_admin.cpp

@@ -505,6 +505,22 @@ static cell_t FindFlagByChar(IPluginContext *pContext, const cell_t *params)
 	return 1;
 }
 
+static cell_t FindFlagChar(IPluginContext *pContext, const cell_t *params)
+{
+       cell_t *addr;
+       pContext->LocalToPhysAddr(params[2], &addr);
+
+       char flagchar;
+       if (!g_Admins.FindFlagChar((AdminFlag)params[1], &flagchar))
+       {
+               return 0;
+       }
+
+       *addr = (cell_t)flagchar;
+
+       return 1;
+}
+ 
 static cell_t ReadFlagString(IPluginContext *pContext, const cell_t *params)
 {
 	char *flag;
@@ -561,6 +577,7 @@ REGISTER_NATIVES(adminNatives)
 	{"CreateAuthMethod",		CreateAuthMethod},
 	{"FindFlagByName",			FindFlagByName},
 	{"FindFlagByChar",			FindFlagByChar},
+	{"FindFlagChar",			FindFlagChar},
 	{"ReadFlagString",			ReadFlagString},
 	{"GetAdmGroupImmunityLevel",GetAdmGroupImmunityLevel},
 	{"SetAdmGroupImmunityLevel",SetAdmGroupImmunityLevel},

core/smn_banning.cpp

@@ -248,7 +248,7 @@ static cell_t BanClient(IPluginContext *pContext, const cell_t *params)
 	char *ban_reason, *ban_cmd;
 	int client, ban_flags, ban_source, ban_time;
 
-	client = params[1];
+	client = g_HL2.ReferenceToIndex(params[1]);
 
 	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
 	if (!pPlayer || !pPlayer->IsConnected())
@@ -377,7 +377,7 @@ static cell_t BanClient(IPluginContext *pContext, const cell_t *params)
 			/* Kick, then ban */
 			if ((ban_flags & BANFLAG_NOKICK) != BANFLAG_NOKICK)
 			{
-   		 		pPlayer->Kick(kick_message);
+				g_HL2.AddDelayedKick(client, pPlayer->GetUserId(), kick_message);
 			}
 			engine->ServerCommand(command);
 
@@ -390,7 +390,7 @@ static cell_t BanClient(IPluginContext *pContext, const cell_t *params)
 	}
 	else if ((ban_flags & BANFLAG_NOKICK) != BANFLAG_NOKICK)
 	{
-		pPlayer->Kick(kick_message);	
+		g_HL2.AddDelayedKick(client, pPlayer->GetUserId(), kick_message);
 	}
 
 

core/smn_bitbuffer.cpp

@@ -33,6 +33,7 @@
 #include "HandleSys.h"
 #include <bitbuf.h>
 #include <vector.h>
+#include <HalfLife2.h>
 
 static cell_t smn_BfWriteBool(IPluginContext *pCtx, const cell_t *params)
 {
@@ -226,7 +227,14 @@ static cell_t smn_BfWriteEntity(IPluginContext *pCtx, const cell_t *params)
 		return pCtx->ThrowNativeError("Invalid bit buffer handle %x (error %d)", hndl, herr);
 	}
 
-	pBitBuf->WriteShort(params[2]);
+	int index = g_HL2.ReferenceToIndex(params[2]);
+
+	if (index == -1)
+	{
+		return 0;
+	}
+
+	pBitBuf->WriteShort(index);
 
 	return 1;
 }
@@ -523,7 +531,9 @@ static cell_t smn_BfReadEntity(IPluginContext *pCtx, const cell_t *params)
 		return pCtx->ThrowNativeError("Invalid bit buffer handle %x (error %d)", hndl, herr);
 	}
 
-	return pBitBuf->ReadShort();
+	int ref = g_HL2.IndexToReference(pBitBuf->ReadShort());
+
+	return g_HL2.ReferenceToBCompatRef(ref);
 }
 
 static cell_t smn_BfReadAngle(IPluginContext *pCtx, const cell_t *params)

core/smn_console.cpp

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -43,8 +43,17 @@
 #include <inetchannel.h>
 #include <bitbuf.h>
 #include <sm_trie_tpl.h>
+#include "Logger.h"
+#include "ConsoleDetours.h"
+#include "ConCommandBaseIterator.h"
 
-#if SOURCE_ENGINE == SE_LEFT4DEAD
+#if SOURCE_ENGINE >= SE_ORANGEBOXVALVE
+#define NETMSG_BITS 6
+#else
+#define NETMSG_BITS 5
+#endif
+
+#if SOURCE_ENGINE >= SE_LEFT4DEAD
 #define NET_SETCONVAR	6
 #else
 #define NET_SETCONVAR	5
@@ -65,15 +74,6 @@ struct GlobCmdIter
 	List<ConCmdInfo *>::iterator iter;
 };
 
-struct ConCmdIter
-{
-#if SOURCE_ENGINE == SE_LEFT4DEAD
-	ICvarIteratorInternal *pLast;
-#else
-	const ConCommandBase *pLast;
-#endif
-};
-
 class ConsoleHelpers : 
 	public SMGlobalClass,
 	public IHandleTypeDispatch
@@ -100,11 +100,7 @@ public:
 		}
 		else if (type == htConCmdIter)
 		{
-			ConCmdIter *iter = (ConCmdIter * )object;
-#if SOURCE_ENGINE == SE_LEFT4DEAD
-			// ICvarIteratorInternal has no virtual destructor
-			g_pMemAlloc->Free(iter->pLast);
-#endif
+			ConCommandBaseIterator *iter = (ConCommandBaseIterator * )object;
 			delete iter;
 		}
 	}
@@ -112,7 +108,7 @@ public:
 	{
 		if (type == htConCmdIter)
 		{
-			*pSize = sizeof(ConCmdIter);
+			*pSize = sizeof(ConCommandBaseIterator);
 			return true;
 		}
 		else if (type == hCmdIterType)
@@ -179,7 +175,7 @@ private:
 	KTrie<ConCommandBase *> m_CmdFlags;
 } s_CommandFlagsHelper;
 
-#if SOURCE_ENGINE >= SE_ORANGEBOX
+#if SOURCE_ENGINE < SE_ORANGEBOX
 static void ReplicateConVar(ConVar *pConVar)
 {
 	int maxClients = g_Players.GetMaxClients();
@@ -187,7 +183,7 @@ static void ReplicateConVar(ConVar *pConVar)
 	char data[256];
 	bf_write buffer(data, sizeof(data));
 
-	buffer.WriteUBitLong(NET_SETCONVAR, 5);
+	buffer.WriteUBitLong(NET_SETCONVAR, NETMSG_BITS);
 	buffer.WriteByte(1);
 	buffer.WriteString(pConVar->GetName());
 	buffer.WriteString(pConVar->GetString());
@@ -198,8 +194,8 @@ static void ReplicateConVar(ConVar *pConVar)
 
 		if (pPlayer && pPlayer->IsInGame() && !pPlayer->IsFakeClient())
 		{
-			INetChannel *netchan = static_cast<INetChannel *>(engine->GetPlayerNetInfo(i));
-			netchan->SendData(buffer);
+			if (INetChannel *netchan = static_cast<INetChannel *>(engine->GetPlayerNetInfo(i)))
+				netchan->SendData(buffer);
 		}
 	}
 }
@@ -353,7 +349,7 @@ static cell_t sm_SetConVarNum(IPluginContext *pContext, const cell_t *params)
 
 	pConVar->SetValue(params[2]);
 
-#if SOURCE_ENGINE >= SE_ORANGEBOX
+#if SOURCE_ENGINE < SE_ORANGEBOX
 	/* Should we replicate it? */
 	if (params[3] && IsFlagSet(pConVar, FCVAR_REPLICATED))
 	{
@@ -402,7 +398,7 @@ static cell_t sm_SetConVarFloat(IPluginContext *pContext, const cell_t *params)
 	float value = sp_ctof(params[2]);
 	pConVar->SetValue(value);
 
-#if SOURCE_ENGINE >= SE_ORANGEBOX
+#if SOURCE_ENGINE < SE_ORANGEBOX
 	/* Should we replicate it? */
 	if (params[3] && IsFlagSet(pConVar, FCVAR_REPLICATED))
 	{
@@ -453,7 +449,7 @@ static cell_t sm_SetConVarString(IPluginContext *pContext, const cell_t *params)
 
 	pConVar->SetValue(value);
 
-#if SOURCE_ENGINE >= SE_ORANGEBOX
+#if SOURCE_ENGINE < SE_ORANGEBOX
 	/* Should we replicate it? */
 	if (params[3] && IsFlagSet(pConVar, FCVAR_REPLICATED))
 	{
@@ -484,7 +480,7 @@ static cell_t sm_ResetConVar(IPluginContext *pContext, const cell_t *params)
 
 	pConVar->Revert();
 	
-#if SOURCE_ENGINE >= SE_ORANGEBOX
+#if SOURCE_ENGINE < SE_ORANGEBOX
 	/* Should we replicate it? */
 	if (params[3] && IsFlagSet(pConVar, FCVAR_REPLICATED))
 	{
@@ -501,6 +497,24 @@ static cell_t sm_ResetConVar(IPluginContext *pContext, const cell_t *params)
 	return 1;
 }
 
+static cell_t GetConVarDefault(IPluginContext *pContext, const cell_t *params)
+{
+	Handle_t hndl = static_cast<Handle_t>(params[1]);
+	HandleError err;
+	ConVar *pConVar;
+
+	if ((err=g_ConVarManager.ReadConVarHandle(hndl, &pConVar))
+		!= HandleError_None)
+	{
+		return pContext->ThrowNativeError("Invalid convar handle %x (error %d)", hndl, err);
+	}
+
+	size_t bytes;
+	pContext->StringToLocalUTF8(params[2], params[3], pConVar->GetDefault(), &bytes);
+
+	return bytes;
+}
+
 static cell_t sm_GetConVarFlags(IPluginContext *pContext, const cell_t *params)
 {
 	Handle_t hndl = static_cast<Handle_t>(params[1]);
@@ -665,6 +679,13 @@ static cell_t sm_RegServerCmd(IPluginContext *pContext, const cell_t *params)
 	IPluginFunction *pFunction;
 
 	pContext->LocalToString(params[1], &name);
+
+	if (strcasecmp(name, "sm") == 0)
+	{
+		g_Logger.LogError("Request to register \"sm\" command denied.");
+		return 0;
+	}
+
 	pContext->LocalToString(params[3], &help);
 	pFunction = pContext->GetFunctionById(params[2]);
 
@@ -687,6 +708,13 @@ static cell_t sm_RegConsoleCmd(IPluginContext *pContext, const cell_t *params)
 	IPluginFunction *pFunction;
 
 	pContext->LocalToString(params[1], &name);
+
+	if (strcasecmp(name, "sm") == 0)
+	{
+		g_Logger.LogError("Request to register \"sm\" command denied.");
+		return 0;
+	}
+
 	pContext->LocalToString(params[3], &help);
 	pFunction = pContext->GetFunctionById(params[2]);
 
@@ -712,6 +740,13 @@ 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)
+	{
+		g_Logger.LogError("Request to register \"sm\" command denied.");
+		return 0;
+	}
+
 	pContext->LocalToString(params[4], &help);
 	pContext->LocalToString(params[5], (char **)&group);
 	pFunction = pContext->GetFunctionById(params[2]);
@@ -1155,7 +1190,7 @@ static cell_t GetCommandFlags(IPluginContext *pContext, const cell_t *params)
 static cell_t FindFirstConCommand(IPluginContext *pContext, const cell_t *params)
 {
 	Handle_t hndl;
-	ConCmdIter *pIter;
+	ConCommandBaseIterator *pIter;
 	cell_t *pIsCmd, *pFlags;
 	const ConCommandBase *pConCmd;
 	const char *desc;
@@ -1163,21 +1198,15 @@ static cell_t FindFirstConCommand(IPluginContext *pContext, const cell_t *params
 	pContext->LocalToPhysAddr(params[3], &pIsCmd);
 	pContext->LocalToPhysAddr(params[4], &pFlags);
 
-#if SOURCE_ENGINE == SE_LEFT4DEAD
-	ICvarIteratorInternal *cvarIter = icvar->FactoryInternalIterator();
-	cvarIter->SetFirst();
-	if (!cvarIter->IsValid())
+	pIter = new ConCommandBaseIterator();
+
+	if (!pIter->IsValid())
 	{
+		delete pIter;
 		return BAD_HANDLE;
 	}
-	pConCmd = cvarIter->Get();
-#else
-	pConCmd = icvar->GetCommands();
-	if (pConCmd == NULL)
-	{
-		return BAD_HANDLE;
-	}
-#endif
+
+	pConCmd = pIter->Get();
 
 	pContext->StringToLocalUTF8(params[1], params[2], pConCmd->GetName(), NULL);
 	*pIsCmd = pConCmd->IsCommand() ? 1 : 0;
@@ -1189,13 +1218,6 @@ static cell_t FindFirstConCommand(IPluginContext *pContext, const cell_t *params
 		pContext->StringToLocalUTF8(params[5], params[6], (desc && desc[0]) ? desc : "", NULL);
 	}
 
-	pIter = new ConCmdIter;
-#if SOURCE_ENGINE == SE_LEFT4DEAD
-	pIter->pLast = cvarIter;
-#else
-	pIter->pLast = pConCmd;
-#endif
-
 	if ((hndl = g_HandleSys.CreateHandle(htConCmdIter, pIter, pContext->GetIdentity(), g_pCoreIdent, NULL))
 		== BAD_HANDLE)
 	{
@@ -1209,7 +1231,7 @@ static cell_t FindFirstConCommand(IPluginContext *pContext, const cell_t *params
 static cell_t FindNextConCommand(IPluginContext *pContext, const cell_t *params)
 {
 	HandleError err;
-	ConCmdIter *pIter;
+	ConCommandBaseIterator *pIter;
 	cell_t *pIsCmd, *pFlags;
 	const char *desc;
 	const ConCommandBase *pConCmd;
@@ -1220,27 +1242,17 @@ static cell_t FindNextConCommand(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Invalid Handle %x (error %d)", params[1], err);
 	}
 
-	if (pIter->pLast == NULL)
+	if (!pIter->IsValid())
 	{
 		return 0;
 	}
 
-#if SOURCE_ENGINE == SE_LEFT4DEAD
-	ICvarIteratorInternal *cvarIter = pIter->pLast;
-	cvarIter->Next();
-	if (!cvarIter->IsValid())
+	pIter->Next();
+	if (!pIter->IsValid())
 	{
 		return 0;
 	}
-	pConCmd = cvarIter->Get();
-#else
-	pConCmd = pIter->pLast->GetNext();
-	if (pConCmd == NULL)
-	{
-		return 0;
-	}
-	pIter->pLast = pConCmd;
-#endif
+	pConCmd = pIter->Get();
 
 	pContext->LocalToPhysAddr(params[4], &pIsCmd);
 	pContext->LocalToPhysAddr(params[5], &pFlags);
@@ -1276,7 +1288,7 @@ static cell_t SendConVarValue(IPluginContext *pContext, const cell_t *params)
 	char data[256];
 	bf_write buffer(data, sizeof(data));
 
-	buffer.WriteUBitLong(NET_SETCONVAR, 5);
+	buffer.WriteUBitLong(NET_SETCONVAR, NETMSG_BITS);
 	buffer.WriteByte(1);
 	buffer.WriteString(pConVar->GetName());
 	buffer.WriteString(value);
@@ -1299,6 +1311,11 @@ static cell_t SendConVarValue(IPluginContext *pContext, const cell_t *params)
 	}
 
 	INetChannel *netchan = static_cast<INetChannel *>(engine->GetPlayerNetInfo(params[1]));
+	if (netchan == NULL)
+	{
+		return 0;
+	}
+
 	netchan->SendData(buffer);
 
 	return 1;
@@ -1314,6 +1331,46 @@ static cell_t RemoveServerTag(IPluginContext *pContext, const cell_t *params)
 	return 0;
 }
 
+static cell_t AddCommandListener(IPluginContext *pContext, const cell_t *params)
+{
+	char *name;
+	IPluginFunction *pFunction;
+
+	pContext->LocalToString(params[2], &name);
+
+	if (strcasecmp(name, "sm") == 0)
+	{
+		g_Logger.LogError("Request to register \"sm\" command denied.");
+		return 0;
+	}
+
+	pFunction = pContext->GetFunctionById(params[1]);
+
+	if (!pFunction)
+		return pContext->ThrowNativeError("Invalid function id (%X)", params[1]);
+
+	if (!g_ConsoleDetours.AddListener(pFunction, name[0] == '\0' ? NULL : name))
+		return pContext->ThrowNativeError("This game does not support command listeners");
+
+	return 1;
+}
+
+static cell_t RemoveCommandListener(IPluginContext *pContext, const cell_t *params)
+{
+	char *name;
+	IPluginFunction *pFunction;
+
+	pContext->LocalToString(params[2], &name);
+	pFunction = pContext->GetFunctionById(params[1]);
+	if (!pFunction)
+		return pContext->ThrowNativeError("Invalid function id (%X)", params[1]);
+
+	if (!g_ConsoleDetours.RemoveListener(pFunction, name[0] == '\0' ? NULL : name))
+		return pContext->ThrowNativeError("No matching callback was registered");
+	
+	return 1;
+}
+
 REGISTER_NATIVES(consoleNatives)
 {
 	{"CreateConVar",		sm_CreateConVar},
@@ -1335,6 +1392,7 @@ REGISTER_NATIVES(consoleNatives)
 	{"GetConVarBounds",		sm_GetConVarBounds},
 	{"SetConVarBounds",		sm_SetConVarBounds},
 	{"QueryClientConVar",	sm_QueryClientConVar},
+	{"GetConVarDefault",	GetConVarDefault},
 	{"RegServerCmd",		sm_RegServerCmd},
 	{"RegConsoleCmd",		sm_RegConsoleCmd},
 	{"GetCmdArgString",		sm_GetCmdArgString},
@@ -1363,5 +1421,7 @@ REGISTER_NATIVES(consoleNatives)
 	{"SendConVarValue",		SendConVarValue},
 	{"AddServerTag",		AddServerTag},
 	{"RemoveServerTag",		RemoveServerTag},
+	{"AddCommandListener",	AddCommandListener},
+	{"RemoveCommandListener", RemoveCommandListener},
 	{NULL,					NULL}
 };

core/smn_core.cpp

@@ -42,6 +42,7 @@
 #include "ForwardSys.h"
 #include "Logger.h"
 #include "ExtensionSys.h"
+#include <sm_trie_tpl.h>
 
 #if defined PLATFORM_WINDOWS
 #include <windows.h>
@@ -491,6 +492,11 @@ static cell_t LibraryExists(IPluginContext *pContext, const cell_t *params)
 	char *str;
 	pContext->LocalToString(params[1], &str);
 
+	if (strcmp(str, "__CanTestFeatures__") == 0)
+	{
+		return 1;
+	}
+
 	if (g_PluginSys.LibraryExists(str))
 	{
 		return 1;
@@ -630,6 +636,43 @@ static cell_t VerifyCoreVersion(IPluginContext *pContext, const cell_t *params)
 	return 4;
 }
 
+static cell_t GetFeatureStatus(IPluginContext *pContext, const cell_t *params)
+{
+	FeatureType type = (FeatureType)params[1];
+	char *name;
+
+	pContext->LocalToString(params[2], &name);
+
+	return g_ShareSys.TestFeature(pContext->GetRuntime(),type, name);
+}
+
+static cell_t RequireFeature(IPluginContext *pContext, const cell_t *params)
+{
+	FeatureType type = (FeatureType)params[1];
+	char *name;
+
+	pContext->LocalToString(params[2], &name);
+
+	if (g_ShareSys.TestFeature(pContext->GetRuntime(),type, name) != FeatureStatus_Available)
+	{
+		char buffer[255];
+		char *msg = buffer;
+		char default_message[255];
+		CPlugin *pPlugin = g_PluginSys.GetPluginByCtx(pContext->GetContext());
+
+		g_SourceMod.FormatString(buffer, sizeof(buffer), pContext, params, 3);
+		if (pContext->GetLastNativeError() != SP_ERROR_NONE || buffer[0] == '\0')
+		{
+			UTIL_Format(default_message, sizeof(default_message), "Feature \"%s\" not available", name);
+			msg = default_message;
+		}
+		pPlugin->SetErrorState(Plugin_Error, "%s", msg);
+		return pContext->ThrowNativeErrorEx(SP_ERROR_ABORTED, "%s", msg);
+	}
+
+	return 1;
+}
+
 REGISTER_NATIVES(coreNatives)
 {
 	{"AutoExecConfig",			AutoExecConfig},
@@ -654,6 +697,8 @@ REGISTER_NATIVES(coreNatives)
 	{"GetExtensionFileStatus",	GetExtensionFileStatus},
 	{"FindPluginByNumber",		FindPluginByNumber},
 	{"VerifyCoreVersion",		VerifyCoreVersion},
+	{"GetFeatureStatus",        GetFeatureStatus},
+	{"RequireFeature",          RequireFeature},
 	{NULL,						NULL},
 };
 

core/smn_entities.cpp

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -54,47 +54,88 @@ enum PropFieldType
 	PropField_String_T,			/**< Valid for Data fields.  Read only! */
 };
 
-inline edict_t *GetEdict(cell_t num)
+inline edict_t *BaseEntityToEdict(CBaseEntity *pEntity)
 {
-	edict_t *pEdict = PEntityOfEntIndex(num);
-	if (!pEdict || pEdict->IsFree())
+	IServerUnknown *pUnk = (IServerUnknown *)pEntity;
+	IServerNetworkable *pNet = pUnk->GetNetworkable();
+
+	if (!pNet)
 	{
 		return NULL;
 	}
-	if (num > 0 && num <= g_Players.GetMaxClients())
+
+	return pNet->GetEdict();
+}
+
+inline edict_t *GetEdict(cell_t num)
+{
+	edict_t *pEdict;
+	if (!IndexToAThings(num, NULL, &pEdict))
 	{
-		CPlayer *pPlayer = g_Players.GetPlayerByIndex(num);
-		if (!pPlayer || !pPlayer->IsConnected())
-		{
-			return NULL;
-		}
+		return NULL;
 	}
+	
 	return pEdict;
 }
 
-edict_t *GetEntity(cell_t num, CBaseEntity **pData)
+inline CBaseEntity *GetEntity(cell_t num)
 {
-	edict_t *pEdict = PEntityOfEntIndex(num);
-	if (!pEdict || pEdict->IsFree())
+	CBaseEntity *pEntity;
+	if (!IndexToAThings(num, &pEntity, NULL))
 	{
 		return NULL;
 	}
-	if (num > 0 && num <= g_Players.GetMaxClients())
+
+	return pEntity;
+}
+
+/* Given an entity reference or index, fill out a CBaseEntity and/or edict.
+   If lookup is successful, returns true and writes back the two parameters.
+   If lookup fails, returns false and doesn't touch the params.  */
+bool IndexToAThings(cell_t num, CBaseEntity **pEntData, edict_t **pEdictData)
+{
+	CBaseEntity *pEntity = g_HL2.ReferenceToEntity(num);
+
+	if (!pEntity)
 	{
-		CPlayer *pPlayer = g_Players.GetPlayerByIndex(num);
+		return false;
+	}
+
+	int index = g_HL2.ReferenceToIndex(num);
+	if (index > 0 && index <= g_Players.GetMaxClients())
+	{
+		CPlayer *pPlayer = g_Players.GetPlayerByIndex(index);
 		if (!pPlayer || !pPlayer->IsConnected())
 		{
-			return NULL;
+			return false;
 		}
 	}
-	IServerUnknown *pUnk;
-	if ((pUnk=pEdict->GetUnknown()) == NULL)
+
+	if (pEntData)
 	{
-		return NULL;
+		*pEntData = pEntity;
 	}
-	*pData = pUnk->GetBaseEntity();
-	return pEdict;
+
+	if (pEdictData)
+	{
+		edict_t *pEdict = ::BaseEntityToEdict(pEntity);
+		if (!pEdict || pEdict->IsFree())
+		{
+			pEdict = NULL;
+		}
+
+		*pEdictData = pEdict;
+	}
+
+	return true;
 }
+/*
+  <predcrab> AThings is like guaranteed r+ by dvander though
+  <predcrab> he wont even read the rest of the patch to nit stuff
+  <Fyren> Like I wasn't going to r? you anyway!
+  <predcrab> he still sees!
+  <predcrab> he's everywhere
+*/
 
 class VEmptyClass {};
 datamap_t *VGetDataDescMap(CBaseEntity *pThisPtr, int offset)
@@ -161,11 +202,11 @@ static cell_t CreateEdict(IPluginContext *pContext, const cell_t *params)
 
 static cell_t RemoveEdict(IPluginContext *pContext, const cell_t *params)
 {
-	edict_t *pEdict = PEntityOfEntIndex(params[1]);
+	edict_t *pEdict = GetEdict(params[1]);
 
 	if (!pEdict)
 	{
-		return pContext->ThrowNativeError("Edict %d is not a valid edict", params[1]);
+		return pContext->ThrowNativeError("Edict %d (%d) is not a valid edict", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
 	engine->RemoveEdict(pEdict);
@@ -188,20 +229,8 @@ static cell_t IsValidEdict(IPluginContext *pContext, const cell_t *params)
 
 static cell_t IsValidEntity(IPluginContext *pContext, const cell_t *params)
 {
-	edict_t *pEdict = GetEdict(params[1]);
+	CBaseEntity *pEntity = g_HL2.ReferenceToEntity(params[1]);
 
-	if (!pEdict)
-	{
-		return 0;
-	}
-
-	IServerUnknown *pUnknown = pEdict->GetUnknown();
-	if (!pUnknown)
-	{
-		return 0;
-	}
-
-	CBaseEntity *pEntity = pUnknown->GetBaseEntity();
 	return (pEntity != NULL) ? 1 : 0;
 }
 
@@ -228,7 +257,7 @@ static cell_t GetEdictFlags(IPluginContext *pContext, const cell_t *params)
 
 	if (!pEdict)
 	{
-		return pContext->ThrowNativeError("Invalid edict (%d)", params[1]);
+		return pContext->ThrowNativeError("Invalid edict (%d - %d)", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
 	return pEdict->m_fStateFlags;
@@ -240,7 +269,7 @@ static cell_t SetEdictFlags(IPluginContext *pContext, const cell_t *params)
 
 	if (!pEdict)
 	{
-		return pContext->ThrowNativeError("Invalid edict (%d)", params[1]);
+		return pContext->ThrowNativeError("Invalid edict (%d - %d)", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
 	pEdict->m_fStateFlags = params[2];
@@ -254,7 +283,7 @@ static cell_t GetEdictClassname(IPluginContext *pContext, const cell_t *params)
 
 	if (!pEdict)
 	{
-		return pContext->ThrowNativeError("Invalid edict (%d)", params[1]);
+		return pContext->ThrowNativeError("Invalid edict (%d - %d)", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
 	const char *cls = pEdict->GetClassName();
@@ -271,14 +300,16 @@ static cell_t GetEdictClassname(IPluginContext *pContext, const cell_t *params)
 
 static cell_t GetEntityNetClass(IPluginContext *pContext, const cell_t *params)
 {
-	edict_t *pEdict = GetEdict(params[1]);
+	CBaseEntity *pEntity = g_HL2.ReferenceToEntity(params[1]);
 
-	if (!pEdict)
+	IServerUnknown *pUnk = (IServerUnknown *)pEntity;
+
+	if (!pEntity)
 	{
-		return pContext->ThrowNativeError("Invalid edict (%d)", params[1]);
+		return pContext->ThrowNativeError("Invalid entity (%d - %d)", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	IServerNetworkable *pNet = pEdict->GetNetworkable();
+	IServerNetworkable *pNet = pUnk->GetNetworkable();
 	if (!pNet)
 	{
 		return 0;
@@ -293,12 +324,11 @@ static cell_t GetEntityNetClass(IPluginContext *pContext, const cell_t *params)
 
 static cell_t GetEntData(IPluginContext *pContext, const cell_t *params)
 {
-	CBaseEntity *pEntity;
-	edict_t *pEdict = GetEntity(params[1], &pEntity);
+	CBaseEntity *pEntity = GetEntity(params[1]);
 
-	if (!pEdict || !pEntity)
+	if (!pEntity)
 	{
-		return pContext->ThrowNativeError("Entity %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
 	int offset = params[2];
@@ -323,11 +353,11 @@ static cell_t GetEntData(IPluginContext *pContext, const cell_t *params)
 static cell_t SetEntData(IPluginContext *pContext, const cell_t *params)
 {
 	CBaseEntity *pEntity;
-	edict_t *pEdict = GetEntity(params[1], &pEntity);
+	edict_t *pEdict;
 
-	if (!pEdict || !pEntity)
+	if (!IndexToAThings(params[1], &pEntity, &pEdict))
 	{
-		return pContext->ThrowNativeError("Entity %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
 	int offset = params[2];
@@ -336,7 +366,7 @@ static cell_t SetEntData(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Offset %d is invalid", offset);
 	}
 
-	if (params[5])
+	if (params[5] && (pEdict != NULL))
 	{
 		g_HL2.SetEdictStateChanged(pEdict, offset);
 	}
@@ -367,12 +397,11 @@ static cell_t SetEntData(IPluginContext *pContext, const cell_t *params)
 
 static cell_t GetEntDataFloat(IPluginContext *pContext, const cell_t *params)
 {
-	CBaseEntity *pEntity;
-	edict_t *pEdict = GetEntity(params[1], &pEntity);
+	CBaseEntity *pEntity = GetEntity(params[1]);
 
-	if (!pEdict || !pEntity)
+	if (!pEntity)
 	{
-		return pContext->ThrowNativeError("Entity %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
 	int offset = params[2];
@@ -389,11 +418,11 @@ static cell_t GetEntDataFloat(IPluginContext *pContext, const cell_t *params)
 static cell_t SetEntDataFloat(IPluginContext *pContext, const cell_t *params)
 {
 	CBaseEntity *pEntity;
-	edict_t *pEdict = GetEntity(params[1], &pEntity);
+	edict_t *pEdict;
 
-	if (!pEdict || !pEntity)
+	if (!IndexToAThings(params[1], &pEntity, &pEdict))
 	{
-		return pContext->ThrowNativeError("Entity %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
 	int offset = params[2];
@@ -404,7 +433,7 @@ static cell_t SetEntDataFloat(IPluginContext *pContext, const cell_t *params)
 
 	*(float *)((uint8_t *)pEntity + offset) = sp_ctof(params[3]);
 
-	if (params[4])
+	if (params[4] && (pEdict != NULL))
 	{
 		g_HL2.SetEdictStateChanged(pEdict, offset);
 	}
@@ -414,12 +443,11 @@ static cell_t SetEntDataFloat(IPluginContext *pContext, const cell_t *params)
 
 static cell_t GetEntDataVector(IPluginContext *pContext, const cell_t *params)
 {
-	CBaseEntity *pEntity;
-	edict_t *pEdict = GetEntity(params[1], &pEntity);
+	CBaseEntity *pEntity = GetEntity(params[1]);
 
-	if (!pEdict || !pEntity)
+	if (!pEntity)
 	{
-		return pContext->ThrowNativeError("Entity %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
 	int offset = params[2];
@@ -443,11 +471,11 @@ static cell_t GetEntDataVector(IPluginContext *pContext, const cell_t *params)
 static cell_t SetEntDataVector(IPluginContext *pContext, const cell_t *params)
 {
 	CBaseEntity *pEntity;
-	edict_t *pEdict = GetEntity(params[1], &pEntity);
+	edict_t *pEdict;
 
-	if (!pEdict || !pEntity)
+	if (!IndexToAThings(params[1], &pEntity, &pEdict))
 	{
-		return pContext->ThrowNativeError("Entity %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
 	int offset = params[2];
@@ -465,7 +493,7 @@ static cell_t SetEntDataVector(IPluginContext *pContext, const cell_t *params)
 	v->y = sp_ctof(vec[1]);
 	v->z = sp_ctof(vec[2]);
 
-	if (params[4])
+	if (params[4] && (pEdict != NULL))
 	{
 		g_HL2.SetEdictStateChanged(pEdict, offset);
 	}
@@ -476,12 +504,11 @@ static cell_t SetEntDataVector(IPluginContext *pContext, const cell_t *params)
 /* THIS GUY IS DEPRECATED. */
 static cell_t GetEntDataEnt(IPluginContext *pContext, const cell_t *params)
 {
-	CBaseEntity *pEntity;
-	edict_t *pEdict = GetEntity(params[1], &pEntity);
+	CBaseEntity *pEntity = GetEntity(params[1]);
 
-	if (!pEdict || !pEntity)
+	if (!pEntity)
 	{
-		return pContext->ThrowNativeError("Entity %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
 	int offset = params[2];
@@ -497,7 +524,8 @@ static cell_t GetEntDataEnt(IPluginContext *pContext, const cell_t *params)
 		return 0;
 	}
 
-	return hndl.GetEntryIndex();
+	int ref = g_HL2.IndexToReference(hndl.GetEntryIndex());
+	return g_HL2.ReferenceToBCompatRef(ref);
 }
 
 int CheckBaseHandle(CBaseHandle &hndl)
@@ -512,7 +540,10 @@ int CheckBaseHandle(CBaseHandle &hndl)
 	edict_t *pStoredEdict;
 	CBaseEntity *pStoredEntity;
 
-	pStoredEdict = GetEntity(index, &pStoredEntity);
+	if (!IndexToAThings(index, &pStoredEntity, &pStoredEdict))
+	{
+		return -1;
+	}
 
 	if (pStoredEdict == NULL || pStoredEntity == NULL)
 	{
@@ -536,12 +567,11 @@ int CheckBaseHandle(CBaseHandle &hndl)
 
 static cell_t GetEntDataEnt2(IPluginContext *pContext, const cell_t *params)
 {
-	CBaseEntity *pEntity;
-	edict_t *pEdict = GetEntity(params[1], &pEntity);
+	CBaseEntity *pEntity = GetEntity(params[1]);
 
-	if (pEdict == NULL || pEntity == NULL)
+	if (pEntity == NULL)
 	{
-		return pContext->ThrowNativeError("Entity %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
 	int offset = params[2];
@@ -552,18 +582,19 @@ static cell_t GetEntDataEnt2(IPluginContext *pContext, const cell_t *params)
 
 	CBaseHandle &hndl = *(CBaseHandle *)((uint8_t *)pEntity + offset);
 
-	return CheckBaseHandle(hndl);
+	int ref = g_HL2.IndexToReference(hndl.GetEntryIndex());
+	return g_HL2.ReferenceToBCompatRef(ref);
 }
 
 /* THIS GUY IS DEPRECATED. */
 static cell_t SetEntDataEnt(IPluginContext *pContext, const cell_t *params)
 {
 	CBaseEntity *pEntity;
-	edict_t *pEdict = GetEntity(params[1], &pEntity);
+	edict_t *pEdict;
 
-	if (!pEdict || !pEntity)
+	if (!IndexToAThings(params[1], &pEntity, &pEdict))
 	{
-		return pContext->ThrowNativeError("Entity %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
 	int offset = params[2];
@@ -574,20 +605,22 @@ static cell_t SetEntDataEnt(IPluginContext *pContext, const cell_t *params)
 
 	CBaseHandle &hndl = *(CBaseHandle *)((uint8_t *)pEntity + offset);
 
-	if (params[3] == 0)
+	if (params[3] == 0 || (unsigned)params[3] == INVALID_EHANDLE_INDEX)
 	{
 		hndl.Set(NULL);
 	} else {
-		edict_t *pEdict = GetEdict(params[3]);
-		if (!pEdict)
+		CBaseEntity *pOther = GetEntity(params[3]);
+
+		if (!pOther)
 		{
-			return pContext->ThrowNativeError("Entity %d is invalid", params[3]);
+			return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[3]), params[3]);
 		}
-		IServerEntity *pEntOther = pEdict->GetIServerEntity();
-		hndl.Set(pEntOther);
+
+		IHandleEntity *pHandleEnt = (IHandleEntity *)pOther;
+		hndl.Set(pHandleEnt);
 	}
 
-	if (params[4])
+	if (params[4] && (pEdict != NULL))
 	{
 		g_HL2.SetEdictStateChanged(pEdict, offset);
 	}
@@ -598,11 +631,11 @@ static cell_t SetEntDataEnt(IPluginContext *pContext, const cell_t *params)
 static cell_t SetEntDataEnt2(IPluginContext *pContext, const cell_t *params)
 {
 	CBaseEntity *pEntity;
-	edict_t *pEdict = GetEntity(params[1], &pEntity);
+	edict_t *pEdict;
 
-	if (!pEdict || !pEntity)
+	if (!IndexToAThings(params[1], &pEntity, &pEdict))
 	{
-		return pContext->ThrowNativeError("Entity %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
 	int offset = params[2];
@@ -613,22 +646,24 @@ static cell_t SetEntDataEnt2(IPluginContext *pContext, const cell_t *params)
 
 	CBaseHandle &hndl = *(CBaseHandle *)((uint8_t *)pEntity + offset);
 
-	if (params[3] == -1)
+	if ((unsigned)params[3] == INVALID_EHANDLE_INDEX)
 	{
 		hndl.Set(NULL);
 	}
 	else
 	{
-		edict_t *pEdict = GetEdict(params[3]);
-		if (!pEdict)
+		CBaseEntity *pOther = GetEntity(params[3]);
+
+		if (!pOther)
 		{
-			return pContext->ThrowNativeError("Entity %d is invalid", params[3]);
+			return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[3]), params[3]);
 		}
-		IServerEntity *pEntOther = pEdict->GetIServerEntity();
-		hndl.Set(pEntOther);
+
+		IHandleEntity *pHandleEnt = (IHandleEntity *)pOther;
+		hndl.Set(pHandleEnt);
 	}
 
-	if (params[4])
+	if (params[4] && (pEdict != NULL))
 	{
 		g_HL2.SetEdictStateChanged(pEdict, offset);
 	}
@@ -642,7 +677,7 @@ static cell_t ChangeEdictState(IPluginContext *pContext, const cell_t *params)
 
 	if (!pEdict)
 	{
-		return pContext->ThrowNativeError("Edict %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Edict %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
 	g_HL2.SetEdictStateChanged(pEdict, params[2]);
@@ -725,11 +760,11 @@ static cell_t FindDataMapOffs(IPluginContext *pContext, const cell_t *params)
 	datamap_t *pMap;
 	typedescription_t *td;
 	char *offset;
-	edict_t *pEdict = GetEntity(params[1], &pEntity);
+	pEntity = GetEntity(params[1]);
 
-	if (!pEdict || !pEntity)
+	if (!pEntity)
 	{
-		return pContext->ThrowNativeError("Entity %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
 	if ((pMap=CBaseEntity_GetDataDescMap(pEntity)) == NULL)
@@ -824,17 +859,16 @@ static cell_t FindDataMapOffs(IPluginContext *pContext, const cell_t *params)
 		}
 	}
 
-	return td->fieldOffset[TD_OFFSET_NORMAL];
+	return GetTypeDescOffs(td);
 }
 
 static cell_t GetEntDataString(IPluginContext *pContext, const cell_t *params)
 {
-	CBaseEntity *pEntity;
-	edict_t *pEdict = GetEntity(params[1], &pEntity);
+	CBaseEntity *pEntity = GetEntity(params[1]);
 
-	if (!pEdict || !pEntity)
+	if (!pEntity)
 	{
-		return pContext->ThrowNativeError("Entity %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
 	int offset = params[2];
@@ -853,11 +887,11 @@ static cell_t GetEntDataString(IPluginContext *pContext, const cell_t *params)
 static cell_t SetEntDataString(IPluginContext *pContext, const cell_t *params)
 {
 	CBaseEntity *pEntity;
-	edict_t *pEdict = GetEntity(params[1], &pEntity);
+	edict_t *pEdict;
 
-	if (!pEdict || !pEntity)
+	if (!IndexToAThings(params[1], &pEntity, &pEdict))
 	{
-		return pContext->ThrowNativeError("Entity %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
 	int offset = params[2];
@@ -872,7 +906,7 @@ static cell_t SetEntDataString(IPluginContext *pContext, const cell_t *params)
 	pContext->LocalToString(params[3], &src);
 	size_t len = strncopy(dest, src, params[4]);
 
-	if (params[5])
+	if (params[5] && (pEdict != NULL))
 	{
 		g_HL2.SetEdictStateChanged(pEdict, offset);
 	}
@@ -895,10 +929,11 @@ static cell_t SetEntDataString(IPluginContext *pContext, const cell_t *params)
 	}
 
 #define FIND_PROP_SEND(pProp) \
-	IServerNetworkable *pNet = pEdict->GetNetworkable(); \
+	IServerUnknown *pUnk = (IServerUnknown *)pEntity; \
+	IServerNetworkable *pNet = pUnk->GetNetworkable(); \
 	if (!pNet) \
 	{ \
-		return pContext->ThrowNativeError("Edict %d is not networkable", params[1]); \
+		return pContext->ThrowNativeError("Edict %d (%d) is not networkable", g_HL2.ReferenceToIndex(params[1]), params[1]); \
 	} \
 	if (!g_HL2.FindSendPropInfo(pNet->GetServerClass()->GetName(), prop, pProp)) \
 	{ \
@@ -940,14 +975,13 @@ static cell_t GetEntProp(IPluginContext *pContext, const cell_t *params)
 	edict_t *pEdict;
 	int bit_count;
 
-	pEdict = GetEntity(params[1], &pEntity);
-
-	if (!pEdict || !pEntity)
+	if (!IndexToAThings(params[1], &pEntity, &pEdict))
 	{
-		return pContext->ThrowNativeError("Entity %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if ((class_name = pEdict->GetClassName()) == NULL)
+	/* TODO: Find a way to lookup classname without having an edict - Is this a guaranteed prop? */
+	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
 	{
 		class_name = "";
 	}
@@ -969,7 +1003,7 @@ static cell_t GetEntProp(IPluginContext *pContext, const cell_t *params)
 					td->fieldType);
 			}
 
-			offset = td->fieldOffset[TD_OFFSET_NORMAL];
+			offset = GetTypeDescOffs(td);
 			break;
 		}
 	case Prop_Send:
@@ -1031,14 +1065,12 @@ static cell_t SetEntProp(IPluginContext *pContext, const cell_t *params)
 	edict_t *pEdict;
 	int bit_count;
 
-	pEdict = GetEntity(params[1], &pEntity);
-
-	if (!pEdict || !pEntity)
+	if (!IndexToAThings(params[1], &pEntity, &pEdict))
 	{
-		return pContext->ThrowNativeError("Entity %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if ((class_name = pEdict->GetClassName()) == NULL)
+	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
 	{
 		class_name = "";
 	}
@@ -1060,7 +1092,7 @@ static cell_t SetEntProp(IPluginContext *pContext, const cell_t *params)
 					td->fieldType);
 			}
 
-			offset = td->fieldOffset[TD_OFFSET_NORMAL];
+			offset = GetTypeDescOffs(td);
 			break;
 		}
 	case Prop_Send:
@@ -1121,14 +1153,12 @@ static cell_t GetEntPropFloat(IPluginContext *pContext, const cell_t *params)
 	const char *class_name;
 	edict_t *pEdict;
 
-	pEdict = GetEntity(params[1], &pEntity);
-
-	if (!pEdict || !pEntity)
+	if (!IndexToAThings(params[1], &pEntity, &pEdict))
 	{
-		return pContext->ThrowNativeError("Entity %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if ((class_name = pEdict->GetClassName()) == NULL)
+	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
 	{
 		class_name = "";
 	}
@@ -1153,7 +1183,7 @@ static cell_t GetEntPropFloat(IPluginContext *pContext, const cell_t *params)
 					FIELD_TIME);
 			}
 
-			offset = td->fieldOffset[TD_OFFSET_NORMAL];
+			offset = GetTypeDescOffs(td);
 			break;
 		}
 	case Prop_Send:
@@ -1192,14 +1222,12 @@ static cell_t SetEntPropFloat(IPluginContext *pContext, const cell_t *params)
 	const char *class_name;
 	edict_t *pEdict;
 
-	pEdict = GetEntity(params[1], &pEntity);
-
-	if (!pEdict || !pEntity)
+	if (!IndexToAThings(params[1], &pEntity, &pEdict))
 	{
-		return pContext->ThrowNativeError("Entity %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if ((class_name = pEdict->GetClassName()) == NULL)
+	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
 	{
 		class_name = "";
 	}
@@ -1224,7 +1252,7 @@ static cell_t SetEntPropFloat(IPluginContext *pContext, const cell_t *params)
 					FIELD_TIME);
 			}
 
-			offset = td->fieldOffset[TD_OFFSET_NORMAL];
+			offset = GetTypeDescOffs(td);
 			break;
 		}
 	case Prop_Send:
@@ -1252,7 +1280,7 @@ static cell_t SetEntPropFloat(IPluginContext *pContext, const cell_t *params)
 
 	*(float *)((uint8_t *)pEntity + offset) = sp_ctof(params[4]);
 
-	if (params[2] == Prop_Send)
+	if (params[2] == Prop_Send && (pEdict != NULL))
 	{
 		g_HL2.SetEdictStateChanged(pEdict, offset);
 	}
@@ -1268,14 +1296,12 @@ static cell_t GetEntPropEnt(IPluginContext *pContext, const cell_t *params)
 	const char *class_name;
 	edict_t *pEdict;
 
-	pEdict = GetEntity(params[1], &pEntity);
-
-	if (!pEdict || !pEntity)
+	if (!IndexToAThings(params[1], &pEntity, &pEdict))
 	{
-		return pContext->ThrowNativeError("Entity %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if ((class_name = pEdict->GetClassName()) == NULL)
+	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
 	{
 		class_name = "";
 	}
@@ -1298,7 +1324,7 @@ static cell_t GetEntPropEnt(IPluginContext *pContext, const cell_t *params)
 					FIELD_EHANDLE);
 			}
 
-			offset = td->fieldOffset[TD_OFFSET_NORMAL];
+			offset = GetTypeDescOffs(td);
 			break;
 		}
 	case Prop_Send:
@@ -1326,7 +1352,8 @@ static cell_t GetEntPropEnt(IPluginContext *pContext, const cell_t *params)
 
 	CBaseHandle &hndl = *(CBaseHandle *)((uint8_t *)pEntity + offset);
 
-	return CheckBaseHandle(hndl);
+	int ref = g_HL2.IndexToReference(hndl.GetEntryIndex());
+	return g_HL2.ReferenceToBCompatRef(ref);
 }
 
 static cell_t SetEntPropEnt(IPluginContext *pContext, const cell_t *params)
@@ -1337,14 +1364,12 @@ static cell_t SetEntPropEnt(IPluginContext *pContext, const cell_t *params)
 	const char *class_name;
 	edict_t *pEdict;
 
-	pEdict = GetEntity(params[1], &pEntity);
-
-	if (!pEdict || !pEntity)
+	if (!IndexToAThings(params[1], &pEntity, &pEdict))
 	{
-		return pContext->ThrowNativeError("Entity %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if ((class_name = pEdict->GetClassName()) == NULL)
+	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
 	{
 		class_name = "";
 	}
@@ -1367,7 +1392,7 @@ static cell_t SetEntPropEnt(IPluginContext *pContext, const cell_t *params)
 					FIELD_EHANDLE);
 			}
 
-			offset = td->fieldOffset[TD_OFFSET_NORMAL];
+			offset = GetTypeDescOffs(td);
 			break;
 		}
 	case Prop_Send:
@@ -1401,18 +1426,18 @@ static cell_t SetEntPropEnt(IPluginContext *pContext, const cell_t *params)
 	}
 	else
 	{
-		edict_t *pOther;
-		CBaseEntity *pOtherEnt;
+		CBaseEntity *pOther = GetEntity(params[4]);
 
-		if ((pOther = GetEntity(params[4], &pOtherEnt)) == NULL)
+		if (!pOther)
 		{
-			return pContext->ThrowNativeError("Invalid entity %d", params[4]);
+			return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[4]), params[4]);
 		}
 
-		hndl.Set(pOther->GetIServerEntity());
+		IHandleEntity *pHandleEnt = (IHandleEntity *)pOther;
+		hndl.Set(pHandleEnt);
 	}
 
-	if (params[2] == Prop_Send)
+	if (params[2] == Prop_Send && (pEdict != NULL))
 	{
 		g_HL2.SetEdictStateChanged(pEdict, offset);
 	}
@@ -1428,14 +1453,12 @@ static cell_t GetEntPropVector(IPluginContext *pContext, const cell_t *params)
 	const char *class_name;
 	edict_t *pEdict;
 	
-	pEdict = GetEntity(params[1], &pEntity);
-
-	if (!pEdict || !pEntity)
+	if (!IndexToAThings(params[1], &pEntity, &pEdict))
 	{
-		return pContext->ThrowNativeError("Entity %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if ((class_name = pEdict->GetClassName()) == NULL)
+	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
 	{
 		class_name = "";
 	}
@@ -1460,7 +1483,7 @@ static cell_t GetEntPropVector(IPluginContext *pContext, const cell_t *params)
 					FIELD_POSITION_VECTOR);
 			}
 
-			offset = td->fieldOffset[TD_OFFSET_NORMAL];
+			offset = GetTypeDescOffs(td);
 			break;
 		}
 	case Prop_Send:
@@ -1506,14 +1529,12 @@ static cell_t SetEntPropVector(IPluginContext *pContext, const cell_t *params)
 	const char *class_name;
 	edict_t *pEdict;
 	
-	pEdict = GetEntity(params[1], &pEntity);
-
-	if (!pEdict || !pEntity)
+	if (!IndexToAThings(params[1], &pEntity, &pEdict))
 	{
-		return pContext->ThrowNativeError("Entity %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if ((class_name = pEdict->GetClassName()) == NULL)
+	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
 	{
 		class_name = "";
 	}
@@ -1538,7 +1559,7 @@ static cell_t SetEntPropVector(IPluginContext *pContext, const cell_t *params)
 					FIELD_POSITION_VECTOR);
 			}
 
-			offset = td->fieldOffset[TD_OFFSET_NORMAL];
+			offset = GetTypeDescOffs(td);
 			break;
 		}
 	case Prop_Send:
@@ -1573,7 +1594,7 @@ static cell_t SetEntPropVector(IPluginContext *pContext, const cell_t *params)
 	v->y = sp_ctof(vec[1]);
 	v->z = sp_ctof(vec[2]);
 
-	if (params[2] == Prop_Send)
+	if (params[2] == Prop_Send && (pEdict != NULL))
 	{
 		g_HL2.SetEdictStateChanged(pEdict, offset);
 	}
@@ -1590,14 +1611,12 @@ static cell_t GetEntPropString(IPluginContext *pContext, const cell_t *params)
 	edict_t *pEdict;
 	bool bIsStringIndex;
 	
-	pEdict = GetEntity(params[1], &pEntity);
-
-	if (!pEdict || !pEntity)
+	if (!IndexToAThings(params[1], &pEntity, &pEdict))
 	{
-		return pContext->ThrowNativeError("Entity %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if ((class_name = pEdict->GetClassName()) == NULL)
+	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
 	{
 		class_name = "";
 	}
@@ -1627,7 +1646,7 @@ static cell_t GetEntPropString(IPluginContext *pContext, const cell_t *params)
 
 			bIsStringIndex = (td->fieldType != FIELD_CHARACTER);
 
-			offset = td->fieldOffset[TD_OFFSET_NORMAL];
+			offset = GetTypeDescOffs(td);
 			break;
 		}
 	case Prop_Send:
@@ -1680,11 +1699,11 @@ static cell_t SetEntPropString(IPluginContext *pContext, const cell_t *params)
 	char *prop;
 	int offset;
 	int maxlen;
-	edict_t *pEdict = GetEntity(params[1], &pEntity);
+	edict_t *pEdict;
 
-	if (!pEdict || !pEntity)
+	if (!IndexToAThings(params[1], &pEntity, &pEdict))
 	{
-		return pContext->ThrowNativeError("Entity %d is invalid", params[1]);
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
 	switch (params[2])
@@ -1706,14 +1725,15 @@ static cell_t SetEntPropString(IPluginContext *pContext, const cell_t *params)
 			{
 				return pContext->ThrowNativeError("Property \"%s\" is not a valid string", prop);
 			}
-			offset = td->fieldOffset[TD_OFFSET_NORMAL];
+			offset = GetTypeDescOffs(td);
 			maxlen = td->fieldSize;
 			break;
 		}
 	case Prop_Send:
 		{
 			char *prop;
-			IServerNetworkable *pNet = pEdict->GetNetworkable();
+			IServerUnknown *pUnk = (IServerUnknown *)pEntity;
+			IServerNetworkable *pNet = pUnk->GetNetworkable();
 			if (!pNet)
 			{
 				return pContext->ThrowNativeError("The edict is not networkable");
@@ -1744,7 +1764,7 @@ static cell_t SetEntPropString(IPluginContext *pContext, const cell_t *params)
 	pContext->LocalToString(params[4], &src);
 	size_t len = strncopy(dest, src, maxlen);
 
-	if (params[2] == Prop_Send)
+	if (params[2] == Prop_Send && (pEdict != NULL))
 	{
 		g_HL2.SetEdictStateChanged(pEdict, offset);
 	}

core/smn_events.cpp

@@ -348,6 +348,23 @@ static cell_t sm_SetEventString(IPluginContext *pContext, const cell_t *params)
 	return 1;
 }
 
+static cell_t sm_SetEventBroadcast(IPluginContext *pContext, const cell_t *params)
+{
+	Handle_t hndl = static_cast<Handle_t>(params[1]);
+	HandleError err;
+	EventInfo *pInfo;
+
+	if ((err=g_HandleSys.ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
+		!= HandleError_None)
+	{
+		return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
+	}
+
+	pInfo->bDontBroadcast = params[2] ? true : false;
+
+	return 1;
+}
+
 REGISTER_NATIVES(gameEventNatives)
 {
 	{"HookEvent",			sm_HookEvent},
@@ -365,5 +382,7 @@ REGISTER_NATIVES(gameEventNatives)
 	{"SetEventInt",			sm_SetEventInt},
 	{"SetEventFloat",		sm_SetEventFloat},
 	{"SetEventString",		sm_SetEventString},
+	{"SetEventBroadcast",   sm_SetEventBroadcast},
 	{NULL,					NULL}
 };
+