bug fixes

sound improvements
spread improvements

Author: mastercoms

engine/audio/private/snd_dma.cpp

@@ -461,7 +461,7 @@ static ConVar volume( "volume", "1.0", FCVAR_ARCHIVE | FCVAR_ARCHIVE_XBOX, "Soun
 // user configurable music volume
 ConVar snd_musicvolume( "snd_musicvolume", "1.0", FCVAR_ARCHIVE | FCVAR_ARCHIVE_XBOX, "Music volume", true, 0.0f, true, 1.0f );	
 
-ConVar snd_mixahead( "snd_mixahead", "0.05");
+ConVar snd_mixahead( "snd_mixahead", "0.04");
 ConVar snd_mix_async( "snd_mix_async", "0" );
 #ifdef _DEBUG
 static ConCommand snd_mixvol("snd_mixvol", MXR_DebugSetMixGroupVolume, "Set named Mixgroup to mix volume.");
@@ -6547,61 +6547,49 @@ void S_Update_Guts( float mixAheadTime )
 }
 
 #if !defined( _X360 )
-#define THREADED_MIX_TIME 7
+#define THREADED_MIX_TIME 0.001
 #else
-#define THREADED_MIX_TIME XMA_POLL_RATE
+#define THREADED_MIX_TIME XMA_POLL_RATE * 0.001
 #endif
-#define THREADED_MIX_TIME_S (THREADED_MIX_TIME) * 0.001f
 
 ConVar snd_ShowThreadFrameTime( "snd_ShowThreadFrameTime", "0" );
 
 bool g_bMixThreadExit;
 ThreadHandle_t g_hMixThread;
 void S_Update_Thread()
 {
-	float frameTime = THREADED_MIX_TIME_S;
-	double lastFrameTime = Plat_FloatTime();
+	double frameTime = THREADED_MIX_TIME;
 
 	while ( !g_bMixThreadExit )
 	{
-#ifdef _X360
-		float t0 = Plat_FloatTime();
-#endif
+		const double t0 = Plat_FloatTime();
 		S_Update_Guts(frameTime + snd_mixahead.GetFloat());
-#ifdef _X360
+		const double tf = Plat_FloatTime();
 
-		// mixing (for 360) needs to be updated at a steady rate
-		// large update times causes the mixer to demand more audio data
-		// the 360 decoder has finite latency and cannot fulfill spike requests
-		float tf = Plat_FloatTime();
-		float dt = tf - t0;
-		float nextFrameTime = tf + THREADED_MIX_TIME_S - dt;
-		int updateTime = (int)dt * 1000;
+		const double dt = tf - t0;
+		const double fWaitTime = THREADED_MIX_TIME - dt;
+		const double fWaitEnd = tf + fWaitTime;
 
 		// try to maintain a steadier rate by compensating for fluctuating mix times
-		// leave 1 ms for tighter timings in loop
-		int sleepTime = THREADED_MIX_TIME - updateTime - 1;
-		if ( sleepTime > 0 )
+		// leave 2 ms for tighter timings in loop
+		const int nSleepMS = (int) ((THREADED_MIX_TIME - dt) * 1000 - 2);
+		if ( nSleepMS > 0 )
 		{
-			ThreadSleep( sleepTime );
+			ThreadSleep( nSleepMS );
 		}
 
-		while (Plat_FloatTime() < nextFrameTime)
+		while (Plat_FloatTime() < fWaitEnd)
 		{
 			ThreadSleep();
 		}
-#else
-		// Give up our time slice
-		ThreadSleep();
-#endif
+
 		// mimic a frametime needed for sound update
-		double t1 = Plat_FloatTime();
-		frameTime = t1 - lastFrameTime;
-		lastFrameTime = t1;
+		const double t1 = Plat_FloatTime();
+		frameTime = t1 - tf;
 
 		if ( snd_ShowThreadFrameTime.GetBool() )
 		{
-			Msg( "S_Update_Thread: frameTime: %d ms\n", (int)( frameTime * 1000.0f ) );
+			Msg( "S_Update_Thread: frameTime: %f s\n", frameTime );
 		}
 	}
 }

