Update versioning for 1.5.0 release.

--HG--
extra : rebase_source : 3090e700ea04a1b2cc6a92c727e3bb58df69500d

.hgignore

@@ -24,3 +24,5 @@
 # Files generated by Windows Explorer
 (^|/)[dD]esktop\.ini$
 (^|/)[tT]humbs\.db$
+syntax: glob
+build/*

.hgtags

@@ -3,7 +3,3 @@ e6ef5ecdf8d75740ca2685a709bf321f8873bc3b sourcemod-1.1.0
 e877885fac80be71822641f7a9122cebc9812521 sourcemod-1.1.1
 b3ffa8a4511c4eadaf533fc790aa6b14f7f0c6ea sourcemod-1.1.2
 3a73bbf60f34befa9b66be03fa5974b394bb3411 sourcemod-1.2.0
-ddd707c3454c382db5db9d28148cd19227f44759 sourcemod-1.4.0
-f74e1dea2ef2c5a12b5238badc0e877106804191 sourcemod-1.4.1
-0026e1394254c392244c7b140e3075974ab5a6db sourcemod-1.4.2
-608f4c94872e3624404a1d105284163bc57fadf7 sourcemod-1.4.3

AMBuildScript

@@ -1,8 +1,31 @@
 # 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()
@@ -10,23 +33,50 @@ class SM:
 		#Build SDK info
 		self.possibleSdks = { }
 		self.possibleSdks['ep1'] =   {'sdk': 'HL2SDK',          'ext': '1.ep1',   'def': '1',
-		                         'name': 'EPISODEONE',     'platform': ['windows', 'linux']}
+		                         'name': 'EPISODEONE',     'platform': ['windows', 'linux'],
+		                         'dir': 'hl2sdk'}
 		self.possibleSdks['ep2'] =   {'sdk': 'HL2SDKOB',        'ext': '2.ep2',   'def': '3',
-		                         'name': 'ORANGEBOX',      'platform': ['windows', 'linux']}
+		                         'name': 'ORANGEBOX',      'platform': ['windows', 'linux'],
-		self.possibleSdks['ep2v'] =  {'sdk': 'HL2SDKOBVALVE',   'ext': '2.ep2v',  'def': '6',
+		                         'dir': 'hl2sdk-ob'}
-		                         'name': 'ORANGEBOXVALVE', 'platform': ['windows', 'linux', 'darwin']}
+		self.possibleSdks['css'] =   {'sdk': 'HL2SDKCSS',       'ext': '2.css',   'def': '6',
-		self.possibleSdks['l4d'] =   {'sdk': 'HL2SDKL4D',       'ext': '2.l4d',   'def': '7',
+		                         'name': 'CSS',            'platform': ['windows', 'linux', 'darwin'],
-		                         'name': 'LEFT4DEAD',      'platform': ['windows', 'linux', 'darwin']}
+		                         'dir': 'hl2sdk-css'}
-		self.possibleSdks['l4d2'] =  {'sdk': 'HL2SDKL4D2',      'ext': '2.l4d2',  'def': '8',
+		self.possibleSdks['hl2dm'] = {'sdk': 'HL2SDKHL2DM',     'ext': '2.hl2dm', 'def': '7',
-		                         'name': 'LEFT4DEAD2',     'platform': ['windows', 'linux', 'darwin']}
+		                         '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']}
+		                         'name': 'DARKMESSIAH',    'platform': ['windows'],
-		self.possibleSdks['swarm'] = {'sdk': 'HL2SDK-SWARM',    'ext': '2.swarm', 'def': '9',
+		                          'dir': 'hl2sdk-darkm'}
-		                         'name': 'ALIENSWARM',     'platform': ['windows']}
+		self.possibleSdks['swarm'] = {'sdk': 'HL2SDK-SWARM',    'ext': '2.swarm', 'def': '13',
-		self.possibleSdks['bgt'] =   {'sdk': 'HL2SDK-BGT',      'ext': '2.bgt', 'def': '4',
+		                         'name': 'ALIENSWARM',     'platform': ['windows'],
-		                         'name': 'BLOODYGOODTIME', 'platform': ['windows']}
+		                         'dir': 'hl2sdk-swarm'}
-		self.possibleSdks['eye'] =   {'sdk': 'HL2SDK-EYE',      'ext': '2.eye', 'def': '5',
+		self.possibleSdks['bgt'] =   {'sdk': 'HL2SDK-BGT',      'ext': '2.bgt',   'def': '4',
-		                         'name': 'EYE', 'platform': ['windows']}
+		                         '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 = { }
 
@@ -34,57 +84,45 @@ class SM:
 			#Detect compilers
 			self.compiler.DetectAll(AMBuild)
 			
-			#Detect variables
+			self.hasMySql = AMBuild.options.hasMySql
-			envvars = { 'MMSOURCE18':    'mmsource-1.8',
+			AMBuild.cache.CacheVariable('hasMySql', self.hasMySql)
-									'HL2SDKOBVALVE': 'hl2sdk-ob-valve',
-									'HL2SDKL4D':     'hl2sdk-l4d',
-									'HL2SDKL4D2':    'hl2sdk-l4d2',
-									'MYSQL5':        'mysql-5.0'
-			}
 
-			if AMBuild.target['platform'] != 'darwin':
+			AMBuild.cache.CacheVariable('debug', AMBuild.options.debug)
-				envvars['HL2SDK'] = 'hl2sdk'
-				envvars['HL2SDKOB'] = 'hl2sdk-ob'
 			
-			#Dark Messiah is Windows-only
+			#Environment variable paths to external headers
-			if AMBuild.target['platform'] == 'windows':
+			envvars = { 'MMSOURCE110': 'mmsource-1.10', 'MYSQL5': 'mysql-5.0' }
-				envvars['HL2SDK-DARKM'] = 'hl2sdk-darkm'
-				envvars['HL2SDK-SWARM'] = 'hl2sdk-swarm'
-				envvars['HL2SDK-BGT']   = 'hl2sdk-bgt'
-				envvars['HL2SDK-EYE']   = 'hl2sdk-eye'
 			
-			# Finds if a dict with `key` set to `value` is present on the dict of dicts `dictionary`
+			#Look for Metamod:Source and MySQL if not disabled
-			def findDictByKey(dictionary, key, value):
+			for env in envvars:
-				for index in dictionary:
+				if not self.hasMySql and env == 'MYSQL5':
-					elem = dictionary[index]
+					continue
-					if elem[key] == value:
+				path = self.ResolveEnvPath(env, envvars[env])
-						return (elem, index)
+				if path == None:
-				return None
+					raise Exception('Could not find a valid path for {0}'.format(env))
+				AMBuild.cache.CacheVariable(env, path)
 			
-			for i in envvars:
+			#Look for SDK directories
-				if i in os.environ:
+			for sdk in self.possibleSdks:
-					path = os.environ[i]
+				#Get list of SDKs to build against or 'all' or 'present'
-					if not os.path.isdir(path):
+				sdkList = AMBuild.options.sdks.split(',')
-						raise Exception('Path for {0} was not found: {1}'.format(i, path))
+				#Build against all supported SDKs?
-					elif i.startswith('HL2SDK'):
+				useAll = sdkList[0] == 'all'
-						(info, sdk) = findDictByKey(self.possibleSdks, 'sdk', i)
+				#Build against supported SDKs that exist?
+				usePresent = sdkList[0] == 'present'
+
+				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
-				else:
+						AMBuild.cache.CacheVariable(env, sdkPath)
-					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 i.startswith('HL2SDK'):
-						if head != None and head != oldhead:
-							(info, sdk) = findDictByKey(self.possibleSdks, 'sdk', i)
-							self.sdkInfo[sdk] = info
-					elif 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.')
@@ -113,14 +151,14 @@ class SM:
 				self.compiler.AddToListVar('CFLAGS', '-Wno-unused')
 				self.compiler.AddToListVar('CFLAGS', '-Wno-switch')
 				self.compiler.AddToListVar('CFLAGS', '-msse')
+				self.compiler.AddToListVar('CFLAGS', '-g3')
 				self.compiler.AddToListVar('CFLAGS', '-m32')
 				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 >= 3) or \
+				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')
@@ -173,20 +211,27 @@ class SM:
 			if AMBuild.options.debug == '1':
 				self.compiler.AddToListVar('CDEFINES', 'DEBUG')
 				self.compiler.AddToListVar('CDEFINES', '_DEBUG')
-				if self.vendor == 'gcc' or self.vendor == 'clang':
+				if self.vendor == 'msvc':
-					self.compiler.AddToListVar('CFLAGS', '-g3')
-				elif 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++')
@@ -220,12 +265,13 @@ class SM:
 			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()
@@ -259,6 +305,10 @@ class SM:
 		else:
 			return
 
+	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]
 		sdkPath = AMBuild.cache[info['sdk']]
@@ -268,18 +318,31 @@ class SM:
 			else:
 				staticLibs = os.path.join(sdkPath, 'lib', 'linux')
 			workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
-			if sdk in ['ep2v', 'l4d', 'l4d2']:
+			if sdk in ['css', 'hl2dm', 'dods', 'tf2', 'l4d2']:
-				for i in ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.so', 'libtier0.so']:
+				libs = ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib_srv.so', 'libtier0_srv.so']
-					link = os.path.join(workFolder, i)
+				for lib in libs:
-					target = os.path.join(staticLibs, i)
+					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']:
+				libs = ['tier1_i486.a', 'mathlib_i486.a', 'vstdlib_i486.so', 'tier0_i486.so']
-					link = os.path.join(workFolder, i)
+				for lib in libs:
-					target = os.path.join(staticLibs, i)
+					link = os.path.join(workFolder, lib)
+					target = os.path.join(staticLibs, lib)
 					try:
 						os.lstat(link)
 					except:
@@ -287,16 +350,19 @@ class SM:
 		elif AMBuild.target['platform'] == 'darwin':
 			staticLibs = os.path.join(sdkPath, 'lib', 'mac')
 			workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
-			for i in ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.dylib', 'libtier0.dylib']:
+			libs = ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.dylib', 'libtier0.dylib']
-				link = os.path.join(workFolder, i)
+			if sdk == 'csgo':
-				target = os.path.join(staticLibs, i)
+				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':
 			libs = ['tier0', 'tier1', 'vstdlib', 'mathlib']
-			if sdk == 'swarm':
+			if sdk in ['swarm', 'csgo']:
 				libs.append('interfaces')
 			for lib in libs:
 				libPath = os.path.join(sdkPath, 'lib', 'public', lib) + '.lib'
@@ -306,6 +372,8 @@ class SM:
 	def PostSetupHL2Job(self, job, builder, sdk):
 		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)
@@ -320,6 +388,10 @@ class SM:
 		info = self.possibleSdks
 		compiler['CDEFINES'].extend(['SE_' + info[i]['name'] + '=' + info[i]['def'] for i in info])
 				
+		# 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']]
 		if sdk == 'ep1' or sdk == 'darkm':
@@ -336,8 +408,11 @@ class SM:
 
 		compiler['CDEFINES'].append('SOURCE_ENGINE=' + info['def'])
 
-		if sdk == 'swarm' and AMBuild.target['platform'] == 'windows':
+		if sdk in ['swarm','csgo']:
-			compiler['CDEFINES'].extend(['COMPILER_MSVC', 'COMPILER_MSVC32'])
+			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':
@@ -354,7 +429,10 @@ class SM:
 		if not noLink:
 			if AMBuild.target['platform'] == 'linux':
 				compiler['POSTLINKFLAGS'][0:0] = ['-lm']
-				if sdk in ['ep2v', 'l4d', 'l4d2']:
+				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:
@@ -366,6 +444,22 @@ class SM:
 
 		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 = {
 	'SM': sm
@@ -383,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'],
@@ -392,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)
 

changelog.txt

@@ -1,5 +1,144 @@
 SourceMod Changelog
 
+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]

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"
 }

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,5 +1,6 @@
 # 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]
@@ -10,9 +11,38 @@ for i in SM.sdkInfo:
 
 	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',
@@ -49,7 +79,6 @@ for i in SM.sdkInfo:
 		'CoreConfig.cpp',
 		'Logger.cpp',
 		'PluginInfoDatabase.cpp',
-		'smn_bitbuffer.cpp',
 		'smn_halflife.cpp',
 		'PluginSys.cpp',
 		'smn_console.cpp',
@@ -71,8 +100,29 @@ for i in SM.sdkInfo:
 		'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/ChatTriggers.cpp

@@ -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,6 +113,8 @@ 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()
@@ -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;
+	int client = g_ConCmds.GetCommandClient();
-	CPlayer *pPlayer;
-	
-	client = g_ConCmds.GetCommandClient();
 	m_bIsChatTrigger = false;
 	m_bWasFloodedMessage = false;
-
+	m_bPluginIgnored = 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);
-	}
 
 	const char *args = command.ArgS();
 	
@@ -184,6 +215,31 @@ 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))
 	{
@@ -211,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;
 
@@ -227,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;
+		m_bIsChatTrigger = true;
-		if (is_silent 
+
-			&& g_bSupressSilentFails 
+		/**
-			&& client != 0
+		 * We'll execute it in post.
-			&& (pPlayer = g_Players.GetPlayerByIndex(client)) != NULL
+		 */
-			&& pPlayer->GetAdminId() != INVALID_ADMIN_ID)
+		m_bWillProcessInPost = true;
-		{
-			RETURN_META(MRES_SUPERCEDE);
-		}
-		RETURN_META(MRES_IGNORED);
 	}
 
-	m_bIsChatTrigger = true;
+	cell_t res = CallOnClientSayCommand(client);
 
-	/**
+	if (res >= Pl_Handled)
-	 * We'll execute it in post.
+	{
-	 */
+		m_bPluginIgnored = (res >= Pl_Stop);
-	m_bWillProcessInPost = true;
+		RETURN_META(MRES_SUPERCEDE);
-	m_bTriggerWasSilent = is_silent;
+	}
 
-	/* If we're silent, block */
+	if (is_silent && (m_bIsChatTrigger || (g_bSupressSilentFails && pPlayer->GetAdminId() != INVALID_ADMIN_ID)))
-	if (is_silent)
 	{
 		RETURN_META(MRES_SUPERCEDE);
 	}
@@ -273,19 +326,33 @@ void ChatTriggers::OnSayCommand_Post(const CCommand &command)
 void ChatTriggers::OnSayCommand_Post()
 #endif
 {
-	m_bIsChatTrigger = false;
+	int client = g_ConCmds.GetCommandClient();
-	m_bWasFloodedMessage = false;
+
 	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)
@@ -362,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

@@ -559,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,
@@ -658,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;
@@ -803,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)
 	{
@@ -837,7 +797,6 @@ void ConCmdManager::UpdateAdminCmdFlags(const char *cmd, OverrideType type, Flag
 				}
 			}
 		}
-		pInfo->is_admin_set = true;
 	}
 }
 
@@ -905,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)
@@ -942,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);
@@ -995,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,7 +88,6 @@ 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;
@@ -119,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,

core/ConsoleDetours.cpp

@@ -688,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/ExtensionSys.cpp

@@ -66,6 +66,8 @@ 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
@@ -74,10 +76,20 @@ CRemoteExtension::CRemoteExtension(IExtensionInterface *pAPI, const char *filena
 #define GAMEFIX "2.bgt"
 #elif SOURCE_ENGINE == SE_EYE
 #define GAMEFIX "2.eye"
-#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE
+#elif SOURCE_ENGINE == SE_CSS
-#define GAMEFIX "2.ep2v"
+#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)
@@ -110,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, 
@@ -117,10 +154,10 @@ CLocalExtension::CLocalExtension(const char *filename)
 		"extensions/auto." GAMEFIX "/%s." PLATFORM_LIB_EXT,
 		filename);
 
-normal:
 	/* Try the "normal" version */
 	if (!g_LibSys.IsPathFile(path))
 	{
+		normal:
 		g_SourceMod.BuildPath(Path_SM,
 			path,
 			PLATFORM_MAX_PATH,
@@ -799,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);
@@ -822,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 */
@@ -893,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;
 
@@ -1395,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/HalfLife2.cpp

@@ -40,6 +40,11 @@
 #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)();
@@ -51,7 +56,10 @@ typedef ICommandLine *(*FakeGetCommandLine)();
 #define TIER0_NAME			"libtier0.dylib"
 #define VSTDLIB_NAME		"libvstdlib.dylib"
 #elif defined __linux__
-#if SOURCE_ENGINE == SE_ORANGEBOXVALVE || SOURCE_ENGINE == SE_LEFT4DEAD || SOURCE_ENGINE == SE_LEFT4DEAD2
+#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
@@ -329,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++)
@@ -345,10 +358,21 @@ typedescription_t *UTIL_FindInDataMap(datamap_t *pMap, const char *name)
 			}
 			if (pMap->dataDesc[i].td)
 			{
-				typedescription_t *_td;
+				if (isNested)
-				if ((_td=UTIL_FindInDataMap(pMap->dataDesc[i].td, name)) != NULL)
 				{
-					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;
+					}
 				}
 			}
 		}
@@ -441,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];
@@ -451,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);
 		}
@@ -483,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)
@@ -496,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;
 			}
@@ -504,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();
 
@@ -511,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();
 
@@ -526,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;
 	}
@@ -540,6 +609,7 @@ bool CHalfLife2::HintTextMsg(int client, const char *msg)
 		pBitBuf->WriteByte(1);
 	}
 	pBitBuf->WriteString(msg);
+#endif
 	g_UserMsgs.EndMessage();
 
 	return true;
@@ -547,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;
 	}
@@ -560,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;
@@ -567,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)
 	{
@@ -588,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);
@@ -597,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;
@@ -728,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;
@@ -971,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));
@@ -1009,3 +1125,82 @@ 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

@@ -45,6 +45,9 @@
 #include <datamap.h>
 #include <ihandleentity.h>
 #include <tier0/icommandline.h>
+#if SOURCE_ENGINE >= SE_PORTAL2
+#include <string_t.h>
+#endif
 
 class CCommand;
 
@@ -88,6 +91,7 @@ struct DelayedKickInfo
 	char buffer[384];
 };
 
+// copy from game/shared/entitylist_base.h
 class CEntInfo
 {
 public:
@@ -95,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 : 
@@ -115,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);
@@ -138,6 +147,9 @@ public: //IGameHelpers
 	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();

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;
@@ -659,6 +660,14 @@ void HandleSystem::GetHandleUnchecked(Handle_t hndl, QHandle *& pHandle, unsigne
 
 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)
@@ -673,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 */
@@ -681,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 */
@@ -727,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);
 }
 
@@ -793,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.
 	*/
@@ -917,29 +929,9 @@ bool HandleSystem::RemoveType(HandleType_t type, IdentityToken_t *ident)
 			{
 				continue;
 			}
