Add support for Insurgency (bug 5950, r=asherkin).
authorNicholas Hastings <skamonkey@gmail.com>
Wed Oct 09 09:00:23 2013 -0400 (2013-10-09)
changeset 858a534b75f1b59
parent 857 d8cc9c7087b0
child 859 49786b18bc29
Add support for Insurgency (bug 5950, r=asherkin).
AMBuildScript
core/ISmmPluginExt.h
core/metamod_console.cpp
core/provider/provider_ep2.cpp
loader/loader.cpp
loader/loader.h
loader/serverplugin.cpp
     1.1 --- a/AMBuildScript	Wed Oct 09 08:46:13 2013 -0400
     1.2 +++ b/AMBuildScript	Wed Oct 09 09:00:23 2013 -0400
     1.3 @@ -51,10 +51,10 @@
     1.4  		self.possibleSdks['eye'] =   {'sdk': 'HL2SDK-EYE',      'ext': '2.eye',     'def': '5',
     1.5  		                         'name': 'EYE',            'platform': ['windows'],
     1.6  		                         'dir': 'hl2sdk-eye'}
     1.7 -		self.possibleSdks['csgo'] =  {'sdk': 'HL2SDKCSGO',     'ext': '2.csgo',     'def': '17',
     1.8 +		self.possibleSdks['csgo'] =  {'sdk': 'HL2SDKCSGO',     'ext': '2.csgo',     'def': '18',
     1.9  		                         'name': 'CSGO',           'platform': ['windows', 'linux', 'darwin'],
    1.10  		                         'dir': 'hl2sdk-csgo'}
    1.11 -		self.possibleSdks['dota'] =  {'sdk': 'HL2SDKDOTA',     'ext': '2.dota',     'def': '18',
    1.12 +		self.possibleSdks['dota'] =  {'sdk': 'HL2SDKDOTA',     'ext': '2.dota',     'def': '19',
    1.13  		                         'name': 'DOTA',           'platform': ['windows'],
    1.14  		                         'dir': 'hl2sdk-dota'}
    1.15  		self.possibleSdks['portal2'] = {'sdk': 'HL2SDKPORTAL2','ext': '2.portal2',  'def': '15',
    1.16 @@ -63,6 +63,9 @@
    1.17  		self.possibleSdks['blade'] =   {'sdk': 'HL2SDKBLADE',  'ext': '2.blade',    'def': '16',
    1.18  		                         'name': 'BLADE',          'platform': ['windows', 'linux'],
    1.19  		                         'dir': 'hl2sdk-blade'}
    1.20 +		self.possibleSdks['insurgency'] = {'sdk': 'HL2SDKINSURGENCY', 'ext': '2.insurgency', 'def': '17',
    1.21 +		                         'name': 'INSURGENCY',     'platform': ['windows', 'linux', 'darwin'],
    1.22 +		                         'dir': 'hl2sdk-insurgency'}
    1.23  		
    1.24  		self.sdkInfo = { }
    1.25  		
    1.26 @@ -280,9 +283,9 @@
    1.27  			libs = []
    1.28  			if sdk in ['css', 'hl2dm', 'dods', 'tf2', 'l4d2']:
    1.29  				libs = ['tier1_i486.a', 'libvstdlib_srv.so', 'libtier0_srv.so']
    1.30 -			elif sdk in ['l4d', 'nd', 'blade', 'csgo']:
    1.31 +			elif sdk in ['l4d', 'nd', 'blade', 'insurgency', 'csgo']:
    1.32  				libs = ['tier1_i486.a', 'libvstdlib.so', 'libtier0.so']
    1.33 -				if sdk in ['blade', 'csgo']:
    1.34 +				if sdk in ['blade', 'insurgency', 'csgo']:
    1.35  					libs.insert(0, 'interfaces_i486.a')
    1.36  			elif sdk == 'sdk2013':
    1.37  				libs = ['tier1.a', 'libvstdlib_srv.so', 'libtier0_srv.so']
    1.38 @@ -304,7 +307,7 @@
    1.39  				staticLibs = os.path.join(sdkPath, 'lib', 'mac')
    1.40  				libs = ['tier1_i486.a', 'libvstdlib.dylib', 'libtier0.dylib']
    1.41  			workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
    1.42 -			if sdk == 'csgo':
    1.43 +			if sdk in ['insurgency', 'csgo']:
    1.44  				libs.append('interfaces_i486.a')
    1.45  			for lib in libs:
    1.46  				link = os.path.join(workFolder, lib)
    1.47 @@ -315,7 +318,7 @@
    1.48  					job.AddCommand(SymlinkCommand(link, target))
    1.49  		elif AMBuild.target['platform'] == 'windows':
    1.50  			libs = ['tier0', 'tier1', 'vstdlib']
    1.51 -			if sdk in ['swarm', 'blade', 'csgo', 'dota']:
    1.52 +			if sdk in ['swarm', 'blade', 'insurgency', 'csgo', 'dota']:
    1.53  				libs.append('interfaces')
    1.54  			for lib in libs:
    1.55  				libPath = os.path.join(sdkPath, 'lib', 'public', lib) + '.lib'
    1.56 @@ -329,7 +332,7 @@
    1.57  			else:
    1.58  				builder.AddObjectFiles(['tier1_i486.a'])
    1.59  			
    1.60 -			if( sdk in ['blade', 'csgo', 'dota'] ):
    1.61 +			if( sdk in ['blade', 'insurgency', 'csgo', 'dota'] ):
    1.62  				builder.AddObjectFiles(['interfaces_i486.a'])
    1.63  
    1.64  	def DefaultHL2Compiler(self, path, sdk, noLink = False):
    1.65 @@ -364,7 +367,7 @@
    1.66  			compiler['CDEFINES'].remove('_snprintf=snprintf')
    1.67  			compiler['CDEFINES'].remove('_vsnprintf=vsnprintf')
    1.68  
    1.69 -		if sdk in ['swarm', 'blade', 'csgo', 'dota']:
    1.70 +		if sdk in ['swarm', 'blade', 'insurgency', 'csgo', 'dota']:
    1.71  			if AMBuild.target['platform'] == 'windows':
    1.72  				compiler['CDEFINES'].extend(['COMPILER_MSVC', 'COMPILER_MSVC32'])
    1.73  			else:
    1.74 @@ -397,7 +400,7 @@
    1.75  				if sdk in ['css', 'hl2dm', 'dods', 'tf2', 'sdk2013', 'l4d2']:
    1.76  					compiler['POSTLINKFLAGS'][0:0] = ['libtier0_srv.so']
    1.77  					compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib_srv.so']
    1.78 -				elif sdk in ['l4d', 'nd', 'blade', 'csgo']:
    1.79 +				elif sdk in ['l4d', 'nd', 'blade', 'insurgency', 'csgo']:
    1.80  					compiler['POSTLINKFLAGS'][0:0] = ['libtier0.so']
    1.81  					compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib.so']
    1.82  				else:
     2.1 --- a/core/ISmmPluginExt.h	Wed Oct 09 08:46:13 2013 -0400
     2.2 +++ b/core/ISmmPluginExt.h	Wed Oct 09 09:00:23 2013 -0400
     2.3 @@ -63,6 +63,7 @@
     2.4  #define SOURCE_ENGINE_NUCLEARDAWN		18				/**< Nuclear Dawn */
     2.5  #define SOURCE_ENGINE_SDK2013			19				/**< Source SDK 2013 */
     2.6  #define SOURCE_ENGINE_BLADE				20				/**< Blade Symphony */
     2.7 +#define SOURCE_ENGINE_INSURGENCY		21				/**< Insurgency */
     2.8  
     2.9  #define METAMOD_PLAPI_VERSION			15				/**< Version of this header file */
    2.10  #define METAMOD_PLAPI_NAME				"ISmmPlugin"	/**< Name of the plugin interface */
     3.1 --- a/core/metamod_console.cpp	Wed Oct 09 08:46:13 2013 -0400
     3.2 +++ b/core/metamod_console.cpp	Wed Oct 09 09:00:23 2013 -0400
     3.3 @@ -141,6 +141,8 @@
     3.4  			CONMSG("  Engine: Portal 2 (2011)\n");
     3.5  #elif SOURCE_ENGINE == SE_BLADE
     3.6  			CONMSG("  Engine: Blade Symphony (2013)\n");
     3.7 +#elif SOURCE_ENGINE == SE_INSURGENCY
     3.8 +			CONMSG("  Engine: Insurgency (2013)\n");
     3.9  #elif SOURCE_ENGINE == SE_CSGO
    3.10  			CONMSG("  Engine: Counter-Strike: Global Offensive (2012)\n");
    3.11  #elif SOURCE_ENGINE == SE_DOTA
     4.1 --- a/core/provider/provider_ep2.cpp	Wed Oct 09 08:46:13 2013 -0400
     4.2 +++ b/core/provider/provider_ep2.cpp	Wed Oct 09 09:00:23 2013 -0400
     4.3 @@ -401,6 +401,8 @@
     4.4  	return SOURCE_ENGINE_PORTAL2;
     4.5  #elif SOURCE_ENGINE == SE_BLADE
     4.6  	return SOURCE_ENGINE_BLADE;
     4.7 +#elif SOURCE_ENGINE == SE_INSURGENCY
     4.8 +	return SOURCE_ENGINE_INSURGENCY;
     4.9  #elif SOURCE_ENGINE == SE_CSGO
    4.10  	return SOURCE_ENGINE_CSGO;
    4.11  #elif SOURCE_ENGINE == SE_DOTA
     5.1 --- a/loader/loader.cpp	Wed Oct 09 08:46:13 2013 -0400
     5.2 +++ b/loader/loader.cpp	Wed Oct 09 09:00:23 2013 -0400
     5.3 @@ -87,6 +87,7 @@
     5.4  	"2.nd",
     5.5  	"2.sdk2013",
     5.6  	"2.blade",
     5.7 +	"2.insurgency",
     5.8  };
     5.9  
    5.10  #if defined _WIN32
    5.11 @@ -276,6 +277,10 @@
    5.12  	}
    5.13  	else if (engineFactory("VEngineServer023", NULL) != NULL)
    5.14  	{
    5.15 +		if (strcmp(game_name, "insurgency") == 0)
    5.16 +		{
    5.17 +			return MMBackend_Insurgency;
    5.18 +		}
    5.19  		return MMBackend_CSGO;
    5.20  	}
    5.21  	else if (engineFactory("VEngineServer022", NULL) != NULL &&
     6.1 --- a/loader/loader.h	Wed Oct 09 08:46:13 2013 -0400
     6.2 +++ b/loader/loader.h	Wed Oct 09 09:00:23 2013 -0400
     6.3 @@ -99,6 +99,7 @@
     6.4  	MMBackend_NuclearDawn,
     6.5  	MMBackend_SDK2013,
     6.6  	MMBackend_Blade,
     6.7 +	MMBackend_Insurgency,
     6.8  
     6.9  	MMBackend_UNKNOWN
    6.10  };
     7.1 --- a/loader/serverplugin.cpp	Wed Oct 09 08:46:13 2013 -0400
     7.2 +++ b/loader/serverplugin.cpp	Wed Oct 09 09:00:23 2013 -0400
     7.3 @@ -137,6 +137,7 @@
     7.4  		if (mm_backend != MMBackend_AlienSwarm
     7.5  			&& mm_backend != MMBackend_Portal2
     7.6  			&& mm_backend != MMBackend_Blade
     7.7 +			&& mm_backend != MMBackend_Insurgency
     7.8  			&& mm_backend != MMBackend_CSGO
     7.9  			&& mm_backend != MMBackend_DOTA)
    7.10  		{