engine/audio/private/snd_win.cpp

@@ -81,6 +81,10 @@ IAudioDevice *IAudioDevice::AutoDetectInit( bool waveOnly )
 			if ( snd_firsttime )
 			{
 				pDevice = Audio_CreateDirectSoundDevice();
+				if (pDevice)
+				{
+					S_EnableThreadedMixing(true);
+				}
 			}
 		}
 

engine/baseclient.cpp

@@ -686,7 +686,6 @@ bool CBaseClient::SendServerInfo( void )
 
 	// supporting smaller stack
 	net_scratchbuffer_t scratch;
-
 	bf_write msg( "SV_SendServerinfo->msg", scratch.GetBuffer(), NET_MAX_PAYLOAD );
 
 	// Only send this message to developer console, or multiplayer clients.
@@ -752,15 +751,12 @@ bool CBaseClient::SendServerInfo( void )
 	// send server info as one data block
 	if ( !m_NetChannel->SendData( msg ) )
 	{
-		MemFreeScratch();
 		Disconnect("Server info data overflow");
 		return false;
 	}
 
 	COM_TimestampedLog( " CBaseClient::SendServerInfo(finished)" );
 
-	MemFreeScratch();
-
 	return true;
 }
 
@@ -1151,6 +1147,8 @@ void CBaseClient::TraceNetworkMsg( int nBits, char const *fmt, ... )
 	m_Trace.m_Records.AddToTail( t );
 }
 
