Split CS:S support off to a separate engine/build (bug 5370, r=asherkin).
authorNicholas Hastings <skamonkey@gmail.com>
Mon Aug 20 21:53:59 2012 -0400 (2012-08-20)
changeset 3613b0740093756d
parent 3612 3730cd7bf1e7
child 3614 d67b465a1e8d
Split CS:S support off to a separate engine/build (bug 5370, r=asherkin).
AMBuildScript
core/ExtensionSys.cpp
core/HalfLife2.cpp
core/MenuStyle_Base.cpp
core/PluginSys.h
core/logic_bridge.cpp
core/smn_entities.cpp
core/smn_halflife.cpp
core/sourcemm_api.h
extensions/cstrike/AMBuilder
extensions/sdktools/vcaller.cpp
extensions/sdktools/vnatives.cpp
extensions/sdktools/vsound.cpp
extensions/sdktools/vsound.h
loader/loader.cpp
plugins/include/halflife.inc
tools/buildbot/PackageScript
     1.1 --- a/AMBuildScript	Thu Aug 16 07:40:06 2012 -0400
     1.2 +++ b/AMBuildScript	Mon Aug 20 21:53:59 2012 -0400
     1.3 @@ -13,23 +13,25 @@
     1.4  		                         'name': 'EPISODEONE',     'platform': ['windows', 'linux']}
     1.5  		self.possibleSdks['ep2'] =   {'sdk': 'HL2SDKOB',        'ext': '2.ep2',   'def': '3',
     1.6  		                         'name': 'ORANGEBOX',      'platform': ['windows', 'linux']}
     1.7 -		self.possibleSdks['ep2v'] =  {'sdk': 'HL2SDKOBVALVE',   'ext': '2.ep2v',  'def': '6',
     1.8 +		self.possibleSdks['css'] =  {'sdk': 'HL2SDKCSS',   'ext': '2.css',  'def': '6',
     1.9 +		                         'name': 'CSS', 'platform': ['windows', 'linux', 'darwin']}
    1.10 +		self.possibleSdks['ep2v'] =  {'sdk': 'HL2SDKOBVALVE',   'ext': '2.ep2v',  'def': '7',
    1.11  		                         'name': 'ORANGEBOXVALVE', 'platform': ['windows', 'linux', 'darwin']}
    1.12 -		self.possibleSdks['l4d'] =   {'sdk': 'HL2SDKL4D',       'ext': '2.l4d',   'def': '7',
    1.13 +		self.possibleSdks['l4d'] =   {'sdk': 'HL2SDKL4D',       'ext': '2.l4d',   'def': '8',
    1.14  		                         'name': 'LEFT4DEAD',      'platform': ['windows', 'linux', 'darwin']}
    1.15 -		self.possibleSdks['l4d2'] =  {'sdk': 'HL2SDKL4D2',      'ext': '2.l4d2',  'def': '8',
    1.16 +		self.possibleSdks['l4d2'] =  {'sdk': 'HL2SDKL4D2',      'ext': '2.l4d2',  'def': '9',
    1.17  		                         'name': 'LEFT4DEAD2',     'platform': ['windows', 'linux', 'darwin']}
    1.18  		self.possibleSdks['darkm'] = {'sdk': 'HL2SDK-DARKM',    'ext': '2.darkm', 'def': '2',
    1.19  		                         'name': 'DARKMESSIAH',    'platform': ['windows']}
    1.20 -		self.possibleSdks['swarm'] = {'sdk': 'HL2SDK-SWARM',    'ext': '2.swarm', 'def': '9',
    1.21 +		self.possibleSdks['swarm'] = {'sdk': 'HL2SDK-SWARM',    'ext': '2.swarm', 'def': '10',
    1.22  		                         'name': 'ALIENSWARM',     'platform': ['windows']}
    1.23  		self.possibleSdks['bgt'] =   {'sdk': 'HL2SDK-BGT',      'ext': '2.bgt', 'def': '4',
    1.24  		                         'name': 'BLOODYGOODTIME', 'platform': ['windows']}
    1.25  		self.possibleSdks['eye'] =   {'sdk': 'HL2SDK-EYE',      'ext': '2.eye', 'def': '5',
    1.26  		                         'name': 'EYE', 'platform': ['windows']}
    1.27 -		self.possibleSdks['csgo'] =  {'sdk': 'HL2SDKCSGO',     'ext': '2.csgo',  'def': '11',
    1.28 +		self.possibleSdks['csgo'] =  {'sdk': 'HL2SDKCSGO',     'ext': '2.csgo',  'def': '12',
    1.29  		                         'name': 'CSGO',           'platform': ['windows', 'linux']}
    1.30 -		# self.possibleSdks['portal2'] =  {'sdk': 'HL2SDK-PORTAL2',     'ext': '2.portal2',  'def': '10',
    1.31 +		# self.possibleSdks['portal2'] =  {'sdk': 'HL2SDK-PORTAL2',     'ext': '2.portal2',  'def': '11',
    1.32  		#                          'name': 'PORTAL2',           'platform': ['windows']}
    1.33  		
    1.34  		self.sdkInfo = { }
    1.35 @@ -40,6 +42,7 @@
    1.36  
    1.37  			#Detect variables
    1.38  			envvars = { 'MMSOURCE19':    'mmsource-1.9',
    1.39 +									'HL2SDKCSS':     'hl2sdk-css',
    1.40  									'HL2SDKOBVALVE': 'hl2sdk-ob-valve',
    1.41  									'HL2SDKL4D':     'hl2sdk-l4d',
    1.42  									'HL2SDKL4D2':    'hl2sdk-l4d2',
    1.43 @@ -273,7 +276,7 @@
    1.44  			else:
    1.45  				staticLibs = os.path.join(sdkPath, 'lib', 'linux')
    1.46  			workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
    1.47 -			if sdk in ['ep2v', 'l4d', 'l4d2', 'csgo']:
    1.48 +			if sdk in ['css', 'ep2v', 'l4d', 'l4d2', 'csgo']:
    1.49  				libs = ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.so', 'libtier0.so']
    1.50  				if sdk == 'csgo':
    1.51  					libs.append('interfaces_i486.a')
    1.52 @@ -336,7 +339,7 @@
    1.53  				
    1.54  		# We don't build for Portal 2 (yet?, ever?), but using this define in code as 
    1.55  		# it saves trouble if we ever need to
    1.56 -		compiler['CDEFINES'].append('SE_PORTAL2=10')
    1.57 +		compiler['CDEFINES'].append('SE_PORTAL2=11')
    1.58  
    1.59  		paths = [['public'], ['public', 'engine'], ['public', 'mathlib'], ['public', 'vstdlib'],
    1.60  						 ['public', 'tier0'], ['public', 'tier1']]
    1.61 @@ -375,7 +378,7 @@
    1.62  		if not noLink:
    1.63  			if AMBuild.target['platform'] == 'linux':
    1.64  				compiler['POSTLINKFLAGS'][0:0] = ['-lm']
    1.65 -				if sdk in ['ep2v', 'l4d', 'l4d2', 'csgo']:
    1.66 +				if sdk in ['css', 'ep2v', 'l4d', 'l4d2', 'csgo']:
    1.67  					compiler['POSTLINKFLAGS'][0:0] = ['libtier0.so']
    1.68  					compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib.so']
    1.69  				else:
     2.1 --- a/core/ExtensionSys.cpp	Thu Aug 16 07:40:06 2012 -0400
     2.2 +++ b/core/ExtensionSys.cpp	Mon Aug 20 21:53:59 2012 -0400
     2.3 @@ -74,6 +74,8 @@
     2.4  #define GAMEFIX "2.bgt"
     2.5  #elif SOURCE_ENGINE == SE_EYE
     2.6  #define GAMEFIX "2.eye"
     2.7 +#elif SOURCE_ENGINE == SE_CSS
     2.8 +#define GAMEFIX "2.css"
     2.9  #elif SOURCE_ENGINE == SE_ORANGEBOXVALVE
    2.10  #define GAMEFIX "2.ep2v"
    2.11  #elif SOURCE_ENGINE == SE_DARKMESSIAH
     3.1 --- a/core/HalfLife2.cpp	Thu Aug 16 07:40:06 2012 -0400
     3.2 +++ b/core/HalfLife2.cpp	Mon Aug 20 21:53:59 2012 -0400
     3.3 @@ -51,7 +51,7 @@
     3.4  #define TIER0_NAME			"libtier0.dylib"
     3.5  #define VSTDLIB_NAME		"libvstdlib.dylib"
     3.6  #elif defined __linux__
     3.7 -#if SOURCE_ENGINE >= SE_ORANGEBOXVALVE
     3.8 +#if SOURCE_ENGINE >= SE_CSS
     3.9  #define TIER0_NAME			"libtier0.so"
    3.10  #define VSTDLIB_NAME		"libvstdlib.so"
    3.11  #else
     4.1 --- a/core/MenuStyle_Base.cpp	Thu Aug 16 07:40:06 2012 -0400
     4.2 +++ b/core/MenuStyle_Base.cpp	Mon Aug 20 21:53:59 2012 -0400
     4.3 @@ -337,7 +337,7 @@
     4.4  #endif
     4.5  							0, 
     4.6  							PITCH_NORM, 
     4.7 -#if SOURCE_ENGINE == SE_ORANGEBOXVALVE
     4.8 +#if SOURCE_ENGINE == SE_CSS || SOURCE_ENGINE == SE_ORANGEBOXVALVE
     4.9  							0,
    4.10  #endif
    4.11  							&pos);
     5.1 --- a/core/PluginSys.h	Thu Aug 16 07:40:06 2012 -0400
     5.2 +++ b/core/PluginSys.h	Mon Aug 20 21:53:59 2012 -0400
     5.3 @@ -49,9 +49,9 @@
     5.4  #include <IRootConsoleMenu.h>
     5.5  #if SOURCE_ENGINE >= SE_ALIENSWARM
     5.6  #include "convar_sm_swarm.h"
     5.7 -#elif (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
     5.8 +#elif SOURCE_ENGINE >= SE_LEFT4DEAD
     5.9  #include "convar_sm_l4d.h"
    5.10 -#elif (SOURCE_ENGINE == SE_ORANGEBOX) || (SOURCE_ENGINE == SE_BLOODYGOODTIME) || (SOURCE_ENGINE == SE_EYE) || (SOURCE_ENGINE == SE_ORANGEBOXVALVE)
    5.11 +#elif SOURCE_ENGINE >= SE_ORANGEBOX
    5.12  #include "convar_sm_ob.h"
    5.13  #else
    5.14  #include "convar_sm.h"
     6.1 --- a/core/logic_bridge.cpp	Thu Aug 16 07:40:06 2012 -0400
     6.2 +++ b/core/logic_bridge.cpp	Mon Aug 20 21:53:59 2012 -0400
     6.3 @@ -159,6 +159,8 @@
     6.4  	return "bloodygoodtime";
     6.5  #elif SOURCE_ENGINE == SE_EYE
     6.6  	return "eye";
     6.7 +#elif SOURCE_ENGINE == SE_CSS
     6.8 +	return "css";
     6.9  #elif SOURCE_ENGINE == SE_ORANGEBOXVALVE
    6.10  	return "orangebox_valve";
    6.11  #elif SOURCE_ENGINE == SE_LEFT4DEAD
    6.12 @@ -176,7 +178,7 @@
    6.13  
    6.14  static bool symbols_are_hidden()
    6.15  {
    6.16 -#if (SOURCE_ENGINE == SE_ORANGEBOXVALVE) || (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2) || (SOURCE_ENGINE == SE_CSGO)
    6.17 +#if (SOURCE_ENGINE == SE_CSS) || (SOURCE_ENGINE == SE_ORANGEBOXVALVE) || (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2) || (SOURCE_ENGINE == SE_CSGO)
    6.18  	return true;
    6.19  #else
    6.20  	return false;
     7.1 --- a/core/smn_entities.cpp	Thu Aug 16 07:40:06 2012 -0400
     7.2 +++ b/core/smn_entities.cpp	Mon Aug 20 21:53:59 2012 -0400
     7.3 @@ -2047,7 +2047,7 @@
     7.4  #if SOURCE_ENGINE == SE_ALIENSWARM
     7.5  		case FL_FREEZING:
     7.6  			return ENTFLAG_FREEZING;
     7.7 -#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE
     7.8 +#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE || SOURCE_ENGINE == SE_CSS
     7.9  		case FL_EP2V_UNKNOWN:
    7.10  			return ENTFLAG_EP2V_UNKNOWN1;
    7.11  #endif
    7.12 @@ -2125,7 +2125,7 @@
    7.13  #if SOURCE_ENGINE == SE_ALIENSWARM
    7.14  		case ENTFLAG_FREEZING:
    7.15  			return FL_FREEZING;
    7.16 -#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE
    7.17 +#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE || SOURCE_ENGINE == SE_CSS
    7.18  		case ENTFLAG_EP2V_UNKNOWN1:
    7.19  			return FL_EP2V_UNKNOWN;
    7.20  #endif
     8.1 --- a/core/smn_halflife.cpp	Thu Aug 16 07:40:06 2012 -0400
     8.2 +++ b/core/smn_halflife.cpp	Mon Aug 20 21:53:59 2012 -0400
     8.3 @@ -473,6 +473,8 @@
     8.4  		return 32;
     8.5  	case SOURCE_ENGINE_EYE:
     8.6  		return 33;
     8.7 +	case SOURCE_ENGINE_CSS:
     8.8 +		return 34;
     8.9  	case SOURCE_ENGINE_ORANGEBOXVALVE:
    8.10  		return 35;
    8.11  	case SOURCE_ENGINE_LEFT4DEAD:
     9.1 --- a/core/sourcemm_api.h	Thu Aug 16 07:40:06 2012 -0400
     9.2 +++ b/core/sourcemm_api.h	Mon Aug 20 21:53:59 2012 -0400
     9.3 @@ -34,9 +34,9 @@
     9.4  
     9.5  #if SOURCE_ENGINE >= SE_ALIENSWARM
     9.6  #include "convar_sm_swarm.h"
     9.7 -#elif (SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
     9.8 +#elif SOURCE_ENGINE >= SE_LEFT4DEAD
     9.9  #include "convar_sm_l4d.h"
    9.10 -#elif (SOURCE_ENGINE == SE_ORANGEBOX) || (SOURCE_ENGINE == SE_BLOODYGOODTIME) || (SOURCE_ENGINE == SE_EYE) || (SOURCE_ENGINE == SE_ORANGEBOXVALVE)
    9.11 +#elif SOURCE_ENGINE >= SE_ORANGEBOX
    9.12  #include "convar_sm_ob.h"
    9.13  #else
    9.14  #include "convar_sm.h"
    10.1 --- a/extensions/cstrike/AMBuilder	Thu Aug 16 07:40:06 2012 -0400
    10.2 +++ b/extensions/cstrike/AMBuilder	Mon Aug 20 21:53:59 2012 -0400
    10.3 @@ -2,7 +2,7 @@
    10.4  import os
    10.5  
    10.6  for i in SM.sdkInfo:
    10.7 -	if i != 'ep2v' and i != 'csgo':
    10.8 +	if i != 'css' and i != 'csgo':
    10.9  		continue
   10.10  	
   10.11  	sdk = SM.sdkInfo[i]
    11.1 --- a/extensions/sdktools/vcaller.cpp	Thu Aug 16 07:40:06 2012 -0400
    11.2 +++ b/extensions/sdktools/vcaller.cpp	Mon Aug 20 21:53:59 2012 -0400
    11.3 @@ -129,7 +129,7 @@
    11.4  		{
    11.5  			return 0;
    11.6  		}
    11.7 -#if (SOURCE_ENGINE == SE_ORANGEBOXVALVE) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
    11.8 +#if (SOURCE_ENGINE == SE_CSS) || (SOURCE_ENGINE == SE_ORANGEBOXVALVE) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
    11.9  		s_call_addr = memutils->ResolveSymbol(handle, &sig[1]);
   11.10  #else
   11.11  		s_call_addr = dlsym(handle, &sig[1]);
    12.1 --- a/extensions/sdktools/vnatives.cpp	Thu Aug 16 07:40:06 2012 -0400
    12.2 +++ b/extensions/sdktools/vnatives.cpp	Mon Aug 20 21:53:59 2012 -0400
    12.3 @@ -528,7 +528,7 @@
    12.4  			CellRecipientFilter rf;
    12.5  			rf.SetToReliable(true);
    12.6  			rf.Initialize(player_list, total_players);
    12.7 -#if SOURCE_ENGINE == SE_ORANGEBOXVALVE
    12.8 +#if SOURCE_ENGINE == SE_ORANGEBOXVALVE || SOURCE_ENGINE == SE_CSS
    12.9  			engsound->EmitSound(rf, params[1], CHAN_AUTO, sound_name, VOL_NORM, ATTN_NORM, 0, PITCH_NORM, 0, &pos);
   12.10  #elif SOURCE_ENGINE < SE_PORTAL2
   12.11  			engsound->EmitSound(rf, params[1], CHAN_AUTO, sound_name, VOL_NORM, ATTN_NORM, 0, PITCH_NORM, &pos);
    13.1 --- a/extensions/sdktools/vsound.cpp	Thu Aug 16 07:40:06 2012 -0400
    13.2 +++ b/extensions/sdktools/vsound.cpp	Mon Aug 20 21:53:59 2012 -0400
    13.3 @@ -36,7 +36,7 @@
    13.4  #if SOURCE_ENGINE >= SE_PORTAL2
    13.5  SH_DECL_HOOK17(IEngineSound, EmitSound, SH_NOATTRIB, 0, int, IRecipientFilter &, int, int, const char *, unsigned int, const char *, float, float, int, int, int, const Vector *, const Vector *, CUtlVector<Vector> *, bool, float, int);
    13.6  SH_DECL_HOOK17(IEngineSound, EmitSound, SH_NOATTRIB, 1, int, IRecipientFilter &, int, int, const char *, unsigned int, const char *, float, soundlevel_t, int, int, int, const Vector *, const Vector *, CUtlVector<Vector> *, bool, float, int);
    13.7 -#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE
    13.8 +#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE || SOURCE_ENGINE == SE_CSS
    13.9  SH_DECL_HOOK15_void(IEngineSound, EmitSound, SH_NOATTRIB, 0, IRecipientFilter &, int, int, const char *, float, float, int, int, int, const Vector *, const Vector *, CUtlVector<Vector> *, bool, float, int);
   13.10  SH_DECL_HOOK15_void(IEngineSound, EmitSound, SH_NOATTRIB, 1, IRecipientFilter &, int, int, const char *, float, soundlevel_t, int, int, int, const Vector *, const Vector *, CUtlVector<Vector> *, bool, float, int);
   13.11  #else
   13.12 @@ -265,7 +265,7 @@
   13.13  							 float flVolume, soundlevel_t iSoundlevel, int nSeed, int iFlags, int iPitch, const Vector *pOrigin, 
   13.14  							 const Vector *pDirection, CUtlVector<Vector> *pUtlVecOrigins, bool bUpdatePositions, 
   13.15  							 float soundtime, int speakerentity)
   13.16 -#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE
   13.17 +#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE || SOURCE_ENGINE == SE_CSS
   13.18  void SoundHooks::OnEmitSound(IRecipientFilter &filter, int iEntIndex, int iChannel, const char *pSample, 
   13.19  							 float flVolume, soundlevel_t iSoundlevel, int iFlags, int iPitch, int iSpecialDSP, const Vector *pOrigin, 
   13.20  							 const Vector *pDirection, CUtlVector<Vector> *pUtlVecOrigins, bool bUpdatePositions, 
   13.21 @@ -326,7 +326,7 @@
   13.22  					(crf, iEntIndex, iChannel, buffer, -1, buffer, flVolume, iSoundlevel, nSeed, iFlags, iPitch, pOrigin, 
   13.23  					pDirection, pUtlVecOrigins, bUpdatePositions, soundtime, speakerentity)
   13.24  					);
   13.25 -#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE
   13.26 +#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE || SOURCE_ENGINE == SE_CSS
   13.27  				RETURN_META_NEWPARAMS(
   13.28  					MRES_IGNORED,
   13.29  					static_cast<void (IEngineSound::*)(IRecipientFilter &, int, int, const char*, float, soundlevel_t, 
   13.30 @@ -357,7 +357,7 @@
   13.31  							 float flVolume, float flAttenuation, int nSeed, int iFlags, int iPitch, const Vector *pOrigin, 
   13.32  							 const Vector *pDirection, CUtlVector<Vector> *pUtlVecOrigins, bool bUpdatePositions, 
   13.33  							 float soundtime, int speakerentity)
   13.34 -#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE
   13.35 +#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE || SOURCE_ENGINE == SE_CSS
   13.36  void SoundHooks::OnEmitSound2(IRecipientFilter &filter, int iEntIndex, int iChannel, const char *pSample, 
   13.37  							 float flVolume, float flAttenuation, int iFlags, int iPitch, int iSpecialDSP, const Vector *pOrigin, 
   13.38  							 const Vector *pDirection, CUtlVector<Vector> *pUtlVecOrigins, bool bUpdatePositions, 
   13.39 @@ -419,7 +419,7 @@
   13.40  					(crf, iEntIndex, iChannel, buffer, -1, buffer, flVolume, SNDLVL_TO_ATTN(static_cast<soundlevel_t>(sndlevel)), 
   13.41  					nSeed, iFlags, iPitch, pOrigin, pDirection, pUtlVecOrigins, bUpdatePositions, soundtime, speakerentity)
   13.42  					);
   13.43 -#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE
   13.44 +#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE || SOURCE_ENGINE == SE_CSS
   13.45  RETURN_META_NEWPARAMS(
   13.46  					MRES_IGNORED,
   13.47  					static_cast<void (IEngineSound::*)(IRecipientFilter &, int, int, const char *, float, float, 
   13.48 @@ -683,7 +683,7 @@
   13.49  					soundtime,
   13.50  					speakerentity);
   13.51  			}
   13.52 -#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE
   13.53 +#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE || SOURCE_ENGINE == SE_CSS
   13.54  			if (g_InSoundHook)
   13.55  			{
   13.56  				SH_CALL(enginesoundPatch, 
   13.57 @@ -811,7 +811,7 @@
   13.58  				soundtime,
   13.59  				speakerentity);
   13.60  		}
   13.61 -#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE
   13.62 +#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE || SOURCE_ENGINE == SE_CSS
   13.63  		if (g_InSoundHook)
   13.64  		{
   13.65  			SH_CALL(enginesoundPatch, 
   13.66 @@ -984,7 +984,7 @@
   13.67  #endif
   13.68  		flags, 
   13.69  		pitch, 
   13.70 -#if SOURCE_ENGINE == SE_ORANGEBOXVALVE
   13.71 +#if SOURCE_ENGINE == SE_ORANGEBOXVALVE || SOURCE_ENGINE == SE_CSS
   13.72  		0, 
   13.73  #endif
   13.74  		pOrigin,
    14.1 --- a/extensions/sdktools/vsound.h	Thu Aug 16 07:40:06 2012 -0400
    14.2 +++ b/extensions/sdktools/vsound.h	Mon Aug 20 21:53:59 2012 -0400
    14.3 @@ -63,7 +63,7 @@
    14.4  #else
    14.5  	void OnEmitAmbientSound(int entindex, const Vector &pos, const char *samp, float vol, 
    14.6  		soundlevel_t soundlevel, int fFlags, int pitch, float delay);
    14.7 -#if SOURCE_ENGINE == SE_ORANGEBOXVALVE
    14.8 +#if SOURCE_ENGINE == SE_ORANGEBOXVALVE || SOURCE_ENGINE == SE_CSS
    14.9  	
   14.10  	void OnEmitSound(IRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample, float flVolume, 
   14.11  		soundlevel_t iSoundlevel, int iFlags, int iPitch, int iSpecialDSP, const Vector *pOrigin, 
   14.12 @@ -82,7 +82,7 @@
   14.13  		float flAttenuation, int iFlags, int iPitch, const Vector *pOrigin, 
   14.14  		const Vector *pDirection, CUtlVector<Vector> *pUtlVecOrigins, bool bUpdatePositions, 
   14.15  		float soundtime, int speakerentity);
   14.16 -#endif // SOURCE_ENGINE == SE_ORANGEBOXVALVE
   14.17 +#endif // SOURCE_ENGINE == SE_ORANGEBOXVALVE || SOURCE_ENGINE == SE_CSS
   14.18  #endif // SOURCE_ENGINE >= SE_PORTAL2
   14.19  private:
   14.20  	size_t _FillInPlayers(int *pl_array, IRecipientFilter *pFilter);
    15.1 --- a/loader/loader.cpp	Thu Aug 16 07:40:06 2012 -0400
    15.2 +++ b/loader/loader.cpp	Mon Aug 20 21:53:59 2012 -0400
    15.3 @@ -78,6 +78,7 @@
    15.4  #define FILENAME_1_6_EYE			"sourcemod.2.eye" PLATFORM_EXT
    15.5  #define FILENAME_1_6_PORTAL2		"sourcemod.2.portal2" PLATFORM_EXT
    15.6  #define FILENAME_1_6_CSGO			"sourcemod.2.csgo" PLATFORM_EXT
    15.7 +#define FILENAME_1_6_CSS			"sourcemod.2.css" PLATFORM_EXT
    15.8  
    15.9  HINSTANCE g_hCore = NULL;
   15.10  bool load_attempted = false;
   15.11 @@ -269,6 +270,11 @@
   15.12  			filename = FILENAME_1_6_CSGO;
   15.13  			break;
   15.14  		}
   15.15 +	case SOURCE_ENGINE_CSS:
   15.16 +		{
   15.17 +			filename = FILENAME_1_6_CSS;
   15.18 +			break;
   15.19 +		}
   15.20  	default:
   15.21  		{
   15.22  			return NULL;
    16.1 --- a/plugins/include/halflife.inc	Thu Aug 16 07:40:06 2012 -0400
    16.2 +++ b/plugins/include/halflife.inc	Mon Aug 20 21:53:59 2012 -0400
    16.3 @@ -42,7 +42,8 @@
    16.4  #define SOURCE_SDK_EPISODE2			30		/**< SDK+Engine released after Episode 2/Orange Box */
    16.5  #define SOURCE_SDK_BLOODYGOODTIME	32		/**< Modified version of ep2 engine used by Bloody Good Time (no SDK) */
    16.6  #define SOURCE_SDK_EYE				33		/**< Modified version of ep2 engine used by E.Y.E Divine Cybermancy (no SDK) */
    16.7 -#define SOURCE_SDK_EPISODE2VALVE	35		/**< SDK+Engine released after Episode 2/Orange Box */
    16.8 +#define SOURCE_SDK_CSS				34		/**< Sometime-older version of Source 2009 SDK+Engine, used for Counter-Strike: Source */
    16.9 +#define SOURCE_SDK_EPISODE2VALVE	35		/**< SDK+Engine released after Episode 2/Orange Box, "Source 2009" or "Source MP" */
   16.10  #define SOURCE_SDK_LEFT4DEAD		40		/**< Engine released after Left 4 Dead (no SDK yet) */
   16.11  #define SOURCE_SDK_LEFT4DEAD2		50		/**< Engine released after Left 4 Dead 2 (no SDK yet) */
   16.12  #define SOURCE_SDK_ALIENSWARM		60		/**< SDK+Engine released after Alien Swarm */
    17.1 --- a/tools/buildbot/PackageScript	Thu Aug 16 07:40:06 2012 -0400
    17.2 +++ b/tools/buildbot/PackageScript	Mon Aug 20 21:53:59 2012 -0400
    17.3 @@ -227,7 +227,7 @@
    17.4  AddNormalLibrary('dbi.mysql.ext', 'extensions')
    17.5  AddNormalLibrary('dbi.sqlite.ext', 'extensions')
    17.6  
    17.7 -AddNormalLibrary('game.cstrike.ext.2.ep2v', 'extensions')
    17.8 +AddNormalLibrary('game.cstrike.ext.2.css', 'extensions')
    17.9  if AMBuild.target['platform'] != 'darwin':
   17.10  	AddNormalLibrary('game.cstrike.ext.2.csgo', 'extensions')
   17.11