-			if (pHandle->clone)
+
-			{
+			FreeHandle(pHandle, i);
-				/* 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);
-				}
-			}
 			if (pType->opened == 0)
 			{
 				break;
@@ -993,12 +985,11 @@ bool HandleSystem::InitAccessDefaults(TypeAccess *pTypeAccess, HandleAccess *pHa
 
 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();
@@ -1027,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)
@@ -1095,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/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);
 	}
 }
@@ -362,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

@@ -4,9 +4,11 @@
 SMSDK = ..
 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
+HL2SDK_CSGO = ../../hl2sdk-csgo
 MMSOURCE = ../../mmsource-central
 
 #####################################
@@ -22,8 +24,8 @@ OBJECTS = AdminCache.cpp CDataPack.cpp ConCmdManager.cpp ConVarManager.cpp CoreC
 	frame_hooks.cpp concmd_cleaner.cpp NextMap.cpp \
 	NativeOwner.cpp logic_bridge.cpp ConsoleDetours.cpp
 OBJECTS += smn_bitbuffer.cpp smn_console.cpp smn_core.cpp \
-	smn_entities.cpp smn_events.cpp smn_fakenatives.cpp \
+	smn_database.cpp smn_entities.cpp smn_events.cpp \
-	smn_filesystem.cpp smn_halflife.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
@@ -48,7 +50,7 @@ CPP = gcc
 
 override ENGSET = false
 
-ifneq (,$(filter original orangebox orangeboxvalve left4dead left4dead2,$(ENGINE)))
+ifneq (,$(filter original orangebox css orangeboxvalve left4dead left4dead2 csgo,$(ENGINE)))
 	override ENGSET = true
 endif
 
@@ -68,19 +70,26 @@ ifeq "$(ENGINE)" "orangebox"
 	INCLUDE += -I$(HL2SDK)/public/game/server
 	BINARY = sourcemod.2.ep2.so
 endif
-ifeq "$(ENGINE)" "orangeboxvalve"
+ifeq "$(ENGINE)" "css"
-	HL2SDK = $(HL2SDK_OB_VALVE)
+	HL2SDK = $(HL2SDK_CSS)
 	HL2LIB = $(HL2SDK)/lib/linux
 	CFLAGS += -DSOURCE_ENGINE=6
 	METAMOD = $(MMSOURCE)/core
 	INCLUDE += -I$(HL2SDK)/public/game/server 
-#-I$(HL2SDK)/common
+	BINARY = sourcemod.2.css.so
+endif
+ifeq "$(ENGINE)" "orangeboxvalve"
+	HL2SDK = $(HL2SDK_OB_VALVE)
+	HL2LIB = $(HL2SDK)/lib/linux
+	CFLAGS += -DSOURCE_ENGINE=7
+	METAMOD = $(MMSOURCE)/core
+	INCLUDE += -I$(HL2SDK)/public/game/server 
 	BINARY = sourcemod.2.ep2v.so
 endif
 ifeq "$(ENGINE)" "left4dead"
 	HL2SDK = $(HL2SDK_L4D)
 	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=7
+	CFLAGS += -DSOURCE_ENGINE=8
 	METAMOD = $(MMSOURCE)/core
 	INCLUDE += -I$(HL2SDK)/public/game/server
 	BINARY = sourcemod.2.l4d.so
@@ -88,11 +97,19 @@ endif
 ifeq "$(ENGINE)" "left4dead2"
 	HL2SDK = $(HL2SDK_L4D2)
 	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=8
+	CFLAGS += -DSOURCE_ENGINE=9
 	METAMOD = $(MMSOURCE)/core
 	INCLUDE += -I$(HL2SDK)/public/game/server
 	BINARY = sourcemod.2.l4d2.so
 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
 
 HL2PUB = $(HL2SDK)/public
 
@@ -114,23 +131,37 @@ ifneq (,$(filter original orangebox left4dead,$(ENGINE)))
 	LIB_SUFFIX = _i486.$(LIB_EXT)
 else
 	LIB_PREFIX = lib
-	LIB_SUFFIX = .$(LIB_EXT)
+	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_ORANGEBOXVALVE=6 -DSE_LEFT4DEAD=7 -DSE_LEFT4DEAD2=8 -DSE_ALIENSWARM=9
+	-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
+	-Wno-uninitialized -Wno-unused -Wno-switch -mfpmath=sse -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H \
-CPPFLAGS += -Wno-non-virtual-dtor -fno-exceptions -fno-rtti
+	-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 ###
@@ -168,7 +199,7 @@ all: check
 check:
 	if [ "$(ENGSET)" = "false" ]; then \
 		echo "You must supply one of the following values for ENGINE:"; \
-		echo "left4dead2, left4dead, orangeboxvalve, orangebox, or original"; \
+		echo "csgo, left4dead2, left4dead, orangeboxvalve, css, orangebox, or original"; \
 		exit 1; \
 	fi
 

core/MenuStyle_Base.cpp

@@ -322,16 +322,22 @@ 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_ORANGEBOXVALVE
+#if SOURCE_ENGINE == SE_CSS || SOURCE_ENGINE == SE_HL2DM || SOURCE_ENGINE == SE_DODS || SOURCE_ENGINE == SE_TF2
 							0,
 #endif
 							&pos);

core/MenuStyle_Radio.cpp

@@ -39,12 +39,28 @@
 #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;
 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];
@@ -90,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);
 
@@ -135,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;
 
@@ -189,7 +226,7 @@ IBaseMenu *CRadioStyle::CreateMenu(IMenuHandler *pHandler, IdentityToken_t *pOwn
 
 unsigned int CRadioStyle::GetMaxPageItems()
 {
-	return 10;
+	return s_RadioMaxPageItems;
 }
 
 const char *CRadioStyle::GetStyleName()
@@ -307,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;
 	}
@@ -343,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;
 	}
@@ -452,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)
@@ -459,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 );
@@ -476,6 +523,7 @@ void CRadioMenuPlayer::Radio_Refresh()
 			break;
 		}
 	}
+#endif
 
 	display_last_refresh = gpGlobals->curtime;
 }
@@ -511,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)
@@ -551,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/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);
 	}

core/PlayerManager.cpp

@@ -116,6 +116,8 @@ PlayerManager::PlayerManager()
 	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));
 }
@@ -229,6 +231,17 @@ 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;
 }
@@ -236,7 +249,7 @@ ConfigResult PlayerManager::OnSourceModConfigChanged(const char *key,
 void PlayerManager::OnServerActivate(edict_t *pEdictList, int edictCount, int clientMax)
 {
 	static ConVar *tv_enable = icvar->FindVar("tv_enable");
-#if SOURCE_ENGINE == SE_ORANGEBOXVALVE
+#if SOURCE_ENGINE == SE_TF2
 	static ConVar *replay_enable = icvar->FindVar("replay_enable");
 #endif
 
@@ -246,7 +259,7 @@ void PlayerManager::OnServerActivate(edict_t *pEdictList, int edictCount, int cl
 	ICommandLine *commandLine = g_HL2.GetValveCommandLine();
 	m_bIsSourceTVActive = (tv_enable && tv_enable->GetBool() && (!commandLine || commandLine->FindParm("-nohltv") == 0));
 	m_bIsReplayActive = false;
-#if SOURCE_ENGINE == SE_ORANGEBOXVALVE
+#if SOURCE_ENGINE == SE_TF2
 	m_bIsReplayActive = (replay_enable && replay_enable->GetBool());
 #endif
 	m_PlayersSinceActive = 0;
@@ -354,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];
@@ -451,7 +471,7 @@ 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);
 		}
 	}
 
@@ -533,7 +553,8 @@ 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;
 
 		/*
@@ -544,15 +565,34 @@ void PlayerManager::OnClientPutInServer(edict_t *pEntity, const char *playername
 		 * 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_ORANGEBOXVALVE
+		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 || strcmp(playername, "Replay") == 0))
+			&& (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;
@@ -562,7 +602,15 @@ void PlayerManager::OnClientPutInServer(edict_t *pEntity, const char *playername
 		if (m_bIsSourceTVActive
 			&& ((!m_bIsReplayActive && newCount == 1)
 				|| (m_bIsReplayActive && newCount == 2))
-			&& (m_SourceTVUserId == userId || strcmp(playername, "SourceTV") == 0)
+			&& (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;
@@ -752,21 +800,23 @@ void PlayerManager::OnClientCommand(edict_t *pEntity)
 		}
 		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:");
+				" Borja \"faluco\" Ferrer, Pavol \"PM OnoTo\" Marko");
-			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");
 			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,
@@ -863,8 +913,7 @@ void PlayerManager::OnClientSettingsChanged(edict_t *pEntity)
 	const char *networkid_force;
 	if ((networkid_force = engine->GetClientConVarValue(client, "networkid_force")) && networkid_force[0] != '\0')
 	{
-		unsigned long long *steamId = (unsigned long long *)engine->GetClientSteamID(pEntity);
+		unsigned int accountId = pPlayer->GetSteamAccountID();
-		unsigned int accountId = steamId ? (*steamId & 0xFFFFFFFF) : 0;
 		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());
 
@@ -880,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) {
@@ -1208,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)
@@ -1322,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);
@@ -1525,6 +1577,7 @@ CPlayer::CPlayer()
 	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)
@@ -1570,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);
@@ -1599,6 +1657,7 @@ void CPlayer::Disconnect()
 	m_bIsSourceTV = false;
 	m_bIsReplay = false;
 	m_Serial.value = -1;
+	m_SteamAccountID = 0;
 }
 
 void CPlayer::SetName(const char *name)
@@ -1621,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;
@@ -1651,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())

core/PlayerManager.h

@@ -69,7 +69,8 @@ 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();
@@ -99,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;
@@ -124,6 +127,7 @@ private:
 	bool m_bIsSourceTV;
 	bool m_bIsReplay;
 	serial_t m_Serial;
+	unsigned int m_SteamAccountID;
 };
 
 class PlayerManager : 
@@ -217,6 +221,7 @@ private:
 	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;

core/PluginSys.cpp

@@ -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()
@@ -1031,6 +1033,41 @@ LoadRes CPluginManager::_LoadPlugin(CPlugin **_plugin, const char *path, bool de
 		}
 	}
 	
+	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());
+				}
+			}
+		}
+	}
+
 	LoadRes loadFailure = LoadRes_Failure;
 	/* Get the status */
 	if (pPlugin->GetStatus() == Plugin_Created)
@@ -1129,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",
@@ -1458,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? */
@@ -1560,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;
@@ -1568,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();
@@ -1876,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()
@@ -1887,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)
@@ -2269,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
 			{
@@ -2483,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;
+	switch (action)
-
-	struct _pl
 	{
-		cell_t name;
+	case LibraryAction_Removed:
-		cell_t file;
+		m_pOnLibraryRemoved->PushString(lib);
-		cell_t required;
+		m_pOnLibraryRemoved->Execute(NULL);
-	} *plc;
+		break;
-
+	case LibraryAction_Added:
-	struct _ext
+		m_pOnLibraryAdded->PushString(lib);
-	{
+		m_pOnLibraryAdded->Execute(NULL);
-		cell_t name;
+		break;
-		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);
-			}
-		}
 	}
 }
 

core/PluginSys.h

@@ -47,16 +47,17 @@
 #include "sm_trie.h"
 #include "sourcemod.h"
 #include <IRootConsoleMenu.h>
-#if SOURCE_ENGINE == SE_ALIENSWARM
+#if SOURCE_ENGINE >= SE_ALIENSWARM
 #include "convar_sm_swarm.h"
-#elif (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
+#elif SOURCE_ENGINE >= SE_LEFT4DEAD
 #include "convar_sm_l4d.h"
-#elif (SOURCE_ENGINE == SE_ORANGEBOX) || (SOURCE_ENGINE == SE_BLOODYGOODTIME) || (SOURCE_ENGINE == SE_EYE) || (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"
 
@@ -130,6 +131,12 @@ enum APLRes
 	APLRes_SilentFailure
 };
 
+enum LibraryAction
+{
+	LibraryAction_Removed,
+	LibraryAction_Added
+};
+
 struct AutoConfig
 {
 	String autocfg;
@@ -249,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();
@@ -326,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);
@@ -401,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);
 
@@ -470,6 +478,13 @@ private:
 	List<FakeNative *> m_Natives;
 
 	bool m_LoadingLocked;
+	
+	// Config
+	bool m_bBlockBadPlugins;
+	
+	// Forwards
+	IForward *m_pOnLibraryAdded;
+	IForward *m_pOnLibraryRemoved;
 };
 
 extern CPluginManager g_PluginSys;

core/UserMessages.cpp

@@ -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_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)
@@ -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
+#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
+#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,8 +745,10 @@ 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
 		engine_bfw = ENGINE_CALL(UserMessageBegin)(m_CurRecFilter, m_CurId, g_SMAPI->GetUserMessage(m_CurId));
 #else
@@ -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);
+#if SOURCE_ENGINE == SE_CSGO
-		pInfo->IsHooked = true;
+		int size = m_OrigBuffer->ByteSize();
-		pInfo->Callback->OnUserMessage(m_CurId, m_OrigBuffer, m_CurRecFilter);
+		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);
+			pInfo = (*iter);
-			m_FreeListeners.push(pInfo);
+			pInfo->IsHooked = true;
-			_DecRefCounter();
+			pInfo->Callback->OnUserMessage(m_CurId, pTempMsg, m_CurRecFilter);
-			continue;
+
+			if (pInfo->KillMe)
+			{
+				iter = pList->erase(iter);
+				m_FreeListeners.push(pInfo);
+				_DecRefCounter();
+				continue;
+			}
+
+			pInfo->IsHooked = false;
+			iter++;
 		}
 
-		pInfo->IsHooked = false;
+#if SOURCE_ENGINE == SE_CSGO
-		iter++;
+		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

@@ -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
+#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);
+#ifdef USE_PROTOBUF_USERMESSAGES
-	bool InternalUnhook(int msg_id, IUserMessageListener *pListener, bool intercept, bool isNew);
+	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

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

core/convar_sm_swarm.h

@@ -20,7 +20,7 @@
 #include "tier1/iconvar.h"
 #include "tier1/utlvector.h"
 #include "tier1/utlstring.h"
-#include "color.h"
+#include "Color.h"
 #include "icvar.h"
 
 #ifdef _WIN32
@@ -381,8 +381,14 @@ public:
 	FnChangeCallback_t GetChangeCallback( int slot ) const { return m_pParent->m_fnChangeCallbacks[ slot ]; }
 
 	// Retrieve value
+#if SOURCE_ENGINE == SE_CSGO
+	virtual float					GetFloat( void ) const;
+	virtual int						GetInt( void ) const;
+#else
 	FORCEINLINE_CVAR float			GetFloat( void ) const;
 	FORCEINLINE_CVAR int			GetInt( void ) const;
+#endif
+
 	FORCEINLINE_CVAR Color			GetColor( void ) const;
 	FORCEINLINE_CVAR bool			GetBool() const {  return !!GetInt(); }
 	FORCEINLINE_CVAR char const	   *GetString( void ) const;
@@ -895,7 +901,9 @@ void ConVar_PrintDescription( const ConCommandBase *pVar );
 //-----------------------------------------------------------------------------
 // Purpose: Utility class to quickly allow ConCommands to call member methods
 //-----------------------------------------------------------------------------
+#ifdef _WIN32
 #pragma warning (disable : 4355 )
+#endif
 
 template< class T >
 class CConCommandMemberAccessor : public ConCommand, public ICommandCallback, public ICommandCompletionCallback
@@ -942,7 +950,9 @@ private:
 	FnMemberCommandCompletionCallback_t m_CompletionFunc;
 };
 
+#ifdef _WIN32
 #pragma warning ( default : 4355 )
+#endif
 
 
 //-----------------------------------------------------------------------------

core/logic/AMBuilder

@@ -13,6 +13,7 @@ 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')
@@ -55,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/GameConfigs.cpp

@@ -54,6 +54,7 @@ IGameConfig *g_pGameConf = NULL;
 static char g_Game[256];
 static char g_GameDesc[256] = {'!', '\0'};
 static char g_GameName[256] = {'$', '\0'};
+static const char *g_pParseEngine = NULL;
 
 #define PSTATE_NONE						0
 #define PSTATE_GAMES					1
@@ -112,10 +113,10 @@ static bool DoesGameMatch(const char *value)
 
 static bool DoesEngineMatch(const char *value)
 {
-	return strcmp(value, smcore.GetSourceEngineName()) == 0;
+	return strcmp(value, g_pParseEngine) == 0;
 }
 
-CGameConfig::CGameConfig(const char *file)
+CGameConfig::CGameConfig(const char *file, const char *engine)
 {
 	strncopy(m_File, file, sizeof(m_File));
 	m_pAddresses = new KTrie<AddressConf>();
@@ -124,6 +125,18 @@ CGameConfig::CGameConfig(const char *file)
 
 	m_CustomLevel = 0;
 	m_CustomHandler = NULL;
+
+	if (!engine)
+		m_pEngine = smcore.GetSourceEngineName();
+	else
+		m_pEngine = engine;
+
+	if (strcmp(m_pEngine, "css") == 0 || strcmp(m_pEngine, "dods") == 0 || strcmp(m_pEngine, "hl2dm") == 0 || strcmp(m_pEngine, "tf2") == 0)
+		this->SetBaseEngine("orangebox_valve");
+	else if (strcmp(m_pEngine, "nucleardawn") == 0)
+		this->SetBaseEngine("left4dead2");
+	else
+		this->SetBaseEngine(NULL);
 }
 
 CGameConfig::~CGameConfig()
@@ -525,9 +538,16 @@ SMCResult CGameConfig::ReadSMC_LeavingSection(const SMCStates *states)
 					s_TempSig.library, 
 					m_CurFile);
 			} else {
-#if defined PLATFORM_POSIX
 				if (s_TempSig.sig[0] == '@')
 				{
+#if defined PLATFORM_WINDOWS
+					MEMORY_BASIC_INFORMATION mem;
+
+					if (VirtualQuery(addrInBase, &mem, sizeof(mem)))
+						final_addr = g_MemUtils.ResolveSymbol(mem.AllocationBase, &s_TempSig.sig[1]);
+					else
+						smcore.LogError("[SM] Unable to find library \"%s\" in memory (gameconf \"%s\")", s_TempSig.library, m_File);
+#elif defined PLATFORM_POSIX
 					Dl_info info;
 					/* GNU only: returns 0 on error, inconsistent! >:[ */
 					if (dladdr(addrInBase, &info) != 0)
@@ -550,12 +570,12 @@ SMCResult CGameConfig::ReadSMC_LeavingSection(const SMCStates *states)
 							s_TempSig.library,
 							m_File);
 					}
+#endif
 				}
 				if (final_addr)
 				{
 					goto skip_find;
 				}
-#endif
 				/* First, preprocess the signature */
 				unsigned char real_sig[511];
 				size_t real_bytes;
@@ -572,9 +592,7 @@ SMCResult CGameConfig::ReadSMC_LeavingSection(const SMCStates *states)
 				}
 			}
 
-#if defined PLATFORM_POSIX
 skip_find:
-#endif
 			m_Sigs.replace(m_offset, final_addr);
 			m_ParseState = PSTATE_GAMEDEFS_SIGNATURES;
 
@@ -767,19 +785,29 @@ bool CGameConfig::Reparse(char *error, size_t maxlength)
 	SMCStates state = {0, 0};
 	List<String> fileList;
 	master_reader.fileList = &fileList;
+	const char *pEngine[2] = { m_pBaseEngine, m_pEngine  };
 
-	err = textparsers->ParseSMCFile(path, &master_reader, &state, error, maxlength);
+	for (unsigned char iter = 0; iter < SM_ARRAYSIZE(pEngine); ++iter)
-	if (err != SMCError_Okay)
 	{
-		const char *msg = textparsers->GetSMCErrorString(err);
+		if (pEngine[iter] == NULL)
+		{
+			continue;
+		}
 
-		smcore.LogError("[SM] Error parsing master gameconf file \"%s\":", path);
+		this->SetParseEngine(pEngine[iter]);
-		smcore.LogError("[SM] Error %d on line %d, col %d: %s", 
+		err = textparsers->ParseSMCFile(path, &master_reader, &state, error, maxlength);
-			err,
+		if (err != SMCError_Okay)
-			state.line,
+		{
-			state.col,
+			const char *msg = textparsers->GetSMCErrorString(err);
-			msg ? msg : "Unknown error");
+
-		return false;
+			smcore.LogError("[SM] Error parsing master gameconf file \"%s\":", path);
+			smcore.LogError("[SM] Error %d on line %d, col %d: %s", 
+				err,
+				state.line,
+				state.col,
+				msg ? msg : "Unknown error");
+			return false;
+		}
 	}
 
 	/* Go through each file we found and parse it. */
@@ -845,35 +873,53 @@ bool CGameConfig::EnterFile(const char *file, char *error, size_t maxlength)
 	m_IgnoreLevel = 0;
 	bShouldBeReadingDefault = true;
 	m_ParseState = PSTATE_NONE;
+	const char *pEngine[2] = { m_pBaseEngine, m_pEngine };
 
-	if ((err=textparsers->ParseSMCFile(m_CurFile, this, &state, error, maxlength))
+	for (unsigned char iter = 0; iter < SM_ARRAYSIZE(pEngine); ++iter)
-		!= SMCError_Okay)
 	{
-		const char *msg;
+		if (pEngine[iter] == NULL)
-
-		msg = textparsers->GetSMCErrorString(err);
-
-		smcore.LogError("[SM] Error parsing gameconfig file \"%s\":", m_CurFile);
-		smcore.LogError("[SM] Error %d on line %d, col %d: %s", 
-			err,
-			state.line,
-			state.col,
-			msg ? msg : "Unknown error");
-
-		if (m_ParseState == PSTATE_GAMEDEFS_CUSTOM)
 		{
-			//error occurred while parsing a custom section
+			continue;
-			m_CustomHandler->ReadSMC_ParseEnd(true, true);
-			m_CustomHandler = NULL;
-			m_CustomLevel = 0;
 		}
 
-		return false;
+		this->SetParseEngine(pEngine[iter]);
+		if ((err=textparsers->ParseSMCFile(m_CurFile, this, &state, error, maxlength))
+			!= SMCError_Okay)
+		{
+			const char *msg = textparsers->GetSMCErrorString(err);
+
+			smcore.LogError("[SM] Error parsing gameconfig file \"%s\":", m_CurFile);
+			smcore.LogError("[SM] Error %d on line %d, col %d: %s", 
+				err,
+				state.line,
+				state.col,
+				msg ? msg : "Unknown error");
+
+			if (m_ParseState == PSTATE_GAMEDEFS_CUSTOM)
+			{
+				//error occurred while parsing a custom section
+				m_CustomHandler->ReadSMC_ParseEnd(true, true);
+				m_CustomHandler = NULL;
+				m_CustomLevel = 0;
+			}
+
+			return false;
+		}
 	}
 
 	return true;
 }
 
+void CGameConfig::SetBaseEngine(const char *engine)
+{
+	m_pBaseEngine = engine;
+}
+
+void CGameConfig::SetParseEngine(const char *engine)
+{
+	g_pParseEngine = engine;
+}
+
 bool CGameConfig::GetOffset(const char *key, int *value)
 {
 	int *pvalue;

core/logic/GameConfigs.h

@@ -50,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);
@@ -111,6 +113,8 @@ private:
 	int m_AddressReadCount;
 	int m_AddressRead[8];
 	KTrie<AddressConf> *m_pAddresses;
+	const char *m_pEngine;
+	const char *m_pBaseEngine;
 };
 
 class GameConfigManager : 

core/logic/Makefile

@@ -40,7 +40,8 @@ OBJECTS = \
 	smn_datapacks.cpp	\
 	smn_gameconfigs.cpp	\
 	GameConfigs.cpp		\
-	smn_players.cpp
+	smn_players.cpp 	\
+	smn_profiler.cpp
 
 ##############################################
 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###

core/logic/MemoryUtils.cpp

@@ -116,7 +116,7 @@ void *MemoryUtils::FindPattern(const void *libPtr, const char *pattern, size_t l
 	}
 
 	ptr = reinterpret_cast<char *>(lib.baseAddress);
-	end = ptr + lib.memorySize - 1;
+	end = ptr + lib.memorySize - len;
 
 	while (ptr < end)
 	{

core/logic/Translator.h

@@ -119,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);
@@ -146,6 +145,7 @@ 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:

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 - 17)
+#define SM_LOGIC_MAGIC		(0x0F47C0DE - 18)
 
 #if defined SM_LOGIC
 class IVEngineServer
@@ -55,6 +55,20 @@ public:
 	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
 {
 	class ISourceMod;
@@ -74,6 +88,7 @@ namespace SourceMod
 }
 
 class IVEngineServer;
+class IFileSystem;
 class ConVar;
 
 struct ServerGlobals
@@ -91,6 +106,7 @@ struct sm_core_t
 	ISourceMod		*sm;
 	ILibrarySys		*libsys;
 	IVEngineServer	*engine;
+	IFileSystem		*filesystem;
 	IShareSys		*sharesys;
 	IRootConsole	*rootmenu;
 	IPluginManager	*pluginsys;

core/logic/msvc10/logic.vcxproj

@@ -43,11 +43,13 @@
     <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>..;$(MMSOURCE18)\core\sourcehook;..\..\..\public;..\..\..\public\sourcepawn;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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>
@@ -60,7 +62,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <OutputFile>$(OutDir)sourcemod.logic.dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
       <IgnoreSpecificDefaultLibraries>LIBC;LIBCD;LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -69,11 +71,17 @@
       </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>..;$(MMSOURCE17)\core\sourcehook;..\..\..\public;..\..\..\public\sourcepawn;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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>
@@ -84,7 +92,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <OutputFile>$(OutDir)sourcemod.logic.dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
       <IgnoreSpecificDefaultLibraries>LIBC;LIBCD;LIBCMTD;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -95,6 +103,12 @@
       </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" />
@@ -129,6 +143,9 @@
     <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" />
@@ -142,7 +159,6 @@
     <ClInclude Include="..\sm_memtable.h" />
     <ClInclude Include="..\sm_symtable.h" />
     <ClInclude Include="..\stringutil.h" />
-    <ClInclude Include="..\svn_version.h" />
     <ClInclude Include="..\TextParsers.h" />
     <ClInclude Include="..\ThreadSupport.h" />
     <ClInclude Include="..\thread\BaseWorker.h" />

core/logic/msvc10/logic.vcxproj.filters

@@ -131,9 +131,6 @@
     <ClInclude Include="..\Profiler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\svn_version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\TextParsers.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -179,6 +176,15 @@
     <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">

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, 
+		GetMapCycleFilePath(pDefList->path, sizeof(pDefList->path));
-			sizeof(pDefList->path),
+		
-			"%s",
-			m_pMapCycleFile ? smcore.GetCvarString(m_pMapCycleFile) : "mapcycle.txt");
 		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()
+					fileName = smcore.filesystem->FindNext(findHandle);
-						|| strcmp(pDir->GetEntryName(), ".") == 0
+					continue;
-						|| 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();
 				}