+static ConVar sv_multiplayer_maxtempentities("sv_multiplayer_maxtempentities", "32");
+
 void CBaseClient::SendSnapshot( CClientFrame *pFrame )
 {
 	// never send the same snapshot twice
@@ -1174,24 +1172,34 @@ void CBaseClient::SendSnapshot( CClientFrame *pFrame )
 
 	bool bFailedOnce = false;
 write_again:
-	bf_write msg( "CBaseClient::SendSnapshot", m_SnapshotScratchBuffer, sizeof( m_SnapshotScratchBuffer ) );
+	net_scratchbuffer_t scratch;
+	bf_write msg("CBaseClient::SendSnapshot",
+		scratch.GetBuffer(), scratch.Size());
 
 	TRACE_PACKET( ( "SendSnapshot(%d)\n", pFrame->tick_count ) );
 
 	// now create client snapshot packet
-	CClientFrame *deltaFrame = GetDeltaFrame( m_nDeltaTick ); // NULL if delta_tick is not found
+	CClientFrame* deltaFrame = m_nDeltaTick < 0 ? NULL : GetDeltaFrame(m_nDeltaTick); // NULL if delta_tick is not found
 	if ( !deltaFrame )
 	{
 		// We need to send a full update and reset the instanced baselines
 		OnRequestFullUpdate();
 	}
 
-	// send tick time
-	NET_Tick tickmsg( pFrame->tick_count, host_frametime_unbounded, host_frametime_stddeviation );
-
-	StartTrace( msg );
+	if (IsTracing())
+	{
+		StartTrace(msg);
+	}
 
-	tickmsg.WriteToBuffer( msg );
+	// send tick time
+	{
+		NET_Tick tickmsg(pFrame->tick_count, host_frametime_unbounded, host_frametime_stddeviation);
+		if (!tickmsg.WriteToBuffer(msg))
+		{
+			Disconnect("#GameUI_Disconnect_TickMessage");
+			return;
+		}
+	}
 
 	if ( IsTracing() )
 	{
@@ -1223,8 +1231,8 @@ void CBaseClient::SendSnapshot( CClientFrame *pFrame )
 	}
 
 	// send all unreliable temp entities between last and current frame
-	// send max 64 events in multi player, 255 in SP
-	int nMaxTempEnts = m_Server->IsMultiplayer() ? 64 : 255;
+	// send max 32 events in multi player, 255 in SP
+	int nMaxTempEnts = m_Server->IsMultiplayer() ? sv_multiplayer_maxtempentities.GetInt() : 255;
 	m_Server->WriteTempEntities( this, pFrame->GetSnapshot(), m_pLastSnapshot.GetObject(), msg, nMaxTempEnts );
 
 	if ( IsTracing() )

engine/baseclient.h

@@ -274,13 +274,6 @@ class CBaseClient : public IGameEventListener2, public IClient, public IClientMe
 	// Default time to wait for next message
 	float          m_fSnapshotInterval;  
 
-	enum
-	{
-		SNAPSHOT_SCRATCH_BUFFER_SIZE = 160000,
-	};
-
-	unsigned int		m_SnapshotScratchBuffer[ SNAPSHOT_SCRATCH_BUFFER_SIZE / 4 ];
-
 private:
 	void				StartTrace( bf_write &msg );
 	void				EndTrace( bf_write &msg );

engine/bugreporter.cpp

@@ -2687,41 +2687,28 @@ void CBugUIPanel::OnKeyCodePressed(KeyCode code)
 // Load game-specific bug reporter defaults as params
 void CBugUIPanel::ParseDefaultParams( void )
 {
-	const char *szDefaults = "scripts/bugreporter_defaults.txt";
-
-	FileHandle_t hLocal = g_pFileSystem->Open( szDefaults, "rb" );
-	if ( FILESYSTEM_INVALID_HANDLE == hLocal )
+	CUtlBuffer buffer(0, 0, CUtlBuffer::TEXT_BUFFER);
+	if (!g_pFileSystem->ReadFile("scripts/bugreporter_defaults.txt", NULL, buffer))
 	{
 		return;
 	}
 
-	// load file into a null-terminated buffer
-	int fileSize = g_pFileSystem->Size(hLocal);
-	char *buffer = (char*)MemAllocScratch(fileSize + 1);
-
-	Assert(buffer);
-
-	g_pFileSystem->Read(buffer, fileSize, hLocal); // read into local buffer
-	buffer[fileSize] = 0; // null terminate file as EOF
-	g_pFileSystem->Close( hLocal );	// close file after reading
-
-	char token[64];
-	const char *pfile = COM_ParseFile(buffer, token, sizeof( token ) );
-
-	while ( pfile )
+	char token[256];
+	const char* pfile = COM_ParseFile((const char*)buffer.Base(), token, sizeof(token));
+	while (pfile)
 	{
-		bool success = AutoFillToken( token, false );
-		if ( !success )
+		bool success = AutoFillToken(token, false);
+		if (!success)
 		{
 			// Try partials
-			success = AutoFillToken( token, true );
-			if ( !success )
+			success = AutoFillToken(token, true);
+			if (!success)
 			{
-				Msg( "Unable to determine where to set default bug parameter '%s', ignoring...\n", token );
+				Msg("Unable to determine where to set default bug parameter '%s', ignoring...\n", token);
 			}
 		}
 
-		pfile = COM_ParseFile(pfile, token, sizeof( token ) );
+		pfile = COM_ParseFile(pfile, token, sizeof(token));
 	}
 }
 

engine/sv_client.cpp

@@ -837,12 +837,14 @@ void CGameClient::WriteGameSounds( bf_write &buf )
 	}
 }
 
+static ConVar sv_multiplayer_maxsounds("sv_multiplayer_sounds", "20");
+
 int	CGameClient::FillSoundsMessage(SVC_Sounds &msg)
 {
 	int i, count = m_Sounds.Count();
 
-	// send max 64 sound in multiplayer per snapshot, 255 in SP
-	int max = m_Server->IsMultiplayer() ? 32 : 255;
+	// send max 20 sound in multiplayer per snapshot, 255 in SP
+	int max = m_Server->IsMultiplayer() ? sv_multiplayer_maxsounds.GetInt() : 255;
 
 	// Discard events if we have too many to signal with 8 bits
 	if ( count > max )
@@ -852,7 +854,7 @@ int	CGameClient::FillSoundsMessage(SVC_Sounds &msg)
 	if ( !count )
 		return 0;
 
-	SoundInfo_t defaultSound; defaultSound.SetDefault();
+	SoundInfo_t defaultSound;
 	SoundInfo_t *pDeltaSound = &defaultSound;
 
 	msg.m_nNumSounds = count;

engine/sys_engine.cpp

@@ -363,7 +363,7 @@ void CEngine::Frame( void )
 				ThreadSleep(nSleepMS);
 			}
 
-			while (Sys_FloatTime() < fWaitEnd)
+			while (Plat_FloatTime() < fWaitEnd)
 			{
 				ThreadSleep();
 			}

game/client/c_baseentity.cpp

@@ -908,13 +908,13 @@ C_BaseEntity::C_BaseEntity() :
 	// but that re-introduces a third-person hitching bug.  One possible cause is the abrupt change
 	// in player size/position that occurs when ducking, and how prediction tries to work through that.
 	//
-	AddVar( &m_vecVelocity, &m_iv_vecVelocity, LATCH_SIMULATION_VAR );
+	//AddVar( &m_vecVelocity, &m_iv_vecVelocity, LATCH_SIMULATION_VAR );
 
 	m_DataChangeEventRef = -1;
 	m_EntClientFlags = 0;
 
 	m_iParentAttachment = 0;
-	m_nRenderFXBlend = 0;
+	m_nRenderFXBlend = 255;
 
 	SetPredictionEligible( false );
 	m_bPredictable = false;

game/shared/tf/tf_fx_shared.cpp

@@ -349,7 +349,7 @@ void FX_FireBullets( CTFWeaponBase *pWpn, int iPlayer, const Vector &vecOrigin,
 		{
 			if (bFixedRecoilSpread)
 			{
-				iSeed = pWpn->m_iConsecutiveShots;
+				iSeed = 200 + pWpn->m_iConsecutiveShots;
 			}
 		}
 
@@ -375,7 +375,7 @@ void FX_FireBullets( CTFWeaponBase *pWpn, int iPlayer, const Vector &vecOrigin,
 			float flScalar;
 			if (!bSpreadNormal && pWpn)
 			{
-				flScalar = clamp(pWpn->m_iConsecutiveShots + 1, 1, 6) * 0.5f;
+				flScalar = clamp(pWpn->m_iConsecutiveShots + 1, 1, 6) * 0.25f;
 			}
 			else
 			{

public/soundinfo.h

@@ -63,9 +63,9 @@
 #define SOUND_SEQNUMBER_BITS	10
 #define SOUND_SEQNUMBER_MASK	( (1<<SOUND_SEQNUMBER_BITS) - 1 )
 
-// offset sound delay encoding by 60ms since we encode negative sound delays with less precision
-// This means any negative sound delay greater than -100ms will get encoded at full precision
-#define SOUND_DELAY_OFFSET					(0.100f)
+// offset sound delay encoding by 15ms since we encode negative sound delays with less precision
+// This means any negative sound delay greater than -15ms will get encoded at full precision
+#define SOUND_DELAY_OFFSET					(0.015f)
 
 #pragma pack(4)
 //-----------------------------------------------------------------------------
@@ -91,10 +91,17 @@ struct SoundInfo_t
 	int				nSpeakerEntity;
 
 	//---------------------------------
-	
-	SoundInfo_t()
+	enum SoundInfoInit_t
+	{
+		SOUNDINFO_SETDEFAULT,
+		SOUNDINFO_NO_SETDEFAULT,
+	};
+	SoundInfo_t(SoundInfoInit_t Init = SOUNDINFO_SETDEFAULT )
 	{
-		SetDefault();
+		if (Init == SOUNDINFO_SETDEFAULT)
+		{
+			SetDefault();
+		}
 	}
 
 	void Set(int newEntity, int newChannel, const char *pszNewName, const Vector &newOrigin, const Vector& newDirection,