add link script for powershell

game_clean/link.ps1

@@ -0,0 +1,53 @@
+<#
+	.SYNOPSIS
+		symlink files from a retail Team Fortress 2 build to a patched build
+#>
+
+param (
+	[Parameter(Mandatory=$true)]
+	[string]$TF2Dir
+)
+
+$VerbosePreference = "Continue"
+$OutPath = "$PSScriptRoot\..\game"
+$GameClean = "$PSScriptRoot\."
+
+
+function Make-Symlink {
+	param (
+		[String]$Path
+	)
+
+	$linkpath = "$OutPath/$Path"
+	$targetpath = "$TF2Dir/$Path"
+
+	Write-Verbose -Message "Linking $linkpath to $targetpath"
+	New-Item -ItemType SymbolicLink -Path $linkpath -Target $targetpath
+}
+
+function Glob-Symlink {
+	param (
+		[String]$Path,
+		[String]$Glob
+	)
+
+	Get-ChildItem -Path "$TF2Dir\$Path\*" -Include $Glob | % { $_.Name } | % { Make-Symlink -Path $Path/$_ }
+}
+
+New-Item -ItemType Directory -Path $OutPath
+
+Write-Verbose -Message "Copying $GameClean/copy/ to $OutPath"
+Copy-Item -Recurse -Force $GameClean/clean/* $OutPath
+
+Write-Verbose -Message "Creating $OutPath/tf/materials"
+New-Item -Type Directory -Path $OutPath/tf/materials
+
+$targets = "hl2","platform"
+$targets += ,"maps","media","resource","scripts" | % { "tf/$_" }
+$targets += ,"models","vgui" | % { "tf/materials/$_" }
+ForEach ($t in $targets) {
+	Make-Symlink -Path $t
+}
+
+Glob-Symlink -Glob '' -Path 'bin'
+ForEach ($g in '*.vpk','*.cache') { Glob-Symlink -Glob $g -Path 'tf' }

src/common/ServerBrowser/blacklisted_server_manager.cpp

@@ -223,7 +223,7 @@ bool CBlacklistedServerManager::IsServerBlacklisted( uint32 serverIP, int server
 {
 	netadr_t netAdr( serverIP, serverPort );
 
-	ConVarRef sb_showblacklists( "sb_showblacklists" );
+	static ConVarRef sb_showblacklists( "sb_showblacklists" );
 
 	for ( int i = 0; i < m_Blacklist.Count(); i++ )
 	{

src/common/vgui_surfacelib/Win32Font.h

@@ -128,6 +128,8 @@ class CWin32Font
 		char c;
 	};
 
+	enum { ABCWIDTHS_CACHE_SIZE = 256 };
+	abc_t* m_ABCWidthsCache[ABCWIDTHS_CACHE_SIZE];
 #if !defined( _X360 )
 	// On PC we cache char widths on demand when actually requested to minimize our use of the kernels 
 	// paged pool (GDI may cache information about glyphs we have requested and take up lots of paged pool)
@@ -138,10 +140,6 @@ class CWin32Font
 	};
 	CUtlRBTree<abc_cache_t, unsigned short> m_ExtendedABCWidthsCache;
 	static bool ExtendedABCWidthsCacheLessFunc(const abc_cache_t &lhs, const abc_cache_t &rhs);
-#else
-	// 360 requires all possible characters during font init
-	enum { ABCWIDTHS_CACHE_SIZE = 256 };
-	abc_t m_ABCWidthsCache[ABCWIDTHS_CACHE_SIZE];
 #endif
 };
 

src/datacache/mdlcache.cpp

@@ -78,12 +78,6 @@ namespace {
 #define MdlCacheMsg		if ( !LogMdlCache() ) ; else Msg
 #define MdlCacheWarning if ( !LogMdlCache() ) ; else Warning
 
-#if defined( _X360 )
-#define AsyncMdlCache() 0	// Explicitly OFF for 360 (incompatible)
-#else
-#define AsyncMdlCache() 0
-#endif
-
 #define ERROR_MODEL		"models/error.mdl"
 #define IDSTUDIOHEADER	(('T'<<24)+('S'<<16)+('D'<<8)+'I')
 
@@ -184,7 +178,7 @@ class CTempAllocHelper
 // ConVars
 //-----------------------------------------------------------------------------
 static ConVar r_rootlod( "r_rootlod", "0", FCVAR_ARCHIVE );
-static ConVar mod_forcedata( "mod_forcedata", ( AsyncMdlCache() ) ? "0" : "1",	0, "Forces all model file data into cache on model load." );
+static ConVar mod_forcedata( "mod_forcedata", ( AsyncMdlCache() && IsX360() ) ? "0" : "1",	0, "Forces all model file data into cache on model load." );
 static ConVar mod_test_not_available( "mod_test_not_available", "0", FCVAR_CHEAT );
 static ConVar mod_test_mesh_not_available( "mod_test_mesh_not_available", "0", FCVAR_CHEAT );
 static ConVar mod_test_verts_not_available( "mod_test_verts_not_available", "0", FCVAR_CHEAT );

src/dmxloader/dmxattribute.cpp

@@ -15,7 +15,7 @@
 //-----------------------------------------------------------------------------
 // globals
 //-----------------------------------------------------------------------------
-CUtlSymbolTableMT CDmxAttribute::s_AttributeNameSymbols;
+CUtlSymbolTableLargeMT CDmxAttribute::s_AttributeNameSymbols;
 
 
 //-----------------------------------------------------------------------------
@@ -128,7 +128,7 @@ CDmxAttribute::CDmxAttribute( const char *pAttributeName )
 	m_pData = NULL;
 }
 
-CDmxAttribute::CDmxAttribute( CUtlSymbol attributeName )
+CDmxAttribute::CDmxAttribute( CUtlSymbolLarge attributeName )
 {
 	m_Name = attributeName;
 	m_Type = AT_UNKNOWN;
@@ -221,7 +221,7 @@ inline const char* CDmxAttribute::GetTypeString() const
 //-----------------------------------------------------------------------------
 const char *CDmxAttribute::GetName() const
 {
-	return s_AttributeNameSymbols.String( m_Name );
+	return m_Name.String();
 }
 
 

src/dmxloader/dmxelement.cpp

@@ -8,6 +8,7 @@
 #include "dmxloader/dmxattribute.h"
 #include "tier1/utlbuffer.h"
 #include "mathlib/ssemath.h"
+#include "tier1/utlsymbollarge.h"
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
@@ -16,7 +17,7 @@
 //-----------------------------------------------------------------------------
 // globals
 //-----------------------------------------------------------------------------
-CUtlSymbolTableMT CDmxElement::s_TypeSymbols;
+CUtlSymbolTableLargeMT CDmxElement::s_TypeSymbols;
 
 
 //-----------------------------------------------------------------------------
@@ -50,14 +51,14 @@ CDmxElement::~CDmxElement()
 //-----------------------------------------------------------------------------
 // Utility method for getting at the type
 //-----------------------------------------------------------------------------
-CUtlSymbol CDmxElement::GetType()  const
+CUtlSymbolLarge CDmxElement::GetType()  const
 {
 	return m_Type;
 }
 
 const char* CDmxElement::GetTypeString() const
 {
-	return s_TypeSymbols.String( m_Type );
+	return m_Type.String();
 }
 
 const char* CDmxElement::GetName() const
@@ -225,7 +226,7 @@ int CDmxElement::FindAttribute( const char *pAttributeName ) const
 //-----------------------------------------------------------------------------
 // Find an attribute by name-based lookup
 //-----------------------------------------------------------------------------
-int CDmxElement::FindAttribute( CUtlSymbol attributeName ) const
+int CDmxElement::FindAttribute( CUtlSymbolLarge attributeName ) const
 {
 	Resort();
 	CDmxAttribute search( attributeName );

src/dmxloader/dmxloader.cpp

@@ -443,7 +443,7 @@ bool CDmxSerializer::Unserialize( CUtlBuffer &buf, int nEncodingVersion, CDmxEle
 	}
 
 	// Read in the element count.
-	int nElementCount = buf.GetInt();
+	const int nElementCount = buf.GetInt();
 	if ( !nElementCount )
 	{
 		// Empty (but valid) file
@@ -474,10 +474,10 @@ bool CDmxSerializer::Unserialize( CUtlBuffer &buf, int nEncodingVersion, CDmxEle
 		}
 		else
 		{
-			buf.GetString( pTypeBuf );
+			buf.GetString<256>( pTypeBuf );
 			pType = pTypeBuf;
 		}
-		buf.GetString( pName );
+		buf.GetString<2048>( pName );
 		buf.Get( &id, sizeof(DmObjectId_t) );
 
 		CDmxElement *pElement = new CDmxElement( pType );

src/engine/audio/private/snd_channels.h

@@ -126,8 +126,8 @@ struct channel_t
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
-#define	MAX_CHANNELS			128
-#define	MAX_DYNAMIC_CHANNELS	64
+#define	MAX_CHANNELS			256
+#define	MAX_DYNAMIC_CHANNELS	32
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

src/engine/audio/private/snd_dev_direct.cpp

@@ -370,7 +370,7 @@ int CAudioDirectSound::PaintBegin( float mixAheadTime, int soundtime, int lpaint
 	DWORD	dwStatus;
 
 	// If using surround, there are 4 or 5 different buffers being used and the pDSBuf is NULL.
-	if ( IsUsingBufferPerSpeaker() ) 
+	if ( IsUsingBufferPerSpeaker() )
 	{
 		if (pDSBufFL->GetStatus(&dwStatus) != DS_OK)
 			Msg ("Couldn't get SURROUND FL sound buffer status\n");
@@ -674,6 +674,7 @@ bool CAudioDirectSound::SNDDMA_InitInterleaved( LPDIRECTSOUND lpDS, WAVEFORMATEX
 			dsbdesc.dwFlags = 0;
 			break;
 		}
+		dsbdesc.dwFlags |= DSBCAPS_TRUEPLAYPOSITION;
 		if ( !snd_mute_losefocus.GetBool() )
 		{
 			dsbdesc.dwFlags |= DSBCAPS_GLOBALFOCUS;
@@ -688,7 +689,7 @@ bool CAudioDirectSound::SNDDMA_InitInterleaved( LPDIRECTSOUND lpDS, WAVEFORMATEX
 	if ( !bSuccess )
 		return false;
 
-	DWORD dwSize = 0, dwWrite;
+	DWORD dwSize = 0;
 	DWORD *pBuffer = 0;
 	if ( !LockDSBuffer( pDSBuf, &pBuffer, &dwSize, "DS_INTERLEAVED", DSBLOCK_ENTIREBUFFER ) )
 		return false;
@@ -707,7 +708,7 @@ bool CAudioDirectSound::SNDDMA_InitInterleaved( LPDIRECTSOUND lpDS, WAVEFORMATEX
 	pDSBuf->Play(0, 0, DSBPLAY_LOOPING);
 
 	pDSBuf->Stop();
-	pDSBuf->GetCurrentPosition(&m_outputBufferStartOffset, &dwWrite);
+	pDSBuf->GetCurrentPosition(&m_outputBufferStartOffset, NULL);
 
 	pDSBuf->Play(0, 0, DSBPLAY_LOOPING);
 
@@ -725,7 +726,7 @@ sndinitstat CAudioDirectSound::SNDDMA_InitDirect( void )
 {
 	DSBUFFERDESC	dsbuf;
 	DSBCAPS			dsbcaps;
-	DWORD			dwSize, dwWrite;
+	DWORD			dwSize;
 	WAVEFORMATEX	format;
 	WAVEFORMATEX	pformat; 
 	HRESULT			hresult;
@@ -830,7 +831,7 @@ sndinitstat CAudioDirectSound::SNDDMA_InitDirect( void )
 	// sound hardware format
 	Q_memset( &dsbuf, 0, sizeof(dsbuf) );
 	dsbuf.dwSize = sizeof(DSBUFFERDESC);
-	dsbuf.dwFlags = DSBCAPS_PRIMARYBUFFER;
+	dsbuf.dwFlags = DSBCAPS_PRIMARYBUFFER | DSBCAPS_TRUEPLAYPOSITION;
 	if ( snd_legacy_surround.GetBool() || m_bSurround )
 	{
 		dsbuf.dwFlags |= DSBCAPS_CTRL3D;
@@ -900,7 +901,8 @@ sndinitstat CAudioDirectSound::SNDDMA_InitDirect( void )
 			// create the secondary buffer we'll actually work with
 			Q_memset( &dsbuf, 0, sizeof(dsbuf) );
 			dsbuf.dwSize = sizeof(DSBUFFERDESC);
-			dsbuf.dwFlags = DSBCAPS_LOCSOFTWARE;		// NOTE: don't use CTRLFREQUENCY (slow)
+			// NOTE: don't use CTRLFREQUENCY (slow)
+			dsbuf.dwFlags = DSBCAPS_LOCSOFTWARE | DSBCAPS_TRUEPLAYPOSITION;
 			dsbuf.dwBufferBytes = SECONDARY_BUFFER_SIZE;
 			dsbuf.lpwfxFormat = &format;
 			if ( !snd_mute_losefocus.GetBool() )
@@ -992,7 +994,7 @@ sndinitstat CAudioDirectSound::SNDDMA_InitDirect( void )
 
 		pDSBuf->Stop();
 
-		pDSBuf->GetCurrentPosition(&m_outputBufferStartOffset, &dwWrite);
+		pDSBuf->GetCurrentPosition(&m_outputBufferStartOffset, NULL);
 
 		pDSBuf->Play(0, 0, DSBPLAY_LOOPING);
 	}
@@ -1288,7 +1290,7 @@ void DS3D_SetBufferParams( LPDIRECTSOUND3DBUFFER pDSBuf3D, D3DVECTOR *pbpos, D3D
 	bparm.vConeOrientation = bdir;
 	bparm.lConeOutsideVolume = DSBVOLUME_MIN;
 	bparm.flMinDistance = 100.0;		// no rolloff (until > 2.0 meter distance)
-	bparm.flMaxDistance = DS3D_DEFAULTMAXDISTANCE;
+	bparm.flMaxDistance = 1000.0;
 	bparm.dwMode = DS3DMODE_NORMAL;
 
 	hr = pDSBuf3D->SetAllParameters( &bparm, DS3D_DEFERRED );
@@ -1300,7 +1302,7 @@ bool CAudioDirectSound::SNDDMA_InitSurround(LPDIRECTSOUND lpDS, WAVEFORMATEX* lp
 {
 	DSBUFFERDESC	dsbuf;
 	WAVEFORMATEX wvex;
-	DWORD dwSize, dwWrite;
+	DWORD dwSize;
 	int reps;
 	HRESULT hresult;
 	void			*lpData = NULL;
@@ -1316,8 +1318,9 @@ bool CAudioDirectSound::SNDDMA_InitSurround(LPDIRECTSOUND lpDS, WAVEFORMATEX* lp
 
 	memset (&dsbuf, 0, sizeof(dsbuf));
 	dsbuf.dwSize = sizeof(DSBUFFERDESC);
-														 // NOTE: LOCHARDWARE causes SB AWE64 to crash in it's DSOUND driver
-	dsbuf.dwFlags = DSBCAPS_CTRL3D;						 // don't use CTRLFREQUENCY (slow)
+	// NOTE: LOCHARDWARE causes SB AWE64 to crash in it's DSOUND driver
+	// don't use CTRLFREQUENCY (slow)
+	dsbuf.dwFlags = DSBCAPS_CTRL3D | DSBCAPS_TRUEPLAYPOSITION;
 	if ( !snd_mute_losefocus.GetBool() )
 	{
 		dsbuf.dwFlags |= DSBCAPS_GLOBALFOCUS;
@@ -1623,7 +1626,7 @@ bool CAudioDirectSound::SNDDMA_InitSurround(LPDIRECTSOUND lpDS, WAVEFORMATEX* lp
 
 	// get hardware playback position, store it, syncronize all buffers to FL
 
-	pDSBufFL->GetCurrentPosition(&m_outputBufferStartOffset, &dwWrite);
+	pDSBufFL->GetCurrentPosition(&m_outputBufferStartOffset, NULL);
 	pDSBufFR->SetCurrentPosition(m_outputBufferStartOffset);
 	pDSBufRL->SetCurrentPosition(m_outputBufferStartOffset);
 	pDSBufRR->SetCurrentPosition(m_outputBufferStartOffset);