-				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,
+			GetMapCycleFilePath(path, sizeof(path));
-				path, 
-				sizeof(path),
-				"%s",
-				m_pMapCycleFile ? smcore.GetCvarString(m_pMapCycleFile) : "mapcycle.txt");
 
 			if (strcmp(path, pMapList->path) != 0)
 			{
@@ -524,7 +549,7 @@ private:
 				{
 					continue;
 				}
-				if (!engine->IsMapValid(ptr))
+				if (!gamehelpers->IsMapValid(ptr))
 				{
 					continue;
 				}

core/logic/smn_profiler.cpp

@@ -179,7 +179,7 @@ static cell_t GetProfilerTime(IPluginContext *pContext, const cell_t *params)
 #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) / 1000) / 1000.0;
+	fTime = double(stop_us - start_us) / 1000000.0;
 #endif
 
 	return sp_ftoc(fTime);

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/stringutil.cpp

@@ -35,6 +35,11 @@
 #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)
@@ -303,3 +308,35 @@ size_t UTIL_DecodeHexString(unsigned char *buffer, size_t maxlength, const char
 	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

@@ -40,5 +40,7 @@ char *UTIL_ReplaceEx(char *subject, size_t maxLen, const char *search, size_t se
                      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

@@ -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
+ FILEVERSION  SM_VERSION_FILE
- PRODUCTVERSION SM_FILE_VERSION
+ 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

@@ -90,6 +90,25 @@ public:
 
 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);
@@ -159,20 +178,32 @@ static const char *get_source_engine_name()
 	return "bloodygoodtime";
 #elif SOURCE_ENGINE == SE_EYE
 	return "eye";
-#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE
+#elif SOURCE_ENGINE == SE_CSS
-	return "orangebox_valve";
+	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_ORANGEBOXVALVE) || (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
+#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;
@@ -194,6 +225,7 @@ 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,

core/msvc10/sourcemod_mm.sln

@@ -5,6 +5,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sourcemod_mm", "sourcemod_m
 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
@@ -12,6 +14,8 @@ Global
 		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
@@ -19,6 +23,8 @@ Global
 		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
@@ -28,6 +34,10 @@ Global
 		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
@@ -42,6 +52,10 @@ Global
 		{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
@@ -56,6 +70,10 @@ Global
 		{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

core/msvc10/sourcemod_mm.vcxproj.filters

@@ -25,6 +25,12 @@
       <UniqueIdentifier>{2A750240-7C10-455f-A900-B9A9D362356C}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
     </Filter>
+    <Filter Include="HL2SDK\Protobuf">
+      <UniqueIdentifier>{28cf0347-3553-4d24-b9ad-476ba5197680}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HL2SDK\Protobuf\CSGO">
+      <UniqueIdentifier>{0e62c72e-57b1-40d2-9a94-059f535ce719}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\AdminCache.cpp">
@@ -198,6 +204,18 @@
     <ClCompile Include="..\smn_vector.cpp">
       <Filter>Natives</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\hl2sdks\hl2sdk-csgo\public\game\shared\csgo\protobuf\cstrike15_usermessage_helpers.cpp">
+      <Filter>HL2SDK\Protobuf\CSGO</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\hl2sdks\hl2sdk-csgo\public\game\shared\csgo\protobuf\cstrike15_usermessages.pb.cc">
+      <Filter>HL2SDK\Protobuf\CSGO</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\hl2sdks\hl2sdk-csgo\public\engine\protobuf\netmessages.pb.cc">
+      <Filter>HL2SDK\Protobuf</Filter>
+    </ClCompile>
+    <ClCompile Include="..\smn_protobuf.cpp">
+      <Filter>Natives</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\AdminCache.h">
@@ -209,9 +227,6 @@
     <ClInclude Include="..\CDataPack.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CellArray.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\CellRecipientFilter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -257,9 +272,6 @@
     <ClInclude Include="..\frame_hooks.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\GameConfigs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\HalfLife2.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -275,9 +287,6 @@
     <ClInclude Include="..\logic_bridge.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\MemoryUtils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\MenuManager.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -302,9 +311,6 @@
     <ClInclude Include="..\NextMap.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\PhraseCollection.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\PlayerManager.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -329,9 +335,6 @@
     <ClInclude Include="..\sm_memtable.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\public\sm_platform.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\sm_queue.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -344,18 +347,12 @@
     <ClInclude Include="..\sm_stringutil.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\sm_symtable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\sm_trie.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\public\sm_trie_tpl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\sm_version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\smn_usermsgs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -368,9 +365,6 @@
     <ClInclude Include="..\TimerSys.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Translator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\UserMessages.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -458,10 +452,42 @@
     <ClInclude Include="..\convar_sm.h">
       <Filter>HL2SDK</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\public\sm_platform.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\public\sourcemod_version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\convar_sm_l4d.h">
+      <Filter>HL2SDK</Filter>
+    </ClInclude>
+    <ClInclude Include="..\convar_sm_ob.h">
+      <Filter>HL2SDK</Filter>
+    </ClInclude>
+    <ClInclude Include="..\convar_sm_swarm.h">
+      <Filter>HL2SDK</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\hl2sdks\hl2sdk-csgo\public\game\shared\csgo\protobuf\cstrike15_usermessage_helpers.h">
+      <Filter>HL2SDK\Protobuf\CSGO</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\hl2sdks\hl2sdk-csgo\public\game\shared\csgo\protobuf\cstrike15_usermessages.pb.h">
+      <Filter>HL2SDK\Protobuf\CSGO</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\hl2sdks\hl2sdk-csgo\public\engine\protobuf\netmessages.pb.h">
+      <Filter>HL2SDK\Protobuf</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\version.rc">
       <Filter>Resources</Filter>
     </ResourceCompile>
   </ItemGroup>
+  <ItemGroup>
+    <Library Include="..\..\..\hl2sdks\hl2sdk-csgo\lib\win32\release\vs2010\libprotobuf.lib">
+      <Filter>HL2SDK\Protobuf</Filter>
+    </Library>
+    <Library Include="..\..\..\hl2sdks\hl2sdk-csgo\lib\win32\debug\vs2010\libprotobuf.lib">
+      <Filter>HL2SDK\Protobuf</Filter>
+    </Library>
+  </ItemGroup>
 </Project>

core/sm_srvcmds.cpp

@@ -39,7 +39,7 @@
 
 RootConsoleMenu g_RootMenu;
 
-ConVar sourcemod_version("sourcemod_version", SM_FULL_VERSION, FCVAR_SPONLY|FCVAR_REPLICATED|FCVAR_NOTIFY, "SourceMod Version");
+ConVar sourcemod_version("sourcemod_version", SM_VERSION_STRING, FCVAR_SPONLY|FCVAR_REPLICATED|FCVAR_NOTIFY, "SourceMod Version");
 
 RootConsoleMenu::RootConsoleMenu()
 {
@@ -329,16 +329,17 @@ void RootConsoleMenu::OnRootConsoleCommand(const char *cmdname, const CCommand &
 		ConsolePrint("  Scott \"DS\" Ehlert");
 		ConsolePrint("  Fyren");
 		ConsolePrint("  Nicholas \"psychonic\" Hastings");
+		ConsolePrint("  Asher \"asherkin\" Baker");
 		ConsolePrint("  Borja \"faluco\" Ferrer");
 		ConsolePrint("  Pavol \"PM OnoTo\" Marko");
-		ConsolePrint(" Special thanks to asherkin, Liam, ferret, and Mani");
+		ConsolePrint(" Special thanks to Liam, ferret, and Mani");
 		ConsolePrint(" Special thanks to Viper and SteamFriends");
 		ConsolePrint(" http://www.sourcemod.net/");
 	}
 	else if (strcmp(cmdname, "version") == 0)
 	{
 		ConsolePrint(" SourceMod Version Information:");
-		ConsolePrint("    SourceMod Version: %s", SM_FULL_VERSION);
+		ConsolePrint("    SourceMod Version: %s", SM_VERSION_STRING);
 		ConsolePrint("    SourcePawn Engine: %s (build %s)", g_pSourcePawn2->GetEngineName(), g_pSourcePawn2->GetVersionString());
 		ConsolePrint("    SourcePawn API: v1 = %d, v2 = %d", g_pSourcePawn->GetEngineAPIVersion(), g_pSourcePawn2->GetAPIVersion());
 		ConsolePrint("    Compiled on: %s %s", __DATE__, __TIME__);

core/smn_bitbuffer.cpp

@@ -29,11 +29,16 @@
  * Version: $Id$
  */
 
+#include "UserMessages.h"
+
+#ifndef USE_PROTOBUF_USERMESSAGES
+
 #include "sourcemod.h"
 #include "HandleSys.h"
 #include <bitbuf.h>
 #include <vector.h>
 #include <HalfLife2.h>
+#include "smn_usermsgs.h"
 
 static cell_t smn_BfWriteBool(IPluginContext *pCtx, const cell_t *params)
 {
@@ -713,3 +718,5 @@ REGISTER_NATIVES(bitbufnatives)
 	{"BfGetNumBytesLeft",		smn_BfGetNumBytesLeft},
 	{NULL,						NULL}
 };
+
+#endif

core/smn_console.cpp

@@ -48,6 +48,10 @@
 #include "ConsoleDetours.h"
 #include "ConCommandBaseIterator.h"
 
+#if SOURCE_ENGINE == SE_CSGO
+#include <netmessages.pb.h>
+#endif
+
 #if SOURCE_ENGINE >= SE_EYE
 #define NETMSG_BITS 6
 #else
@@ -722,7 +726,9 @@ static cell_t sm_RegConsoleCmd(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Invalid function id (%X)", params[2]);
 	}
 
-	if (!g_ConCmds.AddConsoleCommand(pFunction, name, help, params[4]))
+	CPlugin *pPlugin = g_PluginSys.GetPluginByCtx(pContext->GetContext());
+	const char *group = pPlugin->GetFilename();
+	if (!g_ConCmds.AddAdminCommand(pFunction, name, group, 0, help, params[4]))
 	{
 		return pContext->ThrowNativeError("Command \"%s\" could not be created. A convar with the same name already exists.", name);
 	}
@@ -907,7 +913,7 @@ cell_t g_ServerCommandBufferLength;
 
 bool g_ShouldCatchSpew = false;
 
-#if SOURCE_ENGINE < SE_LEFT4DEAD2
+#if SOURCE_ENGINE < SE_NUCLEARDAWN
 SpewOutputFunc_t g_OriginalSpewOutputFunc = NULL;
 
 SpewRetval_t SourcemodSpewOutputFunc(SpewType_t spewType, tchar const *pMsg)
@@ -946,7 +952,7 @@ CON_COMMAND(sm_conhook_start, "")
 		return;
 	}
 
-#if SOURCE_ENGINE < SE_LEFT4DEAD2
+#if SOURCE_ENGINE < SE_NUCLEARDAWN
 	g_OriginalSpewOutputFunc = GetSpewOutputFunc();
 	SpewOutputFunc(SourcemodSpewOutputFunc);
 #else
@@ -967,7 +973,7 @@ CON_COMMAND(sm_conhook_stop, "")
 		return;
 	}
 
-#if SOURCE_ENGINE < SE_LEFT4DEAD2
+#if SOURCE_ENGINE < SE_NUCLEARDAWN
 	SpewOutputFunc(g_OriginalSpewOutputFunc);
 #else
 	LoggingSystem_PopLoggingState(false);
@@ -1091,6 +1097,8 @@ static cell_t FakeClientCommand(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Client %d is not connected", params[1]);
 	}
 
+	g_SourceMod.SetGlobalTarget(params[1]);
+
 	char buffer[256];
 	g_SourceMod.FormatString(buffer, sizeof(buffer), pContext, params, 2);
 
@@ -1118,6 +1126,8 @@ static cell_t FakeClientCommandEx(IPluginContext *pContext, const cell_t *params
 		return pContext->ThrowNativeError("Client %d is not connected", params[1]);
 	}
 
+	g_SourceMod.SetGlobalTarget(params[1]);
+
 	char buffer[256];
 	g_SourceMod.FormatString(buffer, sizeof(buffer), pContext, params, 2);
 
@@ -1166,8 +1176,6 @@ static cell_t ReplyToCommand(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Client %d is not connected", params[1]);
 	}
 
-	g_SourceMod.SetGlobalTarget(params[1]);
-
 	unsigned int replyto = g_ChatTriggers.GetReplyTo();
 	if (replyto == SM_REPLY_CONSOLE)
 	{
@@ -1425,10 +1433,25 @@ static cell_t SendConVarValue(IPluginContext *pContext, const cell_t *params)
 	char data[256];
 	bf_write buffer(data, sizeof(data));
 
+#if SOURCE_ENGINE == SE_CSGO
+	CNETMsg_SetConVar msg;
+	CMsg_CVars_CVar *cvar = msg.mutable_convars()->add_cvars();
+
+	cvar->set_name(pConVar->GetName());
+	cvar->set_value(value);
+
+	int msgsize = msg.ByteSize();
+   
+	buffer.WriteVarInt32(net_SetConVar);
+	buffer.WriteVarInt32(msgsize);
+	msg.SerializeWithCachedSizesToArray( (uint8 *)( buffer.GetBasePointer() + buffer.GetNumBytesWritten() ) );
+	buffer.SeekToBit( ( buffer.GetNumBytesWritten() + msgsize ) * 8 );
+#else
 	buffer.WriteUBitLong(NET_SETCONVAR, NETMSG_BITS);
 	buffer.WriteByte(1);
 	buffer.WriteString(pConVar->GetName());
 	buffer.WriteString(value);
+#endif
 
 	CPlayer *pPlayer = g_Players.GetPlayerByIndex(params[1]);
 

core/smn_entities.cpp

@@ -325,7 +325,7 @@ static cell_t GetEdictClassname(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Invalid edict (%d - %d)", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	const char *cls = pEdict->GetClassName();
+	const char *cls = g_HL2.GetEntityClassname(pEdict);
 
 	if (!cls || cls[0] == '\0')
 	{
@@ -620,9 +620,12 @@ static cell_t GetEntDataEnt2(IPluginContext *pContext, const cell_t *params)
 	}
 
 	CBaseHandle &hndl = *(CBaseHandle *)((uint8_t *)pEntity + offset);
+	CBaseEntity *pHandleEntity = g_HL2.ReferenceToEntity(hndl.GetEntryIndex());
 
-	int ref = g_HL2.IndexToReference(hndl.GetEntryIndex());
+	if (!pHandleEntity || hndl != reinterpret_cast<IHandleEntity *>(pHandleEntity)->GetRefEHandle())
-	return g_HL2.ReferenceToBCompatRef(ref);
+		return -1;
+
+	return g_HL2.EntityToBCompatRef(pHandleEntity);
 }
 
 /* THIS GUY IS DEPRECATED. */
@@ -812,9 +815,13 @@ static cell_t FindDataMapOffs(IPluginContext *pContext, const cell_t *params)
 	}
 
 	pContext->LocalToString(params[2], &offset);
-	if ((td=g_HL2.FindInDataMap(pMap, offset)) == NULL)
+	bool isNested = false;
+	if ((td=g_HL2.FindInDataMap(pMap, offset, &isNested)) == NULL)
 	{
-		return -1;
+		if (isNested)
+			return pContext->ThrowNativeError("Property \"%s\" is not safe to access for entity %d", offset, params[1]);
+		else
+			return -1;
 	}
 
 	if (params[0] == 4)
@@ -959,12 +966,22 @@ static cell_t SetEntDataString(IPluginContext *pContext, const cell_t *params)
 	{ \
 		return pContext->ThrowNativeError("Could not retrieve datamap"); \
 	} \
-	if ((td = g_HL2.FindInDataMap(pMap, prop)) == NULL) \
+	bool isNested = false; \
+	if ((td = g_HL2.FindInDataMap(pMap, prop, &isNested)) == NULL) \
 	{ \
-		return pContext->ThrowNativeError("Property \"%s\" not found (entity %d/%s)", \
+		const char *class_name = g_HL2.GetEntityClassname(pEntity); \
-			prop, \
+		if (isNested) \
-			params[1], \
+		{ \
-			class_name); \
+			return pContext->ThrowNativeError("Property \"%s\" not safe to access (entity %d/%s)", \
+				prop, \
+				params[1], \
+				((class_name) ? class_name : "")); \
+		} else { \
+			return pContext->ThrowNativeError("Property \"%s\" not found (entity %d/%s)", \
+				prop, \
+				params[1], \
+				((class_name) ? class_name : "")); \
+		} \
 	}
 
 #define CHECK_SET_PROP_DATA_OFFSET() \
@@ -980,6 +997,7 @@ static cell_t SetEntDataString(IPluginContext *pContext, const cell_t *params)
 
 #define FIND_PROP_SEND(type, type_name) \
 	sm_sendprop_info_t info;\
+	SendProp *pProp; \
 	IServerUnknown *pUnk = (IServerUnknown *)pEntity; \
 	IServerNetworkable *pNet = pUnk->GetNetworkable(); \
 	if (!pNet) \
@@ -988,16 +1006,18 @@ static cell_t SetEntDataString(IPluginContext *pContext, const cell_t *params)
 	} \
 	if (!g_HL2.FindSendPropInfo(pNet->GetServerClass()->GetName(), prop, &info)) \
 	{ \
+		const char *class_name = g_HL2.GetEntityClassname(pEntity); \
 		return pContext->ThrowNativeError("Property \"%s\" not found (entity %d/%s)", \
 			prop, \
 			params[1], \
-			class_name); \
+			((class_name) ? class_name : "")); \
 	} \
 	\
 	offset = info.actual_offset; \
-	bit_count = info.prop->m_nBits; \
+	pProp = info.prop; \
+	bit_count = pProp->m_nBits; \
 	\
-	switch (info.prop->GetType()) \
+	switch (pProp->GetType()) \
 	{ \
 	case type: \
 		{ \
@@ -1011,7 +1031,6 @@ static cell_t SetEntDataString(IPluginContext *pContext, const cell_t *params)
 		} \
 	case DPT_DataTable: \
 		{ \
-			SendProp *pProp; \
 			FIND_PROP_SEND_IN_SENDTABLE(info, pProp, element, type, type_name); \
 			\
 			offset += pProp->GetOffset(); \
@@ -1022,13 +1041,13 @@ static cell_t SetEntDataString(IPluginContext *pContext, const cell_t *params)
 		{ \
 			return pContext->ThrowNativeError("SendProp %s type is not " type_name " (%d != %d)", \
 				prop, \
-				info.prop->GetType(), \
+				pProp->GetType(), \
 				type); \
 		} \
 	} \
 
 #define FIND_PROP_SEND_IN_SENDTABLE(info, pProp, element, type, type_name) \
-	SendTable *pTable = info.prop->GetDataTable(); \
+	SendTable *pTable = pProp->GetDataTable(); \
 	if (!pTable) \
 	{ \
 		return pContext->ThrowNativeError("Error looking up DataTable for prop %s", \
@@ -1049,8 +1068,8 @@ static cell_t SetEntDataString(IPluginContext *pContext, const cell_t *params)
 	{ \
 		return pContext->ThrowNativeError("SendProp %s type is not " type_name " ([%d,%d] != %d)", \
 			prop, \
-			info.prop->GetType(), \
+			pProp->GetType(), \
-			info.prop->m_nBits, \
+			pProp->m_nBits, \
 			type); \
 	}
 
@@ -1082,7 +1101,6 @@ static cell_t GetEntPropArraySize(IPluginContext *pContext, const cell_t *params
 {
 	CBaseEntity *pEntity;
 	char *prop;
-	const char *class_name;
 	edict_t *pEdict;
 
 	if (!IndexToAThings(params[1], &pEntity, &pEdict))
@@ -1090,11 +1108,6 @@ static cell_t GetEntPropArraySize(IPluginContext *pContext, const cell_t *params
 		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
-	{
-		class_name = "";
-	}
-
 	pContext->LocalToString(params[3], &prop);
 
 	switch (params[2])
@@ -1119,10 +1132,11 @@ static cell_t GetEntPropArraySize(IPluginContext *pContext, const cell_t *params
 			}
 			if (!g_HL2.FindSendPropInfo(pNet->GetServerClass()->GetName(), prop, &info))
 			{
+				const char *class_name = g_HL2.GetEntityClassname(pEntity);
 				return pContext->ThrowNativeError("Property \"%s\" not found (entity %d/%s)",
 					prop,
 					params[1],
-					class_name);
+					((class_name) ? class_name : ""));
 			}
 
 			if (info.prop->GetType() != DPT_DataTable)
@@ -1152,7 +1166,6 @@ static cell_t GetEntProp(IPluginContext *pContext, const cell_t *params)
 	CBaseEntity *pEntity;
 	char *prop;
 	int offset;
-	const char *class_name;
 	edict_t *pEdict;
 	int bit_count;
 	bool is_unsigned = false;
@@ -1168,12 +1181,6 @@ static cell_t GetEntProp(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	/* TODO: Find a way to lookup classname without having an edict - Is this a guaranteed prop? */
-	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
-	{
-		class_name = "";
-	}
-
 	pContext->LocalToString(params[3], &prop);
 
 	switch (params[2])
@@ -1198,7 +1205,15 @@ static cell_t GetEntProp(IPluginContext *pContext, const cell_t *params)
 	case Prop_Send:
 		{
 			FIND_PROP_SEND(DPT_Int, "integer");
-			is_unsigned = ((info.prop->GetFlags() & SPROP_UNSIGNED) == SPROP_UNSIGNED);
+			is_unsigned = ((pProp->GetFlags() & SPROP_UNSIGNED) == SPROP_UNSIGNED);
+
+			// This isn't in CS:S yet, but will be, doesn't hurt to add now, and will save us a build later
+#if SOURCE_ENGINE == SE_CSS || SOURCE_ENGINE == SE_HL2DM || SOURCE_ENGINE == SE_DODS || SOURCE_ENGINE == SE_TF2
+			if (pProp->GetFlags() & SPROP_VARINT)
+			{
+				bit_count = sizeof(int) * 8;
+			}
+#endif
 			break;
 		}
 	default:
@@ -1251,7 +1266,6 @@ static cell_t SetEntProp(IPluginContext *pContext, const cell_t *params)
 	CBaseEntity *pEntity;
 	char *prop;
 	int offset;
-	const char *class_name;
 	edict_t *pEdict;
 	int bit_count;
 
@@ -1266,11 +1280,6 @@ static cell_t SetEntProp(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
-	{
-		class_name = "";
-	}
-
 	pContext->LocalToString(params[3], &prop);
 
 	switch (params[2])
@@ -1295,6 +1304,14 @@ static cell_t SetEntProp(IPluginContext *pContext, const cell_t *params)
 	case Prop_Send:
 		{
 			FIND_PROP_SEND(DPT_Int, "integer");
+
+			// This isn't in CS:S yet, but will be, doesn't hurt to add now, and will save us a build later
+#if SOURCE_ENGINE == SE_CSS || SOURCE_ENGINE == SE_HL2DM || SOURCE_ENGINE == SE_DODS || SOURCE_ENGINE == SE_TF2
+			if (pProp->GetFlags() & SPROP_VARINT)
+			{
+				bit_count = sizeof(int) * 8;
+			}
+#endif
 			break;
 		}
 	default:
@@ -1339,7 +1356,6 @@ static cell_t GetEntPropFloat(IPluginContext *pContext, const cell_t *params)
 	char *prop;
 	int offset;
 	int bit_count;
-	const char *class_name;
 	edict_t *pEdict;
 
 	int element = 0;
@@ -1353,11 +1369,6 @@ static cell_t GetEntPropFloat(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
-	{
-		class_name = "";
-	}
-
 	pContext->LocalToString(params[3], &prop);
 
 	switch (params[2])
@@ -1404,7 +1415,6 @@ static cell_t SetEntPropFloat(IPluginContext *pContext, const cell_t *params)
 	char *prop;
 	int offset;
 	int bit_count;
-	const char *class_name;
 	edict_t *pEdict;
 
 	int element = 0;
@@ -1418,11 +1428,6 @@ static cell_t SetEntPropFloat(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
-	{
-		class_name = "";
-	}
-
 	pContext->LocalToString(params[3], &prop);
 
 	switch (params[2])
@@ -1474,7 +1479,6 @@ static cell_t GetEntPropEnt(IPluginContext *pContext, const cell_t *params)
 	char *prop;
 	int offset;
 	int bit_count;
-	const char *class_name;
 	edict_t *pEdict;
 
 	int element = 0;
@@ -1488,11 +1492,6 @@ static cell_t GetEntPropEnt(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
-	{
-		class_name = "";
-	}
-
 	pContext->LocalToString(params[3], &prop);
 
 	switch (params[2])
@@ -1527,9 +1526,12 @@ static cell_t GetEntPropEnt(IPluginContext *pContext, const cell_t *params)
 	}
 
 	CBaseHandle &hndl = *(CBaseHandle *)((uint8_t *)pEntity + offset);
+	CBaseEntity *pHandleEntity = g_HL2.ReferenceToEntity(hndl.GetEntryIndex());
 
-	int ref = g_HL2.IndexToReference(hndl.GetEntryIndex());
+	if (!pHandleEntity || hndl != reinterpret_cast<IHandleEntity *>(pHandleEntity)->GetRefEHandle())
-	return g_HL2.ReferenceToBCompatRef(ref);
+		return -1;
+
+	return g_HL2.EntityToBCompatRef(pHandleEntity);
 }
 
 static cell_t SetEntPropEnt(IPluginContext *pContext, const cell_t *params)
@@ -1538,7 +1540,6 @@ static cell_t SetEntPropEnt(IPluginContext *pContext, const cell_t *params)
 	char *prop;
 	int offset;
 	int bit_count;
-	const char *class_name;
 	edict_t *pEdict;
 
 	int element = 0;
@@ -1552,11 +1553,6 @@ static cell_t SetEntPropEnt(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
-	{
-		class_name = "";
-	}
-
 	pContext->LocalToString(params[3], &prop);
 
 	switch (params[2])
@@ -1623,7 +1619,6 @@ static cell_t GetEntPropVector(IPluginContext *pContext, const cell_t *params)
 	char *prop;
 	int offset;
 	int bit_count;
-	const char *class_name;
 	edict_t *pEdict;
 
 	int element = 0;
@@ -1637,11 +1632,6 @@ static cell_t GetEntPropVector(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
-	{
-		class_name = "";
-	}
-
 	pContext->LocalToString(params[3], &prop);
 
 	switch (params[2])
@@ -1695,7 +1685,6 @@ static cell_t SetEntPropVector(IPluginContext *pContext, const cell_t *params)
 	char *prop;
 	int offset;
 	int bit_count;
-	const char *class_name;
 	edict_t *pEdict;
 
 	int element = 0;
@@ -1709,11 +1698,6 @@ static cell_t SetEntPropVector(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
-	{
-		class_name = "";
-	}
-
 	pContext->LocalToString(params[3], &prop);
 
 	switch (params[2])
@@ -1771,7 +1755,6 @@ static cell_t GetEntPropString(IPluginContext *pContext, const cell_t *params)
 	CBaseEntity *pEntity;
 	char *prop;
 	int offset;
-	const char *class_name;
 	edict_t *pEdict;
 	bool bIsStringIndex;
 
@@ -1786,11 +1769,6 @@ static cell_t GetEntPropString(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
 	}
 
-	if (!pEdict || (class_name = pEdict->GetClassName()) == NULL)
-	{
-		class_name = "";
-	}
-
 	pContext->LocalToString(params[3], &prop);
 
 	bIsStringIndex = false;
@@ -1849,10 +1827,11 @@ static cell_t GetEntPropString(IPluginContext *pContext, const cell_t *params)
 			}
 			if (!g_HL2.FindSendPropInfo(pNet->GetServerClass()->GetName(), prop, &info))
 			{
+				const char *class_name = g_HL2.GetEntityClassname(pEntity);
 				return pContext->ThrowNativeError("Property \"%s\" not found (entity %d/%s)",
 					prop,
 					params[1],
-					class_name);
+					((class_name) ? class_name : ""));
 			}
 
 			offset = info.actual_offset;
@@ -1923,9 +1902,13 @@ static cell_t SetEntPropString(IPluginContext *pContext, const cell_t *params)
 				return pContext->ThrowNativeError("Unable to retrieve GetDataDescMap offset");
 			}
 			pContext->LocalToString(params[3], &prop);
-			if ((td=g_HL2.FindInDataMap(pMap, prop)) == NULL)
+			bool isNested = false;
+			if ((td=g_HL2.FindInDataMap(pMap, prop, &isNested)) == NULL)
 			{
-				return pContext->ThrowNativeError("Property \"%s\" not found for entity %d", prop, params[1]);
+				if (isNested)
+					return pContext->ThrowNativeError("Property \"%s\" is not safe to access for entity %d", prop, params[1]);
+				else
+					return pContext->ThrowNativeError("Property \"%s\" not found for entity %d", prop, params[1]);
 			}
 			if (td->fieldType != FIELD_CHARACTER)
 			{
@@ -2047,7 +2030,7 @@ static int32_t SDKEntFlagToSMEntFlag(int flag)
 #if SOURCE_ENGINE == SE_ALIENSWARM
 		case FL_FREEZING:
 			return ENTFLAG_FREEZING;
-#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE
+#elif SOURCE_ENGINE == SE_HL2DM || SOURCE_ENGINE == SE_DODS || SOURCE_ENGINE == SE_CSS || SOURCE_ENGINE == SE_TF2
 		case FL_EP2V_UNKNOWN:
 			return ENTFLAG_EP2V_UNKNOWN1;
 #endif
@@ -2125,7 +2108,7 @@ static int32_t SMEntFlagToSDKEntFlag(int32_t flag)
 #if SOURCE_ENGINE == SE_ALIENSWARM
 		case ENTFLAG_FREEZING:
 			return FL_FREEZING;
-#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE
+#elif SOURCE_ENGINE == SE_HL2DM || SOURCE_ENGINE == SE_DODS || SOURCE_ENGINE == SE_CSS || SOURCE_ENGINE == SE_TF2
 		case ENTFLAG_EP2V_UNKNOWN1:
 			return FL_EP2V_UNKNOWN;
 #endif
@@ -2226,6 +2209,16 @@ static cell_t SetEntityFlags(IPluginContext *pContext, const cell_t *params)
 	return 0;
 }
 
+static cell_t GetEntityAddress(IPluginContext *pContext, const cell_t *params)
+{
+	CBaseEntity * pEntity = GetEntity(params[1]);
+	if (!pEntity)
+	{
+		return pContext->ThrowNativeError("Entity %d (%d) is invalid", g_HL2.ReferenceToIndex(params[1]), params[1]);
+	}
+	return reinterpret_cast<cell_t>(pEntity);
+}
+
 REGISTER_NATIVES(entityNatives)
 {
 	{"ChangeEdictState",		ChangeEdictState},
@@ -2268,5 +2261,6 @@ REGISTER_NATIVES(entityNatives)
 	{"SetEntPropFloat",			SetEntPropFloat},
 	{"SetEntPropString",		SetEntPropString},
 	{"SetEntPropVector",		SetEntPropVector},
+	{"GetEntityAddress",		GetEntityAddress},
 	{NULL,						NULL}
 };

core/smn_fakenatives.cpp

@@ -50,7 +50,7 @@ cell_t FakeNativeRouter(IPluginContext *pContext, const cell_t *params, void *pD
 	/* Check if too many parameters were passed */
 	if (params[0] > SP_MAX_EXEC_PARAMS)
 	{
-		return pContext->ThrowNativeError("Called native with too many parameters (%d>%d)", params[9], SP_MAX_EXEC_PARAMS);
+		return pContext->ThrowNativeError("Called native with too many parameters (%d>%d)", params[0], SP_MAX_EXEC_PARAMS);
 	}
 
 	/* Check if the native is paused */

core/smn_halflife.cpp

@@ -63,7 +63,7 @@ static cell_t IsMapValid(IPluginContext *pContext, const cell_t *params)
 	char *map;
 	pContext->LocalToString(params[1], &map);
 
-	return engine->IsMapValid(map);
+	return g_HL2.IsMapValid(map);
 }
 
 static cell_t IsDedicatedServer(IPluginContext *pContext, const cell_t *params)
@@ -73,7 +73,7 @@ static cell_t IsDedicatedServer(IPluginContext *pContext, const cell_t *params)
 
 static cell_t GetEngineTime(IPluginContext *pContext, const cell_t *params)
 {
-#if SOURCE_ENGINE >= SE_LEFT4DEAD2
+#if SOURCE_ENGINE >= SE_NUCLEARDAWN
 	float fTime = Plat_FloatTime();
 #else
 	float fTime = engine->Time();
@@ -473,14 +473,24 @@ static cell_t GuessSDKVersion(IPluginContext *pContext, const cell_t *params)
 		return 32;
 	case SOURCE_ENGINE_EYE:
 		return 33;
-	case SOURCE_ENGINE_ORANGEBOXVALVE:
+	case SOURCE_ENGINE_CSS:
+		return 34;
+	case SOURCE_ENGINE_ORANGEBOXVALVE_DEPRECATED:
+	case SOURCE_ENGINE_HL2DM:
+	case SOURCE_ENGINE_DODS:
+	case SOURCE_ENGINE_TF2:
 		return 35;
 	case SOURCE_ENGINE_LEFT4DEAD:
 		return 40;
+	case SOURCE_ENGINE_NUCLEARDAWN:
 	case SOURCE_ENGINE_LEFT4DEAD2:
 		return 50;
 	case SOURCE_ENGINE_ALIENSWARM:
 		return 60;
+	case SOURCE_ENGINE_PORTAL2:
+		return 70;
+	case SOURCE_ENGINE_CSGO:
+		return 80;
 # endif
 	}
 #else
@@ -497,6 +507,11 @@ static cell_t GuessSDKVersion(IPluginContext *pContext, const cell_t *params)
 	return 0;
 }
 
+static cell_t GetEngineVersion(IPluginContext *pContext, const cell_t *params)
+{
+	return g_SMAPI->GetSourceEngineBuild();
+}
+
 static cell_t IndexToReference(IPluginContext *pContext, const cell_t *params)
 {
 	if (params[1] >= NUM_ENT_ENTRIES || params[1] < 0)
@@ -548,6 +563,7 @@ REGISTER_NATIVES(halflifeNatives)
 	{"ShowVGUIPanel",			ShowVGUIPanel},
 	{"IsPlayerAlive",			smn_IsPlayerAlive},
 	{"GuessSDKVersion",			GuessSDKVersion},
+	{"GetEngineVersion",		GetEngineVersion},
 	{"EntIndexToEntRef",		IndexToReference},
 	{"EntRefToEntIndex",		ReferenceToIndex},
 	{"MakeCompatEntRef",		ReferenceToBCompatRef},

core/smn_hudtext.cpp

@@ -37,6 +37,10 @@
 #include "HandleSys.h"
 #include "logic_bridge.h"
 
+#if SOURCE_ENGINE == SE_CSGO
+#include <game/shared/csgo/protobuf/cstrike15_usermessages.pb.h>
+#endif
+
 #define MAX_HUD_CHANNELS		6
 
 int g_HudMsgNum = -1;
@@ -308,12 +312,39 @@ static cell_t SetHudTextParamsEx(IPluginContext *pContext, const cell_t *params)
 
 void UTIL_SendHudText(int client, const hud_text_parms &textparms, const char *pMessage)
 {
-	bf_write *bf;
 	cell_t players[1];
 
 	players[0] = client;
 
-	bf = g_UserMsgs.StartMessage(g_HudMsgNum, players, 1, 0);
+#if SOURCE_ENGINE == SE_CSGO
+	// If or when we need to support multiple games per engine with this, we can switch to reflection
+	CCSUsrMsg_HudMsg *msg = (CCSUsrMsg_HudMsg *)g_UserMsgs.StartProtobufMessage(g_HudMsgNum, players, 1, 0);
+	msg->set_channel(textparms.channel & 0xFF);
+
+	CMsgVector2D *pos = msg->mutable_pos();
+	pos->set_x(textparms.x);
+	pos->set_y(textparms.y);
+
+	CMsgRGBA *color1 = msg->mutable_clr1();
+	color1->set_r(textparms.r1);
+	color1->set_g(textparms.g1);
+	color1->set_b(textparms.b1);
+	color1->set_a(textparms.a1);
+
+	CMsgRGBA *color2 = msg->mutable_clr2();
+	color2->set_r(textparms.r2);
+	color2->set_g(textparms.g2);
+	color2->set_b(textparms.b2);
+	color2->set_a(textparms.a2);
+
+	msg->set_effect(textparms.effect);
+	msg->set_fade_in_time(textparms.fadeinTime);
+	msg->set_fade_out_time(textparms.fadeoutTime);
+	msg->set_hold_time(textparms.holdTime);
+	msg->set_fx_time(textparms.fxTime);
+	msg->set_text(pMessage);
+#else
+	bf_write *bf = g_UserMsgs.StartBitBufMessage(g_HudMsgNum, players, 1, 0);
 	bf->WriteByte(textparms.channel & 0xFF );
 	bf->WriteFloat(textparms.x);
 	bf->WriteFloat(textparms.y);
@@ -331,6 +362,7 @@ void UTIL_SendHudText(int client, const hud_text_parms &textparms, const char *p
 	bf->WriteFloat(textparms.holdTime);
 	bf->WriteFloat(textparms.fxTime);
 	bf->WriteString(pMessage);
+#endif
 	g_UserMsgs.EndMessage();
 }
 
@@ -362,6 +394,7 @@ static cell_t ShowSyncHudText(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Client %d is not in-game", client);
 	}
 
+	g_SourceMod.SetGlobalTarget(client);
 	g_SourceMod.FormatString(message_buffer, sizeof(message_buffer), pContext, params, 3);
 	if (pContext->GetLastNativeError() != SP_ERROR_NONE)
 	{
@@ -434,6 +467,7 @@ static cell_t ShowHudText(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Client %d is not in-game", client);
 	}
 
+	g_SourceMod.SetGlobalTarget(client);
 	g_SourceMod.FormatString(message_buffer, sizeof(message_buffer), pContext, params, 3);
 	if (pContext->GetLastNativeError() != SP_ERROR_NONE)
 	{

core/smn_menus.cpp

@@ -844,8 +844,6 @@ static cell_t SetMenuTitle(IPluginContext *pContext, const cell_t *params)
 		return pContext->ThrowNativeError("Menu handle %x is invalid (error %d)", hndl, err);
 	}
 
-	g_SourceMod.SetGlobalTarget(SOURCEMOD_SERVER_LANGUAGE);
-
 	char buffer[1024];
 	g_SourceMod.FormatString(buffer, sizeof(buffer), pContext, params, 2);
 

core/smn_player.cpp

@@ -66,6 +66,22 @@ static cell_t sm_GetMaxClients(IPluginContext *pCtx, const cell_t *params)
 	return g_Players.MaxClients();
 }
 
+static cell_t sm_GetMaxHumanPlayers(IPluginContext *pCtx, const cell_t *params)
+{
+	int maxHumans = -1;
+
+#if SOURCE_ENGINE >= SE_LEFT4DEAD
+	maxHumans = serverClients->GetMaxHumanPlayers();
+#endif
+
+	if( maxHumans == -1 )
+	{
+		return g_Players.MaxClients();
+	}
+	
+	return maxHumans;
+}
+
 static cell_t sm_GetClientName(IPluginContext *pCtx, const cell_t *params)
 {
 	int index = params[1];
@@ -140,16 +156,41 @@ static cell_t sm_GetClientAuthStr(IPluginContext *pCtx, const cell_t *params)
 		return pCtx->ThrowNativeError("Client %d is not connected", index);
 	}
 
-	if (!pPlayer->IsAuthorized())
+	bool validate = true;
+	if (params[0] > 3)
+	{
+		validate = !!params[4];
+	}
+
+	const char *authstr = pPlayer->GetAuthString(validate);
+
+	if (!authstr || authstr[0] == '\0')
 	{
 		return 0;
 	}
 
-	pCtx->StringToLocal(params[2], static_cast<size_t>(params[3]), pPlayer->GetAuthString());
+	pCtx->StringToLocal(params[2], static_cast<size_t>(params[3]), authstr);
 
 	return 1;
 }
 
+static cell_t sm_GetSteamAccountID(IPluginContext *pCtx, const cell_t *params)
+{
+	int index = params[1];
+	if ((index < 1) || (index > g_Players.GetMaxClients()))
+	{
+		return pCtx->ThrowNativeError("Client index %d is invalid", index);
+	}
+
+	CPlayer *pPlayer = g_Players.GetPlayerByIndex(index);
+	if (!pPlayer->IsConnected())
+	{
+		return pCtx->ThrowNativeError("Client %d is not connected", index);
+	}
+
+	return pPlayer->GetSteamAccountID(!!params[2]);
+}
+
 static cell_t sm_IsClientConnected(IPluginContext *pCtx, const cell_t *params)
 {
 	int index = params[1];
@@ -1359,7 +1400,6 @@ static cell_t KickClient(IPluginContext *pContext, const cell_t *params)
 		return 1;
 	}
 
-	pPlayer->MarkAsBeingKicked();
 	g_HL2.AddDelayedKick(client, pPlayer->GetUserId(), buffer);
 
 	return 1;
@@ -1627,6 +1667,7 @@ REGISTER_NATIVES(playernatives)
 	{"CanUserTarget",			CanUserTarget},
 	{"ChangeClientTeam",		ChangeClientTeam},
 	{"GetClientAuthString",		sm_GetClientAuthStr},
+	{"GetSteamAccountID",		sm_GetSteamAccountID},
 	{"GetClientCount",			sm_GetClientCount},
 	{"GetClientInfo",			sm_GetClientInfo},
 	{"GetClientIP",				sm_GetClientIP},
@@ -1634,6 +1675,7 @@ REGISTER_NATIVES(playernatives)
 	{"GetClientTeam",			GetClientTeam},
 	{"GetClientUserId",			GetClientUserId},
 	{"GetMaxClients",			sm_GetMaxClients},
+	{"GetMaxHumanPlayers",		sm_GetMaxHumanPlayers},
 	{"GetUserAdmin",			GetUserAdmin},
 	{"GetUserFlagBits",			GetUserFlagBits},
 	{"IsClientAuthorized",		sm_IsClientAuthorized},

core/smn_usermsgs.cpp

@@ -31,15 +31,22 @@
 
 #include "HandleSys.h"
 #include "PluginSys.h"
-#include "UserMessages.h"
 #include "PlayerManager.h"
 #include "smn_usermsgs.h"
+#ifdef USE_PROTOBUF_USERMESSAGES
+#include "UserMessagePBHelpers.h"
+#endif
+
+HandleType_t g_ProtobufType = NO_HANDLE_TYPE;
+HandleType_t g_WrBitBufType = NO_HANDLE_TYPE;
+HandleType_t g_RdBitBufType = NO_HANDLE_TYPE;
 
-HandleType_t g_WrBitBufType;
-HandleType_t g_RdBitBufType;
 Handle_t g_CurMsgHandle;
+
+#ifndef USE_PROTOBUF_USERMESSAGES
 Handle_t g_ReadBufHandle;
 bf_read g_ReadBitBuf;
+#endif
 
 int g_MsgPlayers[256];
 bool g_IsMsgInExec = false;
@@ -85,10 +92,14 @@ void UsrMessageNatives::OnSourceModAllInitialized()
 	g_HandleSys.InitAccessDefaults(NULL, &sec);
 	sec.access[HandleAccess_Delete] = HANDLE_RESTRICT_IDENTITY;
 
+#ifdef USE_PROTOBUF_USERMESSAGES
+	g_ProtobufType = g_HandleSys.CreateType("ProtobufUM", this, 0, NULL, NULL, g_pCoreIdent, NULL);
+#else
 	g_WrBitBufType = g_HandleSys.CreateType("BitBufWriter", this, 0, NULL, NULL, g_pCoreIdent, NULL);
 	g_RdBitBufType = g_HandleSys.CreateType("BitBufReader", this, 0, NULL, &sec, g_pCoreIdent, NULL);
 
 	g_ReadBufHandle = g_HandleSys.CreateHandle(g_RdBitBufType, &g_ReadBitBuf, NULL, g_pCoreIdent, NULL);
+#endif
 
 	g_PluginSys.AddPluginsListener(this);
 }
@@ -98,6 +109,11 @@ void UsrMessageNatives::OnSourceModShutdown()
 	HandleSecurity sec;
 	sec.pIdentity = g_pCoreIdent;
 
+#ifdef USE_PROTOBUF_USERMESSAGES
+	g_HandleSys.RemoveType(g_ProtobufType, g_pCoreIdent);
+
+	g_ProtobufType = 0;
+#else
 	g_HandleSys.FreeHandle(g_ReadBufHandle, &sec);
 
 	g_HandleSys.RemoveType(g_WrBitBufType, g_pCoreIdent);
@@ -105,15 +121,24 @@ void UsrMessageNatives::OnSourceModShutdown()
 
 	g_WrBitBufType = 0;
 	g_RdBitBufType = 0;
+#endif
 }
 
 void UsrMessageNatives::OnHandleDestroy(HandleType_t type, void *object)
 {
+#ifdef USE_PROTOBUF_USERMESSAGES
+	delete (SMProtobufMessage *)object;
+#endif
 }
 
 bool UsrMessageNatives::GetHandleApproxSize(HandleType_t type, void *object, unsigned int *pSize)
 {
+#ifdef USE_PROTOBUF_USERMESSAGES
+	// Different messages have different sizes, but this works as an approximate
+	*pSize = sizeof(protobuf::Message) + sizeof(SMProtobufMessage);
+#else
 	*pSize = sizeof(bf_read);
+#endif
 
 	return true;
 }
@@ -275,37 +300,69 @@ IPluginFunction *MsgListenerWrapper::GetNotifyFunction() const
 	return m_Notify;
 }
 
+#ifdef USE_PROTOBUF_USERMESSAGES
+void MsgListenerWrapper::OnUserMessage(int msg_id, protobuf::Message *msg, IRecipientFilter *pFilter)
+#else
 void MsgListenerWrapper::OnUserMessage(int msg_id, bf_write *bf, IRecipientFilter *pFilter)
+#endif
 {
 	cell_t res;
+	Handle_t hndl;
 	size_t size = _FillInPlayers(g_MsgPlayers, pFilter);
 
+#ifdef USE_PROTOBUF_USERMESSAGES
+	hndl = g_HandleSys.CreateHandle(g_ProtobufType, new SMProtobufMessage(msg), NULL, g_pCoreIdent, NULL);
+#else
 	g_ReadBitBuf.StartReading(bf->GetBasePointer(), bf->GetNumBytesWritten());
+	hndl = g_ReadBufHandle;
+#endif
 
 	m_Hook->PushCell(msg_id);
-	m_Hook->PushCell(g_ReadBufHandle);
+	m_Hook->PushCell(hndl);
 	m_Hook->PushArray(g_MsgPlayers, size);
 	m_Hook->PushCell(size);
 	m_Hook->PushCell(pFilter->IsReliable());
 	m_Hook->PushCell(pFilter->IsInitMessage());
 	m_Hook->Execute(&res);
+
+#ifdef USE_PROTOBUF_USERMESSAGES
+	HandleSecurity sec;
+	sec.pIdentity = g_pCoreIdent;
+	g_HandleSys.FreeHandle(hndl, &sec);
+#endif
 }
 
+#ifdef USE_PROTOBUF_USERMESSAGES
+ResultType MsgListenerWrapper::InterceptUserMessage(int msg_id, protobuf::Message *msg, IRecipientFilter *pFilter)
+#else
 ResultType MsgListenerWrapper::InterceptUserMessage(int msg_id, bf_write *bf, IRecipientFilter *pFilter)
+#endif
 {
+	Handle_t hndl;
 	cell_t res = static_cast<cell_t>(Pl_Continue);
 	size_t size = _FillInPlayers(g_MsgPlayers, pFilter);
 
+#ifdef USE_PROTOBUF_USERMESSAGES
+	hndl = g_HandleSys.CreateHandle(g_ProtobufType, new SMProtobufMessage(msg), NULL, g_pCoreIdent, NULL);
+#else
 	g_ReadBitBuf.StartReading(bf->GetBasePointer(), bf->GetNumBytesWritten());
+	hndl = g_ReadBufHandle;
+#endif
 
 	m_Intercept->PushCell(msg_id);
-	m_Intercept->PushCell(g_ReadBufHandle);
+	m_Intercept->PushCell(hndl);
 	m_Intercept->PushArray(g_MsgPlayers, size);
 	m_Intercept->PushCell(size);
 	m_Intercept->PushCell(pFilter->IsReliable());
 	m_Intercept->PushCell(pFilter->IsInitMessage());
 	m_Intercept->Execute(&res);
 
+#ifdef USE_PROTOBUF_USERMESSAGES
+	HandleSecurity sec;
+	sec.pIdentity = g_pCoreIdent;
+	g_HandleSys.FreeHandle(hndl, &sec);
+#endif
+
 	return static_cast<ResultType>(res);
 }
 
@@ -330,6 +387,11 @@ void MsgListenerWrapper::OnPostUserMessage(int msg_id, bool sent)
 
 static UsrMessageNatives s_UsrMessageNatives;
 
+static cell_t smn_GetUserMessageType(IPluginContext *pCtx, const cell_t *params)
+{
+	return g_UserMsgs.GetUserMessageType();
+}
+
 static cell_t smn_GetUserMessageId(IPluginContext *pCtx, const cell_t *params)
 {
 	char *msgname;
@@ -353,7 +415,6 @@ static cell_t smn_StartMessage(IPluginContext *pCtx, const cell_t *params)
 	cell_t *cl_array;
 	unsigned int numClients;
 	int msgid;
-	bf_write *pBitBuf;
 	int client;
 	CPlayer *pPlayer = NULL;
 
@@ -387,13 +448,24 @@ static cell_t smn_StartMessage(IPluginContext *pCtx, const cell_t *params)
 		}
 	}
 
-	pBitBuf = g_UserMsgs.StartMessage(msgid, cl_array, numClients, params[4]);
+#ifdef USE_PROTOBUF_USERMESSAGES
+	protobuf::Message *msg = g_UserMsgs.StartProtobufMessage(msgid, cl_array, numClients, params[4]);
+	if (!msg)
+	{
+		return pCtx->ThrowNativeError("Unable to execute a new message while in hook");
+	}
+
+	g_CurMsgHandle = g_HandleSys.CreateHandle(g_ProtobufType, new SMProtobufMessage(msg), pCtx->GetIdentity(), g_pCoreIdent, NULL);
+#else
+	bf_write *pBitBuf = g_UserMsgs.StartBitBufMessage(msgid, cl_array, numClients, params[4]);
 	if (!pBitBuf)
 	{
 		return pCtx->ThrowNativeError("Unable to execute a new message while in hook");
 	}
 
 	g_CurMsgHandle = g_HandleSys.CreateHandle(g_WrBitBufType, pBitBuf, pCtx->GetIdentity(), g_pCoreIdent, NULL);
+#endif
+
 	g_IsMsgInExec = true;
 
 	return g_CurMsgHandle;
@@ -403,7 +475,6 @@ static cell_t smn_StartMessageEx(IPluginContext *pCtx, const cell_t *params)
 {
 	cell_t *cl_array;
 	unsigned int numClients;
-	bf_write *pBitBuf;
 	int client;
 	CPlayer *pPlayer = NULL;
 	int msgid = params[1];
@@ -436,13 +507,23 @@ static cell_t smn_StartMessageEx(IPluginContext *pCtx, const cell_t *params)
 		}
 	}
 
-	pBitBuf = g_UserMsgs.StartMessage(msgid, cl_array, numClients, params[4]);
+#ifdef USE_PROTOBUF_USERMESSAGES
+	protobuf::Message *msg = g_UserMsgs.StartProtobufMessage(msgid, cl_array, numClients, params[4]);
+	if (!msg)
+	{
+		return pCtx->ThrowNativeError("Unable to execute a new message while in hook");
+	}
+
+	g_CurMsgHandle = g_HandleSys.CreateHandle(g_ProtobufType, new SMProtobufMessage(msg), pCtx->GetIdentity(), g_pCoreIdent, NULL);
+#else
+	bf_write *pBitBuf = g_UserMsgs.StartBitBufMessage(msgid, cl_array, numClients, params[4]);
 	if (!pBitBuf)
 	{
 		return pCtx->ThrowNativeError("Unable to execute a new message while in hook");
 	}
 
 	g_CurMsgHandle = g_HandleSys.CreateHandle(g_WrBitBufType, pBitBuf, pCtx->GetIdentity(), g_pCoreIdent, NULL);
+#endif
 	g_IsMsgInExec = true;
 
 	return g_CurMsgHandle;
@@ -534,6 +615,7 @@ static cell_t smn_UnhookUserMessage(IPluginContext *pCtx, const cell_t *params)
 
 REGISTER_NATIVES(usrmsgnatives)
 {
+	{"GetUserMessageType",			smn_GetUserMessageType},
 	{"GetUserMessageId",			smn_GetUserMessageId},
 	{"GetUserMessageName",			smn_GetUserMessageName},
 	{"StartMessage",				smn_StartMessage},

core/smn_usermsgs.h

@@ -32,9 +32,14 @@
 #ifndef _INCLUDE_SOURCEMOD_CMSGLISTENERWRAPPER_H_
 #define _INCLUDE_SOURCEMOD_CMSGLISTENERWRAPPER_H_
 
-extern int g_MsgPlayers[256];
+#include "UserMessages.h"
 
-class MsgListenerWrapper : public IUserMessageListener
+class MsgListenerWrapper
+#ifdef USE_PROTOBUF_USERMESSAGES
+	: public IProtobufUserMessageListener
+#else
+	: public IBitBufUserMessageListener
+#endif
 {
 public:
 	void Initialize(int msgid, IPluginFunction *hook, IPluginFunction *notify, bool intercept);
@@ -43,8 +48,13 @@ public:
 	IPluginFunction *GetHookedFunction() const;
 	IPluginFunction *GetNotifyFunction() const;
 public: //IUserMessageListener
+#ifdef USE_PROTOBUF_USERMESSAGES
+	void OnUserMessage(int msg_id, protobuf::Message *msg, IRecipientFilter *pFilter);
+	ResultType InterceptUserMessage(int msg_id, protobuf::Message *msg, IRecipientFilter *pFilter);
+#else
 	void OnUserMessage(int msg_id, bf_write *bf, IRecipientFilter *pFilter);
 	ResultType InterceptUserMessage(int msg_id, bf_write *bf, IRecipientFilter *pFilter);
+#endif
 	void OnPostUserMessage(int msg_id, bool sent);
 private:
 	size_t _FillInPlayers(int *pl_array, IRecipientFilter *pFilter);
@@ -56,4 +66,8 @@ private:
 	int m_MsgId;
 };
 
+extern HandleType_t g_WrBitBufType;
+extern HandleType_t g_RdBitBufType;
+extern HandleType_t g_ProtobufType;
+
 #endif //_INCLUDE_SOURCEMOD_CMSGLISTENERWRAPPER_H_

core/sourcemm_api.cpp

@@ -50,6 +50,7 @@ CallClass<IVEngineServer> *enginePatch = NULL;
 CallClass<IServerGameDLL> *gamedllPatch = NULL;
 IPlayerInfoManager *playerinfo = NULL;
 IBaseFileSystem *basefilesystem = NULL;
+IFileSystem *filesystem = NULL;
 IEngineSound *enginesound = NULL;
 IServerPluginHelpers *serverpluginhelpers = NULL;
 IServerPluginCallbacks *vsp_interface = NULL;
@@ -68,6 +69,7 @@ bool SourceMod_Core::Load(PluginId id, ISmmAPI *ismm, char *error, size_t maxlen
 	GET_V_IFACE_CURRENT(GetEngineFactory, gameevents, IGameEventManager2, INTERFACEVERSION_GAMEEVENTSMANAGER2);
 	GET_V_IFACE_CURRENT(GetEngineFactory, engrandom, IUniformRandomStream, VENGINE_SERVER_RANDOM_INTERFACE_VERSION);
 	GET_V_IFACE_CURRENT(GetFileSystemFactory, basefilesystem, IBaseFileSystem, BASEFILESYSTEM_INTERFACE_VERSION);
+	GET_V_IFACE_CURRENT(GetFileSystemFactory, filesystem, IFileSystem, FILESYSTEM_INTERFACE_VERSION);
 	GET_V_IFACE_CURRENT(GetEngineFactory, enginesound, IEngineSound, IENGINESOUND_SERVER_INTERFACE_VERSION);
 	GET_V_IFACE_CURRENT(GetEngineFactory, serverpluginhelpers, IServerPluginHelpers, INTERFACEVERSION_ISERVERPLUGINHELPERS);
 
@@ -145,7 +147,7 @@ const char *SourceMod_Core::GetLicense()
 
 const char *SourceMod_Core::GetVersion()
 {
-	return SM_FULL_VERSION;
+	return SM_VERSION_STRING;
 }
 
 const char *SourceMod_Core::GetDate()

core/sourcemm_api.h

@@ -32,11 +32,11 @@
 #ifndef _INCLUDE_SOURCEMOD_MM_API_H_
 #define _INCLUDE_SOURCEMOD_MM_API_H_
 
-#if SOURCE_ENGINE == SE_ALIENSWARM
+#if SOURCE_ENGINE >= SE_ALIENSWARM
 #include "convar_sm_swarm.h"
-#elif (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
+#elif SOURCE_ENGINE >= SE_LEFT4DEAD
 #include "convar_sm_l4d.h"
-#elif (SOURCE_ENGINE == SE_ORANGEBOX) || (SOURCE_ENGINE == SE_BLOODYGOODTIME) || (SOURCE_ENGINE == SE_EYE) || (SOURCE_ENGINE == SE_ORANGEBOXVALVE)
+#elif SOURCE_ENGINE >= SE_ORANGEBOX
 #include "convar_sm_ob.h"
 #else
 #include "convar_sm.h"
@@ -99,6 +99,7 @@ extern SourceHook::CallClass<IServerGameDLL> *gamedllPatch;
 extern IUniformRandomStream *engrandom;
 extern IPlayerInfoManager *playerinfo;
 extern IBaseFileSystem *basefilesystem;
+extern IFileSystem *filesystem;
 extern IEngineSound *enginesound;
 extern IServerPluginHelpers *serverpluginhelpers;
 extern IServerPluginCallbacks *vsp_interface;

core/sourcemod.h

@@ -152,7 +152,5 @@ private:
 extern bool g_Loaded;
 extern bool sm_show_debug_spew;
 extern SourceModBase g_SourceMod;
-extern HandleType_t g_WrBitBufType;		//:TODO: find a better place for this
-extern HandleType_t g_RdBitBufType;		//:TODO: find a better place for this
 
 #endif //_INCLUDE_SOURCEMOD_GLOBALHEADER_H_

core/version.rc

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

extensions/bintools/AMBuilder

@@ -19,6 +19,7 @@ binary.AddSourceFiles('extensions/bintools', [
 	'sdk/smsdk_ext.cpp'
 	])
 SM.AutoVersion('extensions/bintools', binary)
+SM.ExtractDebugInfo(extension, binary)
 binary.SendToJob()
 
 

extensions/bintools/extension.cpp

@@ -61,7 +61,7 @@ bool BinTools::SDK_OnLoad(char *error, size_t maxlength, bool late)
 
 const char *BinTools::GetExtensionVerString()
 {
-	return SM_FULL_VERSION;
+	return SM_VERSION_STRING;
 }
 
 const char *BinTools::GetExtensionDateString()

extensions/bintools/msvc10/bintools.sln

@@ -0,0 +1,56 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bintools", "bintools.vcxproj", "{E38F65D9-74B2-4373-B46A-DBB76F579F98}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug - Dark Messiah|Win32 = Debug - Dark Messiah|Win32
+		Debug - Episode 1|Win32 = Debug - Episode 1|Win32
+		Debug - Left 4 Dead 2|Win32 = Debug - Left 4 Dead 2|Win32
+		Debug - Left 4 Dead|Win32 = Debug - Left 4 Dead|Win32
+		Debug - Old Metamod|Win32 = Debug - Old Metamod|Win32
+		Debug - Orange Box Valve|Win32 = Debug - Orange Box Valve|Win32
+		Debug - Orange Box|Win32 = Debug - Orange Box|Win32
+		Release - Dark Messiah|Win32 = Release - Dark Messiah|Win32
+		Release - Episode 1|Win32 = Release - Episode 1|Win32
+		Release - Left 4 Dead 2|Win32 = Release - Left 4 Dead 2|Win32
+		Release - Left 4 Dead|Win32 = Release - Left 4 Dead|Win32
+		Release - Old Metamod|Win32 = Release - Old Metamod|Win32
+		Release - Orange Box Valve|Win32 = Release - Orange Box Valve|Win32
+		Release - Orange Box|Win32 = Release - Orange Box|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Debug - Dark Messiah|Win32.ActiveCfg = Debug - Dark Messiah|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Debug - Dark Messiah|Win32.Build.0 = Debug - Dark Messiah|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Debug - Episode 1|Win32.ActiveCfg = Debug - Episode 1|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Debug - Episode 1|Win32.Build.0 = Debug - Episode 1|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Debug - Left 4 Dead 2|Win32.ActiveCfg = Debug - Left 4 Dead 2|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Debug - Left 4 Dead 2|Win32.Build.0 = Debug - Left 4 Dead 2|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Debug - Left 4 Dead|Win32.ActiveCfg = Debug - Left 4 Dead|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Debug - Left 4 Dead|Win32.Build.0 = Debug - Left 4 Dead|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Debug - Old Metamod|Win32.ActiveCfg = Debug - Old Metamod|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Debug - Old Metamod|Win32.Build.0 = Debug - Old Metamod|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Debug - Orange Box Valve|Win32.ActiveCfg = Debug - Orange Box Valve|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Debug - Orange Box Valve|Win32.Build.0 = Debug - Orange Box Valve|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Debug - Orange Box|Win32.ActiveCfg = Debug - Orange Box|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Debug - Orange Box|Win32.Build.0 = Debug - Orange Box|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Release - Dark Messiah|Win32.ActiveCfg = Release - Dark Messiah|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Release - Dark Messiah|Win32.Build.0 = Release - Dark Messiah|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Release - Episode 1|Win32.ActiveCfg = Release - Episode 1|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Release - Episode 1|Win32.Build.0 = Release - Episode 1|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Release - Left 4 Dead 2|Win32.ActiveCfg = Release - Left 4 Dead 2|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Release - Left 4 Dead 2|Win32.Build.0 = Release - Left 4 Dead 2|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Release - Left 4 Dead|Win32.ActiveCfg = Release - Left 4 Dead|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Release - Left 4 Dead|Win32.Build.0 = Release - Left 4 Dead|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Release - Old Metamod|Win32.ActiveCfg = Release - Old Metamod|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Release - Old Metamod|Win32.Build.0 = Release - Old Metamod|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Release - Orange Box Valve|Win32.ActiveCfg = Release - Orange Box Valve|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Release - Orange Box Valve|Win32.Build.0 = Release - Orange Box Valve|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Release - Orange Box|Win32.ActiveCfg = Release - Orange Box|Win32
+		{E38F65D9-74B2-4373-B46A-DBB76F579F98}.Release - Orange Box|Win32.Build.0 = Release - Orange Box|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

extensions/bintools/msvc10/bintools.vcxproj

@@ -0,0 +1,154 @@
+<?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>{E38F65D9-74B2-4373-B46A-DBB76F579F98}</ProjectGuid>
+    <RootNamespace>bintools</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.40219.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>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <TargetName>bintools.ext</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <TargetName>bintools.ext</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>
+      </AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..;..\sdk;..\..\..\public;..\..\..\public\jit;..\..\..\public\jit\x86;..\..\..\public\extensions;..\..\..\public\sourcepawn;$(MMSOURCE19)\core;$(MMSOURCE19)\core\sourcehook;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BINTOOLS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;ORANGEBOX_BUILD;HOOKING_ENABLED;%(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>
+    <ResourceCompile>
+      <PreprocessorDefinitions>BINARY_NAME="\"$(TargetFileName)\"";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <IgnoreStandardIncludePath>
+      </IgnoreStandardIncludePath>
+      <AdditionalIncludeDirectories>..\..\..\public</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <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>
+    <PostBuildEvent>
+      <Command>IF NOT "%SMOUTDIR%"=="" copy /Y "$(TargetDir)$(TargetFileName)" "%SMOUTDIR%\extensions"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>
+      </AdditionalOptions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>..;..\sdk;..\..\..\public;..\..\..\public\jit;..\..\..\public\jit\x86;..\..\..\public\extensions;..\..\..\public\sourcepawn;$(MMSOURCE19)\core;$(MMSOURCE19)\core\sourcehook;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BINTOOLS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;HOOKING_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>BINARY_NAME="\"$(TargetFileName)\"";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <IgnoreStandardIncludePath>
+      </IgnoreStandardIncludePath>
+      <AdditionalIncludeDirectories>..\..\..\public</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <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>
+    <PostBuildEvent>
+      <Command>IF NOT "%SMOUTDIR%"=="" copy /Y "$(TargetDir)$(TargetFileName)" "%SMOUTDIR%\extensions"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\extension.cpp" />
+    <ClCompile Include="..\CallMaker.cpp" />
+    <ClCompile Include="..\CallWrapper.cpp" />
+    <ClCompile Include="..\HookWrapper.cpp" />
+    <ClCompile Include="..\jit_call.cpp" />
+    <ClCompile Include="..\jit_hook.cpp" />
+    <ClCompile Include="..\sdk\smsdk_ext.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\extension.h" />
+    <ClInclude Include="..\..\..\public\extensions\IBinTools.h" />
+    <ClInclude Include="..\CallMaker.h" />
+    <ClInclude Include="..\CallWrapper.h" />
+    <ClInclude Include="..\HookWrapper.h" />
+    <ClInclude Include="..\jit_compile.h" />
+    <ClInclude Include="..\sdk\smsdk_config.h" />
+    <ClInclude Include="..\sdk\smsdk_ext.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\version.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

extensions/bintools/msvc10/bintools.vcxproj.filters

@@ -0,0 +1,88 @@
+<?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>{0318D835-E129-4fe0-9B9C-C810AC179F31}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{9021A2EF-600E-4028-AE3E-9DDA4C94264C}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{C06F7BFF-18EE-4994-8572-D6383011354B}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+    <Filter Include="BinTools">
+      <UniqueIdentifier>{7BD12831-E179-4961-A3B0-BA9FCF311C7E}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="BinTools\Header Files">
+      <UniqueIdentifier>{2B033553-ECC7-42cc-AD11-D1D985D8BC5A}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="BinTools\Source Files">
+      <UniqueIdentifier>{F70EA5AC-224C-448f-A72D-11C2D06208B3}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="SourceMod SDK">
+      <UniqueIdentifier>{6183251D-B1E4-4cc6-93B2-A0111B2115BA}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Interfaces">
+      <UniqueIdentifier>{7DE81EA3-99D9-4f34-823A-B314791F3514}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\extension.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CallMaker.cpp">
+      <Filter>BinTools\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CallWrapper.cpp">
+      <Filter>BinTools\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\HookWrapper.cpp">
+      <Filter>BinTools\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\jit_call.cpp">
+      <Filter>BinTools\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\jit_hook.cpp">
+      <Filter>BinTools\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sdk\smsdk_ext.cpp">
+      <Filter>SourceMod SDK</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\extension.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\public\extensions\IBinTools.h">
+      <Filter>Resource Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CallMaker.h">
+      <Filter>BinTools\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CallWrapper.h">
+      <Filter>BinTools\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\HookWrapper.h">
+      <Filter>BinTools\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\jit_compile.h">
+      <Filter>BinTools\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\sdk\smsdk_config.h">
+      <Filter>SourceMod SDK</Filter>
+    </ClInclude>
+    <ClInclude Include="..\sdk\smsdk_ext.h">
+      <Filter>SourceMod SDK</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>

extensions/bintools/version.rc

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

extensions/clientprefs/AMBuilder

@@ -15,5 +15,6 @@ binary.AddSourceFiles('extensions/clientprefs', [
 	'sdk/smsdk_ext.cpp'
 	])
 SM.AutoVersion('extensions/clientprefs', binary)
+SM.ExtractDebugInfo(extension, binary)
 binary.SendToJob()
 

extensions/clientprefs/cookie.cpp

@@ -216,52 +216,34 @@ void CookieManager::OnClientDisconnecting(int client)
 
 	CookieData *current;
 	
-	_iter = clientData[client].begin();
+	IGamePlayer *player = playerhelpers->GetGamePlayer(client);
+	const char *pAuth = player ? player->GetAuthString() : NULL;
+	int dbId;
 
-	while (_iter != clientData[client].end())
+	for (SourceHook::List<CookieData *>::iterator _iter = clientData[client].begin(); _iter != clientData[client].end(); _iter++)
 	{
 		current = (CookieData *)*_iter;
+		dbId = current->parent->dbid;
 
-		if (!current->changed)
+		if (player == NULL || pAuth == NULL || !current->changed || dbId == -1)
 		{
 			current->parent->data[client] = NULL;
 			delete current;
-			_iter = clientData[client].erase(_iter);
 			continue;
 		}
 
-		/* Save this cookie to the database */
-		IGamePlayer *player = playerhelpers->GetGamePlayer(client);
-
-		if (player == NULL)
-		{
-			/* panic! */
-			return;
-		}
-
-		int dbId = current->parent->dbid;
-
-		if (dbId == -1)
-		{
-			/* Insert/Find Query must be still running or failed. */
-			return;
-		}
-
 		TQueryOp *op = new TQueryOp(Query_InsertData, client);
 
-		strcpy(op->m_params.steamId, player->GetAuthString());
+		strcpy(op->m_params.steamId, pAuth);
 		op->m_params.cookieId = dbId;
 		op->m_params.data = current;
 
 		g_ClientPrefs.AddQueryToQueue(op);
 
 		current->parent->data[client] = NULL;
-		
-
-		/* We don't delete here, it will be removed when the query is completed */
-
-		_iter = clientData[client].erase(_iter);
 	}
+	
+	clientData[client].clear();
 }
 
 void CookieManager::ClientConnectCallback(int serial, IQuery *data)

extensions/clientprefs/extension.cpp

@@ -201,8 +201,6 @@ void ClientPrefs::SDK_OnUnload()
 
 	phrases->Destroy();
 
-	sharesys->DestroyIdentity( identity );
-
 	plsys->RemovePluginsListener(&g_CookieManager);
 	playerhelpers->RemoveClientListener(&g_CookieManager);
 
@@ -485,7 +483,7 @@ IdentityToken_t *ClientPrefs::GetIdentity() const
 
 const char *ClientPrefs::GetExtensionVerString()
 {
-	return SM_FULL_VERSION;
+	return SM_VERSION_STRING;
 }
 
 const char *ClientPrefs::GetExtensionDateString()

extensions/clientprefs/msvc10/clientprefs.sln

@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clientprefs", "clientprefs.vcxproj", "{B3E797CF-4E77-4C9D-B8A8-7589B6902206}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug|Win32.Build.0 = Debug|Win32
+		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release|Win32.ActiveCfg = Release|Win32
+		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

extensions/clientprefs/msvc10/clientprefs.vcxproj

@@ -0,0 +1,141 @@
+<?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>{B3E797CF-4E77-4C9D-B8A8-7589B6902206}</ProjectGuid>
+    <RootNamespace>clientprefs</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.40219.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>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <TargetName>clientprefs.ext</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <TargetName>clientprefs.ext</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;$(MMSOURCE19)\core\sourcehook;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;%(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>
+    <ResourceCompile>
+      <PreprocessorDefinitions>BINARY_NAME="\"$(TargetFileName)\"";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\public</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <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>
+    <PostBuildEvent>
+      <Command>IF NOT "%SMOUTDIR%"=="" copy /Y "$(TargetDir)$(TargetFileName)" "%SMOUTDIR%\extensions\"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;$(MMSOURCE19)\core\sourcehook;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>BINARY_NAME="\"$(TargetFileName)\"";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\public</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <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>
+    <PostBuildEvent>
+      <Command>IF NOT "%SMOUTDIR%"=="" copy /Y "$(TargetDir)$(TargetFileName)" "%SMOUTDIR%\extensions\"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\cookie.cpp" />
+    <ClCompile Include="..\extension.cpp" />
+    <ClCompile Include="..\menus.cpp" />
+    <ClCompile Include="..\natives.cpp" />
+    <ClCompile Include="..\query.cpp" />
+    <ClCompile Include="..\sdk\smsdk_ext.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\cookie.h" />
+    <ClInclude Include="..\extension.h" />
+    <ClInclude Include="..\menus.h" />
+    <ClInclude Include="..\query.h" />
+    <ClInclude Include="..\sdk\smsdk_config.h" />
+    <ClInclude Include="..\sdk\smsdk_ext.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\version.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

extensions/clientprefs/msvc10/clientprefs.vcxproj.filters

@@ -0,0 +1,65 @@
+<?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="SourceMod SDK">
+      <UniqueIdentifier>{31958233-BB2D-4e41-A8F9-CE8A4684F436}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\cookie.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\extension.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\menus.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\natives.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\query.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sdk\smsdk_ext.cpp">
+      <Filter>SourceMod SDK</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\cookie.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\extension.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\menus.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\query.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\sdk\smsdk_config.h">
+      <Filter>SourceMod SDK</Filter>
+    </ClInclude>
+    <ClInclude Include="..\sdk\smsdk_ext.h">
+      <Filter>SourceMod SDK</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>

extensions/clientprefs/version.rc

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

extensions/cstrike/AMBuilder

@@ -1,25 +1,33 @@
 # vim: set ts=2 sw=2 tw=99 noet ft=python: 
 import os
 
-sdk = SM.sdkInfo['ep2v']
+for i in SM.sdkInfo:
+	if i != 'css' and i != 'csgo':
+		continue
 	
-if AMBuild.target['platform'] in sdk['platform']:
+	sdk = SM.sdkInfo[i]
-	compiler = SM.DefaultHL2Compiler('extensions/cstrike', 'ep2v')
+	
+	if AMBuild.target['platform'] not in sdk['platform']:
+		continue
+	
+	compiler = SM.DefaultHL2Compiler('extensions/cstrike', i)
 
 	name = 'game.cstrike.ext.' + sdk['ext']
 	extension = AMBuild.AddJob(name)
 	binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler)
-	SM.PreSetupHL2Job(extension, binary, 'ep2v')
+	SM.PreSetupHL2Job(extension, binary, i)
 	binary.AddSourceFiles('extensions/cstrike', [
 		'extension.cpp',
 		'natives.cpp',
 		'RegNatives.cpp',
 		'timeleft.cpp',
 		'forwards.cpp',
+		'util_cstrike.cpp',
 		'sdk/smsdk_ext.cpp',
 		'CDetour/detours.cpp',
 		'asm/asm.c'
 		])
-	SM.PostSetupHL2Job(extension, binary, 'ep2v')
+	SM.PostSetupHL2Job(extension, binary, i)
 	SM.AutoVersion('extensions/cstrike', binary)
+	SM.ExtractDebugInfo(extension, binary)
 	binary.SendToJob()

extensions/cstrike/CDetour/detourhelpers.h

@@ -34,7 +34,9 @@
 
 #if defined PLATFORM_POSIX
 #include <sys/mman.h>
+#ifndef PAGE_SIZE
 #define	PAGE_SIZE	4096
+#endif
 #define ALIGN(ar) ((long)ar & ~(PAGE_SIZE-1))
 #define	PAGE_EXECUTE_READWRITE	PROT_READ|PROT_WRITE|PROT_EXEC
 #endif

extensions/cstrike/Makefile

@@ -4,10 +4,12 @@
 SMSDK = ../..
 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-1.7
+HL2SDK_CSGO = ../../../hl2sdk-csgo
+MMSOURCE19 = ../../../mmsource-1.9
 
 #####################################
 ### EDIT BELOW FOR OTHER PROJECTS ###
@@ -33,7 +35,7 @@ CPP = gcc
 override ENGSET = false
 
 # Check for valid list of engines
-ifneq (,$(filter original orangebox orangeboxvalve left4dead left4dead2,$(ENGINE)))
+ifneq (,$(filter original orangebox css orangeboxvalve left4dead left4dead2,$(ENGINE)))
 	override ENGSET = true
 endif
 
@@ -47,30 +49,40 @@ ifeq "$(ENGINE)" "orangebox"
 	CFLAGS += -DSOURCE_ENGINE=3
 	GAMEFIX = 2.ep2
 endif
+ifeq "$(ENGINE)" "css"
+	HL2SDK = $(HL2SDK_CSS)
+	CFLAGS += -DSOURCE_ENGINE=4
+	GAMEFIX = 2.css
+endif
 ifeq "$(ENGINE)" "orangeboxvalve"
 	HL2SDK = $(HL2SDK_OB_VALVE)
-	CFLAGS += -DSOURCE_ENGINE=4
+	CFLAGS += -DSOURCE_ENGINE=5
 	GAMEFIX = 2.ep2v
 endif
 ifeq "$(ENGINE)" "left4dead"
 	HL2SDK = $(HL2SDK_L4D)
-	CFLAGS += -DSOURCE_ENGINE=5
+	CFLAGS += -DSOURCE_ENGINE=6
 	GAMEFIX = 2.l4d
 endif
 ifeq "$(ENGINE)" "left4dead2"
 	HL2SDK = $(HL2SDK_L4D2)
-	CFLAGS += -DSOURCE_ENGINE=6
+	CFLAGS += -DSOURCE_ENGINE=7
 	GAMEFIX = 2.l4d2
 endif
+ifeq "$(ENGINE)" "csgo"
+	HL2SDK = $(HL2SDK_CSGO)
+	CFLAGS += -DSOURCE_ENGINE=8
+	GAMEFIX = 2.csgo
+endif
 
 HL2PUB = $(HL2SDK)/public
 
 ifeq "$(ENGINE)" "original"
 	INCLUDE += -I$(HL2SDK)/public/dlls
-	METAMOD = $(MMSOURCE17)/core-legacy
+	METAMOD = $(MMSOURCE19)/core-legacy
 else
 	INCLUDE += -I$(HL2SDK)/public/game/server
-	METAMOD = $(MMSOURCE17)/core
+	METAMOD = $(MMSOURCE19)/core
 endif
 
 OS := $(shell uname -s)
@@ -103,8 +115,8 @@ ifeq "$(USEMETA)" "true"
 	INCLUDE += -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \
 		-I$(METAMOD) -I$(METAMOD)/sourcehook -I$(SMSDK)/public -I$(SMSDK)/public/extensions \
 		-I$(SMSDK)/public/sourcepawn
-	CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 \
+	CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_CSS=4 -DSE_ORANGEBOXVALVE=5 \
-		-DSE_LEFT4DEAD=5 -DSE_LEFT4DEAD2=6
+		-DSE_LEFT4DEAD=6 -DSE_LEFT4DEAD2=7 -DSE_CSGO=8
 else
 	INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn
 endif
@@ -168,7 +180,7 @@ all: check
 check:
 	if [ "$(USEMETA)" = "true" ] && [ "$(ENGSET)" = "false" ]; then \
 		echo "You must supply one of the following values for ENGINE:"; \
-		echo "left4dead2, left4dead, orangeboxvalve, orangebox, or original"; \
+		echo "left4dead2, left4dead, orangeboxvalve, css, orangebox, or original"; \
 		exit 1; \
 	fi
 

extensions/cstrike/extension.cpp

@@ -59,9 +59,9 @@ ISDKTools *g_pSDKTools = NULL;
 
 bool CStrike::SDK_OnLoad(char *error, size_t maxlength, bool late)
 {
-	if (strcmp(g_pSM->GetGameFolderName(), "cstrike") != 0)
+	if (strcmp(g_pSM->GetGameFolderName(), "cstrike") != 0 && strcmp(g_pSM->GetGameFolderName(), "csgo") != 0)
 	{
-		snprintf(error, maxlength, "Cannot Load Cstrike Extension on mods other than CS:S");
+		snprintf(error, maxlength, "Cannot Load Cstrike Extension on mods other than CS:S and CS:GO");
 		return false;
 	}
 
@@ -73,7 +73,7 @@ bool CStrike::SDK_OnLoad(char *error, size_t maxlength, bool late)
 	{
 		if (error)
 		{
-			snprintf(error, maxlength, "Could not read sm-cstrike.games.txt: %s", conf_error);
+			snprintf(error, maxlength, "Could not read sm-cstrike.games: %s", conf_error);
 		}
 		return false;
 	}
@@ -283,7 +283,7 @@ bool CStrike::ProcessCommandTarget(cmd_target_info_t *info)
 
 const char *CStrike::GetExtensionVerString()
 {
-	return SM_FULL_VERSION;
+	return SM_VERSION_STRING;
 }
 
 const char *CStrike::GetExtensionDateString()

extensions/cstrike/extension.h

@@ -44,12 +44,22 @@
 
 int CallPriceForward(int client, const char *weapon_name, int price);
 
+#if SOURCE_ENGINE == SE_CSGO
+#define WEAPON_C4 49
+#define WEAPON_KNIFE 42
+#define WEAPON_KNIFE_GG 41
+#define WEAPON_KEVLAR 50
+#define WEAPON_ASSAULTSUIT 51
+#define WEAPON_NIGHTVISION 52
+#define WEAPON_DEFUSER 53
+#else
 #define WEAPON_C4 6
 #define WEAPON_KNIFE 28
 #define WEAPON_SHIELD 30
 #define WEAPON_KEVLAR 31
 #define WEAPON_ASSAULTSUIT 32
 #define WEAPON_NIGHTVISION 33
+#endif
 
 /**
  * @brief Sample implementation of the SDK Extension.

extensions/cstrike/forwards.cpp

@@ -1,5 +1,6 @@
 #include "extension.h"
 #include "forwards.h"
+#include "util_cstrike.h"
 
 bool g_pTerminateRoundDetoured = false;
 bool g_pCSWeaponDropDetoured = false;
@@ -20,7 +21,11 @@ CDetour *DCSWeaponDrop = NULL;
 
 int weaponNameOffset = -1;
 
+#if SOURCE_ENGINE == SE_CSGO
+DETOUR_DECL_MEMBER3(DetourHandleBuy, int, const char *, weapon, int, iUnknown, bool, bRebuy)
+#else
 DETOUR_DECL_MEMBER1(DetourHandleBuy, int, const char *, weapon)
+#endif
 {
 	int client = gamehelpers->EntityToBCompatRef(reinterpret_cast<CBaseEntity *>(this));
 
@@ -37,11 +42,17 @@ DETOUR_DECL_MEMBER1(DetourHandleBuy, int, const char *, weapon)
 		lastclient = -1;
 		return 0;
 	}
+
+#if SOURCE_ENGINE == SE_CSGO
+	int val = DETOUR_MEMBER_CALL(DetourHandleBuy)(weapon, iUnknown, bRebuy);
+#else
 	int val = DETOUR_MEMBER_CALL(DetourHandleBuy)(weapon);
+#endif
 	lastclient = -1;
 	return val;
 }
 
+#if SOURCE_ENGINE != SE_CSGO
 DETOUR_DECL_MEMBER0(DetourWeaponPrice, int)
 {
 	int price = DETOUR_MEMBER_CALL(DetourWeaponPrice)();
@@ -53,6 +64,19 @@ DETOUR_DECL_MEMBER0(DetourWeaponPrice, int)
 
 	return CallPriceForward(lastclient, weapon_name, price);
 }
+#else
+DETOUR_DECL_MEMBER2(DetourWeaponPrice, int, const char *, szAttribute, CEconItemView *, pEconItem)
+{
+	int price = DETOUR_MEMBER_CALL(DetourWeaponPrice)(szAttribute, pEconItem);
+
+	if(lastclient == -1 || strcmp(szAttribute, "in_game_price") != 0)
+		return price;
+
+	const char *weapon_name = reinterpret_cast<char *>(this+weaponNameOffset);
+
+	return CallPriceForward(lastclient, weapon_name, price);
+}
+#endif
 
 DETOUR_DECL_MEMBER2(DetourTerminateRound, void, float, delay, int, reason)
 {
@@ -79,6 +103,7 @@ DETOUR_DECL_MEMBER2(DetourTerminateRound, void, float, delay, int, reason)
 
 	return DETOUR_MEMBER_CALL(DetourTerminateRound)(orgdelay, orgreason);
 }
+
 DETOUR_DECL_MEMBER3(DetourCSWeaponDrop, void, CBaseEntity *, weapon, bool, something, bool, toss)
 {
 	if (g_pIgnoreCSWeaponDropDetour)
@@ -102,6 +127,7 @@ DETOUR_DECL_MEMBER3(DetourCSWeaponDrop, void, CBaseEntity *, weapon, bool, somet
 
 	return;
 }
+
 bool CreateWeaponPriceDetour()
 {
 	if (weaponNameOffset == -1)
@@ -112,8 +138,12 @@ bool CreateWeaponPriceDetour()
 			return false;
 		}
 	}
-	DWeaponPrice = DETOUR_CREATE_MEMBER(DetourWeaponPrice, "GetWeaponPrice");
 
+#if SOURCE_ENGINE == SE_CSGO
+	DWeaponPrice = DETOUR_CREATE_MEMBER(DetourWeaponPrice, "GetAttributeInt");
+#else
+	DWeaponPrice = DETOUR_CREATE_MEMBER(DetourWeaponPrice, "GetWeaponPrice");
+#endif
 	if (DWeaponPrice != NULL)
 	{
 		if (!CreateHandleBuyDetour())
@@ -185,7 +215,6 @@ void RemoveWeaponPriceDetour()
 		DWeaponPrice = NULL;
 	}
 	g_PriceDetoured = false;
-
 }
 
 void RemoveHandleBuyDetour()	

extensions/cstrike/msvc10/cstrike.sln

@@ -1,36 +1,39 @@
 
-Microsoft Visual Studio Solution File, Format Version 10.00
+Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2008
+# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cstrike", "cstrike.vcproj", "{B3E797CF-4E77-4C9D-B8A8-7589B6902206}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cstrike", "cstrike.vcxproj", "{B3E797CF-4E77-4C9D-B8A8-7589B6902206}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug - Episode1|Win32 = Debug - Episode1|Win32
 		Debug - Old Metamod|Win32 = Debug - Old Metamod|Win32
-		Debug - Orange Box|Win32 = Debug - Orange Box|Win32
 		Debug - Orange Box Valve|Win32 = Debug - Orange Box Valve|Win32
+		Debug - Orange Box|Win32 = Debug - Orange Box|Win32
+		Release - CS GO|Win32 = Release - CS GO|Win32
 		Release - Episode 1|Win32 = Release - Episode 1|Win32
 		Release - Old Metamod|Win32 = Release - Old Metamod|Win32
-		Release - Orange Box|Win32 = Release - Orange Box|Win32
 		Release - Orange Box Valve|Win32 = Release - Orange Box Valve|Win32
+		Release - Orange Box|Win32 = Release - Orange Box|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Episode1|Win32.ActiveCfg = Debug - Episode1|Win32
 		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Episode1|Win32.Build.0 = Debug - Episode1|Win32
 		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Old Metamod|Win32.ActiveCfg = Debug - Old Metamod|Win32
 		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Old Metamod|Win32.Build.0 = Debug - Old Metamod|Win32
-		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Orange Box|Win32.ActiveCfg = Debug - Orange Box|Win32
-		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Orange Box|Win32.Build.0 = Debug - Orange Box|Win32
 		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Orange Box Valve|Win32.ActiveCfg = Debug - Orange Box Valve|Win32
 		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Orange Box Valve|Win32.Build.0 = Debug - Orange Box Valve|Win32
+		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Orange Box|Win32.ActiveCfg = Debug - Orange Box|Win32
+		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Orange Box|Win32.Build.0 = Debug - Orange Box|Win32
+		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - CS GO|Win32.ActiveCfg = Release - CS GO|Win32
+		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - CS GO|Win32.Build.0 = Release - CS GO|Win32
 		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Episode 1|Win32.ActiveCfg = Release - Episode 1|Win32
 		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Episode 1|Win32.Build.0 = Release - Episode 1|Win32
 		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Old Metamod|Win32.ActiveCfg = Release - Old Metamod|Win32
 		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Old Metamod|Win32.Build.0 = Release - Old Metamod|Win32
-		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Orange Box|Win32.ActiveCfg = Release - Orange Box|Win32
-		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Orange Box|Win32.Build.0 = Release - Orange Box|Win32
 		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Orange Box Valve|Win32.ActiveCfg = Release - Orange Box Valve|Win32
 		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Orange Box Valve|Win32.Build.0 = Release - Orange Box Valve|Win32
+		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Orange Box|Win32.ActiveCfg = Release - Orange Box|Win32
+		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Orange Box|Win32.Build.0 = Release - Orange Box|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

extensions/cstrike/msvc10/cstrike.vcxproj

@@ -0,0 +1,662 @@
+<?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 - CS GO|Win32">
+      <Configuration>Debug - CS GO</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug - CSS|Win32">
+      <Configuration>Debug - CSS</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug - Episode1|Win32">
+      <Configuration>Debug - Episode1</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug - Old Metamod|Win32">
+      <Configuration>Debug - Old Metamod</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug - Orange Box Valve|Win32">
+      <Configuration>Debug - Orange Box Valve</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug - Orange Box|Win32">
+      <Configuration>Debug - Orange Box</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release - CS GO|Win32">
+      <Configuration>Release - CS GO</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release - CSS|Win32">
+      <Configuration>Release - CSS</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release - Episode 1|Win32">
+      <Configuration>Release - Episode 1</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release - Old Metamod|Win32">
+      <Configuration>Release - Old Metamod</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release - Orange Box Valve|Win32">
+      <Configuration>Release - Orange Box Valve</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release - Orange Box|Win32">
+      <Configuration>Release - Orange Box</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{18B5ED38-DBB7-47B2-8500-5648B8C1263B}</ProjectGuid>
+    <RootNamespace>cstrike</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - Episode 1|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - Episode1|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - CS GO|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - CS GO|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - Orange Box Valve|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - CSS|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - Orange Box Valve|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - CSS|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - Orange Box|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - Orange Box|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - Old Metamod|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - Old Metamod|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 - Episode 1|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 - Episode1|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)'=='Release - CS GO|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 - CS GO|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)'=='Release - Orange Box Valve|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)'=='Release - CSS|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 - Orange Box Valve|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 - CSS|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)'=='Release - Orange Box|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 - Orange Box|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)'=='Release - Old Metamod|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 - Old Metamod|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.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug - Old Metamod|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug - Old Metamod|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug - Old Metamod|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release - Old Metamod|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release - Old Metamod|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release - Old Metamod|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug - Orange Box|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug - Orange Box|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug - Orange Box|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release - Orange Box|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release - Orange Box|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release - Orange Box|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug - Orange Box Valve|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug - CSS|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug - Orange Box Valve|Win32'">$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug - CSS|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug - Orange Box Valve|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug - CSS|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release - Orange Box Valve|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release - CSS|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release - Orange Box Valve|Win32'">$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release - CSS|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release - Orange Box Valve|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release - CSS|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug - CS GO|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug - CS GO|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug - CS GO|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release - CS GO|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release - CS GO|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release - CS GO|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug - Episode1|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug - Episode1|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug - Episode1|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release - Episode 1|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release - Episode 1|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release - Episode 1|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - CS GO|Win32'">
+    <TargetName>game.cstrike.ext.2.csgo</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - Episode1|Win32'">
+    <TargetName>game.cstrike.ext.2.ep1</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - Old Metamod|Win32'">
+    <TargetName>game.cstrike.ext.1.ep1</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - Orange Box|Win32'">
+    <TargetName>game.cstrike.ext.2.ep2</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - Orange Box Valve|Win32'">
+    <TargetName>game.cstrike.ext.2.ep2v</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - CSS|Win32'">
+    <TargetName>game.cstrike.ext.2.css</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - CS GO|Win32'">
+    <TargetName>game.cstrike.ext.2.csgo</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - Episode 1|Win32'">
+    <TargetName>game.cstrike.ext.2.ep1</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - Old Metamod|Win32'">
+    <TargetName>game.cstrike.ext.1.ep1</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - Orange Box|Win32'">
+    <TargetName>game.cstrike.ext.2.ep2</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - Orange Box Valve|Win32'">
+    <TargetName>game.cstrike.ext.2.ep2v</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - CSS|Win32'">
+    <TargetName>game.cstrike.ext.2.css</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - Old Metamod|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_CSS=6 /D SE_ORANGEBOXVALVE=7 /D SE_LEFT4DEAD=8 /D SE_LEFT4DEAD2=9 /D SE_ALIENSWARM=10 /D SE_PORTAL2=11 /D SE_CSGO=12</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;$(HL2SDK)\public;$(HL2SDK)\public\dlls;$(HL2SDK)\public\engine;$(HL2SDK)\public\tier0;$(HL2SDK)\public\tier1;$(MMSOURCE19)\core-legacy;$(MMSOURCE19)\core-legacy\sourcehook;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=1;%(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>
+    <ResourceCompile>
+      <PreprocessorDefinitions>BINARY_NAME="$(TargetFileName)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>$(HL2SDK)\lib\public\tier0.lib;$(HL2SDK)\lib\public\tier1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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>
+    <PostBuildEvent>
+      <Command>IF NOT "%SMOUTDIR%"=="" copy /Y "$(TargetDir)$(TargetFileName)" "%SMOUTDIR%\extensions"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - Old Metamod|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_CSS=6 /D SE_ORANGEBOXVALVE=7 /D SE_LEFT4DEAD=8 /D SE_LEFT4DEAD2=9 /D SE_ALIENSWARM=10 /D SE_PORTAL2=11 /D SE_CSGO=12</AdditionalOptions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;$(HL2SDK)\public;$(HL2SDK)\public\dlls;$(HL2SDK)\public\engine;$(HL2SDK)\public\tier0;$(HL2SDK)\public\tier1;$(MMSOURCE19)\core-legacy;$(MMSOURCE19)\core-legacy\sourcehook;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>BINARY_NAME="$(TargetFileName)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>$(HL2SDK)\lib\public\tier0.lib;$(HL2SDK)\lib\public\tier1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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>
+    <PostBuildEvent>
+      <Command>IF NOT "%SMOUTDIR%"=="" copy /Y "$(TargetDir)$(TargetFileName)" "%SMOUTDIR%\extensions"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - Orange Box|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_CSS=6 /D SE_ORANGEBOXVALVE=7 /D SE_LEFT4DEAD=8 /D SE_LEFT4DEAD2=9 /D SE_ALIENSWARM=10 /D SE_PORTAL2=11 /D SE_CSGO=12</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;$(HL2SDKOB)\public;$(HL2SDKOB)\public\engine;$(HL2SDKOB)\public\game\server;$(HL2SDKOB)\public\tier0;$(HL2SDKOB)\public\tier1;$(MMSOURCE19)\core;$(MMSOURCE19)\core\sourcehook;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=3;%(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>
+    <ResourceCompile>
+      <PreprocessorDefinitions>BINARY_NAME="$(TargetFileName)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>$(HL2SDKOB)\lib\public\tier0.lib;$(HL2SDKOB)\lib\public\tier1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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>
+    <PostBuildEvent>
+      <Command>IF NOT "%SMOUTDIR%"=="" copy /Y "$(TargetDir)$(TargetFileName)" "%SMOUTDIR%\extensions"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - Orange Box|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_CSS=6 /D SE_ORANGEBOXVALVE=7 /D SE_LEFT4DEAD=8 /D SE_LEFT4DEAD2=9 /D SE_ALIENSWARM=10 /D SE_PORTAL2=11 /D SE_CSGO=12</AdditionalOptions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;$(HL2SDKOB)\public;$(HL2SDKOB)\public\engine;$(HL2SDKOB)\public\game\server;$(HL2SDKOB)\public\tier0;$(HL2SDKOB)\public\tier1;$(MMSOURCE19)\core;$(MMSOURCE19)\core\sourcehook;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>BINARY_NAME="$(TargetFileName)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>$(HL2SDKOB)\lib\public\tier0.lib;$(HL2SDKOB)\lib\public\tier1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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>
+    <PostBuildEvent>
+      <Command>IF NOT "%SMOUTDIR%"=="" copy /Y "$(TargetDir)$(TargetFileName)" "%SMOUTDIR%\extensions"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - Orange Box Valve|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_CSS=6 /D SE_ORANGEBOXVALVE=7 /D SE_LEFT4DEAD=8 /D SE_LEFT4DEAD2=9 /D SE_ALIENSWARM=10 /D SE_PORTAL2=11 /D SE_CSGO=12</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;$(HL2SDKOBVALVE)\public;$(HL2SDKOBVALVE)\public\game\server;$(HL2SDKOBVALVE)\public\engine;$(HL2SDKOBVALVE)\public\tier0;$(HL2SDKOBVALVE)\public\tier1;$(MMSOURCE19)\core;$(MMSOURCE19)\core\sourcehook;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=7;%(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>
+    <ResourceCompile>
+      <PreprocessorDefinitions>BINARY_NAME="$(TargetFileName)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>$(HL2SDKOBVALVE)\lib\public\tier0.lib;$(HL2SDKOBVALVE)\lib\public\tier1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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>
+    <PostBuildEvent>
+      <Command>IF NOT "%SMOUTDIR%"=="" copy /Y "$(TargetDir)$(TargetFileName)" "%SMOUTDIR%\extensions"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - CSS|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_CSS=6 /D SE_ORANGEBOXVALVE=7 /D SE_LEFT4DEAD=8 /D SE_LEFT4DEAD2=9 /D SE_ALIENSWARM=10 /D SE_PORTAL2=11 /D SE_CSGO=12</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;$(HL2SDKCSS)\public;$(HL2SDKCSS)\public\game\server;$(HL2SDKCSS)\public\engine;$(HL2SDKCSS)\public\tier0;$(HL2SDKCSS)\public\tier1;$(MMSOURCE19)\core;$(MMSOURCE19)\core\sourcehook;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=6;%(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>
+    <ResourceCompile>
+      <PreprocessorDefinitions>BINARY_NAME="$(TargetFileName)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>$(HL2SDKCSS)\lib\public\tier0.lib;$(HL2SDKCSS)\lib\public\tier1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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>
+    <PostBuildEvent>
+      <Command>IF NOT "%SMOUTDIR%"=="" copy /Y "$(TargetDir)$(TargetFileName)" "%SMOUTDIR%\extensions"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - Orange Box Valve|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_CSS=6 /D SE_ORANGEBOXVALVE=7 /D SE_LEFT4DEAD=8 /D SE_LEFT4DEAD2=9 /D SE_ALIENSWARM=10 /D SE_PORTAL2=11 /D SE_CSGO=12</AdditionalOptions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;$(HL2SDKOBVALVE)\public;$(HL2SDKOBVALVE)\public\game\server;$(HL2SDKOBVALVE)\public\engine;$(HL2SDKOBVALVE)\public\tier0;$(HL2SDKOBVALVE)\public\tier1;$(MMSOURCE19)\core;$(MMSOURCE19)\core\sourcehook;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>BINARY_NAME="$(TargetFileName)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>$(HL2SDKOBVALVE)\lib\public\tier0.lib;$(HL2SDKOBVALVE)\lib\public\tier1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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>
+    <PostBuildEvent>
+      <Command>IF NOT "%SMOUTDIR%"=="" copy /Y "$(TargetDir)$(TargetFileName)" "%SMOUTDIR%\extensions"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - CSS|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_CSS=6 /D SE_ORANGEBOXVALVE=7 /D SE_LEFT4DEAD=8 /D SE_LEFT4DEAD2=9 /D SE_ALIENSWARM=10 /D SE_PORTAL2=11 /D SE_CSGO=12</AdditionalOptions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;$(HL2SDKCSS)\public;$(HL2SDKCSS)\public\game\server;$(HL2SDKCSS)\public\engine;$(HL2SDKCSS)\public\tier0;$(HL2SDKCSS)\public\tier1;$(MMSOURCE19)\core;$(MMSOURCE19)\core\sourcehook;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=6;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>BINARY_NAME="$(TargetFileName)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>$(HL2SDKCSS)\lib\public\tier0.lib;$(HL2SDKCSS)\lib\public\tier1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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>
+    <PostBuildEvent>
+      <Command>IF NOT "%SMOUTDIR%"=="" copy /Y "$(TargetDir)$(TargetFileName)" "%SMOUTDIR%\extensions"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - CS GO|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_CSS=6 /D SE_ORANGEBOXVALVE=7 /D SE_LEFT4DEAD=8 /D SE_LEFT4DEAD2=9 /D SE_ALIENSWARM=10 /D SE_PORTAL2=11 /D SE_CSGO=12</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;$(HL2SDKCSGO)\public;$(HL2SDKCSGO)\public\game\server;$(HL2SDKCSGO)\public\engine;$(HL2SDKCSGO)\public\tier0;$(HL2SDKCSGO)\public\tier1;$(MMSOURCE19)\core;$(MMSOURCE19)\core\sourcehook;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=12;COMPILER_MSVC;COMPILER_MSVC32;%(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>
+    <ResourceCompile>
+      <PreprocessorDefinitions>BINARY_NAME="$(TargetFileName)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>$(HL2SDKCSGO)\lib\public\tier0.lib;$(HL2SDKCSGO)\lib\public\tier1.lib;$(HL2SDKCSGO)\lib\public\interfaces.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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>
+    <PostBuildEvent>
+      <Command>IF NOT "%SMOUTDIR%"=="" copy /Y "$(TargetDir)$(TargetFileName)" "%SMOUTDIR%\extensions"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - CS GO|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_CSS=6 /D SE_ORANGEBOXVALVE=7 /D SE_LEFT4DEAD=8 /D SE_LEFT4DEAD2=9 /D SE_ALIENSWARM=10 /D SE_PORTAL2=11 /D SE_CSGO=12</AdditionalOptions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;$(HL2SDKCSGO)\public;$(HL2SDKCSGO)\public\game\server;$(HL2SDKCSGO)\public\engine;$(HL2SDKCSGO)\public\tier0;$(HL2SDKCSGO)\public\tier1;$(MMSOURCE19)\core;$(MMSOURCE19)\core\sourcehook;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=12;COMPILER_MSVC;COMPILER_MSVC32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>BINARY_NAME="$(TargetFileName)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>$(HL2SDKCSGO)\lib\public\tier0.lib;$(HL2SDKCSGO)\lib\public\tier1.lib;$(HL2SDKCSGO)\lib\public\interfaces.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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>
+    <PostBuildEvent>
+      <Command>IF NOT "%SMOUTDIR%"=="" copy /Y "$(TargetDir)$(TargetFileName)" "%SMOUTDIR%\extensions"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - Episode1|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_CSS=6 /D SE_ORANGEBOXVALVE=7 /D SE_LEFT4DEAD=8 /D SE_LEFT4DEAD2=9 /D SE_ALIENSWARM=10 /D SE_PORTAL2=11 /D SE_CSGO=12</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;$(HL2SDK)\public;$(HL2SDK)\public\dlls;$(HL2SDK)\public\engine;$(HL2SDK)\public\tier0;$(HL2SDK)\public\tier1;$(MMSOURCE19)\core;$(MMSOURCE19)\core\sourcehook;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=1;%(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>
+    <ResourceCompile>
+      <PreprocessorDefinitions>BINARY_NAME="$(TargetFileName)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>$(HL2SDK)\lib\public\tier0.lib;$(HL2SDK)\lib\public\tier1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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>
+    <PostBuildEvent>
+      <Command>IF NOT "%SMOUTDIR%"=="" copy /Y "$(TargetDir)$(TargetFileName)" "%SMOUTDIR%\extensions"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - Episode 1|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_CSS=6 /D SE_ORANGEBOXVALVE=7 /D SE_LEFT4DEAD=8 /D SE_LEFT4DEAD2=9 /D SE_ALIENSWARM=10 /D SE_PORTAL2=11 /D SE_CSGO=12</AdditionalOptions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;$(HL2SDK)\public;$(HL2SDK)\public\dlls;$(HL2SDK)\public\engine;$(HL2SDK)\public\tier0;$(HL2SDK)\public\tier1;$(MMSOURCE19)\core;$(MMSOURCE19)\core\sourcehook;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>BINARY_NAME="$(TargetFileName)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>$(HL2SDK)\lib\public\tier0.lib;$(HL2SDK)\lib\public\tier1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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>
+    <PostBuildEvent>
+      <Command>IF NOT "%SMOUTDIR%"=="" copy /Y "$(TargetDir)$(TargetFileName)" "%SMOUTDIR%\extensions"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\extension.cpp" />
+    <ClCompile Include="..\forwards.cpp" />
+    <ClCompile Include="..\natives.cpp" />
+    <ClCompile Include="..\RegNatives.cpp" />
+    <ClCompile Include="..\timeleft.cpp" />
+    <ClCompile Include="..\util_cstrike.cpp" />
+    <ClCompile Include="..\sdk\smsdk_ext.cpp" />
+    <ClCompile Include="..\asm\asm.c" />
+    <ClCompile Include="..\CDetour\detours.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\extension.h" />
+    <ClInclude Include="..\forwards.h" />
+    <ClInclude Include="..\RegNatives.h" />
+    <ClInclude Include="..\timeleft.h" />
+    <ClInclude Include="..\util_cstrike.h" />
+    <ClInclude Include="..\sdk\smsdk_config.h" />
+    <ClInclude Include="..\sdk\smsdk_ext.h" />
+    <ClInclude Include="..\asm\asm.h" />
+    <ClInclude Include="..\CDetour\detourhelpers.h" />
+    <ClInclude Include="..\CDetour\detours.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

extensions/cstrike/msvc10/cstrike.vcxproj.filters

@@ -0,0 +1,87 @@
+<?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="SourceMod SDK">
+      <UniqueIdentifier>{31958233-BB2D-4e41-A8F9-CE8A4684F436}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="asm">
+      <UniqueIdentifier>{bed40a0d-9cf0-408e-b407-b40d3e72ccd5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="CDetour">
+      <UniqueIdentifier>{e6b64c8f-79f3-48fe-a66f-caaafc86710c}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\extension.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\forwards.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\natives.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\RegNatives.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\timeleft.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\util_cstrike.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sdk\smsdk_ext.cpp">
+      <Filter>SourceMod SDK</Filter>
+    </ClCompile>
+    <ClCompile Include="..\asm\asm.c">
+      <Filter>asm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CDetour\detours.cpp">
+      <Filter>CDetour</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\extension.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\forwards.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\RegNatives.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\timeleft.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\util_cstrike.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\sdk\smsdk_config.h">
+      <Filter>SourceMod SDK</Filter>
+    </ClInclude>
+    <ClInclude Include="..\sdk\smsdk_ext.h">
+      <Filter>SourceMod SDK</Filter>
+    </ClInclude>
+    <ClInclude Include="..\asm\asm.h">
+      <Filter>asm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CDetour\detourhelpers.h">
+      <Filter>CDetour</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CDetour\detours.h">
+      <Filter>CDetour</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>

extensions/cstrike/msvc8/cstrike.sln

@@ -1,32 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cstrike", "cstrike.vcproj", "{B3E797CF-4E77-4C9D-B8A8-7589B6902206}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug - Episode1|Win32 = Debug - Episode1|Win32
-		Debug - Old Metamod|Win32 = Debug - Old Metamod|Win32
-		Debug - Orange Box|Win32 = Debug - Orange Box|Win32
-		Release - Episode 1|Win32 = Release - Episode 1|Win32
-		Release - Old Metamod|Win32 = Release - Old Metamod|Win32
-		Release - Orange Box|Win32 = Release - Orange Box|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Episode1|Win32.ActiveCfg = Debug - Episode1|Win32
-		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Episode1|Win32.Build.0 = Debug - Episode1|Win32
-		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Old Metamod|Win32.ActiveCfg = Debug - Old Metamod|Win32
-		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Old Metamod|Win32.Build.0 = Debug - Old Metamod|Win32
-		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Orange Box|Win32.ActiveCfg = Debug - Orange Box|Win32
-		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Orange Box|Win32.Build.0 = Debug - Orange Box|Win32
-		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Episode 1|Win32.ActiveCfg = Release - Episode 1|Win32
-		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Episode 1|Win32.Build.0 = Release - Episode 1|Win32
-		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Old Metamod|Win32.ActiveCfg = Release - Old Metamod|Win32
-		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Old Metamod|Win32.Build.0 = Release - Old Metamod|Win32
-		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Orange Box|Win32.ActiveCfg = Release - Orange Box|Win32
-		{B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Orange Box|Win32.Build.0 = Release - Orange Box|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNNode = FALSE
-	EndGlobalSection
-EndGlobal

extensions/cstrike/msvc8/cstrike.vcproj

@@ -1,617 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="cstrike"
-	ProjectGUID="{B3E797CF-4E77-4C9D-B8A8-7589B6902206}"
-	RootNamespace="cstrike"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug - Old Metamod|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\dlls&quot;;&quot;$(HL2SDK)\public\engine&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;;&quot;$(MMSOURCE17)\core-legacy&quot;;&quot;$(MMSOURCE17)\core-legacy\sourcehook&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(HL2SDK)\lib\public\tier0.lib&quot; &quot;$(HL2SDK)\lib\public\tier1.lib&quot;"
-				OutputFile="$(OutDir)\game.cstrike.ext.dll"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release - Old Metamod|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\dlls&quot;;&quot;$(HL2SDK)\public\engine&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;;&quot;$(MMSOURCE17)\core-legacy&quot;;&quot;$(MMSOURCE17)\core-legacy\sourcehook&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
-				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(HL2SDK)\lib\public\tier0.lib&quot; &quot;$(HL2SDK)\lib\public\tier1.lib&quot;"
-				OutputFile="$(OutDir)\game.cstrike.ext.dll"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug - Orange Box|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;&quot;$(HL2SDKOB)\public&quot;;&quot;$(HL2SDKOB)\public\engine&quot;;&quot;$(HL2SDKOB)\public\game\server&quot;;&quot;$(HL2SDKOB)\public\tier0&quot;;&quot;$(HL2SDKOB)\public\tier1&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(HL2SDKOB)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier1.lib&quot;"
-				OutputFile="$(OutDir)\game.cstrike.ext.dll"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release - Orange Box|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;&quot;$(HL2SDKOB)\public&quot;;&quot;$(HL2SDKOB)\public\engine&quot;;&quot;$(HL2SDKOB)\public\game\server&quot;;&quot;$(HL2SDKOB)\public\tier0&quot;;&quot;$(HL2SDKOB)\public\tier1&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
-				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(HL2SDKOB)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier1.lib&quot;"
-				OutputFile="$(OutDir)\game.cstrike.ext.dll"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug - Episode1|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\dlls&quot;;&quot;$(HL2SDK)\public\engine&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(HL2SDK)\lib\public\tier0.lib&quot; &quot;$(HL2SDK)\lib\public\tier1.lib&quot;"
-				OutputFile="$(OutDir)\game.cstrike.ext.dll"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release - Episode 1|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\dlls&quot;;&quot;$(HL2SDK)\public\engine&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
-				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(HL2SDK)\lib\public\tier0.lib&quot; &quot;$(HL2SDK)\lib\public\tier1.lib&quot;"
-				OutputFile="$(OutDir)\game.cstrike.ext.dll"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\extension.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\forwards.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\natives.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\RegNatives.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\timeleft.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\extension.h"
-				>
-			</File>
-			<File
-				RelativePath="..\forwards.h"
-				>
-			</File>
-			<File
-				RelativePath="..\RegNatives.h"
-				>
-			</File>
-			<File
-				RelativePath="..\timeleft.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\version.rc"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="SourceMod SDK"
-			UniqueIdentifier="{31958233-BB2D-4e41-A8F9-CE8A4684F436}"
-			>
-			<File
-				RelativePath="..\sdk\smsdk_config.h"
-				>
-			</File>
-			<File
-				RelativePath="..\sdk\smsdk_ext.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\sdk\smsdk_ext.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="asm"
-			>
-			<File
-				RelativePath="..\asm\asm.c"
-				>
-			</File>
-			<File
-				RelativePath="..\asm\asm.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="CDetour"
-			>
-			<File
-				RelativePath="..\CDetour\detourhelpers.h"
-				>
-			</File>
-			<File
-				RelativePath="..\CDetour\detours.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\CDetour\detours.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

extensions/cstrike/msvc9/cstrike.vcproj

@@ -1,781 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="cstrike"
-	ProjectGUID="{B3E797CF-4E77-4C9D-B8A8-7589B6902206}"
-	RootNamespace="cstrike"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug - Old Metamod|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\dlls&quot;;&quot;$(HL2SDK)\public\engine&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;;&quot;$(MMSOURCE17)\core-legacy&quot;;&quot;$(MMSOURCE17)\core-legacy\sourcehook&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(HL2SDK)\lib\public\tier0.lib&quot; &quot;$(HL2SDK)\lib\public\tier1.lib&quot;"
-				OutputFile="$(OutDir)\game.cstrike.ext.1.ep1.dll"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release - Old Metamod|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\dlls&quot;;&quot;$(HL2SDK)\public\engine&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;;&quot;$(MMSOURCE17)\core-legacy&quot;;&quot;$(MMSOURCE17)\core-legacy\sourcehook&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
-				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(HL2SDK)\lib\public\tier0.lib&quot; &quot;$(HL2SDK)\lib\public\tier1.lib&quot;"
-				OutputFile="$(OutDir)\game.cstrike.ext.1.ep1.dll"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug - Orange Box|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;&quot;$(HL2SDKOB)\public&quot;;&quot;$(HL2SDKOB)\public\engine&quot;;&quot;$(HL2SDKOB)\public\game\server&quot;;&quot;$(HL2SDKOB)\public\tier0&quot;;&quot;$(HL2SDKOB)\public\tier1&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(HL2SDKOB)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier1.lib&quot;"
-				OutputFile="$(OutDir)\game.cstrike.ext.2.ep2.dll"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release - Orange Box|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;&quot;$(HL2SDKOB)\public&quot;;&quot;$(HL2SDKOB)\public\engine&quot;;&quot;$(HL2SDKOB)\public\game\server&quot;;&quot;$(HL2SDKOB)\public\tier0&quot;;&quot;$(HL2SDKOB)\public\tier1&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
-				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(HL2SDKOB)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier1.lib&quot;"
-				OutputFile="$(OutDir)\game.cstrike.ext.2.ep2.dll"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug - Orange Box Valve|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;&quot;$(HL2SDKOBVALVE)\public&quot;;&quot;$(HL2SDKOBVALVE)\public\game\server&quot;;&quot;$(HL2SDKOBVALVE)\public\engine&quot;;&quot;$(HL2SDKOBVALVE)\public\tier0&quot;;&quot;$(HL2SDKOBVALVE)\public\tier1&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(HL2SDKOBVALVE)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOBVALVE)\lib\public\tier1.lib&quot;"
-				OutputFile="$(OutDir)\game.cstrike.ext.2.ep2v.dll"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release - Orange Box Valve|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;&quot;$(HL2SDKOBVALVE)\public&quot;;&quot;$(HL2SDKOBVALVE)\public\game\server&quot;;&quot;$(HL2SDKOBVALVE)\public\engine&quot;;&quot;$(HL2SDKOBVALVE)\public\tier0&quot;;&quot;$(HL2SDKOBVALVE)\public\tier1&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
-				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(HL2SDKOBVALVE)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOBVALVE)\lib\public\tier1.lib&quot;"
-				OutputFile="$(OutDir)\game.cstrike.ext.2.ep2v.dll"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug - Episode1|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\dlls&quot;;&quot;$(HL2SDK)\public\engine&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableEnhancedInstructionSet="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(HL2SDK)\lib\public\tier0.lib&quot; &quot;$(HL2SDK)\lib\public\tier1.lib&quot;"
-				OutputFile="$(OutDir)\game.cstrike.ext.1.ep1.dll"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release - Episode 1|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\sourcepawn;..\..\..\public\extensions;&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\dlls&quot;;&quot;$(HL2SDK)\public\engine&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
-				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(HL2SDK)\lib\public\tier0.lib&quot; &quot;$(HL2SDK)\lib\public\tier1.lib&quot;"
-				OutputFile="$(OutDir)\game.cstrike.ext.1.ep1.dll"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\extension.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\forwards.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\natives.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\RegNatives.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\timeleft.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\extension.h"
-				>
-			</File>
-			<File
-				RelativePath="..\forwards.h"
-				>
-			</File>
-			<File
-				RelativePath="..\RegNatives.h"
-				>
-			</File>
-			<File
-				RelativePath="..\timeleft.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\version.rc"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="SourceMod SDK"
-			UniqueIdentifier="{31958233-BB2D-4e41-A8F9-CE8A4684F436}"
-			>
-			<File
-				RelativePath="..\sdk\smsdk_config.h"
-				>
-			</File>
-			<File
-				RelativePath="..\sdk\smsdk_ext.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\sdk\smsdk_ext.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="asm"
-			>
-			<File
-				RelativePath="..\asm\asm.c"
-				>
-			</File>
-			<File
-				RelativePath="..\asm\asm.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="CDetour"
-			>
-			<File
-				RelativePath="..\CDetour\detourhelpers.h"
-				>
-			</File>
-			<File
-				RelativePath="..\CDetour\detours.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\CDetour\detours.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

extensions/cstrike/natives.cpp

@@ -31,8 +31,12 @@
 
 #include "extension.h"
 #include "RegNatives.h"
+#include "forwards.h"
+#include "util_cstrike.h"
 #include <server_class.h>
 
+int g_iPriceOffset = -1;
+
 #define REGISTER_NATIVE_ADDR(name, code) \
 	void *addr; \
 	if (!g_pGameConf->GetMemSig(name, &addr) || !addr) \
@@ -44,7 +48,7 @@
 
 inline CBaseEntity *GetCBaseEntity(int num, bool isplayer)
 {
-	edict_t *pEdict = engine->PEntityOfEntIndex(num);
+	edict_t *pEdict = gamehelpers->EdictOfIndex(num);
 	if (!pEdict || pEdict->IsFree())
 	{
 		return NULL;
@@ -206,18 +210,18 @@ static cell_t CS_DropWeapon(IPluginContext *pContext, const cell_t *params)
 	}
 
 	//Psychonic is awesome for this
-	sm_sendprop_info_t *spi = new sm_sendprop_info_t;
+	sm_sendprop_info_t spi;
 	IServerUnknown *pUnk = (IServerUnknown *)pWeapon;
 	IServerNetworkable *pNet = pUnk->GetNetworkable();
 
-	if (!UTIL_FindDataTable(pNet->GetServerClass()->m_pTable, "DT_WeaponCSBase", spi, 0))
+	if (!UTIL_FindDataTable(pNet->GetServerClass()->m_pTable, "DT_WeaponCSBase", &spi, 0))
 		return pContext->ThrowNativeError("Entity index %d is not a weapon", params[2]);
 
-	if (!gamehelpers->FindSendPropInfo("CBaseCombatWeapon", "m_hOwnerEntity", spi))
+	if (!gamehelpers->FindSendPropInfo("CBaseCombatWeapon", "m_hOwnerEntity", &spi))
 		return pContext->ThrowNativeError("Invalid entity index %d for weapon", params[2]);
 
-	CBaseHandle &hndl = *(CBaseHandle *)((uint8_t *)pWeapon + spi->actual_offset);
+	CBaseHandle &hndl = *(CBaseHandle *)((uint8_t *)pWeapon + spi.actual_offset);
-	if (params[1] != hndl.GetEntryIndex())
+	if (params[1] != hndl.GetEntryIndex() || hndl != ((IServerEntity *)pEntity)->GetRefEHandle())
 		return pContext->ThrowNativeError("Weapon %d is not owned by client %d", params[2], params[1]);
 
 	if (params[4] == 1 && g_pCSWeaponDropDetoured)
@@ -290,37 +294,34 @@ static cell_t CS_TerminateRound(IPluginContext *pContext, const cell_t *params)
 	return 1;
 }
 
+static cell_t CS_WeaponIDToAlias(IPluginContext *pContext, const cell_t *params)
+{
+	if (!IsValidWeaponID(params[1]))
+		return pContext->ThrowNativeError("Invalid WeaponID passed for this game");
+
+	char *dest;
+
+	pContext->LocalToString(params[2], &dest);
+
+	const char *ret = WeaponIDToAlias(params[1]);
+	
+	if (ret == NULL)
+	{
+		return 0;
+	}
+	
+	return strncopy(dest, ret, params[3]);
+}
+
 static cell_t CS_GetTranslatedWeaponAlias(IPluginContext *pContext, const cell_t *params)
 {
-	static ICallWrapper *pWrapper = NULL;
+	char *weapon;
-
+	char *dest;
-	if (!pWrapper)
-	{
-		REGISTER_NATIVE_ADDR("GetTranslatedWeaponAlias",
-			PassInfo pass[1]; \
-			PassInfo retpass[1]; \
-			pass[0].flags = PASSFLAG_BYVAL; \
-			pass[0].type = PassType_Basic; \
-			pass[0].size = sizeof(char *); \
-			retpass[0].flags = PASSFLAG_BYVAL; \
-			retpass[0].type = PassType_Basic; \
-			retpass[0].size = sizeof(char *); \
-			pWrapper = g_pBinTools->CreateCall(addr, CallConv_Cdecl, &retpass[0], pass, 1))
-	}
-	char *dest, *weapon;
 
 	pContext->LocalToString(params[2], &dest);
 	pContext->LocalToString(params[1], &weapon);
 
-	char *ret = new char[128];
+	const char *ret = GetTranslatedWeaponAlias(weapon);
-
-	unsigned char vstk[sizeof(char *)];
-	unsigned char *vptr = vstk;
-
-	*(char **)vptr = weapon;
-
-	pWrapper->Execute(vstk, &ret);
-
 	strncopy(dest, ret, params[3]);
 	
 	return 1;
@@ -328,59 +329,87 @@ static cell_t CS_GetTranslatedWeaponAlias(IPluginContext *pContext, const cell_t
 
 static cell_t CS_GetWeaponPrice(IPluginContext *pContext, const cell_t *params)
 {
-	//Hard code return values for weapons that dont call GetWeaponPrice and always use default value.
+	if (!IsValidWeaponID(params[2]))
-	if (params[2] == WEAPON_C4 || params[2] == WEAPON_KNIFE || params[2] == WEAPON_SHIELD)
+		return pContext->ThrowNativeError("Invalid WeaponID passed for this game");
-		return 0;
-	if (params[2] == WEAPON_KEVLAR)
-		return 650;
-	if (params[2] == WEAPON_ASSAULTSUIT)
-		return 1000;
-	if (params[2] == WEAPON_NIGHTVISION)
-		return 1250;
 
+	int id = GetRealWeaponID(params[2]);
+
+	//Hard code return values for weapons that dont call GetWeaponPrice and always use default value.
+#if SOURCE_ENGINE == SE_CSGO
+	if (id == WEAPON_C4 || id == WEAPON_KNIFE || id == WEAPON_KNIFE_GG)
+		return 0;
+#else
+ 	if (id == WEAPON_C4 || id == WEAPON_KNIFE || id == WEAPON_SHIELD)
+		return 0;
+	else if (id == WEAPON_KEVLAR)
+		return 650;
+	else if (id == WEAPON_ASSAULTSUIT)
+		return 1000;
+#endif
+	else if (id == WEAPON_NIGHTVISION)
+		return 1250;
+#if SOURCE_ENGINE == SE_CSGO
+	else if (id == WEAPON_DEFUSER)
+		return 400;
+#endif
+
+	void *info = GetWeaponInfo(id);
+		
+	if (!info)
+	{
+		return pContext->ThrowNativeError("Failed to get weaponinfo");
+	}
+
+#if SOURCE_ENGINE == SE_CSGO
 	static ICallWrapper *pWrapper = NULL;
-	static int priceOffset = -1;
+
 	if (!pWrapper)
 	{
-		REGISTER_NATIVE_ADDR("GetWeaponInfo",
+		REGISTER_NATIVE_ADDR("GetAttributeInt",
-			PassInfo pass[1]; \
+		PassInfo pass[2]; \
-			PassInfo retpass[1]; \
+		PassInfo ret; \
-			pass[0].flags = PASSFLAG_BYVAL; \
+		pass[0].flags = PASSFLAG_BYVAL; \
-			pass[0].type = PassType_Basic; \
+		pass[0].type = PassType_Basic; \
-			pass[0].size = sizeof(int); \
+		pass[0].size = sizeof(char *); \
-			retpass[0].flags = PASSFLAG_BYVAL; \
+		pass[1].flags = PASSFLAG_BYVAL; \
-			retpass[0].type = PassType_Basic; \
+		pass[1].type = PassType_Basic; \
-			retpass[0].size = sizeof(void *); \
+		pass[1].size = sizeof(CEconItemView *); \
-			pWrapper = g_pBinTools->CreateCall(addr, CallConv_Cdecl, &retpass[0], pass, 1))
+		ret.flags = PASSFLAG_BYVAL; \
+		ret.type = PassType_Basic; \
+		ret.size = sizeof(int); \
+		pWrapper = g_pBinTools->CreateCall(addr, CallConv_ThisCall, &ret, pass, 2))
 	}
-	if (priceOffset == -1)
+
+	unsigned char vstk[sizeof(void *) * 2 + sizeof(char *)];
+	unsigned char *vptr = vstk;
+
+	*(void **)vptr = info;
+	vptr += sizeof(void *);
+	*(const char **)vptr = "in_game_price";
+	vptr += sizeof(const char **);
+	*(CEconItemView **)vptr = NULL;
+
+	int price = 0;
+ 	pWrapper->Execute(vstk, &price);
+#else
+	if (g_iPriceOffset == -1)
 	{
-		if (!g_pGameConf->GetOffset("WeaponPrice", &priceOffset))
+		if (!g_pGameConf->GetOffset("WeaponPrice", &g_iPriceOffset))
 		{
+			g_iPriceOffset = -1;
 			return pContext->ThrowNativeError("Failed to get WeaponPrice offset");
 		}
 	}
 
+	int price = *(int *)((intptr_t)info + g_iPriceOffset);
+#endif
+
 	CBaseEntity *pEntity;
 	if (!(pEntity = GetCBaseEntity(params[1], true)))
 	{
 		return pContext->ThrowNativeError("Client index %d is not valid", params[1]);
 	}
 
-	void *info;
-
-	unsigned char vstk[sizeof(int)];
-	unsigned char *vptr = vstk;
-
-	*(int *)vptr = params[2];
-
-	pWrapper->Execute(vstk, &info);
-
-	if (!info)
-		return pContext->ThrowNativeError("Failed to get weaponinfo");
-
-	int price = *(int *)((intptr_t)info + priceOffset);
-
 	if (params[3] || weaponNameOffset == -1)
 		return price;
 
@@ -466,6 +495,298 @@ static cell_t CS_SetClientClanTag(IPluginContext *pContext, const cell_t *params
 	return 1;
 }
 
+static cell_t CS_AliasToWeaponID(IPluginContext *pContext, const cell_t *params)
+{
+	char *weapon;
+
+	pContext->LocalToString(params[1], &weapon);
+
+#if SOURCE_ENGINE == SE_CSGO
+	if (strstr(weapon, "usp_silencer") != NULL)
+	{
+		return SMCSWeapon_HKP2000;
+	}
+#endif
+
+	int id = GetFakeWeaponID(AliasToWeaponID(weapon));
+
+	if (!IsValidWeaponID(id))
+		return SMCSWeapon_NONE;
+
+	return id;
+}
+
+static cell_t CS_SetTeamScore(IPluginContext *pContext, const cell_t *params)
+{
+	if (g_pSDKTools == NULL)
+	{
+		smutils->LogError(myself, "SDKTools interface not found. CS_SetTeamScore native disabled.");
+	}
+	else if (g_pSDKTools->GetInterfaceVersion() < 2)
+	{
+		//<psychonic> THIS ISN'T DA LIMBO STICK. LOW IS BAD
+		return pContext->ThrowNativeError("SDKTools interface is outdated. CS_SetTeamScore native disabled.");
+	}
+
+	static void *addr;
+	if (!addr)
+	{
+		if (!g_pGameConf->GetMemSig("CheckWinLimit", &addr) || !addr)
+		{
+			return pContext->ThrowNativeError("Failed to locate CheckWinLimit function");
+		}
+	}
+
+	static int ctTeamOffsetOffset = -1;
+	static int ctTeamOffset;
+
+	static int tTeamOffsetOffset = -1;
+	static int tTeamOffset;
+
+	if (ctTeamOffsetOffset == -1)
+	{
+		if (!g_pGameConf->GetOffset("CTTeamScoreOffset", &ctTeamOffsetOffset))
+		{
+			ctTeamOffsetOffset = -1;
+			return pContext->ThrowNativeError("Unable to find CTTeamOffset gamedata");
+		}
+
+		ctTeamOffset = *(int *)((intptr_t)addr + ctTeamOffsetOffset);
+	}
+
+	if (tTeamOffsetOffset == -1)
+	{
+		if (!g_pGameConf->GetOffset("TTeamScoreOffset", &tTeamOffsetOffset))
+		{
+			tTeamOffsetOffset = -1;
+			return pContext->ThrowNativeError("Unable to find CTTeamOffset gamedata");
+		}
+
+		tTeamOffset = *(int *)((intptr_t)addr + tTeamOffsetOffset);
+	}
+
+	void *gamerules = g_pSDKTools->GetGameRules();
+	if (gamerules == NULL)
+	{
+		return pContext->ThrowNativeError("GameRules not available. CS_SetTeamScore native disabled.");
+	}
+
+	if (params[1] == 3)
+	{
+		*(int16_t *)((intptr_t)gamerules+ctTeamOffset) = params[2];
+		return 1;
+	}
+	else if (params[1] == 2)
+	{
+		*(int16_t *)((intptr_t)gamerules+tTeamOffset) = params[2];
+		return 1;
+	}
+	return pContext->ThrowNativeError("Invalid team index passed (%i).", params[1]);
+}
+
+static cell_t CS_GetTeamScore(IPluginContext *pContext, const cell_t *params)
+{
+	if (g_pSDKTools == NULL)
+	{
+		smutils->LogError(myself, "SDKTools interface not found. CS_GetTeamScore native disabled.");
+	}
+	else if (g_pSDKTools->GetInterfaceVersion() < 2)
+	{
+		//<psychonic> THIS ISN'T DA LIMBO STICK. LOW IS BAD
+		return pContext->ThrowNativeError("SDKTools interface is outdated. CS_GetTeamScore native disabled.");
+	}
+
+	static void *addr;
+	if (!addr)
+	{
+		if (!g_pGameConf->GetMemSig("CheckWinLimit", &addr) || !addr)
+		{
+			return pContext->ThrowNativeError("Failed to locate CheckWinLimit function");
+		}
+	}
+
+	static int ctTeamOffsetOffset = -1;
+	static int ctTeamOffset;
+
+	static int tTeamOffsetOffset = -1;
+	static int tTeamOffset;
+
+	if (ctTeamOffsetOffset == -1)
+	{
+		if (!g_pGameConf->GetOffset("CTTeamScoreOffset", &ctTeamOffsetOffset))
+		{
+			ctTeamOffsetOffset = -1;
+			return pContext->ThrowNativeError("Unable to find CTTeamOffset gamedata");
+		}
+
+		ctTeamOffset = *(int *)((intptr_t)addr + ctTeamOffsetOffset);
+	}
+
+	if (tTeamOffsetOffset == -1)
+	{
+		if (!g_pGameConf->GetOffset("TTeamScoreOffset", &tTeamOffsetOffset))
+		{
+			tTeamOffsetOffset = -1;
+			return pContext->ThrowNativeError("Unable to find CTTeamOffset gamedata");
+		}
+
+		tTeamOffset = *(int *)((intptr_t)addr + tTeamOffsetOffset);
+	}
+
+	void *gamerules = g_pSDKTools->GetGameRules();
+	if (gamerules == NULL)
+	{
+		return pContext->ThrowNativeError("GameRules not available. CS_GetTeamScore native disabled.");
+	}
+
+	if (params[1] == 3)
+	{
+		return *(int16_t *)((intptr_t)gamerules+ctTeamOffset);
+	}
+	else if (params[1] == 2)
+	{
+		return *(int16_t *)((intptr_t)gamerules+tTeamOffset);
+	}
+	return pContext->ThrowNativeError("Invalid team index passed (%i).", params[1]);
+}
+
+static cell_t CS_IsValidWeaponID(IPluginContext *pContext, const cell_t *params)
+{
+	return IsValidWeaponID(params[1]) ? 1 : 0;
+}
+
+template <typename T>
+static inline T *GetPlayerVarAddressOrError(const char *pszGamedataName, IPluginContext *pContext, CBaseEntity *pPlayerEntity)
+{
+	char szBaseName[128];
+	g_pSM->Format(szBaseName, sizeof(szBaseName), "%sBase", pszGamedataName);
+
+	const char *pszBaseVar = g_pGameConf->GetKeyValue(szBaseName);
+	if (pszBaseVar == NULL)
+	{
+		pContext->ThrowNativeError("Failed to locate %s key in gamedata", szBaseName);
+		return NULL;
+	}
+
+	int interimOffset = 0;
+	sm_sendprop_info_t info;
+	if (gamehelpers->FindSendPropInfo("CCSPlayer", pszBaseVar, &info))
+	{
+		interimOffset = info.actual_offset;
+	}
+	else
+	{
+		datamap_t *pMap = gamehelpers->GetDataMap(pPlayerEntity);
+		typedescription_t *td = gamehelpers->FindInDataMap(pMap, pszBaseVar);
+		if (td)
+		{
+#if SOURCE_ENGINE >= SE_LEFT4DEAD
+			interimOffset = td->fieldOffset;
+#else
+			interimOffset = td->fieldOffset[TD_OFFSET_NORMAL];
+#endif
+		}
+	}
+
+	if (interimOffset == 0)
+	{
+		pContext->ThrowNativeError("Failed to find property \"%s\" on player.", pszBaseVar);
+		return NULL;
+	}
+		
+
+	int tempOffset;
+	if (!g_pGameConf->GetOffset(pszGamedataName, &tempOffset))
+	{
+		pContext->ThrowNativeError("Failed to locate %s offset in gamedata", pszGamedataName);
+		return NULL;
+	}
+
+	return (T *)((intptr_t)pPlayerEntity + interimOffset + tempOffset);
+}
+
+template <typename T>
+static inline cell_t GetPlayerVar(IPluginContext *pContext, const cell_t *params, const char *varName)
+{
+	CBaseEntity *pPlayer = GetCBaseEntity(params[1], true);
+	if (!pPlayer)
+	{
+		return pContext->ThrowNativeError("Client index %d is not valid", params[1]);
+	}
+
+	T *pVar = GetPlayerVarAddressOrError<T>(varName, pContext, pPlayer);
+	if (pVar)
+	{	
+		return (cell_t)*pVar;
+	}
+
+	return 0;
+}
+
+template <typename T>
+static inline cell_t SetPlayerVar(IPluginContext *pContext, const cell_t *params, const char *varName)
+{
+	CBaseEntity *pPlayer = GetCBaseEntity(params[1], true);
+	if (!pPlayer)
+	{
+		return pContext->ThrowNativeError("Client index %d is not valid", params[1]);
+	}
+
+	T *pVar = GetPlayerVarAddressOrError<T>(varName, pContext, pPlayer);
+	if (pVar)
+	{
+		*pVar = (T)params[2];
+	}
+
+	return 0;
+}
+
+static cell_t CS_SetMVPCount(IPluginContext *pContext, const cell_t *params)
+{
+	return SetPlayerVar<int>(pContext, params, "MVPs");
+}
+
+static cell_t CS_GetMVPCount(IPluginContext *pContext, const cell_t *params)
+{
+	return GetPlayerVar<int>(pContext, params, "MVPs");
+}
+
+static cell_t CS_SetClientContributionScore(IPluginContext *pContext, const cell_t *params)
+{
+#if SOURCE_ENGINE == SE_CSGO
+	return SetPlayerVar<int>(pContext, params, "CScore");
+#else
+	return pContext->ThrowNativeError("SetClientContributionScore is not supported on this game");
+#endif
+}
+
+static cell_t CS_GetClientContributionScore(IPluginContext *pContext, const cell_t *params)
+{
+#if SOURCE_ENGINE == SE_CSGO
+	return GetPlayerVar<int>(pContext, params, "CScore");
+#else
+	return pContext->ThrowNativeError("GetClientContributionScore is not supported on this game");
+#endif
+}
+
+static cell_t CS_SetClientAssists(IPluginContext *pContext, const cell_t *params)
+{
+#if SOURCE_ENGINE == SE_CSGO
+	return SetPlayerVar<int>(pContext, params, "Assists");
+#else
+	return pContext->ThrowNativeError("SetClientAssists is not supported on this game");
+#endif
+}
+
+static cell_t CS_GetClientAssists(IPluginContext *pContext, const cell_t *params)
+{
+#if SOURCE_ENGINE == SE_CSGO
+	return GetPlayerVar<int>(pContext, params, "Assists");
+#else
+	return pContext->ThrowNativeError("GetClientAssists is not supported on this game");
+#endif
+}
+
 sp_nativeinfo_t g_CSNatives[] = 
 {
 	{"CS_RespawnPlayer",			CS_RespawnPlayer}, 
@@ -476,6 +797,17 @@ sp_nativeinfo_t g_CSNatives[] =
 	{"CS_GetWeaponPrice",			CS_GetWeaponPrice},
 	{"CS_GetClientClanTag",			CS_GetClientClanTag},
 	{"CS_SetClientClanTag",			CS_SetClientClanTag},
+	{"CS_AliasToWeaponID",			CS_AliasToWeaponID},
+	{"CS_GetTeamScore",				CS_GetTeamScore},
+	{"CS_SetTeamScore",				CS_SetTeamScore},
+	{"CS_GetMVPCount",				CS_GetMVPCount},
+	{"CS_SetMVPCount",				CS_SetMVPCount},
+	{"CS_WeaponIDToAlias",			CS_WeaponIDToAlias},
+	{"CS_GetClientContributionScore",	CS_GetClientContributionScore},
+	{"CS_SetClientContributionScore",	CS_SetClientContributionScore},
+	{"CS_GetClientAssists",			CS_GetClientAssists},
+	{"CS_SetClientAssists",			CS_SetClientAssists},
+	{"CS_IsValidWeaponID",			CS_IsValidWeaponID},
 	{NULL,							NULL}
 };
 

extensions/cstrike/sdk/smsdk_config.h

@@ -38,8 +38,8 @@
  */
 
 /* Basic information exposed publicly */
-#define SMEXT_CONF_NAME			"CS:S Tools"
+#define SMEXT_CONF_NAME			"CS Tools"
-#define SMEXT_CONF_DESCRIPTION	"CS:S extended functionality"
+#define SMEXT_CONF_DESCRIPTION	"CS extended functionality"
 #define SMEXT_CONF_VERSION		""
 #define SMEXT_CONF_AUTHOR		"AlliedModders LLC"
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"

extensions/cstrike/timeleft.h

@@ -40,6 +40,9 @@ class TimeLeftEvents : public IGameEventListener2
 public:
 	bool LevelInit(char const *pMapName, char const *pMapEntities, char const *pOldLevel, char const *pLandmarkName, bool loadGame, bool background);
 	virtual void FireGameEvent(IGameEvent *event);
+#if SOURCE_ENGINE >= SE_ALIENSWARM
+	virtual int	 GetEventDebugID( void ) { return 42; }
+#endif
 };
 
 extern TimeLeftEvents g_TimeLeftEvents;