Update versioning for 1.5.2 release.

--HG--
extra : rebase_source : fee683e74786f060f670ea6a7c98bd6645c07da5

.hgignore

@@ -1,11 +1,15 @@
 # Binaries
 \.dll$
+\.dylib$
 \.exe$
 \.so$
 
 # Files generated by Visual Studio
 \.aps$
+\.ipch$
 \.ncb$
+\.opensdf$
+\.sdf$
 \.suo$
 \.user$
 
@@ -20,3 +24,5 @@
 # Files generated by Windows Explorer
 (^|/)[dD]esktop\.ini$
 (^|/)[tT]humbs\.db$
+syntax: glob
+build/*

.hgtags

@@ -3,4 +3,5 @@ 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
+78a1f1b1c6fa86fd7691c70ebf48a9fb3dfb3c11 sourcemod-1.5.0
+5574bfe07731b7dba171c1300f6022319d2dbc89 sourcemod-1.5.1

AMBuildScript

@@ -1,76 +1,148 @@
 # vim: set ts=2 sw=2 tw=99 noet ft=python:
 import os
 import sys
+from ambuild.command import Command
+from ambuild.command import ShellCommand
 from ambuild.command import SymlinkCommand
 
+class ExtractDebugInfoCommand(Command):
+	def __init__(self, binary, outfile):
+		Command.__init__(self)
+		self.binary = binary
+		self.outfile = outfile
+
+	def run(self, runner, job):
+		if AMBuild.cache['debug']:
+			return
+
+		if not self.binary.NeedsRelink(self.outfile):
+			return
+
+		if AMBuild.target['platform'] == 'linux':
+			job.AddCommand(ShellCommand('objcopy --only-keep-debug ' + self.outfile + ' ' + self.outfile + '.dbg'))
+			job.AddCommand(ShellCommand('objcopy --strip-debug ' + self.outfile))
+			job.AddCommand(ShellCommand('objcopy --add-gnu-debuglink=' + os.path.basename(self.outfile) + '.dbg ' + self.outfile))
+		elif AMBuild.target['platform'] == 'darwin':
+			job.AddCommand(ShellCommand('dsymutil ' + self.outfile))
+			job.AddCommand(ShellCommand('strip -S ' + self.outfile))
+
 class SM:
 	def __init__(self):
 		self.compiler = Cpp.Compiler()
 
 		#Build SDK info
+		self.possibleSdks = { }
+		self.possibleSdks['ep1'] =   {'sdk': 'HL2SDK',          'ext': '1.ep1',   'def': '1',
+		                         'name': 'EPISODEONE',     'platform': ['windows', 'linux'],
+		                         'dir': 'hl2sdk'}
+		self.possibleSdks['ep2'] =   {'sdk': 'HL2SDKOB',        'ext': '2.ep2',   'def': '3',
+		                         'name': 'ORANGEBOX',      'platform': ['windows', 'linux'],
+		                         'dir': 'hl2sdk-ob'}
+		self.possibleSdks['css'] =   {'sdk': 'HL2SDKCSS',       'ext': '2.css',   'def': '6',
+		                         'name': 'CSS',            'platform': ['windows', 'linux', 'darwin'],
+		                         'dir': 'hl2sdk-css'}
+		self.possibleSdks['hl2dm'] = {'sdk': 'HL2SDKHL2DM',     'ext': '2.hl2dm', 'def': '7',
+		                         'name': 'HL2DM',          'platform': ['windows', 'linux', 'darwin'],
+		                        'dir': 'hl2sdk-hl2dm'}
+		self.possibleSdks['dods'] =  {'sdk': 'HL2SDKDODS',      'ext': '2.dods',  'def': '8',
+		                         'name': 'DODS',           'platform': ['windows', 'linux', 'darwin'],
+		                        'dir': 'hl2sdk-dods'}
+		self.possibleSdks['tf2'] =   {'sdk': 'HL2SDKTF2',       'ext': '2.tf2',   'def': '9',
+		                         'name': 'TF2',            'platform': ['windows', 'linux', 'darwin'],
+		                        'dir': 'hl2sdk-tf2'}
+		self.possibleSdks['l4d'] =   {'sdk': 'HL2SDKL4D',       'ext': '2.l4d',   'def': '10',
+		                         'name': 'LEFT4DEAD',      'platform': ['windows', 'linux', 'darwin'],
+		                         'dir': 'hl2sdk-l4d'}
+		self.possibleSdks['nd'] =    {'sdk': 'HL2SDKND',        'ext': '2.nd',    'def': '11',
+		                         'name': 'NUCLEARDAWN',    'platform': ['windows', 'linux', 'darwin'],
+		                         'dir': 'hl2sdk-nd'}
+		self.possibleSdks['l4d2'] =  {'sdk': 'HL2SDKL4D2',      'ext': '2.l4d2',  'def': '12',
+		                         'name': 'LEFT4DEAD2',     'platform': ['windows', 'linux', 'darwin'],
+		                         'dir': 'hl2sdk-l4d2'}
+		self.possibleSdks['darkm'] = {'sdk': 'HL2SDK-DARKM',    'ext': '2.darkm', 'def': '2',
+		                         'name': 'DARKMESSIAH',    'platform': ['windows'],
+		                          'dir': 'hl2sdk-darkm'}
+		self.possibleSdks['swarm'] = {'sdk': 'HL2SDK-SWARM',    'ext': '2.swarm', 'def': '13',
+		                         'name': 'ALIENSWARM',     'platform': ['windows'],
+		                         'dir': 'hl2sdk-swarm'}
+		self.possibleSdks['bgt'] =   {'sdk': 'HL2SDK-BGT',      'ext': '2.bgt',   'def': '4',
+		                         'name': 'BLOODYGOODTIME', 'platform': ['windows'],
+		                         'dir': 'hl2sdk-bgt'}
+		self.possibleSdks['eye'] =   {'sdk': 'HL2SDK-EYE',      'ext': '2.eye',   'def': '5',
+		                         'name': 'EYE',            'platform': ['windows'],
+		                         'dir': 'hl2sdk-eye'}
+		self.possibleSdks['csgo'] =  {'sdk': 'HL2SDKCSGO',     'ext': '2.csgo',   'def': '15',
+		                         'name': 'CSGO',           'platform': ['windows', 'linux', 'darwin'],
+		                         'dir': 'hl2sdk-csgo'}
+		# self.possibleSdks['portal2'] =  {'sdk': 'HL2SDK-PORTAL2',     'ext': '2.portal2',  'def': '14',
+		#                        'name': 'PORTAL2',           'platform': ['windows'],
+		#                        'dir': 'hl2sdk-portal'}
+		
 		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'}
 
 		if AMBuild.mode == 'config':
 			#Detect compilers
 			self.compiler.DetectAll(AMBuild)
+			
+			self.hasMySql = AMBuild.options.hasMySql
+			AMBuild.cache.CacheVariable('hasMySql', self.hasMySql)
 
-			#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'
-			}
+			AMBuild.cache.CacheVariable('debug', AMBuild.options.debug)
+			
+			#Environment variable paths to external headers
+			envvars = { 'MMSOURCE110': 'mmsource-1.10', 'MYSQL5': 'mysql-5.0' }
+			
+			#Look for Metamod:Source and MySQL if not disabled
+			for env in envvars:
+				if not self.hasMySql and env == 'MYSQL5':
+					continue
+				path = self.ResolveEnvPath(env, envvars[env])
+				if path == None:
+					raise Exception('Could not find a valid path for {0}'.format(env))
+				AMBuild.cache.CacheVariable(env, path)
+			
+			#Look for SDK directories
+			for sdk in self.possibleSdks:
+				#Get list of SDKs to build against or 'all' or 'present'
+				sdkList = AMBuild.options.sdks.split(',')
+				#Build against all supported SDKs?
+				useAll = sdkList[0] == 'all'
+				#Build against supported SDKs that exist?
+				usePresent = sdkList[0] == 'present'
 
-			#Dark Messiah is Windows-only
-			if AMBuild.target['platform'] == 'windows':
-				envvars['HL2SDK-DARKM'] = 'hl2sdk-darkm'
+				info = self.possibleSdks[sdk]
+				if AMBuild.target['platform'] in info['platform']:
+					env = info['sdk']
+					dir = info['dir']
+					sdkPath = self.ResolveEnvPath(env, dir)
+					if sdkPath == None:
+						if useAll or sdk in sdkList:
+							raise Exception('Could not find a valid path for {0}'.format(env))
+						else:
+							continue
+					if useAll or usePresent or sdk in sdkList:
+						self.sdkInfo[sdk] = info
+						AMBuild.cache.CacheVariable(env, sdkPath)
 
-			#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)
+			if len(self.sdkInfo) < 1:
+				raise Exception('At least one SDK must be available.')
+				
+			AMBuild.cache.CacheVariable('sdkInfo', self.sdkInfo)
 
 			#Set up defines
 			cxx = self.compiler.cxx
-			if isinstance(cxx, Cpp.GCC):
-				self.vendor = 'gcc'
+			if isinstance(cxx, Cpp.CompatGCC):
+				if isinstance(cxx, Cpp.GCC):
+					self.vendor = 'gcc'
+				elif isinstance(cxx, Cpp.Clang):
+					self.vendor = 'clang'
 				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:
+				if (self.vendor == 'gcc' and cxx.majorVersion >= 4) or self.vendor == 'clang':
 					self.compiler.AddToListVar('CFLAGS', '-fvisibility=hidden')
 					self.compiler.AddToListVar('CXXFLAGS', '-fvisibility-inlines-hidden')
 				self.compiler.AddToListVar('CFLAGS', '-Wall')
@@ -78,19 +150,26 @@ class SM:
 				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', '-g3')
 				self.compiler.AddToListVar('CFLAGS', '-m32')
-				self.compiler.AddToListVar('CFLAGS', '-static-libgcc')
+				self.compiler.AddToListVar('POSTLINKFLAGS', '-m32')
 				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('CXXFLAGS', '-Wno-overloaded-virtual')
+				if (self.vendor == 'gcc' and cxx.majorVersion >= 4 and cxx.minorVersion >= 7) or \
+						(self.vendor == 'clang' and cxx.majorVersion >= 3):
+					self.compiler.AddToListVar('CXXFLAGS', '-Wno-delete-non-virtual-dtor')
 				self.compiler.AddToListVar('CDEFINES', 'HAVE_STDINT_H')
+				self.compiler.AddToListVar('CDEFINES', 'GNUC')
+				if self.vendor == 'gcc':
+					self.compiler.AddToListVar('CFLAGS', '-mfpmath=sse')
 			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')
@@ -121,25 +200,54 @@ class SM:
 			#Optimization
 			if AMBuild.options.opt == '1':
 				self.compiler.AddToListVar('CDEFINES', 'NDEBUG')
-				if self.vendor == 'gcc':
+				if self.vendor == 'gcc' or self.vendor == 'clang':
 					self.compiler.AddToListVar('CFLAGS', '-O3')
 				elif self.vendor == 'msvc':
-					self.compiler.AddToListVar('CFLAGS', '/Ot')
+					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':
+				if self.vendor == 'msvc':
 					self.compiler.AddToListVar('CFLAGS', '/Od')
 					self.compiler.AddToListVar('CFLAGS', '/RTC1')
+			
+			#This needs to be after our optimization flags which could otherwise disable it.
+			if self.vendor == 'msvc':
+				# Don't omit frame pointer
+				self.compiler.AddToListVar('CFLAGS', '/Oy-')
 
 			#Platform-specifics
 			if AMBuild.target['platform'] == 'linux':
 				self.compiler.AddToListVar('CDEFINES', '_LINUX')
+				self.compiler.AddToListVar('CDEFINES', 'POSIX')
+				if self.vendor == 'gcc':
+					self.compiler.AddToListVar('POSTLINKFLAGS', '-static-libgcc')
+				if self.vendor == 'clang':
+					self.compiler.AddToListVar('POSTLINKFLAGS', '-lgcc_eh')
+			elif AMBuild.target['platform'] == 'darwin':
+				self.compiler.AddToListVar('CDEFINES', 'OSX')
+				self.compiler.AddToListVar('CDEFINES', '_OSX')
+				self.compiler.AddToListVar('CDEFINES', 'POSIX')
+				self.compiler.AddToListVar('POSTLINKFLAGS', '-mmacosx-version-min=10.5')
+				self.compiler.AddToListVar('POSTLINKFLAGS', ['-arch', 'i386'])
+				self.compiler.AddToListVar('POSTLINKFLAGS', '-lstdc++')
+
+				# For OS X dylib versioning
+				import re
+				productFile = open(os.path.join(AMBuild.sourceFolder, 'product.version'), 'r')
+				productContents = productFile.read()
+				productFile.close()
+				m = re.match('(\d+)\.(\d+)\.(\d+).*', productContents)
+				if m == None:
+					self.version = '1.0.0'
+				else:
+					major, minor, release = m.groups()
+					self.version = '{0}.{1}.{2}'.format(major, minor, release)
+				AMBuild.cache.CacheVariable('version', self.version)
 			elif AMBuild.target['platform'] == 'windows':
 				self.compiler.AddToListVar('CDEFINES', 'WIN32')
 				self.compiler.AddToListVar('CDEFINES', '_WINDOWS')
@@ -154,14 +262,16 @@ class SM:
 			self.targetMap = { }
 			AMBuild.cache.CacheVariable('targetMap', self.targetMap)
 		else:
+			self.sdkInfo = AMBuild.cache['sdkInfo']
 			self.compiler.FromConfig(AMBuild, 'compiler')
 			self.targetMap = AMBuild.cache['targetMap']
+			self.hasMySql = AMBuild.cache['hasMySql']
 
 		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']
+		self.mmsPath = AMBuild.cache['MMSOURCE110']
 
 	def DefaultCompiler(self):
 		return self.compiler.Clone()
@@ -186,10 +296,18 @@ class SM:
 		return compiler
 
 	def AutoVersion(self, folder, binary):
-		if AMBuild.target['platform'] != 'windows':
+		if AMBuild.target['platform'] == 'windows':
+			env = {'RCDEFINES': ['BINARY_NAME="' + binary.binaryFile + '"', 'SM_GENERATED_BUILD']}
+			binary.AddResourceFile(os.path.join(folder, 'version.rc' ), env)
+		elif AMBuild.target['platform'] == 'darwin' and isinstance(binary, Cpp.LibraryBuilder):
+			binary.compiler['POSTLINKFLAGS'].extend(['-compatibility_version', '1.0.0'])
+			binary.compiler['POSTLINKFLAGS'].extend(['-current_version', AMBuild.cache['version']])
+		else:
 			return
-		env = {'RCDEFINES': ['BINARY_NAME="' + binary.binaryFile + '"', 'SM_GENERATED_BUILD']}
-		binary.AddResourceFile(os.path.join(folder, 'version.rc' ), env)
+
+	def ExtractDebugInfo(self, job, binary):
+		src = os.path.join('..', AMBuild.outputFolder, job.workFolder, binary.binaryFile)
+		job.AddCommand(ExtractDebugInfoCommand(binary, src))
 
 	def PreSetupHL2Job(self, job, builder, sdk):
 		info = self.sdkInfo[sdk]
@@ -200,32 +318,63 @@ class SM:
 			else:
 				staticLibs = os.path.join(sdkPath, 'lib', 'linux')
 			workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
-			if sdk == 'l4d2':
-				for i in ['tier1_i486.a', 'mathlib_i486.a', 'vstdlib_linux.so', 'tier0_linux.so']:
-					link = os.path.join(workFolder, i)
-					target = os.path.join(staticLibs, i)
+			if sdk in ['css', 'hl2dm', 'dods', 'tf2', 'l4d2']:
+				libs = ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib_srv.so', 'libtier0_srv.so']
+				for lib in libs:
+					link = os.path.join(workFolder, lib)
+					target = os.path.join(staticLibs, lib)
+					try:
+						os.lstat(link)
+					except:
+						job.AddCommand(SymlinkCommand(link, target))
+			elif sdk in ['l4d', 'nd', 'csgo']:
+				libs = ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.so', 'libtier0.so']
+				if sdk == 'csgo':
+					libs.append('interfaces_i486.a')
+				for lib in libs:
+					link = os.path.join(workFolder, lib)
+					target = os.path.join(staticLibs, lib)
 					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)
+				libs = ['tier1_i486.a', 'mathlib_i486.a', 'vstdlib_i486.so', 'tier0_i486.so']
+				for lib in libs:
+					link = os.path.join(workFolder, lib)
+					target = os.path.join(staticLibs, lib)
 					try:
 						os.lstat(link)
 					except:
 						job.AddCommand(SymlinkCommand(link, target))
+		elif AMBuild.target['platform'] == 'darwin':
+			staticLibs = os.path.join(sdkPath, 'lib', 'mac')
+			workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
+			libs = ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.dylib', 'libtier0.dylib']
+			if sdk == 'csgo':
+				libs.append('interfaces_i486.a')
+			for lib in libs:
+				link = os.path.join(workFolder, lib)
+				target = os.path.join(staticLibs, lib)
+				try:
+					os.lstat(link)
+				except:
+					job.AddCommand(SymlinkCommand(link, target))
 		elif AMBuild.target['platform'] == 'windows':
-			for lib in ['tier0', 'tier1', 'vstdlib', 'mathlib']:
+			libs = ['tier0', 'tier1', 'vstdlib', 'mathlib']
+			if sdk in ['swarm', 'csgo']:
+				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':
+		if AMBuild.target['platform'] in ['linux', 'darwin']:
 			builder.AddObjectFiles(['tier1_i486.a', 'mathlib_i486.a'])
-
+			if sdk == 'csgo':
+				builder.AddObjectFiles(['interfaces_i486.a'])
+	
 	def DefaultHL2Compiler(self, path, sdk, noLink = False, oldMms = '-legacy'):
 		compiler = self.DefaultExtCompiler(path)
 
@@ -236,9 +385,12 @@ class SM:
 		compiler['CXXINCLUDES'].append(os.path.join(self.mmsPath, mms))
 		compiler['CXXINCLUDES'].append(os.path.join(self.mmsPath, mms, 'sourcehook'))
 
-		info = self.sdkInfo
+		info = self.possibleSdks
 		compiler['CDEFINES'].extend(['SE_' + info[i]['name'] + '=' + info[i]['def'] for i in info])
-		compiler['CDEFINES'].append('SE_DARKMESSIAH=2')
+				
+		# We don't build for Portal 2 (yet?, ever?), but using this define in code as 
+		# it saves trouble if we ever need to
+		compiler['CDEFINES'].append('SE_PORTAL2=14')
 
 		paths = [['public'], ['public', 'engine'], ['public', 'mathlib'], ['public', 'vstdlib'],
 						 ['public', 'tier0'], ['public', 'tier1']]
@@ -247,6 +399,7 @@ class SM:
 			paths.append(['game_shared'])
 		else:
 			paths.append(['public', 'game', 'server'])
+			paths.append(['public', 'toolframework'])
 			paths.append(['game', 'shared'])
 			paths.append(['common'])
 
@@ -255,12 +408,20 @@ class SM:
 
 		compiler['CDEFINES'].append('SOURCE_ENGINE=' + info['def'])
 
+		if sdk in ['swarm','csgo']:
+			if AMBuild.target['platform'] == 'windows':
+				compiler['CDEFINES'].extend(['COMPILER_MSVC', 'COMPILER_MSVC32'])
+			else:
+				compiler['CDEFINES'].extend(['COMPILER_GCC'])
+
 		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')
+			elif AMBuild.target['platform'] == 'darwin':
+				staticLibs = os.path.join(sdkPath, 'lib', 'mac')
 
 		for i in paths:
 			compiler['CXXINCLUDES'].append(os.path.join(sdkPath, *i))
@@ -268,14 +429,36 @@ class SM:
 		if not noLink:
 			if AMBuild.target['platform'] == 'linux':
 				compiler['POSTLINKFLAGS'][0:0] = ['-lm']
-				if sdk == 'l4d2':
-					compiler['POSTLINKFLAGS'][0:0] = ['tier0_linux.so']
-					compiler['POSTLINKFLAGS'][0:0] = ['vstdlib_linux.so']
+				if sdk in ['css', 'hl2dm', 'dods', 'tf2', 'l4d2']:
+					compiler['POSTLINKFLAGS'][0:0] = ['libtier0_srv.so']
+					compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib_srv.so']
+				elif sdk in ['l4d', 'nd', 'csgo']:
+					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']				
+					compiler['POSTLINKFLAGS'][0:0] = ['vstdlib_i486.so']
+			elif AMBuild.target['platform'] == 'darwin':
+				compiler['POSTLINKFLAGS'][0:0] = ['libtier0.dylib']
+				compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib.dylib']
 
 		return compiler
+		
+	def ResolveEnvPath(self, env, defaultDir):
+		if env in os.environ:
+			path = os.environ[env]
+			if os.path.isdir(path):
+				return path
+		else:
+			head = os.getcwd()
+			oldhead = None
+			while head != None and head != oldhead:
+				path = os.path.join(head, defaultDir)
+				if os.path.isdir(path):
+					return path
+				oldhead = head
+				head, tail = os.path.split(head)
+		return None
 
 sm = SM()
 globals = {
@@ -294,6 +477,7 @@ FileList = [
 		['extensions', 'curl', 'AMBuilder'],
 		['extensions', 'geoip', 'AMBuilder'],
 		['extensions', 'mysql', 'AMBuilder'],
+		['extensions', 'sdkhooks', 'AMBuilder'],
 		['extensions', 'sdktools', 'AMBuilder'],
 		['extensions', 'topmenus', 'AMBuilder'],
 		['extensions', 'updater', 'AMBuilder'],
@@ -303,9 +487,13 @@ FileList = [
 		['sourcepawn', 'jit', 'AMBuilder'],
 		['sourcepawn', 'compiler', 'AMBuilder'],
 		['plugins', 'AMBuilder'],
-		['tools', 'buildbot', 'PackageScript']
+		['tools', 'buildbot', 'PackageScript'],
+		['tools', 'buildbot', 'BreakpadSymbols']
 	]
 
+if not sm.hasMySql:
+	FileList.remove(['extensions', 'mysql', 'AMBuilder'])
+
 for parts in FileList:
 	AMBuild.Include(os.path.join(*parts), globals)
 

NOTICE.txt

@@ -3,4 +3,3 @@ CONFIGURE YOUR IDENTITY FOR MERCURIAL!
 IF YOU ARE A DEVELOPER WITH PUSH ACCESS, DO IT NOW KPLZTHX.
 
 http://wiki.alliedmods.net/Mercurial_Tutorial#Identity
-

changelog.txt

@@ -1,5 +1,516 @@
 SourceMod Changelog
 
+SourceMod 1.5.2 [2013-10-29]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.5.2_Release_Notes
+
+User Changes:
+ - Updated gamedata support for TF2, CS:S, CS:GO, and HL2:DM.
+ - Fixed crash from regression in SDKTools SetClientListening hook refcounting (bug 5956) (KyleS).
+ - Fixed potential crash when having maps with format characters in name.
+ - Fixed some nextmap issues with long map names.
+ - SDKTools no longer requires gamedata for sm_dump_datamaps on TF2, CS:S, HL2:DM, and DoD:S (bug 5968). 
+
+Developer Changes:
+ - Updated TFCond and TF custom dmg enums.
+ - Updated TF2 critical hit detection logic in TF2_OnCalcIsAttackCritical to handle more cases, including when criticals are disabled (bug 5894).
+ - Fixed GetEngineVersion native returning a bad value when running on MM:S 1.9.x or earlier (bug 5697). 
+
+----------------------------------------------------------
+SourceMod 1.5.1 [2013-09-10]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.5.1_Release_Notes
+
+User Changes:
+ - Updated gamedata support for TF2.
+ - Added missing DispatchKeyValue gamedata for HL2 CTF (bug 5114) (peace-maker).
+ - Fixed translations not being loaded if identifier was not two or three characters (fixes Portuguese) (bug 5888).
+ - Fixed runoff voting occurring when receiving the exact number of required votes (bug 5890).
+ - Fixed reserve slot plugin hiding too many slots on Orangebox gamesif SourceTV and/or Replay are present (bug 5499).
+ - Fixed some crashes in TF2 and unexpected behavior in all games with SDKHook_TakeDamage due to uninitialized var.
+ - Fixed attempted triggers from gagged users displaying in chat (bug 5918).
+ - Fixed errors in Italian translation (Oktober).
+ - Added Norwegian translation (checkster).
+
+Developer Changes:
+ - Added CS_UpdateClientModel native to CStrike extension for CS:S and CS:GO (bug 5905) (Drifter).
+ - Fixed setting weapon param in SDKHook_TakeDamage overwriting attacker instead of setting weapon (bug 5911) (KyleS)
+
+----------------------------------------------------------
+SourceMod 1.5.0 [2013-08-25]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.5.0_Release_Notes
+
+User Changes:
+
+ - Added support for Counter-Strike: Global Offensive (bug 5299, bug 5579).
+ - Split CS:S, TF2, DoD:S, HL2:DM, and ND to separate binaries (bug 5370, bug 5813).
+ - Added support for runoff voting in mapchooser (bug 4218).
+ - Added option to require Steam validation before granting admin access (bug 4837) (VoiDeD).
+ - Added localization support for many more core and base plugin messages (bug 5120, bug 5146).
+ - Added the ability to override RegConsoleCommand-created commands (bug 5199).
+ - Added support for "fuzzy" (partial) map names in map-related natives and cmds for L4D and later (bug 5599).
+ - Updated Reserved Slots to use max humans as max count (bug 5444).
+ - Added support for custom maxitems on radio menus (bug 5371).
+ - Improved console config editing (bug 5470).
+ - Increased map name buffer sizes in mapchooser to better account for nested maps (bug 5609) (Peace-Maker).
+ - Fixed JIT conflicts with SELinux (bug 5581).
+ - Added logged error when PlayerRunCommand offset lookup fails (bug 5535) (GoD-Tony).
+ - Fixed double print when sending psay to self (bug 5649) (Peace-Maker).
+ - Fixed check against uninitialized string in extension loader (bug 5546) (KyleS).
+ - Fixed possible runtime errors in basetriggers for not-ingame clients (bug 5191) (Peace-Maker).
+ - Check all possible mapcycle paths on newer orangebox games (bug 5719).
+ - Fixed ReadMapList not seeing maps in all valve search paths (bug 5715) (VoiDeD).
+ - Fixed typo in too-many-params native error message (Peace-Maker).
+ - Fixed various issues in clientprefs (bug 5538) (KyleS).
+ - Removed debug printout from PerformGravity (bug 5679) (KyleS).
+ - Fixed broken translating in some plugins and natives (bug 5612) (KyleS).
+ - Fixed issues with COMMAND_FILTER_NO_BOTS and @bots multi-target.
+ - Fixed crash in SDKHooks when throwing bad ent type error on logical ent (KyleS).
+
+Developer Changes:
+
+ - Added support for CS:GO to the CStrike extension (bug 5299) (Drifter).
+ - Added support for new protobuf usermessages used in newer games (bug 5579, bug 5588, bug 5590, bug 5633).
+ - Added latest SDKHooks version as first-party extension.
+ - Updated SQLite to version 3.7.15.1 (bug 5235).
+ - Added natives for changing team score and mvp stars on CSS/CSGO (bug 5295) (Drifter).
+ - Added global pre and post forwards for client chat (bug 5394) (KyleS).
+ - Added TF2_CanPlayerTeleport forward to the TF2 game extension (bug 5283) (VoiDeD).
+ - Added GetEntityAddress native (bug 5269) (ProdigySim).
+ - Added more parameters to PlayerRunCommand forward (bug 5346) (GoD-Tony).
+ - Added forwards to basecomm plugin (bug 5466) (Drifter).
+ - Added symbol lookup support to gamedata on Windows (bug 5511) (GoD-Tony).
+ - Exposed GetLanguageInfo in ITranslator interface (bug 5249) (VoiDeD).
+ - Increase maximum .sp line length to 4095 characters. (bug 5347) (theY4Kman).
+ - Improved netprop dump output (bug 5471).
+ - Added int64 typename to netprop dumps (bug 5655).
+ - Added GetMaxHumanPlayers native exposing IServerGameClients func (bug 5551).
+ - Added WeaponIDToAlias native to CStrike extension (bug 5460) (KyleS).
+ - Fixed OnLibraryAdded/Removed not being called in all plugins (bug 5431).
+ - Made thread worker processing limits configurable at runtime (bug 5326).
+ - Added support in TF2 ext for detection of player conds >= 64 (bug 5565).
+ - Updated button defines in entity_prop_stocks (bug 5564).
+ - Added GetPlayerResourceEntity to SDKTools to replace old, semi-broken TF2-only version (bug 5491).
+ - Exposed third parameter of TF2's AddCond in TF2_AddCondition (bug 5641) (FlaminSarge).
+ - Added GetSteamAccountID function to IPlayerHelpers and native for sp (bug 5548) (KyleS).
+ - Added ISDKHooks interface with entity listeners (bug 5602) (GoD-Tony).
+ - Added file upload support to webternet extension.
+ - Added more alternative names for TFClass_Heavy (bug 5338) (Afronanny).
+ - Throw error instead of crash when calling SetTeamScore between maps (bug 5718) (KyleS).
+ - Fixed clients not being marked as in kick queue in some cases (bug 5746) (SystematicMania).
+ - Made compile.sh set working dir to own dir (bug 5710) (KyleS).
+ - Added CS_IsValidWeaponID native and validity checks to other natives (bug 5566) (Drifter).
+ - Numerous code documentation fixups (bug 5720) (Tsunami).
+ - Fixed cmd listener callback return behavior to match func doc (bug 5882).
+
+Internal Changes:
+
+ - Fixed handle misuse in clientprefs plugin (bug 5805) (KyleS).
+ - Removed call to getchar() in debug build of compiler (bug 5626) (KyleS).
+ - Fixed instability issues with cloned handles (bug 5245, bug 5240) (KyleS).
+ - Changed extension unload order to avoid exposing finalization window (bug 5556) (KyleS).
+ - Call OnPluginEnd before finalizer hooks have run (bug 4519).
+ - Fixed potential for reading out of library bounds in MemoryUtils::FindPattern.
+ - Fixed typo in TF2 ext asm.c causing accidental assignment instead of compare.
+ - Overhauled versioning information (bug 5453).
+ - Changed from RemoveEdict to using the Kill input for TF2_RemoveWeapon.
+ - Fixed accidental assignment in each of SDKTools and sp compiler (bug 5745) (KyleS).
+ - Fixed potential deadlock in HandleSystem::TryAndFreeSomeHandles (bug 5665) (KyleS).
+
+----------------------------------------------------------
+SourceMod 1.4.7 [2013-02-06]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.4.7_Release_Notes
+
+User Changes: 
+
+ - Updated support for latest Source 2009 engine changes (CS:S, DoD:S, TF2, HL2DM). 
+ - Updated gamedata for Left 4 Dead 2, Nuclear Dawn, No More Room in Hell, Zombie Panic Source, CSPromod, GoldenEye Source, Synergy, The Hidden, and PVKII. 
+ - Added system to block malware or illegal plugins (bug 5289). 
+ - Fixed a potential crash when a bad entity index is passed to certain functions (bug 5539) (KyleS). 
+ - Added an error message for when auto plugin configs fail to be created due to write error (bug 5465) (Drifter). 
+ - Fixed an issue where a malformed plugin could cause crashes (bug 5478). 
+
+Developer Changes: 
+
+ - Added new values to the TFCond TF2 conditions enum (bug 5537) (FlaminSarge). 
+ - Updated TFHoliday TF2 holidays enum (bug 5526) (Powerlord). 
+ - Fixed regression in SourceMod 1.3.0 causing GetEntPropEnt, GetEntDataEnt2, and GameRules_GetPropEnt to possibly return stale (incorrect) entity indexes in place of -1. 
+ - Added support for < 32-bit unsigned sign extension to GameRules_GetProp lookup (already in GetEntProp since SM 1.4.0). 
+ - Fixed < 32-bit unsigned sign extension in GetEntProp not being applied for array prop elements (bug 5591). 
+ - Fixed value size auto-detection in GetEntProp and GameRules_GetProp for ep2v's new SPROP_VARINT sendprops. 
+ - Fixed Sort_Random sort type not including first value in array sorting functions (bug 4292) (Peace-Maker). 
+ - Fixed GameRules_SetPropVector writing data to unexpected addresses instead of to the gamerules proxy entity (bug 5592) (ProdigySim). 
+ - Fixed VoteMenuToAll stock adding bots to list (bug 5253 (VoiDeD).
+
+----------------------------------------------------------
+SourceMod 1.4.6 [2012-09-04]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.4.6_Release_Notes
+
+User Changes:
+
+ - Fixed extraneous errors resulting from a bug in 1.4.5.
+
+----------------------------------------------------------
+
+SourceMod 1.4.5 [2012-09-03]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.4.5_Release_Notes
+
+User Changes:
+
+ - Updated support for latest Source 2009 engine changes (CS:S, DoD:S, TF2, HL2DM, GMod). 
+ - Updated Nuclear Dawn, Dino D-Day, and Zombie Panic gamedata. 
+ - Added compatibility for running on Metamod:Source 1.9.0.
+ - Fixed very minor memory leaks in CStrike extension (bug 5456) (KyleS).
+ - Fixed crash from plugins accessing netprops too early (bug 5297) (KyleS).
+ - Fixed crash from plugins trying to access nested datadesc members (bug 5446).
+
+Developer Changes:
+
+ - Added new TF2 weapon and custom dmg defines. 
+ - Added new TF2 TFHoliday value (bug 5436) (Powerlord). 
+ - Fixed IClientListener::InterceptClientConnect not being able to properly block connections (bug 5461) (PimpinJuice).
+ - Fixed PrepSDKCall_SetSignature native not working with symbol names on L4D2 linux (bug 5440).
+ - Fixed resolution of GetProfilerTime native on non-Windows platforms.
+
+-----------------------------
+
+SourceMod 1.4.4 [2012-07-03]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.4.4_Release_Notes
+
+User Changes:
+
+ - Updated support for latest Source 2009 engine changes (CS:S, DoD:S, TF2, HL2DM, GMod). 
+ - Updated Nuclear Dawn gamedata. 
+ - Fixed a crash that could occur when selecting an option on a clientprefs prefab menu (bug 5374).
+
+Developer Changes:
+
+ - Added new TF2 weapon and custom dmg defines. 
+ - Added new TF2 TFHoliday value (bug 5364) (Powerlord). 
+ - Updated sample extension to properly fill ninvoke with INativeInvoker ptr (bug 5340) (Afronanny).
+
+-----------------------------
+
+SourceMod 1.4.3 [2012-06-09]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.4.3_Release_Notes
+
+User Changes:
+
+ - Updated support for latest OrangeBox engine changes (CS:S, DoD:S, TF2, HL2DM, GMod).
+ - Made clientprefs attempt to reconnect to the database on map change (bug 4745). 
+ - Log functions now respect sv_logecho (bug 5135). 
+ - Fixed client console vote output (bug 5290, bug 5205) (FlaminSarge). 
+ - Fixed error when reloading dependant plugins using aliased natives (bug 5302). 
+ - Fixed intermittent crash when looking for an invalid signature (bug 5301). 
+ - Fixed possible crash when reloading a plugin with an invalid binary (bug 5288). 
+ - Exposed extensions list to clients (bug 5221) (VoiDeD). 
+ - Fixed intermittent crashes in clientprefs (bug 4660). 
+ - Fixed crash when passing an invalid entity reference to ReferenceToEntity (bug 5330). 
+ - Fixed cstrike extension crash on shutdown (bug 5328). 
+ - Lowered threading API think time to 20ms, making threaded MySQL queries complete faster (bug 4733).
+
+Developer Changes:
+
+ - Fixed client serials not being unique on Windows (bug 5285). 
+ - Fixed broken SourceTV detection on L4D1 (bug 5216). 
+ - Fixed Float negation operator (bug 5292). 
+ - Updated TF2 condition defines (bug 5259) (FlaminSarge). 
+ - Adding missing SetMenuNoVoteButton native declaration (bug 4522) (GoD-Tony). 
+ - Fixed erroneous const-qualification of name param of GetAdminUsername (bug 5267). 
+ - Added GetGameTickCount native (bug 5209) (GoD-Tony).
+ 
+-----------------------------
+
+SourceMod 1.4.2 [2011-04-13]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.4.2_Release_Notes
+
+User Changes:
+ - Updated support for latest OrangeBox engine changes (CS:S, DoD:S, TF2, HL2DM, GMod). 
+ - Fixed regression in SourceMod 1.4.0 causing SM to cause load errors on The Ship (bug 5216).
+ - Fixed toggling and player lag issues with sm_drug command (bugs 5217, 5218) (FlaminSarge).
+
+Developer Changes:
+ - Updated TF2-specific defines and enums (bug 5194).
+ - Fixed StoreToAddress always writing 32 bits and throwing an error (bug 5248) (ProdigySim).
+ - Fixed crash with StoreToAddress if memory wasn't writable (bug 5252) (Dr!fter).
+ - Fixed return value of VoteMenuToAll (bug 5254) (VoiDeD).
+ - Fixed bug in command lower-casing API guarantee
+
+-----------------------------
+
+SourceMod 1.4.1 [2011-12-07]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.4.1_Release_Notes
+
+User Changes:
+
+ - Updated support for latest OrangeBox engine changes (CS:S, DoD:S, TF2, HL2DM, GMod). 
+ - Added gamedata for Adrenaline Gamer 2 and No More Room in Hell. 
+ - Fixed "not connected" error in reserve slots plugin (bug 5158) (ostrel). 
+ - Fixed ff trigger output printing to all in triggerer's language (rather than viewer's language) (bug 5161). 
+ - Fixed typo in one of basebans ban reasons (bug 5188).
+ - Fixed formatting error in Swedish "Vote Count" phrase (bug 5174).
+
+Developer Changes:
+
+ - Fixed sp MaxClients not being updated on map changes after load (bug 5160). 
+ - Removed GLIBC_2.7 dependency from spcomp. 
+ - Increased buffer for sm_rcon command to fit larger responses (bug 5169). 
+ - BaseComm now properly registers a library allowing it to be required by other plugins (bug 5156). 
+ - Fixed TFHoliday enum values (bug 5155). 
+ - Updated TF2_OnIsHolidayActive ret behavior to match doc (bug 5155). 
+ - Added new TF2 deathflag and dmg custom defines (bug 5157).
+
+-----------------------------
+
+SourceMod 1.4.0 [2011-10-28]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.4.0_Release_Notes
+
+User Changes:
+
+ - Added support for Max OS X (bug 4392). 
+ - Added support for Bloody Good Time (bug 4780). 
+ - Added support for E.Y.E Divine Cybermancy (bug 5035). 
+ - Added gamedata for Nuclear Dawn. 
+ - Added gamedata for International Online Soccer: Source (bug 5019). 
+ - Added gamedata for Half-Life 2 Capture the Flag (bug 5114). 
+ - Updated mapchooser and other base plugins with Nuclear Dawn specific fixes (bug 5117). 
+ - Fixed ServerLang value not being read properly on startup (bug 4675). 
+ - Added support for aliases in languages.cfg (bug 4858). 
+ - Added output display to sm_rcon command (bug 5018). 
+ - Flood protection bypass access can now be overridden with command name sm_flood_access (bug 4584). 
+ - Added a reset argument to sm cvars command to revset cvar values to default (bug 5043). 
+ - Fixed incorrect language identifiers for Chinese (both Trad. and Simplified) and Brazilian Portuguese not matching cl_language values (bug 5067). 
+ - Added translation support for Bulgarian (bg). 
+ - Fixed incorrect number of slots being hidden for reserve with sm_hideslots on Source 2009 with SourceTV or replay (bug 5094). 
+ - sm_hideslots changes now take effect immediately instead of waiting until a client joins or leaves (bug 5094). 
+ - Fixed sv_visiblemaxplayers getting stuck at previous max clients in some cases with reserves and SourceTV or replay (bug 5094). 
+ - Removed error logging if an optional extension is not found (bug 5112). 
+ - Fixed bots with semicolon in name being unkickable (bug 5120). 
+ - Changed strings in ice-related funcommands to be translatable (bug 4540). 
+ - Changed Bintools extension to use a single build for every engine (bug 4548). 
+
+Developer Changes:
+ - Provided native interface for basecomm (bug 2594). 
+ - Client language detection is too late. (bug 3714) (Tony A. "GoD-Tony"). 
+ - Added ServerCommandEx native to execute server command and retrieve output (bug 3873). 
+ - Added ability to update clientprefs cookies values on clients not currently connected (bug 3882) (databomb). 
+ - Added library "matchmaking_ds" support to gamedata lookups (bug 4158). 
+ - Rooted menu handles to callbacks (bug 4353). 
+ - Fixed corner cases with ExplodeString (bug 4629). (Michael "LumiStance"). 
+ - Fixed return omission with else-after-return (bug 4852). 
+ - Added OnConditionAdded and OnConditionRemoved forwards to TF2 extension (bug 4851). 
+ - Added new natives and forward to the cstrike extension (bug 4732, bug 4985) (Dr!fter). 
+ - Added WaitingForPlayers forwards to the TF2 extension (bug 4704) (CrimsonGT). 
+ - Updated and added more TF2 condition, weapon, and damagecustom defines (multiple bug#s). 
+ - Fixed TF2_RemoveCondition not always removing conditions (bug 4981). 
+ - Fixed MaxClients not being updated correctly in some places with SourceTV or replay active (bug 4986). 
+ - Fixed some vars not being marked for init on first compile pass (bug 4643). 
+ - Increased symbol name limit to 63 characters (bug 4564) (javalia). 
+ - Fixed crash when dynamic arrays run out of memory (bug 4632). 
+ - Fixed a crash that could happen from looking up out-of-bounds edict or entity indexes (bug 5080). 
+ - Fixed client serials not getting cleared on disconnect (bug 5121). 
+ - Added error on declaring arrays that the compiler is too buggy to handle (bug 4977). 
+ - Removed reliance on gamedata for multiple SDKTools functions in ep2 and later (bug 4899). 
+ - Added InvalidateClient and ReconnectClient natives to SDKTools (bug 4931) (Brian "Afronanny" Simon). 
+ - Added ability to lookup and set values on the gamerules class (bug 4983. 
+ - BaseComm now uses AddCommandListener for chat hooks (bug 4991). 
+ - Fixed shutdown bug in SDKTools (bug 5063). 
+ - Fixed MM-enabled extensions continuing to load after failing MM attach (bug 5042). 
+ - Added GetDistGainFromSoundLevel native to SDKTools (bug 5066) (javalia). 
+ - Added CheckAccess native to check an AdminId's command access (bug 5083). 
+ - Fixed GetEntProp not sign-extending unsigned values less than 32 bits (bug 5105). 
+ - Fixed crashing when calling CreateEntityByName or CreateFakeClient when no map is running (now errors) (bug 5119). 
+ - Fixed erring in kick function (e. bad translation) causing client to become unkickable until disconnect (bug 5120). 
+ - Fixed KickClientEx not immediately kicking client if client was in kick queue (bug 5120). 
+ - Added IsClientSourceTV and IsClientReplay natives (bug 5124). 
+ - Added support for getting and setting individual array elements with Get/Set EntProp functions (bug 4160). 
+ - Added support for threaded query handles to SQL_GetInsertId and SQL_GetAffectedRows (bug 4699) (Nephyrin). 
+ - Added a GetGameRules function to ISDKTools for extensions to easily get the GameRules class pointer (bug 4707). 
+ - Added GetMessageName to IUserMessages (bug 4573) (Zach "theY4Kman" Kanzler) 
+ - Added HintTextMsg to IGameHelpers (bug 4950). 
+ - Added ProcessTargetString simple filter API (bug 4404). 
+ - Moved much functionality from core bins to logic bin (bug 4406, bug 4402). 
+ - Fixed bogus asserts in sp compiler (bug 4486, bug 4487). 
+ - Greatly improved sp compiler performance (~5x overall speedup) (bug 3820, bug 4493, bug 4495). 
+ - Changed entity output detours to use CDetour (bug 4416). 
+ - Enhanced nominations API (bug 4677) (CrimsonGT). 
+ - Added Linux support for profiling natives (bug 4927). 
+ - Added a new ValveCallType that allows for arbitrary |this| parameters, as well as associated features in gamedata and for reading/writing memory (bug 3520) (Downtown1). 
+ - Updated TF2 extension to handle Valve's changes to the "holiday" system (bug 5150).
+
+-----------------------------
+
+SourceMod 1.3.8 [2011-06-23]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.3.8_Release_Notes
+
+User Changes:
+
+ - Updated support for latest OrangeBox engine changes (CS:S, DoD:S, TF2, HL2DM, GMod).
+ - Updated support for various games, including Garry's Mod, Zombie Panic, and Dino D-Day.
+ - Added gamedata for Eternal Silence.
+ - Fixed libgcc_s.so.1 load error present on some systems (bug 4876).
+ - Handle leak notices now print to error log (in addition fatal log) (bug 4929).
+ - Translator now properly falls back on bad server language (bug 4861).
+ - Fixed invalid client errors from bad MaxClients value when SourceTV is late-loaded (bug 4881).
+ - Fixed crash on plugin unload when two commands exist with same name, different casing (bug 4698). 
+
+Developer Changes:
+
+ - Updated TF2 condition defines (bug 4916).
+ - Fixed var names and docs for TF2_MakeBleed native (bug 4928).
+ - Removed compiler double include check (bug 4863).
+ - Fixed plugin compile errors when using GetEntityClassname (bug 4798). 
+
+---------------------------
+
+SourceMod 1.3.7 [2011-04-15]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.3.7_Release_Notes
+
+User Changes:
+
+ - Updated support for latest OrangeBox engine changes (CS:S, DoD:S, TF2, HL2DM, GMod).
+ - Updated support for various games, including Zombie Panic, CS ProMod, Empires, and GoldenEye: Source.
+ - Added gamedata for Dino D-Day.
+ - Fix precedence of voice mute flag versus specific client overrides (bug 4826).
+ - Fix mistaken unhooking of voice hooks (bug 4804).
+ - Fixed graphical glitches with funcommands effects in L4D1 (bug 3486).
+ - Fixed bug in nominations that could cause "Unknown command" error (bug 4797).
+ - Removed tv_enable hook to fix rare max client count issue (bug 4791).
+ - Added missing unhooking of ClientConnect in PlayerManager (bug 4749).
+ - Fixed sm_rtv printing "unknown command" (bug 4730).
+ - Fixed voting crash when client console, chat, and SourceTV are enabled (bug 4676).
+ - Fixed CDetour crash in TF2 extension when last plugin using forward is unloaded (bug 4713).
+
+Developer Changes:
+
+ - SetEntProp now marks edict state as changed (bug 4855).
+ - Added GetEntityClassname stock (bug 4798).
+ - Fix compiler hanging when #including a directory (bug 4822).
+ - Added GetEntityFlags and SetEntityFlags natives for better cross-engine compatibility. (bug 4809).
+ - Fixed ClientPrefs natives not being marked optional when REQUIRE_EXTENSIONS not defined (bug 4839).
+ - Changed some instances of LogMessage to LogAction (bug 4649).
+ - Added some new language natives (bug 4613).
+ - Fixed SetTeamScore not updating score on client (bug 2736).
+ - Raised MAXPLAYERS from 64 to 65 (bug 4490).
+ - Added and updated many TF2-specific defines in tf2.inc and tf2_stocks.inc.
+ - Fixed TF2_GetPlayerConditionFlags no longer necessarily returning all set flags (bug 4726).
+ - Fixed profiler flush not clearing, added 'report' and 'clear' (bug 4674).
+ - Fixed GetPlayerDecalFile crash on L4D and L4D2 (bug 4729).
+ - Fixed TF2_OnGetHoliday detour no longer firing under all circumstances (bug 4700).
+ - Added TF2_IsPlayerInDuel native to TF2 extension (bug 4695).
+
+----------------------------
+
+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 4681).
+
+Developer Changes:
+
+ - Updated TF2 custom kill defines (bug 4682).
+
+----------------------------
+
+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]

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

configs/core.cfg

@@ -107,4 +107,22 @@
 	 * Currently this will log details about the gamedata updating process.
 	 */
 	"DebugSpew"					"no"
+	
+	/**
+	 * If set to yes, SourceMod will validate steamid auth strings with the Steam backend before giving out admin access.
+	 * This can prevent malicious users from impersonating admins with stolen Steam apptickets.
+	 * If Steam is down, admins will not be authenticated until Steam comes back up.
+	 * This option increases the security of your server, but is still experimental.
+	 */
+	"SteamAuthstringValidation"	"no"
+	
+	/**
+	 * Enables or disables whether SourceMod blocks known or potentially malicious plugins from loading.
+	 * It is STRONGLY advised that this is left enabled, there have been cases in the past with plugins that
+	 * allow anyone to delete files on the server, gain full rcon control, etc.
+	 *
+	 * "yes"	- Block malware or illegal plugins from loading (default)
+	 * "no"		- Warn about malware or illegal plugins loading
+	 */
+	"BlockBadPlugins"	"yes"
 }

configs/databases.cfg

@@ -2,6 +2,8 @@
 {
 	"driver_default"		"mysql"
 	
+	// When specifying "host", you may use an IP address, a hostname, or a socket file path
+	
 	"default"
 	{
 		"driver"			"default"

configure.py

@@ -7,4 +7,9 @@ run.options.add_option('--enable-debug', action='store_const', const='1', dest='
                        help='Enable debugging symbols')
 run.options.add_option('--enable-optimize', action='store_const', const='1', dest='opt',
                        help='Enable optimization')
+run.options.add_option('--no-mysql', action='store_false', default=True, dest='hasMySql',
+                       help='Disable building MySQL extension')
+run.options.add_option('-s', '--sdks', default='all', dest='sdks',
+                       help='Build against specified SDKs; valid args are "all", "present", or '
+                            'comma-delimited list of engine names (default: %default)')
 run.Configure(sys.path[0])

core/AMBuilder

@@ -1,39 +1,68 @@
 # vim: set ts=2 sw=2 tw=99 noet ft=python: 
 import os
+from ambuild.command import SymlinkCommand
 
 for i in SM.sdkInfo:
 	sdk = SM.sdkInfo[i]
+	if AMBuild.target['platform'] not in sdk['platform']:
+		continue
+
 	name = 'sourcemod.' + sdk['ext']
 
 	compiler = SM.DefaultHL2Compiler('core', i)
 
+	if i == 'csgo':
+		# Protobuf 2.3 headers have some signed/unsigned compares. I believe that it's fixed in later versions, but Valve.
+		if isinstance(compiler.cxx, Cpp.CompatGCC):
+			compiler.AddToListVar('CFLAGS', '-Wno-sign-compare')
+		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache[sdk['sdk']], 'common', 'protobuf-2.3.0', 'src'))
+		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache[sdk['sdk']], 'public', 'engine', 'protobuf'))
+		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache[sdk['sdk']], 'public', 'game', 'shared', 'csgo', 'protobuf'))
+
 	extension = AMBuild.AddJob(name)
 	binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler)
 	SM.PreSetupHL2Job(extension, binary, i)
+
+	if i == 'csgo':
+		if AMBuild.target['platform'] == 'linux':
+			link = os.path.join(os.path.join(AMBuild.outputFolder, extension.workFolder), 'libprotobuf.a')
+			target = os.path.join(os.path.join(AMBuild.cache[sdk['sdk']], 'lib', 'linux32', 'release'), 'libprotobuf.a')
+			try:
+				os.lstat(link)
+			except:
+				extension.AddCommand(SymlinkCommand(link, target))
+		elif AMBuild.target['platform'] == 'darwin':
+			link = os.path.join(os.path.join(AMBuild.outputFolder, extension.workFolder), 'libprotobuf.a')
+			target = os.path.join(os.path.join(AMBuild.cache[sdk['sdk']], 'lib', 'osx32', 'release'), 'libprotobuf.a')
+			try:
+				os.lstat(link)
+			except:
+				extension.AddCommand(SymlinkCommand(link, target))
+		elif AMBuild.target['platform'] == 'windows':
+			libPath = os.path.join(AMBuild.cache[sdk['sdk']], 'lib', 'win32', 'release', 'vs2010', 'libprotobuf.lib')
+			binary.RebuildIfNewer(libPath)
+			binary['POSTLINKFLAGS'].append(libPath)
+
 	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',
@@ -41,28 +70,18 @@ for i in SM.sdkInfo:
 		'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',
@@ -78,13 +97,32 @@ for i in SM.sdkInfo:
 		'EventManager.cpp',
 		'MenuStyle_Radio.cpp',
 		'sm_autonatives.cpp',
-		'smn_datapacks.cpp',
-		'smn_lang.cpp',
 		'sm_srvcmds.cpp',
 		'ConsoleDetours.cpp'
 		]
+	
+	if i == 'csgo':
+		files.append('smn_protobuf.cpp')
+	else:
+		files.append('smn_bitbuffer.cpp')
+
 	binary.AddSourceFiles('core', files)
+
+	if i == 'csgo':
+		files = [
+			os.path.join('public', 'engine', 'protobuf', 'netmessages.pb.cc'),
+			os.path.join('public', 'game', 'shared', 'csgo', 'protobuf', 'cstrike15_usermessages.pb.cc'),
+			os.path.join('public', 'game', 'shared', 'csgo', 'protobuf', 'cstrike15_usermessage_helpers.cpp'),
+			]
+		binary.AddSourceFiles(AMBuild.cache[sdk['sdk']], files)
+
 	SM.PostSetupHL2Job(extension, binary, i)
+	
+	if i == 'csgo':
+		if AMBuild.target['platform'] in ['linux', 'darwin']:
+			binary.AddObjectFiles(['libprotobuf.a'])
+	
 	SM.AutoVersion('core', binary)
+	SM.ExtractDebugInfo(extension, binary)
 	binary.SendToJob()
 

core/AdminCache.cpp

@@ -1719,7 +1719,7 @@ bool AdminCache::CanAdminUseCommand(int client, const char *cmd)
 		}
 	}
 
-	return g_ConCmds.CheckCommandAccess(client, cmd, bits);
+	return g_ConCmds.CheckClientCommandAccess(client, cmd, bits);
 }
 
 unsigned int AdminCache::SetGroupImmunityLevel(GroupId gid, unsigned int level)
@@ -1794,7 +1794,7 @@ bool AdminCache::CheckAccess(int client, const char *cmd, FlagBits flags, bool o
 		GetCommandOverride(cmd, Override_Command, &bits);
 	}
 
-	return g_ConCmds.CheckCommandAccess(client, cmd, bits) ? 1 : 0;
+	return g_ConCmds.CheckClientCommandAccess(client, cmd, bits) ? 1 : 0;
 }
 
 void iterator_glob_basic_override(Trie *pTrie, const char *key, void **value, void *data)

core/ChatTriggers.cpp

@@ -34,8 +34,8 @@
 #include "sm_stringutil.h"
 #include "ConCmdManager.h"
 #include "PlayerManager.h"
-#include "Translator.h"
 #include "HalfLife2.h"
+#include "logic_bridge.h"
 
 /* :HACKHACK: We can't SH_DECL here because ConCmdManager.cpp does.
  * While the OB build only runs on MM:S 1.6.0+ (SH 5+), the older one 
@@ -59,13 +59,17 @@ ChatTriggers g_ChatTriggers;
 bool g_bSupressSilentFails = false;
 
 ChatTriggers::ChatTriggers() : m_pSayCmd(NULL), m_bWillProcessInPost(false), 
-	m_bTriggerWasSilent(false), m_ReplyTo(SM_REPLY_CONSOLE)
+	m_ReplyTo(SM_REPLY_CONSOLE)
 {
 	m_PubTrigger = sm_strdup("!");
 	m_PrivTrigger = sm_strdup("/");
 	m_PubTriggerSize = 1;
 	m_PrivTriggerSize = 1;
 	m_bIsChatTrigger = false;
+	m_bPluginIgnored = false;
+#if SOURCE_ENGINE == SE_EPISODEONE
+	m_bIsINS = false;
+#endif
 }
 
 ChatTriggers::~ChatTriggers()
@@ -109,11 +113,13 @@ void ChatTriggers::OnSourceModAllInitialized()
 {
 	m_pShouldFloodBlock = g_Forwards.CreateForward("OnClientFloodCheck", ET_Event, 1, NULL, Param_Cell);
 	m_pDidFloodBlock = g_Forwards.CreateForward("OnClientFloodResult", ET_Event, 2, NULL, Param_Cell, Param_Cell);
+	m_pOnClientSayCmd = g_Forwards.CreateForward("OnClientSayCommand", ET_Event, 3, NULL, Param_Cell, Param_String, Param_String);
+	m_pOnClientSayCmd_Post = g_Forwards.CreateForward("OnClientSayCommand_Post", ET_Ignore, 3, NULL, Param_Cell, Param_String, Param_String);
 }
 
 void ChatTriggers::OnSourceModAllInitialized_Post()
 {
-	g_pCorePhrases->AddPhraseFile("antiflood.phrases");
+	logicore.AddCorePhraseFile("antiflood.phrases");
 }
 
 void ChatTriggers::OnSourceModGameInitialized()
@@ -131,23 +137,62 @@ void ChatTriggers::OnSourceModGameInitialized()
 		SH_ADD_HOOK_MEMFUNC(ConCommand, Dispatch, m_pSayTeamCmd, this, &ChatTriggers::OnSayCommand_Pre, false);
 		SH_ADD_HOOK_MEMFUNC(ConCommand, Dispatch, m_pSayTeamCmd, this, &ChatTriggers::OnSayCommand_Post, true);
 	}
+
+#if SOURCE_ENGINE == SE_EPISODEONE
+	m_bIsINS = (strcmp(g_SourceMod.GetGameFolderName(), "insurgency") == 0);
+
+	if (m_bIsINS)
+	{
+		m_pSay2Cmd = FindCommand("say2");
+		if (m_pSay2Cmd)
+		{
+			SH_ADD_HOOK(ConCommand, Dispatch, m_pSay2Cmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Pre), false);
+			SH_ADD_HOOK(ConCommand, Dispatch, m_pSay2Cmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Post), true);
+		}
+	}
+#elif SOURCE_ENGINE == SE_NUCLEARDAWN
+	m_pSaySquadCmd = FindCommand("say_squad");
+
+	if (m_pSaySquadCmd)
+	{
+		SH_ADD_HOOK(ConCommand, Dispatch, m_pSaySquadCmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Pre), false);
+		SH_ADD_HOOK(ConCommand, Dispatch, m_pSaySquadCmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Post), true);
+	}
+#endif
 }
 
 void ChatTriggers::OnSourceModShutdown()
 {
-	if (m_pSayTeamCmd)
-	{
-		SH_REMOVE_HOOK_MEMFUNC(ConCommand, Dispatch, m_pSayTeamCmd, this, &ChatTriggers::OnSayCommand_Post, true);
-		SH_REMOVE_HOOK_MEMFUNC(ConCommand, Dispatch, m_pSayTeamCmd, this, &ChatTriggers::OnSayCommand_Pre, false);
-	}
 	if (m_pSayCmd)
 	{
 		SH_REMOVE_HOOK_MEMFUNC(ConCommand, Dispatch, m_pSayCmd, this, &ChatTriggers::OnSayCommand_Post, true);
 		SH_REMOVE_HOOK_MEMFUNC(ConCommand, Dispatch, m_pSayCmd, this, &ChatTriggers::OnSayCommand_Pre, false);
 	}
 
+	if (m_pSayTeamCmd)
+	{
+		SH_REMOVE_HOOK(ConCommand, Dispatch, m_pSayTeamCmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Post), true);
+		SH_REMOVE_HOOK(ConCommand, Dispatch, m_pSayTeamCmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Pre), false);
+	}
+
+#if SOURCE_ENGINE == SE_EPISODEONE
+	if (m_bIsINS && m_pSay2Cmd)
+	{
+		SH_REMOVE_HOOK(ConCommand, Dispatch, m_pSay2Cmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Pre), false);
+		SH_REMOVE_HOOK(ConCommand, Dispatch, m_pSay2Cmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Post), true);
+	}
+#elif SOURCE_ENGINE == SE_NUCLEARDAWN
+	if (m_pSaySquadCmd)
+	{
+		SH_REMOVE_HOOK(ConCommand, Dispatch, m_pSaySquadCmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Pre), false);
+		SH_REMOVE_HOOK(ConCommand, Dispatch, m_pSaySquadCmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Post), true);
+	}
+#endif
+
 	g_Forwards.ReleaseForward(m_pShouldFloodBlock);
 	g_Forwards.ReleaseForward(m_pDidFloodBlock);
+	g_Forwards.ReleaseForward(m_pOnClientSayCmd);
+	g_Forwards.ReleaseForward(m_pOnClientSayCmd_Post);
 }
 
 #if SOURCE_ENGINE >= SE_ORANGEBOX
@@ -158,24 +203,10 @@ void ChatTriggers::OnSayCommand_Pre()
 {
 	CCommand command;
 #endif
-	int client;
-	CPlayer *pPlayer;
-	
-	client = g_ConCmds.GetCommandClient();
+	int client = g_ConCmds.GetCommandClient();
 	m_bIsChatTrigger = false;
 	m_bWasFloodedMessage = false;
-
-	/* The server console cannot do this */
-	if (client == 0 || (pPlayer = g_Players.GetPlayerByIndex(client)) == NULL)
-	{
-		RETURN_META(MRES_IGNORED);
-	}
-
-	/* We guarantee the client is connected */
-	if (!pPlayer->IsConnected())
-	{
-		RETURN_META(MRES_IGNORED);
-	}
+	m_bPluginIgnored = false;
 
 	const char *args = command.ArgS();
 	
@@ -184,22 +215,38 @@ void ChatTriggers::OnSayCommand_Pre()
 		RETURN_META(MRES_IGNORED);
 	}
 
+	/* Save these off for post hook as the command data returned from the engine in older engine versions 
+	 * can be NULL, despite the data still being there and valid. */
+	m_Arg0Backup = command.Arg(0);
+	m_ArgSBackup = command.ArgS();
+
+	/* The server console cannot do this */
+	if (client == 0)
+	{
+		cell_t res = CallOnClientSayCommand(client);
+		if (res >= Pl_Handled)
+		{
+			m_bPluginIgnored = (res >= Pl_Stop);
+			RETURN_META(MRES_SUPERCEDE);
+		}
+		RETURN_META(MRES_IGNORED);
+	}
+
+	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
+
+	/* We guarantee the client is connected */
+	if (!pPlayer || !pPlayer->IsConnected())
+	{
+		RETURN_META(MRES_IGNORED);
+	}
+
 	/* Check if we need to block this message from being sent */
 	if (ClientIsFlooding(client))
 	{
 		char buffer[128];
 
-		if (!CoreTranslate(
-			buffer,
-			sizeof(buffer),
-			"%T",
-			2,
-			NULL,
-			"Flooding the server",
-			&client))
-		{
+		if (!logicore.CoreTranslate(buffer, sizeof(buffer), "%T", 2, NULL, "Flooding the server", &client))
 			UTIL_Format(buffer, sizeof(buffer), "You are flooding the server!");
-		}
 
 		/* :TODO: we should probably kick people who spam too much. */
 
@@ -220,6 +267,13 @@ void ChatTriggers::OnSayCommand_Pre()
 		is_quoted = true;
 	}
 
+#if SOURCE_ENGINE == SE_EPISODEONE
+	if (m_bIsINS && strcmp(m_Arg0Backup, "say2") == 0 && strlen(args) >= 4)
+	{
+		args += 4;
+	}
+#endif
+
 	bool is_trigger = false;
 	bool is_silent = false;
 
@@ -236,38 +290,28 @@ void ChatTriggers::OnSayCommand_Pre()
 		args = &args[m_PrivTriggerSize];
 	}
 
-	if (!is_trigger)
-	{
-		RETURN_META(MRES_IGNORED);
-	}
-
 	/**
 	 * Test if this is actually a command!
 	 */
-	if (!PreProcessTrigger(PEntityOfEntIndex(client), args, is_quoted))
+	if (is_trigger && PreProcessTrigger(PEntityOfEntIndex(client), args, is_quoted))
 	{
-		CPlayer *pPlayer;
-		if (is_silent 
-			&& g_bSupressSilentFails 
-			&& client != 0
-			&& (pPlayer = g_Players.GetPlayerByIndex(client)) != NULL
-			&& pPlayer->GetAdminId() != INVALID_ADMIN_ID)
-		{
-			RETURN_META(MRES_SUPERCEDE);
-		}
-		RETURN_META(MRES_IGNORED);
+		m_bIsChatTrigger = true;
+
+		/**
+		 * We'll execute it in post.
+		 */
+		m_bWillProcessInPost = true;
 	}
 
-	m_bIsChatTrigger = true;
+	cell_t res = CallOnClientSayCommand(client);
 
-	/**
-	 * We'll execute it in post.
-	 */
-	m_bWillProcessInPost = true;
-	m_bTriggerWasSilent = is_silent;
+	if (res >= Pl_Handled)
+	{
+		m_bPluginIgnored = (res >= Pl_Stop);
+		RETURN_META(MRES_SUPERCEDE);
+	}
 
-	/* If we're silent, block */
-	if (is_silent)
+	if (is_silent && (m_bIsChatTrigger || (g_bSupressSilentFails && pPlayer->GetAdminId() != INVALID_ADMIN_ID)))
 	{
 		RETURN_META(MRES_SUPERCEDE);
 	}
@@ -282,19 +326,33 @@ void ChatTriggers::OnSayCommand_Post(const CCommand &command)
 void ChatTriggers::OnSayCommand_Post()
 #endif
 {
-	m_bIsChatTrigger = false;
-	m_bWasFloodedMessage = false;
+	int client = g_ConCmds.GetCommandClient();
+
 	if (m_bWillProcessInPost)
 	{
 		/* Reset this for re-entrancy */
 		m_bWillProcessInPost = false;
 		
 		/* Execute the cached command */
-		int client = g_ConCmds.GetCommandClient();
 		unsigned int old = SetReplyTo(SM_REPLY_CHAT);
 		serverpluginhelpers->ClientCommand(PEntityOfEntIndex(client), m_ToExecute);
 		SetReplyTo(old);
 	}
+
+	if (m_bPluginIgnored)
+	{
+		m_bPluginIgnored = false;
+	}
+	else if (!m_bWasFloodedMessage && !m_bIsChatTrigger && m_pOnClientSayCmd_Post->GetFunctionCount() != 0)
+	{	
+		m_pOnClientSayCmd_Post->PushCell(client);
+		m_pOnClientSayCmd_Post->PushString(m_Arg0Backup);
+		m_pOnClientSayCmd_Post->PushString(m_ArgSBackup);
+		m_pOnClientSayCmd_Post->Execute(NULL);
+	}
+
+	m_bIsChatTrigger = false;
+	m_bWasFloodedMessage = false;
 }
 
 bool ChatTriggers::PreProcessTrigger(edict_t *pEdict, const char *args, bool is_quoted)
@@ -371,6 +429,19 @@ bool ChatTriggers::PreProcessTrigger(edict_t *pEdict, const char *args, bool is_
 	return true;
 }
 
+cell_t ChatTriggers::CallOnClientSayCommand(int client)
+{
+	cell_t res = Pl_Continue;
+	if (!m_bIsChatTrigger && m_pOnClientSayCmd->GetFunctionCount() != 0)
+	{
+		m_pOnClientSayCmd->PushCell(client);
+		m_pOnClientSayCmd->PushString(m_Arg0Backup);
+		m_pOnClientSayCmd->PushString(m_ArgSBackup);
+		m_pOnClientSayCmd->Execute(&res);
+	}
+	return res;
+}
+
 unsigned int ChatTriggers::SetReplyTo(unsigned int reply)
 {
 	unsigned int old = m_ReplyTo;

core/ChatTriggers.h

@@ -69,21 +69,34 @@ public:
 private:
 	bool PreProcessTrigger(edict_t *pEdict, const char *args, bool is_quoted);
 	bool ClientIsFlooding(int client);
+	cell_t CallOnClientSayCommand(int client);
 private:
 	ConCommand *m_pSayCmd;
 	ConCommand *m_pSayTeamCmd;
+#if SOURCE_ENGINE == SE_EPISODEONE
+	ConCommand *m_pSay2Cmd;
+#elif SOURCE_ENGINE == SE_NUCLEARDAWN
+	ConCommand *m_pSaySquadCmd;
+#endif
 	char *m_PubTrigger;
 	size_t m_PubTriggerSize;
 	char *m_PrivTrigger;
 	size_t m_PrivTriggerSize;
 	bool m_bWillProcessInPost;
-	bool m_bTriggerWasSilent;
 	bool m_bIsChatTrigger;
 	bool m_bWasFloodedMessage;
+	bool m_bPluginIgnored;
 	unsigned int m_ReplyTo;
 	char m_ToExecute[300];
+	const char *m_Arg0Backup;
+	const char *m_ArgSBackup;
 	IForward *m_pShouldFloodBlock;
 	IForward *m_pDidFloodBlock;
+	IForward *m_pOnClientSayCmd;
+	IForward *m_pOnClientSayCmd_Post;
+#if SOURCE_ENGINE == SE_EPISODEONE
+	bool m_bIsINS;
+#endif
 };
 
 extern ChatTriggers g_ChatTriggers;

core/ConCmdManager.cpp

@@ -34,9 +34,9 @@
 #include "AdminCache.h"
 #include "sm_stringutil.h"
 #include "PlayerManager.h"
-#include "Translator.h"
 #include "HalfLife2.h"
 #include "ChatTriggers.h"
+#include "logic_bridge.h"
 
 ConCmdManager g_ConCmds;
 
@@ -226,30 +226,38 @@ void ConCmdManager::SetCommandClient(int client)
 	m_CmdClient = client + 1;
 }
 
+ConCmdInfo *ConCmdManager::FindInTrie(const char *name)
+{
+	ConCmdInfo *pInfo;
+	if (!sm_trie_retrieve(m_pCmds, name, (void **)&pInfo))
+		return NULL;
+	return pInfo;
+}
+
+ConCmdList::iterator ConCmdManager::FindInList(const char *cmd)
+{
+	List<ConCmdInfo *>::iterator iter = m_CmdList.begin();
+
+	while (iter != m_CmdList.end())
+	{
+		if (strcasecmp((*iter)->pCmd->GetName(), cmd) == 0)
+			break;
+		iter++;
+	}
+
+	return iter;
+}
+
 ResultType ConCmdManager::DispatchClientCommand(int client, const char *cmd, int args, ResultType type)
 {
 	ConCmdInfo *pInfo;
 
-	if (!sm_trie_retrieve(m_pCmds, cmd, (void **)&pInfo))
+	if ((pInfo = FindInTrie(cmd)) == NULL)
 	{
-		List<ConCmdInfo *>::iterator iter;
-
-		pInfo = NULL;
-		iter = m_CmdList.begin();
-		while (iter != m_CmdList.end())
-		{
-			if (strcasecmp((*iter)->pCmd->GetName(), cmd) == 0)
-			{
-				pInfo = (*iter);
-				break;
-			}
-			iter++;
-		}
-
-		if (pInfo == NULL)
-		{
+		ConCmdList::iterator item = FindInList(cmd);
+		if (item == m_CmdList.end())
 			return type;
-		}
+		pInfo = *item;
 	}
 
 	cell_t result = type;
@@ -314,35 +322,20 @@ void ConCmdManager::InternalDispatch(const CCommand &command)
 	 */
 	const char *cmd = g_HL2.CurrentCommandName();
 
-	ConCmdInfo *pInfo;
-	if (!sm_trie_retrieve(m_pCmds, cmd, (void **)&pInfo))
+	ConCmdInfo *pInfo = FindInTrie(cmd);
+	if (pInfo == NULL)
 	{
         /* Unfortunately, we now have to do a slow lookup because Valve made client commands 
          * case-insensitive.  We can't even use our sortedness.
          */
         if (client == 0 && !engine->IsDedicatedServer())
-        {
             return;
-        }
 
-        List<ConCmdInfo *>::iterator iter;
+		ConCmdList::iterator item = FindInList(cmd);
+		if (item == m_CmdList.end())
+			return;
 
-        pInfo = NULL;
-        iter = m_CmdList.begin();
-        while (iter != m_CmdList.end())
-        {
-            if (strcasecmp((*iter)->pCmd->GetName(), cmd) == 0)
-            {
-                pInfo = (*iter);
-                break;
-            }
-            iter++;
-        }
-        
-		if (pInfo == NULL)
-        {
-            return;
-        }
+		pInfo = *item;
 	}
 
 	/* This is a hack to prevent say triggers from firing on messages that were 
@@ -457,7 +450,7 @@ void ConCmdManager::InternalDispatch(const CCommand &command)
 	}
 }
 
-bool ConCmdManager::CheckCommandAccess(int client, const char *cmd, FlagBits cmdflags)
+bool ConCmdManager::CheckClientCommandAccess(int client, const char *cmd, FlagBits cmdflags)
 {
 	if (cmdflags == 0 || client == 0)
 	{
@@ -478,7 +471,11 @@ bool ConCmdManager::CheckCommandAccess(int client, const char *cmd, FlagBits cmd
 		return false;
 	}
 
-	AdminId adm = player->GetAdminId();
+	return CheckAdminCommandAccess(player->GetAdminId(), cmd, cmdflags);
+}
+
+bool ConCmdManager::CheckAdminCommandAccess(AdminId adm, const char *cmd, FlagBits cmdflags)
+{
 	if (adm != INVALID_ADMIN_ID)
 	{
 		FlagBits bits = g_Admins.GetAdminFlags(adm, Access_Effective);
@@ -531,7 +528,7 @@ bool ConCmdManager::CheckCommandAccess(int client, const char *cmd, FlagBits cmd
 
 bool ConCmdManager::CheckAccess(int client, const char *cmd, AdminCmdInfo *pAdmin)
 {
-	if (CheckCommandAccess(client, cmd, pAdmin->eflags))
+	if (CheckClientCommandAccess(client, cmd, pAdmin->eflags))
 	{
 		return true;
 	}
@@ -540,7 +537,7 @@ bool ConCmdManager::CheckAccess(int client, const char *cmd, AdminCmdInfo *pAdmi
 	
 	/* If we got here, the command failed... */
 	char buffer[128];
-	if (!CoreTranslate(buffer, sizeof(buffer), "%T", 2, NULL, "No Access", &client))
+	if (!logicore.CoreTranslate(buffer, sizeof(buffer), "%T", 2, NULL, "No Access", &client))
 	{
 		UTIL_Format(buffer, sizeof(buffer), "You do not have access to this command");
 	}
@@ -562,44 +559,6 @@ bool ConCmdManager::CheckAccess(int client, const char *cmd, AdminCmdInfo *pAdmi
 	return false;
 }
 
-bool ConCmdManager::AddConsoleCommand(IPluginFunction *pFunction, 
-									   const char *name, 
-									   const char *description, 
-									   int flags)
-{
-	ConCmdInfo *pInfo = AddOrFindCommand(name, description, flags);
-
-	if (!pInfo)
-	{
-		return false;
-	}
-
-	CmdHook *pHook = new CmdHook();
-
-	pHook->pf = pFunction;
-	if (description && description[0])
-	{
-		pHook->helptext.assign(description);
-	}
-	pInfo->conhooks.push_back(pHook);
-
-	/* Add to the plugin */
-	CmdList *pList;
-	IPlugin *pPlugin = g_PluginSys.GetPluginByCtx(pFunction->GetParentContext()->GetContext());
-	if (!pPlugin->GetProperty("CommandList", (void **)&pList))
-	{
-		pList = new CmdList();
-		pPlugin->SetProperty("CommandList", pList);
-	}
-	PlCmdInfo info;
-	info.pInfo = pInfo;
-	info.type = Cmd_Console;
-	info.pHook = pHook;
-	AddToPlCmdList(pList, info);
-
-	return true;
-}
-
 bool ConCmdManager::AddAdminCommand(IPluginFunction *pFunction, 
 									 const char *name, 
 									 const char *group,
@@ -661,7 +620,6 @@ bool ConCmdManager::AddAdminCommand(IPluginFunction *pFunction,
 	/* Finally, add the hook */
 	pInfo->conhooks.push_back(pHook);
 	pInfo->admin = *(pHook->pAdmin);
-	pInfo->is_admin_set = true;
 
 	/* Now add to the plugin */
 	CmdList *pList;
@@ -806,7 +764,6 @@ void ConCmdManager::UpdateAdminCmdFlags(const char *cmd, OverrideType type, Flag
 				pInfo->admin = *(pHook->pAdmin);
 			}
 		}
-		pInfo->is_admin_set = true;
 	}
 	else if (type == Override_CommandGroup)
 	{
@@ -840,7 +797,6 @@ void ConCmdManager::UpdateAdminCmdFlags(const char *cmd, OverrideType type, Flag
 				}
 			}
 		}
-		pInfo->is_admin_set = true;
 	}
 }
 
@@ -908,7 +864,7 @@ bool ConCmdManager::LookForCommandAdminFlags(const char *cmd, FlagBits *pFlags)
 
 	*pFlags = pInfo->admin.eflags;
 
-	return pInfo->is_admin_set;
+	return true;
 }
 
 ConCmdInfo *ConCmdManager::AddOrFindCommand(const char *name, const char *description, int flags)
@@ -916,6 +872,10 @@ ConCmdInfo *ConCmdManager::AddOrFindCommand(const char *name, const char *descri
 	ConCmdInfo *pInfo;
 	if (!sm_trie_retrieve(m_pCmds, name, (void **)&pInfo))
 	{
+		ConCmdList::iterator item = FindInList(name);
+		if (item != m_CmdList.end())
+			return *item;
+
 		pInfo = new ConCmdInfo();
 		/* Find the commandopan */
 		ConCommand *pCmd = FindCommand(name);
@@ -941,7 +901,6 @@ ConCmdInfo *ConCmdManager::AddOrFindCommand(const char *name, const char *descri
 		}
 
 		pInfo->pCmd = pCmd;
-		pInfo->is_admin_set = false;
 
 		sm_trie_insert(m_pCmds, name, pInfo);
 		AddToCmdList(pInfo);
@@ -994,13 +953,9 @@ void ConCmdManager::OnRootConsoleCommand(const char *cmdname, const CCommand &co
 			{
 				type = "server";
 			}
-			else if (cmd.type == Cmd_Console)
-			{
-				type = "console";
-			}
 			else if (cmd.type == Cmd_Admin)
 			{
-				type = "admin";
+				type = (cmd.pInfo->admin.eflags == 0)?"console":"admin";
 			}
 			name = cmd.pInfo->pCmd->GetName();
 			if (cmd.pHook->helptext.size())

core/ConCmdManager.h

@@ -48,7 +48,6 @@ using namespace SourceHook;
 enum CmdType
 {
 	Cmd_Server,
-	Cmd_Console,
 	Cmd_Admin,
 };
 
@@ -89,9 +88,10 @@ struct ConCmdInfo
 	List<CmdHook *> srvhooks;		/**< Hooks as a server command */
 	List<CmdHook *> conhooks;		/**< Hooks as a console command */
 	AdminCmdInfo admin;				/**< Admin info, if any */
-	bool is_admin_set;				/**< Whether or not admin info is set */
 };
 
+typedef List<ConCmdInfo *> ConCmdList;
+
 class ConCmdManager :
 	public SMGlobalClass,
 	public IRootConsoleCommand,
@@ -117,7 +117,6 @@ public: //IConCommandTracker
 	void OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name, bool is_read_safe);
 public:
 	bool AddServerCommand(IPluginFunction *pFunction, const char *name, const char *description, int flags);
-	bool AddConsoleCommand(IPluginFunction *pFunction, const char *name, const char *description, int flags);
 	bool AddAdminCommand(IPluginFunction *pFunction, 
 						 const char *name, 
 						 const char *group,
@@ -128,7 +127,8 @@ public:
 	void UpdateAdminCmdFlags(const char *cmd, OverrideType type, FlagBits bits, bool remove);
 	bool LookForSourceModCommand(const char *cmd);
 	bool LookForCommandAdminFlags(const char *cmd, FlagBits *pFlags);
-	bool CheckCommandAccess(int client, const char *cmd, FlagBits flags);
+	bool CheckClientCommandAccess(int client, const char *cmd, FlagBits flags);
+	bool CheckAdminCommandAccess(AdminId adm, const char *cmd, FlagBits flags);
 private:
 	void InternalDispatch(const CCommand &command);
 	ResultType RunAdminCommand(ConCmdInfo *pInfo, int client, int args);
@@ -139,6 +139,12 @@ private:
 	void RemoveConCmds(List<CmdHook *> &cmdlist);
 	void RemoveConCmds(List<CmdHook *> &cmdlist, IPluginContext *pContext);
 	bool CheckAccess(int client, const char *cmd, AdminCmdInfo *pAdmin);
+
+	// Case insensitive
+	ConCmdList::iterator FindInList(const char *name);
+
+	// Case sensitive
+	ConCmdInfo *FindInTrie(const char *name);
 public:
 	inline int GetCommandClient()
 	{
@@ -151,7 +157,7 @@ public:
 private:
 	Trie *m_pCmds;					/* command lookup */
 	Trie *m_pCmdGrps;				/* command group lookup */
-	List<ConCmdInfo *> m_CmdList;	/* command list */
+	ConCmdList m_CmdList;			/* command list */
 	int m_CmdClient;				/* current client */
 	BaseStringTable m_Strings;		/* string table */
 };

core/ConCommandBaseIterator.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2009 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
@@ -31,59 +31,59 @@
 #ifndef _INCLUDE_SOURCEMOD_CON_COMMAND_BASE_ITERATOR_H_
 #define _INCLUDE_SOURCEMOD_CON_COMMAND_BASE_ITERATOR_H_
 
+#if SOURCE_ENGINE >= SE_LEFT4DEAD
 class ConCommandBaseIterator
 {
-#if (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
-	ICvarIteratorInternal *cvarIter;
-#else
-	ConCommandBase *cvarIter;
-#endif
-
 public:
-	ConCommandBaseIterator()
+	inline ConCommandBaseIterator() : iter(icvar)
 	{
-#if (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
-		cvarIter = icvar->FactoryInternalIterator();
-		cvarIter->SetFirst();
-#else
-		cvarIter = icvar->GetCommands();
-#endif
-	}
-	
-	~ConCommandBaseIterator()
-	{
-#if (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
-		g_pMemAlloc->Free(cvarIter);
-#endif
+		iter.SetFirst();
 	}
 
 	inline bool IsValid()
 	{
-#if (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
-		return cvarIter->IsValid();
-#else
-		return cvarIter != NULL;
-#endif
+		return iter.IsValid();
 	}
 
 	inline void Next()
 	{
-#if (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
-		cvarIter->Next();
-#else
-		cvarIter = const_cast<ConCommandBase*>(cvarIter->GetNext());
-#endif
+		iter.Next();
 	}
 
 	inline ConCommandBase *Get()
 	{
-#if (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
-		return cvarIter->Get();
-#else
-		return cvarIter;
-#endif
+		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_ */
 

core/ConVarManager.cpp

@@ -322,8 +322,15 @@ void ConVarManager::OnRootConsoleCommand(const char *cmdname, const CCommand &co
 	int argcount = command.ArgC();
 	if (argcount >= 3)
 	{
+		bool wantReset = false;
+		
 		/* Get plugin index that was passed */
 		const char *arg = command.Arg(2);
+		if (argcount >= 4 && strcmp(arg, "reset") == 0)
+		{
+			wantReset = true;
+			arg = command.Arg(3);
+		}
 		
 		/* Get plugin object */
 		CPlugin *plugin = g_PluginSys.FindPluginByConsoleArg(arg);
@@ -348,21 +355,34 @@ void ConVarManager::OnRootConsoleCommand(const char *cmdname, const CCommand &co
 			return;
 		}
 
-		g_RootMenu.ConsolePrint("[SM] Listing %d convars for: %s", pConVarList->size(), plname);
-		g_RootMenu.ConsolePrint("  %-32.31s %s", "[Name]", "[Value]");
-
-		/* Iterate convar list and display each one */
+		if (!wantReset)
+		{
+			g_RootMenu.ConsolePrint("[SM] Listing %d convars for: %s", pConVarList->size(), plname);
+			g_RootMenu.ConsolePrint("  %-32.31s %s", "[Name]", "[Value]");
+		}
+		
+		/* Iterate convar list and display/reset each one */
 		for (iter = pConVarList->begin(); iter != pConVarList->end(); iter++)
 		{
-			const ConVar *pConVar = (*iter);
-			g_RootMenu.ConsolePrint("  %-32.31s %s", pConVar->GetName(), pConVar->GetString()); 
+			/*const */ConVar *pConVar = const_cast<ConVar *>(*iter);
+			if (!wantReset)
+			{
+				g_RootMenu.ConsolePrint("  %-32.31s %s", pConVar->GetName(), pConVar->GetString()); 
+			} else {
+				pConVar->Revert();
+			}
+		}
+		
+		if (wantReset)
+		{
+			g_RootMenu.ConsolePrint("[SM] Reset %d convars for: %s", pConVarList->size(), plname);
 		}
 
 		return;
 	}
 
 	/* Display usage of subcommand */
-	g_RootMenu.ConsolePrint("[SM] Usage: sm cvars <plugin #>");
+	g_RootMenu.ConsolePrint("[SM] Usage: sm cvars [reset] <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)

core/ConsoleDetours.cpp

@@ -44,14 +44,14 @@
 #include "Logger.h"
 #include "compat_wrappers.h"
 #include "ConsoleDetours.h"
-#include "GameConfigs.h"
+#include <IGameConfigs.h>
 #include "sm_stringutil.h"
 #include "ConCmdManager.h"
 #include "HalfLife2.h"
 #include "ConCommandBaseIterator.h"
 #include "ShareSys.h"
 
-#if defined PLATFORM_LINUX
+#if defined PLATFORM_POSIX
 # include <dlfcn.h>
 # include <sys/mman.h>
 # include <stdint.h>
@@ -664,6 +664,11 @@ cell_t ConsoleDetours::InternalDispatch(int client, const CCommand& args)
 	char name[255];
 	const char *realname = args.Arg(0);
 	size_t len = strlen(realname);
+
+	// Disallow command strings that are too long, for now.
+	if (len >= sizeof(name) - 1)
+		return Pl_Continue;
+
 	for (size_t i = 0; i < len; i++)
 	{
 		if (realname[i] >= 'A' && realname[i] <= 'Z')
@@ -683,7 +688,7 @@ cell_t ConsoleDetours::InternalDispatch(int client, const CCommand& args)
 	if (strcmp(name, "sm") == 0)
 		result = Pl_Continue;
 
-	if (result >= Pl_Stop)
+	if (result >= Pl_Handled)
 		return result;
 	
 	Listener **plistener = m_CmdLookup.retrieve(name);

core/CoreConfig.cpp

@@ -193,17 +193,30 @@ void CoreConfig::OnRootConsoleCommand(const char *cmdname, const CCommand &comma
 
 		if (res == ConfigResult_Reject)
 		{
-			g_RootMenu.ConsolePrint("[SM] Could not set config option \"%s\" to \"%s\" (%s)", option, value, error);
+			g_RootMenu.ConsolePrint("[SM] Could not set config option \"%s\" to \"%s\". (%s)", option, value, error);
 		} else if (res == ConfigResult_Ignore) {
 			g_RootMenu.ConsolePrint("[SM] No such config option \"%s\" exists.", option);
 		} else {
-			g_RootMenu.ConsolePrint("Config option \"%s\" successfully set to \"%s.\"", option, value);
+			g_RootMenu.ConsolePrint("[SM] Config option \"%s\" successfully set to \"%s\".", option, value);
 		}
 
+		return;
+	} else if (argcount >= 3) {
+		const char *option = command.Arg(2);
+		
+		const char *value = GetCoreConfigValue(option);
+		
+		if (value == NULL)
+		{
+			g_RootMenu.ConsolePrint("[SM] No such config option \"%s\" exists.", option);
+		} else {
+			g_RootMenu.ConsolePrint("[SM] Config option \"%s\" is set to \"%s\".", option, value);
+		}
+		
 		return;
 	}
 
-	g_RootMenu.ConsolePrint("[SM] Usage: sm config <option> <value>");
+	g_RootMenu.ConsolePrint("[SM] Usage: sm config <option> [value]");
 }
 
 void CoreConfig::Initialize()
@@ -395,7 +408,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", SM_FULL_VERSION);
+				fprintf(fp, "// This file was auto-generated by SourceMod (v%s)\n", SM_VERSION_STRING);
 				fprintf(fp, "// ConVars for plugin \"%s\"\n", pl->GetFilename());
 				fprintf(fp, "\n\n");
 
@@ -452,6 +465,11 @@ bool SM_ExecuteConfig(CPlugin *pl, AutoConfig *cfg, bool can_create)
 				can_create = false;
 				fclose(fp);
 			}
+			else
+			{
+				g_Logger.LogError("Failed to auto generate config for %s, make sure the directory has write permission.", pl->GetFilename());
+				return can_create;
+			}
 		}
 	}
 

core/Database.cpp

@@ -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/DebugReporter.cpp

@@ -56,11 +56,16 @@ void DebugReport::OnDebugSpew(const char *msg, ...)
 void DebugReport::GenerateError(IPluginContext *ctx, cell_t func_idx, int err, const char *message, ...)
 {
 	va_list ap;
-	char buffer[512];
 
 	va_start(ap, message);
-	UTIL_FormatArgs(buffer, sizeof(buffer), message, ap);
+	GenerateErrorVA(ctx, func_idx, err, message, ap);
 	va_end(ap);
+}
+
+void DebugReport::GenerateErrorVA(IPluginContext *ctx, cell_t func_idx, int err, const char *message, va_list ap)
+{
+	char buffer[512];
+	UTIL_FormatArgs(buffer, sizeof(buffer), message, ap);
 
 	const char *plname = g_PluginSys.FindPluginByContext(ctx->GetContext())->GetFilename();
 	const char *error = g_pSourcePawn2->GetErrorString(err);

core/DebugReporter.h

@@ -46,6 +46,7 @@ public: // IDebugListener
 	void OnDebugSpew(const char *msg, ...);
 public:
 	void GenerateError(IPluginContext *ctx, cell_t func_idx, int err, const char *message, ...);
+	void GenerateErrorVA(IPluginContext *ctx, cell_t func_idx, int err, const char *message, va_list ap); 
 	void GenerateCodeError(IPluginContext *ctx, uint32_t code_addr, int err, const char *message, ...);
 private:
 	int _GetPluginIndex(IPluginContext *ctx);

core/EventManager.cpp

@@ -2,7 +2,7 @@
  * 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
@@ -161,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;

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
@@ -105,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

@@ -2,7 +2,7 @@
  * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2009 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,6 +37,7 @@
 #include "sourcemm_api.h"
 #include "sm_srvcmds.h"
 #include "sm_stringutil.h"
+#include "PlayerManager.h"
 
 CExtensionManager g_Extensions;
 IdentityType_t g_ExtType;
@@ -65,12 +66,30 @@ CRemoteExtension::CRemoteExtension(IExtensionInterface *pAPI, const char *filena
 #define GAMEFIX "2.l4d"
 #elif SOURCE_ENGINE == SE_LEFT4DEAD2
 #define GAMEFIX "2.l4d2"
+#elif SOURCE_ENGINE == SE_NUCLEARDAWN
+#define GAMEFIX "2.nd"
+#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_BLOODYGOODTIME
+#define GAMEFIX "2.bgt"
+#elif SOURCE_ENGINE == SE_EYE
+#define GAMEFIX "2.eye"
+#elif SOURCE_ENGINE == SE_CSS
+#define GAMEFIX "2.css"
+#elif SOURCE_ENGINE == SE_HL2DM
+#define GAMEFIX "2.hl2dm"
+#elif SOURCE_ENGINE == SE_DODS
+#define GAMEFIX "2.dods"
+#elif SOURCE_ENGINE == SE_TF2
+#define GAMEFIX "2.tf2"
 #elif SOURCE_ENGINE == SE_DARKMESSIAH
 #define GAMEFIX "2.darkm"
+#elif SOURCE_ENGINE == SE_PORTAL2
+#define GAMEFIX "2.portal2"
+#elif SOURCE_ENGINE == SE_CSGO
+#define GAMEFIX "2.csgo"
 #else
 #define GAMEFIX "2.ep1"
 #endif //(SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
@@ -85,6 +104,12 @@ CLocalExtension::CLocalExtension(const char *filename)
 
 	char path[PLATFORM_MAX_PATH];
 
+	/* Special case for new bintools binary */
+	if (strcmp(filename, "bintools.ext") == 0)
+	{
+		goto normal;
+	}
+
 	/* Zeroth, see if there is an engine specific build in the new place. */
 	g_SourceMod.BuildPath(Path_SM,
 		path,
@@ -97,6 +122,31 @@ CLocalExtension::CLocalExtension(const char *filename)
 		goto found;
 	}
 
+#if SOURCE_ENGINE == SE_TF2 || SOURCE_ENGINE == SE_DODS || SOURCE_ENGINE == SE_HL2DM
+	/* COMPAT HACK: One-halfth, if ep2v, see if there is an engine specific build in the new place with old naming */
+	g_SourceMod.BuildPath(Path_SM,
+		path,
+		PLATFORM_MAX_PATH,
+		"extensions/%s.2.ep2v." PLATFORM_LIB_EXT,
+		filename);
+
+	if (g_LibSys.IsPathFile(path))
+	{
+		goto found;
+	}
+#elif SOURCE_ENGINE == SE_NUCLEARDAWN
+	g_SourceMod.BuildPath(Path_SM,
+		path,
+		PLATFORM_MAX_PATH,
+		"extensions/%s.2.l4d2." PLATFORM_LIB_EXT,
+		filename);
+
+	if (g_LibSys.IsPathFile(path))
+	{
+		goto found;
+	}
+#endif
+
 	/* First see if there is an engine specific build! */
 	g_SourceMod.BuildPath(Path_SM, 
 		path, 
@@ -107,6 +157,7 @@ CLocalExtension::CLocalExtension(const char *filename)
 	/* Try the "normal" version */
 	if (!g_LibSys.IsPathFile(path))
 	{
+		normal:
 		g_SourceMod.BuildPath(Path_SM,
 			path,
 			PLATFORM_MAX_PATH,
@@ -171,6 +222,28 @@ bool CLocalExtension::Load(char *error, size_t maxlength)
 	{
 		bool already;
 		m_PlId = g_pMMPlugins->Load(m_Path.c_str(), g_PLID, already, error, maxlength);
+
+		// Check the plugin didn't refuse load
+		Pl_Status status;
+		
+#ifndef METAMOD_PLAPI_VERSION
+		const char *file;
+		PluginId source;
+#endif
+		
+		if (!m_PlId || (
+#ifndef METAMOD_PLAPI_VERSION
+			g_pMMPlugins->Query(m_PlId, file, status, source)
+#else
+			g_pMMPlugins->Query(m_PlId, NULL, &status, NULL)
+#endif			
+			&& status < Pl_Paused))
+		{
+			m_pLib->CloseLibrary();
+			m_pLib = NULL;
+			m_pAPI = NULL;
+			return false;
+		}
 	}
 
 	if (!CExtension::Load(error, maxlength))
@@ -337,6 +410,11 @@ const char *CExtension::GetFilename()
 	return m_RealFile.c_str();
 }
 
+const char *CExtension::GetPath() const
+{
+	return m_Path.c_str();
+}
+
 IdentityToken_t *CExtension::GetIdentity()
 {
 	return m_pIdentToken;
@@ -545,7 +623,7 @@ void CExtensionManager::TryAutoload()
 	}
 }
 
-IExtension *CExtensionManager::LoadAutoExtension(const char *path)
+IExtension *CExtensionManager::LoadAutoExtension(const char *path, bool bErrorOnMissing)
 {
 	/* Remove platform extension if it's there. Compat hack. */
 	const char *ext = g_LibSys.GetFileExtension(path);
@@ -554,7 +632,7 @@ IExtension *CExtensionManager::LoadAutoExtension(const char *path)
 		char path2[PLATFORM_MAX_PATH];
 		UTIL_Format(path2, sizeof(path2), "%s", path);
 		path2[strlen(path) - strlen(PLATFORM_LIB_EXT) - 1] = '\0';
-		return LoadAutoExtension(path2);
+		return LoadAutoExtension(path2, bErrorOnMissing);
 	}
 
 	IExtension *pAlready;
@@ -573,7 +651,11 @@ IExtension *CExtensionManager::LoadAutoExtension(const char *path)
 
 	if (!p->Load(error, sizeof(error)) || !p->IsLoaded())
 	{
-		g_Logger.LogError("[SM] Unable to load extension \"%s\": %s", path, error);
+		if (bErrorOnMissing || g_LibSys.IsPathFile(p->GetPath()))
+		{
+			g_Logger.LogError("[SM] Unable to load extension \"%s\": %s", path, error);
+		}
+
 		p->SetError(error);
 	}
 
@@ -754,6 +836,13 @@ bool CExtensionManager::UnloadExtension(IExtension *_pExt)
 		return false;
 	}
 
+	/* Tell it to unload */
+	if (pExt->IsLoaded())
+	{
+		IExtensionInterface *pAPI = pExt->GetAPI();
+		pAPI->OnExtensionUnload();
+	}
+
 	/* First remove us from internal lists */
 	g_ShareSys.RemoveInterfaces(_pExt);
 	m_Libs.remove(pExt);
@@ -777,7 +866,7 @@ bool CExtensionManager::UnloadExtension(IExtension *_pExt)
 			 s_iter != pExt->m_Libraries.end();
 			 s_iter++)
 		{
-			g_PluginSys.OnLibraryAction((*s_iter).c_str(), false, true);
+			g_PluginSys.OnLibraryAction((*s_iter).c_str(), LibraryAction_Removed);
 		}
 
 		/* Notify and/or unload all dependencies */
@@ -848,13 +937,6 @@ bool CExtensionManager::UnloadExtension(IExtension *_pExt)
 		}
 	}
 
-	/* Tell it to unload */
-	if (pExt->IsLoaded())
-	{
-		IExtensionInterface *pAPI = pExt->GetAPI();
-		pAPI->OnExtensionUnload();
-	}
-
 	pExt->Unload();
 	delete pExt;
 
@@ -988,7 +1070,7 @@ void CExtensionManager::OnRootConsoleCommand(const char *cmdname, const CCommand
 		{
 			if (argcount < 4)
 			{
-				g_RootMenu.ConsolePrint("[SM] Usage: sm info <#>");
+				g_RootMenu.ConsolePrint("[SM] Usage: sm exts info <#>");
 				return;
 			}
 
@@ -996,7 +1078,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;
 			}
 
@@ -1073,7 +1155,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;
 			}
 
@@ -1240,6 +1322,94 @@ void CExtensionManager::OnRootConsoleCommand(const char *cmdname, const CCommand
 	g_RootMenu.DrawGenericOption("unload", "Unload an extension");
 }
 
+void CExtensionManager::ListExtensionsToClient(CPlayer *player, const CCommand &args)
+{
+	char buffer[256];
+	int numExtensions = m_Libs.size();
+	edict_t *edict = player->GetEdict();
+	unsigned int id = 0;
+	unsigned int start = 0;
+
+	if (!numExtensions)
+	{
+		ClientConsolePrint(edict, "[SM] No extensions found.");
+		return;
+	}
+
+	if (args.ArgC() > 2)
+	{
+		start = atoi(args.Arg(2));
+	}
+
+	CExtension *ext;
+	SourceHook::List<CExtension *>::iterator iter;
+
+	for (iter = m_Libs.begin();
+		 iter != m_Libs.end();
+		 iter++)
+	{
+		ext = (*iter);
+
+		char error[255];
+		if (!ext->IsRunning(error, sizeof(error)))
+		{
+			continue;
+		}
+
+		id++;
+		if (id < start)
+		{
+			continue;
+		}
+
+		if (id - start > 10)
+		{
+			break;
+		}
+
+		IExtensionInterface *api = ext->GetAPI();
+
+		const char *name = api->GetExtensionName();
+		const char *version = api->GetExtensionVerString();
+		const char *author = api->GetExtensionAuthor();
+		const char *description = api->GetExtensionDescription();
+
+		size_t len = UTIL_Format(buffer, sizeof(buffer), " \"%s\"", name);
+
+		if (version != NULL && IS_STR_FILLED(version))
+		{
+			len += UTIL_Format(&buffer[len], sizeof(buffer)-len, " (%s)", version);
+		}
+
+		if (author != NULL && IS_STR_FILLED(author))
+		{
+			len += UTIL_Format(&buffer[len], sizeof(buffer)-len, " by %s", author);
+		}
+
+		if (description != NULL && IS_STR_FILLED(description))
+		{
+			len += UTIL_Format(&buffer[len], sizeof(buffer)-len, ": %s", description);
+		}
+
+
+		ClientConsolePrint(edict, "%s", buffer);
+	}
+
+	while (iter != m_Libs.end())
+	{
+		char error[255];
+		if ((*iter)->IsRunning(error, sizeof(error)))
+		{
+			break;
+		}
+	}
+
+	if (iter != m_Libs.end())
+	{
+		ClientConsolePrint(edict, "To see more, type \"sm exts %d\"", id);
+	}
+}
+
 CExtension *CExtensionManager::GetExtensionFromIdent(IdentityToken_t *ptr)
 {
 	if (ptr->type == g_ExtType)
@@ -1262,7 +1432,7 @@ void CExtensionManager::AddLibrary(IExtension *pSource, const char *library)
 {
 	CExtension *pExt = (CExtension *)pSource;
 	pExt->AddLibrary(library);
-	g_PluginSys.OnLibraryAction(library, false, false);
+	g_PluginSys.OnLibraryAction(library, LibraryAction_Added);
 }
 
 bool CExtensionManager::LibraryExists(const char *library)

core/ExtensionSys.h

@@ -45,6 +45,8 @@
 #include "PluginSys.h"
 #include "NativeOwner.h"
 
+class CPlayer;
+
 using namespace SourceMod;
 using namespace SourceHook;
 
@@ -66,6 +68,7 @@ public:
 public: //IExtension
 	IExtensionInterface *GetAPI();
 	const char *GetFilename();
+	const char *GetPath() const;
 	IdentityToken_t *GetIdentity();
 	ITERATOR *FindFirstDependency(IExtension **pOwner, SMInterface **pInterface);
 	bool FindNextDependency(ITERATOR *iter, IExtension **pOwner, SMInterface **pInterface);
@@ -163,7 +166,7 @@ public: //IPluginsListener
 public: //IRootConsoleCommand
 	void OnRootConsoleCommand(const char *cmdname, const CCommand &command);
 public:
-	IExtension *LoadAutoExtension(const char *path);
+	IExtension *LoadAutoExtension(const char *path, bool bErrorOnMissing=true);
 	void BindDependency(IExtension *pOwner, IfaceInfo *pInfo);
 	void AddInterface(IExtension *pOwner, SMInterface *pInterface);
 	void BindChildPlugin(IExtension *pParent, CPlugin *pPlugin);
@@ -174,6 +177,8 @@ public:
 	bool LibraryExists(const char *library);
 	void CallOnCoreMapStart(edict_t *pEdictList, int edictCount, int clientMax);
 	void AddRawDependency(IExtension *ext, IdentityToken_t *other, void *iface);
+public:
+	void ListExtensionsToClient(CPlayer *player, const CCommand &args);
 public:
 	CExtension *GetExtensionFromIdent(IdentityToken_t *ptr);
 	void Shutdown();

core/HalfLife2.cpp

@@ -35,9 +35,38 @@
 #include "UserMessages.h"
 #include "PlayerManager.h"
 #include "sm_stringutil.h"
-#include "GameConfigs.h"
+#include <IGameConfigs.h>
 #include <compat_wrappers.h>
 #include <Logger.h>
+#include "LibrarySys.h"
+#include "logic_bridge.h"
+#include <tier0/mem.h>
+
+#if SOURCE_ENGINE == SE_CSGO
+#include <cstrike15_usermessages.pb.h>
+#endif
+
+
+typedef ICommandLine *(*FakeGetCommandLine)();
+
+#if defined _WIN32
+#define TIER0_NAME			"tier0.dll"
+#define VSTDLIB_NAME		"vstdlib.dll"
+#elif defined __APPLE__
+#define TIER0_NAME			"libtier0.dylib"
+#define VSTDLIB_NAME		"libvstdlib.dylib"
+#elif defined __linux__
+#if SOURCE_ENGINE == SE_HL2DM || SOURCE_ENGINE == SE_DODS || SOURCE_ENGINE == SE_CSS || SOURCE_ENGINE == SE_TF2 || SOURCE_ENGINE == SE_LEFT4DEAD2
+#define TIER0_NAME			"libtier0_srv.so"
+#define VSTDLIB_NAME		"libvstdlib_srv.so"
+#elif SOURCE_ENGINE >= SE_LEFT4DEAD
+#define TIER0_NAME			"libtier0.so"
+#define VSTDLIB_NAME		"libvstdlib.so"
+#else
+#define TIER0_NAME			"tier0_i486.so"
+#define VSTDLIB_NAME		"vstdlib_i486.so"
+#endif
+#endif
 
 CHalfLife2 g_HL2;
 ConVar *sv_lan = NULL;
@@ -131,41 +160,68 @@ void CHalfLife2::OnSourceModAllInitialized()
 
 void CHalfLife2::OnSourceModAllInitialized_Post()
 {
-	char *addr = NULL;
-#ifdef PLATFORM_WINDOWS
-	int offset;
+	InitLogicalEntData();
+	InitCommandLine();
+}
 
-	/* gEntList and/or g_pEntityList */
-	if (!g_pGameConf->GetMemSig("LevelShutdown", (void **)&addr))
+void CHalfLife2::InitLogicalEntData()
+{
+	char *addr = NULL;
+
+	/*
+	 * gEntList and/or g_pEntityList
+	 *
+	 * First try to lookup pointer directly for platforms with symbols.
+	 * If symbols aren't present (Windows or stripped Linux/Mac), 
+	 * attempt find via LevelShutdown + offset
+	 */
+	if (g_pGameConf->GetMemSig("gEntList", (void **)&addr))
 	{
-		g_Logger.LogError("Logical Entities not supported by this mod (LevelShutdown) - Reverting to networkable entities only");
-		return;
+#if !defined PLATFORM_WINDOWS
+		if (!addr)
+		{
+			// Key exists so notify if lookup fails, but try other method.
+			g_Logger.LogError("Failed lookup of gEntList directly - Reverting to lookup via LevelShutdown");
+		}
+		else
+		{
+#endif
+			g_EntList = reinterpret_cast<void *>(addr);
+#if !defined PLATFORM_WINDOWS
+		}
+#endif
 	}
-	if (!addr)
+
+
+	if (!g_EntList)
 	{
-		g_Logger.LogError("Failed lookup of LevelShutdown - Reverting to networkable entities only");
-		return;
+		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;
+		}
+
+		int offset;
+		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);
 	}
-	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)
+	
+	if (!g_EntList)
 	{
 		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))
 	{
@@ -174,6 +230,64 @@ void CHalfLife2::OnSourceModAllInitialized_Post()
 	}
 }
 
+void CHalfLife2::InitCommandLine()
+{
+	char path[PLATFORM_MAX_PATH];
+	char error[256];
+	
+	g_SourceMod.BuildPath(Path_Game, path, sizeof(path), "../bin/" TIER0_NAME);
+
+	if (!g_LibSys.IsPathFile(path))
+	{
+		g_Logger.LogError("Could not find path for: " TIER0_NAME);
+		return;
+	}
+
+	ILibrary *lib = g_LibSys.OpenLibrary(path, error, sizeof(error));
+	m_pGetCommandLine = lib->GetSymbolAddress("CommandLine_Tier0");
+
+	/* '_Tier0' dropped on Alien Swarm version */
+	if (m_pGetCommandLine == NULL)
+	{
+		m_pGetCommandLine = lib->GetSymbolAddress("CommandLine");
+	}
+
+	if (m_pGetCommandLine == NULL)
+	{
+		/* We probably have a Ship engine. */
+		lib->CloseLibrary();
+		g_SourceMod.BuildPath(Path_Game, path, sizeof(path), "../bin/" VSTDLIB_NAME);
+		if (!g_LibSys.IsPathFile(path))
+		{
+			g_Logger.LogError("Could not find path for: " VSTDLIB_NAME);
+			return;
+		}
+
+		if ((lib = g_LibSys.OpenLibrary(path, error, sizeof(error))) == NULL)
+		{
+			g_Logger.LogError("Could not load %s: %s", path, error);
+			return;
+		}
+
+		m_pGetCommandLine = lib->GetSymbolAddress("CommandLine");
+
+		if (m_pGetCommandLine == NULL)
+		{
+			g_Logger.LogError("Could not locate any command line functionality");
+		}
+
+		lib->CloseLibrary();
+	}
+}
+
+ICommandLine *CHalfLife2::GetValveCommandLine()
+{
+	if (!m_pGetCommandLine)
+		return NULL;
+
+	return ((FakeGetCommandLine)((FakeGetCommandLine *)m_pGetCommandLine))();
+}
+
 #if !defined METAMOD_PLAPI_VERSION || PLAPI_VERSION < 11
 bool CHalfLife2::IsOriginalEngine()
 {
@@ -223,8 +337,13 @@ bool UTIL_FindInSendTable(SendTable *pTable,
 	return false;
 }
 
-typedescription_t *UTIL_FindInDataMap(datamap_t *pMap, const char *name)
+typedescription_t *UTIL_FindInDataMap(datamap_t *pMap, const char *name, bool *isNested)
 {
+	if (isNested)
+	{
+		*isNested = false;
+	}
+	
 	while (pMap)
 	{
 		for (int i=0; i<pMap->dataNumFields; i++)
@@ -239,10 +358,21 @@ typedescription_t *UTIL_FindInDataMap(datamap_t *pMap, const char *name)
 			}
 			if (pMap->dataDesc[i].td)
 			{
-				typedescription_t *_td;
-				if ((_td=UTIL_FindInDataMap(pMap->dataDesc[i].td, name)) != NULL)
+				if (isNested)
 				{
-					return _td;
+					*isNested = (UTIL_FindInDataMap(pMap->dataDesc[i].td, name, NULL) != NULL);
+					if (*isNested)
+					{
+						return NULL;
+					} else {
+						continue;
+					}
+				} else { // Use the old behaviour, we dont want to spring this on extensions - even if they're doing bad things.
+					typedescription_t *_td;
+					if ((_td=UTIL_FindInDataMap(pMap->dataDesc[i].td, name, NULL)) != NULL)
+					{
+						return _td;
+					}
 				}
 			}
 		}
@@ -335,6 +465,11 @@ SendProp *CHalfLife2::FindInSendTable(const char *classname, const char *offset)
 }
 
 typedescription_t *CHalfLife2::FindInDataMap(datamap_t *pMap, const char *offset)
+{
+	return this->FindInDataMap(pMap, offset, NULL);
+}
+
+typedescription_t *CHalfLife2::FindInDataMap(datamap_t *pMap, const char *offset, bool *isNested)
 {
 	typedescription_t *td = NULL;
 	DataMapTrie &val = m_Maps[pMap];
@@ -345,7 +480,7 @@ typedescription_t *CHalfLife2::FindInDataMap(datamap_t *pMap, const char *offset
 	}
 	if (!sm_trie_retrieve(val.trie, offset, (void **)&td))
 	{
-		if ((td = UTIL_FindInDataMap(pMap, offset)) != NULL)
+		if ((td = UTIL_FindInDataMap(pMap, offset, isNested)) != NULL)
 		{
 			sm_trie_insert(val.trie, offset, td);
 		}
@@ -359,13 +494,11 @@ void CHalfLife2::SetEdictStateChanged(edict_t *pEdict, unsigned short offset)
 #if SOURCE_ENGINE != SE_DARKMESSIAH
 	if (g_pSharedChangeInfo != NULL)
 	{
-#if SOURCE_ENGINE != SE_LEFT4DEAD2
 		if (offset)
 		{
 			pEdict->StateChanged(offset);
 		}
 		else
-#endif
 		{
 			pEdict->StateChanged();
 		}
@@ -379,7 +512,9 @@ void CHalfLife2::SetEdictStateChanged(edict_t *pEdict, unsigned short offset)
 
 bool CHalfLife2::TextMsg(int client, int dest, const char *msg)
 {
+#if SOURCE_ENGINE != SE_CSGO
 	bf_write *pBitBuf = NULL;
+#endif
 	cell_t players[] = {client};
 
 	if (dest == HUD_PRINTTALK)
@@ -392,7 +527,18 @@ bool CHalfLife2::TextMsg(int client, int dest, const char *msg)
 			char buffer[192];
 			UTIL_Format(buffer, sizeof(buffer), "%s\1\n", msg);
 
-			if ((pBitBuf = g_UserMsgs.StartMessage(m_SayTextMsg, players, 1, USERMSG_RELIABLE)) == NULL)
+#if SOURCE_ENGINE == SE_CSGO
+			CCSUsrMsg_SayText *pMsg;
+			if ((pMsg = (CCSUsrMsg_SayText *)g_UserMsgs.StartProtobufMessage(m_SayTextMsg, players, 1, USERMSG_RELIABLE)) == NULL)
+			{
+				return false;
+			}
+
+			pMsg->set_ent_idx(0);
+			pMsg->set_text(buffer);
+			pMsg->set_chat(false);
+#else
+			if ((pBitBuf = g_UserMsgs.StartBitBufMessage(m_SayTextMsg, players, 1, USERMSG_RELIABLE)) == NULL)
 			{
 				return false;
 			}
@@ -400,6 +546,7 @@ bool CHalfLife2::TextMsg(int client, int dest, const char *msg)
 			pBitBuf->WriteByte(0);
 			pBitBuf->WriteString(buffer);
 			pBitBuf->WriteByte(1);
+#endif
 
 			g_UserMsgs.EndMessage();
 
@@ -407,13 +554,29 @@ bool CHalfLife2::TextMsg(int client, int dest, const char *msg)
 		}
 	}
 
-	if ((pBitBuf = g_UserMsgs.StartMessage(m_MsgTextMsg, players, 1, USERMSG_RELIABLE)) == NULL)
+#if SOURCE_ENGINE == SE_CSGO
+	CCSUsrMsg_TextMsg *pMsg;
+	if ((pMsg = (CCSUsrMsg_TextMsg *)g_UserMsgs.StartProtobufMessage(m_MsgTextMsg, players, 1, USERMSG_RELIABLE)) == NULL)
+	{
+		return false;
+	}
+
+	// Client tries to read all 5 'params' and will crash if less
+	pMsg->set_msg_dst(dest);
+	pMsg->add_params(msg);
+	pMsg->add_params("");
+	pMsg->add_params("");
+	pMsg->add_params("");
+	pMsg->add_params("");
+#else
+	if ((pBitBuf = g_UserMsgs.StartBitBufMessage(m_MsgTextMsg, players, 1, USERMSG_RELIABLE)) == NULL)
 	{
 		return false;
 	}
 
 	pBitBuf->WriteByte(dest);
 	pBitBuf->WriteString(msg);
+#endif
 
 	g_UserMsgs.EndMessage();
 
@@ -422,10 +585,20 @@ bool CHalfLife2::TextMsg(int client, int dest, const char *msg)
 
 bool CHalfLife2::HintTextMsg(int client, const char *msg)
 {
-	bf_write *pBitBuf = NULL;
 	cell_t players[] = {client};
 
-	if ((pBitBuf = g_UserMsgs.StartMessage(m_HinTextMsg, players, 1, USERMSG_RELIABLE)) == NULL)
+#if SOURCE_ENGINE == SE_CSGO
+	CCSUsrMsg_HintText *pMsg;
+	if ((pMsg = (CCSUsrMsg_HintText *)g_UserMsgs.StartProtobufMessage(m_HinTextMsg, players, 1, USERMSG_RELIABLE)) == NULL)
+	{
+		return false;
+	}
+
+	pMsg->set_text(msg);
+#else
+	bf_write *pBitBuf = NULL;
+
+	if ((pBitBuf = g_UserMsgs.StartBitBufMessage(m_HinTextMsg, players, 1, USERMSG_RELIABLE)) == NULL)
 	{
 		return false;
 	}
@@ -436,6 +609,7 @@ bool CHalfLife2::HintTextMsg(int client, const char *msg)
 		pBitBuf->WriteByte(1);
 	}
 	pBitBuf->WriteString(msg);
+#endif
 	g_UserMsgs.EndMessage();
 
 	return true;
@@ -443,9 +617,18 @@ bool CHalfLife2::HintTextMsg(int client, const char *msg)
 
 bool CHalfLife2::HintTextMsg(cell_t *players, int count, const char *msg)
 {
+#if SOURCE_ENGINE == SE_CSGO
+	CCSUsrMsg_HintText *pMsg;
+	if ((pMsg = (CCSUsrMsg_HintText *)g_UserMsgs.StartProtobufMessage(m_HinTextMsg, players, count, USERMSG_RELIABLE)) == NULL)
+	{
+		return false;
+	}
+
+	pMsg->set_text(msg);
+#else
 	bf_write *pBitBuf = NULL;
 
-	if ((pBitBuf = g_UserMsgs.StartMessage(m_HinTextMsg, players, count, USERMSG_RELIABLE)) == NULL)
+	if ((pBitBuf = g_UserMsgs.StartBitBufMessage(m_HinTextMsg, players, count, USERMSG_RELIABLE)) == NULL)
 	{
 		return false;
 	}
@@ -456,6 +639,8 @@ bool CHalfLife2::HintTextMsg(cell_t *players, int count, const char *msg)
 		pBitBuf->WriteByte(1);
 	}
 	pBitBuf->WriteString(msg);
+#endif
+
 	g_UserMsgs.EndMessage();
 
 	return true;
@@ -463,15 +648,23 @@ bool CHalfLife2::HintTextMsg(cell_t *players, int count, const char *msg)
 
 bool CHalfLife2::ShowVGUIMenu(int client, const char *name, KeyValues *data, bool show)
 {
-	bf_write *pBitBuf = NULL;
 	KeyValues *SubKey = NULL;
 	int count = 0;
 	cell_t players[] = {client};
 
-	if ((pBitBuf = g_UserMsgs.StartMessage(m_VGUIMenu, players, 1, USERMSG_RELIABLE)) == NULL)
+#if SOURCE_ENGINE == SE_CSGO
+	CCSUsrMsg_VGUIMenu *pMsg;
+	if ((pMsg = (CCSUsrMsg_VGUIMenu *)g_UserMsgs.StartProtobufMessage(m_VGUIMenu, players, 1, USERMSG_RELIABLE)) == NULL)
 	{
 		return false;
 	}
+#else
+	bf_write *pBitBuf = NULL;
+	if ((pBitBuf = g_UserMsgs.StartBitBufMessage(m_VGUIMenu, players, 1, USERMSG_RELIABLE)) == NULL)
+	{
+		return false;
+	}
+#endif
 
 	if (data)
 	{
@@ -484,6 +677,18 @@ bool CHalfLife2::ShowVGUIMenu(int client, const char *name, KeyValues *data, boo
 		SubKey = data->GetFirstSubKey();
 	}
 
+#if SOURCE_ENGINE == SE_CSGO
+	pMsg->set_name(name);
+	pMsg->set_show(show);
+
+	while (SubKey)
+	{
+		CCSUsrMsg_VGUIMenu_Subkey *key = pMsg->add_subkeys();
+		key->set_name(SubKey->GetName());
+		key->set_str(SubKey->GetString());
+		SubKey = SubKey->GetNextKey();
+	}
+#else
 	pBitBuf->WriteString(name);
 	pBitBuf->WriteByte((show) ? 1 : 0);
 	pBitBuf->WriteByte(count);
@@ -493,6 +698,8 @@ bool CHalfLife2::ShowVGUIMenu(int client, const char *name, KeyValues *data, boo
 		pBitBuf->WriteString(SubKey->GetString());
 		SubKey = SubKey->GetNextKey();
 	}
+#endif
+
 	g_UserMsgs.EndMessage();
 
 	return true;
@@ -624,6 +831,14 @@ const char *CHalfLife2::CurrentCommandName()
 
 void CHalfLife2::AddDelayedKick(int client, int userid, const char *msg)
 {
+	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
+	if (!pPlayer || !pPlayer->IsConnected() || pPlayer->IsInKickQueue())
+	{
+		return;
+	}
+	
+	pPlayer->MarkAsBeingKicked();
+
 	DelayedKickInfo kick;
 
 	kick.client = client;
@@ -728,6 +943,11 @@ cell_t CHalfLife2::EntityToReference(CBaseEntity *pEntity)
 
 CBaseEntity *CHalfLife2::ReferenceToEntity(cell_t entRef)
 {
+	if ((unsigned)entRef == INVALID_EHANDLE_INDEX)
+	{
+		return NULL;
+	}
+
 	CEntInfo *pInfo = NULL;
 
 	if (entRef & (1<<31))
@@ -737,7 +957,7 @@ CBaseEntity *CHalfLife2::ReferenceToEntity(cell_t entRef)
 		CBaseHandle hndl(hndlValue);
 
 		pInfo = LookupEntity(hndl.GetEntryIndex());
-		if (pInfo->m_SerialNumber != hndl.GetSerialNumber())
+		if (!pInfo || pInfo->m_SerialNumber != hndl.GetSerialNumber())
 		{
 			return NULL;
 		}
@@ -767,6 +987,12 @@ CBaseEntity *CHalfLife2::ReferenceToEntity(cell_t entRef)
  */
 CEntInfo *CHalfLife2::LookupEntity(int entIndex)
 {
+	// Make sure that our index is within the bounds of the global ent array
+	if (entIndex < 0 || entIndex >= NUM_ENT_ENTRIES)
+	{
+		return NULL;
+	}
+
 	if (!g_EntList || entInfoOffset == -1)
 	{
 		/* Attempt to use engine interface instead */
@@ -856,6 +1082,11 @@ cell_t CHalfLife2::EntityToBCompatRef(CBaseEntity *pEntity)
 	IServerUnknown *pUnknown = (IServerUnknown *)pEntity;
 	CBaseHandle hndl = pUnknown->GetRefEHandle();
 
+	if (hndl == INVALID_EHANDLE_INDEX)
+	{
+		return INVALID_EHANDLE_INDEX;
+	}
+	
 	if (hndl.GetEntryIndex() >= MAX_EDICTS)
 	{
 		return (hndl.ToInt() | (1<<31));
@@ -888,3 +1119,88 @@ void *CHalfLife2::GetGlobalEntityList()
 {
 	return g_EntList;
 }
+
+int CHalfLife2::GetSendPropOffset(SendProp *prop)
+{
+	return prop->GetOffset();
+}
+
+const char *CHalfLife2::GetEntityClassname(edict_t * pEdict)
+{
+	if (pEdict == NULL || pEdict->IsFree())
+	{
+		return NULL;
+	}
+	
+	IServerUnknown *pUnk = pEdict->GetUnknown();
+	if (pUnk == NULL)
+	{
+		return NULL;
+	}
+	
+	CBaseEntity * pEntity = pUnk->GetBaseEntity();
+	
+	if (pEntity == NULL)
+	{
+		return NULL;
+	}
+	
+	return GetEntityClassname(pEntity);
+}
+
+const char *CHalfLife2::GetEntityClassname(CBaseEntity *pEntity)
+{
+	static int offset = -1;
+	if (offset == -1)
+	{
+		datamap_t *pMap = GetDataMap(pEntity);
+		typedescription_t *pDesc = FindInDataMap(pMap, "m_iClassname");
+		offset = GetTypeDescOffs(pDesc);
+	}
+
+	return *(const char **)(((unsigned char *)pEntity) + offset);
+}
+
+#if SOURCE_ENGINE >= SE_LEFT4DEAD
+static bool ResolveFuzzyMapName(const char *fuzzyName, char *outFullname, int size)
+{
+	static ConCommand *pHelperCmd = g_pCVar->FindCommand("changelevel");
+	if (!pHelperCmd || !pHelperCmd->CanAutoComplete())
+		return false;
+
+	static size_t helperCmdLen = strlen(pHelperCmd->GetName());
+
+	CUtlVector<CUtlString> results;
+	pHelperCmd->AutoCompleteSuggest(fuzzyName, results);
+	if (results.Count() == 0)
+		return false;
+
+	// Results come back as you'd see in autocomplete. (ie. "changelevel fullmapnamehere"),
+	// so skip ahead to start of map path/name
+
+	// Like the engine, we're only going to deal with the first match.
+
+	strncopy(outFullname, &results[0][helperCmdLen + 1], size);
+
+	return true;
+}
+#endif
+
+bool CHalfLife2::IsMapValid(const char *map)
+{
+	if (!map || !map[0])
+		return false;
+
+	bool ret = engine->IsMapValid(map);
+#if SOURCE_ENGINE >= SE_LEFT4DEAD
+	if (!ret)
+	{
+		static char szFuzzyName[PLATFORM_MAX_PATH];
+		if (ResolveFuzzyMapName(map, szFuzzyName, sizeof(szFuzzyName)))
+		{
+			ret = engine->IsMapValid(szFuzzyName);
+		}
+	}
+#endif
+	return ret;
+}

core/HalfLife2.h

@@ -44,6 +44,10 @@
 #include <server_class.h>
 #include <datamap.h>
 #include <ihandleentity.h>
+#include <tier0/icommandline.h>
+#if SOURCE_ENGINE >= SE_PORTAL2
+#include <string_t.h>
+#endif
 
 class CCommand;
 
@@ -87,6 +91,7 @@ struct DelayedKickInfo
 	char buffer[384];
 };
 
+// copy from game/shared/entitylist_base.h
 class CEntInfo
 {
 public:
@@ -94,6 +99,10 @@ public:
 	int				m_SerialNumber;
 	CEntInfo		*m_pPrev;
 	CEntInfo		*m_pNext;
+#if SOURCE_ENGINE >= SE_PORTAL2
+	string_t		m_iName;
+	string_t		m_iClassName;
+#endif
 };
 
 class CHalfLife2 : 
@@ -114,6 +123,7 @@ public: //IGameHelpers
 	datamap_t *GetDataMap(CBaseEntity *pEntity);
 	ServerClass *FindServerClass(const char *classname);
 	typedescription_t *FindInDataMap(datamap_t *pMap, const char *offset);
+	typedescription_t *FindInDataMap(datamap_t *pMap, const char *offset, bool *isNested);
 	void SetEdictStateChanged(edict_t *pEdict, unsigned short offset);
 	bool TextMsg(int client, int dest, const char *msg);
 	bool HintTextMsg(int client, const char *msg);
@@ -135,6 +145,11 @@ public: //IGameHelpers
 	CEntInfo *LookupEntity(int entIndex);
 	cell_t EntityToBCompatRef(CBaseEntity *pEntity);
 	void *GetGlobalEntityList();
+	int GetSendPropOffset(SendProp *prop);
+	ICommandLine *GetValveCommandLine();
+	const char *GetEntityClassname(edict_t *pEdict);
+	const char *GetEntityClassname(CBaseEntity *pEntity);
+	bool IsMapValid(const char *map);
 public:
 	void AddToFakeCliCmdQueue(int client, int userid, const char *cmd);
 	void ProcessFakeCliCmdQueue();
@@ -150,6 +165,9 @@ public:
 #endif
 private:
 	DataTableInfo *_FindServerClass(const char *classname);
+private:
+	void InitLogicalEntData();
+	void InitCommandLine();
 private:
 	Trie *m_pClasses;
 	List<DataTableInfo *> m_Tables;
@@ -162,6 +180,7 @@ private:
 	CStack<DelayedFakeCliCmd *> m_FreeCmds;
 	CStack<CachedCommandInfo> m_CommandStack;
 	Queue<DelayedKickInfo> m_DelayedKicks;
+	void *m_pGetCommandLine;
 };
 
 extern CHalfLife2 g_HL2;

core/HandleSys.cpp

@@ -579,6 +579,7 @@ HandleError HandleSystem::CloneHandle(QHandle *pHandle, unsigned int index, Hand
 	}
 
 	pNewHandle->clone = index;
+	pNewHandle->object = NULL;
 	pHandle->refcount++;
 
 	*newhandle = new_handle;
@@ -620,8 +621,53 @@ HandleError HandleSystem::CloneHandle(Handle_t handle, Handle_t *newhandle, Iden
 	return CloneHandle(pHandle, index, newhandle, newOwner);
 }
 
+Handle_t HandleSystem::FastCloneHandle(QHandle *pHandle, unsigned int index)
+{
+	if (pHandle->clone)
+		return FastCloneHandle(&m_Handles[pHandle->clone], pHandle->clone);
+
+	Handle_t hndl;
+	if (CloneHandle(pHandle, index, &hndl, g_pCoreIdent) != HandleError_None)
+		return BAD_HANDLE;
+
+	return hndl;
+}
+
+Handle_t HandleSystem::FastCloneHandle(Handle_t hndl)
+{
+	QHandle *pHandle;
+	unsigned int index;
+
+	GetHandleUnchecked(hndl, pHandle, index);
+
+	return FastCloneHandle(pHandle, index);
+}
+
+void HandleSystem::GetHandleUnchecked(Handle_t hndl, QHandle *& pHandle, unsigned int &index)
+{
+#ifndef NDEBUG
+	unsigned int serial = (hndl >> 16);
+#endif
+	index = (hndl & HANDLESYS_HANDLE_MASK);
+
+	assert(index != 0 && index <= m_HandleTail && index < HANDLESYS_MAX_HANDLES);
+
+	pHandle = &m_Handles[index];
+
+	assert(pHandle->set && pHandle->set != HandleSet_Freed);
+	assert(pHandle->serial == serial);
+}
+
 HandleError HandleSystem::FreeHandle(QHandle *pHandle, unsigned int index)
 {
+	if (pHandle->is_destroying)
+	{
+		/* Someone tried to free this recursively.  
+		 * We'll just ignore this safely.
+		 */
+		return HandleError_None;
+	}
+
 	QHandleType *pType = &m_Types[pHandle->type];
 
 	if (pHandle->clone)
@@ -636,6 +682,7 @@ HandleError HandleSystem::FreeHandle(QHandle *pHandle, unsigned int index)
 		pMaster = &m_Handles[master];
 
 		/* Release the clone now */
+		pHandle->is_destroying = true;
 		ReleasePrimHandle(index);
 
 		/* Decrement the master's reference count */
@@ -644,20 +691,27 @@ HandleError HandleSystem::FreeHandle(QHandle *pHandle, unsigned int index)
 			/* Type should be the same but do this anyway... */
 			pType = &m_Types[pMaster->type];
 			pMaster->is_destroying = true;
-			pType->dispatch->OnHandleDestroy(pMaster->type, pMaster->object);
+			if (pMaster->object)
+			{
+				pType->dispatch->OnHandleDestroy(pMaster->type, pMaster->object);
+			}
 			ReleasePrimHandle(master);
 		}
 	} else if (pHandle->set == HandleSet_Identity) {
 		/* If we're an identity, skip all this stuff!
 		 * NOTE: SHARESYS DOES NOT CARE ABOUT THE DESTRUCTOR
 		 */
+		pHandle->is_destroying = true;
 		ReleasePrimHandle(index);
 	} else {
 		/* Decrement, free if necessary */
 		if (--pHandle->refcount == 0)
 		{
 			pHandle->is_destroying = true;
-			pType->dispatch->OnHandleDestroy(pHandle->type, pHandle->object);
+			if (pHandle->object)
+			{
+				pType->dispatch->OnHandleDestroy(pHandle->type, pHandle->object);
+			}
 			ReleasePrimHandle(index);
 		} else {
 			/* We must be cloned, so mark ourselves as freed */
@@ -690,14 +744,6 @@ HandleError HandleSystem::FreeHandle(Handle_t handle, const HandleSecurity *pSec
 		return HandleError_Access;
 	}
 
-	if (pHandle->is_destroying)
-	{
-		/* Someone tried to free this recursively.  
-		 * We'll just ignore this safely.
-		 */
-		return HandleError_None;
-	}
-
 	return FreeHandle(pHandle, index);
 }
 
@@ -756,6 +802,9 @@ void HandleSystem::UnlinkHandleFromOwner(QHandle *pHandle, unsigned int index)
 		assert(pHandle->owner == 0);
 		return;
 	}
+
+	pHandle->owner = NULL;
+
 	/* Note that since 0 is an invalid handle, if any of these links are 0,
 	* the data can still be set.
 	*/
@@ -880,29 +929,9 @@ bool HandleSystem::RemoveType(HandleType_t type, IdentityToken_t *ident)
 			{
 				continue;
 			}
-			if (pHandle->clone)
-			{
-				/* Get parent */
-				QHandle *pOther = &m_Handles[pHandle->clone];
-				if (--pOther->refcount == 0)
-				{
-					/* Free! */
-					dispatch->OnHandleDestroy(type, pOther->object);
-					ReleasePrimHandle(pHandle->clone);
-				}
-				/* Unlink ourselves since we don't have a reference count */
-				ReleasePrimHandle(i);
-			} else {
-				/* If it's not a clone, we still have to check the reference count.
-				 * Either way, we'll be destroyed eventually because the handle types do not change.
-				 */
-				if (--pHandle->refcount == 0)
-				{
-					/* Free! */
-					dispatch->OnHandleDestroy(type, pHandle->object);
-					ReleasePrimHandle(i);
-				}
-			}
+
+			FreeHandle(pHandle, i);
+
 			if (pType->opened == 0)
 			{
 				break;
@@ -950,14 +979,17 @@ bool HandleSystem::InitAccessDefaults(TypeAccess *pTypeAccess, HandleAccess *pHa
 	return true;
 }
 
+#define HANDLE_LOG_VERY_BAD(message, ...) \
+	g_Logger.LogFatal(message, ##__VA_ARGS__); \
+	g_Logger.LogError(message, ##__VA_ARGS__);
+
 bool HandleSystem::TryAndFreeSomeHandles()
 {
-	IPluginIterator *pl_iter = g_PluginSys.GetPluginIterator();
 	IPlugin *highest_owner = NULL;
 	unsigned int highest_handle_count = 0;
 
 	/* Search all plugins */
-	while (pl_iter->MorePlugins())
+	for (IPluginIterator *pl_iter = g_PluginSys.GetPluginIterator(); pl_iter->MorePlugins(); pl_iter->NextPlugin())
 	{
 		IPlugin *plugin = pl_iter->GetPlugin();
 		IdentityToken_t *identity = plugin->GetIdentity();
@@ -986,8 +1018,6 @@ bool HandleSystem::TryAndFreeSomeHandles()
 			highest_owner = plugin;
 			highest_handle_count = handle_count;
 		}
-
-		pl_iter->NextPlugin();
 	}
 
 	if (highest_owner == NULL || highest_handle_count == 0)
@@ -995,9 +1025,9 @@ bool HandleSystem::TryAndFreeSomeHandles()
 		return false;
 	}
 
-	g_Logger.LogFatal("[SM] MEMORY LEAK DETECTED IN PLUGIN (file \"%s\")", highest_owner->GetFilename());
-	g_Logger.LogFatal("[SM] Unloading plugin to free %d handles.", highest_handle_count);
-	g_Logger.LogFatal("[SM] Contact the author(s) of this plugin to correct this error.", highest_handle_count);
+	HANDLE_LOG_VERY_BAD("[SM] MEMORY LEAK DETECTED IN PLUGIN (file \"%s\")", highest_owner->GetFilename());
+	HANDLE_LOG_VERY_BAD("[SM] Unloading plugin to free %d handles.", highest_handle_count);
+	HANDLE_LOG_VERY_BAD("[SM] Contact the author(s) of this plugin to correct this error.", highest_handle_count);
 
 	highest_owner->GetBaseContext()->ThrowNativeErrorEx(SP_ERROR_MEMACCESS, "Memory leak");
 
@@ -1054,12 +1084,32 @@ void HandleSystem::Dump(HANDLE_REPORTER rep)
 		const char *type = "ANON";
 		QHandleType *pType = &m_Types[m_Handles[i].type];
 		unsigned int size = 0;
+		unsigned int parentIdx;
+		bool bresult;
 		if (pType->nameIdx != -1)
 		{
 			type = m_strtab->GetString(pType->nameIdx);
 		}
+
+		if ((parentIdx = m_Handles[i].clone) != 0)
+		{
+			if (m_Handles[parentIdx].refcount > 0)
+			{
+				size = 0;
+				bresult = true;
+			}
+			else
+			{
+				bresult = pType->dispatch->GetHandleApproxSize(m_Handles[parentIdx].type, m_Handles[parentIdx].object, &size);
+			}
+		}
+		else
+		{
+			bresult = pType->dispatch->GetHandleApproxSize(m_Handles[i].type, m_Handles[i].object, &size);
+		}
+
 		if (pType->dispatch->GetDispatchVersion() < HANDLESYS_MEMUSAGE_MIN_VERSION
-			|| !pType->dispatch->GetHandleApproxSize(m_Handles[i].type, m_Handles[i].object, &size))
+			|| !bresult)
 		{
 			rep("0x%08x\t%-20.20s\t%-20.20s\t%-10.10s", index, owner, type, "-1");
 		}

core/HandleSys.h

@@ -160,6 +160,9 @@ public: //IHandleSystem
 		HandleError *err);
 
 	void Dump(HANDLE_REPORTER rep);
+
+	/* Bypasses security checks. */
+	Handle_t FastCloneHandle(Handle_t hndl);
 protected:
 	/**
 	 * Decodes a handle with sanity and security checking.
@@ -170,6 +173,9 @@ protected:
 						  unsigned int *index,
 						  bool ignoreFree=false);
 
+	Handle_t FastCloneHandle(QHandle *pHandle, unsigned int index);
+	void GetHandleUnchecked(Handle_t hndl, QHandle *& pHandle, unsigned int &index);
+
 	/**
 	 * Creates a basic handle and sets its reference count to 1.
 	 * Does not do any type or security checking.
@@ -222,4 +228,27 @@ private:
 
 extern HandleSystem g_HandleSys;
 
+struct AutoHandleRooter
+{
+public:
+	AutoHandleRooter(Handle_t hndl)
+	{
+		if (hndl != BAD_HANDLE)
+			this->hndl = g_HandleSys.FastCloneHandle(hndl);
+		else
+			this->hndl = BAD_HANDLE;
+	}
+
+	~AutoHandleRooter()
+	{
+		if (hndl != BAD_HANDLE)
+		{
+			HandleSecurity sec(g_pCoreIdent, g_pCoreIdent);
+			g_HandleSys.FreeHandle(hndl, &sec);
+		}
+	}
+private:
+	Handle_t hndl;
+};
+
 #endif //_INCLUDE_SOURCEMOD_HANDLESYSTEM_H_

core/LibrarySys.cpp

@@ -241,7 +241,7 @@ bool LibrarySystem::IsPathDirectory(const char *path)
 		return true;
 	}
 
-#elif defined PLATFORM_LINUX
+#elif defined PLATFORM_POSIX
 	struct stat s;
 
 	if (stat(path, &s) != 0)
@@ -410,7 +410,7 @@ size_t LibrarySystem::GetFileFromPath(char *buffer, size_t maxlength, const char
 	size_t length = strlen(path);
 
 	for (size_t i = length - 1;
-		 i >= 0 && i <= length - 1;
+		 i <= length - 1;
 		 i--)
 	{
 		if (path[i] == '/' 

core/Logger.cpp

@@ -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, SM_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_VERSION_STRING);
 		fclose(fp);
 	}
 }
@@ -265,6 +265,8 @@ void Logger::LogToOpenFileEx(FILE *fp, const char *msg, va_list ap)
 		return;
 	}
 
+	static ConVar *sv_logecho = icvar->FindVar("sv_logecho");
+
 	char buffer[3072];
 	UTIL_FormatArgs(buffer, sizeof(buffer), msg, ap);
 
@@ -275,7 +277,11 @@ void Logger::LogToOpenFileEx(FILE *fp, const char *msg, va_list ap)
 	strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
 
 	fprintf(fp, "L %s: %s\n", date, buffer);
-	g_SMAPI->ConPrintf("L %s: %s\n", date, buffer);
+
+	if (!sv_logecho || sv_logecho->GetBool())
+	{
+		g_SMAPI->ConPrintf("L %s: %s\n", date, buffer);
+	}
 }
 
 void Logger::LogToFileOnlyEx(FILE *fp, const char *msg, va_list ap)
@@ -356,7 +362,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, SM_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_VERSION_STRING);
 	 	}
 		va_list ap;
 		va_start(ap, vafmt);

core/Makefile

@@ -2,32 +2,32 @@
 # Makefile written by David "BAILOPAN" Anderson
 
 SMSDK = ..
-SRCDS_BASE = ~/srcds
 HL2SDK_ORIG = ../../hl2sdk
 HL2SDK_OB = ../../hl2sdk-ob
+HL2SDK_CSS = ../../hl2sdk-css
 HL2SDK_OB_VALVE = ../../hl2sdk-ob-valve
 HL2SDK_L4D = ../../hl2sdk-l4d
 HL2SDK_L4D2 = ../../hl2sdk-l4d2
-MMSOURCE17 = ../../mmsource-central
+HL2SDK_CSGO = ../../hl2sdk-csgo
+MMSOURCE = ../../mmsource-central
 
 #####################################
 ### EDIT BELOW FOR OTHER PROJECTS ###
 #####################################
 
 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 TimerSys.cpp Translator.cpp UserMessages.cpp \
-	sm_autonatives.cpp sm_memtable.cpp sm_srvcmds.cpp sm_stringutil.cpp sm_trie.cpp \
+	Database.cpp DebugReporter.cpp EventManager.cpp HalfLife2.cpp Logger.cpp \
+	PlayerManager.cpp TimerSys.cpp UserMessages.cpp \
+	sm_autonatives.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 PhraseCollection.cpp NextMap.cpp \
+	MenuStyle_Radio.cpp ChatTriggers.cpp ADTFactory.cpp MenuVoting.cpp \
+	frame_hooks.cpp concmd_cleaner.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_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 \
+OBJECTS += smn_bitbuffer.cpp smn_console.cpp smn_core.cpp \
+	smn_database.cpp smn_entities.cpp smn_events.cpp \
+	smn_fakenatives.cpp smn_filesystem.cpp smn_halflife.cpp \
+	smn_keyvalues.cpp smn_player.cpp \
+	smn_usermsgs.cpp smn_menus.cpp smn_vector.cpp \
 	smn_hudtext.cpp smn_nextmap.cpp
 OBJECTS += ExtensionSys.cpp 		\
 		   ForwardSys.cpp 			\
@@ -49,80 +49,119 @@ CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
 CPP = gcc
 
 override ENGSET = false
+
+ifneq (,$(filter original orangebox css orangeboxvalve left4dead left4dead2 csgo,$(ENGINE)))
+	override ENGSET = true
+endif
+
 ifeq "$(ENGINE)" "original"
 	HL2SDK = $(HL2SDK_ORIG)
-	HL2PUB = $(HL2SDK)/public
 	HL2LIB = $(HL2SDK)/linux_sdk
 	CFLAGS += -DSOURCE_ENGINE=1
-	METAMOD = $(MMSOURCE17)/core-legacy
+	METAMOD = $(MMSOURCE)/core-legacy
 	INCLUDE += -I$(HL2SDK)/public/dlls
-	SRCDS = $(SRCDS_BASE)
 	BINARY = sourcemod.1.ep1.so
-	override ENGSET = true
 endif
 ifeq "$(ENGINE)" "orangebox"
 	HL2SDK = $(HL2SDK_OB)
-	HL2PUB = $(HL2SDK)/public
 	HL2LIB = $(HL2SDK)/lib/linux
 	CFLAGS += -DSOURCE_ENGINE=3
-	METAMOD = $(MMSOURCE17)/core
+	METAMOD = $(MMSOURCE)/core
 	INCLUDE += -I$(HL2SDK)/public/game/server
-	SRCDS = $(SRCDS_BASE)/orangebox
 	BINARY = sourcemod.2.ep2.so
-	override ENGSET = true
+endif
+ifeq "$(ENGINE)" "css"
+	HL2SDK = $(HL2SDK_CSS)
+	HL2LIB = $(HL2SDK)/lib/linux
+	CFLAGS += -DSOURCE_ENGINE=6
+	METAMOD = $(MMSOURCE)/core
+	INCLUDE += -I$(HL2SDK)/public/game/server 
+	BINARY = sourcemod.2.css.so
 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
+	CFLAGS += -DSOURCE_ENGINE=7
+	METAMOD = $(MMSOURCE)/core
+	INCLUDE += -I$(HL2SDK)/public/game/server 
 	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=5
-	METAMOD = $(MMSOURCE17)/core
+	CFLAGS += -DSOURCE_ENGINE=8
+	METAMOD = $(MMSOURCE)/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
+	CFLAGS += -DSOURCE_ENGINE=9
+	METAMOD = $(MMSOURCE)/core
 	INCLUDE += -I$(HL2SDK)/public/game/server
-	SRCDS = $(SRCDS_BASE)/left4dead2_demo
 	BINARY = sourcemod.2.l4d2.so
-	override ENGSET = true
+endif
+ifeq "$(ENGINE)" "csgo"
+	HL2SDK = $(HL2SDK_CSGO)
+	HL2LIB = $(HL2SDK)/lib/linux
+	CFLAGS += -DSOURCE_ENGINE=12
+	METAMOD = $(MMSOURCE)/core
+	INCLUDE += -I$(HL2SDK)/public/game/server
+	BINARY = sourcemod.2.csgo.so
 endif
 
-CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 -DSE_LEFT4DEAD=5 -DSE_LEFT4DEAD2=6
+HL2PUB = $(HL2SDK)/public
 
-ifeq "$(ENGINE)" "left4dead2"
-LINK += $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a vstdlib_linux.so \
-	tier0_linux.so -static-libgcc
+OS := $(shell uname -s)
+
+ifeq "$(OS)" "Darwin"
+	LIB_EXT = dylib
+	HL2LIB = $(HL2SDK)/lib/mac
 else
-LINK += $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a vstdlib_i486.so \
-	tier0_i486.so -static-libgcc
+	LIB_EXT = so
+	ifeq "$(ENGINE)" "original"
+		HL2LIB = $(HL2SDK)/linux_sdk
+	else
+		HL2LIB = $(HL2SDK)/lib/linux
+	endif
+endif
+
+ifneq (,$(filter original orangebox left4dead,$(ENGINE)))
+	LIB_SUFFIX = _i486.$(LIB_EXT)
+else
+	LIB_PREFIX = lib
+	ifneq (,$(filter orangeboxvalve css,$(ENGINE)))
+		ifneq "$(OS)" "Darwin"
+			LIB_SUFFIX = _srv.$(LIB_EXT)
+		else
+			LIB_SUFFIX = .$(LIB_EXT)
+		endif
+	else
+		LIB_SUFFIX = .$(LIB_EXT)
+	endif
+endif
+
+CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_BLOODYGOODTIME=4 -DSE_EYE=5 \
+	-DSE_CSS=6 -DSE_ORANGEBOXVALVE=7 -DSE_LEFT4DEAD=8 -DSE_LEFT4DEAD2=9 -DSE_ALIENSWARM=10 \
+	-DSE_PORTAL2=11 -DSE_CSGO=12
+
+LINK += $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a $(LIB_PREFIX)vstdlib$(LIB_SUFFIX) \
+	$(LIB_PREFIX)tier0$(LIB_SUFFIX) -static-libgcc
+
+ifeq "$(ENGINE)" "csgo"
+	LINK += $(HL2LIB)/interfaces_i486.a
 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 \
 	-I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn
 
-CFLAGS += -D_LINUX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp \
+CFLAGS += -D_LINUX -DPOSIX -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
-CPPFLAGS += -Wno-non-virtual-dtor -fno-exceptions -fno-rtti
+	-Wno-uninitialized -Wno-unused -Wno-switch -mfpmath=sse -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H \
+	-DSM_DEFAULT_THREADER -m32 -DCOMPILER_GCC
+CPPFLAGS += -Wno-non-virtual-dtor -Wno-overloaded-virtual -fno-threadsafe-statics -fno-exceptions -fno-rtti
 
 ################################################
 ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ###
@@ -153,18 +192,14 @@ $(BIN_DIR)/%.o: %.c
 
 all: check
 	mkdir -p $(BIN_DIR)
-ifeq "$(ENGINE)" "left4dead2"
-	ln -sf $(SRCDS)/bin/vstdlib_linux.so vstdlib_linux.so;
-	ln -sf $(SRCDS)/bin/tier0_linux.so tier0_linux.so;
-else
-	ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so;
-	ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so;
-endif
+	ln -sf $(HL2LIB)/$(LIB_PREFIX)vstdlib$(LIB_SUFFIX)
+	ln -sf $(HL2LIB)/$(LIB_PREFIX)tier0$(LIB_SUFFIX)
 	$(MAKE) -f Makefile sourcemod
 
 check:
 	if [ "$(ENGSET)" = "false" ]; then \
-		echo "You must supply ENGINE=left4dead or ENGINE=orangebox or ENGINE=original"; \
+		echo "You must supply one of the following values for ENGINE:"; \
+		echo "csgo, left4dead2, left4dead, orangeboxvalve, css, orangebox, or original"; \
 		exit 1; \
 	fi
 

core/MenuManager.cpp

@@ -41,7 +41,7 @@
 #include "ShareSys.h"
 #include "HandleSys.h"
 #include "sourcemm_api.h"
-#include "Translator.h"
+#include "logic_bridge.h"
 
 MenuManager g_Menus;
 VoteMenuHandler s_VoteHandler;
@@ -231,6 +231,7 @@ IMenuPanel *MenuManager::RenderMenu(int client, menu_states_t &md, ItemOrder ord
 	unsigned int pgn = menu->GetPagination();
 	unsigned int maxItems = style->GetMaxPageItems();
 	bool exitButton = (menu->GetMenuOptionFlags() & MENUFLAG_BUTTON_EXIT) == MENUFLAG_BUTTON_EXIT;
+	bool novoteButton = (menu->GetMenuOptionFlags() & MENUFLAG_BUTTON_NOVOTE) == MENUFLAG_BUTTON_NOVOTE;
 
 	if (pgn != MENU_NO_PAGINATION)
 	{
@@ -241,6 +242,11 @@ IMenuPanel *MenuManager::RenderMenu(int client, menu_states_t &md, ItemOrder ord
 		maxItems--;
 	}
 
+	if (novoteButton)
+	{
+		maxItems--;
+	}
+
 	/* This is very not allowed! */
 	if (maxItems < 2)
 	{
@@ -436,6 +442,20 @@ skip_search:
 	/* Draw the item according to the order */
 	menu_slots_t *slots = md.slots;
 	unsigned int position = 0;			/* Keep track of the last position */
+
+	if (novoteButton)
+	{
+		char text[50];
+		if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "No Vote", &client))
+		{
+			UTIL_Format(text, sizeof(text), "No Vote");
+		}
+		ItemDrawInfo dr(text, 0);
+		position = panel->DrawItem(dr);
+		slots[position].type = ItemSel_Exit;
+		position++;
+	}
+
 	if (order == ItemOrder_Ascending)
 	{
 		md.item_on_page = drawItems[0].position;
@@ -586,7 +606,7 @@ skip_search:
 				{
 					if (exitBackButton)
 					{
-						if (!CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Back", &client))
+						if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Back", &client))
 						{
 							UTIL_Format(text, sizeof(text), "Back");
 						}
@@ -596,7 +616,7 @@ skip_search:
 					}
 					else
 					{
-						if (!CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Previous", &client))
+						if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Previous", &client))
 						{
 							UTIL_Format(text, sizeof(text), "Previous");
 						}
@@ -617,7 +637,7 @@ skip_search:
 				/* NEXT */
 				if (displayNext || canDrawDisabled)
 				{
-					if (!CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Next", &client))
+					if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Next", &client))
 					{
 						UTIL_Format(text, sizeof(text), "Next");
 					}
@@ -648,7 +668,7 @@ skip_search:
 		/* EXIT */
 		if (exitButton)
 		{
-			if (!CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Exit", &client))
+			if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Exit", &client))
 			{
 				UTIL_Format(text, sizeof(text), "Exit");
 			}

core/MenuStyle_Base.cpp

@@ -322,15 +322,24 @@ void BaseMenuStyle::ClientPressedKey(int client, unsigned int key_press)
 					if (pCollideable)
 					{
 						const Vector & pos = pCollideable->GetCollisionOrigin();
-		
 						enginesound->EmitSound(filter, 
 							client, 
 							CHAN_AUTO, 
+#if SOURCE_ENGINE >= SE_PORTAL2
+							sound, 
+							-1, 
+#endif
 							sound, 
 							VOL_NORM, 
 							ATTN_NORM, 
+#if SOURCE_ENGINE >= SE_PORTAL2
+							0, 
+#endif
 							0, 
 							PITCH_NORM, 
+#if SOURCE_ENGINE == SE_CSS || SOURCE_ENGINE == SE_HL2DM || SOURCE_ENGINE == SE_DODS || SOURCE_ENGINE == SE_TF2
+							0,
+#endif
 							&pos);
 					}
 				}
@@ -377,6 +386,9 @@ void BaseMenuStyle::ClientPressedKey(int client, unsigned int key_press)
 		RemoveClientFromWatch(client);
 	}
 
+	Handle_t hndl = menu ? menu->GetHandle() : BAD_HANDLE;
+	AutoHandleRooter ahr(hndl);
+
 	if (cancel)
 	{
 		mh->OnMenuCancel(menu, client, reason);

core/MenuStyle_Radio.cpp

@@ -32,11 +32,20 @@
 #include "MenuStyle_Radio.h"
 #include "sm_stringutil.h"
 #include "UserMessages.h"
-#include "GameConfigs.h"
+#include <IGameConfigs.h>
 #include "PlayerManager.h"
 #if defined MENU_DEBUG
 #include "Logger.h"
 #endif
+#include "logic_bridge.h"
+
+#ifdef USE_PROTOBUF_USERMESSAGES
+#include <google/protobuf/descriptor.h>
+#endif
+
+#if SOURCE_ENGINE == SE_CSGO
+#include <game/shared/csgo/protobuf/cstrike15_usermessages.pb.h>
+#endif
 
 extern const char *g_RadioNumTable[];
 CRadioStyle g_RadioMenuStyle;
@@ -44,6 +53,14 @@ int g_ShowMenuId = -1;
 bool g_bRadioInit = false;
 unsigned int g_RadioMenuTimeout = 0;
 
+// back, next, exit
+#define MAX_PAGINATION_OPTIONS 3
+
+#define MAX_MENUSLOT_KEYS 10
+
+static unsigned int s_RadioMaxPageItems = MAX_MENUSLOT_KEYS;
+
+
 CRadioStyle::CRadioStyle()
 {
 	m_players = new CRadioMenuPlayer[256+1];
@@ -89,6 +106,18 @@ void CRadioStyle::OnSourceModLevelChange(const char *mapName)
 		g_RadioMenuTimeout = 0;
 	}
 
+	const char *items = g_pGameConf->GetKeyValue("RadioMenuMaxPageItems");
+	if (items != NULL)
+	{
+		int value = atoi(items);
+
+		// Only override the mostly-safe default if it's a sane value
+		if (value > MAX_PAGINATION_OPTIONS && value <= MAX_MENUSLOT_KEYS)
+		{
+			s_RadioMaxPageItems = value;
+		}
+	}
+
 	g_Menus.AddStyle(this);
 	g_Menus.SetDefaultStyle(this);
 
@@ -134,13 +163,22 @@ static unsigned int g_last_holdtime = 0;
 static unsigned int g_last_client_count = 0;
 static int g_last_clients[256];
 
+#ifdef USE_PROTOBUF_USERMESSAGES
+void CRadioStyle::OnUserMessage(int msg_id, protobuf::Message &msg, IRecipientFilter *pFilter)
+#else
 void CRadioStyle::OnUserMessage(int msg_id, bf_write *bf, IRecipientFilter *pFilter)
+#endif
 {
 	int count = pFilter->GetRecipientCount();
+
+#ifdef USE_PROTOBUF_USERMESSAGES
+	int c = ((CCSUsrMsg_ShowMenu &)msg).display_time();
+#else
 	bf_read br(bf->GetBasePointer(), 3);
 
 	br.ReadWord();
 	int c = br.ReadChar();
+#endif
 
 	g_last_holdtime = (c == -1) ? 0 : (unsigned)c;
 
@@ -188,7 +226,7 @@ IBaseMenu *CRadioStyle::CreateMenu(IMenuHandler *pHandler, IdentityToken_t *pOwn
 
 unsigned int CRadioStyle::GetMaxPageItems()
 {
-	return 10;
+	return s_RadioMaxPageItems;
 }
 
 const char *CRadioStyle::GetStyleName()
@@ -306,7 +344,7 @@ unsigned int CRadioDisplay::GetCurrentKey()
 
 bool CRadioDisplay::SetCurrentKey(unsigned int key)
 {
-	if (key < m_NextPos || m_NextPos > 10)
+	if (key < m_NextPos || m_NextPos > s_RadioMaxPageItems)
 	{
 		return false;
 	}
@@ -342,7 +380,7 @@ void CRadioDisplay::DrawTitle(const char *text, bool onlyIfEmpty/* =false */)
 
 unsigned int CRadioDisplay::DrawItem(const ItemDrawInfo &item)
 {
-	if (m_NextPos > 10 || !CanDrawItem(item.style))
+	if (m_NextPos > s_RadioMaxPageItems || !CanDrawItem(item.style))
 	{
 		return 0;
 	}
@@ -451,6 +489,15 @@ void CRadioMenuPlayer::Radio_Refresh()
 		time = menuHoldTime - (unsigned int)(gpGlobals->curtime - menuStartTime);
 	}
 
+#ifdef USE_PROTOBUF_USERMESSAGES
+	// If or when we need to support multiple games per engine with this, we can switch to reflection
+	// TODO: find what happens past 240 on CS:GO
+	CCSUsrMsg_ShowMenu *msg = (CCSUsrMsg_ShowMenu *)g_UserMsgs.StartProtobufMessage(g_ShowMenuId, players, 1, USERMSG_BLOCKHOOKS);
+	msg->set_bits_valid_slots(display_keys);
+	msg->set_display_time(time);
+	msg->set_menu_string(ptr);
+	g_UserMsgs.EndMessage();
+#else
 	while (true)
 	{
 		if (len > 240)
@@ -458,7 +505,8 @@ void CRadioMenuPlayer::Radio_Refresh()
 			save = ptr[240];
 			ptr[240] = '\0';
 		}
-		bf_write *buffer = g_UserMsgs.StartMessage(g_ShowMenuId, players, 1, USERMSG_BLOCKHOOKS);
+
+		bf_write *buffer = g_UserMsgs.StartBitBufMessage(g_ShowMenuId, players, 1, USERMSG_BLOCKHOOKS);
 		buffer->WriteWord(display_keys);
 		buffer->WriteChar(time ? time : -1);
 		buffer->WriteByte( (len > 240) ? 1 : 0 );
@@ -475,6 +523,7 @@ void CRadioMenuPlayer::Radio_Refresh()
 			break;
 		}
 	}
+#endif
 
 	display_last_refresh = gpGlobals->curtime;
 }
@@ -510,6 +559,7 @@ unsigned int CRadioDisplay::GetApproxMemUsage()
 CRadioMenu::CRadioMenu(IMenuHandler *pHandler, IdentityToken_t *pOwner) : 
 CBaseMenu(pHandler, &g_RadioMenuStyle, pOwner)
 {
+	m_Pagination = s_RadioMaxPageItems - MAX_PAGINATION_OPTIONS;
 }
 
 bool CRadioMenu::SetExtOption(MenuOption option, const void *valuePtr)
@@ -550,6 +600,17 @@ bool CRadioMenu::DisplayAtItem(int client,
 		time);
 }
 
+bool CRadioMenu::SetPagination(unsigned int itemsPerPage)
+{
+	const unsigned int maxPerPage = s_RadioMaxPageItems - MAX_PAGINATION_OPTIONS;
+	if (itemsPerPage > maxPerPage)
+	{
+		return false;
+	}
+
+	return CBaseMenu::SetPagination(itemsPerPage);
+}
+
 void CRadioMenu::Cancel_Finally()
 {
 	g_RadioMenuStyle.CancelMenu(this);

core/MenuStyle_Radio.h

@@ -37,7 +37,7 @@
 #include "MenuStyle_Base.h"
 #include "sourcemm_api.h"
 #include <IPlayerHelpers.h>
-#include <IUserMessages.h>
+#include "UserMessages.h"
 #include "sm_fastlink.h"
 #include <sh_stack.h>
 #include <compat_wrappers.h>
@@ -65,7 +65,11 @@ private:
 class CRadioStyle : 
 	public BaseMenuStyle,
 	public SMGlobalClass,
-	public IUserMessageListener
+#ifdef USE_PROTOBUF_USERMESSAGES
+	public IProtobufUserMessageListener
+#else
+	public IBitBufUserMessageListener
+#endif
 {
 public:
 	CRadioStyle();
@@ -84,7 +88,11 @@ public: //IMenuStyle
 	unsigned int GetMaxPageItems();
 	unsigned int GetApproxMemUsage();
 public: //IUserMessageListener
+#ifdef USE_PROTOBUF_USERMESSAGES
+	void OnUserMessage(int msg_id, protobuf::Message &msg, IRecipientFilter *pFilter);
+#else
 	void OnUserMessage(int msg_id, bf_write *bf, IRecipientFilter *pFilter);
+#endif
 	void OnUserMessageSent(int msg_id);
 public:
 	bool IsSupported();
@@ -142,6 +150,7 @@ public:
 		unsigned int time,
 		unsigned int start_item,
 		IMenuHandler *alt_handler/* =NULL */);
+	bool SetPagination(unsigned int itemsPerPage);
 	void Cancel_Finally();
 	unsigned int GetApproxMemUsage();
 };

core/MenuStyle_Valve.cpp

@@ -32,7 +32,6 @@
 #include "sm_stringutil.h"
 #include "PlayerManager.h"
 #include "MenuStyle_Valve.h"
-#include "Translator.h"
 #include "PlayerManager.h"
 #include "ConCmdManager.h"
 

core/MenuVoting.cpp

@@ -39,7 +39,8 @@
 #include <HalfLife2.h>
 #include <mathlib.h>
 #include <const.h>
-#include <Translator.h>
+#include <ITranslator.h>
+#include "logic_bridge.h"
 
 float g_next_vote = 0.0f;
 
@@ -517,7 +518,7 @@ void VoteMenuHandler::OnMenuSelect(IBaseMenu *menu, int client, unsigned int ite
 		m_Votes[item]++;
 		m_NumVotes++;
 
-		if (sm_vote_chat.GetBool() || sm_vote_console.GetBool())
+		if (sm_vote_chat.GetBool() || sm_vote_console.GetBool() || sm_vote_client_console.GetBool())
 		{
 			static char buffer[1024];
 			ItemDrawInfo dr;
@@ -526,7 +527,8 @@ void VoteMenuHandler::OnMenuSelect(IBaseMenu *menu, int client, unsigned int ite
 			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);
+				logicore.CoreTranslate(buffer, sizeof(buffer), "[SM] %T", 4, NULL, "Voted For",
+				                       &target, g_Players.GetPlayerByIndex(client)->GetName(), dr.display);
 				Engine_LogPrintWrapper(buffer);
 			}
 			
@@ -538,15 +540,17 @@ void VoteMenuHandler::OnMenuSelect(IBaseMenu *menu, int client, unsigned int ite
 					CPlayer *pPlayer = g_Players.GetPlayerByIndex(i);
 					assert(pPlayer);
 
-					if (pPlayer->IsInGame())
+					if (pPlayer->IsInGame() && !pPlayer->IsFakeClient())
 					{
 						if (m_Revoting[client])
 						{
-							CoreTranslate(buffer, sizeof(buffer), "[SM] %T", 4, NULL, "Changed Vote", &i, g_Players.GetPlayerByIndex(client)->GetName(), dr.display);
+							logicore.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);
+							logicore.CoreTranslate(buffer, sizeof(buffer), "[SM] %T", 4, NULL, "Voted For",
+							                       &i, g_Players.GetPlayerByIndex(client)->GetName(), dr.display);
 						}
 
 						if (sm_vote_chat.GetBool())
@@ -556,7 +560,7 @@ void VoteMenuHandler::OnMenuSelect(IBaseMenu *menu, int client, unsigned int ite
 
 						if (sm_vote_client_console.GetBool())
 						{
-							engine->ClientPrintf(pPlayer->GetEdict(), buffer);
+							ClientConsolePrint(pPlayer->GetEdict(), buffer);
 						}		
 					}
 				}
@@ -634,7 +638,8 @@ void VoteMenuHandler::DrawHintProgress()
 	{
 		if (g_Players.GetPlayerByIndex(i)->IsInGame())
 		{
-			CoreTranslate(buffer, sizeof(buffer), "%T%s", 6, NULL, "Vote Count", &i, &m_NumVotes, &m_TotalClients, &iTimeRemaining, &m_leaderList);
+			logicore.CoreTranslate(buffer, sizeof(buffer), "%T%s", 6, NULL, "Vote Count",
+			                       &i, &m_NumVotes, &m_TotalClients, &iTimeRemaining, &m_leaderList);
 			g_HL2.HintTextMsg(i, buffer);
 		}
 	}

core/NextMap.cpp

@@ -31,6 +31,7 @@
 
 #include "NextMap.h"
 #include "Logger.h"
+#include "HalfLife2.h"
 #include "sourcemm_api.h"
 #include "sm_stringutil.h"
 #include "sourcehook.h"
@@ -109,7 +110,7 @@ const char *NextMapManager::GetNextMap()
 
 bool NextMapManager::SetNextMap(const char *map)
 {
-	if (!engine->IsMapValid(map))
+	if (!g_HL2.IsMapValid(map))
 	{
 		return false;
 	}
@@ -133,7 +134,7 @@ void NextMapManager::HookChangeLevel(const char *map, const char *unknown, const
 
 	const char *newmap = sm_nextmap.GetString();
 
-	if (newmap[0] == 0 || !engine->IsMapValid(newmap))
+	if (newmap[0] == 0 || !g_HL2.IsMapValid(newmap))
 	{
 		RETURN_META(MRES_IGNORED);
 	}
@@ -183,14 +184,14 @@ void NextMapManager::OnSourceModLevelChange( const char *mapName )
 	m_tempChangeInfo.m_mapName[0] ='\0';
 	m_tempChangeInfo.m_changeReason[0] = '\0';
 	m_tempChangeInfo.startTime = time(NULL);
-	UTIL_Format(lastMap, sizeof(lastMap), mapName);
+	UTIL_Format(lastMap, sizeof(lastMap), "%s", mapName);
 }
 
 void NextMapManager::ForceChangeLevel( const char *mapName, const char* changeReason )
 {
 	/* Store the mapname and reason */
-	UTIL_Format(m_tempChangeInfo.m_mapName, sizeof(m_tempChangeInfo.m_mapName), mapName);
-	UTIL_Format(m_tempChangeInfo.m_changeReason, sizeof(m_tempChangeInfo.m_changeReason), changeReason);
+	UTIL_Format(m_tempChangeInfo.m_mapName, sizeof(m_tempChangeInfo.m_mapName), "%s", mapName);
+	UTIL_Format(m_tempChangeInfo.m_changeReason, sizeof(m_tempChangeInfo.m_changeReason), "%s", changeReason);
 
 	/* Change level and skip our hook */
 	g_forcedChange = true;

core/NextMap.h

@@ -53,7 +53,7 @@ struct MapChangeData
 		startTime = 0;
 	}
 
-	char m_mapName[32];
+	char m_mapName[PLATFORM_MAX_PATH];
 	char m_changeReason[100];
 	time_t startTime;
 };

core/PlayerManager.cpp

@@ -39,23 +39,23 @@
 #include "sm_stringutil.h"
 #include "CoreConfig.h"
 #include "TimerSys.h"
-#include "Translator.h"
 #include "Logger.h"
 #include "ChatTriggers.h"
 #include "HalfLife2.h"
 #include <inetchannel.h>
 #include <iclient.h>
-#include "GameConfigs.h"
+#include <IGameConfigs.h>
 #include "ExtensionSys.h"
 #include <sourcemod_version.h>
 #include "ConsoleDetours.h"
+#include "logic_bridge.h"
 
 PlayerManager g_Players;
 bool g_OnMapStarted = false;
 IForward *PreAdminCheck = NULL;
 IForward *PostAdminCheck = NULL;
 IForward *PostAdminFilter = NULL;
-IForward *OnClientConnected = NULL;
+
 const unsigned int *g_NumPlayersToAuth = NULL;
 int lifestate_offset = -1;
 List<ICommandTargetProcessor *> target_processors;
@@ -113,6 +113,11 @@ PlayerManager::PlayerManager()
 	m_FirstPass = false;
 	m_maxClients = 0;
 
+	m_SourceTVUserId = -1;
+	m_ReplayUserId = -1;
+
+	m_bAuthstringValidation = false; // don't use steam auth by default... yet
+
 	m_UserIdLookUp = new int[USHRT_MAX+1];
 	memset(m_UserIdLookUp, 0, sizeof(int) * (USHRT_MAX+1));
 }
@@ -142,6 +147,7 @@ void PlayerManager::OnSourceModAllInitialized()
 	ParamType p2[] = {Param_Cell};
 
 	m_clconnect = g_Forwards.CreateForward("OnClientConnect", ET_LowEvent, 3, p1);
+	m_clconnect_post = g_Forwards.CreateForward("OnClientConnected", ET_Ignore, 1, p2);
 	m_clputinserver = g_Forwards.CreateForward("OnClientPutInServer", ET_Ignore, 1, p2);
 	m_cldisconnect = g_Forwards.CreateForward("OnClientDisconnect", ET_Ignore, 1, p2);
 	m_cldisconnect_post = g_Forwards.CreateForward("OnClientDisconnect_Post", ET_Ignore, 1, p2);
@@ -150,7 +156,6 @@ void PlayerManager::OnSourceModAllInitialized()
 	m_clauth = g_Forwards.CreateForward("OnClientAuthorized", ET_Ignore, 2, NULL, Param_Cell, Param_String);
 	m_onActivate = g_Forwards.CreateForward("OnServerLoad", ET_Ignore, 0, NULL);
 	m_onActivate2 = g_Forwards.CreateForward("OnMapStart", ET_Ignore, 0, NULL);
-	OnClientConnected = g_Forwards.CreateForward("OnClientConnected", ET_Ignore, 1, p2);
 
 	PreAdminCheck = g_Forwards.CreateForward("OnClientPreAdminCheck", ET_Event, 1, p1);
 	PostAdminCheck = g_Forwards.CreateForward("OnClientPostAdminCheck", ET_Ignore, 1, p1);
@@ -159,8 +164,6 @@ void PlayerManager::OnSourceModAllInitialized()
 	m_bIsListenServer = !engine->IsDedicatedServer();
 	m_ListenClient = 0;
 
-	g_ConVarManager.AddConVarChangeListener("tv_enable", this);
-
 	ConCommand *pCmd = FindCommand("maxplayers");
 	if (pCmd != NULL)
 	{
@@ -172,6 +175,7 @@ void PlayerManager::OnSourceModAllInitialized()
 void PlayerManager::OnSourceModShutdown()
 {
 	SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientConnect, serverClients, this, &PlayerManager::OnClientConnect, false);
+	SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientConnect, serverClients, this, &PlayerManager::OnClientConnect_Post, true);
 	SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientPutInServer, serverClients, this, &PlayerManager::OnClientPutInServer, true);
 	SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientDisconnect, serverClients, this, &PlayerManager::OnClientDisconnect, false);
 	SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientDisconnect, serverClients, this, &PlayerManager::OnClientDisconnect_Post, true);
@@ -181,6 +185,7 @@ void PlayerManager::OnSourceModShutdown()
 
 	/* Release forwards */
 	g_Forwards.ReleaseForward(m_clconnect);
+	g_Forwards.ReleaseForward(m_clconnect_post);
 	g_Forwards.ReleaseForward(m_clputinserver);
 	g_Forwards.ReleaseForward(m_cldisconnect);
 	g_Forwards.ReleaseForward(m_cldisconnect_post);
@@ -189,7 +194,6 @@ void PlayerManager::OnSourceModShutdown()
 	g_Forwards.ReleaseForward(m_clauth);
 	g_Forwards.ReleaseForward(m_onActivate);
 	g_Forwards.ReleaseForward(m_onActivate2);
-	g_Forwards.ReleaseForward(OnClientConnected);
 
 	g_Forwards.ReleaseForward(PreAdminCheck);
 	g_Forwards.ReleaseForward(PostAdminCheck);
@@ -197,8 +201,6 @@ void PlayerManager::OnSourceModShutdown()
 
 	delete [] m_Players;
 
-	g_ConVarManager.RemoveConVarChangeListener("tv_enable", this);
-
 	if (maxplayersCmd != NULL)
 	{
 		SH_REMOVE_HOOK_STATICFUNC(ConCommand, Dispatch, maxplayersCmd, CmdMaxplayersCallback, true);
@@ -229,16 +231,43 @@ ConfigResult PlayerManager::OnSourceModConfigChanged(const char *key,
 			return ConfigResult_Reject;
 		}
 		return ConfigResult_Accept;
+	} else if (strcmp( key, "SteamAuthstringValidation" ) == 0) {
+		if (strcasecmp(value, "yes") == 0)
+		{
+			m_bAuthstringValidation = true;
+		} else if ( strcasecmp(value, "no") == 0) {
+			m_bAuthstringValidation = false;
+		} else {
+			UTIL_Format(error, maxlength, "Invalid value: must be \"yes\" or \"no\"");
+			return ConfigResult_Reject;
+		}
+		return ConfigResult_Accept;
 	}
 	return ConfigResult_Ignore;
 }
 
 void PlayerManager::OnServerActivate(edict_t *pEdictList, int edictCount, int clientMax)
 {
+	static ConVar *tv_enable = icvar->FindVar("tv_enable");
+#if SOURCE_ENGINE == SE_TF2
+	static ConVar *replay_enable = icvar->FindVar("replay_enable");
+#endif
+
+	// clientMax will not necessarily be correct here (such as on late SourceTV enable)
+	m_maxClients = gpGlobals->maxClients;
+
+	ICommandLine *commandLine = g_HL2.GetValveCommandLine();
+	m_bIsSourceTVActive = (tv_enable && tv_enable->GetBool() && (!commandLine || commandLine->FindParm("-nohltv") == 0));
+	m_bIsReplayActive = false;
+#if SOURCE_ENGINE == SE_TF2
+	m_bIsReplayActive = (replay_enable && replay_enable->GetBool());
+#endif
+	m_PlayersSinceActive = 0;
+	
 	if (!m_FirstPass)
 	{
 		/* Initialize all players */
-		m_maxClients = clientMax;
+
 		m_PlayerCount = 0;
 		m_Players = new CPlayer[ABSOLUTE_PLAYER_LIMIT + 1];
 		m_AuthQueue = new unsigned int[ABSOLUTE_PLAYER_LIMIT + 1];
@@ -247,10 +276,13 @@ void PlayerManager::OnServerActivate(edict_t *pEdictList, int edictCount, int cl
 		memset(m_AuthQueue, 0, sizeof(unsigned int) * (ABSOLUTE_PLAYER_LIMIT + 1));
 
 		g_NumPlayersToAuth = &m_AuthQueue[0];
-
-		g_PluginSys.SyncMaxClients(clientMax);
 	}
-	g_Extensions.CallOnCoreMapStart(pEdictList, edictCount, clientMax);
+
+	g_PluginSys.SyncMaxClients(m_maxClients);
+
+	g_OnMapStarted = true;
+
+	g_Extensions.CallOnCoreMapStart(pEdictList, edictCount, m_maxClients);
 	m_onActivate->Execute(NULL);
 	m_onActivate2->Execute(NULL);
 
@@ -259,12 +291,10 @@ void PlayerManager::OnServerActivate(edict_t *pEdictList, int edictCount, int cl
 	{
 		if ((*iter)->GetClientListenerVersion() >= 5)
 		{
-			(*iter)->OnServerActivated(clientMax);
+			(*iter)->OnServerActivated(m_maxClients);
 		}
 	}
 
-	g_OnMapStarted = true;
-
 	SMGlobalClass *cls = SMGlobalClass::head;
 	while (cls)
 	{
@@ -337,11 +367,18 @@ void PlayerManager::RunAuthChecks()
 	{
 		pPlayer = &m_Players[m_AuthQueue[i]];
 		authstr = engine->GetPlayerNetworkIDString(pPlayer->m_pEdict);
+		pPlayer->SetAuthString(authstr);
+
+		if (!pPlayer->IsAuthStringValidated())
+		{
+			continue; // we're using steam auth, and steam doesn't know about this player yet so we can't do anything about them for now
+		}
+
 		if (authstr && authstr[0] != '\0'
 			&& (strcmp(authstr, "STEAM_ID_PENDING") != 0))
 		{
 			/* Set authorization */
-			pPlayer->Authorize(authstr);
+			pPlayer->Authorize();
 
 			/* Mark as removed from queue */
 			unsigned int client = m_AuthQueue[i];
@@ -410,7 +447,23 @@ bool PlayerManager::OnClientConnect(edict_t *pEntity, const char *pszName, const
 {
 	int client = IndexOfEdict(pEntity);
 	CPlayer *pPlayer = &m_Players[client];
+	++m_PlayersSinceActive;
 
+	pPlayer->Initialize(pszName, pszAddress, pEntity);
+	
+	/* Get the client's language */
+	if (m_QueryLang)
+	{
+		const char *name;
+		if (!pPlayer->IsFakeClient() && (name=engine->GetClientConVarValue(client, "cl_language")))
+		{
+			unsigned int langid;
+			pPlayer->m_LangId = (translator->GetLanguageByName(name, &langid)) ? langid : translator->GetServerLanguage();
+		} else {
+			pPlayer->m_LangId = translator->GetServerLanguage();
+		}
+	}
+	
 	List<IClientListener *>::iterator iter;
 	IClientListener *pListener = NULL;
 	for (iter=m_hooks.begin(); iter!=m_hooks.end(); iter++)
@@ -418,13 +471,12 @@ bool PlayerManager::OnClientConnect(edict_t *pEntity, const char *pszName, const
 		pListener = (*iter);
 		if (!pListener->InterceptClientConnect(client, reject, maxrejectlen))
 		{
-			return false;
+			RETURN_META_VALUE(MRES_SUPERCEDE, false);
 		}
 	}
 
 	cell_t res = 1;
 
-	pPlayer->Initialize(pszName, pszAddress, pEntity);
 	m_clconnect->PushCell(client);
 	m_clconnect->PushStringEx(reject, maxrejectlen, SM_PARAM_STRING_UTF8 | SM_PARAM_STRING_COPY, SM_PARAM_COPYBACK);
 	m_clconnect->PushCell(maxrejectlen);
@@ -466,7 +518,7 @@ bool PlayerManager::OnClientConnect_Post(edict_t *pEntity, const char *pszName,
 			pListener->OnClientConnected(client);
 			if (!pPlayer->IsConnected())
 			{
-				break;
+				return true;
 			}
 		}
 
@@ -478,8 +530,8 @@ bool PlayerManager::OnClientConnect_Post(edict_t *pEntity, const char *pszName,
 		}
 
 		cell_t res;
-		OnClientConnected->PushCell(client);
-		OnClientConnected->Execute(&res, NULL);
+		m_clconnect_post->PushCell(client);
+		m_clconnect_post->Execute(&res, NULL);
 	}
 	else
 	{
@@ -501,8 +553,70 @@ void PlayerManager::OnClientPutInServer(edict_t *pEntity, const char *playername
 		/* Run manual connection routines */
 		char error[255];
 		const char *authid = engine->GetPlayerNetworkIDString(pEntity);
-		pPlayer->Authorize(authid);
+		pPlayer->SetAuthString(authid);
+		pPlayer->Authorize();
 		pPlayer->m_bFakeClient = true;
+
+		/*
+		 * While we're already filtered to just bots, we'll do other checks to
+		 * make sure that the requisite services are enabled and that the bots
+		 * have joined at the expected time.
+		 *
+		 * Checking playerinfo's IsHLTV and IsReplay would be better and less
+		 * error-prone but will always show false until later in the frame,
+		 * after PutInServer and Activate, and we want it now!
+		 *
+		 * These checks are hairy as hell due to differences between engines and games.
+		 * 
+		 * Most engines use "Replay" and "SourceTV" as bot names for these when they're
+		 * created. EP2V, CSS and Nuclear Dawn (but not L4D2) differ from this by now using
+		 * replay_/tv_name directly when creating the bot(s). To complicate it slightly
+		 * further, the cvar can be empty and the engine's fallback to "unnamed" will be used.
+		 * We can maybe just rip out the name checks at some point and rely solely on whether
+		 * they're enabled and the join order.
+		 */
+		
+		// This doesn't actually get incremented until OnClientConnect. Fake it to check.
+		int newCount = m_PlayersSinceActive + 1;
+
+		int userId = engine->GetPlayerUserId(pEntity);
+#if (SOURCE_ENGINE == SE_CSS || SOURCE_ENGINE == SE_HL2DM || SOURCE_ENGINE == SE_DODS || SOURCE_ENGINE == SE_TF2 || SOURCE_ENGINE == SE_NUCLEARDAWN || SOURCE_ENGINE == SE_LEFT4DEAD2)
+		static ConVar *tv_name = icvar->FindVar("tv_name");
+#endif
+#if SOURCE_ENGINE == SE_TF2
+		static ConVar *replay_name = icvar->FindVar("replay_name");
+#endif
+
+#if SOURCE_ENGINE == SE_TF2
+		if (m_bIsReplayActive && newCount == 1
+			&& (m_ReplayUserId == userId
+				|| (replay_name && strcmp(playername, replay_name->GetString()) == 0) || (replay_name && replay_name->GetString()[0] == 0 && strcmp(playername, "unnamed") == 0)
+				)
+			)
+		{
+			pPlayer->m_bIsReplay = true;
+			m_ReplayUserId = userId;
+		}
+#endif
+
+		if (m_bIsSourceTVActive
+			&& ((!m_bIsReplayActive && newCount == 1)
+				|| (m_bIsReplayActive && newCount == 2))
+			&& (m_SourceTVUserId == userId
+#if SOURCE_ENGINE == SE_CSGO
+				|| strcmp(playername, "GOTV") == 0
+#elif (SOURCE_ENGINE == SE_CSS || SOURCE_ENGINE == SE_HL2DM || SOURCE_ENGINE == SE_DODS || SOURCE_ENGINE == SE_TF2 || SOURCE_ENGINE == SE_NUCLEARDAWN)
+				|| (tv_name && strcmp(playername, tv_name->GetString()) == 0) || (tv_name && tv_name->GetString()[0] == 0 && strcmp(playername, "unnamed") == 0)
+#else
+				|| strcmp(playername, "SourceTV") == 0
+#endif
+				)
+			)
+		{
+			pPlayer->m_bIsSourceTV = true;
+			m_SourceTVUserId = userId;
+		}
+
 		if (!OnClientConnect(pEntity, playername, "127.0.0.1", error, sizeof(error)))
 		{
 			/* :TODO: kick the bot if it's rejected */
@@ -520,6 +634,11 @@ void PlayerManager::OnClientPutInServer(edict_t *pEntity, const char *playername
 				return;
 			}
 		}
+
+		cell_t res;
+		m_clconnect_post->PushCell(client);
+		m_clconnect_post->Execute(&res, NULL);
+
 		/* Now do authorization */
 		for (iter=m_hooks.begin(); iter!=m_hooks.end(); iter++)
 		{
@@ -541,19 +660,6 @@ void PlayerManager::OnClientPutInServer(edict_t *pEntity, const char *playername
 		pPlayer->m_Info = playerinfo->GetPlayerInfo(pEntity);
 	}
 
-	/* Get the client's language */
-	if (m_QueryLang)
-	{
-		const char *name;
-		if (!pPlayer->IsFakeClient() && (name=engine->GetClientConVarValue(client, "cl_language")))
-		{
-			unsigned int langid;
-			pPlayer->m_LangId = (g_Translator.GetLanguageByName(name, &langid)) ? langid : g_Translator.GetServerLanguage();
-		} else {
-			pPlayer->m_LangId = g_Translator.GetServerLanguage();
-		}
-	}
-
 	pPlayer->Connect();
 	m_PlayerCount++;
 
@@ -687,23 +793,30 @@ void PlayerManager::OnClientCommand(edict_t *pEntity)
 			g_PluginSys.ListPluginsToClient(pPlayer, args);
 			RETURN_META(MRES_SUPERCEDE);
 		}
+		else if (args.ArgC() > 1 && strcmp(args.Arg(1), "exts") == 0)
+		{
+			g_Extensions.ListExtensionsToClient(pPlayer, args);
+			RETURN_META(MRES_SUPERCEDE);
+		}
 		else if (args.ArgC() > 1 && strcmp(args.Arg(1), "credits") == 0)
 		{
+ 			ClientConsolePrint(pEntity,
+ 				"SourceMod would not be possible without:");
+ 			ClientConsolePrint(pEntity,
+				" David \"BAILOPAN\" Anderson, Matt \"pRED\" Woodrow");
+ 			ClientConsolePrint(pEntity,
+				" Scott \"DS\" Ehlert, Fyren");
+ 			ClientConsolePrint(pEntity,
+				" Nicholas \"psychonic\" Hastings, Asher \"asherkin\" Baker");
 			ClientConsolePrint(pEntity,
-				"SourceMod would not be possible without:");
-			ClientConsolePrint(pEntity,
-				" David \"BAILOPAN\" Anderson, Borja \"faluco\" Ferrer");
-			ClientConsolePrint(pEntity,
-				" Scott \"DS\" Ehlert, Matt \"pRED\" Woodrow");
-			ClientConsolePrint(pEntity,
-				" Michael \"ferret\" McKoy, Pavol \"PM OnoTo\" Marko");
+				" Borja \"faluco\" Ferrer, Pavol \"PM OnoTo\" Marko");
 			ClientConsolePrint(pEntity,
 				"SourceMod is open source under the GNU General Public License.");
 			RETURN_META(MRES_SUPERCEDE);
 		}
 
 		ClientConsolePrint(pEntity,
-			"SourceMod %s, by AlliedModders LLC", SM_FULL_VERSION);
+			"SourceMod %s, by AlliedModders LLC", SM_VERSION_STRING);
 		ClientConsolePrint(pEntity,
 			"To see running plugins, type \"sm plugins\"");
 		ClientConsolePrint(pEntity,
@@ -796,6 +909,19 @@ void PlayerManager::OnClientSettingsChanged(edict_t *pEntity)
 	const char *new_name = info ? info->GetName() : engine->GetClientConVarValue(client, "name");
 	const char *old_name = pPlayer->m_Name.c_str();
 
+#if SOURCE_ENGINE >= SE_LEFT4DEAD
+	const char *networkid_force;
+	if ((networkid_force = engine->GetClientConVarValue(client, "networkid_force")) && networkid_force[0] != '\0')
+	{
+		unsigned int accountId = pPlayer->GetSteamAccountID();
+		g_Logger.LogMessage("\"%s<%d><STEAM_1:%d:%d><>\" has bad networkid (id \"%s\") (ip \"%s\")",
+			new_name, pPlayer->GetUserId(), accountId & 1, accountId >> 1, networkid_force, pPlayer->GetIPAddress());
+
+		pPlayer->Kick("NetworkID spoofing detected.");
+		RETURN_META(MRES_IGNORED);
+	}
+#endif
+
 	if (strcmp(old_name, new_name) != 0)
 	{
 		AdminId id = g_Admins.FindAdminByIdentity("name", new_name);
@@ -803,7 +929,9 @@ void PlayerManager::OnClientSettingsChanged(edict_t *pEntity)
 		{
 			if (!CheckSetAdminName(client, pPlayer, id))
 			{
-				pPlayer->Kick("Your name is reserved by SourceMod; set your password to use it.");
+				char kickMsg[128];
+				logicore.CoreTranslate(kickMsg, sizeof(kickMsg), "%T", 2, NULL, "Name Reserved", &client);
+				pPlayer->Kick(kickMsg);
 				RETURN_META(MRES_IGNORED);
 			}
 		} else if ((id = g_Admins.FindAdminByIdentity("name", old_name)) != INVALID_ADMIN_ID) {
@@ -831,6 +959,17 @@ void PlayerManager::OnClientSettingsChanged(edict_t *pEntity)
 			}
 		}
 	}
+	/* Notify Extensions */
+	List<IClientListener *>::iterator iter;
+	IClientListener *pListener = NULL;
+	for (iter=m_hooks.begin(); iter!=m_hooks.end(); iter++)
+	{
+		pListener = (*iter);
+		if (pListener->GetClientListenerVersion() >= 13)
+		{
+			pListener->OnClientSettingsChanged(client);
+		}
+	}
 }
 
 int PlayerManager::GetMaxClients()
@@ -1120,11 +1259,12 @@ void PlayerManager::ProcessCommandTarget(cmd_target_info_t *info)
 				{
 					continue;
 				}
-				if (!pTarget->IsConnected() || !pTarget->IsAuthorized())
+				if (!pTarget->IsConnected())
 				{
 					continue;
 				}
-				if (strcmp(pTarget->GetAuthString(), new_pattern) == 0)
+				const char *authstr = pTarget->GetAuthString(false); // We want to make it easy for people to be kicked/banned, so don't require validation for command targets.
+				if (authstr && strcmp(authstr, new_pattern) == 0)
 				{
 					if ((info->reason = FilterCommandTarget(pAdmin, pTarget, info->flags))
 						== COMMAND_TARGET_VALID)
@@ -1234,7 +1374,7 @@ void PlayerManager::ProcessCommandTarget(cmd_target_info_t *info)
 			if ((info->flags & COMMAND_FILTER_NO_BOTS) == COMMAND_FILTER_NO_BOTS)
 			{
 				info->num_targets = 0;
-				info->reason = COMMAND_FILTER_NO_BOTS;
+				info->reason = COMMAND_TARGET_NOT_HUMAN;
 				return;
 			}
 			strncopy(info->target_name, "all bots", info->target_name_maxlength);
@@ -1300,7 +1440,7 @@ void PlayerManager::ProcessCommandTarget(cmd_target_info_t *info)
 			continue;
 		}
 
-		if (stristr(pTarget->GetName(), info->pattern) != NULL)
+		if (logicore.stristr(pTarget->GetName(), info->pattern) != NULL)
 		{
 			if (found_client)
 			{
@@ -1338,18 +1478,6 @@ void PlayerManager::ProcessCommandTarget(cmd_target_info_t *info)
 	}
 }
 
-void PlayerManager::OnConVarChanged( ConVar *pConVar, const char *oldValue, float flOldValue )
-{
-	if (pConVar->GetBool() && !atoi(oldValue))
-	{
-		MaxPlayersChanged(gpGlobals->maxClients + 1);
-	}
-	else
-	{
-		MaxPlayersChanged();
-	}
-}
-
 void PlayerManager::OnSourceModMaxPlayersChanged( int newvalue )
 {
 	m_maxClients = newvalue;
@@ -1441,10 +1569,15 @@ 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;
 	m_bFakeClient = false;
+	m_bIsSourceTV = false;
+	m_bIsReplay = false;
+	m_Serial.value = -1;
+	m_SteamAccountID = 0;
 }
 
 void CPlayer::Initialize(const char *name, const char *ip, edict_t *pEntity)
@@ -1454,7 +1587,7 @@ void CPlayer::Initialize(const char *name, const char *ip, edict_t *pEntity)
 	m_Ip.assign(ip);
 	m_pEdict = pEntity;
 	m_iIndex = IndexOfEdict(pEntity);
-	m_LangId = g_Translator.GetServerLanguage();
+	m_LangId = translator->GetServerLanguage();
 
 	m_Serial.bits.index = m_iIndex;
 	m_Serial.bits.serial = g_PlayerSerialCount++;
@@ -1490,17 +1623,22 @@ void CPlayer::Connect()
 	}
 }
 
-void CPlayer::Authorize(const char *steamid)
+void CPlayer::SetAuthString(const char *steamid)
 {
 	if (m_IsAuthorized)
 	{
 		return;
 	}
 
-	m_IsAuthorized = true;
 	m_AuthID.assign(steamid);
 }
 
+// Ensure a valid AuthString is set before calling.
+void CPlayer::Authorize()
+{
+	m_IsAuthorized = true;
+}
+
 void CPlayer::Disconnect()
 {
 	DumpAdmin(false);
@@ -1516,6 +1654,10 @@ void CPlayer::Disconnect()
 	m_UserId = -1;
 	m_bIsInKickQueue = false;
 	m_bFakeClient = false;
+	m_bIsSourceTV = false;
+	m_bIsReplay = false;
+	m_Serial.value = -1;
+	m_SteamAccountID = 0;
 }
 
 void CPlayer::SetName(const char *name)
@@ -1538,11 +1680,45 @@ const char *CPlayer::GetIPAddress()
 	return m_Ip.c_str();
 }
 
-const char *CPlayer::GetAuthString()
+const char *CPlayer::GetAuthString(bool validated)
 {
+	if (validated && !IsAuthStringValidated())
+	{
+		return NULL;
+	}
+
 	return m_AuthID.c_str();
 }
 
+unsigned int CPlayer::GetSteamAccountID(bool validated)
+{
+	if (IsFakeClient() || (validated && !IsAuthStringValidated()))
+	{
+		return 0;
+	}
+
+	if (m_SteamAccountID != 0)
+	{
+		return m_SteamAccountID;
+	}
+
+#if SOURCE_ENGINE < SE_ORANGEBOX
+	const char * pAuth = GetAuthString();
+	/* STEAM_0:1:123123 | STEAM_ID_LAN | STEAM_ID_PENDING */
+	if (pAuth && (strlen(pAuth) > 10) && pAuth[8] != '_')
+	{
+		m_SteamAccountID = (atoi(&pAuth[8]) | (atoi(&pAuth[10]) << 1));
+	}
+#else
+	unsigned long long *steamId = (unsigned long long *)engine->GetClientSteamID(m_pEdict);
+	if (steamId)
+	{
+		m_SteamAccountID = (*steamId & 0xFFFFFFFF);
+	}
+#endif
+	return m_SteamAccountID;
+}
+
 edict_t *CPlayer::GetEdict()
 {
 	return m_pEdict;
@@ -1568,6 +1744,18 @@ bool CPlayer::IsAuthorized()
 	return m_IsAuthorized;
 }
 
+bool CPlayer::IsAuthStringValidated()
+{     
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+	if (g_Players.m_bAuthstringValidation && !g_HL2.IsLANServer())
+	{
+		return engine->IsClientFullyAuthenticated(m_pEdict);
+	}
+#endif
+
+	return true;
+}
+
 IPlayerInfo *CPlayer::GetPlayerInfo()
 {
 	if (m_pEdict->GetUnknown())
@@ -1583,6 +1771,16 @@ bool CPlayer::IsFakeClient()
 	return m_bFakeClient;
 }
 
+bool CPlayer::IsSourceTV() const
+{
+	return m_bIsSourceTV;
+}
+
+bool CPlayer::IsReplay() const
+{
+	return m_bIsReplay;
+}
+
 void CPlayer::SetAdminId(AdminId id, bool temporary)
 {
 	if (!m_IsConnected)
@@ -1618,8 +1816,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()
@@ -1761,6 +1973,11 @@ unsigned int CPlayer::GetLanguageId()
 	return m_LangId;
 }
 
+void CPlayer::SetLanguageId(unsigned int id)
+{
+	m_LangId = id;
+}
+
 int CPlayer::GetUserId()
 {
 	if (m_UserId == -1)

core/PlayerManager.h

@@ -56,7 +56,7 @@ union serial_t
 	uint32_t   value;
 	struct
 	{
-		uint8_t  index;
+		uint32_t index  :  8;
 		uint32_t serial : 24;
 	} bits;
 };
@@ -69,19 +69,23 @@ public:
 public:
 	const char *GetName();
 	const char *GetIPAddress();
-	const char *GetAuthString();
+	const char *GetAuthString(bool validated = true);
+	unsigned int GetSteamAccountID(bool validated = true);
 	edict_t *GetEdict();
 	bool IsInGame();
 	bool WasCountedAsInGame();
 	bool IsConnected();
 	bool IsAuthorized();
 	bool IsFakeClient();
+	bool IsSourceTV() const;
+	bool IsReplay() const;
 	void SetAdminId(AdminId id, bool temporary);
 	AdminId GetAdminId();
 	void Kick(const char *str);
 	bool IsInKickQueue();
 	IPlayerInfo *GetPlayerInfo();
 	unsigned int GetLanguageId();
+	void SetLanguageId(unsigned int id);
 	int GetUserId();
 	bool RunAdminCacheChecks();
 	void NotifyPostAdminChecks();
@@ -96,9 +100,11 @@ private:
 	void Disconnect();
 	void SetName(const char *name);
 	void DumpAdmin(bool deleting);
-	void Authorize(const char *auth);
+	void SetAuthString(const char *auth);
+	void Authorize();
 	void Authorize_Post();
 	void DoPostConnectAuthorization();
+	bool IsAuthStringValidated();
 private:
 	bool m_IsConnected;
 	bool m_IsInGame;
@@ -118,13 +124,15 @@ private:
 	unsigned int m_LangId;
 	int m_UserId;
 	bool m_bFakeClient;
+	bool m_bIsSourceTV;
+	bool m_bIsReplay;
 	serial_t m_Serial;
+	unsigned int m_SteamAccountID;
 };
 
 class PlayerManager : 
 	public SMGlobalClass,
-	public IPlayerManager,
-	public IConVarChangeListener
+	public IPlayerManager
 {
 	friend class CPlayer;
 public:
@@ -169,8 +177,6 @@ public: //IPlayerManager
 	void UnregisterCommandTargetProcessor(ICommandTargetProcessor *pHandler);
 	void ProcessCommandTarget(cmd_target_info_t *info);
 	int GetClientFromSerial(unsigned int serial);
-public: // IConVarChangeListener
-	void OnConVarChanged(ConVar *pConVar, const char *oldValue, float flOldValue);
 public:
 	inline int MaxClients()
 	{
@@ -197,6 +203,7 @@ private:
 private:
 	List<IClientListener *> m_hooks;
 	IForward *m_clconnect;
+	IForward *m_clconnect_post;
 	IForward *m_cldisconnect;
 	IForward *m_cldisconnect_post;
 	IForward *m_clputinserver;
@@ -209,12 +216,18 @@ private:
 	int *m_UserIdLookUp;
 	int m_maxClients;
 	int m_PlayerCount;
+	int m_PlayersSinceActive;
 	bool m_FirstPass;
 	unsigned int *m_AuthQueue;
 	String m_PassInfoVar;
 	bool m_QueryLang;
+	bool m_bAuthstringValidation; // are we validating admins with steam before authorizing?
 	bool m_bIsListenServer;
 	int m_ListenClient;
+	bool m_bIsSourceTVActive;
+	bool m_bIsReplayActive;
+	int m_SourceTVUserId;
+	int m_ReplayUserId;
 };
 
 #if SOURCE_ENGINE >= SE_ORANGEBOX

core/PluginSys.cpp

@@ -44,7 +44,7 @@
 #include "ConCmdManager.h"
 #include "PlayerManager.h"
 #include "CoreConfig.h"
-#include "Translator.h"
+#include "logic_bridge.h"
 
 CPluginManager g_PluginSys;
 HandleType_t g_PluginType = 0;
@@ -67,7 +67,7 @@ CPlugin::CPlugin(const char *file)
 	m_FakeNativesMissing = false;
 	m_LibraryMissing = false;
 	m_bGotAllLoaded = false;
-	m_pPhrases = g_Translator.CreatePhraseCollection();
+	m_pPhrases = translator->CreatePhraseCollection();
 	m_MaxClientsVar = NULL;
 }
 
@@ -372,7 +372,7 @@ void CPlugin::Call_OnAllPluginsLoaded()
 		pFunction->Execute(&result);
 	}
 
-	if (g_OnMapStarted)
+	if (g_SourceMod.IsMapRunning())
 	{
 		if ((pFunction = m_pRuntime->GetFunctionByName("OnMapStart")) != NULL)
 		{
@@ -501,14 +501,14 @@ void CPlugin::SetSilentlyFailed(bool sf)
 	m_bSilentlyFailed = sf;
 }
 
-void CPlugin::LibraryActions(bool dropping)
+void CPlugin::LibraryActions(LibraryAction action)
 {
 	List<String>::iterator iter;
 	for (iter = m_Libraries.begin();
 		iter != m_Libraries.end();
 		iter++)
 	{
-		g_PluginSys.OnLibraryAction((*iter).c_str(), true, dropping);
+		g_PluginSys.OnLibraryAction((*iter).c_str(), action);
 	}
 }
 
@@ -523,7 +523,7 @@ bool CPlugin::SetPauseState(bool paused)
 
 	if (paused)
 	{
-		LibraryActions(true);
+		LibraryActions(LibraryAction_Removed);
 	}
 
 	IPluginFunction *pFunction = m_pRuntime->GetFunctionByName("OnPluginPauseChange");
@@ -547,7 +547,7 @@ bool CPlugin::SetPauseState(bool paused)
 
 	if (!paused)
 	{
-		LibraryActions(false);
+		LibraryActions(LibraryAction_Added);
 	}
 
 	return true;
@@ -789,6 +789,8 @@ CPluginManager::CPluginManager()
 	m_AllPluginsLoaded = false;
 	m_MyIdent = NULL;
 	m_LoadingLocked = false;
+	
+	m_bBlockBadPlugins = true;
 }
 
 CPluginManager::~CPluginManager()
@@ -1005,11 +1007,14 @@ LoadRes CPluginManager::_LoadPlugin(CPlugin **_plugin, const char *path, bool de
 		pPlugin->m_pRuntime = g_pSourcePawn2->LoadPlugin(co, fullpath, &err);
 		if (pPlugin->m_pRuntime == NULL)
 		{
-			UTIL_Format(error, 
-				maxlength, 
-				"Unable to load plugin (error %d: %s)", 
-				err, 
-				g_pSourcePawn2->GetErrorString(err));
+			if (error)
+			{
+				UTIL_Format(error, 
+					maxlength, 
+					"Unable to load plugin (error %d: %s)", 
+					err, 
+					g_pSourcePawn2->GetErrorString(err));
+			}
 			pPlugin->m_status = Plugin_BadLoad;
 		}
 		else
@@ -1020,7 +1025,45 @@ LoadRes CPluginManager::_LoadPlugin(CPlugin **_plugin, const char *path, bool de
 			}
 			else
 			{
-				UTIL_Format(error, maxlength, "%s", pPlugin->m_errormsg);
+				if (error)
+				{
+					UTIL_Format(error, maxlength, "%s", pPlugin->m_errormsg);
+				}
+			}
+		}
+	}
+	
+	if (pPlugin->GetStatus() == Plugin_Created)
+	{
+		unsigned char *pCodeHash = pPlugin->m_pRuntime->GetCodeHash();
+		
+		char codeHashBuf[40];
+		UTIL_Format(codeHashBuf, 40, "plugin_");
+		for (int i = 0; i < 16; i++)
+			UTIL_Format(codeHashBuf + 7 + (i * 2), 3, "%02x", pCodeHash[i]);
+		
+		const char *bulletinUrl = g_pGameConf->GetKeyValue(codeHashBuf);
+		if (bulletinUrl != NULL)
+		{
+			if (m_bBlockBadPlugins)
+			{
+				if (error)
+				{
+					if (bulletinUrl[0] != '\0')
+					{
+						UTIL_Format(error, maxlength, "Known malware detected and blocked. See %s for more info", bulletinUrl);
+					} else {
+						UTIL_Format(error, maxlength, "Possible malware or illegal plugin detected and blocked");
+					}
+				}
+				pPlugin->m_status = Plugin_BadLoad;
+			} else {
+				if (bulletinUrl[0] != '\0')
+				{
+					g_Logger.LogMessage("%s: Known malware detected. See %s for more info, blocking disabled in core.cfg", pPlugin->GetFilename(), bulletinUrl);
+				} else {
+					g_Logger.LogMessage("%s: Possible malware or illegal plugin detected, blocking disabled in core.cfg", pPlugin->GetFilename());
+				}
 			}
 		}
 	}
@@ -1123,7 +1166,7 @@ void CPluginManager::LoadAutoPlugin(const char *plugin)
 
 	if ((res=_LoadPlugin(&pl, plugin, false, PluginType_MapUpdated, error, sizeof(error))) == LoadRes_Failure)
 	{
-		g_Logger.LogError("[SM] Failed to load plugin \"%s\": %s", plugin, error);
+		g_Logger.LogError("[SM] Failed to load plugin \"%s\": %s.", plugin, error);
 		pl->SetErrorState(
 			pl->GetStatus() <= Plugin_Created ? Plugin_BadLoad : pl->GetStatus(), 
 			"%s",
@@ -1308,7 +1351,8 @@ bool CPluginManager::LoadOrRequireExtensions(CPlugin *pPlugin, unsigned int pass
 				if (ext->autoload)
 				{
 					g_LibSys.PathFormat(path, PLATFORM_MAX_PATH, "%s", file);
-					g_Extensions.LoadAutoExtension(path);
+					bool bErrorOnMissing = ext->required ? true : false;
+					g_Extensions.LoadAutoExtension(path, bErrorOnMissing);
 				}
 			}
 			else if (pass == 2)
@@ -1451,7 +1495,7 @@ bool CPluginManager::RunSecondPass(CPlugin *pPlugin, char *error, size_t maxleng
 		s_iter != pPlugin->m_Libraries.end();
 		s_iter++)
 	{
-		OnLibraryAction((*s_iter).c_str(), true, false);
+		OnLibraryAction((*s_iter).c_str(), LibraryAction_Added);
 	}
 
 	/* :TODO: optimize? does this even matter? */
@@ -1503,7 +1547,9 @@ void CPluginManager::TryRefreshDependencies(CPlugin *pPlugin)
 		{
 			break;
 		}
-		if (native->status == SP_NATIVE_UNBOUND && !(native->flags & SP_NTVFLAG_OPTIONAL))
+		if (native->status == SP_NATIVE_UNBOUND
+			&& native->name[0] != '@'
+			&& !(native->flags & SP_NTVFLAG_OPTIONAL))
 		{
 			pPlugin->SetErrorState(Plugin_Error, "Native not found: %s", native->name);
 			return;
@@ -1551,7 +1597,7 @@ bool CPluginManager::UnloadPlugin(IPlugin *plugin)
 		 s_iter != pPlugin->m_Libraries.end();
 		 s_iter++)
 	{
-		OnLibraryAction((*s_iter).c_str(), true, true);
+		OnLibraryAction((*s_iter).c_str(), LibraryAction_Removed);
 	}
 
 	List<IPluginsListener *>::iterator iter;
@@ -1559,14 +1605,15 @@ bool CPluginManager::UnloadPlugin(IPlugin *plugin)
 
 	if (pPlugin->GetStatus() <= Plugin_Error)
 	{
+		/* Notify plugin */
+		pPlugin->Call_OnPluginEnd();
+
 		/* Notify listeners of unloading */
 		for (iter=m_listeners.begin(); iter!=m_listeners.end(); iter++)
 		{
 			pListener = (*iter);
 			pListener->OnPluginUnloaded(pPlugin);
 		}
-		/* Notify plugin */
-		pPlugin->Call_OnPluginEnd();
 	}
 
 	pPlugin->DropEverything();
@@ -1867,6 +1914,9 @@ void CPluginManager::OnSourceModAllInitialized()
 	g_RootMenu.AddRootConsoleCommand("plugins", "Manage Plugins", this);
 
 	g_ShareSys.AddInterface(NULL, this);
+	
+	m_pOnLibraryAdded = g_Forwards.CreateForward("OnLibraryAdded", ET_Ignore, 1, NULL, Param_String);
+	m_pOnLibraryRemoved = g_Forwards.CreateForward("OnLibraryRemoved", ET_Ignore, 1, NULL, Param_String);
 }
 
 void CPluginManager::OnSourceModShutdown()
@@ -1878,6 +1928,30 @@ void CPluginManager::OnSourceModShutdown()
 	g_HandleSys.RemoveType(g_PluginType, m_MyIdent);
 	g_ShareSys.DestroyIdentType(g_PluginIdent);
 	g_ShareSys.DestroyIdentity(m_MyIdent);
+	
+	g_Forwards.ReleaseForward(m_pOnLibraryAdded);
+	g_Forwards.ReleaseForward(m_pOnLibraryRemoved);
+}
+
+ConfigResult CPluginManager::OnSourceModConfigChanged(const char *key, 
+												 const char *value, 
+												 ConfigSource source, 
+												 char *error, 
+												 size_t maxlength)
+{
+	if (strcmp(key, "BlockBadPlugins") == 0) {
+		if (strcasecmp(value, "yes") == 0)
+		{
+			m_bBlockBadPlugins = true;
+		} else if (strcasecmp(value, "no") == 0) {
+			m_bBlockBadPlugins = false;
+		} else {
+			UTIL_Format(error, maxlength, "Invalid value: must be \"yes\" or \"no\"");
+			return ConfigResult_Reject;
+		}
+		return ConfigResult_Accept;
+	}
+	return ConfigResult_Ignore;
 }
 
 void CPluginManager::OnHandleDestroy(HandleType_t type, void *object)
@@ -2260,6 +2334,15 @@ void CPluginManager::OnRootConsoleCommand(const char *cmdname, const CCommand &c
 				{
 					g_RootMenu.ConsolePrint("  Timestamp: %s", pl->m_DateTime);
 				}
+				
+				unsigned char *pCodeHash = pl->m_pRuntime->GetCodeHash();
+				unsigned char *pDataHash = pl->m_pRuntime->GetDataHash();
+				
+				char combinedHash[33];
+				for (int i = 0; i < 16; i++)
+					UTIL_Format(combinedHash + (i * 2), 3, "%02x", pCodeHash[i] ^ pDataHash[i]);
+				
+				g_RootMenu.ConsolePrint("  Hash: %s", combinedHash);
 			}
 			else
 			{
@@ -2474,83 +2557,18 @@ CPlugin *CPluginManager::GetPluginFromIdentity(IdentityToken_t *pToken)
 	return (CPlugin *)(pToken->ptr);
 }
 
-void CPluginManager::OnLibraryAction(const char *lib, bool is_a_plugin, bool drop)
+void CPluginManager::OnLibraryAction(const char *lib, LibraryAction action)
 {
-	List<CPlugin *>::iterator iter;
-
-	struct _pl
+	switch (action)
 	{
-		cell_t name;
-		cell_t file;
-		cell_t required;
-	} *plc;
-
-	struct _ext
-	{
-		cell_t name;
-		cell_t file;
-		cell_t autoload;
-		cell_t required;
-	} *ext;
-
-	const char *name = drop ? "OnLibraryRemoved" : "OnLibraryAdded";
-
-	for (iter=m_plugins.begin();
-		 iter!=m_plugins.end();
-		 iter++)
-	{
-		CPlugin *pl = (*iter);
-		if (pl->GetStatus() != Plugin_Running)
-		{
-			continue;
-		}
-		IPluginContext *pContext = pl->GetBaseContext();
-		IPluginFunction *pf = pContext->GetFunctionByName(name);
-		if (!pf)
-		{
-			continue;
-		}
-		uint32_t num_vars = pContext->GetPubVarsNum();
-		for (uint32_t i=0; i<num_vars; i++)
-		{
-			sp_pubvar_t *pubvar;
-			if (pContext->GetPubvarByIndex(i, &pubvar) != SP_ERROR_NONE)
-			{
-				continue;
-			}
-			if (is_a_plugin && strncmp(pubvar->name, "__pl_", 5) == 0)
-			{
-				plc = (_pl *)pubvar->offs;
-				if (plc->required)
-				{
-					continue;
-				}
-				char *str;
-				pContext->LocalToString(plc->name, &str);
-				if (strcmp(str, lib) != 0)
-				{
-					continue;
-				}
-				pf->PushString(lib);
-				pf->Execute(NULL);
-			}
-			else if (!is_a_plugin && strncmp(pubvar->name, "__ext_", 6) == 0)
-			{
-				ext = (_ext *)pubvar->offs;
-				if (ext->required)
-				{
-					continue;
-				}
-				char *str;
-				pContext->LocalToString(ext->name, &str);
-				if (strcmp(str, lib) != 0)
-				{
-					continue;
-				}
-				pf->PushString(lib);
-				pf->Execute(NULL);
-			}
-		}
+	case LibraryAction_Removed:
+		m_pOnLibraryRemoved->PushString(lib);
+		m_pOnLibraryRemoved->Execute(NULL);
+		break;
+	case LibraryAction_Added:
+		m_pOnLibraryAdded->PushString(lib);
+		m_pOnLibraryAdded->Execute(NULL);
+		break;
 	}
 }
 
@@ -2741,6 +2759,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,14 +47,17 @@
 #include "sm_trie.h"
 #include "sourcemod.h"
 #include <IRootConsoleMenu.h>
-#if (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
+#if SOURCE_ENGINE >= SE_ALIENSWARM
+#include "convar_sm_swarm.h"
+#elif SOURCE_ENGINE >= SE_LEFT4DEAD
 #include "convar_sm_l4d.h"
-#elif (SOURCE_ENGINE == SE_ORANGEBOX) || (SOURCE_ENGINE == SE_ORANGEBOXVALVE)
+#elif SOURCE_ENGINE >= SE_ORANGEBOX
 #include "convar_sm_ob.h"
 #else
 #include "convar_sm.h"
 #endif
 #include "ITranslator.h"
+#include "IGameConfigs.h"
 #include "NativeOwner.h"
 #include "ShareSys.h"
 
@@ -128,6 +131,12 @@ enum APLRes
 	APLRes_SilentFailure
 };
 
+enum LibraryAction
+{
+	LibraryAction_Removed,
+	LibraryAction_Added
+};
+
 struct AutoConfig
 {
 	String autocfg;
@@ -247,7 +256,7 @@ public:
 	{
 		m_Libraries.push_back(name);
 	}
-	void LibraryActions(bool dropping);
+	void LibraryActions(LibraryAction action);
 	void SyncMaxClients(int max_clients);
 protected:
 	bool UpdateInfo();
@@ -324,6 +333,7 @@ public: //IPluginManager
 public: //SMGlobalClass
 	void OnSourceModAllInitialized();
 	void OnSourceModShutdown();
+	ConfigResult OnSourceModConfigChanged(const char *key, const char *value, ConfigSource source, char *error, size_t maxlength);
 	void OnSourceModMaxPlayersChanged(int newvalue);
 public: //IHandleTypeDispatch
 	void OnHandleDestroy(HandleType_t type, void *object);
@@ -399,7 +409,7 @@ public:
 
 	void Shutdown();
 
-	void OnLibraryAction(const char *lib, bool is_a_plugin, bool drop);
+	void OnLibraryAction(const char *lib, LibraryAction action);
 
 	bool LibraryExists(const char *lib);
 
@@ -468,8 +478,16 @@ private:
 	List<FakeNative *> m_Natives;
 
 	bool m_LoadingLocked;
+	
+	// Config
+	bool m_bBlockBadPlugins;
+	
+	// Forwards
+	IForward *m_pOnLibraryAdded;
+	IForward *m_pOnLibraryRemoved;
 };
 
 extern CPluginManager g_PluginSys;
 
 #endif //_INCLUDE_SOURCEMOD_PLUGINSYSTEM_H_
+

core/TimerSys.h

@@ -78,11 +78,11 @@ public: //ITimerSystem
 	float GetTickedTime();
 	void NotifyOfGameStart(float offset /* = 0.0f */);
 	bool GetMapTimeLeft(float *pTime);
+	IMapTimer *GetMapTimer();
 public:
 	void RunFrame();
 	void RemoveMapChangeTimers();
 	void GameFrame(bool simulating);
-	IMapTimer *GetMapTimer();
 private:
 	List<ITimer *> m_SingleTimers;
 	List<ITimer *> m_LoopTimers;

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
@@ -32,18 +32,32 @@
 #include "UserMessages.h"
 #include "sm_stringutil.h"
 
+#if SOURCE_ENGINE == SE_CSGO
+#include <cstrike15_usermessage_helpers.h>
+#endif
+
 UserMessages g_UserMsgs;
 
-#if (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
+#if SOURCE_ENGINE == SE_CSGO
+SH_DECL_HOOK3_void(IVEngineServer, SendUserMessage, SH_NOATTRIB, 0, IRecipientFilter &, int, const protobuf::Message &);
+#else
+#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);
 #endif
 SH_DECL_HOOK0_void(IVEngineServer, MessageEnd, SH_NOATTRIB, 0);
+#endif // ==SE_CSGO
 
-UserMessages::UserMessages() : m_InterceptBuffer(m_pBase, 2500)
+UserMessages::UserMessages()
+#ifndef USE_PROTOBUF_USERMESSAGES
+	: m_InterceptBuffer(m_pBase, 2500)
 {
 	m_Names = sm_trie_create();
+#else
+	: m_InterceptBuffer(NULL)
+{
+#endif
 	m_HookCount = 0;
 	m_InExec = false;
 	m_InHook = false;
@@ -53,7 +67,9 @@ UserMessages::UserMessages() : m_InterceptBuffer(m_pBase, 2500)
 
 UserMessages::~UserMessages()
 {
+#ifndef USE_PROTOBUF_USERMESSAGES
 	sm_trie_destroy(m_Names);
+#endif
 
 	CStack<ListenerInfo *>::iterator iter;
 	for (iter=m_FreeListeners.begin(); iter!=m_FreeListeners.end(); iter++)
@@ -65,8 +81,10 @@ UserMessages::~UserMessages()
 
 void UserMessages::OnSourceModStartup(bool late)
 {
+#ifndef USE_PROTOBUF_USERMESSAGES
 	/* -1 means SourceMM was unable to get the user message list */
 	m_FallbackSearch = (g_SMAPI->GetUserMessageCount() == -1);
+#endif
 }
 
 void UserMessages::OnSourceModAllInitialized()
@@ -78,16 +96,25 @@ void UserMessages::OnSourceModAllShutdown()
 {
 	if (m_HookCount)
 	{
+#if SOURCE_ENGINE == SE_CSGO
+		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, SendUserMessage, engine, this, &UserMessages::OnSendUserMessage_Pre, false);
+		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, SendUserMessage, engine, this, &UserMessages::OnSendUserMessage_Post, true);
+#else
 		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Pre, false);
 		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Post, true);
 		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Pre, false);
 		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Post, true);
+#endif
 	}
 	m_HookCount = 0;
 }
 
 int UserMessages::GetMessageIndex(const char *msg)
 {
+#if SOURCE_ENGINE == SE_CSGO
+	// Can split this per engine and/or game later
+	return g_Cstrike15UsermessageHelpers.GetIndex(msg);
+#else
 	int msgid;
 
 	if (!sm_trie_retrieve(m_Names, msg, reinterpret_cast<void **>(&msgid)))
@@ -118,10 +145,19 @@ int UserMessages::GetMessageIndex(const char *msg)
 	}
 
 	return msgid;
+#endif
 }
 
 bool UserMessages::GetMessageName(int msgid, char *buffer, size_t maxlength) const
 {
+#if SOURCE_ENGINE == SE_CSGO
+	const char *pszName = g_Cstrike15UsermessageHelpers.GetName(msgid);
+	if (!pszName)
+		return false;
+
+	strncopy(buffer, pszName, maxlength);
+	return true;
+#else
 	if (m_FallbackSearch)
 	{
 		int size;
@@ -137,10 +173,14 @@ bool UserMessages::GetMessageName(int msgid, char *buffer, size_t maxlength) con
 	}
 
 	return false;
+#endif
 }
 
-bf_write *UserMessages::StartMessage(int msg_id, const cell_t players[], unsigned int playersNum, int flags)
+bf_write *UserMessages::StartBitBufMessage(int msg_id, const cell_t players[], unsigned int playersNum, int flags)
 {
+#ifdef USE_PROTOBUF_USERMESSAGES
+	return NULL;
+#else
 	bf_write *buffer;
 
 	if (m_InExec || m_InHook)
@@ -168,13 +208,13 @@ bf_write *UserMessages::StartMessage(int msg_id, const cell_t players[], unsigne
 
 	if (m_CurFlags & USERMSG_BLOCKHOOKS)
 	{
-#if (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
+#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) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
+#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);
@@ -182,6 +222,75 @@ bf_write *UserMessages::StartMessage(int msg_id, const cell_t players[], unsigne
 	}
 
 	return buffer;
+#endif // USE_PROTOBUF_USERMESSAGES
+}
+
+google::protobuf::Message *UserMessages::StartProtobufMessage(int msg_id, const cell_t players[], unsigned int playersNum, int flags)
+{
+#ifndef USE_PROTOBUF_USERMESSAGES
+	return NULL;
+#else
+	protobuf::Message *buffer;
+
+	if (m_InExec || m_InHook)
+	{
+		return NULL;
+	}
+	if (msg_id < 0 || msg_id >= 255)
+	{
+		return NULL;
+	}
+
+	m_CurId = msg_id;
+	m_CellRecFilter.Initialize(players, playersNum);
+
+	m_CurFlags = flags;
+	if (m_CurFlags & USERMSG_INITMSG)
+	{
+		m_CellRecFilter.SetToInit(true);
+	}
+	if (m_CurFlags & USERMSG_RELIABLE)
+	{
+		m_CellRecFilter.SetToReliable(true);
+	}
+
+	m_InExec = true;
+
+	if (m_CurFlags & USERMSG_BLOCKHOOKS)
+	{
+		// direct message creation, return buffer "from engine". keep track
+		m_FakeEngineBuffer = g_Cstrike15UsermessageHelpers.GetPrototype(msg_id)->New();
+		buffer = m_FakeEngineBuffer;
+	} else {
+		char messageName[32];
+		if (!GetMessageName(msg_id, messageName, sizeof(messageName)))
+		{
+			m_InExec = false;
+			return NULL;
+		}
+
+		protobuf::Message *msg = OnStartMessage_Pre(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id, messageName);
+		switch (m_FakeMetaRes)
+		{
+		case MRES_IGNORED:
+		case MRES_HANDLED:
+			m_FakeEngineBuffer = g_Cstrike15UsermessageHelpers.GetPrototype(msg_id)->New();
+			buffer = m_FakeEngineBuffer;
+			break;		
+
+		case MRES_OVERRIDE:
+			m_FakeEngineBuffer = g_Cstrike15UsermessageHelpers.GetPrototype(msg_id)->New();
+		// fallthrough
+		case MRES_SUPERCEDE:
+			buffer = msg;
+			break;
+		}
+		
+		OnStartMessage_Post(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id, messageName);
+	}
+
+	return buffer;
+#endif // USE_PROTOBUF_USERMESSAGES
 }
 
 bool UserMessages::EndMessage()
@@ -191,12 +300,37 @@ bool UserMessages::EndMessage()
 		return false;
 	}
 
+#if SOURCE_ENGINE == SE_CSGO
+	if (m_CurFlags & USERMSG_BLOCKHOOKS)
+	{
+		ENGINE_CALL(SendUserMessage)(static_cast<IRecipientFilter &>(m_CellRecFilter), m_CurId, *m_FakeEngineBuffer);
+		delete m_FakeEngineBuffer;
+		m_FakeEngineBuffer = NULL;
+	} else {
+		OnMessageEnd_Pre();
+
+		switch (m_FakeMetaRes)
+		{
+		case MRES_IGNORED:
+		case MRES_HANDLED:
+		case MRES_OVERRIDE:
+			engine->SendUserMessage(static_cast<IRecipientFilter &>(m_CellRecFilter), m_CurId, *m_FakeEngineBuffer);
+			delete m_FakeEngineBuffer;
+			m_FakeEngineBuffer = NULL;
+			break;
+		//case MRES_SUPERCEDE:
+		}
+
+		OnMessageEnd_Post();
+	}
+#else
 	if (m_CurFlags & USERMSG_BLOCKHOOKS)
 	{
 		ENGINE_CALL(MessageEnd)();
 	} else {
 		engine->MessageEnd();
 	}
+#endif // SE_CSGO
 
 	m_InExec = false;
 	m_CurFlags = 0;
@@ -205,31 +339,60 @@ bool UserMessages::EndMessage()
 	return true;
 }
 
+UserMessageType UserMessages::GetUserMessageType() const
+{
+#ifdef USE_PROTOBUF_USERMESSAGES
+	return UM_Protobuf;
+#else
+	return UM_BitBuf;
+#endif
+}
+
 bool UserMessages::HookUserMessage2(int msg_id,
 									IUserMessageListener *pListener,
 									bool intercept)
 {
-	return InternalHook(msg_id, pListener, intercept, true);
+#ifdef USE_PROTOBUF_USERMESSAGES
+	return InternalHook(msg_id, (IProtobufUserMessageListener *)pListener, intercept, true);
+#else
+	return InternalHook(msg_id, (IBitBufUserMessageListener *)pListener, intercept, true);
+#endif
 }
 
 bool UserMessages::UnhookUserMessage2(int msg_id,
 									  IUserMessageListener *pListener,
 									  bool intercept)
 {
-	return InternalUnhook(msg_id, pListener, intercept, true);
+#ifdef USE_PROTOBUF_USERMESSAGES
+	return InternalUnhook(msg_id, (IProtobufUserMessageListener *)pListener, intercept, true);
+#else
+	return InternalUnhook(msg_id, (IBitBufUserMessageListener *)pListener, intercept, true);
+#endif
 }
 
 bool UserMessages::HookUserMessage(int msg_id, IUserMessageListener *pListener, bool intercept)
 {
-	return InternalHook(msg_id, pListener, intercept, false);
+#ifdef USE_PROTOBUF_USERMESSAGES
+	return InternalHook(msg_id, (IProtobufUserMessageListener *)pListener, intercept, false);
+#else
+	return InternalHook(msg_id, (IBitBufUserMessageListener *)pListener, intercept, false);
+#endif
 }
 
 bool UserMessages::UnhookUserMessage(int msg_id, IUserMessageListener *pListener, bool intercept)
 {	
-	return InternalUnhook(msg_id, pListener, intercept, false);
+#ifdef USE_PROTOBUF_USERMESSAGES
+	return InternalUnhook(msg_id, (IProtobufUserMessageListener *)pListener, intercept, false);
+#else
+	return InternalUnhook(msg_id, (IBitBufUserMessageListener *)pListener, intercept, false);
+#endif
 }
 
-bool UserMessages::InternalHook(int msg_id, IUserMessageListener *pListener, bool intercept, bool isNew)
+#ifdef USE_PROTOBUF_USERMESSAGES
+bool UserMessages::InternalHook(int msg_id, IProtobufUserMessageListener *pListener, bool intercept, bool isNew)
+#else
+bool UserMessages::InternalHook(int msg_id, IBitBufUserMessageListener *pListener, bool intercept, bool isNew)
+#endif
 {
 	if (msg_id < 0 || msg_id >= 255)
 	{
@@ -252,10 +415,15 @@ bool UserMessages::InternalHook(int msg_id, IUserMessageListener *pListener, boo
 
 	if (!m_HookCount++)
 	{
+#if SOURCE_ENGINE == SE_CSGO
+		SH_ADD_HOOK_MEMFUNC(IVEngineServer, SendUserMessage, engine, this, &UserMessages::OnSendUserMessage_Pre, false);
+		SH_ADD_HOOK_MEMFUNC(IVEngineServer, SendUserMessage, engine, this, &UserMessages::OnSendUserMessage_Post, true);
+#else
 		SH_ADD_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Pre, false);
 		SH_ADD_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Post, true);
 		SH_ADD_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Pre, false);
 		SH_ADD_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Post, true);
+#endif
 	}
 
 	if (intercept)
@@ -268,7 +436,11 @@ bool UserMessages::InternalHook(int msg_id, IUserMessageListener *pListener, boo
 	return true;
 }
 
-bool UserMessages::InternalUnhook(int msg_id, IUserMessageListener *pListener, bool intercept, bool isNew)
+#ifdef USE_PROTOBUF_USERMESSAGES
+bool UserMessages::InternalUnhook(int msg_id, IProtobufUserMessageListener *pListener, bool intercept, bool isNew)
+#else
+bool UserMessages::InternalUnhook(int msg_id, IBitBufUserMessageListener *pListener, bool intercept, bool isNew)
+#endif
 {
 	MsgList *pList;
 	MsgIter iter;
@@ -309,14 +481,69 @@ void UserMessages::_DecRefCounter()
 {
 	if (--m_HookCount == 0)
 	{
+#if SOURCE_ENGINE == SE_CSGO
+		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, SendUserMessage, engine, this, &UserMessages::OnSendUserMessage_Pre, false);
+		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, SendUserMessage, engine, this, &UserMessages::OnSendUserMessage_Post, true);
+#else
 		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Pre, false);
 		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Post, true);
 		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Pre, false);
 		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Post, true);
+#endif
 	}
 }
 
-#if (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
+#if SOURCE_ENGINE == SE_CSGO
+void UserMessages::OnSendUserMessage_Pre(IRecipientFilter &filter, int msg_type, const protobuf::Message &msg)
+{
+	OnStartMessage_Pre(&filter, msg_type, g_Cstrike15UsermessageHelpers.GetName(msg_type));
+	if (m_FakeMetaRes == MRES_SUPERCEDE)
+	{
+		int size = msg.ByteSize();
+		uint8 *data = (uint8 *)stackalloc(size);
+		msg.SerializePartialToArray(data, size);
+		m_InterceptBuffer->ParsePartialFromArray(data, size);
+	}
+	else
+	{
+		m_FakeEngineBuffer = &const_cast<protobuf::Message &>(msg);
+	}
+
+	OnStartMessage_Post(&filter, msg_type, g_Cstrike15UsermessageHelpers.GetName(msg_type));
+
+	OnMessageEnd_Pre();
+	if (m_FakeMetaRes == MRES_SUPERCEDE)
+		RETURN_META(MRES_SUPERCEDE);
+
+	RETURN_META(MRES_IGNORED);
+}
+
+void UserMessages::OnSendUserMessage_Post(IRecipientFilter &filter, int msg_type, const protobuf::Message &msg)
+{
+	OnMessageEnd_Post();
+	RETURN_META(MRES_IGNORED);
+}
+#endif
+
+#ifdef USE_PROTOBUF_USERMESSAGES
+#define UM_RETURN_META_VALUE(res, val) \
+	m_FakeMetaRes = res;               \
+	return val;
+
+#define UM_RETURN_META(res)            \
+	m_FakeMetaRes = res;               \
+	return;
+#else
+#define UM_RETURN_META_VALUE(res, val) \
+	RETURN_META_VALUE(res, val)
+
+#define UM_RETURN_META(res)            \
+	RETURN_META(res)
+#endif
+
+#if SOURCE_ENGINE == SE_CSGO
+protobuf::Message *UserMessages::OnStartMessage_Pre(IRecipientFilter *filter, int msg_type, const char *msg_name)
+#elif 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)
@@ -329,7 +556,7 @@ bf_write *UserMessages::OnStartMessage_Pre(IRecipientFilter *filter, int msg_typ
 		|| (m_InExec && (m_CurFlags & USERMSG_BLOCKHOOKS)))
 	{
 		m_InHook = false;
-		RETURN_META_VALUE(MRES_IGNORED, NULL);
+		UM_RETURN_META_VALUE(MRES_IGNORED, NULL);
 	}
 
 	m_CurId = msg_type;
@@ -339,14 +566,23 @@ bf_write *UserMessages::OnStartMessage_Pre(IRecipientFilter *filter, int msg_typ
 
 	if (!is_intercept_empty)
 	{
+#ifdef USE_PROTOBUF_USERMESSAGES
+		if (m_InterceptBuffer)
+			delete m_InterceptBuffer;
+		m_InterceptBuffer = g_Cstrike15UsermessageHelpers.GetPrototype(msg_type)->New();
+		UM_RETURN_META_VALUE(MRES_SUPERCEDE, m_InterceptBuffer);
+#else
 		m_InterceptBuffer.Reset();
-		RETURN_META_VALUE(MRES_SUPERCEDE, &m_InterceptBuffer);
+		UM_RETURN_META_VALUE(MRES_SUPERCEDE, &m_InterceptBuffer);
+#endif
 	}
 
-	RETURN_META_VALUE(MRES_IGNORED, NULL);
+	UM_RETURN_META_VALUE(MRES_IGNORED, NULL);
 }
 
-#if (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
+#if SOURCE_ENGINE == SE_CSGO
+protobuf::Message *UserMessages::OnStartMessage_Post(IRecipientFilter *filter, int msg_type, const char *msg_name)
+#elif 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)
@@ -354,19 +590,26 @@ bf_write *UserMessages::OnStartMessage_Post(IRecipientFilter *filter, int msg_ty
 {
 	if (!m_InHook)
 	{
-		RETURN_META_VALUE(MRES_IGNORED, NULL);
+		UM_RETURN_META_VALUE(MRES_IGNORED, NULL);
 	}
 
+#ifdef USE_PROTOBUF_USERMESSAGES
+	if (m_FakeMetaRes == MRES_SUPERCEDE)
+		m_OrigBuffer = m_InterceptBuffer;
+	else
+		m_OrigBuffer = m_FakeEngineBuffer;
+#else
 	m_OrigBuffer = META_RESULT_ORIG_RET(bf_write *);
+#endif
 
-	RETURN_META_VALUE(MRES_IGNORED, NULL);
+	UM_RETURN_META_VALUE(MRES_IGNORED, NULL);
 }
 
 void UserMessages::OnMessageEnd_Post()
 {
 	if (!m_InHook)
 	{
-		RETURN_META(MRES_IGNORED);
+		UM_RETURN_META(MRES_IGNORED);
 	}
 
 	MsgList *pList;
@@ -434,7 +677,7 @@ void UserMessages::OnMessageEnd_Pre()
 {
 	if (!m_InHook)
 	{
-		RETURN_META(MRES_IGNORED);
+		UM_RETURN_META(MRES_IGNORED);
 	}
 
 	MsgList *pList;
@@ -450,7 +693,11 @@ void UserMessages::OnMessageEnd_Pre()
 	{
 		pInfo = (*iter);
 		pInfo->IsHooked = true;
+#ifdef USE_PROTOBUF_USERMESSAGES
+		res = pInfo->Callback->InterceptUserMessage(m_CurId, m_InterceptBuffer, m_CurRecFilter);
+#else
 		res = pInfo->Callback->InterceptUserMessage(m_CurId, &m_InterceptBuffer, m_CurRecFilter);
+#endif
 
 		intercepted = true;
 
@@ -498,9 +745,11 @@ void UserMessages::OnMessageEnd_Pre()
 
 	if (!handled && intercepted)
 	{
+#if SOURCE_ENGINE == SE_CSGO
+		ENGINE_CALL(SendUserMessage)(static_cast<IRecipientFilter &>(*m_CurRecFilter), m_CurId, *m_InterceptBuffer);
+#else
 		bf_write *engine_bfw;
-
-#if (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
+#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);
@@ -508,29 +757,46 @@ void UserMessages::OnMessageEnd_Pre()
 		m_ReadBuffer.StartReading(m_InterceptBuffer.GetBasePointer(), m_InterceptBuffer.GetNumBytesWritten());
 		engine_bfw->WriteBitsFromBuffer(&m_ReadBuffer, m_InterceptBuffer.GetNumBitsWritten());
 		ENGINE_CALL(MessageEnd)();
+#endif // SE_CSGO
 	}
 
-	pList = &m_msgHooks[m_CurId];
-	for (iter=pList->begin(); iter!=pList->end(); )
 	{
-		pInfo = (*iter);
-		pInfo->IsHooked = true;
-		pInfo->Callback->OnUserMessage(m_CurId, m_OrigBuffer, m_CurRecFilter);
+#if SOURCE_ENGINE == SE_CSGO
+		int size = m_OrigBuffer->ByteSize();
+		uint8 *data = (uint8 *)stackalloc(size);
+		m_OrigBuffer->SerializePartialToArray(data, size);
+		protobuf::Message *pTempMsg = g_Cstrike15UsermessageHelpers.GetPrototype(m_CurId)->New();
+		pTempMsg->ParsePartialFromArray(data, size);
+#else
+		bf_write *pTempMsg = m_OrigBuffer;
+#endif
 
-		if (pInfo->KillMe)
+		pList = &m_msgHooks[m_CurId];
+		for (iter=pList->begin(); iter!=pList->end(); )
 		{
-			iter = pList->erase(iter);
-			m_FreeListeners.push(pInfo);
-			_DecRefCounter();
-			continue;
+			pInfo = (*iter);
+			pInfo->IsHooked = true;
+			pInfo->Callback->OnUserMessage(m_CurId, pTempMsg, m_CurRecFilter);
+
+			if (pInfo->KillMe)
+			{
+				iter = pList->erase(iter);
+				m_FreeListeners.push(pInfo);
+				_DecRefCounter();
+				continue;
+			}
+
+			pInfo->IsHooked = false;
+			iter++;
 		}
 
-		pInfo->IsHooked = false;
-		iter++;
+#if SOURCE_ENGINE == SE_CSGO
+		delete pTempMsg;
+#endif
 	}
 
-	RETURN_META((intercepted) ? MRES_SUPERCEDE : MRES_IGNORED);
+	UM_RETURN_META((intercepted) ? MRES_SUPERCEDE : MRES_IGNORED);
 supercede:
 	m_BlockEndPost = true;
-	RETURN_META(MRES_SUPERCEDE);
+	UM_RETURN_META(MRES_SUPERCEDE);
 }

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
@@ -36,16 +36,35 @@
 #include <IUserMessages.h>
 #include "sourcemm_api.h"
 #include "sm_trie.h"
+#include "sm_stringutil.h"
 #include "CellRecipientFilter.h"
 
 using namespace SourceHook;
 using namespace SourceMod;
 
+#if SOURCE_ENGINE == SE_CSGO
+#define USE_PROTOBUF_USERMESSAGES
+#endif
+
+#ifdef USE_PROTOBUF_USERMESSAGES
+#include <google/protobuf/message.h>
+#include <google/protobuf/descriptor.h>
+#include <netmessages.pb.h>
+
+using namespace google;
+#else
+#include <bitbuf.h>
+#endif
+
 #define INVALID_MESSAGE_ID -1
 
 struct ListenerInfo
 {
-	IUserMessageListener *Callback;
+#ifdef USE_PROTOBUF_USERMESSAGES
+	IProtobufUserMessageListener *Callback;
+#else
+	IBitBufUserMessageListener *Callback;
+#endif
 	bool IsHooked;
 	bool KillMe;
 	bool IsNew;
@@ -70,7 +89,8 @@ public: //IUserMessages
 	bool GetMessageName(int msgid, char *buffer, size_t maxlength) const;
 	bool HookUserMessage(int msg_id, IUserMessageListener *pListener, bool intercept=false);
 	bool UnhookUserMessage(int msg_id, IUserMessageListener *pListener, bool intercept=false);
-	bf_write *StartMessage(int msg_id, const cell_t players[], unsigned int playersNum, int flags);
+	bf_write *StartBitBufMessage(int msg_id, const cell_t players[], unsigned int playersNum, int flags);
+	google::protobuf::Message *StartProtobufMessage(int msg_id, const cell_t players[], unsigned int playersNum, int flags);
 	bool EndMessage();
 	bool HookUserMessage2(int msg_id,
 		IUserMessageListener *pListener,
@@ -78,8 +98,17 @@ public: //IUserMessages
 	bool UnhookUserMessage2(int msg_id,
 		IUserMessageListener *pListener,
 		bool intercept=false);
+	UserMessageType GetUserMessageType() const;
 public:
-#if (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
+#if SOURCE_ENGINE == SE_CSGO
+	void OnSendUserMessage_Pre(IRecipientFilter &filter, int msg_type, const protobuf::Message &msg);
+	void OnSendUserMessage_Post(IRecipientFilter &filter, int msg_type, const protobuf::Message &msg);
+#endif
+
+#if SOURCE_ENGINE == SE_CSGO
+	protobuf::Message *OnStartMessage_Pre(IRecipientFilter *filter, int msg_type, const char *msg_name);
+	protobuf::Message *OnStartMessage_Post(IRecipientFilter *filter, int msg_type, const char *msg_name);
+#elif 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
@@ -89,24 +118,40 @@ public:
 	void OnMessageEnd_Pre();
 	void OnMessageEnd_Post();
 private:
-	bool InternalHook(int msg_id, IUserMessageListener *pListener, bool intercept, bool isNew);
-	bool InternalUnhook(int msg_id, IUserMessageListener *pListener, bool intercept, bool isNew);
+#ifdef USE_PROTOBUF_USERMESSAGES
+	bool InternalHook(int msg_id, IProtobufUserMessageListener *pListener, bool intercept, bool isNew);
+	bool InternalUnhook(int msg_id, IProtobufUserMessageListener *pListener, bool intercept, bool isNew);
+#else
+	bool InternalHook(int msg_id, IBitBufUserMessageListener *pListener, bool intercept, bool isNew);
+	bool InternalUnhook(int msg_id, IBitBufUserMessageListener *pListener, bool intercept, bool isNew);
+#endif
 	void _DecRefCounter();
 private:
 	List<ListenerInfo *> m_msgHooks[255];
 	List<ListenerInfo *> m_msgIntercepts[255];
 	CStack<ListenerInfo *> m_FreeListeners;
-	unsigned char m_pBase[2500];
 	IRecipientFilter *m_CurRecFilter;
+#ifndef USE_PROTOBUF_USERMESSAGES
+	unsigned char m_pBase[2500];
 	bf_write m_InterceptBuffer;
 	bf_write *m_OrigBuffer;
 	bf_read m_ReadBuffer;
+#else
+	// The engine used to provide this. Now we track it.
+	protobuf::Message *m_OrigBuffer;
+	protobuf::Message *m_FakeEngineBuffer;
+	META_RES m_FakeMetaRes;
+
+	protobuf::Message *m_InterceptBuffer;
+#endif
 	size_t m_HookCount;
 	bool m_InHook;
 	bool m_BlockEndPost;
+#ifndef USE_PROTOBUF_USERMESSAGES
 	bool m_FallbackSearch;
 
 	Trie *m_Names;
+#endif
 	CellRecipientFilter m_CellRecFilter;
 	bool m_InExec;
 	int m_CurFlags;

core/convar_sm_l4d.h

@@ -24,7 +24,7 @@
 
 #ifdef _WIN32
 #define FORCEINLINE_CVAR FORCEINLINE
-#elif _LINUX
+#elif defined _LINUX || defined __APPLE__
 #define FORCEINLINE_CVAR inline
 #else
 #error "implement me"
@@ -386,7 +386,7 @@ public:
 	virtual void				SetValue( const char *value );
 	virtual void				SetValue( float value );
 	virtual void				SetValue( int value );
-#if SOURCE_ENGINE == SE_LEFT4DEAD2
+#if SOURCE_ENGINE >= SE_NUCLEARDAWN
 	virtual void				SetValue( Color value );
 #endif
 	
@@ -404,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/convar_sm_ob.h

@@ -24,7 +24,7 @@
 
 #ifdef _WIN32
 #define FORCEINLINE_CVAR FORCEINLINE
-#elif _LINUX
+#elif defined _LINUX || defined __APPLE__
 #define FORCEINLINE_CVAR inline
 #else
 #error "implement me"

core/logic/AMBuilder

@@ -12,6 +12,9 @@ compiler['CDEFINES'].append('SM_LOGIC')
 
 if AMBuild.target['platform'] == 'linux':
 	compiler['POSTLINKFLAGS'].append('-lpthread')
+if AMBuild.target['platform'] == 'darwin':
+	compiler['CFLAGS'].extend(['-Wno-deprecated-declarations'])
+	compiler['POSTLINKFLAGS'].extend(['-framework', 'CoreServices'])
 
 extension = AMBuild.AddJob('sourcemod.logic')
 binary = Cpp.LibraryBuilder('sourcemod.logic', AMBuild, extension, compiler)
@@ -29,7 +32,23 @@ files = [
 	'smn_textparse.cpp',
 	'smn_adt_trie.cpp',
 	'Profiler.cpp',
-	'smn_functions.cpp'
+	'smn_functions.cpp',
+	'smn_timers.cpp',
+	'smn_players.cpp',
+	'MemoryUtils.cpp',
+	'smn_admin.cpp',
+	'smn_banning.cpp',
+	'stringutil.cpp',
+	'Translator.cpp',
+	'PhraseCollection.cpp',
+	'smn_lang.cpp',
+	'smn_string.cpp',
+	'smn_handles.cpp',
+	'smn_datapacks.cpp',
+	'smn_gameconfigs.cpp',
+	'GameConfigs.cpp',
+	'sm_crc32.cpp',
+	'smn_profiler.cpp'
 	]
 if AMBuild.target['platform'] == 'windows':
 	files.append('thread/WinThreads.cpp')
@@ -37,5 +56,6 @@ else:
 	files.append('thread/PosixThreads.cpp')
 binary.AddSourceFiles('core/logic', files)
 SM.AutoVersion('core/logic', binary)
+SM.ExtractDebugInfo(extension, binary)
 binary.SendToJob()
 

core/logic/AutoHandleRooter.h

@@ -0,0 +1,92 @@
+/**
+ * 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_AUTO_HANDLE_ROOTER_H_
+#define _INCLUDE_SOURCEMOD_AUTO_HANDLE_ROOTER_H_
+
+#include "common_logic.h"
+#include <IHandleSys.h>
+
+class AutoHandleRooter
+{
+public:
+	AutoHandleRooter(Handle_t hndl)
+	{
+		if (hndl != BAD_HANDLE)
+			this->hndl = handlesys->FastCloneHandle(hndl);
+		else
+			this->hndl = BAD_HANDLE;
+	}
+
+	~AutoHandleRooter()
+	{
+		if (hndl != BAD_HANDLE)
+		{
+			HandleSecurity sec(g_pCoreIdent, g_pCoreIdent);
+			handlesys->FreeHandle(hndl, &sec);
+		}
+	}
+
+	Handle_t getHandle()
+	{
+		return hndl;
+	}
+private:
+	Handle_t hndl;
+};
+
+class AutoHandleCloner
+{
+	Handle_t original;
+	HandleSecurity sec;
+	AutoHandleRooter ahr;
+public:
+	AutoHandleCloner(Handle_t original, HandleSecurity sec)
+	  : original(original), sec(sec), ahr(original)
+	{
+	}
+
+	~AutoHandleCloner()
+	{
+		if (original != BAD_HANDLE)
+		{
+			handlesys->FreeHandle(original, &sec);
+		}
+	}
+
+	Handle_t getClone()
+	{
+		return ahr.getHandle();
+	}
+};
+
+#endif /* _INCLUDE_SOURCEMOD_AUTO_HANDLE_ROOTER_H_ */
+

core/logic/GameConfigs.h

@@ -32,13 +32,12 @@
 #ifndef _INCLUDE_SOURCEMOD_CGAMECONFIGS_H_
 #define _INCLUDE_SOURCEMOD_CGAMECONFIGS_H_
 
+#include "common_logic.h"
 #include <IGameConfigs.h>
 #include <ITextParsers.h>
 #include <sh_list.h>
-#include "sm_trie.h"
-#include "sm_globals.h"
 #include "sm_memtable.h"
-#include "sm_trie_tpl.h"
+#include <sm_trie_tpl.h>
 
 using namespace SourceMod;
 using namespace SourceHook;
@@ -51,11 +50,13 @@ class CGameConfig :
 {
 	friend class GameConfigManager;
 public:
-	CGameConfig(const char *file);
+	CGameConfig(const char *file, const char *engine = NULL);
 	~CGameConfig();
 public:
 	bool Reparse(char *error, size_t maxlength);
 	bool EnterFile(const char *file, char *error, size_t maxlength);
+	void SetBaseEngine(const char *engine);
+	void SetParseEngine(const char *engine);
 public: //ITextListener_SMC
 	SMCResult ReadSMC_NewSection(const SMCStates *states, const char *name);
 	SMCResult ReadSMC_KeyValue(const SMCStates *states, const char *key, const char *value);
@@ -65,6 +66,7 @@ public: //IGameConfig
 	bool GetOffset(const char *key, int *value);
 	SendProp *GetSendProp(const char *key);
 	bool GetMemSig(const char *key, void **addr);
+	bool GetAddress(const char *key, void **addr);
 public:
 	void IncRefCount();
 	unsigned int DecRefCount();
@@ -72,10 +74,10 @@ private:
 	BaseStringTable *m_pStrings;
 	char m_File[PLATFORM_MAX_PATH];
 	char m_CurFile[PLATFORM_MAX_PATH];
-	Trie *m_pOffsets;
-	Trie *m_pProps;
-	Trie *m_pKeys;
-	Trie *m_pSigs;
+	KTrie<int> m_Offsets;
+	KTrie<SendProp *> m_Props;
+	KTrie<int> m_Keys;
+	KTrie<void *> m_Sigs;
 	unsigned int m_RefCount;
 	/* Parse states */
 	int m_ParseState;
@@ -93,6 +95,26 @@ private:
 	/* Custom Sections */
 	unsigned int m_CustomLevel;
 	ITextListener_SMC *m_CustomHandler;
+
+	/* Support for reading Addresses */
+	struct AddressConf
+	{
+		char signatureName[64];
+		int readCount;
+		int read[8];
+
+		AddressConf(char *sigName, unsigned sigLength, unsigned readCount, int *read);
+
+		AddressConf() {}
+	};
+
+	char m_Address[64];
+	char m_AddressSignature[64];
+	int m_AddressReadCount;
+	int m_AddressRead[8];
+	KTrie<AddressConf> *m_pAddresses;
+	const char *m_pEngine;
+	const char *m_pBaseEngine;
 };
 
 class GameConfigManager : 
@@ -118,7 +140,7 @@ public: //SMGlobalClass
 	void OnSourceModAllShutdown();
 private:
 	List<CGameConfig *> m_cfgs;
-	Trie *m_pLookup;
+	KTrie<CGameConfig *> m_Lookup;
 public:
 	KTrie<ITextListener_SMC *> m_customHandlers;
 };

core/logic/Makefile

@@ -25,7 +25,23 @@ OBJECTS = \
 	smn_textparse.cpp	\
 	smn_adt_trie.cpp	\
 	Profiler.cpp		\
-	smn_functions.cpp
+	smn_functions.cpp   \
+	sm_crc32.cpp		\
+	smn_timers.cpp		\
+	MemoryUtils.cpp		\
+	smn_admin.cpp		\
+	smn_banning.cpp		\
+	stringutil.cpp		\
+	Translator.cpp		\
+	PhraseCollection.cpp \
+	smn_lang.cpp		\
+	smn_string.cpp		\
+	smn_handles.cpp		\
+	smn_datapacks.cpp	\
+	smn_gameconfigs.cpp	\
+	GameConfigs.cpp		\
+	smn_players.cpp 	\
+	smn_profiler.cpp
 
 ##############################################
 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###

core/logic/MemoryUtils.cpp

@@ -0,0 +1,612 @@
+/**
+ * vim: set ts=4 sw=4 tw=99 noet :
+ * =============================================================================
+ * SourceMod
+ * Copyright (C) 2004-2011 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>.
+ */
+
+#include "MemoryUtils.h"
+#ifdef PLATFORM_LINUX
+#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
+
+#ifdef PLATFORM_APPLE
+#include <AvailabilityMacros.h>
+#include <mach/task.h>
+#include <mach-o/dyld_images.h>
+#include <mach-o/loader.h>
+#include <mach-o/nlist.h>
+
+/* Define things from 10.6 SDK for older SDKs */
+#ifndef MAC_OS_X_VERSION_10_6
+struct task_dyld_info
+{
+	mach_vm_address_t all_image_info_addr;
+	mach_vm_size_t all_image_info_size;
+};
+typedef struct task_dyld_info task_dyld_info_data_t;
+#define TASK_DYLD_INFO 17
+#define TASK_DYLD_INFO_COUNT (sizeof(task_dyld_info_data_t) / sizeof(natural_t))
+#endif // MAC_OS_X_VERSION_10_6
+#endif // PLATFORM_APPLE
+
+MemoryUtils g_MemUtils;
+
+MemoryUtils::MemoryUtils()
+{
+#ifdef PLATFORM_APPLE
+
+	Gestalt(gestaltSystemVersionMajor, &m_OSXMajor);
+	Gestalt(gestaltSystemVersionMinor, &m_OSXMinor);
+
+	/* Get pointer to struct that describes all loaded mach-o images in process */
+	if ((m_OSXMajor == 10 && m_OSXMinor >= 6) || m_OSXMajor > 10)
+	{
+		task_dyld_info_data_t dyld_info;
+		mach_msg_type_number_t count = TASK_DYLD_INFO_COUNT;
+		task_info(mach_task_self(), TASK_DYLD_INFO, (task_info_t)&dyld_info, &count);
+		m_ImageList = (struct dyld_all_image_infos *)dyld_info.all_image_info_addr;
+	}
+	else
+	{
+		struct nlist list[2];
+		memset(list, 0, sizeof(list));
+		list[0].n_un.n_name = (char *)"_dyld_all_image_infos";
+		nlist("/usr/lib/dyld", list);
+		m_ImageList = (struct dyld_all_image_infos *)list[0].n_value;
+	}
+
+#endif
+}
+
+MemoryUtils::~MemoryUtils()
+{
+#if defined PLATFORM_LINUX || defined PLATFORM_APPLE
+	for (size_t i = 0; i < m_SymTables.size(); i++)
+	{
+		delete m_SymTables[i];
+	}
+	m_SymTables.clear();
+#endif
+}
+
+void MemoryUtils::OnSourceModAllInitialized()
+{
+	sharesys->AddInterface(NULL, this);
+}
+
+void *MemoryUtils::FindPattern(const void *libPtr, const char *pattern, size_t len)
+{
+	DynLibInfo lib;
+	bool found;
+	char *ptr, *end;
+
+	memset(&lib, 0, sizeof(DynLibInfo));
+
+	if (!GetLibraryInfo(libPtr, lib))
+	{
+		return NULL;
+	}
+
+	ptr = reinterpret_cast<char *>(lib.baseAddress);
+	end = ptr + lib.memorySize - len;
+
+	while (ptr < end)
+	{
+		found = true;
+		for (register size_t i = 0; i < len; i++)
+		{
+			if (pattern[i] != '\x2A' && pattern[i] != ptr[i])
+			{
+				found = false;
+				break;
+			}
+		}
+
+		if (found)
+			return ptr;
+
+		ptr++;
+	}
+
+	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;
+
+#elif defined PLATFORM_APPLE
+	
+	uintptr_t dlbase, linkedit_addr;
+	uint32_t image_count;
+	struct mach_header *file_hdr;
+	struct load_command *loadcmds;
+	struct segment_command *linkedit_hdr;
+	struct symtab_command *symtab_hdr;
+	struct nlist *symtab;
+	const char *strtab;
+	uint32_t loadcmd_count;
+	uint32_t symbol_count;
+	LibSymbolTable *libtable;
+	SymbolTable *table;
+	Symbol *symbol_entry;
+	
+	dlbase = 0;
+	image_count = m_ImageList->infoArrayCount;
+	linkedit_hdr = NULL;
+	symtab_hdr = NULL;
+	table = NULL;
+	
+	/* Loop through mach-o images in process.
+	 * We can skip index 0 since that is just the executable.
+	 */
+	for (uint32_t i = 1; i < image_count; i++)
+	{
+		const struct dyld_image_info &info = m_ImageList->infoArray[i];
+		
+		/* "Load" each one until we get a matching handle */
+		void *h = dlopen(info.imageFilePath, RTLD_NOLOAD);
+		if (h == handle)
+		{
+			dlbase = (uintptr_t)info.imageLoadAddress;
+			dlclose(h);
+			break;
+		}
+		
+		dlclose(h);
+	}
+	
+	if (!dlbase)
+	{
+		/* Uh oh, we couldn't find a matching handle */
+		return 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 == dlbase)
+		{
+			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 = dlbase;
+		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 to locate it in memory */
+	
+	file_hdr = (struct mach_header *)dlbase;
+	loadcmds = (struct load_command *)(dlbase + sizeof(struct mach_header));
+	loadcmd_count = file_hdr->ncmds;
+	
+	/* Loop through load commands until we find the ones for the symbol table */
+	for (uint32_t i = 0; i < loadcmd_count; i++)
+	{
+		if (loadcmds->cmd == LC_SEGMENT && !linkedit_hdr)
+		{
+			struct segment_command *seg = (struct segment_command *)loadcmds;
+			if (strcmp(seg->segname, "__LINKEDIT") == 0)
+			{
+				linkedit_hdr = seg;
+				if (symtab_hdr)
+				{
+					break;
+				}
+			}
+		}
+		else if (loadcmds->cmd == LC_SYMTAB)
+		{
+			symtab_hdr = (struct symtab_command *)loadcmds;
+			if (linkedit_hdr)
+			{
+				break;
+			}
+		}
+
+		/* Load commands are not of a fixed size which is why we add the size */
+		loadcmds = (struct load_command *)((uintptr_t)loadcmds + loadcmds->cmdsize);
+	}
+	
+	if (!linkedit_hdr || !symtab_hdr || !symtab_hdr->symoff || !symtab_hdr->stroff)
+	{
+		/* Uh oh, no symbol table */
+		return NULL;
+	}
+
+	linkedit_addr = dlbase + linkedit_hdr->vmaddr;
+	symtab = (struct nlist *)(linkedit_addr + symtab_hdr->symoff - linkedit_hdr->fileoff);
+	strtab = (const char *)(linkedit_addr + symtab_hdr->stroff - linkedit_hdr->fileoff);
+	symbol_count = symtab_hdr->nsyms;
+	
+	/* Iterate symbol table starting from the position we were at last time */
+	for (uint32_t i = libtable->last_pos; i < symbol_count; i++)
+	{
+		struct nlist &sym = symtab[i];
+		/* Ignore the prepended underscore on all symbols, so +1 here */
+		const char *sym_name = strtab + sym.n_un.n_strx + 1;
+		Symbol *cur_sym;
+		
+		/* Skip symbols that are undefined */
+		if (sym.n_sect == NO_SECT)
+		{
+			continue;
+		}
+		
+		/* Caching symbols as we go along */
+		cur_sym = table->InternSymbol(sym_name, strlen(sym_name), (void *)(dlbase + sym.n_value));
+		if (strcmp(symbol, sym_name) == 0)
+		{
+			symbol_entry = cur_sym;
+			libtable->last_pos = ++i;
+			break;
+		}
+	}
+	
+	return symbol_entry ? symbol_entry->address : NULL;
+
+#endif
+}
+
+bool MemoryUtils::GetLibraryInfo(const void *libPtr, DynLibInfo &lib)
+{
+	uintptr_t baseAddr;
+
+	if (libPtr == NULL)
+	{
+		return false;
+	}
+
+#ifdef PLATFORM_WINDOWS
+
+	MEMORY_BASIC_INFORMATION info;
+	IMAGE_DOS_HEADER *dos;
+	IMAGE_NT_HEADERS *pe;
+	IMAGE_FILE_HEADER *file;
+	IMAGE_OPTIONAL_HEADER *opt;
+
+	if (!VirtualQuery(libPtr, &info, sizeof(MEMORY_BASIC_INFORMATION)))
+	{
+		return false;
+	}
+
+	baseAddr = reinterpret_cast<uintptr_t>(info.AllocationBase);
+
+	/* All this is for our insane sanity checks :o */
+	dos = reinterpret_cast<IMAGE_DOS_HEADER *>(baseAddr);
+	pe = reinterpret_cast<IMAGE_NT_HEADERS *>(baseAddr + dos->e_lfanew);
+	file = &pe->FileHeader;
+	opt = &pe->OptionalHeader;
+
+	/* Check PE magic and signature */
+	if (dos->e_magic != IMAGE_DOS_SIGNATURE || pe->Signature != IMAGE_NT_SIGNATURE || opt->Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC)
+	{
+		return false;
+	}
+
+	/* Check architecture, which is 32-bit/x86 right now
+	 * Should change this for 64-bit if Valve gets their act together
+	 */
+	if (file->Machine != IMAGE_FILE_MACHINE_I386)
+	{
+		return false;
+	}
+
+	/* For our purposes, this must be a dynamic library */
+	if ((file->Characteristics & IMAGE_FILE_DLL) == 0)
+	{
+		return false;
+	}
+
+	/* Finally, we can do this */
+	lib.memorySize = opt->SizeOfImage;
+
+#elif defined PLATFORM_LINUX
+
+	Dl_info info;
+	Elf32_Ehdr *file;
+	Elf32_Phdr *phdr;
+	uint16_t phdrCount;
+
+	if (!dladdr(libPtr, &info))
+	{
+		return false;
+	}
+
+	if (!info.dli_fbase || !info.dli_fname)
+	{
+		return false;
+	}
+
+	/* This is for our insane sanity checks :o */
+	baseAddr = reinterpret_cast<uintptr_t>(info.dli_fbase);
+	file = reinterpret_cast<Elf32_Ehdr *>(baseAddr);
+
+	/* Check ELF magic */
+	if (memcmp(ELFMAG, file->e_ident, SELFMAG) != 0)
+	{
+		return false;
+	}
+
+	/* Check ELF version */
+	if (file->e_ident[EI_VERSION] != EV_CURRENT)
+	{
+		return false;
+	}
+
+	/* Check ELF architecture, which is 32-bit/x86 right now
+	 * Should change this for 64-bit if Valve gets their act together
+	 */
+	if (file->e_ident[EI_CLASS] != ELFCLASS32 || file->e_machine != EM_386 || file->e_ident[EI_DATA] != ELFDATA2LSB)
+	{
+		return false;
+	}
+
+	/* For our purposes, this must be a dynamic library/shared object */
+	if (file->e_type != ET_DYN)
+	{
+		return false;
+	}
+
+	phdrCount = file->e_phnum;
+	phdr = reinterpret_cast<Elf32_Phdr *>(baseAddr + file->e_phoff);
+
+	for (uint16_t i = 0; i < phdrCount; i++)
+	{
+		Elf32_Phdr &hdr = phdr[i];
+
+		/* We only really care about the segment with executable code */
+		if (hdr.p_type == PT_LOAD && hdr.p_flags == (PF_X|PF_R))
+		{
+			/* 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;
+		}
+	}
+
+#elif defined PLATFORM_APPLE
+
+	Dl_info info;
+	struct mach_header *file;
+	struct segment_command *seg;
+	uint32_t cmd_count;
+
+	if (!dladdr(libPtr, &info))
+	{
+		return false;
+	}
+
+	if (!info.dli_fbase || !info.dli_fname)
+	{
+		return false;
+	}
+
+	/* This is for our insane sanity checks :o */
+	baseAddr = (uintptr_t)info.dli_fbase;
+	file = (struct mach_header *)baseAddr;
+
+	/* Check Mach-O magic */
+	if (file->magic != MH_MAGIC)
+	{
+		return false;
+	}
+
+	/* Check architecture (32-bit/x86) */
+	if (file->cputype != CPU_TYPE_I386 || file->cpusubtype != CPU_SUBTYPE_I386_ALL)
+	{
+		return false;
+	}
+
+	/* For our purposes, this must be a dynamic library */
+	if (file->filetype != MH_DYLIB)
+	{
+		return false;
+	}
+
+	cmd_count = file->ncmds;
+	seg = (struct segment_command *)(baseAddr + sizeof(struct mach_header));
+	
+	/* Add up memory sizes of mapped segments */
+	for (uint32_t i = 0; i < cmd_count; i++)
+	{		
+		if (seg->cmd == LC_SEGMENT)
+		{
+			lib.memorySize += seg->vmsize;
+		}
+		
+		seg = (struct segment_command *)((uintptr_t)seg + seg->cmdsize);
+	}
+
+#endif
+
+	lib.baseAddress = reinterpret_cast<void *>(baseAddr);
+
+	return true;
+}

core/logic/MemoryUtils.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2000 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2011 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -30,9 +30,9 @@
 #ifndef _INCLUDE_SOURCEMOD_MEMORYUTILS_H_
 #define _INCLUDE_SOURCEMOD_MEMORYUTILS_H_
 
+#include "common_logic.h"
 #include <IMemoryUtils.h>
-#include "sm_globals.h"
-#ifdef PLATFORM_LINUX
+#if defined PLATFORM_LINUX || defined PLATFORM_APPLE
 #include <sh_vector.h>
 #include "sm_symtable.h"
 
@@ -41,19 +41,21 @@ using namespace SourceHook;
 
 using namespace SourceMod;
 
+#ifdef PLATFORM_APPLE
+#include <CoreServices/CoreServices.h>
+#endif
+
 struct DynLibInfo
 {
 	void *baseAddress;
 	size_t memorySize;
 };
 
-#ifdef PLATFORM_LINUX
-typedef uint32_t Elf32_Addr;
-
+#if defined PLATFORM_LINUX || defined PLATFORM_APPLE
 struct LibSymbolTable
 {
 	SymbolTable table;
-	Elf32_Addr lib_base;
+	uintptr_t lib_base;
 	uint32_t last_pos;
 };
 #endif
@@ -63,6 +65,7 @@ class MemoryUtils :
 	public SMGlobalClass
 {
 public:
+	MemoryUtils();
 	~MemoryUtils();
 public: // SMGlobalClass
 	void OnSourceModAllInitialized();
@@ -71,9 +74,14 @@ public: // IMemoryUtils
 	void *ResolveSymbol(void *handle, const char *symbol);
 public:
 	bool GetLibraryInfo(const void *libPtr, DynLibInfo &lib);
-#ifdef PLATFORM_LINUX
+#if defined PLATFORM_LINUX || defined PLATFORM_APPLE
 private:
 	CVector<LibSymbolTable *> m_SymTables;
+#ifdef PLATFORM_APPLE
+	struct dyld_all_image_infos *m_ImageList;
+	SInt32 m_OSXMajor;
+	SInt32 m_OSXMinor;
+#endif
 #endif
 };
 

core/logic/PhraseCollection.cpp

@@ -29,9 +29,9 @@
  * Version: $Id$
  */
 
+#include "common_logic.h"
 #include "PhraseCollection.h"
 #include "Translator.h"
-#include "sm_stringutil.h"
 
 CPhraseCollection::CPhraseCollection()
 {
@@ -54,7 +54,7 @@ IPhraseFile *CPhraseCollection::AddPhraseFile(const char *filename)
 	char full_name[PLATFORM_MAX_PATH];
 
 	/* No compat shim here.  The user should have read the doc. */
-	UTIL_Format(full_name, sizeof(full_name), "%s.txt", filename);
+	smcore.Format(full_name, sizeof(full_name), "%s.txt", filename);
 	
 	fid = g_Translator.FindOrAddPhraseFile(full_name);
 	pFile = g_Translator.GetFileByIndex(fid);
@@ -113,7 +113,7 @@ bool CPhraseCollection::FormatString(char *buffer,
 	unsigned int arg;
 
 	arg = 0;
-	if (!gnprintf(buffer, maxlength, format, this, params, numparams, arg, pOutLength, pFailPhrase))
+	if (!smcore.gnprintf(buffer, maxlength, format, this, params, numparams, arg, pOutLength, pFailPhrase))
 	{
 		return false;
 	}

core/logic/Profiler.cpp

@@ -36,6 +36,7 @@
 #include <time.h>
 #endif
 #include <IPluginSys.h>
+#include "stringutil.h"
 
 ProfileEngine g_Profiler;
 IProfiler *sm_profiler = &g_Profiler;
@@ -341,15 +342,46 @@ void ProfileEngine::OnRootConsoleCommand2(const char *cmdname, const ICommandArg
 			GenerateReport(fp);
 
 			fclose(fp);
+			
+			Clear();
 
 			rootmenu->ConsolePrint("Profiler report generated as: %s\n", path);
 
 			return;
 		}
+		else if (strcmp(command->Arg(2), "report") == 0)
+		{
+			FILE *fp;
+			char path[256];
+
+			g_pSM->BuildPath(Path_SM, path, sizeof(path), "logs/profile_%d.xml", (int)time(NULL));
+
+			if ((fp = fopen(path, "wt")) == NULL)
+			{
+				rootmenu->ConsolePrint("Failed, could not open file for writing: %s", path);
+				return;
+			}
+
+			GenerateReport(fp);
+
+			fclose(fp);
+			
+			rootmenu->ConsolePrint("Profiler report generated as: %s\n", path);
+			return;
+		}
+		else if (strcmp(command->Arg(2), "clear") == 0)
+		{
+			Clear();
+
+			rootmenu->ConsolePrint("Profiler statistics cleared.\n");
+			return;
+		}
 	}
 
 	rootmenu->ConsolePrint("Profiler commands:");
 	rootmenu->DrawGenericOption("flush", "Flushes statistics to disk and starts over");
+	rootmenu->DrawGenericOption("report", "Flushes statistics to disk");
+	rootmenu->DrawGenericOption("clear", "Clears statistics");
 }
 
 bool ProfileEngine::GenerateReport(FILE *fp)
@@ -386,9 +418,9 @@ void ProfileEngine::WriteReport(FILE *fp, ProfileReport *report, const char *nam
 	{
 		ar = report->GetReport(i);
 
-		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);
+		strncopy(new_name, ar->atom_name, sizeof(new_name));
+		UTIL_ReplaceAll(new_name, sizeof(new_name), "<", "&lt;", true);
+		UTIL_ReplaceAll(new_name, sizeof(new_name), ">", "&gt;", true);
 
 		fprintf(fp, "  <item name=\"%s\" numcalls=\"%d\" mintime=\"%f\" maxtime=\"%f\" totaltime=\"%f\"/>\n", 
 			new_name,

core/logic/TextParsers.cpp

@@ -872,7 +872,7 @@ bool TextParsers::ParseFile_INI(const char *file, ITextListener_INI *ini_listene
 		ptr = save_ptr;
 
 		/* Lastly, strip ending whitespace off */
-		for (size_t i=len-1; i>=0 && i<len; i--)
+		for (size_t i=len-1; i<len; i--)
 		{
 			if (g_ws_chartable[(unsigned char)ptr[i]])
 			{

core/logic/Translator.cpp

@@ -29,22 +29,24 @@
  * Version: $Id$
  */
 
+#include "common_logic.h"
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <sm_platform.h>
 #include "Translator.h"
-#include "Logger.h"
-#include "LibrarySys.h"
-#include "sm_stringutil.h"
-#include "sourcemod.h"
-#include "PlayerManager.h"
+#include <IPlayerHelpers.h>
+#include <ISourceMod.h>
+#include <ILibrarySys.h>
 #include "PhraseCollection.h"
-#include "ShareSys.h"
+#include "stringutil.h"
 
 Translator g_Translator;
 IPhraseCollection *g_pCorePhrases = NULL;
 unsigned int g_pCorePhraseID = 0;
 
+using namespace SourceMod;
+
 struct trans_t
 {
 	int stridx;
@@ -67,15 +69,10 @@ CPhraseFile::CPhraseFile(Translator *pTranslator, const char *file)
 	m_LangCount = pTranslator->GetLanguageCount();
 	m_File.assign(file);
 	m_pTranslator = pTranslator;
-	m_pPhraseLookup = NULL;
 }
 
 CPhraseFile::~CPhraseFile()
 {
-	if (m_pPhraseLookup)
-	{
-		sm_trie_destroy(m_pPhraseLookup);
-	}
 }
 
 void CPhraseFile::ParseError(const char *message, ...)
@@ -99,20 +96,16 @@ void CPhraseFile::ParseWarning(const char *message, ...)
 
 	if (!m_FileLogged)
 	{
-		g_Logger.LogError("[SM] Warning(s) encountered in translation file \"%s\"", m_File.c_str());
+		smcore.LogError("[SM] Warning(s) encountered in translation file \"%s\"", m_File.c_str());
 		m_FileLogged = true;
 	}
 
-	g_Logger.LogError("[SM] %s", buffer);
+	smcore.LogError("[SM] %s", buffer);
 }
 
 void CPhraseFile::ReparseFile()
 {
-	if (m_pPhraseLookup)
-	{
-		sm_trie_destroy(m_pPhraseLookup);
-	}
-	m_pPhraseLookup = sm_trie_create();
+	m_PhraseLookup.clear();
 
 	m_LangCount = m_pTranslator->GetLanguageCount();
 
@@ -123,19 +116,19 @@ void CPhraseFile::ReparseFile()
 
 	SMCError err;
 	char path[PLATFORM_MAX_PATH];
-	g_SourceMod.BuildPath(Path_SM, path, PLATFORM_MAX_PATH, "translations/%s", m_File.c_str());
+	g_pSM->BuildPath(Path_SM, path, PLATFORM_MAX_PATH, "translations/%s", m_File.c_str());
 
 	//backwards compatibility shim
 	/* :HACKHACK: Change .cfg/.txt and vice versa for compatibility */
-	if (!g_LibSys.PathExists(path))
+	if (!libsys->PathExists(path))
 	{
 		if (m_File.compare("common.cfg") == 0)
 		{
-			UTIL_ReplaceAll(path, sizeof(path), "common.cfg", "common.phrases.txt");
+			UTIL_ReplaceAll(path, sizeof(path), "common.cfg", "common.phrases.txt", true);
 		} else if (strstr(path, ".cfg")) {
-			UTIL_ReplaceAll(path, sizeof(path), ".cfg", ".txt");
+			UTIL_ReplaceAll(path, sizeof(path), ".cfg", ".txt", true);
 		} else if (strstr(path, ".txt")) {
-			UTIL_ReplaceAll(path, sizeof(path), ".txt", ".cfg");
+			UTIL_ReplaceAll(path, sizeof(path), ".txt", ".cfg", true);
 		}
 	}
 
@@ -149,8 +142,8 @@ void CPhraseFile::ReparseFile()
 			msg = m_ParseError.c_str();
 		}
 
-		g_Logger.LogError("[SM] Fatal error encountered parsing translation file \"%s\"", m_File.c_str());
-		g_Logger.LogError("[SM] Error (line %d, column %d): %s", states.line, states.col, msg);
+		smcore.LogError("[SM] Fatal error encountered parsing translation file \"%s\"", m_File.c_str());
+		smcore.LogError("[SM] Error (line %d, column %d): %s", states.line, states.col, msg);
 	}
 
 	const char *code;
@@ -161,7 +154,7 @@ void CPhraseFile::ReparseFile()
 			continue;
 		}
 
-		g_SourceMod.BuildPath(Path_SM, 
+		g_pSM->BuildPath(Path_SM, 
 			path,
 			PLATFORM_MAX_PATH,
 			"translations/%s/%s",
@@ -169,7 +162,7 @@ void CPhraseFile::ReparseFile()
 			m_File.c_str());
 
 		/* Speculatively load these. */
-		if (!g_LibSys.PathExists(path))
+		if (!libsys->PathExists(path))
 		{
 			continue;
 		}
@@ -182,10 +175,10 @@ void CPhraseFile::ReparseFile()
 				msg = m_ParseError.c_str();
 			}
 
-			g_Logger.LogError("[SM] Fatal error encountered parsing translation file \"%s/%s\"", 
+			smcore.LogError("[SM] Fatal error encountered parsing translation file \"%s/%s\"", 
 				code, 
 				m_File.c_str());
-			g_Logger.LogError("[SM] Error (line %d, column %d): %s",
+			smcore.LogError("[SM] Error (line %d, column %d): %s",
 				states.line,
 				states.col,
 				msg);
@@ -217,17 +210,17 @@ SMCResult CPhraseFile::ReadSMC_NewSection(const SMCStates *states, const char *n
 		m_ParseState = PPS_InPhrase;
 		recognized = true;
 
-		void *value;
-		if (sm_trie_retrieve(m_pPhraseLookup, name, &value))
+		int *pvalue;
+		if ((pvalue = m_PhraseLookup.retrieve(name)) != NULL)
 		{
-			m_CurPhrase = reinterpret_cast<int>(value);
+			m_CurPhrase = *pvalue;
 		}
 		else
 		{
 			phrase_t *pPhrase;
 
 			m_CurPhrase = m_pMemory->CreateMem(sizeof(phrase_t), (void **)&pPhrase);
-			sm_trie_insert(m_pPhraseLookup, name, reinterpret_cast<void *>(m_CurPhrase));
+			m_PhraseLookup.insert(name, m_CurPhrase);
 
 			/* Initialize new phrase */
 			trans_t *pTrans;
@@ -486,13 +479,6 @@ SMCResult CPhraseFile::ReadSMC_KeyValue(const SMCStates *states, const char *key
 	} 
 	else 
 	{
-		size_t len = strlen(key);
-		if (len < 2 || len > 3)
-		{
-			ParseWarning("Ignoring translation to invalid language \"%s\" on line %d.", key, states->line);
-			return SMCResult_Continue;
-		}
-
 		unsigned int lang;
 		if (!m_pTranslator->GetLanguageByCode(key, &lang))
 		{
@@ -505,7 +491,7 @@ SMCResult CPhraseFile::ReadSMC_KeyValue(const SMCStates *states, const char *key
 		/* See how many bytes we need for this string, then allocate.
 		 * NOTE: THIS SHOULD GUARANTEE THAT WE DO NOT NEED TO NEED TO SIZE CHECK 
 		 */
-		len = strlen(value) + pPhrase->fmt_bytes + 1;
+		size_t len = strlen(value) + pPhrase->fmt_bytes + 1;
 		char *out_buf;
 		int out_idx;
 
@@ -639,9 +625,7 @@ SMCResult CPhraseFile::ReadSMC_LeavingSection(const SMCStates *states)
 	if (m_ParseState == PPS_InPhrase)
 	{
 		if (m_CurPhrase == -1 && m_LastPhraseString.size())
-		{
-			sm_trie_delete(m_pPhraseLookup, m_LastPhraseString.c_str());
-		}
+			m_PhraseLookup.remove(m_LastPhraseString.c_str());
 		m_CurPhrase = -1;
 		m_ParseState = PPS_Phrases;
 		m_LastPhraseString.assign("");
@@ -658,9 +642,7 @@ void CPhraseFile::ReadSMC_ParseEnd(bool halted, bool failed)
 {
 	/* Check to see if we have any dangling phrases that weren't completed, and scrap them */
 	if ((halted || failed) && m_LastPhraseString.size())
-	{
-		sm_trie_delete(m_pPhraseLookup, m_LastPhraseString.c_str());
-	}
+		m_PhraseLookup.remove(m_LastPhraseString.c_str());
 }
 
 TransError CPhraseFile::GetTranslation(const char *szPhrase, unsigned int lang_id, Translation *pTrans)
@@ -670,13 +652,11 @@ TransError CPhraseFile::GetTranslation(const char *szPhrase, unsigned int lang_i
 		return Trans_BadLanguage;
 	}
 
-	void *object;
-	if (!sm_trie_retrieve(m_pPhraseLookup, szPhrase, &object))
-	{
+	int *pvalue;
+	if ((pvalue = m_PhraseLookup.retrieve(szPhrase)) == NULL)
 		return Trans_BadPhrase;
-	}
 
-	phrase_t *pPhrase = (phrase_t *)m_pMemory->GetAddress(reinterpret_cast<int>(object));
+	phrase_t *pPhrase = (phrase_t *)m_pMemory->GetAddress(*pvalue);
 	trans_t *trans = (trans_t *)m_pMemory->GetAddress(pPhrase->trans_tbl);
 
 	trans = &trans[lang_id];
@@ -705,7 +685,6 @@ const char *CPhraseFile::GetFilename()
 Translator::Translator() : m_ServerLang(SOURCEMOD_LANGUAGE_ENGLISH)
 {
 	m_pStringTab = new BaseStringTable(2048);
-	m_pLCodeLookup = sm_trie_create();
 	strncopy(m_InitialLang, "en", sizeof(m_InitialLang));
 }
 
@@ -721,8 +700,6 @@ Translator::~Translator()
 		delete m_Languages[i];
 	}
 
-	sm_trie_destroy(m_pLCodeLookup);
-
 	delete m_pStringTab;
 }
 
@@ -739,13 +716,13 @@ ConfigResult Translator::OnSourceModConfigChanged(const char *key,
 			unsigned int index;
 			if (!GetLanguageByCode(value, &index))
 			{
-				UTIL_Format(error, maxlength, "Language code \"%s\" is not registered", value);
+				smcore.Format(error, maxlength, "Language code \"%s\" is not registered", value);
 				return ConfigResult_Reject;
 			}
 
 			m_ServerLang = index;
 		} else {
-			strncopy(m_InitialLang, value, sizeof(m_InitialLang));
+			smcore.strncopy(m_InitialLang, value, sizeof(m_InitialLang));
 		}
 
 		return ConfigResult_Accept;
@@ -758,7 +735,7 @@ void Translator::OnSourceModLevelChange(const char *mapName)
 {
 	/* Refresh language stuff */
 	char path[PLATFORM_MAX_PATH];
-	g_SourceMod.BuildPath(Path_SM, path, sizeof(path), "configs/languages.cfg");
+	g_pSM->BuildPath(Path_SM, path, sizeof(path), "configs/languages.cfg");
 	RebuildLanguageDatabase(path);
 }
 
@@ -766,10 +743,16 @@ void Translator::OnSourceModAllInitialized()
 {
 	AddLanguage("en", "English");
 
+	const char* lang = smcore.GetCoreConfigValue("ServerLang");
+	if (lang)
+	{
+		strncpy(m_InitialLang, lang, sizeof(m_InitialLang));
+	}
+
 	g_pCorePhrases = CreatePhraseCollection();
 	g_pCorePhrases->AddPhraseFile("core.phrases");
 
-	g_ShareSys.AddInterface(NULL, this);
+	sharesys->AddInterface(NULL, this);
 }
 
 void Translator::OnSourceModShutdown()
@@ -779,43 +762,38 @@ void Translator::OnSourceModShutdown()
 
 bool Translator::GetLanguageByCode(const char *code, unsigned int *index)
 {
-	void *_index;
+	unsigned int *pindex;
 
-	if (!sm_trie_retrieve(m_pLCodeLookup, code, &_index))
-	{
+	if ((pindex = m_LCodeLookup.retrieve(code)) == NULL)
 		return false;
-	}
 
 	if (index)
-	{
-		*index = reinterpret_cast<unsigned int>(_index);
-	}
+		*index = *pindex;
 
 	return true;
 }
 
 bool Translator::GetLanguageByName(const char *name, unsigned int *index)
 {
-	CVector<Language *>::iterator iter;
-	unsigned int id = 0;
-
-	for (iter=m_Languages.begin(); iter!=m_Languages.end(); iter++, id++)
+	char lower[256];
+	size_t len = strlen(name);
+	if (len > 255) len = 255;
+	for (size_t i = 0; i < len; i++)
 	{
-		if (strcasecmp(m_pStringTab->GetString((*iter)->m_FullName), name) == 0)
-		{
-			break;
-		}
+		if (name[i] >= 'A' && name[i] <= 'Z')
+			lower[i] = tolower(name[i]);
+		else
+			lower[i] = name[i];
 	}
+	lower[len] = '\0';
 
-	if (iter == m_Languages.end())
-	{
+	unsigned int *pIndex;
+
+	if ((pIndex = m_LAliases.retrieve(lower)) == NULL)
 		return false;
-	}
 
 	if (index)
-	{
-		*index = id;
-	}
+		*index = *pIndex;
 
 	return true;
 }
@@ -853,8 +831,8 @@ unsigned int Translator::FindOrAddPhraseFile(const char *phrase_file)
 void Translator::RebuildLanguageDatabase(const char *lang_header_file)
 {
 	/* Erase everything we have */
-	sm_trie_destroy(m_pLCodeLookup);
-	m_pLCodeLookup = sm_trie_create();
+	m_LCodeLookup.clear();
+	m_LAliases.clear();
 	m_pStringTab->Reset();
 
 	for (size_t i=0; i<m_Languages.size(); i++)
@@ -874,25 +852,27 @@ void Translator::RebuildLanguageDatabase(const char *lang_header_file)
 			str_err = m_CustomError.c_str();
 		}
 
-		g_Logger.LogError("[SM] Failed to parse language header file: \"%s\"", lang_header_file);
-		g_Logger.LogError("[SM] Parse error (line %d, column %d): %s", states.line, states.col, str_err);
+		smcore.LogError("[SM] Failed to parse language header file: \"%s\"", lang_header_file);
+		smcore.LogError("[SM] Parse error (line %d, column %d): %s", states.line, states.col, str_err);
 	}
 
-	void *serverLang;
+	unsigned int *pServerLang;
 
-	if (!sm_trie_retrieve(m_pLCodeLookup, m_InitialLang, &serverLang))
+	if ((pServerLang = m_LCodeLookup.retrieve(m_InitialLang)) == NULL)
 	{
-		g_Logger.LogError("Server language was set to bad language \"%s\" -- reverting to English", m_InitialLang);
+		smcore.LogError("Server language was set to bad language \"%s\" -- reverting to English", m_InitialLang);
 
-		strncopy(m_InitialLang, "en", sizeof(m_InitialLang));
+		smcore.strncopy(m_InitialLang, "en", sizeof(m_InitialLang));
 		m_ServerLang = SOURCEMOD_LANGUAGE_ENGLISH;
 	}
-
-	m_ServerLang = reinterpret_cast<unsigned int>(serverLang);
+	else
+	{
+		m_ServerLang = *pServerLang;
+	}
 
 	if (!m_Languages.size())
 	{
-		g_Logger.LogError("[SM] Fatal error, no languages found! Translation will not work.");
+		smcore.LogError("[SM] Fatal error, no languages found! Translation will not work.");
 	}
 
 	for (size_t i=0; i<m_Files.size(); i++)
@@ -919,7 +899,7 @@ SMCResult Translator::ReadSMC_NewSection(const SMCStates *states, const char *na
 
 	if (!m_InLanguageSection)
 	{
-		g_Logger.LogError("[SM] Warning: Unrecognized section \"%s\" in languages.cfg", name);
+		smcore.LogError("[SM] Warning: Unrecognized section \"%s\" in languages.cfg", name);
 	}
 
 	return SMCResult_Continue;
@@ -934,14 +914,6 @@ SMCResult Translator::ReadSMC_LeavingSection(const SMCStates *states)
 
 SMCResult Translator::ReadSMC_KeyValue(const SMCStates *states, const char *key, const char *value)
 {
-	size_t len = strlen(key);
-
-	if (len < 2 || len > 3)
-	{
-		g_Logger.LogError("[SM] Warning encountered parsing languages.cfg file.");
-		g_Logger.LogError("[SM] Invalid language code \"%s\" is being ignored.", key);
-	}
-
 	AddLanguage(key, value);
 
 	return SMCResult_Continue;
@@ -949,20 +921,40 @@ SMCResult Translator::ReadSMC_KeyValue(const SMCStates *states, const char *key,
 
 bool Translator::AddLanguage(const char *langcode, const char *description)
 {
-	if (sm_trie_retrieve(m_pLCodeLookup, langcode, NULL))
+	char lower[256];
+	size_t len = strlen(description);
+	if (len > 255) len = 255;
+	for (size_t i = 0; i < len; i++)
 	{
-		return false;
+		if (description[i] >= 'A' && description[i] <= 'Z')
+			lower[i] = tolower(description[i]);
+		else
+			lower[i] = description[i];
 	}
+	lower[len] = '\0';
 
-	Language *pLanguage = new Language;
-	unsigned int idx = m_Languages.size();
+	if (m_LAliases.retrieve(lower))
+		return false;
 
-	UTIL_Format(pLanguage->m_code2, sizeof(pLanguage->m_code2), "%s", langcode);
-	pLanguage->m_FullName = m_pStringTab->AddString(description);
+	unsigned int idx;
+	if (unsigned int *pIdx = m_LCodeLookup.retrieve(langcode))
+	{
+		idx = *pIdx;
+	}
+	else
+	{
+		Language *pLanguage = new Language;
+		idx = m_Languages.size();
 
-	sm_trie_insert(m_pLCodeLookup, langcode, reinterpret_cast<void *>(idx));
+		smcore.Format(pLanguage->m_code2, sizeof(pLanguage->m_code2), "%s", langcode);
+		pLanguage->m_CanonicalName = m_pStringTab->AddString(lower);
 
-	m_Languages.push_back(pLanguage);
+		m_LCodeLookup.insert(langcode, idx);
+
+		m_Languages.push_back(pLanguage);
+	}
+	
+	m_LAliases.insert(lower, idx);
 
 	return true;
 }
@@ -984,7 +976,7 @@ unsigned int Translator::GetServerLanguage()
 
 unsigned int Translator::GetClientLanguage(int client)
 {
-	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
+	IGamePlayer *pPlayer = playerhelpers->GetGamePlayer(client);
 	return pPlayer->GetLanguageId();
 }
 
@@ -1002,7 +994,7 @@ bool Translator::GetLanguageInfo(unsigned int number, const char **code, const c
 	}
 	if (name)
 	{
-		*name = m_pStringTab->GetString(l->m_FullName);
+		*name = m_pStringTab->GetString(l->m_CanonicalName);
 	}
 
 	return true;
@@ -1025,20 +1017,16 @@ IPhraseCollection *Translator::CreatePhraseCollection()
 
 int Translator::SetGlobalTarget(int index)
 {
-	return g_SourceMod.SetGlobalTarget(index);
+	return g_pSM->SetGlobalTarget(index);
 }
 
 int Translator::GetGlobalTarget() const
 {
-	return g_SourceMod.GetGlobalTarget();
+	return g_pSM->GetGlobalTarget();
 }
 
-bool CoreTranslate(char *buffer, 
-				   size_t maxlength,
-				   const char *format,
-				   unsigned int numparams,
-				   size_t *pOutLength,
-				   ...)
+bool CoreTranslate(char *buffer,  size_t maxlength, const char *format, unsigned int numparams,
+                   size_t *pOutLength, ...)
 {
 	va_list ap;
 	unsigned int i;
@@ -1068,11 +1056,11 @@ bool CoreTranslate(char *buffer,
 	{
 		if (fail_phrase != NULL)
 		{
-			g_Logger.LogError("[SM] Could not find core phrase: %s", fail_phrase);
+			smcore.LogError("[SM] Could not find core phrase: %s", fail_phrase);
 		}
 		else
 		{
-			g_Logger.LogError("[SM] Unknown fatal error while translating a core phrase.");
+			smcore.LogError("[SM] Unknown fatal error while translating a core phrase.");
 		}
 
 		return false;
@@ -1093,7 +1081,7 @@ bool Translator::FormatString(char *buffer,
 	unsigned int arg;
 
 	arg = 0;
-	if (!gnprintf(buffer, maxlength, format, pPhrases, params, numparams, arg, pOutLength, pFailPhrase))
+	if (!smcore.gnprintf(buffer, maxlength, format, pPhrases, params, numparams, arg, pOutLength, pFailPhrase))
 	{
 		return false;
 	}

core/logic/Translator.h

@@ -32,17 +32,14 @@
 #ifndef _INCLUDE_SOURCEMOD_TRANSLATOR_H_
 #define _INCLUDE_SOURCEMOD_TRANSLATOR_H_
 
-#include "sm_trie.h"
+#include "common_logic.h"
+#include <sm_trie_tpl.h>
 #include <sh_string.h>
 #include <sh_vector.h>
-#include "sm_globals.h"
 #include "sm_memtable.h"
 #include "ITextParsers.h"
 #include <ITranslator.h>
 
-#define MAX_TRANSLATE_PARAMS		32
-#define CORELANG_ENGLISH			0
-
 /* :TODO: write a templatized version of tries? */
 
 using namespace SourceHook;
@@ -58,7 +55,7 @@ enum PhraseParseState
 struct Language
 {
 	char m_code2[4];
-	int m_FullName;
+	int m_CanonicalName;
 };
 
 class CPhraseFile : 
@@ -82,7 +79,7 @@ private:
 	void ParseError(const char *message, ...);
 	void ParseWarning(const char *message, ...);
 private:
-	Trie *m_pPhraseLookup;
+	KTrie<int> m_PhraseLookup;
 	String m_File;
 	Translator *m_pTranslator;
 	PhraseParseState m_ParseState;
@@ -122,7 +119,6 @@ public:
 	unsigned int FindOrAddPhraseFile(const char *phrase_file);
 	BaseStringTable *GetStringTable();
 	unsigned int GetLanguageCount();
-	bool GetLanguageInfo(unsigned int number, const char **code, const char **name);
 	bool GetLanguageByCode(const char *code, unsigned int *index);
 	bool GetLanguageByName(const char *name, unsigned int *index);
 	CPhraseFile *GetFileByIndex(unsigned int index);
@@ -149,13 +145,15 @@ public: //ITranslator
 		unsigned int numparams,
 		size_t *pOutLength,
 		const char **pFailPhrase);
+	bool GetLanguageInfo(unsigned int number, const char **code, const char **name);
 private:
 	bool AddLanguage(const char *langcode, const char *description);
 private:
 	CVector<Language *> m_Languages;
 	CVector<CPhraseFile *> m_Files;
 	BaseStringTable *m_pStringTab;
-	Trie *m_pLCodeLookup;
+	KTrie<unsigned int> m_LCodeLookup;
+	KTrie<unsigned int> m_LAliases;
 	bool m_InLanguageSection;
 	String m_CustomError;
 	unsigned int m_ServerLang;
@@ -175,3 +173,4 @@ extern unsigned int g_pCorePhraseID;
 extern Translator g_Translator;
 
 #endif //_INCLUDE_SOURCEMOD_TRANSLATOR_H_
+

core/logic/common_logic.cpp

@@ -33,9 +33,14 @@
 #include <sm_platform.h>
 #include <string.h>
 #include "common_logic.h"
-#include "ThreadSupport.h"
 #include "TextParsers.h"
 #include "Profiler.h"
+#include "sm_crc32.h"
+#include "MemoryUtils.h"
+#include "stringutil.h"
+#include "ThreadSupport.h"
+#include "Translator.h"
+#include "GameConfigs.h"
 
 sm_core_t smcore;
 IHandleSys *handlesys;
@@ -49,12 +54,35 @@ IShareSys *sharesys;
 IRootConsole *rootmenu;
 IPluginManager *pluginsys;
 IForwardManager *forwardsys;
+ITimerSystem *timersys;
+ServerGlobals serverGlobals;
+IPlayerManager *playerhelpers;
+IAdminSystem *adminsys;
+IGameHelpers *gamehelpers;
+
+static void AddCorePhraseFile(const char *filename)
+{
+	g_pCorePhrases->AddPhraseFile(filename);
+}
+
+static IGameConfig *GetCoreGameConfig()
+{
+	return g_pGameConf;
+}
 
 static sm_logic_t logic =
 {
 	NULL,
 	g_pThreader,
-	sm_profiler
+	sm_profiler,
+	&g_Translator,
+	stristr,
+	CoreTranslate,
+	AddCorePhraseFile,
+	UTIL_ReplaceAll,
+	UTIL_ReplaceEx,
+	UTIL_DecodeHexString,
+	GetCoreGameConfig
 };
 
 static void logic_init(const sm_core_t* core, sm_logic_t* _logic)
@@ -63,6 +91,7 @@ static void logic_init(const sm_core_t* core, sm_logic_t* _logic)
 
 	memcpy(&smcore, core, sizeof(sm_core_t));
 	memcpy(_logic, &logic, sizeof(sm_logic_t));
+	memcpy(&serverGlobals, core->serverGlobals, sizeof(ServerGlobals));
 
 	handlesys = core->handlesys;
 	libsys = core->libsys;
@@ -73,6 +102,10 @@ static void logic_init(const sm_core_t* core, sm_logic_t* _logic)
 	rootmenu = core->rootmenu;
 	pluginsys = core->pluginsys;
 	forwardsys = core->forwardsys;
+	timersys = core->timersys;
+	playerhelpers = core->playerhelpers;
+	adminsys = core->adminsys;
+	gamehelpers = core->gamehelpers;
 }
 
 PLATFORM_EXTERN_C ITextParsers *get_textparsers()

core/logic/common_logic.h

@@ -47,6 +47,11 @@ extern IShareSys *sharesys;
 extern IRootConsole *rootmenu;
 extern IPluginManager *pluginsys;
 extern IForwardManager *forwardsys;
+extern ITimerSystem *timersys;
+extern ServerGlobals serverGlobals;
+extern IPlayerManager *playerhelpers;
+extern IAdminSystem *adminsys;
+extern IGameHelpers *gamehelpers;
 
 #endif /* _INCLUDE_SOURCEMOD_COMMON_LOGIC_H_ */
 

core/logic/intercom.h

@@ -42,7 +42,7 @@ 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)
+#define SM_LOGIC_MAGIC		(0x0F47C0DE - 18)
 
 #if defined SM_LOGIC
 class IVEngineServer
@@ -52,6 +52,21 @@ class IVEngineServer_Logic
 {
 public:
 	virtual bool IsMapValid(const char *map) = 0;
+	virtual void ServerCommand(const char *cmd) = 0;
+};
+
+typedef int FileFindHandle_t; 
+
+#if defined SM_LOGIC
+class IFileSystem
+#else
+class IFileSystem_Logic
+#endif
+{
+public:
+	virtual const char *FindFirstEx(const char *pWildCard, const char *pPathID, FileFindHandle_t *pHandle) = 0;
+	virtual const char *FindNext(FileFindHandle_t handle) = 0;
+	virtual void FindClose(FileFindHandle_t handle) = 0;
 };
 
 namespace SourceMod
@@ -63,11 +78,26 @@ namespace SourceMod
 	class IRootConsole;
 	class IPluginManager;
 	class IForwardManager;
+	class ITimerSystem;
+	class IPlayerManager;
+	class IAdminSystem;
+	class IGameHelpers;
+	class IPhraseCollection;
+	class ITranslator;
+	class IGameConfig;
 }
 
 class IVEngineServer;
+class IFileSystem;
 class ConVar;
 
+struct ServerGlobals
+{
+	const double *universalTime;
+	float *interval_per_tick;
+	float *frametime;
+};
+
 struct sm_core_t
 {
 	/* Objects */
@@ -76,10 +106,15 @@ struct sm_core_t
 	ISourceMod		*sm;
 	ILibrarySys		*libsys;
 	IVEngineServer	*engine;
+	IFileSystem		*filesystem;
 	IShareSys		*sharesys;
 	IRootConsole	*rootmenu;
 	IPluginManager	*pluginsys;
 	IForwardManager	*forwardsys;
+	ITimerSystem    *timersys;
+	IPlayerManager  *playerhelpers;
+	IAdminSystem	*adminsys;
+	IGameHelpers    *gamehelpers;
 	/* Functions */
 	void			(*AddNatives)(sp_nativeinfo_t* nlist);
 	ConVar *		(*FindConVar)(const char*);
@@ -88,7 +123,20 @@ struct sm_core_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);
+	void			(*GenerateError)(IPluginContext *, cell_t, int, const char *, ...);
+	bool			(*gnprintf)(char *, size_t, const char *, IPhraseCollection *, void **,
+	                            unsigned int, unsigned int &, size_t *, const char **);
+	size_t			(*atcprintf)(char *, size_t, const char *, IPluginContext *, const cell_t *, int *);
+	bool            (*GetGameName)(char *buffer, size_t maxlength);
+	const char *    (*GetGameDescription)();
+	const char *    (*GetSourceEngineName)();
+	bool            (*SymbolsAreHidden)();
+	const char *	(*GetCoreConfigValue)(const char*);
+	/* Data */
+	ServerGlobals   *serverGlobals;
+	void *          serverFactory;
+	void *          engineFactory;
+	void *          matchmakingDSFactory;
 };
 
 struct sm_logic_t
@@ -96,6 +144,14 @@ struct sm_logic_t
 	SMGlobalClass	*head;
 	IThreader		*threader;
 	IProfiler		*profiler;
+	ITranslator		*translator;
+	const char      *(*stristr)(const char *, const char *);
+	bool			(*CoreTranslate)(char *,  size_t, const char *, unsigned int, size_t *, ...);
+	void            (*AddCorePhraseFile)(const char *filename);
+	unsigned int	(*ReplaceAll)(char*, size_t, const char *, const char *, bool);
+	char            *(*ReplaceEx)(char *, size_t, const char *, size_t, const char *, size_t, bool);
+	size_t          (*DecodeHexString)(unsigned char *, size_t, const char *);
+	IGameConfig *   (*GetCoreGameConfig)();
 };
 
 typedef void (*LogicInitFunction)(const sm_core_t *core, sm_logic_t *logic);

core/logic/msvc10/logic.sln

@@ -0,0 +1,19 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "logic", "logic.vcxproj", "{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/msvc10/logic.vcxproj

@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{6EF06E6E-0ED5-4E2D-A8F3-01DD1EC25BA7}</ProjectGuid>
+    <RootNamespace>jitx86</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">sourcemod.logic</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">sourcemod.logic</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..;$(MMSOURCE19)\core\sourcehook;..\..\..\public;..\..\..\public\sourcepawn;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;JITX86_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SM_DEFAULT_THREADER;SM_LOGIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
+      <IgnoreSpecificDefaultLibraries>LIBC;LIBCD;LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\public</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <PostBuildEvent>
+      <Command>IF NOT "%SMOUTDIR%"=="" copy /Y "$(TargetDir)$(TargetFileName)" "%SMOUTDIR%\bin"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>..;$(MMSOURCE19)\core\sourcehook;..\..\..\public;..\..\..\public\sourcepawn;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;JITX86_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SM_LOGIC;SM_DEFAULT_THREADER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
+      <IgnoreSpecificDefaultLibraries>LIBC;LIBCD;LIBCMTD;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\public</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <PostBuildEvent>
+      <Command>IF NOT "%SMOUTDIR%"=="" copy /Y "$(TargetDir)$(TargetFileName)" "%SMOUTDIR%\bin"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\common_logic.cpp" />
+    <ClCompile Include="..\GameConfigs.cpp" />
+    <ClCompile Include="..\MemoryUtils.cpp" />
+    <ClCompile Include="..\PhraseCollection.cpp" />
+    <ClCompile Include="..\Profiler.cpp" />
+    <ClCompile Include="..\sm_crc32.cpp" />
+    <ClCompile Include="..\smn_admin.cpp" />
+    <ClCompile Include="..\smn_adt_array.cpp" />
+    <ClCompile Include="..\smn_adt_stack.cpp" />
+    <ClCompile Include="..\smn_adt_trie.cpp" />
+    <ClCompile Include="..\smn_banning.cpp" />
+    <ClCompile Include="..\smn_datapacks.cpp" />
+    <ClCompile Include="..\smn_float.cpp" />
+    <ClCompile Include="..\smn_functions.cpp" />
+    <ClCompile Include="..\smn_gameconfigs.cpp" />
+    <ClCompile Include="..\smn_handles.cpp" />
+    <ClCompile Include="..\smn_lang.cpp" />
+    <ClCompile Include="..\smn_maplists.cpp" />
+    <ClCompile Include="..\smn_players.cpp" />
+    <ClCompile Include="..\smn_sorting.cpp" />
+    <ClCompile Include="..\smn_string.cpp" />
+    <ClCompile Include="..\smn_textparse.cpp" />
+    <ClCompile Include="..\smn_timers.cpp" />
+    <ClCompile Include="..\stringutil.cpp" />
+    <ClCompile Include="..\TextParsers.cpp" />
+    <ClCompile Include="..\ThreadSupport.cpp" />
+    <ClCompile Include="..\Translator.cpp" />
+    <ClCompile Include="..\thread\BaseWorker.cpp" />
+    <ClCompile Include="..\thread\ThreadWorker.cpp" />
+    <ClCompile Include="..\thread\WinThreads.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\public\sm_platform.h" />
+    <ClInclude Include="..\..\..\public\sm_trie_tpl.h" />
+    <ClInclude Include="..\..\..\public\sourcemod_version.h" />
+    <ClInclude Include="..\AutoHandleRooter.h" />
+    <ClInclude Include="..\CellArray.h" />
+    <ClInclude Include="..\common_logic.h" />
+    <ClInclude Include="..\GameConfigs.h" />
+    <ClInclude Include="..\intercom.h" />
+    <ClInclude Include="..\MemoryUtils.h" />
+    <ClInclude Include="..\MersenneTwister.h" />
+    <ClInclude Include="..\PhraseCollection.h" />
+    <ClInclude Include="..\Profiler.h" />
+    <ClInclude Include="..\sm_crc32.h" />
+    <ClInclude Include="..\sm_memtable.h" />
+    <ClInclude Include="..\sm_symtable.h" />
+    <ClInclude Include="..\stringutil.h" />
+    <ClInclude Include="..\TextParsers.h" />
+    <ClInclude Include="..\ThreadSupport.h" />
+    <ClInclude Include="..\thread\BaseWorker.h" />
+    <ClInclude Include="..\thread\ThreadWorker.h" />
+    <ClInclude Include="..\thread\WinThreads.h" />
+    <ClInclude Include="..\Translator.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\version.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

core/logic/msvc10/logic.vcxproj.filters

@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+    <Filter Include="Threads">
+      <UniqueIdentifier>{67c1ebce-c1f8-4d2c-9ef4-33f0ef6343e9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Threads\Header Files">
+      <UniqueIdentifier>{c6e2ebb3-4869-4453-9b83-e49f70cb8a05}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Threads\Source Files">
+      <UniqueIdentifier>{e6d8a9af-1c1b-4f0c-ae06-a9ebd5cd32e4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Natives">
+      <UniqueIdentifier>{126462f2-e517-4854-8a94-759e56787536}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\common_logic.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\GameConfigs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\MemoryUtils.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\PhraseCollection.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Profiler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sm_crc32.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\stringutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\TextParsers.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ThreadSupport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Translator.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\thread\BaseWorker.cpp">
+      <Filter>Threads\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\thread\ThreadWorker.cpp">
+      <Filter>Threads\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\thread\WinThreads.cpp">
+      <Filter>Threads\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\smn_admin.cpp">
+      <Filter>Natives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\smn_timers.cpp">
+      <Filter>Natives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\smn_adt_array.cpp">
+      <Filter>Natives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\smn_adt_stack.cpp">
+      <Filter>Natives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\smn_adt_trie.cpp">
+      <Filter>Natives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\smn_banning.cpp">
+      <Filter>Natives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\smn_datapacks.cpp">
+      <Filter>Natives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\smn_float.cpp">
+      <Filter>Natives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\smn_functions.cpp">
+      <Filter>Natives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\smn_gameconfigs.cpp">
+      <Filter>Natives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\smn_handles.cpp">
+      <Filter>Natives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\smn_lang.cpp">
+      <Filter>Natives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\smn_maplists.cpp">
+      <Filter>Natives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\smn_players.cpp">
+      <Filter>Natives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\smn_sorting.cpp">
+      <Filter>Natives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\smn_string.cpp">
+      <Filter>Natives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\smn_textparse.cpp">
+      <Filter>Natives</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\CellArray.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common_logic.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\intercom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Profiler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\TextParsers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ThreadSupport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thread\BaseWorker.h">
+      <Filter>Threads\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thread\ThreadWorker.h">
+      <Filter>Threads\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thread\WinThreads.h">
+      <Filter>Threads\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\AutoHandleRooter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\GameConfigs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\MemoryUtils.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\MersenneTwister.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\PhraseCollection.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\sm_crc32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\sm_memtable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\sm_symtable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\stringutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Translator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\public\sm_trie_tpl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\public\sourcemod_version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\public\sm_platform.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>

core/logic/msvc9/logic.vcproj

@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..;"$(MMSOURCE17)\core\sourcehook";..\..\..\public;..\..\..\public\sourcepawn"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;JITX86_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SM_DEFAULT_THREADER"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;JITX86_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SM_DEFAULT_THREADER;SM_LOGIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -64,7 +64,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\sourcepawn.jit.x86.dll"
+				OutputFile="$(OutDir)\sourcemod.logic.dll"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
 				GenerateDebugInformation="true"
@@ -185,11 +185,19 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\smn_functions.cpp"
+				RelativePath="..\common_logic.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\smn_adt_trie.cpp"
+				RelativePath="..\GameConfigs.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\MemoryUtils.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\PhraseCollection.cpp"
 				>
 			</File>
 			<File
@@ -197,7 +205,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\common_logic.cpp"
+				RelativePath="..\sm_crc32.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\smn_admin.cpp"
 				>
 			</File>
 			<File
@@ -208,22 +220,66 @@
 				RelativePath="..\smn_adt_stack.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\smn_adt_trie.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\smn_banning.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\smn_datapacks.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\smn_float.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\smn_functions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\smn_gameconfigs.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\smn_handles.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\smn_lang.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\smn_maplists.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\smn_players.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"
+				>
+			</File>
+			<File
+				RelativePath="..\stringutil.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\TextParsers.cpp"
 				>
@@ -232,6 +288,10 @@
 				RelativePath="..\ThreadSupport.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\Translator.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -250,6 +310,10 @@
 				RelativePath="..\intercom.h"
 				>
 			</File>
+			<File
+				RelativePath="..\Profiler.h"
+				>
+			</File>
 			<File
 				RelativePath="..\svn_version.h"
 				>
@@ -262,10 +326,6 @@
 				RelativePath="..\ThreadSupport.h"
 				>
 			</File>
-			<File
-				RelativePath="..\Profiler.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -276,10 +336,6 @@
 				RelativePath="..\svn_version.tpl"
 				>
 			</File>
-			<File
-				RelativePath="..\version.rc"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Threads"

core/logic/sm_crc32.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 "sm_crc32.h"

core/logic/sm_crc32.h

@@ -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.
@@ -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_CRC32_H_

core/logic/sm_memtable.h

@@ -0,0 +1,163 @@
+/**
+ * vim: set ts=4 :
+ * =============================================================================
+ * SourceMod
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * =============================================================================
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3.0, as published by the
+ * Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * As a special exception, AlliedModders LLC gives you permission to link the
+ * code of this program (as well as its derivative works) to "Half-Life 2," the
+ * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+ * by the Valve Corporation.  You must obey the GNU General Public License in
+ * all respects for all other code used.  Additionally, AlliedModders LLC grants
+ * this exception to all derivative works.  AlliedModders LLC defines further
+ * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+ * or <http://www.sourcemod.net/license.php>.
+ *
+ * Version: $Id$
+ */
+
+#ifndef _INCLUDE_SOURCEMOD_CORE_STRINGTABLE_H_
+#define _INCLUDE_SOURCEMOD_CORE_STRINGTABLE_H_
+
+#include <stdlib.h>
+#include <string.h>
+
+class BaseMemTable
+{
+public:
+	BaseMemTable(unsigned int init_size)
+	{
+		membase = (unsigned char *)malloc(init_size);
+		size = init_size;
+		tail = 0;
+	}
+	~BaseMemTable()
+	{
+		free(membase);
+		membase = NULL;
+	}
+public:
+	/**
+	 * Allocates 'size' bytes of memory.
+	 * Optionally outputs the address through 'addr'.
+	 * Returns an index >= 0 on success, < 0 on failure.
+	 */
+	int CreateMem(unsigned int addsize, void **addr)
+	{
+		int idx = (int)tail;
+
+		while (tail + addsize >= size) {
+			size *= 2;
+			membase = (unsigned char *)realloc(membase, size);
+		}
+
+		tail += addsize;
+		if (addr)
+			*addr = (void *)&membase[idx];
+
+		return idx;
+	}
+
+	/**
+	 * Given an index into the memory table, returns its address.
+	 * Returns NULL if invalid.
+	 */
+	void *GetAddress(int index)
+	{
+		if (index < 0 || (unsigned int)index >= tail)
+			return NULL;
+		return &membase[index];
+	}
+
+	/**
+	 * Scraps the memory table.  For caching purposes, the memory 
+	 * is not freed, however subsequent calls to CreateMem() will 
+	 * begin at the first index again.
+	 */
+	void Reset()
+	{
+		tail = 0;
+	}
+
+	inline unsigned int GetMemUsage()
+	{
+		return size;
+	}
+
+	inline unsigned int GetActualMemUsed()
+	{
+		return tail;
+	}
+
+private:
+	unsigned char *membase;
+	unsigned int size;
+	unsigned int tail;
+};
+
+class BaseStringTable
+{
+public:
+	BaseStringTable(unsigned int init_size) : m_table(init_size)
+	{
+	}
+public:
+	/** 
+	 * Adds a string to the string table and returns its index.
+	 */
+	int AddString(const char *string)
+	{
+		size_t len = strlen(string) + 1;
+		int idx;
+		char *addr;
+
+		idx = m_table.CreateMem(len, (void **)&addr);
+		strcpy(addr, string);
+
+		return idx;
+	}
+
+	/**
+	 * Given an index into the string table, returns the associated string.
+	 */
+	inline const char *GetString(int str)
+	{
+		return (const char *)m_table.GetAddress(str);
+	}
+
+	/**
+	 * Scraps the string table.  For caching purposes, the memory
+	 * is not freed, however subsequent calls to AddString() will 
+	 * begin at the first index again.
+	 */
+	void Reset()
+	{
+		m_table.Reset();
+	}
+
+	/**
+	 * Returns the parent BaseMemTable that this string table uses.
+	 */
+	inline BaseMemTable *GetMemTable()
+	{
+		return &m_table;
+	}
+private:
+	BaseMemTable m_table;
+};
+
+#endif //_INCLUDE_SOURCEMOD_CORE_STRINGTABLE_H_
+

core/logic/smn_admin.cpp

@@ -29,13 +29,15 @@
  * Version: $Id$
  */
 
-#include "sm_globals.h"
-#include "AdminCache.h"
-#include "ForwardSys.h"
+#include "common_logic.h"
+#include <IAdminSystem.h>
+#include <IForwardSys.h>
+
+using namespace SourceMod;
 
 static cell_t DumpAdminCache(IPluginContext *pContext, const cell_t *params)
 {
-	g_Admins.DumpAdminCache((AdminCachePart)params[1], (params[2] == 1) ? true : false);
+	adminsys->DumpAdminCache((AdminCachePart)params[1], (params[2] == 1) ? true : false);
 	return 1;
 }
 
@@ -44,7 +46,7 @@ static cell_t AddCommandOverride(IPluginContext *pContext, const cell_t *params)
 	char *str;
 
 	pContext->LocalToString(params[1], &str);
-	g_Admins.AddCommandOverride(str, (OverrideType)params[2], (AdminFlag)params[3]);
+	adminsys->AddCommandOverride(str, (OverrideType)params[2], (AdminFlag)params[3]);
 
 	return 1;
 }
@@ -56,7 +58,7 @@ static cell_t GetCommandOverride(IPluginContext *pContext, const cell_t *params)
 
 	pContext->LocalToString(params[1], &cmd);
 
-	if (!g_Admins.GetCommandOverride(cmd, (OverrideType)params[2], &flags))
+	if (!adminsys->GetCommandOverride(cmd, (OverrideType)params[2], &flags))
 	{
 		return 0;
 	}
@@ -75,7 +77,7 @@ static cell_t UnsetCommandOverride(IPluginContext *pContext, const cell_t *param
 
 	pContext->LocalToString(params[1], &cmd);
 
-	g_Admins.UnsetCommandOverride(cmd, (OverrideType)params[2]);
+	adminsys->UnsetCommandOverride(cmd, (OverrideType)params[2]);
 
 	return 1;
 }
@@ -86,7 +88,7 @@ static cell_t CreateAdmGroup(IPluginContext *pContext, const cell_t *params)
 
 	pContext->LocalToString(params[1], &str);
 
-	return g_Admins.AddGroup(str);
+	return adminsys->AddGroup(str);
 }
 
 static cell_t FindAdmGroup(IPluginContext *pContext, const cell_t *params)
@@ -95,7 +97,7 @@ static cell_t FindAdmGroup(IPluginContext *pContext, const cell_t *params)
 
 	pContext->LocalToString(params[1], &str);
 
-	return g_Admins.FindGroupByName(str);
+	return adminsys->FindGroupByName(str);
 }
 
 static cell_t SetAdmGroupAddFlag(IPluginContext *pContext, const cell_t *params)
@@ -104,7 +106,7 @@ static cell_t SetAdmGroupAddFlag(IPluginContext *pContext, const cell_t *params)
 	AdminFlag flag = (AdminFlag)params[2];
 	bool enabled = params[3] ? 1 : 0;
 
-	g_Admins.SetGroupAddFlag(id, flag, enabled);
+	adminsys->SetGroupAddFlag(id, flag, enabled);
 
 	return 1;
 }
@@ -114,7 +116,7 @@ static cell_t GetAdmGroupAddFlag(IPluginContext *pContext, const cell_t *params)
 	GroupId id = (GroupId)params[1];
 	AdminFlag flag = (AdminFlag)params[2];
 	
-	return g_Admins.GetGroupAddFlag(id, flag) ? 1 : 0;
+	return adminsys->GetGroupAddFlag(id, flag) ? 1 : 0;
 }
 
 static cell_t SetAdmGroupImmunity(IPluginContext *pContext, const cell_t *params)
@@ -123,7 +125,7 @@ static cell_t SetAdmGroupImmunity(IPluginContext *pContext, const cell_t *params
 	ImmunityType type = (ImmunityType)params[2];
 	bool enabled = params[3] ? 1 : 0;
 
-	g_Admins.SetGroupGenericImmunity(id, type, enabled);
+	adminsys->SetGroupGenericImmunity(id, type, enabled);
 
 	return 1;
 }
@@ -133,7 +135,7 @@ static cell_t GetAdmGroupImmunity(IPluginContext *pContext, const cell_t *params
 	GroupId id = (GroupId)params[1];
 	ImmunityType type = (ImmunityType)params[2];
 
-	return g_Admins.GetGroupGenericImmunity(id, type) ? 1 : 0;
+	return adminsys->GetGroupGenericImmunity(id, type) ? 1 : 0;
 }
 
 static cell_t SetAdmGroupImmuneFrom(IPluginContext *pContext, const cell_t *params)
@@ -141,7 +143,7 @@ static cell_t SetAdmGroupImmuneFrom(IPluginContext *pContext, const cell_t *para
 	GroupId id = (GroupId)params[1];
 	GroupId other_id = (GroupId)params[2];
 
-	g_Admins.AddGroupImmunity(id, other_id);
+	adminsys->AddGroupImmunity(id, other_id);
 
 	return 1;
 }
@@ -150,14 +152,14 @@ static cell_t GetAdmGroupImmuneCount(IPluginContext *pContext, const cell_t *par
 {
 	GroupId id = (GroupId)params[1];
 
-	return g_Admins.GetGroupImmunityCount(id);
+	return adminsys->GetGroupImmunityCount(id);
 }
 
 static cell_t GetAdmGroupImmuneFrom(IPluginContext *pContext, const cell_t *params)
 {
 	GroupId id = (GroupId)params[1];
 
-	return g_Admins.GetGroupImmunity(id, params[2]);
+	return adminsys->GetGroupImmunity(id, params[2]);
 }
 
 static cell_t AddAdmGroupCmdOverride(IPluginContext *pContext, const cell_t *params)
@@ -169,7 +171,7 @@ static cell_t AddAdmGroupCmdOverride(IPluginContext *pContext, const cell_t *par
 
 	pContext->LocalToString(params[2], &cmd);
 
-	g_Admins.AddGroupCommandOverride(id, cmd, type, rule);
+	adminsys->AddGroupCommandOverride(id, cmd, type, rule);
 
 	return 1;
 }
@@ -183,7 +185,7 @@ static cell_t GetAdmGroupCmdOverride(IPluginContext *pContext, const cell_t *par
 
 	pContext->LocalToString(params[2], &cmd);
 
-	if (!g_Admins.GetGroupCommandOverride(id, cmd, type, &rule))
+	if (!adminsys->GetGroupCommandOverride(id, cmd, type, &rule))
 	{
 		return 0;
 	}
@@ -198,7 +200,7 @@ static cell_t GetAdmGroupCmdOverride(IPluginContext *pContext, const cell_t *par
 static cell_t GetAdmGroupAddFlags(IPluginContext *pContext, const cell_t *params)
 {
 	GroupId id = (GroupId)params[1];
-	return g_Admins.GetGroupAddFlags(id);
+	return adminsys->GetGroupAddFlags(id);
 }
 
 static cell_t RegisterAuthIdentType(IPluginContext *pContext, const cell_t *params)
@@ -206,7 +208,7 @@ static cell_t RegisterAuthIdentType(IPluginContext *pContext, const cell_t *para
 	char *type;
 	pContext->LocalToString(params[1], &type);
 
-	g_Admins.RegisterAuthIdentType(type);
+	adminsys->RegisterAuthIdentType(type);
 
 	return 1;
 }
@@ -221,14 +223,14 @@ static cell_t CreateAdmin(IPluginContext *pContext, const cell_t *params)
 		admin = NULL;
 	}
 
-	return g_Admins.CreateAdmin(admin);
+	return adminsys->CreateAdmin(admin);
 }
 
 static cell_t GetAdminUsername(IPluginContext *pContext, const cell_t *params)
 {
 	AdminId id = params[1];
 	size_t written;
-	const char *name = g_Admins.GetAdminName(id);
+	const char *name = adminsys->GetAdminName(id);
 
 	if (!name)
 	{
@@ -248,7 +250,7 @@ static cell_t BindAdminIdentity(IPluginContext *pContext, const cell_t *params)
 	pContext->LocalToString(params[2], &auth);
 	pContext->LocalToString(params[3], &ident);
 
-	return g_Admins.BindAdminIdentity(id, auth, ident);
+	return adminsys->BindAdminIdentity(id, auth, ident);
 }
 
 static cell_t SetAdminFlag(IPluginContext *pContext, const cell_t *params)
@@ -257,7 +259,7 @@ static cell_t SetAdminFlag(IPluginContext *pContext, const cell_t *params)
 	AdminFlag flag = (AdminFlag)params[2];
 	bool enabled = params[3] ? true : false;
 
-	g_Admins.SetAdminFlag(id, flag, enabled);
+	adminsys->SetAdminFlag(id, flag, enabled);
 
 	return 1;
 }
@@ -268,7 +270,7 @@ static cell_t GetAdminFlag(IPluginContext *pContext, const cell_t *params)
 	AdminFlag flag = (AdminFlag)params[2];
 	AccessMode mode = (AccessMode)params[3];
 
-	return g_Admins.GetAdminFlag(id, flag, mode);
+	return adminsys->GetAdminFlag(id, flag, mode);
 }
 
 static cell_t GetAdminFlags(IPluginContext *pContext, const cell_t *params)
@@ -276,7 +278,7 @@ static cell_t GetAdminFlags(IPluginContext *pContext, const cell_t *params)
 	AdminId id = params[1];
 	AccessMode mode = (AccessMode)params[2];
 
-	return g_Admins.GetAdminFlags(id, mode);
+	return adminsys->GetAdminFlags(id, mode);
 }
 
 static cell_t AdminInheritGroup(IPluginContext *pContext, const cell_t *params)
@@ -284,14 +286,14 @@ static cell_t AdminInheritGroup(IPluginContext *pContext, const cell_t *params)
 	AdminId id = params[1];
 	GroupId gid = params[2];
 
-	return g_Admins.AdminInheritGroup(id, gid);
+	return adminsys->AdminInheritGroup(id, gid);
 }
 
 static cell_t GetAdminGroupCount(IPluginContext *pContext, const cell_t *params)
 {
 	AdminId id = params[1];
 
-	return g_Admins.GetAdminGroupCount(id);
+	return adminsys->GetAdminGroupCount(id);
 }
 
 static cell_t GetAdminGroup(IPluginContext *pContext, const cell_t *params)
@@ -301,7 +303,7 @@ static cell_t GetAdminGroup(IPluginContext *pContext, const cell_t *params)
 	const char *name;
 	GroupId gid;
 
-	if ((gid=g_Admins.GetAdminGroup(id, index, &name)) == INVALID_GROUP_ID)
+	if ((gid=adminsys->GetAdminGroup(id, index, &name)) == INVALID_GROUP_ID)
 	{
 		return gid;
 	}
@@ -323,7 +325,7 @@ static cell_t SetAdminPassword(IPluginContext *pContext, const cell_t *params)
 
 	pContext->LocalToString(params[2], &password);
 
-	g_Admins.SetAdminPassword(id, password);
+	adminsys->SetAdminPassword(id, password);
 
 	return 1;
 }
@@ -331,7 +333,7 @@ static cell_t SetAdminPassword(IPluginContext *pContext, const cell_t *params)
 static cell_t GetAdminPassword(IPluginContext *pContext, const cell_t *params)
 {
 	AdminId id = params[1];
-	const char *password = g_Admins.GetAdminPassword(id);
+	const char *password = adminsys->GetAdminPassword(id);
 
 	if (!password)
 	{
@@ -350,14 +352,14 @@ static cell_t FindAdminByIdentity(IPluginContext *pContext, const cell_t *params
 	pContext->LocalToString(params[1], &auth);
 	pContext->LocalToString(params[2], &ident);
 
-	return g_Admins.FindAdminByIdentity(auth, ident);
+	return adminsys->FindAdminByIdentity(auth, ident);
 }
 
 static cell_t RemoveAdmin(IPluginContext *pContext, const cell_t *params)
 {
 	AdminId id = params[1];
 
-	return g_Admins.InvalidateAdmin(id);
+	return adminsys->InvalidateAdmin(id);
 }
 
 static cell_t FlagBitsToBitArray(IPluginContext *pContext, const cell_t *params)
@@ -365,7 +367,7 @@ static cell_t FlagBitsToBitArray(IPluginContext *pContext, const cell_t *params)
 	FlagBits bits = (FlagBits)params[1];
 	bool array[AdminFlags_TOTAL];
 	cell_t *addr;
-	unsigned int numWr = g_Admins.FlagBitsToBitArray(bits, array, AdminFlags_TOTAL);
+	unsigned int numWr = adminsys->FlagBitsToBitArray(bits, array, AdminFlags_TOTAL);
 
 	pContext->LocalToPhysAddr(params[2], &addr);
 
@@ -391,7 +393,7 @@ static cell_t FlagBitArrayToBits(IPluginContext *pContext, const cell_t *params)
 		array[i] = addr[i] ? true : false;
 	}
 
-	return g_Admins.FlagBitArrayToBits(array, num);
+	return adminsys->FlagBitArrayToBits(array, num);
 }
 
 static cell_t FlagArrayToBits(IPluginContext *pContext, const cell_t *params)
@@ -401,7 +403,7 @@ static cell_t FlagArrayToBits(IPluginContext *pContext, const cell_t *params)
 
 	if (sizeof(AdminFlag) == sizeof(cell_t))
 	{
-		return g_Admins.FlagArrayToBits((const AdminFlag *)addr, params[2]);
+		return adminsys->FlagArrayToBits((const AdminFlag *)addr, params[2]);
 	} else {
 		AdminFlag flags[AdminFlags_TOTAL];
 		unsigned int num = ((unsigned)params[2] > AdminFlags_TOTAL ? AdminFlags_TOTAL : params[2]);
@@ -410,7 +412,7 @@ static cell_t FlagArrayToBits(IPluginContext *pContext, const cell_t *params)
 		{
 			flags[i] = (AdminFlag)addr[i];
 		}
-		return g_Admins.FlagArrayToBits(flags, num);
+		return adminsys->FlagArrayToBits(flags, num);
 	}
 }
 
@@ -421,11 +423,11 @@ static cell_t FlagBitsToArray(IPluginContext *pContext, const cell_t *params)
 
 	if (sizeof(AdminFlag) == sizeof(cell_t))
 	{
-		return g_Admins.FlagBitsToArray(params[1], (AdminFlag *)addr, params[3]);
+		return adminsys->FlagBitsToArray(params[1], (AdminFlag *)addr, params[3]);
 	} else {
 		AdminFlag flags[AdminFlags_TOTAL];
 		unsigned int num = ((unsigned)params[2] > AdminFlags_TOTAL ? AdminFlags_TOTAL : params[2]);
-		num = g_Admins.FlagBitsToArray(params[1], flags, num);
+		num = adminsys->FlagBitsToArray(params[1], flags, num);
 
 		for (unsigned int i=0; i<num; i++)
 		{
@@ -438,36 +440,36 @@ static cell_t FlagBitsToArray(IPluginContext *pContext, const cell_t *params)
 
 static cell_t CanAdminTarget(IPluginContext *pContext, const cell_t *params)
 {
-	return g_Admins.CanAdminTarget(params[1], params[2]) ? 1 : 0;
+	return adminsys->CanAdminTarget(params[1], params[2]) ? 1 : 0;
 }
 
 static cell_t CreateAuthMethod(IPluginContext *pContext, const cell_t *params)
 {
 	char *name;
 	pContext->LocalToString(params[1], &name);
-	g_Admins.RegisterAuthIdentType(name);
+	adminsys->RegisterAuthIdentType(name);
 
 	return 1;
 }
 
 static cell_t SetAdmGroupImmunityLevel(IPluginContext *pContext, const cell_t *params)
 {
-	return g_Admins.SetGroupImmunityLevel(params[1], params[2]);
+	return adminsys->SetGroupImmunityLevel(params[1], params[2]);
 }
 
 static cell_t GetAdmGroupImmunityLevel(IPluginContext *pContext, const cell_t *params)
 {
-	return g_Admins.GetGroupImmunityLevel(params[1]);
+	return adminsys->GetGroupImmunityLevel(params[1]);
 }
 
 static cell_t SetAdminImmunityLevel(IPluginContext *pContext, const cell_t *params)
 {
-	return g_Admins.SetAdminImmunityLevel(params[1], params[2]);
+	return adminsys->SetAdminImmunityLevel(params[1], params[2]);
 }
 
 static cell_t GetAdminImmunityLevel(IPluginContext *pContext, const cell_t *params)
 {
-	return g_Admins.GetAdminImmunityLevel(params[1]);
+	return adminsys->GetAdminImmunityLevel(params[1]);
 }
 
 static cell_t FindFlagByName(IPluginContext *pContext, const cell_t *params)
@@ -479,7 +481,7 @@ static cell_t FindFlagByName(IPluginContext *pContext, const cell_t *params)
 	pContext->LocalToPhysAddr(params[2], &addr);
 
 	AdminFlag admflag;
-	if (!g_Admins.FindFlag(flag, &admflag))
+	if (!adminsys->FindFlag(flag, &admflag))
 	{
 		return 0;
 	}
@@ -495,7 +497,7 @@ static cell_t FindFlagByChar(IPluginContext *pContext, const cell_t *params)
 	pContext->LocalToPhysAddr(params[2], &addr);
 
 	AdminFlag admflag;
-	if (!g_Admins.FindFlag((char)params[1], &admflag))
+	if (!adminsys->FindFlag((char)params[1], &admflag))
 	{
 		return 0;
 	}
@@ -505,6 +507,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 (!adminsys->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;
@@ -514,7 +532,7 @@ static cell_t ReadFlagString(IPluginContext *pContext, const cell_t *params)
 	pContext->LocalToPhysAddr(params[2], &addr);
 
 	const char *end = flag;
-	FlagBits bits = g_Admins.ReadFlagString(flag, &end);
+	FlagBits bits = adminsys->ReadFlagString(flag, &end);
 
 	*addr = end - flag;
 
@@ -561,6 +579,7 @@ REGISTER_NATIVES(adminNatives)
 	{"CreateAuthMethod",		CreateAuthMethod},
 	{"FindFlagByName",			FindFlagByName},
 	{"FindFlagByChar",			FindFlagByChar},
+	{"FindFlagChar",			FindFlagChar},
 	{"ReadFlagString",			ReadFlagString},
 	{"GetAdmGroupImmunityLevel",GetAdmGroupImmunityLevel},
 	{"SetAdmGroupImmunityLevel",SetAdmGroupImmunityLevel},

core/logic/smn_banning.cpp

@@ -29,11 +29,12 @@
  * Version: $Id$
  */
 
-#include "sm_globals.h"
-#include "sm_stringutil.h"
-#include "HalfLife2.h"
-#include "PlayerManager.h"
-#include "ForwardSys.h"
+#include "common_logic.h"
+#include <string.h>
+#include <IGameHelpers.h>
+#include <IPlayerHelpers.h>
+#include <IForwardSys.h>
+#include "stringutil.h"
 
 #define BANFLAG_AUTO	(1<<0)	/**< Auto-detects whether to ban by steamid or IP */
 #define BANFLAG_IP   	(1<<1)	/**< Always ban by IP address */
@@ -50,7 +51,7 @@ class BanNativeHelpers : public SMGlobalClass
 public:
 	void OnSourceModAllInitialized()
 	{
-		g_pOnBanClient = g_Forwards.CreateForward(
+		g_pOnBanClient = forwardsys->CreateForward(
 			"OnBanClient",
 			ET_Event,
 			7,
@@ -62,7 +63,7 @@ public:
 			Param_String,
 			Param_String,
 			Param_Cell);
-		g_pOnBanIdentity = g_Forwards.CreateForward(
+		g_pOnBanIdentity = forwardsys->CreateForward(
 			"OnBanIdentity",
 			ET_Event,
 			6,
@@ -73,7 +74,7 @@ public:
 			Param_String,
 			Param_String,
 			Param_Cell);
-		g_pOnRemoveBan = g_Forwards.CreateForward(
+		g_pOnRemoveBan = forwardsys->CreateForward(
 			"OnRemoveBan",
 			ET_Event,
 			4,
@@ -85,9 +86,9 @@ public:
 	}
 	void OnSourceModShutdown()
 	{
-		g_Forwards.ReleaseForward(g_pOnBanClient);
-		g_Forwards.ReleaseForward(g_pOnBanIdentity);
-		g_Forwards.ReleaseForward(g_pOnRemoveBan);
+		forwardsys->ReleaseForward(g_pOnBanClient);
+		forwardsys->ReleaseForward(g_pOnBanIdentity);
+		forwardsys->ReleaseForward(g_pOnRemoveBan);
 
 		g_pOnBanClient = NULL;
 		g_pOnBanIdentity = NULL;
@@ -118,7 +119,7 @@ static cell_t BanIdentity(IPluginContext *pContext, const cell_t *params)
 	/* Sanitize the input */
 	char identity[64];
 	strncopy(identity, r_identity, sizeof(identity));
-	UTIL_ReplaceAll(identity, sizeof(identity), ";", "");
+	UTIL_ReplaceAll(identity, sizeof(identity), ";", "", true);
 
 	cell_t handled = 0;
 	if (ban_cmd[0] != '\0' && g_pOnBanIdentity->GetFunctionCount() > 0)
@@ -139,7 +140,7 @@ static cell_t BanIdentity(IPluginContext *pContext, const cell_t *params)
 		char command[256];
 		if (ban_by_ip)
 		{
-			UTIL_Format(
+			smcore.Format(
 				command,
 				sizeof(command),
 				"addip %d %s\n",
@@ -152,9 +153,9 @@ static cell_t BanIdentity(IPluginContext *pContext, const cell_t *params)
 				engine->ServerCommand("writeip\n");
 			}
 		}
-		else if (!g_HL2.IsLANServer())
+		else if (!gamehelpers->IsLANServer())
 		{
-			UTIL_Format(
+			smcore.Format(
 				command,
 				sizeof(command),
 				"banid %d %s\n",
@@ -195,7 +196,7 @@ static cell_t RemoveBan(IPluginContext *pContext, const cell_t *params)
 
 	char identity[64];
 	strncopy(identity, r_identity, sizeof(identity));
-	UTIL_ReplaceAll(identity, sizeof(identity), ";", "");
+	UTIL_ReplaceAll(identity, sizeof(identity), ";", "", true);
 
 	cell_t handled = 0;
 	if (ban_cmd[0] != '\0' && g_pOnRemoveBan->GetFunctionCount() > 0)
@@ -212,7 +213,7 @@ static cell_t RemoveBan(IPluginContext *pContext, const cell_t *params)
 	{
 		if (!handled)
 		{
-			UTIL_Format(
+			smcore.Format(
 				command,
 				sizeof(command),
 				"removeip %s\n",
@@ -221,11 +222,11 @@ static cell_t RemoveBan(IPluginContext *pContext, const cell_t *params)
 			engine->ServerCommand("writeip\n");
 		}
 	}
-	else if (!g_HL2.IsLANServer())
+	else if (!gamehelpers->IsLANServer())
 	{
 		if (!handled)
 		{
-			UTIL_Format(
+			smcore.Format(
 				command,
 				sizeof(command),
 				"removeid %s\n",
@@ -248,9 +249,9 @@ static cell_t BanClient(IPluginContext *pContext, const cell_t *params)
 	char *ban_reason, *ban_cmd;
 	int client, ban_flags, ban_source, ban_time;
 
-	client = g_HL2.ReferenceToIndex(params[1]);
+	client = gamehelpers->ReferenceToIndex(params[1]);
 
-	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
+	IGamePlayer *pPlayer = playerhelpers->GetGamePlayer(client);
 	if (!pPlayer || !pPlayer->IsConnected())
 	{
 		return pContext->ThrowNativeError("Client index %d is invalid", client);
@@ -268,11 +269,16 @@ static cell_t BanClient(IPluginContext *pContext, const cell_t *params)
 	ban_flags = params[3];
 	ban_source = params[7];
 
-#if SOURCE_ENGINE != SE_DARKMESSIAH
 	/* Check how we should ban the player */
-	if ((ban_flags & BANFLAG_AUTO) == BANFLAG_AUTO)
+	if (!strcmp(smcore.GetSourceEngineName(), "darkmessiah"))
 	{
-		if (g_HL2.IsLANServer() || !pPlayer->IsAuthorized())
+		/* Dark Messiah doesn't have Steam IDs so there is only one ban method to choose */
+		ban_flags |= BANFLAG_IP;
+		ban_flags &= ~BANFLAG_AUTHID;
+	}
+	else if ((ban_flags & BANFLAG_AUTO) == BANFLAG_AUTO)
+	{
+		if (gamehelpers->IsLANServer() || !pPlayer->IsAuthorized())
 		{
 			ban_flags |= BANFLAG_IP;
 			ban_flags &= ~BANFLAG_AUTHID;
@@ -304,11 +310,6 @@ static cell_t BanClient(IPluginContext *pContext, const cell_t *params)
 	{
 		return pContext->ThrowNativeError("No valid ban method flags specified");
 	}
-#else
-	/* Dark Messiah doesn't have Steam IDs so there is only one ban method to choose */
-	ban_flags |= BANFLAG_IP;
-	ban_flags &= ~BANFLAG_AUTHID;
-#endif
 
 	cell_t handled = 0;
 	if (ban_cmd[0] != '\0' && g_pOnBanClient->GetFunctionCount() > 0)
@@ -335,7 +336,7 @@ static cell_t BanClient(IPluginContext *pContext, const cell_t *params)
 		{
 			/* Get the IP address and strip the port */
 			char ip[24], *ptr;
-			strncopy(ip, pPlayer->GetIPAddress(), sizeof(ip));
+			smcore.strncopy(ip, pPlayer->GetIPAddress(), sizeof(ip));
 			if ((ptr = strchr(ip, ':')) != NULL)
 			{
 				*ptr = '\0';
@@ -343,7 +344,7 @@ static cell_t BanClient(IPluginContext *pContext, const cell_t *params)
 		
 			/* Tell the server to ban the ip */
 			char command[256];
-			UTIL_Format(
+			smcore.Format(
 				command,
 				sizeof(command),
 				"addip %d %s\n",
@@ -367,7 +368,7 @@ static cell_t BanClient(IPluginContext *pContext, const cell_t *params)
 		{
 			/* Tell the server to ban the auth string */
 			char command[256];
-			UTIL_Format(
+			smcore.Format(
 				command, 
 				sizeof(command), 
 				"banid %d %s\n", 
@@ -377,7 +378,7 @@ static cell_t BanClient(IPluginContext *pContext, const cell_t *params)
 			/* Kick, then ban */
 			if ((ban_flags & BANFLAG_NOKICK) != BANFLAG_NOKICK)
 			{
-				g_HL2.AddDelayedKick(client, pPlayer->GetUserId(), kick_message);
+				gamehelpers->AddDelayedKick(client, pPlayer->GetUserId(), kick_message);
 			}
 			engine->ServerCommand(command);
 
@@ -390,7 +391,7 @@ static cell_t BanClient(IPluginContext *pContext, const cell_t *params)
 	}
 	else if ((ban_flags & BANFLAG_NOKICK) != BANFLAG_NOKICK)
 	{
-		g_HL2.AddDelayedKick(client, pPlayer->GetUserId(), kick_message);
+		gamehelpers->AddDelayedKick(client, pPlayer->GetUserId(), kick_message);
 	}
 
 

core/logic/smn_datapacks.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
@@ -29,9 +29,10 @@
  * Version: $Id$
  */
 
-#include "sm_globals.h"
-#include "HandleSys.h"
-#include "CDataPack.h"
+#include "common_logic.h"
+#include <IHandleSys.h>
+#include <IDataPack.h>
+#include <ISourceMod.h>
 
 HandleType_t g_DataPackType;
 
@@ -45,35 +46,35 @@ public:
 		HandleAccess hacc;
 		TypeAccess tacc;
 
-		g_HandleSys.InitAccessDefaults(&tacc, &hacc);
+		handlesys->InitAccessDefaults(&tacc, &hacc);
 		tacc.access[HTypeAccess_Create] = true;
 		tacc.access[HTypeAccess_Inherit] = true;
 		tacc.ident = g_pCoreIdent;
 		hacc.access[HandleAccess_Read] = HANDLE_RESTRICT_OWNER;
 
-		g_DataPackType = g_HandleSys.CreateType("DataPack", this, 0, &tacc, &hacc, g_pCoreIdent, NULL);
+		g_DataPackType = handlesys->CreateType("DataPack", this, 0, &tacc, &hacc, g_pCoreIdent, NULL);
 	}
 	void OnSourceModShutdown()
 	{
-		g_HandleSys.RemoveType(g_DataPackType, g_pCoreIdent);
+		handlesys->RemoveType(g_DataPackType, g_pCoreIdent);
 		g_DataPackType = 0;
 	}
 	void OnHandleDestroy(HandleType_t type, void *object)
 	{
-		g_SourceMod.FreeDataPack(reinterpret_cast<IDataPack *>(object));
+		g_pSM->FreeDataPack(reinterpret_cast<IDataPack *>(object));
 	}
 };
 
 static cell_t smn_CreateDataPack(IPluginContext *pContext, const cell_t *params)
 {
-	IDataPack *pDataPack = g_SourceMod.CreateDataPack();
+	IDataPack *pDataPack = g_pSM->CreateDataPack();
 
 	if (!pDataPack)
 	{
 		return 0;
 	}
 
-	return g_HandleSys.CreateHandle(g_DataPackType, pDataPack, pContext->GetIdentity(), g_pCoreIdent, NULL);
+	return handlesys->CreateHandle(g_DataPackType, pDataPack, pContext->GetIdentity(), g_pCoreIdent, NULL);
 }
 
 static cell_t smn_WritePackCell(IPluginContext *pContext, const cell_t *params)
@@ -86,7 +87,7 @@ static cell_t smn_WritePackCell(IPluginContext *pContext, const cell_t *params)
 	sec.pOwner = pContext->GetIdentity();
 	sec.pIdentity = g_pCoreIdent;
 
-	if ((herr=g_HandleSys.ReadHandle(hndl, g_DataPackType, &sec, (void **)&pDataPack))
+	if ((herr=handlesys->ReadHandle(hndl, g_DataPackType, &sec, (void **)&pDataPack))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid data pack handle %x (error %d)", hndl, herr);
@@ -107,7 +108,7 @@ static cell_t smn_WritePackFloat(IPluginContext *pContext, const cell_t *params)
 	sec.pOwner = pContext->GetIdentity();
 	sec.pIdentity = g_pCoreIdent;
 
-	if ((herr=g_HandleSys.ReadHandle(hndl, g_DataPackType, &sec, (void **)&pDataPack))
+	if ((herr=handlesys->ReadHandle(hndl, g_DataPackType, &sec, (void **)&pDataPack))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid data pack handle %x (error %d)", hndl, herr);
@@ -129,7 +130,7 @@ static cell_t smn_WritePackString(IPluginContext *pContext, const cell_t *params
 	sec.pOwner = pContext->GetIdentity();
 	sec.pIdentity = g_pCoreIdent;
 
-	if ((herr=g_HandleSys.ReadHandle(hndl, g_DataPackType, &sec, (void **)&pDataPack))
+	if ((herr=handlesys->ReadHandle(hndl, g_DataPackType, &sec, (void **)&pDataPack))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid data pack handle %x (error %d)", hndl, herr);
@@ -157,7 +158,7 @@ static cell_t smn_ReadPackCell(IPluginContext *pContext, const cell_t *params)
 	sec.pOwner = pContext->GetIdentity();
 	sec.pIdentity = g_pCoreIdent;
 
-	if ((herr=g_HandleSys.ReadHandle(hndl, g_DataPackType, &sec, (void **)&pDataPack))
+	if ((herr=handlesys->ReadHandle(hndl, g_DataPackType, &sec, (void **)&pDataPack))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid data pack handle %x (error %d)", hndl, herr);
@@ -181,7 +182,7 @@ static cell_t smn_ReadPackFloat(IPluginContext *pContext, const cell_t *params)
 	sec.pOwner = pContext->GetIdentity();
 	sec.pIdentity = g_pCoreIdent;
 
-	if ((herr=g_HandleSys.ReadHandle(hndl, g_DataPackType, &sec, (void **)&pDataPack))
+	if ((herr=handlesys->ReadHandle(hndl, g_DataPackType, &sec, (void **)&pDataPack))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid data pack handle %x (error %d)", hndl, herr);
@@ -205,7 +206,7 @@ static cell_t smn_ReadPackString(IPluginContext *pContext, const cell_t *params)
 	sec.pOwner = pContext->GetIdentity();
 	sec.pIdentity = g_pCoreIdent;
 
-	if ((herr=g_HandleSys.ReadHandle(hndl, g_DataPackType, &sec, (void **)&pDataPack))
+	if ((herr=handlesys->ReadHandle(hndl, g_DataPackType, &sec, (void **)&pDataPack))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid data pack handle %x (error %d)", hndl, herr);
@@ -232,7 +233,7 @@ static cell_t smn_ResetPack(IPluginContext *pContext, const cell_t *params)
 	sec.pOwner = pContext->GetIdentity();
 	sec.pIdentity = g_pCoreIdent;
 
-	if ((herr=g_HandleSys.ReadHandle(hndl, g_DataPackType, &sec, (void **)&pDataPack))
+	if ((herr=handlesys->ReadHandle(hndl, g_DataPackType, &sec, (void **)&pDataPack))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid data pack handle %x (error %d)", hndl, herr);
@@ -257,7 +258,7 @@ static cell_t smn_GetPackPosition(IPluginContext *pContext, const cell_t *params
 	sec.pOwner = pContext->GetIdentity();
 	sec.pIdentity = g_pCoreIdent;
 
-	if ((herr=g_HandleSys.ReadHandle(hndl, g_DataPackType, &sec, (void **)&pDataPack))
+	if ((herr=handlesys->ReadHandle(hndl, g_DataPackType, &sec, (void **)&pDataPack))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid data pack handle %x (error %d)", hndl, herr);
@@ -276,7 +277,7 @@ static cell_t smn_SetPackPosition(IPluginContext *pContext, const cell_t *params
 	sec.pOwner = pContext->GetIdentity();
 	sec.pIdentity = g_pCoreIdent;
 
-	if ((herr=g_HandleSys.ReadHandle(hndl, g_DataPackType, &sec, (void **)&pDataPack))
+	if ((herr=handlesys->ReadHandle(hndl, g_DataPackType, &sec, (void **)&pDataPack))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid data pack handle %x (error %d)", hndl, herr);
@@ -300,7 +301,7 @@ static cell_t smn_IsPackReadable(IPluginContext *pContext, const cell_t *params)
 	sec.pOwner = pContext->GetIdentity();
 	sec.pIdentity = g_pCoreIdent;
 
-	if ((herr=g_HandleSys.ReadHandle(hndl, g_DataPackType, &sec, (void **)&pDataPack))
+	if ((herr=handlesys->ReadHandle(hndl, g_DataPackType, &sec, (void **)&pDataPack))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid data pack handle %x (error %d)", hndl, herr);

core/logic/smn_gameconfigs.cpp

@@ -29,24 +29,24 @@
  * Version: $Id$
  */
 
-#include "sourcemod.h"
-#include "HandleSys.h"
+#include "common_logic.h"
+#include <IHandleSys.h>
 #include "GameConfigs.h"
 
 HandleType_t g_GameConfigsType;
 
 class GameConfigsNatives :
 	public IHandleTypeDispatch, 
-	public SourceModBase
+	public SMGlobalClass 
 {
 public:
 	void OnSourceModAllInitialized()
 	{
-		g_GameConfigsType = g_HandleSys.CreateType("GameConfigs", this, 0, NULL, NULL, g_pCoreIdent, NULL);
+		g_GameConfigsType = handlesys->CreateType("GameConfigs", this, 0, NULL, NULL, g_pCoreIdent, NULL);
 	}
 	void OnSourceModShutdown()
 	{
-		g_HandleSys.RemoveType(g_GameConfigsType, g_pCoreIdent);
+		handlesys->RemoveType(g_GameConfigsType, g_pCoreIdent);
 		g_GameConfigsType = 0;
 	}
 	void OnHandleDestroy(HandleType_t type, void *object)
@@ -67,7 +67,7 @@ static cell_t smn_LoadGameConfigFile(IPluginContext *pCtx, const cell_t *params)
 		return pCtx->ThrowNativeError("Unable to open %s: %s", filename, error);
 	}
 
-	return g_HandleSys.CreateHandle(g_GameConfigsType, gc, pCtx->GetIdentity(), g_pCoreIdent, NULL);
+	return handlesys->CreateHandle(g_GameConfigsType, gc, pCtx->GetIdentity(), g_pCoreIdent, NULL);
 }
 
 static cell_t smn_GameConfGetOffset(IPluginContext *pCtx, const cell_t *params)
@@ -80,7 +80,7 @@ static cell_t smn_GameConfGetOffset(IPluginContext *pCtx, const cell_t *params)
 	sec.pOwner = NULL;
 	sec.pIdentity = g_pCoreIdent;
 
-	if ((herr=g_HandleSys.ReadHandle(hndl, g_GameConfigsType, &sec, (void **)&gc))
+	if ((herr=handlesys->ReadHandle(hndl, g_GameConfigsType, &sec, (void **)&gc))
 		!= HandleError_None)
 	{
 		return pCtx->ThrowNativeError("Invalid game config handle %x (error %d)", hndl, herr);
@@ -108,7 +108,7 @@ static cell_t smn_GameConfGetKeyValue(IPluginContext *pCtx, const cell_t *params
 	sec.pOwner = NULL;
 	sec.pIdentity = g_pCoreIdent;
 
-	if ((herr=g_HandleSys.ReadHandle(hndl, g_GameConfigsType, &sec, (void **)&gc))
+	if ((herr=handlesys->ReadHandle(hndl, g_GameConfigsType, &sec, (void **)&gc))
 		!= HandleError_None)
 	{
 		return pCtx->ThrowNativeError("Invalid game config handle %x (error %d)", hndl, herr);
@@ -128,6 +128,33 @@ static cell_t smn_GameConfGetKeyValue(IPluginContext *pCtx, const cell_t *params
 	return 1;
 }
 
+
+static cell_t smn_GameConfGetAddress(IPluginContext *pCtx, const cell_t *params)
+{
+	Handle_t hndl = static_cast<Handle_t>(params[1]);
+	HandleError herr;
+	HandleSecurity sec;
+	IGameConfig *gc;
+
+	sec.pOwner = NULL;
+	sec.pIdentity = g_pCoreIdent;
+
+	if ((herr=handlesys->ReadHandle(hndl, g_GameConfigsType, &sec, (void **)&gc))
+		!= HandleError_None)
+	{
+		return pCtx->ThrowNativeError("Invalid game config handle %x (error %d)", hndl, herr);
+	}
+
+	char *key;
+	void* val;
+	pCtx->LocalToString(params[2], &key);
+
+	if (!gc->GetAddress(key, &val))
+		return 0;
+
+	return (cell_t)val;
+}
+
 static GameConfigsNatives s_GameConfigsNatives;
 
 REGISTER_NATIVES(gameconfignatives)
@@ -135,5 +162,6 @@ REGISTER_NATIVES(gameconfignatives)
 	{"LoadGameConfigFile",			smn_LoadGameConfigFile},
 	{"GameConfGetOffset",			smn_GameConfGetOffset},
 	{"GameConfGetKeyValue",			smn_GameConfGetKeyValue},
+	{"GameConfGetAddress",			smn_GameConfGetAddress},
 	{NULL,							NULL}
 };

core/logic/smn_handles.cpp

@@ -29,15 +29,17 @@
  * Version: $Id$
  */
 
-#include "sm_globals.h"
-#include "HandleSys.h"
-#include "PluginSys.h"
+#include "common_logic.h"
+#include <IHandleSys.h>
+#include <IPluginSys.h>
+
+using namespace SourceMod;
 
 static cell_t sm_IsValidHandle(IPluginContext *pContext, const cell_t *params)
 {
 	Handle_t hndl = static_cast<Handle_t>(params[1]);
 
-	HandleError err = g_HandleSys.ReadHandle(hndl, 0, NULL, NULL);
+	HandleError err = handlesys->ReadHandle(hndl, 0, NULL, NULL);
 
 	if (err != HandleError_Access
 		&& err != HandleError_None)
@@ -56,7 +58,7 @@ static cell_t sm_CloseHandle(IPluginContext *pContext, const cell_t *params)
 	sec.pIdentity = NULL;
 	sec.pOwner = pContext->GetIdentity();
 
-	HandleError err = g_HandleSys.FreeHandle(hndl, &sec);
+	HandleError err = handlesys->FreeHandle(hndl, &sec);
   
 	if (err == HandleError_None)
 	{
@@ -80,7 +82,7 @@ static cell_t sm_CloneHandle(IPluginContext *pContext, const cell_t *params)
 		pNewOwner = pContext->GetIdentity();
 	} else {
 		Handle_t hPlugin = static_cast<Handle_t>(params[2]);
-		IPlugin *pPlugin = g_PluginSys.PluginFromHandle(hPlugin, &err);
+		IPlugin *pPlugin = pluginsys->PluginFromHandle(hPlugin, &err);
 		if (!pPlugin)
 		{
 			return pContext->ThrowNativeError("Plugin handle %x is invalid (error %d)", hndl, err);
@@ -88,7 +90,7 @@ static cell_t sm_CloneHandle(IPluginContext *pContext, const cell_t *params)
 		pNewOwner = pPlugin->GetIdentity();
 	}
 
-	err = g_HandleSys.CloneHandle(hndl, &new_hndl, pNewOwner, NULL);
+	err = handlesys->CloneHandle(hndl, &new_hndl, pNewOwner, NULL);
 
 	if (err == HandleError_Access)
 	{
@@ -102,7 +104,7 @@ static cell_t sm_CloneHandle(IPluginContext *pContext, const cell_t *params)
 
 static cell_t sm_GetMyHandle(IPluginContext *pContext, const cell_t *params)
 {
-	CPlugin *pPlugin = g_PluginSys.GetPluginByCtx(pContext->GetContext());
+	IPlugin *pPlugin = pluginsys->FindPluginByContext(pContext->GetContext());
 
 	return pPlugin->GetMyHandle();
 }

core/logic/smn_lang.cpp

@@ -29,20 +29,20 @@
  * Version: $Id$
  */
 
-#include "PluginSys.h"
+#include "common_logic.h"
 #include "Translator.h"
-#include "LibrarySys.h"
-#include "sm_stringutil.h"
-#include "PlayerManager.h"
+#include <IPlayerHelpers.h>
+#include <IPluginSys.h>
+#include <ISourceMod.h>
 
 static cell_t sm_LoadTranslations(IPluginContext *pCtx, const cell_t *params)
 {
 	char *filename, *ext;
 	char buffer[PLATFORM_MAX_PATH];
-	CPlugin *pl = (CPlugin *)g_PluginSys.FindPluginByContext(pCtx->GetContext());
+	IPlugin *pl = pluginsys->FindPluginByContext(pCtx->GetContext());
 
 	pCtx->LocalToString(params[1], &filename);
-	UTIL_Format(buffer, sizeof(buffer), "%s", filename);
+	smcore.Format(buffer, sizeof(buffer), "%s", filename);
 
 	/* Make sure there is no extension */
 	if ((ext = strstr(buffer, ".txt")) != NULL
@@ -62,14 +62,14 @@ static cell_t sm_LoadTranslations(IPluginContext *pCtx, const cell_t *params)
 
 static cell_t sm_SetGlobalTransTarget(IPluginContext *pContext, const cell_t *params)
 {
-	g_SourceMod.SetGlobalTarget(params[1]);
+	g_pSM->SetGlobalTarget(params[1]);
 
 	return 1;
 }
 
 static cell_t sm_GetClientLanguage(IPluginContext *pContext, const cell_t *params)
 {
-	CPlayer *player = g_Players.GetPlayerByIndex(params[1]);
+	IGamePlayer *player = playerhelpers->GetGamePlayer(params[1]);
 	if (!player || !player->IsConnected())
 	{
 		return pContext->ThrowNativeError("Invalid client index %d", params[1]);
@@ -104,6 +104,46 @@ static cell_t sm_GetLanguageInfo(IPluginContext *pContext, const cell_t *params)
 	return 1;
 }
 
+static cell_t sm_SetClientLanguage(IPluginContext *pContext, const cell_t *params)
+{
+	IGamePlayer *player = playerhelpers->GetGamePlayer(params[1]);
+	
+	if (!player || !player->IsConnected())
+	{
+		return pContext->ThrowNativeError("Invalid client index %d", params[1]);
+	}
+	
+	player->SetLanguageId(params[2]);
+
+	return 1;
+}
+
+static cell_t sm_GetLanguageByCode(IPluginContext *pContext, const cell_t *params)
+{
+	char *code;
+	unsigned int langid;
+
+	pContext->LocalToString(params[1], &code);
+
+	if (g_Translator.GetLanguageByCode(code, &langid))
+		return langid;
+
+	return -1;
+}
+
+static cell_t sm_GetLanguageByName(IPluginContext *pContext, const cell_t *params)
+{
+	char *name;
+	unsigned int langid;
+
+	pContext->LocalToString(params[1], &name);
+
+	if (g_Translator.GetLanguageByName(name, &langid))
+		return langid;
+
+	return -1;
+}
+
 REGISTER_NATIVES(langNatives)
 {
 	{"LoadTranslations",			sm_LoadTranslations},
@@ -112,5 +152,8 @@ REGISTER_NATIVES(langNatives)
 	{"GetServerLanguage",			sm_GetServerLanguage},
 	{"GetLanguageCount",			sm_GetLanguageCount},
 	{"GetLanguageInfo",				sm_GetLanguageInfo},
+	{"SetClientLanguage",			sm_SetClientLanguage},
+	{"GetLanguageByCode",			sm_GetLanguageByCode},
+	{"GetLanguageByName",			sm_GetLanguageByName},
 	{NULL,							NULL},
 };

core/logic/smn_maplists.cpp

@@ -33,9 +33,11 @@
 #include <sm_trie_tpl.h>
 #include "common_logic.h"
 #include "CellArray.h"
+#include <IGameHelpers.h>
 #include <ILibrarySys.h>
 #include <ITextParsers.h>
 #include <ISourceMod.h>
+#include "stringutil.h"
 
 using namespace SourceHook;
 
@@ -78,6 +80,47 @@ public:
 	{
 		DumpCache(NULL);
 	}
+	void GetMapCycleFilePath(char *pBuffer, int maxlen)
+	{
+		const char *pEngineName = smcore.GetSourceEngineName();
+		const char *pMapCycleFileName = m_pMapCycleFile ? smcore.GetCvarString(m_pMapCycleFile) : "mapcycle.txt";
+
+		if (strcmp(pEngineName, "tf2") == 0 || strcmp(pEngineName, "css") == 0
+			|| strcmp(pEngineName, "dods") == 0 || strcmp(pEngineName, "hl2dm") == 0)
+		{
+			// These four games and Source SDK 2013 do a lookup in this order; so shall we.
+			g_pSM->BuildPath(Path_Game,
+				pBuffer,
+				maxlen,
+				"cfg/%s",
+				pMapCycleFileName);
+
+			if (!libsys->PathExists(pBuffer))
+			{
+				g_pSM->BuildPath(Path_Game,
+					pBuffer,
+					maxlen,
+					"%s",
+					pMapCycleFileName);
+
+				if (!libsys->PathExists(pBuffer))
+				{
+					g_pSM->BuildPath(Path_Game,
+						pBuffer,
+						maxlen,
+						"cfg/mapcycle_default.txt");
+				}
+			}
+		}
+		else
+		{
+			g_pSM->BuildPath(Path_Game,
+				pBuffer,
+				maxlen,
+				"%s",
+				pMapCycleFileName);
+		}
+	}
 	void AddOrUpdateDefault(const char *name, const char *file)
 	{
 		char path[PLATFORM_MAX_PATH];
@@ -154,11 +197,9 @@ public:
 
 		pDefList->bIsPath = true;
 		smcore.strncopy(pDefList->name, "mapcyclefile", sizeof(pDefList->name));
-		g_pSM->BuildPath(Path_Game,
-			pDefList->path, 
-			sizeof(pDefList->path),
-			"%s",
-			m_pMapCycleFile ? smcore.GetCvarString(m_pMapCycleFile) : "mapcycle.txt");
+
+		GetMapCycleFilePath(pDefList->path, sizeof(pDefList->path));
+		
 		pDefList->last_modified_time = 0;
 		pDefList->pArray = NULL;
 		pDefList->serial = 0;
@@ -348,51 +389,39 @@ public:
 		if ((success && pNewArray == NULL)
 			|| (!success && ((flags & MAPLIST_FLAG_MAPSFOLDER) == MAPLIST_FLAG_MAPSFOLDER)))
 		{
-			char path[255];
-			IDirectory *pDir;
-
 			pNewArray = new CellArray(64);
 			free_new_array = true;
-			g_pSM->BuildPath(Path_Game, path, sizeof(path), "maps");
 
-			if ((pDir = libsys->OpenDirectory(path)) != NULL)
+			cell_t *blk;
+
+			FileFindHandle_t findHandle;
+			const char *fileName = smcore.filesystem->FindFirstEx("maps/*.bsp", "GAME", &findHandle);
+
+			while (fileName)
 			{
-				char *ptr;
-				cell_t *blk;
 				char buffer[PLATFORM_MAX_PATH];
 
-				while (pDir->MoreFiles())
+				UTIL_StripExtension(fileName, buffer, sizeof(buffer));
+
+				if (!engine->IsMapValid(buffer))
 				{
-					if (!pDir->IsEntryFile()
-						|| strcmp(pDir->GetEntryName(), ".") == 0
-						|| strcmp(pDir->GetEntryName(), "..") == 0)
-					{
-						pDir->NextEntry();
-						continue;
-					}
-					smcore.strncopy(buffer, pDir->GetEntryName(), sizeof(buffer));
-					if ((ptr = strstr(buffer, ".bsp")) == NULL || ptr[4] != '\0')
-					{
-						pDir->NextEntry();
-						continue;
-					}
-					*ptr = '\0';
-					if (!engine->IsMapValid(buffer))
-					{
-						pDir->NextEntry();
-						continue;
-					}
-					if ((blk = pNewArray->push()) == NULL)
-					{
-						pDir->NextEntry();
-						continue;
-					}
-					smcore.strncopy((char *)blk, buffer, 255);
-					pDir->NextEntry();
+					fileName = smcore.filesystem->FindNext(findHandle);
+					continue;
 				}
-				libsys->CloseDirectory(pDir);
+
+				if ((blk = pNewArray->push()) == NULL)
+				{
+					fileName = smcore.filesystem->FindNext(findHandle);
+					continue;
+				}
+
+				smcore.strncopy((char *)blk, buffer, 255);
+
+				fileName = smcore.filesystem->FindNext(findHandle);
 			}
 
+			smcore.filesystem->FindClose(findHandle);
+
 			/* Remove the array if there were no items. */
 			if (pNewArray->size() == 0)
 			{
@@ -485,11 +514,7 @@ private:
 		if (m_pMapCycleFile != NULL && strcmp(name, "mapcyclefile") == 0)
 		{
 			char path[PLATFORM_MAX_PATH];
-			g_pSM->BuildPath(Path_Game,
-				path, 
-				sizeof(path),
-				"%s",
-				m_pMapCycleFile ? smcore.GetCvarString(m_pMapCycleFile) : "mapcycle.txt");
+			GetMapCycleFilePath(path, sizeof(path));
 
 			if (strcmp(path, pMapList->path) != 0)
 			{
@@ -524,7 +549,7 @@ private:
 				{
 					continue;
 				}
-				if (!engine->IsMapValid(ptr))
+				if (!gamehelpers->IsMapValid(ptr))
 				{
 					continue;
 				}

core/logic/smn_players.cpp

@@ -0,0 +1,235 @@
+/**
+ * vim: set ts=4 sw=4 tw=99 noet :
+ * =============================================================================
+ * 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 "common_logic.h"
+#include <IPluginSys.h>
+#include <IPlayerHelpers.h>
+#include <sh_string.h>
+#include <sh_list.h>
+#include "AutoHandleRooter.h"
+#include "CellArray.h"
+
+using namespace SourceHook;
+using namespace SourceMod;
+
+class PlayerLogicHelpers : 
+	public SMGlobalClass,
+	public IPluginsListener,
+	public ICommandTargetProcessor
+{
+	struct SimpleMultiTargetFilter
+	{
+		IPlugin *plugin;
+		SourceHook::String pattern;
+		IPluginFunction *fun;
+		SourceHook::String phrase;
+		bool phraseIsML;
+
+		SimpleMultiTargetFilter(IPlugin *plugin, const char *pattern, IPluginFunction *fun,
+		                        const char *phrase, bool phraseIsML)
+		  : plugin(plugin), pattern(pattern), fun(fun), phrase(phrase), phraseIsML(phraseIsML)
+		{
+		}
+	};
+
+	List<SimpleMultiTargetFilter *> simpleMultis;
+	bool filterEnabled;
+
+public:
+	void AddMultiTargetFilter(IPlugin *plugin, const char *pattern, IPluginFunction *fun,
+	                          const char *phrase, bool phraseIsML)
+	{
+		SimpleMultiTargetFilter *smtf = new SimpleMultiTargetFilter(plugin, pattern, fun, phrase,
+		                                                            phraseIsML);
+
+		simpleMultis.push_back(smtf);
+
+		if (!filterEnabled) {
+			playerhelpers->RegisterCommandTargetProcessor(this);
+			filterEnabled = true;
+		}
+	}
+
+	void RemoveMultiTargetFilter(const char *pattern, IPluginFunction *fun)
+	{
+		List<SimpleMultiTargetFilter *>::iterator iter = simpleMultis.begin();
+
+		while (iter != simpleMultis.end()) {
+			if ((*iter)->fun == fun && strcmp((*iter)->pattern.c_str(), pattern) == 0) {
+				delete (*iter);
+				iter = simpleMultis.erase(iter);
+				break;
+			}
+			iter++;
+		}
+	}
+
+	PlayerLogicHelpers()
+	 : filterEnabled(false)
+	{
+	}
+
+public: //ICommandTargetProcessor
+	bool ProcessCommandTarget(cmd_target_info_t *info)
+	{
+		List<SimpleMultiTargetFilter *>::iterator iter;
+
+		for (iter = simpleMultis.begin(); iter != simpleMultis.end(); iter++) {
+			SimpleMultiTargetFilter *smtf = (*iter);
+			if (strcmp(smtf->pattern.c_str(), info->pattern) == 0) {
+				CellArray *array = new CellArray(1);
+				HandleSecurity sec(g_pCoreIdent, g_pCoreIdent);
+				Handle_t hndl = handlesys->CreateHandleEx(htCellArray, array, &sec, NULL, NULL);
+				AutoHandleCloner ahc(hndl, sec);
+				if (ahc.getClone() == BAD_HANDLE) {
+					smcore.LogError("[SM] Could not allocate a handle (%s, %d)", __FILE__, __LINE__);
+					delete array;
+					return false;
+				}
+
+				smtf->fun->PushString(info->pattern);
+				smtf->fun->PushCell(ahc.getClone());
+				cell_t result = 0;
+				if (smtf->fun->Execute(&result) != SP_ERROR_NONE || !result)
+					return false;
+
+				IGamePlayer *pAdmin = info->admin
+				                      ? playerhelpers->GetGamePlayer(info->admin)
+				                      : NULL;
+
+				info->num_targets = 0;
+				for (size_t i = 0; i < array->size(); i++) {
+					cell_t client = *array->at(i);
+					IGamePlayer *pClient = playerhelpers->GetGamePlayer(client);
+					if (pClient == NULL || !pClient->IsConnected())
+						continue;
+					if (playerhelpers->FilterCommandTarget(pAdmin, pClient, info->flags) ==
+					    COMMAND_TARGET_VALID)
+					{
+						info->targets[info->num_targets++] = client;
+						if (info->num_targets >= unsigned(info->max_targets))
+							break;
+					}
+				}
+
+				info->reason = info->num_targets > 0
+				               ? COMMAND_TARGET_VALID
+				               : COMMAND_TARGET_EMPTY_FILTER;
+				if (info->num_targets) {
+					smcore.strncopy(info->target_name, smtf->phrase.c_str(), info->target_name_maxlength);
+					info->target_name_style = smtf->phraseIsML
+					                          ? COMMAND_TARGETNAME_ML
+					                          : COMMAND_TARGETNAME_RAW;
+				}
+
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+public: //SMGlobalClass
+	void OnSourceModAllInitialized()
+	{
+		pluginsys->AddPluginsListener(this);
+	}
+
+	void OnSourceModShutdown()
+	{
+		pluginsys->RemovePluginsListener(this);
+		if (filterEnabled) {
+			playerhelpers->UnregisterCommandTargetProcessor(this);
+			filterEnabled = false;
+		}
+	}
+
+public: //IPluginsListener
+
+	void OnPluginDestroyed(IPlugin *plugin)
+	{
+		List<SimpleMultiTargetFilter *>::iterator iter = simpleMultis.begin();
+
+		while (iter != simpleMultis.end()) {
+			if ((*iter)->plugin != plugin) {
+				iter++;
+			} else {
+				delete (*iter);
+				iter = simpleMultis.erase(iter);
+			}
+		}
+	}
+} s_PlayerLogicHelpers;
+
+static cell_t
+AddMultiTargetFilter(IPluginContext *ctx, const cell_t *params)
+{
+	IPluginFunction *fun = ctx->GetFunctionById(funcid_t(params[2]));
+	if (fun == NULL)
+		return ctx->ThrowNativeError("Invalid function id (%X)", params[2]);
+
+	char *pattern;
+	char *phrase;
+
+	ctx->LocalToString(params[1], &pattern);
+	ctx->LocalToString(params[3], &phrase);
+
+	bool phraseIsML = !!params[4];
+	IPlugin *plugin = pluginsys->FindPluginByContext(ctx->GetContext());
+
+	s_PlayerLogicHelpers.AddMultiTargetFilter(plugin, pattern, fun, phrase, phraseIsML);
+
+	return 1;
+}
+
+static cell_t
+RemoveMultiTargetFilter(IPluginContext *ctx, const cell_t *params)
+{
+	IPluginFunction *fun = ctx->GetFunctionById(funcid_t(params[2]));
+	if (fun == NULL)
+		return ctx->ThrowNativeError("Invalid function id (%X)", params[2]);
+
+	char *pattern;
+
+	ctx->LocalToString(params[1], &pattern);
+
+	s_PlayerLogicHelpers.RemoveMultiTargetFilter(pattern, fun);
+
+	return 1;
+}
+
+REGISTER_NATIVES(playernatives)
+{
+	{"AddMultiTargetFilter",	AddMultiTargetFilter},
+	{"RemoveMultiTargetFilter",	RemoveMultiTargetFilter},
+	{NULL,						NULL}
+};
+

core/logic/smn_profiler.cpp

@@ -29,12 +29,13 @@
  * Version: $Id$
  */
 
-#include "sm_globals.h"
-#include "HandleSys.h"
-
-//Note: Do not add this to Linux yet, i haven't done the HPET timing research (if even available)
-//nonetheless we need accurate counting
-#if !defined PLATFORM_LINUX
+#include "common_logic.h"
+#include <IHandleSys.h>
+#if !defined PLATFORM_WINDOWS
+#include <stddef.h>
+#include <stdint.h>
+#include <sys/time.h>
+#endif
 
 struct Profiler
 {
@@ -47,6 +48,9 @@ struct Profiler
 	LARGE_INTEGER start;
 	LARGE_INTEGER end;
 	double freq;
+#else
+	struct timeval start;
+	struct timeval end;
 #endif
 	bool started;
 	bool stopped;
@@ -61,11 +65,11 @@ class ProfilerHelpers :
 public:
 	void OnSourceModAllInitialized()
 	{
-		g_ProfilerType = g_HandleSys.CreateType("Profiler", this, 0, NULL, NULL, g_pCoreIdent, NULL);
+		g_ProfilerType = handlesys->CreateType("Profiler", this, 0, NULL, NULL, g_pCoreIdent, NULL);
 	}
 	void OnSourceModShutdown()
 	{
-		g_HandleSys.RemoveType(g_ProfilerType, g_pCoreIdent);
+		handlesys->RemoveType(g_ProfilerType, g_pCoreIdent);
 	}
 	void OnHandleDestroy(HandleType_t type, void *object)
 	{
@@ -84,7 +88,7 @@ static cell_t CreateProfiler(IPluginContext *pContext, const cell_t *params)
 	p->freq = 1.0 / (double)(qpf.QuadPart);
 #endif
 
-	Handle_t hndl = g_HandleSys.CreateHandle(g_ProfilerType, p, pContext->GetIdentity(), g_pCoreIdent, NULL);
+	Handle_t hndl = handlesys->CreateHandle(g_ProfilerType, p, pContext->GetIdentity(), g_pCoreIdent, NULL);
 	if (hndl == BAD_HANDLE)
 	{
 		delete p;
@@ -100,7 +104,7 @@ static cell_t StartProfiling(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	Profiler *prof;
 
-	if ((err = g_HandleSys.ReadHandle(hndl, g_ProfilerType, &sec, (void **)&prof))
+	if ((err = handlesys->ReadHandle(hndl, g_ProfilerType, &sec, (void **)&prof))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error %d)", hndl, err);
@@ -108,6 +112,8 @@ static cell_t StartProfiling(IPluginContext *pContext, const cell_t *params)
 
 #if defined PLATFORM_WINDOWS
 	QueryPerformanceCounter(&prof->start);
+#else
+	gettimeofday(&prof->start, NULL);
 #endif
 
 	prof->started = true;
@@ -123,7 +129,7 @@ static cell_t StopProfiling(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	Profiler *prof;
 
-	if ((err = g_HandleSys.ReadHandle(hndl, g_ProfilerType, &sec, (void **)&prof))
+	if ((err = handlesys->ReadHandle(hndl, g_ProfilerType, &sec, (void **)&prof))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error %d)", hndl, err);
@@ -136,6 +142,8 @@ static cell_t StopProfiling(IPluginContext *pContext, const cell_t *params)
 
 #if defined PLATFORM_WINDOWS
 	QueryPerformanceCounter(&prof->end);
+#else
+	gettimeofday(&prof->end, NULL);
 #endif
 
 	prof->started = false;
@@ -151,7 +159,7 @@ static cell_t GetProfilerTime(IPluginContext *pContext, const cell_t *params)
 	HandleError err;
 	Profiler *prof;
 
-	if ((err = g_HandleSys.ReadHandle(hndl, g_ProfilerType, &sec, (void **)&prof))
+	if ((err = handlesys->ReadHandle(hndl, g_ProfilerType, &sec, (void **)&prof))
 		!= HandleError_None)
 	{
 		return pContext->ThrowNativeError("Invalid Handle %x (error %d)", hndl, err);
@@ -168,6 +176,10 @@ static cell_t GetProfilerTime(IPluginContext *pContext, const cell_t *params)
 	LONGLONG diff = prof->end.QuadPart - prof->start.QuadPart;
 	double seconds = diff * prof->freq;
 	fTime = (float)seconds;
+#else
+	int64_t start_us = int64_t(prof->start.tv_sec) * 1000000 + prof->start.tv_usec;
+	int64_t stop_us = int64_t(prof->end.tv_sec) * 1000000 + prof->end.tv_usec;
+	fTime = double(stop_us - start_us) / 1000000.0;
 #endif
 
 	return sp_ftoc(fTime);
@@ -181,5 +193,4 @@ REGISTER_NATIVES(profilerNatives)
 	{"StopProfiling",			StopProfiling},
 	{NULL,						NULL},
 };
-#endif
 

core/logic/smn_sorting.cpp

@@ -94,7 +94,7 @@ void sort_random(cell_t *array, cell_t size)
 
 	for (int i = size-1; i > 0; i--)
 	{
-        int n = (rand() % i) + 1;
+        int n = rand() % (i + 1);
 
 		if (array[i] != array[n]) 
 		{
@@ -435,7 +435,7 @@ void sort_adt_random(CellArray *cArray)
 
 	for (int i = arraysize-1; i > 0; i--)
 	{
-        int n = (rand() % i) + 1;
+        int n = rand() % (i + 1);
 
 		cArray->swap(i, n);
 	}

core/logic/smn_string.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.
@@ -29,12 +29,12 @@
  * Version: $Id$
  */
 
+#include "common_logic.h"
 #include <string.h>
 #include <stdlib.h>
-#include "sm_globals.h"
-#include "sm_stringutil.h"
 #include <ITextParsers.h>
 #include <ctype.h>
+#include "stringutil.h"
 
 inline const char *_strstr(const char *str, const char *substr)
 {
@@ -141,7 +141,7 @@ static cell_t sm_numtostr(IPluginContext *pCtx, const cell_t *params)
 {
 	char *str;
 	pCtx->LocalToString(params[2], &str);
-	size_t res = UTIL_Format(str, params[3], "%d", params[1]);
+	size_t res = smcore.Format(str, params[3], "%d", params[1]);
 
 	return static_cast<cell_t>(res);
 }
@@ -174,7 +174,7 @@ static cell_t sm_floattostr(IPluginContext *pCtx, const cell_t *params)
 {
 	char *str;
 	pCtx->LocalToString(params[2], &str);
-	size_t res = UTIL_Format(str, params[3], "%f", sp_ctof(params[1]));
+	size_t res = smcore.Format(str, params[3], "%f", sp_ctof(params[1]));
 
 	return static_cast<cell_t>(res);
 }
@@ -187,7 +187,7 @@ static cell_t sm_formatex(IPluginContext *pCtx, const cell_t *params)
 
 	pCtx->LocalToString(params[1], &buf);
 	pCtx->LocalToString(params[3], &fmt);
-	res = atcprintf(buf, static_cast<size_t>(params[2]), fmt, pCtx, params, &arg);
+	res = smcore.atcprintf(buf, static_cast<size_t>(params[2]), fmt, pCtx, params, &arg);
 
 	return static_cast<cell_t>(res);
 }
@@ -256,7 +256,7 @@ static cell_t sm_format(IPluginContext *pCtx, const cell_t *params)
 	}
 
 	buf = (copy) ? __copy_buf : destbuf;
-	res = atcprintf(buf, maxlen, fmt, pCtx, params, &arg);
+	res = smcore.atcprintf(buf, maxlen, fmt, pCtx, params, &arg);
 
 	if (copy)
 	{
@@ -306,7 +306,7 @@ static cell_t sm_vformat(IPluginContext *pContext, const cell_t *params)
 
 	pContext->LocalToString(params[3], &format);
 
-	size_t total = atcprintf(destination, maxlen, format, pContext, local_params, &vargPos);
+	size_t total = smcore.atcprintf(destination, maxlen, format, pContext, local_params, &vargPos);
 
 	/* Perform copy-on-write if we need to */
 	if (copy)

core/logic/smn_timers.cpp

@@ -29,11 +29,14 @@
  * Version: $Id$
  */
 
-#include "HandleSys.h"
-#include "TimerSys.h"
-#include "PluginSys.h"
-#include "Logger.h"
-#include "DebugReporter.h"
+#include "common_logic.h"
+#include <string.h>
+#include <IHandleSys.h>
+#include <ITimerSystem.h>
+#include <IPluginSys.h>
+#include <sh_stack.h>
+
+using namespace SourceHook;
 
 #define TIMER_DATA_HNDL_CLOSE	(1<<9)
 #define TIMER_HNDL_CLOSE		(1<<9)
@@ -86,15 +89,15 @@ void TimerNatives::OnSourceModAllInitialized()
 {
 	HandleAccess sec;
 
-	g_HandleSys.InitAccessDefaults(NULL, &sec);
+	handlesys->InitAccessDefaults(NULL, &sec);
 	sec.access[HandleAccess_Clone] = HANDLE_RESTRICT_IDENTITY;
 
-	g_TimerType = g_HandleSys.CreateType("Timer", this, 0, NULL, &sec, g_pCoreIdent, NULL);
+	g_TimerType = handlesys->CreateType("Timer", this, 0, NULL, &sec, g_pCoreIdent, NULL);
 }
 
 void TimerNatives::OnSourceModShutdown()
 {
-	g_HandleSys.RemoveType(g_TimerType, g_pCoreIdent);
+	handlesys->RemoveType(g_TimerType, g_pCoreIdent);
 	g_TimerType = 0;
 }
 
@@ -102,7 +105,7 @@ void TimerNatives::OnHandleDestroy(HandleType_t type, void *object)
 {
 	TimerInfo *pTimer = reinterpret_cast<TimerInfo *>(object);
 
-	g_Timers.KillTimer(pTimer->Timer);
+	timersys->KillTimer(pTimer->Timer);
 }
 
 TimerInfo *TimerNatives::CreateTimerInfo()
@@ -150,27 +153,23 @@ void TimerNatives::OnTimerEnd(ITimer *pTimer, void *pData)
 
 	if (pInfo->Flags & TIMER_DATA_HNDL_CLOSE)
 	{
-		if ((herr=g_HandleSys.FreeHandle(usrhndl, &sec)) != HandleError_None)
+		if ((herr=handlesys->FreeHandle(usrhndl, &sec)) != HandleError_None)
 		{
-			g_DbgReporter.GenerateError(pInfo->pContext,
-										pInfo->Hook->GetFunctionID(), 
-										SP_ERROR_NATIVE, 
-										"Invalid data handle %x (error %d) passed during timer end with TIMER_DATA_HNDL_CLOSE",
-										usrhndl, 
-										herr);
+			smcore.GenerateError(pInfo->pContext, pInfo->Hook->GetFunctionID(), 
+							  	 SP_ERROR_NATIVE, 
+							  	 "Invalid data handle %x (error %d) passed during timer end with TIMER_DATA_HNDL_CLOSE",
+							  	 usrhndl, herr);
 		}
 	}
 
 	if (pInfo->TimerHandle != BAD_HANDLE)
 	{
-		if ((herr=g_HandleSys.FreeHandle(pInfo->TimerHandle, &sec)) != HandleError_None)
+		if ((herr=handlesys->FreeHandle(pInfo->TimerHandle, &sec)) != HandleError_None)
 		{
-			g_DbgReporter.GenerateError(pInfo->pContext, 
-				pInfo->Hook->GetFunctionID(), 
+			smcore.GenerateError(pInfo->pContext, pInfo->Hook->GetFunctionID(), 
 				SP_ERROR_NATIVE, 
 				"Invalid timer handle %x (error %d) during timer end, displayed function is timer callback, not the stack trace", 
-				pInfo->TimerHandle, 
-				herr);
+				pInfo->TimerHandle, herr);
 		}
 	}
 
@@ -200,7 +199,7 @@ static cell_t smn_CreateTimer(IPluginContext *pCtx, const cell_t *params)
 	}
 
 	pInfo = s_TimerNatives.CreateTimerInfo();
-	pTimer = g_Timers.CreateTimer(&s_TimerNatives, sp_ctof(params[1]), pInfo, flags);
+	pTimer = timersys->CreateTimer(&s_TimerNatives, sp_ctof(params[1]), pInfo, flags);
 
 	if (!pTimer)
 	{
@@ -208,7 +207,7 @@ static cell_t smn_CreateTimer(IPluginContext *pCtx, const cell_t *params)
 		return 0;
 	}
 
-	hndl = g_HandleSys.CreateHandle(g_TimerType, pInfo, pCtx->GetIdentity(), g_pCoreIdent, NULL);
+	hndl = handlesys->CreateHandle(g_TimerType, pInfo, pCtx->GetIdentity(), g_pCoreIdent, NULL);
 
 	/* If we can't get a handle, the timer isn't refcounted against the plugin and 
 	 * we need to bail out to prevent a crash.
@@ -219,11 +218,11 @@ static cell_t smn_CreateTimer(IPluginContext *pCtx, const cell_t *params)
 		if (flags & TIMER_DATA_HNDL_CLOSE)
 		{
 			HandleSecurity sec(pCtx->GetIdentity(), g_pCoreIdent);
-			g_HandleSys.FreeHandle(params[3], &sec);
+			handlesys->FreeHandle(params[3], &sec);
 		}
 		/* Zero everything so there's no conflicts */
 		memset(pInfo, 0, sizeof(TimerInfo));
-		g_Timers.KillTimer(pTimer);
+		timersys->KillTimer(pTimer);
 
 		return pCtx->ThrowNativeError("Could not create timer, no more handles");
 	}
@@ -248,20 +247,20 @@ static cell_t smn_KillTimer(IPluginContext *pCtx, const cell_t *params)
 	sec.pOwner = pCtx->GetIdentity();
 	sec.pIdentity = g_pCoreIdent;
 
-	if ((herr=g_HandleSys.ReadHandle(hndl, g_TimerType, &sec, (void **)&pInfo))
+	if ((herr=handlesys->ReadHandle(hndl, g_TimerType, &sec, (void **)&pInfo))
 		!= HandleError_None)
 	{
 		return pCtx->ThrowNativeError("Invalid timer handle %x (error %d)", hndl, herr);
 	}
 
-	g_Timers.KillTimer(pInfo->Timer);
+	timersys->KillTimer(pInfo->Timer);
 
 	if (params[2] && !(pInfo->Flags & TIMER_DATA_HNDL_CLOSE))
 	{
 		sec.pOwner = pInfo->pContext->GetIdentity();
 		sec.pIdentity = g_pCoreIdent;
 
-		if ((herr=g_HandleSys.FreeHandle(static_cast<Handle_t>(pInfo->UserData), &sec)) != HandleError_None)
+		if ((herr=handlesys->FreeHandle(static_cast<Handle_t>(pInfo->UserData), &sec)) != HandleError_None)
 		{
 			return pCtx->ThrowNativeError("Invalid data handle %x (error %d) on timer kill with TIMER_DATA_HNDL_CLOSE", hndl, herr);
 		}
@@ -280,26 +279,26 @@ static cell_t smn_TriggerTimer(IPluginContext *pCtx, const cell_t *params)
 	sec.pOwner = pCtx->GetIdentity();
 	sec.pIdentity = g_pCoreIdent;
 
-	if ((herr=g_HandleSys.ReadHandle(hndl, g_TimerType, &sec, (void **)&pInfo))
+	if ((herr=handlesys->ReadHandle(hndl, g_TimerType, &sec, (void **)&pInfo))
 		!= HandleError_None)
 	{
 		return pCtx->ThrowNativeError("Invalid timer handle %x (error %d)", hndl, herr);
 	}
 
-	g_Timers.FireTimerOnce(pInfo->Timer, params[2] ? true : false);
+	timersys->FireTimerOnce(pInfo->Timer, params[2] ? true : false);
 
 	return 1;
 }
 
 static cell_t smn_GetTickedTime(IPluginContext *pContext, const cell_t *params)
 {
-	return sp_ftoc(*g_pUniversalTime);
+	return sp_ftoc(*serverGlobals.universalTime);
 }
 
 static cell_t smn_GetMapTimeLeft(IPluginContext *pContext, const cell_t *params)
 {
 	float time_left;
-	if (!g_Timers.GetMapTimeLeft(&time_left))
+	if (!timersys->GetMapTimeLeft(&time_left))
 	{
 		return 0;
 	}
@@ -313,7 +312,7 @@ static cell_t smn_GetMapTimeLeft(IPluginContext *pContext, const cell_t *params)
 
 static cell_t smn_GetMapTimeLimit(IPluginContext *pContext, const cell_t *params)
 {
-	IMapTimer *pMapTimer = g_Timers.GetMapTimer();
+	IMapTimer *pMapTimer = timersys->GetMapTimer();
 
 	if (!pMapTimer)
 	{
@@ -330,7 +329,7 @@ static cell_t smn_GetMapTimeLimit(IPluginContext *pContext, const cell_t *params
 
 static cell_t smn_ExtendMapTimeLimit(IPluginContext *pContext, const cell_t *params)
 {
-	IMapTimer *pMapTimer = g_Timers.GetMapTimer();
+	IMapTimer *pMapTimer = timersys->GetMapTimer();
 
 	if (!pMapTimer)
 	{
@@ -344,12 +343,12 @@ static cell_t smn_ExtendMapTimeLimit(IPluginContext *pContext, const cell_t *par
 
 static cell_t smn_IsServerProcessing(IPluginContext *pContext, const cell_t *params)
 {
-	return (gpGlobals->frametime > 0.0f) ? 1 : 0;
+	return (*serverGlobals.frametime > 0.0f) ? 1 : 0;
 }
 
 static cell_t smn_GetTickInterval(IPluginContext *pContext, const cell_t *params)
 {
-	return sp_ftoc(gpGlobals->interval_per_tick);
+	return sp_ftoc(*serverGlobals.interval_per_tick);
 }
 
 REGISTER_NATIVES(timernatives)

core/logic/stringutil.cpp

@@ -0,0 +1,342 @@
+/**
+ * vim: set ts=4 sw=4 tw=99 et :
+ * =============================================================================
+ * 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 <string.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <sm_platform.h>
+#include "stringutil.h"
+
+// We're in logic so we don't have this from the SDK.
+#ifndef MIN
+#define MIN( a, b ) ( ( ( a ) < ( b ) ) ? ( a ) : ( b ) )
+#endif
+
+const char *stristr(const char *str, const char *substr)
+{
+	if (!*substr)
+	{
+		return ((char *)str);
+	}
+
+	char *needle = (char *)substr;
+	char *prevloc = (char *)str;
+	char *haystack = (char *)str;
+
+	while (*haystack)
+	{
+		if (tolower(*haystack) == tolower(*needle))
+		{
+			haystack++;
+			if (!*++needle)
+			{
+				return prevloc;
+			}
+		}
+		else
+		{
+			haystack = ++prevloc;
+			needle = (char *)substr;
+		}
+	}
+
+	return NULL;
+}
+
+unsigned int strncopy(char *dest, const char *src, size_t count)
+{
+	if (!count)
+	{
+		return 0;
+	}
+
+	char *start = dest;
+	while ((*src) && (--count))
+	{
+		*dest++ = *src++;
+	}
+	*dest = '\0';
+
+	return (dest - start);
+}
+
+unsigned int UTIL_ReplaceAll(char *subject, size_t maxlength, const char *search, const char *replace, bool caseSensitive)
+{
+	size_t searchLen = strlen(search);
+	size_t replaceLen = strlen(replace);
+
+	char *ptr = subject;
+	unsigned int total = 0;
+	while ((ptr = UTIL_ReplaceEx(ptr, maxlength, search, searchLen, replace, replaceLen, caseSensitive)) != NULL)
+	{
+		total++;
+		if (*ptr == '\0')
+		{
+			break;
+		}
+	}
+
+	return total;
+}
+
+/**
+ * NOTE: Do not edit this for the love of god unless you have 
+ * read the test cases and understand the code behind each one.
+ * While I don't guarantee there aren't mistakes, I do guarantee
+ * that plugins will end up relying on tiny idiosyncrasies of this
+ * function, just like they did with AMX Mod X.
+ *
+ * There are explicitly more cases than the AMX Mod X version because
+ * we're not doing a blind copy.  Each case is specifically optimized
+ * for what needs to be done.  Even better, we don't have to error on
+ * bad buffer sizes.  Instead, this function will smartly cut off the 
+ * string in a way that pushes old data out.
+ */
+char *UTIL_ReplaceEx(char *subject, size_t maxLen, const char *search, size_t searchLen, const char *replace, size_t replaceLen, bool caseSensitive)
+{
+	char *ptr = subject;
+	size_t browsed = 0;
+	size_t textLen = strlen(subject);
+
+	/* It's not possible to search or replace */
+	if (searchLen > textLen)
+	{
+		return NULL;
+	}
+
+	/* Handle the case of one byte replacement.
+	 * It's only valid in one case.
+	 */
+	if (maxLen == 1)
+	{
+		/* If the search matches and the replace length is 0, 
+		 * we can just terminate the string and be done.
+		 */
+		if ((caseSensitive ? strcmp(subject, search) : strcasecmp(subject, search)) == 0 && replaceLen == 0)
+		{
+			*subject = '\0';
+			return subject;
+		}
+		else
+		{
+			return NULL;
+		}
+	}
+
+	/* Subtract one off the maxlength so we can include the null terminator */
+	maxLen--;
+
+	while (*ptr != '\0' && (browsed <= textLen - searchLen))
+	{
+		/* See if we get a comparison */
+		if ((caseSensitive ? strncmp(ptr, search, searchLen) : strncasecmp(ptr, search, searchLen)) == 0)
+		{
+			if (replaceLen > searchLen)
+			{
+				/* First, see if we have enough space to do this operation */
+				if (maxLen - textLen < replaceLen - searchLen)
+				{
+					/* First, see if the replacement length goes out of bounds. */
+					if (browsed + replaceLen >= maxLen)
+					{
+						/* EXAMPLE CASE:
+						 * Subject: AABBBCCC
+						 * Buffer : 12 bytes
+						 * Search : BBB
+						 * Replace: DDDDDDDDDD
+						 * OUTPUT : AADDDDDDDDD
+						 * POSITION:           ^
+						 */
+						/* If it does, we'll just bound the length and do a strcpy. */
+						replaceLen = maxLen - browsed;
+						/* Note, we add one to the final result for the null terminator */
+						strncopy(ptr, replace, replaceLen+1);
+					}
+					else
+					{
+						/* EXAMPLE CASE:
+						 * Subject: AABBBCCC
+						 * Buffer : 12 bytes
+						 * Search : BBB
+						 * Replace: DDDDDDD
+						 * OUTPUT : AADDDDDDDCC
+						 * POSITION:         ^
+						 */
+						/* We're going to have some bytes left over... */
+						size_t origBytesToCopy = (textLen - (browsed + searchLen)) + 1;
+						size_t realBytesToCopy = (maxLen - (browsed + replaceLen)) + 1;
+						char *moveFrom = ptr + searchLen + (origBytesToCopy - realBytesToCopy);
+						char *moveTo = ptr + replaceLen;
+
+						/* First, move our old data out of the way. */
+						memmove(moveTo, moveFrom, realBytesToCopy);
+
+						/* Now, do our replacement. */
+						memcpy(ptr, replace, replaceLen);
+					}
+				}
+				else
+				{
+					/* EXAMPLE CASE:
+					 * Subject: AABBBCCC
+					 * Buffer : 12 bytes
+					 * Search : BBB
+					 * Replace: DDDD
+					 * OUTPUT : AADDDDCCC
+					 * POSITION:      ^
+					 */
+					/* Yes, we have enough space.  Do a normal move operation. */
+					char *moveFrom = ptr + searchLen;
+					char *moveTo = ptr + replaceLen;
+
+					/* First move our old data out of the way. */
+					size_t bytesToCopy = (textLen - (browsed + searchLen)) + 1;
+					memmove(moveTo, moveFrom, bytesToCopy);
+
+					/* Now do our replacement. */
+					memcpy(ptr, replace, replaceLen);
+				}
+			}
+			else if (replaceLen < searchLen)
+			{
+				/* EXAMPLE CASE:
+				 * Subject: AABBBCCC
+				 * Buffer : 12 bytes
+				 * Search : BBB
+				 * Replace: D
+				 * OUTPUT : AADCCC
+				 * POSITION:   ^
+				 */
+				/* If the replacement does not grow the string length, we do not
+				 * need to do any fancy checking at all.  Yay!
+				 */
+				char *moveFrom = ptr + searchLen;		/* Start after the search pointer */
+				char *moveTo = ptr + replaceLen;		/* Copy to where the replacement ends */
+
+				/* Copy our replacement in, if any */
+				if (replaceLen)
+				{
+					memcpy(ptr, replace, replaceLen);
+				}
+
+				/* Figure out how many bytes to move down, including null terminator */
+				size_t bytesToCopy = (textLen - (browsed + searchLen)) + 1;
+
+				/* Move the rest of the string down */
+				memmove(moveTo, moveFrom, bytesToCopy);
+			}
+			else
+			{
+				/* EXAMPLE CASE:
+				 * Subject: AABBBCCC
+				 * Buffer : 12 bytes
+				 * Search : BBB
+				 * Replace: DDD
+				 * OUTPUT : AADDDCCC
+				 * POSITION:     ^
+				 */
+				/* We don't have to move anything around, just do a straight copy */
+				memcpy(ptr, replace, replaceLen);
+			}
+
+			return ptr + replaceLen;
+		}
+		ptr++;
+		browsed++;
+	}
+
+	return NULL;
+}
+
+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;
+}
+
+#define PATHSEPARATOR(c) ((c) == '\\' || (c) == '/')
+
+void UTIL_StripExtension(const char *in, char *out, int outSize)
+{
+	// Find the last dot. If it's followed by a dot or a slash, then it's part of a 
+	// directory specifier like ../../somedir/./blah.
+
+	// scan backward for '.'
+	int end = strlen(in) - 1;
+	while (end > 0 && in[end] != '.' && !PATHSEPARATOR(in[end]))
+	{
+		--end;
+	}
+
+	if (end > 0 && !PATHSEPARATOR(in[end]) && end < outSize)
+	{
+		int nChars = MIN(end, outSize-1);
+		if (out != in)
+		{
+			memcpy(out, in, nChars);
+		}
+		out[nChars] = 0;
+	}
+	else
+	{
+		// nothing found
+		if (out != in)
+		{
+			strncopy(out, in, outSize);
+		}
+	}
+}

core/logic/stringutil.h

@@ -0,0 +1,46 @@
+/**
+ * vim: set ts=4 sw=4 tw=99 et :
+ * =============================================================================
+ * 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_COMMON_STRINGUTIL_H_
+#define _INCLUDE_SOURCEMOD_COMMON_STRINGUTIL_H_
+
+const char *stristr(const char *str, const char *substr);
+unsigned int strncopy(char *dest, const char *src, size_t count);
+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);
+size_t UTIL_DecodeHexString(unsigned char *buffer, size_t maxlength, const char *hexstr);
+
+void UTIL_StripExtension(const char *in, char *out, int outSize);
+
+#endif /* _INCLUDE_SOURCEMOD_COMMON_STRINGUTIL_H_ */
+

core/logic/thread/BaseWorker.cpp

@@ -124,11 +124,6 @@ void BaseWorker::AddThreadToQueue(SWThreadHandle *pHandle)
 	m_ThreadQueue.push_back(pHandle);
 }
 
-unsigned int BaseWorker::GetMaxThreadsPerFrame()
-{
-	return m_perFrame;
-}
-
 WorkerState BaseWorker::GetStatus(unsigned int *threads)
 {
 	if (threads)
@@ -140,7 +135,7 @@ WorkerState BaseWorker::GetStatus(unsigned int *threads)
 unsigned int BaseWorker::RunFrame()
 {
 	unsigned int done = 0;
-	unsigned int max = GetMaxThreadsPerFrame();
+	unsigned int max = m_perFrame;
 	SWThreadHandle *swt = NULL;
 	IThread *pThread = NULL;
 

core/logic/thread/BaseWorker.h

@@ -84,6 +84,8 @@ public:	//IWorker
 	virtual unsigned int Flush(bool flush_cancel);
 	//returns status and number of threads in queue
 	virtual WorkerState GetStatus(unsigned int *numThreads);
+	virtual void SetMaxThreadsPerFrame(unsigned int threads);
+	virtual void SetThinkTimePerFrame(unsigned int thinktime) {}
 public:	//IThreadCreator
 	virtual void MakeThread(IThread *pThread);
 	virtual IThreadHandle *MakeThread(IThread *pThread, ThreadFlags flags);
@@ -92,8 +94,6 @@ public:	//IThreadCreator
 public:	//BaseWorker
 	virtual void AddThreadToQueue(SWThreadHandle *pHandle);
 	virtual SWThreadHandle *PopThreadFromQueue();
-	virtual void SetMaxThreadsPerFrame(unsigned int threads);
-	virtual unsigned int GetMaxThreadsPerFrame();
 protected:
 	SourceHook::List<SWThreadHandle *> m_ThreadQueue;
 	unsigned int m_perFrame;

core/logic/thread/ThreadWorker.cpp

@@ -209,6 +209,11 @@ WorkerState ThreadWorker::GetStatus(unsigned int *threads)
 	return state;
 }
 
+void ThreadWorker::SetThinkTimePerFrame(unsigned int thinktime)
+{
+	m_think_time = thinktime;
+}
+
 bool ThreadWorker::Start()
 {
 	if (m_state == Worker_Invalid)

core/logic/thread/ThreadWorker.h

@@ -34,7 +34,7 @@
 
 #include "BaseWorker.h"
 
-#define DEFAULT_THINK_TIME_MS	50
+#define DEFAULT_THINK_TIME_MS	20
 
 class ThreadWorker : public BaseWorker, public IThread
 {
@@ -53,6 +53,8 @@ public:	//IWorker
 	virtual bool Stop(bool flush_cancel);
 	//returns status and number of threads in queue
 	virtual WorkerState GetStatus(unsigned int *numThreads);
+	//virtual void SetMaxThreadsPerFrame(unsigned int threads);
+	virtual void SetThinkTimePerFrame(unsigned int thinktime);
 public:	//BaseWorker
 	virtual void AddThreadToQueue(SWThreadHandle *pHandle);
 	virtual SWThreadHandle *PopThreadFromQueue();

core/logic/version.rc

@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  SM_FILE_VERSION
- PRODUCTVERSION SM_FILE_VERSION
+ FILEVERSION  SM_VERSION_FILE
+ PRODUCTVERSION SM_VERSION_FILE
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,12 +47,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "SourceMod"
             VALUE "FileDescription", "SourceMod Core Logic"
-            VALUE "FileVersion", SM_FULL_VERSION
+            VALUE "FileVersion", SM_VERSION_STRING
             VALUE "InternalName", "sourcemod"
             VALUE "LegalCopyright", "Copyright (c) 2004-2009, AlliedModders LLC"
             VALUE "OriginalFilename", "sourcemod.logic.dll"
             VALUE "ProductName", "SourceMod"
-            VALUE "ProductVersion", SM_FULL_VERSION
+            VALUE "ProductVersion", SM_VERSION_STRING
         END
     END
     BLOCK "VarFileInfo"

core/logic_bridge.cpp

@@ -2,7 +2,7 @@
  * vim: set ts=4 sw=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2009 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,12 +43,36 @@
 #include "ShareSys.h"
 #include "sm_srvcmds.h"
 #include "ForwardSys.h"
+#include "TimerSys.h"
+#include "logic_bridge.h"
+#include "DebugReporter.h"
+#include "PlayerManager.h"
+#include "AdminCache.h"
+#include "HalfLife2.h"
+#include "CoreConfig.h"
+
+#if defined _WIN32
+	#define MATCHMAKINGDS_SUFFIX	""
+	#define MATCHMAKINGDS_EXT	"dll"
+#elif defined __APPLE__
+	#define MATCHMAKINGDS_SUFFIX	""
+	#define MATCHMAKINGDS_EXT	"dylib"
+#elif defined __linux__
+#if SOURCE_ENGINE < SE_LEFT4DEAD2
+	#define MATCHMAKINGDS_SUFFIX	"_i486"
+#else
+	#define MATCHMAKINGDS_SUFFIX	""
+#endif
+	#define MATCHMAKINGDS_EXT	"so"
+#endif
 
 static ILibrary *g_pLogic = NULL;
 static LogicInitFunction logic_init_fn;
 
 IThreader *g_pThreader;
 ITextParsers *textparsers;
+sm_logic_t logicore;
+ITranslator *translator;
 
 class VEngineServer_Logic : public IVEngineServer_Logic
 {
@@ -57,10 +81,34 @@ public:
 	{
 		return engine->IsMapValid(map);
 	}
+
+	virtual void ServerCommand(const char *cmd)
+	{
+		engine->ServerCommand(cmd);
+	}
 };
 
 static VEngineServer_Logic logic_engine;
 
+class VFileSystem_Logic : public IFileSystem_Logic
+{
+public:
+	const char *FindFirstEx(const char *pWildCard, const char *pPathID, FileFindHandle_t *pHandle)
+	{
+		return filesystem->FindFirstEx(pWildCard, pPathID, pHandle);
+	}
+	const char *FindNext(FileFindHandle_t handle)
+	{
+		return filesystem->FindNext(handle);
+	}
+	void FindClose(FileFindHandle_t handle)
+	{
+		filesystem->FindClose(handle);
+	}
+};
+
+static VFileSystem_Logic logic_filesystem;
+
 static void add_natives(sp_nativeinfo_t *natives)
 {
 	g_pCoreNatives->AddNatives(natives);
@@ -80,11 +128,95 @@ static void log_error(const char *fmt, ...)
 	va_end(ap);
 }
 
+static void generate_error(IPluginContext *ctx, cell_t func_idx, int err, const char *fmt, ...)
+{
+	va_list ap;
+	
+	va_start(ap, fmt);
+	g_DbgReporter.GenerateErrorVA(ctx, func_idx, err, fmt, ap);
+	va_end(ap);
+}
+
 static const char *get_cvar_string(ConVar* cvar)
 {
 	return cvar->GetString();
 }
 
+static bool get_game_name(char *buffer, size_t maxlength)
+{
+	KeyValues *pGameInfo = new KeyValues("GameInfo");
+	if (g_HL2.KVLoadFromFile(pGameInfo, basefilesystem, "gameinfo.txt"))
+	{
+		const char *str;
+		if ((str = pGameInfo->GetString("game", NULL)) != NULL)
+		{
+			strncopy(buffer, str, maxlength);
+			return true;
+		}
+	}
+	pGameInfo->deleteThis();
+	return false;
+}
+
+static const char *get_game_description()
+{
+	return SERVER_CALL(GetGameDescription)();
+}
+
+static const char *get_source_engine_name()
+{
+#if !defined SOURCE_ENGINE
+# error "Unknown engine type"
+#endif
+#if SOURCE_ENGINE == SE_EPISODEONE
+	return "original";
+#elif SOURCE_ENGINE == SE_DARKMESSIAH
+	return "darkmessiah";
+#elif SOURCE_ENGINE == SE_ORANGEBOX
+	return "orangebox";
+#elif SOURCE_ENGINE == SE_BLOODYGOODTIME
+	return "bloodygoodtime";
+#elif SOURCE_ENGINE == SE_EYE
+	return "eye";
+#elif SOURCE_ENGINE == SE_CSS
+	return "css";
+#elif SOURCE_ENGINE == SE_HL2DM
+	return "hl2dm";
+#elif SOURCE_ENGINE == SE_DODS
+	return "dods";
+#elif SOURCE_ENGINE == SE_TF2
+	return "tf2";
+#elif SOURCE_ENGINE == SE_LEFT4DEAD
+	return "left4dead";
+#elif SOURCE_ENGINE == SE_NUCLEARDAWN
+	return "nucleardawn";
+#elif SOURCE_ENGINE == SE_LEFT4DEAD2
+	return "left4dead2";
+#elif SOURCE_ENGINE == SE_ALIENSWARM
+	return "alienswarm";
+#elif SOURCE_ENGINE == SE_PORTAL2
+	return "portal2";
+#elif SOURCE_ENGINE == SE_CSGO
+	return "csgo";
+#endif
+}
+
+static bool symbols_are_hidden()
+{
+#if (SOURCE_ENGINE == SE_CSS) || (SOURCE_ENGINE == SE_HL2DM) || (SOURCE_ENGINE == SE_DODS) || (SOURCE_ENGINE == SE_TF2) || (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_NUCLEARDAWN) || (SOURCE_ENGINE == SE_LEFT4DEAD2) || (SOURCE_ENGINE == SE_CSGO)
+	return true;
+#else
+	return false;
+#endif
+}
+
+static const char* get_core_config_value(const char* key)
+{
+	return g_CoreConfig.GetCoreConfigValue(key);
+}	
+
+static ServerGlobals serverGlobals;
+
 static sm_core_t core_bridge =
 {
 	/* Objects */
@@ -93,10 +225,15 @@ static sm_core_t core_bridge =
 	&g_SourceMod,
 	&g_LibSys,
 	reinterpret_cast<IVEngineServer*>(&logic_engine),
+	reinterpret_cast<IFileSystem*>(&logic_filesystem),
 	&g_ShareSys,
 	&g_RootMenu,
 	&g_PluginSys,
 	&g_Forwards,
+	&g_Timers,
+	&g_Players,
+	&g_Admins,
+	&g_HL2,
 	/* Functions */
 	add_natives,
 	find_convar,
@@ -105,15 +242,39 @@ static sm_core_t core_bridge =
 	log_error,
 	get_cvar_string,
 	UTIL_Format,
-	UTIL_ReplaceAll
+	generate_error,
+	gnprintf,
+	atcprintf,
+	get_game_name,
+	get_game_description,
+	get_source_engine_name,
+	symbols_are_hidden,
+	get_core_config_value,
+	&serverGlobals
 };
 
 void InitLogicBridge()
 {
-	sm_logic_t logic;
+	serverGlobals.universalTime = g_pUniversalTime;
+	serverGlobals.frametime = &gpGlobals->frametime;
+	serverGlobals.interval_per_tick = &gpGlobals->interval_per_tick;
 
 	core_bridge.core_ident = g_pCoreIdent;
-	logic_init_fn(&core_bridge, &logic);
+	core_bridge.engineFactory = (void *)g_SMAPI->GetEngineFactory(false);
+	core_bridge.serverFactory = (void *)g_SMAPI->GetServerFactory(false);
+
+	ILibrary *mmlib;
+	char path[PLATFORM_MAX_PATH];
+
+	g_LibSys.PathFormat(path, sizeof(path), "%s/bin/matchmaking_ds%s.%s", g_SMAPI->GetBaseDir(), MATCHMAKINGDS_SUFFIX, MATCHMAKINGDS_EXT);
+
+	if ((mmlib = g_LibSys.OpenLibrary(path, NULL, 0)))
+	{
+		core_bridge.matchmakingDSFactory = mmlib->GetSymbolAddress("CreateInterface");
+		mmlib->CloseLibrary();
+	}
+	
+	logic_init_fn(&core_bridge, &logicore);
 
 	/* Add SMGlobalClass instances */
 	SMGlobalClass* glob = SMGlobalClass::head;
@@ -122,10 +283,11 @@ void InitLogicBridge()
 		glob = glob->m_pGlobalClassNext;
 	}
 	assert(glob->m_pGlobalClassNext == NULL);
-	glob->m_pGlobalClassNext = logic.head;
+	glob->m_pGlobalClassNext = logicore.head;
 
-	g_pThreader = logic.threader;
-	g_pSourcePawn2->SetProfiler(logic.profiler);
+	g_pThreader = logicore.threader;
+	g_pSourcePawn2->SetProfiler(logicore.profiler);
+	translator = logicore.translator;
 }
 
 bool StartLogicBridge(char *error, size_t maxlength)

core/logic_bridge.h

@@ -31,9 +31,17 @@
 #ifndef _INCLUDE_SOURCEMOD_LOGIC_BRIDGE_H_
 #define _INCLUDE_SOURCEMOD_LOGIC_BRIDGE_H_
 
+#include "logic/intercom.h"
+
 void InitLogicBridge();
 bool StartLogicBridge(char *error, size_t maxlength);
 void ShutdownLogicBridge();
 
+struct sm_logic_t;
+
+extern sm_logic_t logicore;
+extern ITranslator *translator;
+extern IGameConfig *g_pGameConf;
+
 #endif /* _INCLUDE_SOURCEMOD_LOGIC_BRIDGE_H_ */
 

core/msvc10/sourcemod_mm.sln

@@ -0,0 +1,95 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sourcemod_mm", "sourcemod_mm.vcxproj", "{E39527CD-7CAB-4420-97CC-DA1B93B260BC}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		CrazyDebug - Alien Swarm|Win32 = CrazyDebug - Alien Swarm|Win32
+		CrazyDebug - CS GO|Win32 = CrazyDebug - CS GO|Win32
+		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 - Alien Swarm|Win32 = Debug - Alien Swarm|Win32
+		Debug - CS GO|Win32 = Debug - CS GO|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 - Alien Swarm|Win32 = Release - Alien Swarm|Win32
+		Release - CS GO|Win32 = Release - CS GO|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
+		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Alien Swarm|Win32.ActiveCfg = CrazyDebug - Alien Swarm|Win32
+		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Alien Swarm|Win32.Build.0 = CrazyDebug - Alien Swarm|Win32
+		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - CS GO|Win32.ActiveCfg = CrazyDebug - CS GO|Win32
+		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - CS GO|Win32.Build.0 = CrazyDebug - CS GO|Win32
+		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Dark Messiah|Win32.ActiveCfg = CrazyDebug - Dark Messiah|Win32
+		{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 - Alien Swarm|Win32.ActiveCfg = Debug - Alien Swarm|Win32
+		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Alien Swarm|Win32.Build.0 = Debug - Alien Swarm|Win32
+		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - CS GO|Win32.ActiveCfg = Debug - CS GO|Win32
+		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - CS GO|Win32.Build.0 = Debug - CS GO|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 - Alien Swarm|Win32.ActiveCfg = Release - Alien Swarm|Win32
+		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Alien Swarm|Win32.Build.0 = Release - Alien Swarm|Win32
+		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - CS GO|Win32.ActiveCfg = Release - CS GO|Win32
+		{E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - CS GO|Win32.Build.0 = Release - CS GO|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
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal