Merge.
authorAsher Baker <asherkin@limetech.org>
Sun May 27 02:16:48 2012 +0100 (2012-05-27)
changeset 7842d1b06329254
parent 783 ba8cd35102b1
parent 782 6c999e76296d
child 785 11aa8bb24378
Merge.
     1.1 --- a/AMBuildScript	Sun May 27 02:16:08 2012 +0100
     1.2 +++ b/AMBuildScript	Sun May 27 02:16:48 2012 +0100
     1.3 @@ -27,6 +27,10 @@
     1.4  		                              'name': 'BLOODYGOODTIME', 'platform': ['windows']}
     1.5  		self.possibleSdks['eye'] =   {'sdk': 'HL2SDK-EYE',      'ext': '2.eye', 'def': '5',
     1.6  		                              'name': 'EYE', 'platform': ['windows']}
     1.7 +		self.possibleSdks['csgo'] =   {'sdk': 'HL2SDKCSGO',      'ext': '2.csgo', 'def': '11',
     1.8 +		                              'name': 'CSGO', 'platform': ['windows', 'linux']}
     1.9 +		# self.possibleSdks['portal2'] =   {'sdk': 'HL2SDK-PORTAL2',      'ext': '2.portal2', 'def': '10',
    1.10 +		#                               'name': 'PORTAL2', 'platform': ['windows']}
    1.11  		
    1.12  		self.sdkInfo = { }
    1.13  		
    1.14 @@ -39,6 +43,7 @@
    1.15  			if AMBuild.target['platform'] != 'darwin':
    1.16  				envvars['HL2SDK'] = 'hl2sdk'
    1.17  				envvars['HL2SDKOB'] = 'hl2sdk-ob'
    1.18 +				envvars['HL2SDKCSGO'] = 'hl2sdk-csgo'
    1.19  
    1.20  			envvars['HL2SDKOBVALVE'] = 'hl2sdk-ob-valve'
    1.21  			envvars['HL2SDKL4D'] = 'hl2sdk-l4d'
    1.22 @@ -118,7 +123,7 @@
    1.23  				self.compiler.AddToListVar('CXXFLAGS', '-fno-threadsafe-statics')
    1.24  				self.compiler.AddToListVar('CXXFLAGS', '-Wno-non-virtual-dtor')
    1.25  				self.compiler.AddToListVar('CXXFLAGS', '-Wno-overloaded-virtual')
    1.26 -				if (self.vendor == 'gcc' and cxx.majorVersion >= 4 and cxx.minorVersion >= 3) or \
    1.27 +				if (self.vendor == 'gcc' and cxx.majorVersion >= 4 and cxx.minorVersion >= 7) or \
    1.28  						(self.vendor == 'clang' and cxx.majorVersion >= 3):
    1.29  					self.compiler.AddToListVar('CXXFLAGS', '-Wno-delete-non-virtual-dtor')
    1.30  				self.compiler.AddToListVar('CDEFINES', 'HAVE_STDINT_H')
    1.31 @@ -256,10 +261,13 @@
    1.32  			else:
    1.33  				staticLibs = os.path.join(sdkPath, 'lib', 'linux')
    1.34  			workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
    1.35 -			if sdk in ['ep2v', 'l4d', 'l4d2']:
    1.36 -				for i in ['tier1_i486.a', 'libvstdlib.so', 'libtier0.so']:
    1.37 -					link = os.path.join(workFolder, i)
    1.38 -					target = os.path.join(staticLibs, i)
    1.39 +			if sdk in ['ep2v', 'l4d', 'l4d2', 'csgo']:
    1.40 +				libs = ['tier1_i486.a', 'libvstdlib.so', 'libtier0.so']
    1.41 +				if sdk == 'csgo':
    1.42 +					libs.insert(0, 'interfaces_i486.a')
    1.43 +				for lib in libs:
    1.44 +					link = os.path.join(workFolder, lib)
    1.45 +					target = os.path.join(staticLibs, lib)
    1.46  					try:
    1.47  						os.lstat(link)
    1.48  					except:
    1.49 @@ -275,16 +283,19 @@
    1.50  		elif AMBuild.target['platform'] == 'darwin':
    1.51  			staticLibs = os.path.join(sdkPath, 'lib', 'mac')
    1.52  			workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
    1.53 -			for i in ['tier1_i486.a', 'libvstdlib.dylib', 'libtier0.dylib']:
    1.54 -				link = os.path.join(workFolder, i)
    1.55 -				target = os.path.join(staticLibs, i)
    1.56 +			libs = ['tier1_i486.a', 'libvstdlib.dylib', 'libtier0.dylib']
    1.57 +			if sdk == 'csgo':
    1.58 +				libs.append('interfaces_i486.a')
    1.59 +			for lib in libs:
    1.60 +				link = os.path.join(workFolder, lib)
    1.61 +				target = os.path.join(staticLibs, lib)
    1.62  				try:
    1.63  					os.lstat(link)
    1.64  				except:
    1.65  					job.AddCommand(SymlinkCommand(link, target))
    1.66  		elif AMBuild.target['platform'] == 'windows':
    1.67  			libs = ['tier0', 'tier1', 'vstdlib']
    1.68 -			if sdk == 'swarm':
    1.69 +			if sdk in ['swarm', 'csgo']:
    1.70  				libs.append('interfaces')
    1.71  			for lib in libs:
    1.72  				libPath = os.path.join(sdkPath, 'lib', 'public', lib) + '.lib'
    1.73 @@ -294,6 +305,8 @@
    1.74  	def PostSetupHL2Job(self, job, builder, sdk):
    1.75  		if AMBuild.target['platform'] in ['linux', 'darwin']:
    1.76  			builder.AddObjectFiles(['tier1_i486.a'])
    1.77 +			if( sdk == 'csgo' ):
    1.78 +				builder.AddObjectFiles(['interfaces_i486.a'])
    1.79  
    1.80  	def DefaultHL2Compiler(self, path, sdk, noLink = False):
    1.81  		compiler = self.DefaultCompiler()
    1.82 @@ -304,6 +317,10 @@
    1.83  
    1.84  		info = self.possibleSdks
    1.85  		compiler['CDEFINES'].extend(['SE_' + info[i]['name'] + '=' + info[i]['def'] for i in info])
    1.86 +		
    1.87 +		# We don't build for Portal 2 (yet?, ever?), but using this define in code as 
    1.88 +		# it saves trouble if we ever need to
    1.89 +		compiler['CDEFINES'].append('SE_PORTAL2=10')
    1.90  
    1.91  		paths = [['public'], ['public', 'engine'], ['public', 'mathlib'], ['public', 'vstdlib'],
    1.92  						 ['public', 'tier0'], ['public', 'tier1']]
    1.93 @@ -320,8 +337,11 @@
    1.94  
    1.95  		compiler['CDEFINES'].append('SOURCE_ENGINE=' + info['def'])
    1.96  
    1.97 -		if sdk == 'swarm' and AMBuild.target['platform'] == 'windows':
    1.98 -			compiler['CDEFINES'].extend(['COMPILER_MSVC', 'COMPILER_MSVC32'])
    1.99 +		if sdk in ['swarm', 'csgo']:
   1.100 +			if AMBuild.target['platform'] == 'windows':
   1.101 +				compiler['CDEFINES'].extend(['COMPILER_MSVC', 'COMPILER_MSVC32'])
   1.102 +			else:
   1.103 +				compiler['CDEFINES'].extend(['COMPILER_GCC', 'POSIX'])
   1.104  
   1.105  		if sdk == 'ep1':
   1.106  			if AMBuild.target['platform'] == 'linux':
   1.107 @@ -338,7 +358,7 @@
   1.108  		if not noLink:
   1.109  			if AMBuild.target['platform'] == 'linux':
   1.110  				compiler['POSTLINKFLAGS'][0:0] = ['-lm']
   1.111 -				if sdk in ['ep2v', 'l4d', 'l4d2']:
   1.112 +				if sdk in ['ep2v', 'l4d', 'l4d2', 'csgo']:
   1.113  					compiler['POSTLINKFLAGS'][0:0] = ['libtier0.so']
   1.114  					compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib.so']
   1.115  				else:
     2.1 --- a/core-legacy/sourcemm.h	Sun May 27 02:16:08 2012 +0100
     2.2 +++ b/core-legacy/sourcemm.h	Sun May 27 02:16:48 2012 +0100
     2.3 @@ -16,7 +16,6 @@
     2.4   * @file sourcemm.h
     2.5   */
     2.6  
     2.7 -#include <string>
     2.8  #include <interface.h>
     2.9  #include <eiface.h>
    2.10  #include <sourcehook/sourcehook_impl.h>
     3.1 --- a/core/ISmmPluginExt.h	Sun May 27 02:16:08 2012 +0100
     3.2 +++ b/core/ISmmPluginExt.h	Sun May 27 02:16:48 2012 +0100
     3.3 @@ -46,6 +46,8 @@
     3.4  #define SOURCE_ENGINE_ALIENSWARM		8				/**< Alien Swarm */
     3.5  #define SOURCE_ENGINE_BLOODYGOODTIME	9				/**< Bloody Good Time */
     3.6  #define SOURCE_ENGINE_EYE				10				/**< E.Y.E Divine Cybermancy */
     3.7 +#define SOURCE_ENGINE_PORTAL2			11				/**< Portal 2 */
     3.8 +#define SOURCE_ENGINE_CSGO				12				/**< Counter-Strike: Global Offensive */
     3.9  
    3.10  #define METAMOD_PLAPI_VERSION			15				/**< Version of this header file */
    3.11  #define METAMOD_PLAPI_NAME				"ISmmPlugin"	/**< Name of the plugin interface */
     4.1 --- a/core/Makefile	Sun May 27 02:16:08 2012 +0100
     4.2 +++ b/core/Makefile	Sun May 27 02:16:48 2012 +0100
     4.3 @@ -6,6 +6,7 @@
     4.4  HL2SDK_OB_VALVE = ../../hl2sdk-ob-valve
     4.5  HL2SDK_L4D = ../../hl2sdk-l4d
     4.6  HL2SDK_L4D2 = ../../hl2sdk-l4d2
     4.7 +HL2SDK_CSGO = ../../hl2sdk-csgo
     4.8  
     4.9  #####################################
    4.10  ### EDIT BELOW FOR OTHER PROJECTS ###
    4.11 @@ -53,7 +54,7 @@
    4.12  	HL2SDK = $(HL2SDK_OB_VALVE)
    4.13  	HL2PUB = $(HL2SDK)/public
    4.14  	HL2LIB = $(HL2SDK)/lib/linux
    4.15 -	CFLAGS += -DSOURCE_ENGINE=4
    4.16 +	CFLAGS += -DSOURCE_ENGINE=6
    4.17  	INCLUDE += -I$(HL2SDK)/public/game/server
    4.18  	SRCDS = $(SRCDS_BASE)/orangebox
    4.19  	BINARY = metamod.2.ep2v.so
    4.20 @@ -65,7 +66,7 @@
    4.21  	HL2SDK = $(HL2SDK_L4D)
    4.22  	HL2PUB = $(HL2SDK)/public
    4.23  	HL2LIB = $(HL2SDK)/lib/linux
    4.24 -	CFLAGS += -DSOURCE_ENGINE=5
    4.25 +	CFLAGS += -DSOURCE_ENGINE=7
    4.26  	INCLUDE += -I$(HL2SDK)/public/game/server
    4.27  	SRCDS = $(SRCDS_BASE)/l4d
    4.28  	BINARY = metamod.2.l4d.so
    4.29 @@ -76,7 +77,7 @@
    4.30  	HL2SDK = $(HL2SDK_L4D2)
    4.31  	HL2PUB = $(HL2SDK)/public
    4.32  	HL2LIB = $(HL2SDK)/lib/linux
    4.33 -	CFLAGS += -DSOURCE_ENGINE=6
    4.34 +	CFLAGS += -DSOURCE_ENGINE=8
    4.35  	INCLUDE += -I$(HL2SDK)/public/game/server
    4.36  	SRCDS = $(SRCDS_BASE)/left4dead2
    4.37  	BINARY = metamod.2.l4d2.so
    4.38 @@ -84,18 +85,33 @@
    4.39  	LIB_SUFFIX = .so
    4.40  	override ENGSET = true
    4.41  endif
    4.42 +ifeq "$(ENGINE)" "csgo"
    4.43 +	HL2SDK = $(HL2SDK_CSGO)
    4.44 +	HL2PUB = $(HL2SDK)/public
    4.45 +	HL2LIB = $(HL2SDK)/lib/linux
    4.46 +	CFLAGS += -DSOURCE_ENGINE=11
    4.47 +	INCLUDE += -I$(HL2SDK)/public/game/server
    4.48 +	SRCDS = $(SRCDS_BASE)/csgo
    4.49 +	BINARY = metamod.2.csgo.so
    4.50 +	LIB_PREFIX = lib
    4.51 +	LIB_SUFFIX = .so
    4.52 +	override ENGSET = true
    4.53 +endif
    4.54  
    4.55 -CFLAGS += -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 -DSE_LEFT4DEAD=5 -DSE_LEFT4DEAD2=6
    4.56 +CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_BLOODYGOODTIME=4 -DSE_EYE=5 \
    4.57 +	-DSE_ORANGEBOXVALVE=6 -DSE_LEFT4DEAD=7 -DSE_LEFT4DEAD2=8 -DSE_ALIENSWARM=9 -DSE_PORTAL2=10 \
    4.58 +	-DSE_CSGO=11
    4.59  
    4.60 -LINK += $(HL2LIB)/tier1_i486.a $(LIB_PREFIX)vstdlib$(LIB_SUFFIX) $(LIB_PREFIX)tier0$(LIB_SUFFIX) \
    4.61 +LINK += $(HL2LIB)/tier1_i486.a $(HL2LIB)/interfaces_i486.a $(LIB_PREFIX)vstdlib$(LIB_SUFFIX) $(LIB_PREFIX)tier0$(LIB_SUFFIX) \
    4.62  	-static-libgcc
    4.63  
    4.64  INCLUDE += -I. -I.. -I../public -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/mathlib -I$(HL2PUB)/vstdlib \
    4.65  	-I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 -I. -Isourcehook -I../loader
    4.66  
    4.67 -CFLAGS += -D_LINUX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \
    4.68 +CFLAGS += -D_LINUX -DPOSIX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \
    4.69  	-Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca \
    4.70 -	-Dstrcmpi=strcasecmp -Wall -Werror -Wno-uninitialized -mfpmath=sse -msse -DHAVE_STDINT_H -m32
    4.71 +	-Dstrcmpi=strcasecmp -Wall -Werror -Wno-uninitialized -mfpmath=sse -msse -DHAVE_STDINT_H -m32 \
    4.72 +	-DCOMPILER_GCC
    4.73  CPPFLAGS += -Wno-non-virtual-dtor -fno-exceptions -fno-rtti
    4.74  
    4.75  ################################################
     5.1 --- a/core/metamod.h	Sun May 27 02:16:08 2012 +0100
     5.2 +++ b/core/metamod.h	Sun May 27 02:16:48 2012 +0100
     5.3 @@ -31,7 +31,6 @@
     5.4   * @file sourcemm.h
     5.5   */
     5.6  
     5.7 -#include <string>
     5.8  #include <interface.h>
     5.9  #include <eiface.h>
    5.10  #include <sourcehook/sourcehook_impl.h>
     6.1 --- a/core/metamod_console.cpp	Sun May 27 02:16:08 2012 +0100
     6.2 +++ b/core/metamod_console.cpp	Sun May 27 02:16:48 2012 +0100
     6.3 @@ -127,6 +127,10 @@
     6.4  			CONMSG("  Engine: Dark Messiah (2006)\n");
     6.5  #elif SOURCE_ENGINE == SE_EYE
     6.6  			CONMSG("  Engine: E.Y.E. Divine Cybermancy (2011)\n");
     6.7 +#elif SOURCE_ENGINE == SE_PORTAL2
     6.8 +			CONMSG("  Engine: Portal 2 (2011)\n");
     6.9 +#elif SOURCE_ENGINE == SE_CSGO
    6.10 +			CONMSG("  Engine: Counter-Strike: Global Offensive (2012)\n");
    6.11  #else
    6.12  #error "SOURCE_ENGINE not defined to a known value"
    6.13  #endif
     7.1 --- a/core/metamod_oslink.h	Sun May 27 02:16:08 2012 +0100
     7.2 +++ b/core/metamod_oslink.h	Sun May 27 02:16:48 2012 +0100
     7.3 @@ -71,8 +71,12 @@
     7.4  	#define PATH_SEP_CHAR		'/'
     7.5  	#define ALT_SEP_CHAR		'\\'
     7.6  	#define PATH_SIZE			PATH_MAX
     7.7 -	#define	stricmp				strcasecmp
     7.8 -	#define strnicmp			strncasecmp
     7.9 +	#ifndef stricmp
    7.10 +		#define	stricmp			strcasecmp
    7.11 +	#endif
    7.12 +	#ifndef strnicmp
    7.13 +		#define strnicmp		strncasecmp
    7.14 +	#endif
    7.15  	inline bool _IsPathSepChar(char c) { return (c == '/'); }
    7.16  #endif
    7.17  
     8.1 --- a/core/msvc9/mm_core.sln	Sun May 27 02:16:08 2012 +0100
     8.2 +++ b/core/msvc9/mm_core.sln	Sun May 27 02:16:48 2012 +0100
     8.3 @@ -5,11 +5,13 @@
     8.4  EndProject
     8.5  Global
     8.6  	GlobalSection(SolutionConfigurationPlatforms) = preSolution
     8.7 +		Debug - CS GO|Win32 = Debug - CS GO|Win32
     8.8  		Debug - Dark Messiah|Win32 = Debug - Dark Messiah|Win32
     8.9  		Debug - Left 4 Dead 2|Win32 = Debug - Left 4 Dead 2|Win32
    8.10  		Debug - Left 4 Dead|Win32 = Debug - Left 4 Dead|Win32
    8.11  		Debug - Orange Box|Win32 = Debug - Orange Box|Win32
    8.12  		Debug - Orange Box Valve|Win32 = Debug - Orange Box Valve|Win32
    8.13 +		Release - CS GO|Win32 = Release - CS GO|Win32
    8.14  		Release - Dark Messiah|Win32 = Release - Dark Messiah|Win32
    8.15  		Release - Left 4 Dead 2|Win32 = Release - Left 4 Dead 2|Win32
    8.16  		Release - Left 4 Dead|Win32 = Release - Left 4 Dead|Win32
    8.17 @@ -17,6 +19,8 @@
    8.18  		Release - Orange Box Valve|Win32 = Release - Orange Box Valve|Win32
    8.19  	EndGlobalSection
    8.20  	GlobalSection(ProjectConfigurationPlatforms) = postSolution
    8.21 +		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Debug - CS GO|Win32.ActiveCfg = Debug - CS GO|Win32
    8.22 +		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Debug - CS GO|Win32.Build.0 = Debug - CS GO|Win32
    8.23  		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Debug - Dark Messiah|Win32.ActiveCfg = Debug - Dark Messiah|Win32
    8.24  		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Debug - Dark Messiah|Win32.Build.0 = Debug - Dark Messiah|Win32
    8.25  		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Debug - Left 4 Dead 2|Win32.ActiveCfg = Debug - Left 4 Dead 2|Win32
    8.26 @@ -27,6 +31,8 @@
    8.27  		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Debug - Orange Box|Win32.Build.0 = Debug - Orange Box|Win32
    8.28  		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Debug - Orange Box Valve|Win32.ActiveCfg = Debug - Orange Box Valve|Win32
    8.29  		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Debug - Orange Box Valve|Win32.Build.0 = Debug - Orange Box Valve|Win32
    8.30 +		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Release - CS GO|Win32.ActiveCfg = Release - CS GO|Win32
    8.31 +		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Release - CS GO|Win32.Build.0 = Release - CS GO|Win32
    8.32  		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Release - Dark Messiah|Win32.ActiveCfg = Release - Dark Messiah|Win32
    8.33  		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Release - Dark Messiah|Win32.Build.0 = Release - Dark Messiah|Win32
    8.34  		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Release - Left 4 Dead 2|Win32.ActiveCfg = Release - Left 4 Dead 2|Win32
     9.1 --- a/core/msvc9/mm_core.vcproj	Sun May 27 02:16:08 2012 +0100
     9.2 +++ b/core/msvc9/mm_core.vcproj	Sun May 27 02:16:48 2012 +0100
     9.3 @@ -40,9 +40,9 @@
     9.4  			/>
     9.5  			<Tool
     9.6  				Name="VCCLCompilerTool"
     9.7 -				AdditionalOptions="/D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6"
     9.8 +				AdditionalOptions="/D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_ORANGEBOXVALVE=6 /D SE_LEFT4DEAD=7 /D SE_LEFT4DEAD2=8 /D SE_ALIENSWARM=9 /D SE_PORTAL2=10 /D SE_CSGO=11"
     9.9  				Optimization="0"
    9.10 -				AdditionalIncludeDirectories="..;..\..\loader;..\sourcehook;&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;$(HL2SDKOB)\public\vstdlib&quot;"
    9.11 +				AdditionalIncludeDirectories="..;..\..\public;..\..\loader;..\sourcehook;&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;$(HL2SDKOB)\public\vstdlib&quot;"
    9.12  				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCE_ENGINE=3"
    9.13  				MinimalRebuild="true"
    9.14  				BasicRuntimeChecks="3"
    9.15 @@ -124,11 +124,11 @@
    9.16  			/>
    9.17  			<Tool
    9.18  				Name="VCCLCompilerTool"
    9.19 -				AdditionalOptions="/D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6"
    9.20 +				AdditionalOptions="/D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_ORANGEBOXVALVE=6 /D SE_LEFT4DEAD=7 /D SE_LEFT4DEAD2=8 /D SE_ALIENSWARM=9 /D SE_PORTAL2=10 /D SE_CSGO=11"
    9.21  				Optimization="3"
    9.22  				FavorSizeOrSpeed="1"
    9.23  				OmitFramePointers="true"
    9.24 -				AdditionalIncludeDirectories="..;..\..\loader;..\sourcehook;&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;$(HL2SDKOB)\public\vstdlib&quot;"
    9.25 +				AdditionalIncludeDirectories="..;..\..\public;..\..\loader;..\sourcehook;&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;$(HL2SDKOB)\public\vstdlib&quot;"
    9.26  				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCE_ENGINE=3"
    9.27  				StringPooling="true"
    9.28  				ExceptionHandling="1"
    9.29 @@ -211,10 +211,10 @@
    9.30  			/>
    9.31  			<Tool
    9.32  				Name="VCCLCompilerTool"
    9.33 -				AdditionalOptions="/D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6"
    9.34 +				AdditionalOptions="/D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_ORANGEBOXVALVE=6 /D SE_LEFT4DEAD=7 /D SE_LEFT4DEAD2=8 /D SE_ALIENSWARM=9 /D SE_PORTAL2=10 /D SE_CSGO=11"
    9.35  				Optimization="0"
    9.36  				AdditionalIncludeDirectories="..;..\..\public;..\..\loader;..\sourcehook;&quot;$(HL2SDKOBVALVE)\public&quot;;&quot;$(HL2SDKOBVALVE)\public\engine&quot;;&quot;$(HL2SDKOBVALVE)\public\game\server&quot;;&quot;$(HL2SDKOBVALVE)\public\tier0&quot;;&quot;$(HL2SDKOBVALVE)\public\tier1&quot;;&quot;$(HL2SDKOBVALVE)\public\vstdlib&quot;"
    9.37 -				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCE_ENGINE=4"
    9.38 +				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCE_ENGINE=6"
    9.39  				MinimalRebuild="true"
    9.40  				BasicRuntimeChecks="3"
    9.41  				RuntimeLibrary="1"
    9.42 @@ -295,12 +295,12 @@
    9.43  			/>
    9.44  			<Tool
    9.45  				Name="VCCLCompilerTool"
    9.46 -				AdditionalOptions="/D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6"
    9.47 +				AdditionalOptions="/D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_ORANGEBOXVALVE=6 /D SE_LEFT4DEAD=7 /D SE_LEFT4DEAD2=8 /D SE_ALIENSWARM=9 /D SE_PORTAL2=10 /D SE_CSGO=11"
    9.48  				Optimization="3"
    9.49  				FavorSizeOrSpeed="1"
    9.50  				OmitFramePointers="true"
    9.51 -				AdditionalIncludeDirectories="..;..\..\loader;..\sourcehook;&quot;$(HL2SDKOBVALVE)\public&quot;;&quot;$(HL2SDKOBVALVE)\public\engine&quot;;&quot;$(HL2SDKOBVALVE)\public\game\server&quot;;&quot;$(HL2SDKOBVALVE)\public\tier0&quot;;&quot;$(HL2SDKOBVALVE)\public\tier1&quot;;&quot;$(HL2SDKOBVALVE)\public\vstdlib&quot;"
    9.52 -				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCE_ENGINE=4"
    9.53 +				AdditionalIncludeDirectories="..;..\..\public;..\..\loader;..\sourcehook;&quot;$(HL2SDKOBVALVE)\public&quot;;&quot;$(HL2SDKOBVALVE)\public\engine&quot;;&quot;$(HL2SDKOBVALVE)\public\game\server&quot;;&quot;$(HL2SDKOBVALVE)\public\tier0&quot;;&quot;$(HL2SDKOBVALVE)\public\tier1&quot;;&quot;$(HL2SDKOBVALVE)\public\vstdlib&quot;"
    9.54 +				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCE_ENGINE=6"
    9.55  				StringPooling="true"
    9.56  				ExceptionHandling="1"
    9.57  				RuntimeLibrary="0"
    9.58 @@ -382,10 +382,10 @@
    9.59  			/>
    9.60  			<Tool
    9.61  				Name="VCCLCompilerTool"
    9.62 -				AdditionalOptions="/D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6"
    9.63 +				AdditionalOptions="/D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_ORANGEBOXVALVE=6 /D SE_LEFT4DEAD=7 /D SE_LEFT4DEAD2=8 /D SE_ALIENSWARM=9 /D SE_PORTAL2=10 /D SE_CSGO=11"
    9.64  				Optimization="0"
    9.65 -				AdditionalIncludeDirectories="..;..\..\loader;..\sourcehook;&quot;$(HL2SDKL4D)\public&quot;;&quot;$(HL2SDKL4D)\public\engine&quot;;&quot;$(HL2SDKL4D)\public\game\server&quot;;&quot;$(HL2SDKL4D)\public\tier0&quot;;&quot;$(HL2SDKL4D)\public\tier1&quot;;&quot;$(HL2SDKL4D)\public\vstdlib&quot;"
    9.66 -				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCE_ENGINE=5"
    9.67 +				AdditionalIncludeDirectories="..;..\..\public;..\..\loader;..\sourcehook;&quot;$(HL2SDKL4D)\public&quot;;&quot;$(HL2SDKL4D)\public\engine&quot;;&quot;$(HL2SDKL4D)\public\game\server&quot;;&quot;$(HL2SDKL4D)\public\tier0&quot;;&quot;$(HL2SDKL4D)\public\tier1&quot;;&quot;$(HL2SDKL4D)\public\vstdlib&quot;"
    9.68 +				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCE_ENGINE=7"
    9.69  				MinimalRebuild="true"
    9.70  				BasicRuntimeChecks="3"
    9.71  				RuntimeLibrary="1"
    9.72 @@ -466,12 +466,12 @@
    9.73  			/>
    9.74  			<Tool
    9.75  				Name="VCCLCompilerTool"
    9.76 -				AdditionalOptions="/D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6"
    9.77 +				AdditionalOptions="/D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_ORANGEBOXVALVE=6 /D SE_LEFT4DEAD=7 /D SE_LEFT4DEAD2=8 /D SE_ALIENSWARM=9 /D SE_PORTAL2=10 /D SE_CSGO=11"
    9.78  				Optimization="3"
    9.79  				FavorSizeOrSpeed="1"
    9.80  				OmitFramePointers="true"
    9.81 -				AdditionalIncludeDirectories="..;..\..\loader;..\sourcehook;&quot;$(HL2SDKL4D)\public&quot;;&quot;$(HL2SDKL4D)\public\engine&quot;;&quot;$(HL2SDKL4D)\public\game\server&quot;;&quot;$(HL2SDKL4D)\public\tier0&quot;;&quot;$(HL2SDKL4D)\public\tier1&quot;;&quot;$(HL2SDKL4D)\public\vstdlib&quot;"
    9.82 -				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCE_ENGINE=5"
    9.83 +				AdditionalIncludeDirectories="..;..\..\public;..\..\loader;..\sourcehook;&quot;$(HL2SDKL4D)\public&quot;;&quot;$(HL2SDKL4D)\public\engine&quot;;&quot;$(HL2SDKL4D)\public\game\server&quot;;&quot;$(HL2SDKL4D)\public\tier0&quot;;&quot;$(HL2SDKL4D)\public\tier1&quot;;&quot;$(HL2SDKL4D)\public\vstdlib&quot;"
    9.84 +				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCE_ENGINE=7"
    9.85  				StringPooling="true"
    9.86  				ExceptionHandling="1"
    9.87  				RuntimeLibrary="0"
    9.88 @@ -553,10 +553,10 @@
    9.89  			/>
    9.90  			<Tool
    9.91  				Name="VCCLCompilerTool"
    9.92 -				AdditionalOptions="/D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6"
    9.93 +				AdditionalOptions="/D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_ORANGEBOXVALVE=6 /D SE_LEFT4DEAD=7 /D SE_LEFT4DEAD2=8 /D SE_ALIENSWARM=9 /D SE_PORTAL2=10 /D SE_CSGO=11"
    9.94  				Optimization="0"
    9.95 -				AdditionalIncludeDirectories="..;..\..\loader;..\sourcehook;&quot;$(HL2SDKL4D2)\public&quot;;&quot;$(HL2SDKL4D2)\public\engine&quot;;&quot;$(HL2SDKL4D2)\public\game\server&quot;;&quot;$(HL2SDKL4D2)\public\tier0&quot;;&quot;$(HL2SDKL4D2)\public\tier1&quot;;&quot;$(HL2SDKL4D2)\public\vstdlib&quot;"
    9.96 -				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCE_ENGINE=6"
    9.97 +				AdditionalIncludeDirectories="..;..\..\public;..\..\loader;..\sourcehook;&quot;$(HL2SDKL4D2)\public&quot;;&quot;$(HL2SDKL4D2)\public\engine&quot;;&quot;$(HL2SDKL4D2)\public\game\server&quot;;&quot;$(HL2SDKL4D2)\public\tier0&quot;;&quot;$(HL2SDKL4D2)\public\tier1&quot;;&quot;$(HL2SDKL4D2)\public\vstdlib&quot;"
    9.98 +				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCE_ENGINE=8"
    9.99  				MinimalRebuild="true"
   9.100  				BasicRuntimeChecks="3"
   9.101  				RuntimeLibrary="1"
   9.102 @@ -637,12 +637,12 @@
   9.103  			/>
   9.104  			<Tool
   9.105  				Name="VCCLCompilerTool"
   9.106 -				AdditionalOptions="/D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6"
   9.107 +				AdditionalOptions="/D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_ORANGEBOXVALVE=6 /D SE_LEFT4DEAD=7 /D SE_LEFT4DEAD2=8 /D SE_ALIENSWARM=9 /D SE_PORTAL2=10 /D SE_CSGO=11"
   9.108  				Optimization="3"
   9.109  				FavorSizeOrSpeed="1"
   9.110  				OmitFramePointers="true"
   9.111 -				AdditionalIncludeDirectories="..;..\..\loader;..\sourcehook;&quot;$(HL2SDKL4D2)\public&quot;;&quot;$(HL2SDKL4D2)\public\engine&quot;;&quot;$(HL2SDKL4D2)\public\game\server&quot;;&quot;$(HL2SDKL4D2)\public\tier0&quot;;&quot;$(HL2SDKL4D2)\public\tier1&quot;;&quot;$(HL2SDKL4D2)\public\vstdlib&quot;"
   9.112 -				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCE_ENGINE=6"
   9.113 +				AdditionalIncludeDirectories="..;..\..\public;..\..\loader;..\sourcehook;&quot;$(HL2SDKL4D2)\public&quot;;&quot;$(HL2SDKL4D2)\public\engine&quot;;&quot;$(HL2SDKL4D2)\public\game\server&quot;;&quot;$(HL2SDKL4D2)\public\tier0&quot;;&quot;$(HL2SDKL4D2)\public\tier1&quot;;&quot;$(HL2SDKL4D2)\public\vstdlib&quot;"
   9.114 +				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCE_ENGINE=8"
   9.115  				StringPooling="true"
   9.116  				ExceptionHandling="1"
   9.117  				RuntimeLibrary="0"
   9.118 @@ -701,6 +701,177 @@
   9.119  			/>
   9.120  		</Configuration>
   9.121  		<Configuration
   9.122 +			Name="Debug - CS GO|Win32"
   9.123 +			OutputDirectory="$(ConfigurationName)"
   9.124 +			IntermediateDirectory="$(ConfigurationName)"
   9.125 +			ConfigurationType="2"
   9.126 +			CharacterSet="2"
   9.127 +			>
   9.128 +			<Tool
   9.129 +				Name="VCPreBuildEventTool"
   9.130 +			/>
   9.131 +			<Tool
   9.132 +				Name="VCCustomBuildTool"
   9.133 +			/>
   9.134 +			<Tool
   9.135 +				Name="VCXMLDataGeneratorTool"
   9.136 +			/>
   9.137 +			<Tool
   9.138 +				Name="VCWebServiceProxyGeneratorTool"
   9.139 +			/>
   9.140 +			<Tool
   9.141 +				Name="VCMIDLTool"
   9.142 +			/>
   9.143 +			<Tool
   9.144 +				Name="VCCLCompilerTool"
   9.145 +				AdditionalOptions="/D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_ORANGEBOXVALVE=6 /D SE_LEFT4DEAD=7 /D SE_LEFT4DEAD2=8 /D SE_ALIENSWARM=9 /D SE_PORTAL2=10 /D SE_CSGO=11 /D COMPILER_MSVC /D COMPILER_MSVC32"
   9.146 +				Optimization="0"
   9.147 +				AdditionalIncludeDirectories="..;..\..\public;..\..\loader;..\sourcehook;&quot;$(HL2SDK-CSGO)\public&quot;;&quot;$(HL2SDK-CSGO)\public\engine&quot;;&quot;$(HL2SDK-CSGO)\public\game\server&quot;;&quot;$(HL2SDK-CSGO)\public\tier0&quot;;&quot;$(HL2SDK-CSGO)\public\tier1&quot;;&quot;$(HL2SDK-CSGO)\public\vstdlib&quot;"
   9.148 +				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCE_ENGINE=11"
   9.149 +				MinimalRebuild="true"
   9.150 +				BasicRuntimeChecks="3"
   9.151 +				RuntimeLibrary="1"
   9.152 +				RuntimeTypeInfo="false"
   9.153 +				UsePrecompiledHeader="0"
   9.154 +				WarningLevel="3"
   9.155 +				Detect64BitPortabilityProblems="false"
   9.156 +				DebugInformationFormat="4"
   9.157 +			/>
   9.158 +			<Tool
   9.159 +				Name="VCManagedResourceCompilerTool"
   9.160 +			/>
   9.161 +			<Tool
   9.162 +				Name="VCResourceCompilerTool"
   9.163 +				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
   9.164 +			/>
   9.165 +			<Tool
   9.166 +				Name="VCPreLinkEventTool"
   9.167 +			/>
   9.168 +			<Tool
   9.169 +				Name="VCLinkerTool"
   9.170 +				AdditionalDependencies="&quot;$(HL2SDK-CSGO)\lib\public\tier0.lib&quot; &quot;$(HL2SDK-CSGO)\lib\public\tier1.lib&quot; &quot;$(HL2SDK-CSGO)\lib\public\vstdlib.lib&quot; &quot;$(HL2SDK-CSGO)\lib\public\interfaces.lib&quot;"
   9.171 +				OutputFile="$(OutDir)/metamod.2.csgo.dll"
   9.172 +				LinkIncremental="2"
   9.173 +				IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmt.lib"
   9.174 +				GenerateDebugInformation="true"
   9.175 +				ProgramDatabaseFile="$(OutDir)/sourcemm.pdb"
   9.176 +				SubSystem="2"
   9.177 +				EnableCOMDATFolding="1"
   9.178 +				RandomizedBaseAddress="1"
   9.179 +				DataExecutionPrevention="0"
   9.180 +				ImportLibrary="$(OutDir)/sourcemm.lib"
   9.181 +				TargetMachine="1"
   9.182 +			/>
   9.183 +			<Tool
   9.184 +				Name="VCALinkTool"
   9.185 +			/>
   9.186 +			<Tool
   9.187 +				Name="VCManifestTool"
   9.188 +			/>
   9.189 +			<Tool
   9.190 +				Name="VCXDCMakeTool"
   9.191 +			/>
   9.192 +			<Tool
   9.193 +				Name="VCBscMakeTool"
   9.194 +			/>
   9.195 +			<Tool
   9.196 +				Name="VCFxCopTool"
   9.197 +			/>
   9.198 +			<Tool
   9.199 +				Name="VCAppVerifierTool"
   9.200 +			/>
   9.201 +			<Tool
   9.202 +				Name="VCPostBuildEventTool"
   9.203 +			/>
   9.204 +		</Configuration>
   9.205 +		<Configuration
   9.206 +			Name="Release - CS GO|Win32"
   9.207 +			OutputDirectory="$(ConfigurationName)"
   9.208 +			IntermediateDirectory="$(ConfigurationName)"
   9.209 +			ConfigurationType="2"
   9.210 +			CharacterSet="2"
   9.211 +			>
   9.212 +			<Tool
   9.213 +				Name="VCPreBuildEventTool"
   9.214 +			/>
   9.215 +			<Tool
   9.216 +				Name="VCCustomBuildTool"
   9.217 +			/>
   9.218 +			<Tool
   9.219 +				Name="VCXMLDataGeneratorTool"
   9.220 +			/>
   9.221 +			<Tool
   9.222 +				Name="VCWebServiceProxyGeneratorTool"
   9.223 +			/>
   9.224 +			<Tool
   9.225 +				Name="VCMIDLTool"
   9.226 +			/>
   9.227 +			<Tool
   9.228 +				Name="VCCLCompilerTool"
   9.229 +				AdditionalOptions="/D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_ORANGEBOXVALVE=6 /D SE_LEFT4DEAD=7 /D SE_LEFT4DEAD2=8 /D SE_ALIENSWARM=9 /D SE_PORTAL2=10 /D SE_CSGO=11 /D COMPILER_MSVC /D COMPILER_MSVC32"
   9.230 +				Optimization="3"
   9.231 +				FavorSizeOrSpeed="1"
   9.232 +				OmitFramePointers="true"
   9.233 +				AdditionalIncludeDirectories="..;..\..\public;..\..\loader;..\sourcehook;&quot;$(HL2SDK-CSGO)\public&quot;;&quot;$(HL2SDK-CSGO)\public\engine&quot;;&quot;$(HL2SDK-CSGO)\public\game\server&quot;;&quot;$(HL2SDK-CSGO)\public\tier0&quot;;&quot;$(HL2SDK-CSGO)\public\tier1&quot;;&quot;$(HL2SDK-CSGO)\public\vstdlib&quot;"
   9.234 +				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCE_ENGINE=11"
   9.235 +				StringPooling="true"
   9.236 +				ExceptionHandling="1"
   9.237 +				RuntimeLibrary="0"
   9.238 +				BufferSecurityCheck="false"
   9.239 +				RuntimeTypeInfo="false"
   9.240 +				UsePrecompiledHeader="0"
   9.241 +				WarningLevel="3"
   9.242 +				Detect64BitPortabilityProblems="false"
   9.243 +				DebugInformationFormat="3"
   9.244 +			/>
   9.245 +			<Tool
   9.246 +				Name="VCManagedResourceCompilerTool"
   9.247 +			/>
   9.248 +			<Tool
   9.249 +				Name="VCResourceCompilerTool"
   9.250 +				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
   9.251 +			/>
   9.252 +			<Tool
   9.253 +				Name="VCPreLinkEventTool"
   9.254 +			/>
   9.255 +			<Tool
   9.256 +				Name="VCLinkerTool"
   9.257 +				AdditionalDependencies="&quot;$(HL2SDK-CSGO)\lib\public\tier0.lib&quot; &quot;$(HL2SDK-CSGO)\lib\public\tier1.lib&quot; &quot;$(HL2SDK-CSGO)\lib\public\vstdlib.lib&quot; &quot;$(HL2SDK-CSGO)\lib\public\interfaces.lib&quot;"
   9.258 +				OutputFile="$(OutDir)/metamod.2.csgo.dll"
   9.259 +				LinkIncremental="1"
   9.260 +				IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmtd.lib"
   9.261 +				GenerateDebugInformation="true"
   9.262 +				SubSystem="2"
   9.263 +				OptimizeReferences="2"
   9.264 +				EnableCOMDATFolding="2"
   9.265 +				RandomizedBaseAddress="1"
   9.266 +				DataExecutionPrevention="0"
   9.267 +				ImportLibrary="$(OutDir)/sourcemm.lib"
   9.268 +				TargetMachine="1"
   9.269 +			/>
   9.270 +			<Tool
   9.271 +				Name="VCALinkTool"
   9.272 +			/>
   9.273 +			<Tool
   9.274 +				Name="VCManifestTool"
   9.275 +			/>
   9.276 +			<Tool
   9.277 +				Name="VCXDCMakeTool"
   9.278 +			/>
   9.279 +			<Tool
   9.280 +				Name="VCBscMakeTool"
   9.281 +			/>
   9.282 +			<Tool
   9.283 +				Name="VCFxCopTool"
   9.284 +			/>
   9.285 +			<Tool
   9.286 +				Name="VCAppVerifierTool"
   9.287 +			/>
   9.288 +			<Tool
   9.289 +				Name="VCPostBuildEventTool"
   9.290 +			/>
   9.291 +		</Configuration>
   9.292 +		<Configuration
   9.293  			Name="Debug - Dark Messiah|Win32"
   9.294  			OutputDirectory="$(ConfigurationName)"
   9.295  			IntermediateDirectory="$(ConfigurationName)"
   9.296 @@ -724,9 +895,9 @@
   9.297  			/>
   9.298  			<Tool
   9.299  				Name="VCCLCompilerTool"
   9.300 -				AdditionalOptions="/D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6"
   9.301 +				AdditionalOptions="/D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_ORANGEBOXVALVE=6 /D SE_LEFT4DEAD=7 /D SE_LEFT4DEAD2=8 /D SE_ALIENSWARM=9 /D SE_PORTAL2=10 /D SE_CSGO=11"
   9.302  				Optimization="0"
   9.303 -				AdditionalIncludeDirectories="..;..\..\loader;..\sourcehook;&quot;$(HL2SDK-DARKM)\public&quot;;&quot;$(HL2SDK-DARKM)\public\engine&quot;;&quot;$(HL2SDK-DARKM)\public\dlls&quot;;&quot;$(HL2SDK-DARKM)\public\tier0&quot;;&quot;$(HL2SDK-DARKM)\public\tier1&quot;;&quot;$(HL2SDK-DARKM)\public\vstdlib&quot;"
   9.304 +				AdditionalIncludeDirectories="..;..\..\public;..\..\loader;..\sourcehook;&quot;$(HL2SDK-DARKM)\public&quot;;&quot;$(HL2SDK-DARKM)\public\engine&quot;;&quot;$(HL2SDK-DARKM)\public\dlls&quot;;&quot;$(HL2SDK-DARKM)\public\tier0&quot;;&quot;$(HL2SDK-DARKM)\public\tier1&quot;;&quot;$(HL2SDK-DARKM)\public\vstdlib&quot;"
   9.305  				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCE_ENGINE=2"
   9.306  				MinimalRebuild="true"
   9.307  				BasicRuntimeChecks="3"
   9.308 @@ -808,11 +979,11 @@
   9.309  			/>
   9.310  			<Tool
   9.311  				Name="VCCLCompilerTool"
   9.312 -				AdditionalOptions="/D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6"
   9.313 +				AdditionalOptions="/D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_ORANGEBOXVALVE=6 /D SE_LEFT4DEAD=7 /D SE_LEFT4DEAD2=8 /D SE_ALIENSWARM=9 /D SE_PORTAL2=10 /D SE_CSGO=11"
   9.314  				Optimization="3"
   9.315  				FavorSizeOrSpeed="1"
   9.316  				OmitFramePointers="true"
   9.317 -				AdditionalIncludeDirectories="..;..\..\loader;..\sourcehook;&quot;$(HL2SDK-DARKM)\public&quot;;&quot;$(HL2SDK-DARKM)\public\engine&quot;;&quot;$(HL2SDK-DARKM)\public\dlls&quot;;&quot;$(HL2SDK-DARKM)\public\tier0&quot;;&quot;$(HL2SDK-DARKM)\public\tier1&quot;;&quot;$(HL2SDK-DARKM)\public\vstdlib&quot;"
   9.318 +				AdditionalIncludeDirectories="..;..\..\public;..\..\loader;..\sourcehook;&quot;$(HL2SDK-DARKM)\public&quot;;&quot;$(HL2SDK-DARKM)\public\engine&quot;;&quot;$(HL2SDK-DARKM)\public\dlls&quot;;&quot;$(HL2SDK-DARKM)\public\tier0&quot;;&quot;$(HL2SDK-DARKM)\public\tier1&quot;;&quot;$(HL2SDK-DARKM)\public\vstdlib&quot;"
   9.319  				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCE_ENGINE=2"
   9.320  				StringPooling="true"
   9.321  				ExceptionHandling="1"
    10.1 --- a/core/provider/console.cpp	Sun May 27 02:16:08 2012 +0100
    10.2 +++ b/core/provider/console.cpp	Sun May 27 02:16:48 2012 +0100
    10.3 @@ -41,7 +41,7 @@
    10.4  bool SMConVarAccessor::RegisterConCommandBase(ConCommandBase *pCommand)
    10.5  {
    10.6  	m_RegisteredCommands.push_back(pCommand);
    10.7 -#if SOURCE_ENGINE != SE_ALIENSWARM
    10.8 +#if SOURCE_ENGINE < SE_ALIENSWARM
    10.9  	pCommand->SetNext(NULL);
   10.10  #endif
   10.11  	icvar->RegisterConCommand(pCommand);
   10.12 @@ -51,7 +51,7 @@
   10.13  
   10.14  bool SMConVarAccessor::Register(ConCommandBase *pCommand)
   10.15  {
   10.16 -#if SOURCE_ENGINE != SE_ALIENSWARM
   10.17 +#if SOURCE_ENGINE < SE_ALIENSWARM
   10.18  	pCommand->SetNext(NULL);
   10.19  #endif
   10.20  	icvar->RegisterConCommand(pCommand);
    11.1 --- a/core/provider/provider_ep2.cpp	Sun May 27 02:16:08 2012 +0100
    11.2 +++ b/core/provider/provider_ep2.cpp	Sun May 27 02:16:48 2012 +0100
    11.3 @@ -283,7 +283,7 @@
    11.4  	UTIL_FormatArgs(buffer, sizeof(buffer), fmt, ap);
    11.5  	va_end(ap);
    11.6  
    11.7 -	Error(buffer);
    11.8 +	Error("%s", buffer);
    11.9  }
   11.10  
   11.11  void BaseProvider::DisplayWarning(const char *fmt, ...)
   11.12 @@ -295,7 +295,7 @@
   11.13  	UTIL_FormatArgs(buffer, sizeof(buffer), fmt, ap);
   11.14  	va_end(ap);
   11.15  
   11.16 -	Warning(buffer);
   11.17 +	Warning("%s", buffer);
   11.18  }
   11.19  
   11.20  IConCommandBaseAccessor *BaseProvider::GetConCommandBaseAccessor()
   11.21 @@ -373,6 +373,10 @@
   11.22  	return SOURCE_ENGINE_DARKMESSIAH;
   11.23  #elif SOURCE_ENGINE == SE_EYE
   11.24  	return SOURCE_ENGINE_EYE;
   11.25 +#elif SOURCE_ENGINE == SE_PORTAL2
   11.26 +	return SOURCE_ENGINE_PORTAL2;
   11.27 +#elif SOURCE_ENGINE == SE_CSGO
   11.28 +	return SOURCE_ENGINE_CSGO;
   11.29  #else
   11.30  #error "SOURCE_ENGINE not defined to a known value"
   11.31  #endif
    12.1 --- a/core/sourcehook/FastDelegate.h	Sun May 27 02:16:08 2012 +0100
    12.2 +++ b/core/sourcehook/FastDelegate.h	Sun May 27 02:16:48 2012 +0100
    12.3 @@ -2297,6 +2297,91 @@
    12.4  	return (*(m_Closure.GetStaticFunction()))(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16); }
    12.5  };
    12.6  
    12.7 +//N=17 (!)
    12.8 +template<class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17, class RetType=detail::DefaultVoid>
    12.9 +class FastDelegate17 {
   12.10 +private:
   12.11 +	typedef typename detail::DefaultVoidToVoid<RetType>::type DesiredRetType;
   12.12 +	typedef DesiredRetType (*StaticFunctionPtr)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17);
   12.13 +	typedef RetType (*UnvoidStaticFunctionPtr)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17);
   12.14 +	typedef RetType (detail::GenericClass::*GenericMemFn)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17);
   12.15 +	typedef detail::ClosurePtr<GenericMemFn, StaticFunctionPtr, UnvoidStaticFunctionPtr> ClosureType;
   12.16 +	ClosureType m_Closure;
   12.17 +public:
   12.18 +	// Typedefs to aid generic programming
   12.19 +	typedef FastDelegate17 type;
   12.20 +
   12.21 +	// Construction and comparison functions
   12.22 +	FastDelegate17() { clear(); }
   12.23 +	FastDelegate17(const FastDelegate17 &x) {
   12.24 +		m_Closure.CopyFrom(this, x.m_Closure); }
   12.25 +	void operator = (const FastDelegate17 &x)  {
   12.26 +		m_Closure.CopyFrom(this, x.m_Closure); }
   12.27 +	bool operator ==(const FastDelegate17 &x) const {
   12.28 +		return m_Closure.IsEqual(x.m_Closure);	}
   12.29 +	bool operator !=(const FastDelegate17 &x) const {
   12.30 +		return !m_Closure.IsEqual(x.m_Closure); }
   12.31 +	bool operator <(const FastDelegate17 &x) const {
   12.32 +		return m_Closure.IsLess(x.m_Closure);	}
   12.33 +	bool operator >(const FastDelegate17 &x) const {
   12.34 +		return x.m_Closure.IsLess(m_Closure);	}
   12.35 +	// Binding to non-const member functions
   12.36 +	template < class X, class Y >
   12.37 +	FastDelegate17(Y *pthis, DesiredRetType (X::* function_to_bind)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) ) {
   12.38 +		m_Closure.bindmemfunc(detail::implicit_cast<X*>(pthis), function_to_bind); }
   12.39 +	template < class X, class Y >
   12.40 +	inline void bind(Y *pthis, DesiredRetType (X::* function_to_bind)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17)) {
   12.41 +		m_Closure.bindmemfunc(detail::implicit_cast<X*>(pthis), function_to_bind);	}
   12.42 +	// Binding to const member functions.
   12.43 +	template < class X, class Y >
   12.44 +	FastDelegate17(const Y *pthis, DesiredRetType (X::* function_to_bind)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const) {
   12.45 +		m_Closure.bindconstmemfunc(detail::implicit_cast<const X*>(pthis), function_to_bind);	}
   12.46 +	template < class X, class Y >
   12.47 +	inline void bind(const Y *pthis, DesiredRetType (X::* function_to_bind)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const) {
   12.48 +		m_Closure.bindconstmemfunc(detail::implicit_cast<const X *>(pthis), function_to_bind);	}
   12.49 +	// Static functions. We convert them into a member function call.
   12.50 +	// This constructor also provides implicit conversion
   12.51 +	FastDelegate17(DesiredRetType (*function_to_bind)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) ) {
   12.52 +		bind(function_to_bind);	}
   12.53 +	// for efficiency, prevent creation of a temporary
   12.54 +	void operator = (DesiredRetType (*function_to_bind)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) ) {
   12.55 +		bind(function_to_bind);	}
   12.56 +	inline void bind(DesiredRetType (*function_to_bind)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17)) {
   12.57 +		m_Closure.bindstaticfunc(this, &FastDelegate17::InvokeStaticFunction,
   12.58 +			function_to_bind); }
   12.59 +	// Invoke the delegate
   12.60 +	RetType operator() (Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const {
   12.61 +	return (m_Closure.GetClosureThis()->*(m_Closure.GetClosureMemPtr()))(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17); }
   12.62 +	// Implicit conversion to "bool" using the safe_bool idiom
   12.63 +private:
   12.64 +	typedef struct SafeBoolStruct {
   12.65 +		int a_data_pointer_to_this_is_0_on_buggy_compilers;
   12.66 +		StaticFunctionPtr m_nonzero;
   12.67 +	} UselessTypedef;
   12.68 +    typedef StaticFunctionPtr SafeBoolStruct::*unspecified_bool_type;
   12.69 +public:
   12.70 +	operator unspecified_bool_type() const {
   12.71 +        return empty()? 0: &SafeBoolStruct::m_nonzero;
   12.72 +    }
   12.73 +	// necessary to allow ==0 to work despite the safe_bool idiom
   12.74 +	inline bool operator==(StaticFunctionPtr funcptr) {
   12.75 +		return m_Closure.IsEqualToStaticFuncPtr(funcptr);	}
   12.76 +	inline bool operator!=(StaticFunctionPtr funcptr) { 
   12.77 +		return !m_Closure.IsEqualToStaticFuncPtr(funcptr);    }
   12.78 +	inline bool operator ! () const	{	// Is it bound to anything?
   12.79 +			return !m_Closure; }
   12.80 +	inline bool empty() const	{
   12.81 +			return !m_Closure; }
   12.82 +	void clear() { m_Closure.clear();}
   12.83 +	// Conversion to and from the DelegateMemento storage class
   12.84 +	const DelegateMemento & GetMemento() { return m_Closure; }
   12.85 +	void SetMemento(const DelegateMemento &any) { m_Closure.CopyFrom(this, any); }
   12.86 +
   12.87 +private:	// Invoker for static functions
   12.88 +	RetType InvokeStaticFunction(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const {
   12.89 +	return (*(m_Closure.GetStaticFunction()))(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17); }
   12.90 +};
   12.91 +
   12.92  
   12.93  ////////////////////////////////////////////////////////////////////////////////
   12.94  //						Fast Delegates, part 4:
   12.95 @@ -2945,6 +3030,43 @@
   12.96  		*static_cast<BaseType*>(this) = x; }
   12.97  };
   12.98  
   12.99 +//N=17
  12.100 +// Specialization to allow use of
  12.101 +// FastDelegate< R ( Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17 ) >
  12.102 +// instead of
  12.103 +// FastDelegate17 < Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, R >
  12.104 +template<typename R, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17>
  12.105 +class FastDelegate< R ( Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17 ) >
  12.106 +  // Inherit from FastDelegate17 so that it can be treated just like a FastDelegate17
  12.107 +  : public FastDelegate17 < Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, R >
  12.108 +{
  12.109 +public:
  12.110 +  // Make using the base type a bit easier via typedef.
  12.111 +  typedef FastDelegate17 < Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, R > BaseType;
  12.112 +
  12.113 +  // Allow users access to the specific type of this delegate.
  12.114 +  typedef FastDelegate SelfType;
  12.115 +
  12.116 +  // Mimic the base class constructors.
  12.117 +  FastDelegate() : BaseType() { }
  12.118 +
  12.119 +  template < class X, class Y >
  12.120 +  FastDelegate(Y * pthis,
  12.121 +    R (X::* function_to_bind)( Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17 ))
  12.122 +    : BaseType(pthis, function_to_bind)  { }
  12.123 +
  12.124 +  template < class X, class Y >
  12.125 +  FastDelegate(const Y *pthis,
  12.126 +      R (X::* function_to_bind)( Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17 ) const)
  12.127 +    : BaseType(pthis, function_to_bind)
  12.128 +  {  }
  12.129 +
  12.130 +  FastDelegate(R (*function_to_bind)( Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17 ))
  12.131 +    : BaseType(function_to_bind)  { }
  12.132 +  void operator = (const BaseType &x)  {
  12.133 +		*static_cast<BaseType*>(this) = x; }
  12.134 +};
  12.135 +
  12.136  
  12.137  #endif //FASTDELEGATE_ALLOW_FUNCTION_TYPE_SYNTAX
  12.138  
  12.139 @@ -3250,6 +3372,22 @@
  12.140  	return FastDelegate16<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, FASTDLGT_RETTYPE>(func);
  12.141  }
  12.142  
  12.143 +//N=17
  12.144 +template <class X, class Y, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17, class RetType>
  12.145 +FastDelegate17<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, FASTDLGT_RETTYPE> MakeDelegate(Y* x, RetType (X::*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17)) {
  12.146 +	return FastDelegate17<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, FASTDLGT_RETTYPE>(x, func);
  12.147 +}
  12.148 +
  12.149 +template <class X, class Y, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17, class RetType>
  12.150 +FastDelegate17<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, FASTDLGT_RETTYPE> MakeDelegate(Y* x, RetType (X::*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const) {
  12.151 +	return FastDelegate17<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, FASTDLGT_RETTYPE>(x, func);
  12.152 +}
  12.153 +
  12.154 +template <class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17, class RetType>
  12.155 +FastDelegate17<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, FASTDLGT_RETTYPE> MakeDelegate(RetType (*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17)) {
  12.156 +	return FastDelegate17<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, FASTDLGT_RETTYPE>(func);
  12.157 +}
  12.158 +
  12.159  
  12.160   // clean up after ourselves...
  12.161  #undef FASTDLGT_RETTYPE
    13.1 --- a/core/sourcehook/sh_memfuncinfo.h	Sun May 27 02:16:08 2012 +0100
    13.2 +++ b/core/sourcehook/sh_memfuncinfo.h	Sun May 27 02:16:48 2012 +0100
    13.3 @@ -528,6 +528,20 @@
    13.4  		MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
    13.5  	}
    13.6  
    13.7 +	template<class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17>
    13.8 +	inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17), MemFuncInfo &out)
    13.9 +	{
   13.10 +		RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17) = mfp;
   13.11 +		MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
   13.12 +	}
   13.13 +
   13.14 +	template<class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17>
   13.15 +		inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17) const, MemFuncInfo &out)
   13.16 +	{
   13.17 +		RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17) const = mfp;
   13.18 +		MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
   13.19 +	}
   13.20 +
   13.21  
   13.22  	// GCC & MSVC 7.1 need this, MSVC 7.0 doesn't like it
   13.23  #if SH_COMP != SH_COMP_MSVC || _MSC_VER > 1300
   13.24 @@ -788,6 +802,20 @@
   13.25  	}
   13.26  
   13.27  
   13.28 +	template<class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17>
   13.29 +	inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, ...), MemFuncInfo &out)
   13.30 +	{
   13.31 +		RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, ...) = mfp;
   13.32 +		MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
   13.33 +	}
   13.34 +
   13.35 +	template<class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17>
   13.36 +		inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, ...) const, MemFuncInfo &out)
   13.37 +	{
   13.38 +		RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, ...) const = mfp;
   13.39 +		MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
   13.40 +	}
   13.41 +
   13.42  
   13.43  #endif
   13.44  
    14.1 --- a/core/sourcehook/sourcehook.h	Sun May 27 02:16:08 2012 +0100
    14.2 +++ b/core/sourcehook/sourcehook.h	Sun May 27 02:16:48 2012 +0100
    14.3 @@ -4558,6 +4558,104 @@
    14.4  	SourceHook::ExecutableClass17<SourceHook::EmptyClass, void(::SourceHook::EmptyClass::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, const char *, ...), void, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, const char*> __SoureceHook_FHM_SHCall##hookname(void *ptr); \
    14.5  	void __SourceHook_FHM_Reconfigure##hookname(int pvtblindex, int pvtbloffs, int pthisptroffs);
    14.6  
    14.7 +// ********* Support for 17(!) arguments *********
    14.8 +#define SH_DECL_HOOK17(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17) \
    14.9 +	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17) attr> \
   14.10 +		(&ifacetype::ifacefunc))) \
   14.11 +		typedef fastdelegate::FastDelegate17<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, rettype> FD; \
   14.12 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, param16 p16, param17 p17), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17)); \
   14.13 +		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, param16 p16, param17 p17) \
   14.14 +		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), rettype); } \
   14.15 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
   14.16 +		(static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17) attr>(&ifacetype::ifacefunc))) \
   14.17 +	\
   14.18 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {1, 0, 0}, __SH_GPI(param1), __SH_GPI(param2), __SH_GPI(param3), __SH_GPI(param4), __SH_GPI(param5), __SH_GPI(param6), __SH_GPI(param7), __SH_GPI(param8), __SH_GPI(param9), __SH_GPI(param10), __SH_GPI(param11), __SH_GPI(param12), __SH_GPI(param13), __SH_GPI(param14), __SH_GPI(param15), __SH_GPI(param16), __SH_GPI(param17) }; \
   14.19 +	const ::SourceHook::PassInfo::V2Info __SourceHook_ParamInfos2_##ifacetype##ifacefunc##overload[] = { __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI }; \
   14.20 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 17, __SH_GPI(rettype), \
   14.21 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0, __SH_EPI, __SourceHook_ParamInfos2_##ifacetype##ifacefunc##overload };
   14.22 +
   14.23 +#define SH_DECL_EXTERN17(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17) \
   14.24 +	int __SourceHook_FHAdd##ifacetype##ifacefunc(void *iface, ::SourceHook::ISourceHook::AddHookMode mode, bool post, \
   14.25 +		fastdelegate::FastDelegate17<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, rettype> handler); \
   14.26 +	bool __SourceHook_FHRemove##ifacetype##ifacefunc(void *iface, bool post, \
   14.27 +		fastdelegate::FastDelegate17<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, rettype> handler);
   14.28 +
   14.29 +#define SH_DECL_HOOK17_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17) \
   14.30 +	SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17) attr> \
   14.31 +		(&ifacetype::ifacefunc))) \
   14.32 +		typedef fastdelegate::FastDelegate17<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17> FD; \
   14.33 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, param16 p16, param17 p17), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17)); \
   14.34 +		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, param16 p16, param17 p17) \
   14.35 +		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17)); } \
   14.36 +	SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
   14.37 +		(static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17) attr>(&ifacetype::ifacefunc))) \
   14.38 +	\
   14.39 +	const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {1, 0, 0},__SH_GPI(param1),__SH_GPI(param2),__SH_GPI(param3),__SH_GPI(param4),__SH_GPI(param5),__SH_GPI(param6),__SH_GPI(param7),__SH_GPI(param8),__SH_GPI(param9),__SH_GPI(param10),__SH_GPI(param11),__SH_GPI(param12),__SH_GPI(param13),__SH_GPI(param14),__SH_GPI(param15),__SH_GPI(param16),__SH_GPI(param17) }; \
   14.40 +	const ::SourceHook::PassInfo::V2Info __SourceHook_ParamInfos2_##ifacetype##ifacefunc##overload[] = { __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI }; \
   14.41 +	::SourceHook::ProtoInfo SH_FHCls(ifacetype, ifacefunc, overload)::ms_Proto = { 17, { 0, 0, 0 }, \
   14.42 +		__SourceHook_ParamInfos_##ifacetype##ifacefunc##overload, 0, __SH_EPI, __SourceHook_ParamInfos2_##ifacetype##ifacefunc##overload };
   14.43 +
   14.44 +#define SH_DECL_EXTERN17_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17) \
   14.45 +	int __SourceHook_FHAdd##ifacetype##ifacefunc(void *iface, ::SourceHook::ISourceHook::AddHookMode mode, bool post, \
   14.46 +		fastdelegate::FastDelegate17<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17> handler); \
   14.47 +	bool __SourceHook_FHRemove##ifacetype##ifacefunc(void *iface, bool post, \
   14.48 +		fastdelegate::FastDelegate17<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17> handler);
   14.49 +
   14.50 +#define SH_DECL_MANUALHOOK17(hookname, vtblidx, vtbloffs, thisptroffs, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17) \
   14.51 +	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   14.52 +		typedef fastdelegate::FastDelegate17<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, rettype> FD; \
   14.53 +		MAKE_DELEG(rettype, (param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, param16 p16, param17 p17), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17)); \
   14.54 +		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, param16 p16, param17 p17) \
   14.55 +		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), rettype); } \
   14.56 +		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17); \
   14.57 +		typedef SourceHook::ExecutableClass17< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17 > CallEC; \
   14.58 +		typedef rettype RetType; \
   14.59 +	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   14.60 +	\
   14.61 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {1, 0, 0}, __SH_GPI(param1), __SH_GPI(param2), __SH_GPI(param3), __SH_GPI(param4), __SH_GPI(param5), __SH_GPI(param6), __SH_GPI(param7), __SH_GPI(param8), __SH_GPI(param9), __SH_GPI(param10), __SH_GPI(param11), __SH_GPI(param12), __SH_GPI(param13), __SH_GPI(param14), __SH_GPI(param15), __SH_GPI(param16), __SH_GPI(param17) }; \
   14.62 +	const ::SourceHook::PassInfo::V2Info __SourceHook_ParamInfos2M_##hookname[] = { __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI }; \
   14.63 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 17, __SH_GPI(rettype), \
   14.64 +		__SourceHook_ParamInfosM_##hookname, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname }; \
   14.65 +	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype value) \
   14.66 +	{ \
   14.67 +		::SourceHook::SetOverrideResult<SH_MFHCls(hookname)::RetType>()(shptr, value); \
   14.68 +	}
   14.69 +
   14.70 +#define SH_DECL_MANUALEXTERN17(hookname, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17) \
   14.71 +	int __SourceHook_FHMAdd##hookname(void *iface, ::SourceHook::ISourceHook::AddHookMode mode, bool post, \
   14.72 +		fastdelegate::FastDelegate17<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, rettype> handler); \
   14.73 +	bool __SourceHook_FHMRemove##hookname(void *iface, bool post, \
   14.74 +		fastdelegate::FastDelegate17<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, rettype> handler); \
   14.75 +	rettype(::SourceHook::EmptyClass::* __SoureceHook_FHM_GetRecallMFP##hookname(::SourceHook::EmptyClass *thisptr) )(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17); \
   14.76 +	SourceHook::ExecutableClass17<SourceHook::EmptyClass, rettype(::SourceHook::EmptyClass::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17), rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17> __SoureceHook_FHM_SHCall##hookname(void *ptr); \
   14.77 +	void __SoureceHook_FHM_SetOverrideResult##hookname(::SourceHook::ISourceHook *shptr, rettype res); \
   14.78 +	void __SourceHook_FHM_Reconfigure##hookname(int pvtblindex, int pvtbloffs, int pthisptroffs);
   14.79 +
   14.80 +#define SH_DECL_MANUALHOOK17_void(hookname, vtblidx, vtbloffs, thisptroffs, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17) \
   14.81 +	SHINT_MAKE_GENERICSTUFF_BEGIN_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   14.82 +		typedef fastdelegate::FastDelegate17<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17> FD; \
   14.83 +		MAKE_DELEG_void((param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, param16 p16, param17 p17), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17)); \
   14.84 +		virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, param16 p16, param17 p17) \
   14.85 +		{ SH_HANDLEFUNC_void((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17)); } \
   14.86 +		typedef void(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17); \
   14.87 +		typedef SourceHook::ExecutableClass17<SourceHook::EmptyClass, ECMFP, void, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17> CallEC; \
   14.88 +	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   14.89 +	\
   14.90 +	const ::SourceHook::PassInfo __SourceHook_ParamInfosM_##hookname[] = { {1, 0, 0}, __SH_GPI(param1), __SH_GPI(param2), __SH_GPI(param3), __SH_GPI(param4), __SH_GPI(param5), __SH_GPI(param6), __SH_GPI(param7), __SH_GPI(param8), __SH_GPI(param9), __SH_GPI(param10), __SH_GPI(param11), __SH_GPI(param12), __SH_GPI(param13), __SH_GPI(param14), __SH_GPI(param15), __SH_GPI(param16), __SH_GPI(param17) }; \
   14.91 +	const ::SourceHook::PassInfo::V2Info __SourceHook_ParamInfos2M_##hookname[] = { __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI, __SH_EPI }; \
   14.92 +	::SourceHook::ProtoInfo SH_MFHCls(hookname)::ms_Proto = { 17, { 0, 0, 0 }, \
   14.93 +		__SourceHook_ParamInfosM_##hookname	, 0, __SH_EPI, __SourceHook_ParamInfos2M_##hookname };
   14.94 +
   14.95 +#define SH_DECL_MANUALEXTERN17_void(hookname, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17) \
   14.96 +	int __SourceHook_FHMAdd##hookname(void *iface, ::SourceHook::ISourceHook::AddHookMode mode, bool post, \
   14.97 +		fastdelegate::FastDelegate17<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17> handler); \
   14.98 +	bool __SourceHook_FHMRemove##hookname(void *iface, bool post, \
   14.99 +		fastdelegate::FastDelegate17<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17> handler); \
  14.100 +	void(::SourceHook::EmptyClass::* __SoureceHook_FHM_GetRecallMFP##hookname(::SourceHook::EmptyClass *thisptr) )(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17); \
  14.101 +	SourceHook::ExecutableClass17<SourceHook::EmptyClass, void(::SourceHook::EmptyClass::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17), void, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17> __SoureceHook_FHM_SHCall##hookname(void *ptr); \
  14.102 +	void __SourceHook_FHM_Reconfigure##hookname(int pvtblindex, int pvtbloffs, int pthisptroffs);
  14.103 +
  14.104 +
  14.105  
  14.106  
  14.107  //////////////////////////////////////////////////////////////////////////
  14.108 @@ -4647,6 +4745,9 @@
  14.109  		
  14.110  		template <class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.111  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.112 +
  14.113 +		template <class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.114 +			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.115  		
  14.116  	};
  14.117  
  14.118 @@ -4711,6 +4812,9 @@
  14.119  	   
  14.120  	   template <class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.121  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.122 +
  14.123 +	   template <class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.124 +	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.125  	   
  14.126  	};
  14.127  
  14.128 @@ -4773,6 +4877,9 @@
  14.129  		
  14.130  		template <class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.131  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.132 +
  14.133 +		template <class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.134 +			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.135  		
  14.136  	};
  14.137  
  14.138 @@ -4834,6 +4941,9 @@
  14.139  	   
  14.140  	   template <class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.141  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.142 +
  14.143 +	   template <class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.144 +	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.145  	   
  14.146  	};
  14.147  
  14.148 @@ -4893,6 +5003,9 @@
  14.149  		
  14.150  		template <class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.151  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.152 +
  14.153 +		template <class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.154 +			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.155  		
  14.156  	};
  14.157  
  14.158 @@ -4951,6 +5064,9 @@
  14.159  	   
  14.160  	   template <class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.161  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.162 +
  14.163 +	   template <class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.164 +	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.165  	   
  14.166  	};
  14.167  
  14.168 @@ -5007,6 +5123,9 @@
  14.169  		
  14.170  		template <class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.171  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.172 +
  14.173 +		template <class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.174 +			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.175  		
  14.176  	};
  14.177  
  14.178 @@ -5062,6 +5181,9 @@
  14.179  	   
  14.180  	   template <class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.181  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.182 +
  14.183 +	   template <class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.184 +	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.185  	   
  14.186  	};
  14.187  
  14.188 @@ -5115,6 +5237,9 @@
  14.189  		
  14.190  		template <class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.191  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.192 +
  14.193 +		template <class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.194 +			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.195  		
  14.196  	};
  14.197  
  14.198 @@ -5167,6 +5292,9 @@
  14.199  	   
  14.200  	   template <class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.201  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.202 +
  14.203 +	   template <class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.204 +	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.205  	   
  14.206  	};
  14.207  
  14.208 @@ -5217,6 +5345,9 @@
  14.209  		
  14.210  		template <class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.211  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.212 +
  14.213 +		template <class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.214 +			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.215  		
  14.216  	};
  14.217  
  14.218 @@ -5266,6 +5397,9 @@
  14.219  	   
  14.220  	   template <class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.221  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.222 +
  14.223 +	   template <class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.224 +	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.225  	   
  14.226  	};
  14.227  
  14.228 @@ -5313,6 +5447,9 @@
  14.229  		
  14.230  		template <class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.231  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.232 +
  14.233 +		template <class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.234 +			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.235  		
  14.236  	};
  14.237  
  14.238 @@ -5359,6 +5496,9 @@
  14.239  	   
  14.240  	   template <class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.241  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.242 +
  14.243 +	   template <class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.244 +	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.245  	   
  14.246  	};
  14.247  
  14.248 @@ -5403,6 +5543,9 @@
  14.249  		
  14.250  		template <class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.251  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.252 +
  14.253 +		template <class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.254 +			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.255  		
  14.256  	};
  14.257  
  14.258 @@ -5446,6 +5589,9 @@
  14.259  	   
  14.260  	   template <class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.261  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.262 +
  14.263 +	   template <class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.264 +	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.265  	   
  14.266  	};
  14.267  
  14.268 @@ -5487,6 +5633,9 @@
  14.269  		
  14.270  		template <class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.271  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.272 +
  14.273 +		template <class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.274 +			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.275  		
  14.276  	};
  14.277  
  14.278 @@ -5527,6 +5676,9 @@
  14.279  	   
  14.280  	   template <class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.281  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.282 +
  14.283 +	   template <class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.284 +	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.285  	   
  14.286  	};
  14.287  
  14.288 @@ -5565,6 +5717,9 @@
  14.289  		
  14.290  		template <class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.291  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.292 +
  14.293 +		template <class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.294 +			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.295  		
  14.296  	};
  14.297  
  14.298 @@ -5602,6 +5757,9 @@
  14.299  	   
  14.300  	   template <class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.301  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.302 +
  14.303 +	   template <class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.304 +	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.305  	   
  14.306  	};
  14.307  
  14.308 @@ -5637,6 +5795,9 @@
  14.309  		
  14.310  		template <class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.311  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.312 +
  14.313 +		template <class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.314 +			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.315  		
  14.316  	};
  14.317  
  14.318 @@ -5671,6 +5832,9 @@
  14.319  	   
  14.320  	   template <class Param11, class Param12, class Param13, class Param14, class Param15, class Param16> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.321  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.322 +
  14.323 +	   template <class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.324 +	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.325  	   
  14.326  	};
  14.327  
  14.328 @@ -5703,6 +5867,9 @@
  14.329  		
  14.330  		template <class Param12, class Param13, class Param14, class Param15, class Param16> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.331  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.332 +
  14.333 +		template <class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.334 +			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.335  		
  14.336  	};
  14.337  
  14.338 @@ -5734,6 +5901,9 @@
  14.339  	   
  14.340  	   template <class Param12, class Param13, class Param14, class Param15, class Param16> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.341  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.342 +
  14.343 +	   template <class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.344 +	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.345  	   
  14.346  	};
  14.347  
  14.348 @@ -5763,6 +5933,9 @@
  14.349  		
  14.350  		template <class Param13, class Param14, class Param15, class Param16> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.351  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.352 +
  14.353 +		template <class Param13, class Param14, class Param15, class Param16, class Param17> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.354 +			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.355  		
  14.356  	};
  14.357  
  14.358 @@ -5791,6 +5964,9 @@
  14.359  	   
  14.360  	   template <class Param13, class Param14, class Param15, class Param16> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.361  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.362 +
  14.363 +	   template <class Param13, class Param14, class Param15, class Param16, class Param17> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.364 +	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.365  	   
  14.366  	};
  14.367  
  14.368 @@ -5817,6 +5993,9 @@
  14.369  		
  14.370  		template <class Param14, class Param15, class Param16> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.371  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.372 +
  14.373 +		template <class Param14, class Param15, class Param16, class Param17> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.374 +			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.375  		
  14.376  	};
  14.377  
  14.378 @@ -5842,6 +6021,9 @@
  14.379  	   
  14.380  	   template <class Param14, class Param15, class Param16> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.381  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.382 +
  14.383 +	   template <class Param14, class Param15, class Param16, class Param17> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.384 +	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.385  	   
  14.386  	};
  14.387  
  14.388 @@ -5865,6 +6047,9 @@
  14.389  		
  14.390  		template <class Param15, class Param16> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.391  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.392 +
  14.393 +		template <class Param15, class Param16, class Param17> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.394 +			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.395  		
  14.396  	};
  14.397  
  14.398 @@ -5887,6 +6072,9 @@
  14.399  	   
  14.400  	   template <class Param15, class Param16> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.401  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.402 +
  14.403 +	   template <class Param15, class Param16, class Param17> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.404 +	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.405  	   
  14.406  	};
  14.407  
  14.408 @@ -5907,6 +6095,9 @@
  14.409  		
  14.410  		template <class Param16> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.411  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.412 +
  14.413 +		template <class Param16, class Param17> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.414 +			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.415  		
  14.416  	};
  14.417  
  14.418 @@ -5926,6 +6117,9 @@
  14.419  	   
  14.420  	   template <class Param16> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.421  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.422 +
  14.423 +	   template <class Param16, class Param17> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.424 +	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.425  	   
  14.426  	};
  14.427  
  14.428 @@ -5942,7 +6136,9 @@
  14.429  	
  14.430  		RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.431  			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.432 -	         
  14.433 +
  14.434 +		template <class Param17> RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.435 +			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))	         
  14.436  		
  14.437  	};
  14.438  
  14.439 @@ -5958,11 +6154,41 @@
  14.440  	
  14.441  	   void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16) const
  14.442  	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16))
  14.443 +
  14.444 +	   template <class Param17> void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.445 +	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.446  	         
  14.447  	   
  14.448  	};
  14.449  
  14.450 -
  14.451 +	// Support for 17 arguments
  14.452 +	template<class ObjType, class MFPType, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> class ExecutableClass17
  14.453 +	{
  14.454 +		ObjType *m_ThisPtr;
  14.455 +		void *m_VfnPtr;
  14.456 +		MFPType m_MFP;
  14.457 +		ISourceHook *m_pSH;
  14.458 +	public:
  14.459 +		ExecutableClass17(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  14.460 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  14.461 +	
  14.462 +		RetType operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.463 +			SH_MAKE_EXECUTABLECLASS_OB((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))		
  14.464 +	};
  14.465 +
  14.466 +	template<class ObjType, class MFPType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17> class ExecutableClass17<ObjType, MFPType, void, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>
  14.467 +	{
  14.468 +		ObjType *m_ThisPtr;
  14.469 +		void *m_VfnPtr;
  14.470 +		MFPType m_MFP;
  14.471 +		ISourceHook *m_pSH;
  14.472 +	public:
  14.473 +		ExecutableClass17(ObjType *tp, MFPType mfp, void *vp, ISourceHook *pSH) : m_ThisPtr(tp),
  14.474 +			m_VfnPtr(vp), m_MFP(mfp), m_pSH(pSH) { }
  14.475 +	
  14.476 +	   void operator()(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16, Param17 p17) const
  14.477 +	      SH_MAKE_EXECUTABLECLASS_OB_void((p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17), (Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))	   
  14.478 +	};
  14.479  }
  14.480  
  14.481  #define SH__CALL_GET_VFNPTR_NORMAL \
  14.482 @@ -6426,6 +6652,32 @@
  14.483  		reinterpret_cast<SourceHook::EmptyClass*>(ptr), mfp, vfnptr, shptr);
  14.484  }
  14.485  
  14.486 +// Support for 17 arguments
  14.487 +template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17>
  14.488 +SourceHook::ExecutableClass17<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>
  14.489 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17), SourceHook::ISourceHook *shptr)
  14.490 +{
  14.491 +	SH__CALL_GET_VFNPTR_NORMAL
  14.492 +	return SourceHook::ExecutableClass17<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>(ptr, mfp, vfnptr, shptr);
  14.493 +}
  14.494 +
  14.495 +template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17>
  14.496 +SourceHook::ExecutableClass17<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>
  14.497 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17)const, SourceHook::ISourceHook *shptr)
  14.498 +{
  14.499 +	SH__CALL_GET_VFNPTR_NORMAL
  14.500 +	return SourceHook::ExecutableClass17<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>(ptr, mfp, vfnptr, shptr);
  14.501 +}
  14.502 +
  14.503 +template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17>
  14.504 +SourceHook::ExecutableClass17<SourceHook::EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>
  14.505 +SH_MCALL3(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17), int vtblidx, int vtbloffs, int thisptroffs, SourceHook::ISourceHook *shptr)
  14.506 +{
  14.507 +	SH__CALL_GET_VFNPTR_MANUAL
  14.508 +	return SourceHook::ExecutableClass17<EmptyClass, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>(
  14.509 +		reinterpret_cast<SourceHook::EmptyClass*>(ptr), mfp, vfnptr, shptr);
  14.510 +}
  14.511 +
  14.512  
  14.513  #if SH_COMP != SH_COMP_MSVC || _MSC_VER > 1300
  14.514  // GCC & MSVC 7.1 need this, MSVC 7.0 doesn't like it
  14.515 @@ -6736,6 +6988,23 @@
  14.516  	return SourceHook::ExecutableClass16<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16>(ptr, mfp, vfnptr, shptr);
  14.517  }
  14.518  
  14.519 +// Support for 17 arguments
  14.520 +template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17>
  14.521 +SourceHook::ExecutableClass17<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>
  14.522 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, ...), SourceHook::ISourceHook *shptr)
  14.523 +{
  14.524 +	SH__CALL_GET_VFNPTR_NORMAL
  14.525 +	return SourceHook::ExecutableClass17<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>(ptr, mfp, vfnptr, shptr);
  14.526 +}
  14.527 +
  14.528 +template <class X, class Y, class MFP, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17>
  14.529 +SourceHook::ExecutableClass17<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>
  14.530 +SH_CALL2(Y *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, ...)const, SourceHook::ISourceHook *shptr)
  14.531 +{
  14.532 +	SH__CALL_GET_VFNPTR_NORMAL
  14.533 +	return SourceHook::ExecutableClass17<Y, MFP, RetType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17>(ptr, mfp, vfnptr, shptr);
  14.534 +}
  14.535 +
  14.536  
  14.537  
  14.538  #endif
  14.539 @@ -7195,6 +7464,30 @@
  14.540  		return reinterpret_cast<Iface*>(shptr->GetIfacePtr());
  14.541  	}
  14.542  
  14.543 +	template <class Iface, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17>
  14.544 +	OverrideFunctor<RetType> SetOverrideResult(RetType (Iface::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.545 +	{
  14.546 +		return OverrideFunctor<RetType>();
  14.547 +	}
  14.548 +
  14.549 +	template <class Iface, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17>
  14.550 +	OverrideFunctor<RetType> SetOverrideResult(RetType (Iface::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, ...))
  14.551 +	{
  14.552 +		return OverrideFunctor<RetType>();
  14.553 +	}
  14.554 +
  14.555 +	template <class Iface, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17>
  14.556 +	Iface *RecallGetIface(ISourceHook *shptr, RetType (Iface::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17))
  14.557 +	{
  14.558 +		return reinterpret_cast<Iface*>(shptr->GetIfacePtr());
  14.559 +	}
  14.560 +
  14.561 +	template <class Iface, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17>
  14.562 +	Iface *RecallGetIface(ISourceHook *shptr, RetType (Iface::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, Param17, ...))
  14.563 +	{
  14.564 +		return reinterpret_cast<Iface*>(shptr->GetIfacePtr());
  14.565 +	}
  14.566 +
  14.567  }
  14.568  
  14.569  #endif
    15.1 --- a/loader/Makefile	Sun May 27 02:16:08 2012 +0100
    15.2 +++ b/loader/Makefile	Sun May 27 02:16:48 2012 +0100
    15.3 @@ -20,7 +20,7 @@
    15.4  CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
    15.5  CPP = gcc-4.1
    15.6  
    15.7 -ifeq "$(ENGINE)" "left4dead2"
    15.8 +ifneq (,$(filter left4dead2 csgo,$(ENGINE)))
    15.9  	BINARY = server.so
   15.10  	CFLAGS += -DLIB_PREFIX=\"lib\" -DLIB_SUFFIX=\".so\"
   15.11  else
    16.1 --- a/loader/loader.cpp	Sun May 27 02:16:08 2012 +0100
    16.2 +++ b/loader/loader.cpp	Sun May 27 02:16:48 2012 +0100
    16.3 @@ -78,7 +78,9 @@
    16.4  	"2.ep2v",
    16.5  	"2.l4d",
    16.6  	"2.l4d2",
    16.7 -	"2.swarm"
    16.8 +	"2.swarm",
    16.9 +	"2.portal2",
   16.10 +	"2.csgo"
   16.11  };
   16.12  
   16.13  #if defined _WIN32
   16.14 @@ -267,9 +269,17 @@
   16.15  mm_DetermineBackend(QueryValveInterface engineFactory, const char *game_name)
   16.16  {
   16.17  	/* Check for L4D */
   16.18 -	if (engineFactory("VEngineServer022", NULL) != NULL &&
   16.19 +	if (engineFactory("VEngineServer023", NULL) != NULL)
   16.20 +	{
   16.21 +		return MMBackend_CSGO;
   16.22 +	}
   16.23 +	else if (engineFactory("VEngineServer022", NULL) != NULL &&
   16.24  		engineFactory("VEngineCvar007", NULL) != NULL)
   16.25  	{
   16.26 +		if (strcmp(game_name, "portal2") == 0)
   16.27 +		{
   16.28 +			return MMBackend_Portal2;
   16.29 +		}
   16.30  		if (engineFactory("EngineTraceServer004", NULL) != NULL)
   16.31  		{
   16.32  			return MMBackend_AlienSwarm;
    17.1 --- a/loader/loader.h	Sun May 27 02:16:08 2012 +0100
    17.2 +++ b/loader/loader.h	Sun May 27 02:16:48 2012 +0100
    17.3 @@ -89,6 +89,8 @@
    17.4  	MMBackend_Left4Dead,
    17.5  	MMBackend_Left4Dead2,
    17.6  	MMBackend_AlienSwarm,
    17.7 +	MMBackend_Portal2,
    17.8 +	MMBackend_CSGO,
    17.9  	MMBackend_UNKNOWN
   17.10  };
   17.11  
    18.1 --- a/loader/serverplugin.cpp	Sun May 27 02:16:08 2012 +0100
    18.2 +++ b/loader/serverplugin.cpp	Sun May 27 02:16:48 2012 +0100
    18.3 @@ -132,9 +132,8 @@
    18.4  			this_vtable[mfp_dest.vtblindex] = vtable_src[mfp_src.vtblindex];
    18.5  		}
    18.6  
    18.7 -#ifdef _WIN32
    18.8  		/* AS inserted ClientFullyConnect into vtable, so move entries up on older engines */
    18.9 -		if (mm_backend != MMBackend_AlienSwarm)
   18.10 +		if (mm_backend < MMBackend_AlienSwarm)
   18.11  		{
   18.12  			SourceHook::MemFuncInfo mfp_fconnect;
   18.13  			mfp_fconnect.isVirtual = false;
   18.14 @@ -155,7 +154,6 @@
   18.15  					&this_vtable[mfp_fconnect.vtblindex + 1],
   18.16  					sizeof(void *) * 8);
   18.17  		}
   18.18 -#endif
   18.19  
   18.20  		char error[255];
   18.21  		if (gamedll_bridge == NULL)
   18.22 @@ -240,11 +238,9 @@
   18.23  	virtual void ClientActive(edict_t *pEntity)
   18.24  	{
   18.25  	}
   18.26 -#ifdef _WIN32
   18.27  	virtual void ClientFullyConnect(edict_t *pEntity)
   18.28  	{
   18.29  	}
   18.30 -#endif
   18.31  	virtual void ClientDisconnect(edict_t *pEntity)
   18.32  	{
   18.33  	}
    19.1 --- a/pushbuild.txt	Sun May 27 02:16:08 2012 +0100
    19.2 +++ b/pushbuild.txt	Sun May 27 02:16:48 2012 +0100
    19.3 @@ -18,3 +18,4 @@
    19.4  bees bees bees
    19.5  Why is Windows so awful?
    19.6  cling clang clung
    19.7 +javalia