It has come to my attention that some of the code from the RDA merge may have been leaked/stolen.

It is a violation of the license we have with Valve to use leaked or
stolen code, so five pieces of code have been removed, including the
client-side sprite implementation.

I have written a new client-side sprite implementation from scratch
based on C_ASW_Snow_Volume, so we don't have to lose any features as a
result of this.

Author: BenLubar

src/game/client/c_baseanimating.cpp

@@ -2734,17 +2734,7 @@ bool C_BaseAnimating::SetupBones( matrix3x4a_t *pBoneToWorldOut, int nMaxBones,
 {
 	VPROF_BUDGET( "C_BaseAnimating::SetupBones", ( !g_bInThreadedBoneSetup ) ? VPROF_BUDGETGROUP_CLIENT_ANIMATION : "Client_Animation_Threaded" );
 
-	//=============================================================================
-	// HPE_BEGIN:
-	// [pfreese] Added the check for pBoneToWorldOut != NULL in this debug warning
-	// code. SetupBones is called in the CSS anytime an attachment wants its
-	// parent's transform, hence this warning is hit extremely frequently.
-	// I'm not actually sure if this is the right "fix" for this, as the bones are
-	// actually accessed as part of the setup process, but since I'm not clear on the
-	// purpose of this dev warning, I'm including this comment block.
-	//=============================================================================
-
-	if ( pBoneToWorldOut != NULL && !IsBoneAccessAllowed() )
+	if ( !IsBoneAccessAllowed() )
 	{
 		static float lastWarning = 0.0f;
 

src/game/client/c_sprite.cpp

@@ -20,8 +20,6 @@
 #include "tier1/KeyValues.h"
 #include "toolframework/itoolframework.h"
 #include "toolframework_client.h"
-#include "mapentities_shared.h"
-#include "gamestringpool.h"
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
@@ -501,199 +499,3 @@ void CSprite::GetToolRecordingState( KeyValues *msg )
 
 	msg->SetPtr( "sprite", &state );
 }
-
-CUtlVector< CSprite * > g_ClientsideSprites;
-
-// ===================== For clientside spawning of sprites =====================
-void CSprite::RecreateAllClientside()
-{
-	DestroyAllClientside();	
-	ParseAllClientsideEntities( engine->GetMapEntitiesString() );
-}
-
-void CSprite::DestroyAllClientside()
-{
-	// This only gets called during LevelInitPostEntity and LevelShutdown so we're going to use 
-	// Release() instead of Remove() or UTIL_Remove
-	while ( g_ClientsideSprites.Count() > 0 )
-	{
-		CSprite *p = g_ClientsideSprites[0];
-
-		// This will call into CSprite::~CSprite in sprite.cpp, which will FindAndRemove this sprite from the array
-		p->Release();
-	}
-}
-
-bool CSprite::InitializeClientside()
-{	
-	if ( InitializeAsClientEntity( STRING( GetModelName() ), false ) == false )
-	{
-		return false;
-	}
-
-	m_bClientOnly = true;
-	g_ClientsideSprites.AddToTail( this );
-	
-	Spawn();
-
-	const model_t *mod = GetModel();
-	if ( mod )
-	{
-		Vector mins, maxs;
-		modelinfo->GetModelBounds( mod, mins, maxs );
-		SetCollisionBounds( mins, maxs );		
-	}
-
-	SetBlocksLOS( false ); // this should be a small object
-	SetNextClientThink( CLIENT_THINK_NEVER );
-
-	return true;
-}
-
-
-const char *CSprite::ParseClientsideEntity( const char *pEntData )
-{
-	CEntityMapData entData( (char*)pEntData );
-	char className[MAPKEY_MAXLENGTH];
-
-	MDLCACHE_CRITICAL_SECTION();
-
-	if ( !entData.ExtractValue( "classname", className ) )
-	{
-		Error( "classname missing from entity!\n" );
-	}
-
-	if ( !Q_strcmp( className, "env_sprite_clientside" ))
-	{
-		char targetName[MAPKEY_MAXLENGTH]{};
-		char parentName[MAPKEY_MAXLENGTH]{};
-		entData.ExtractValue( "targetname", targetName );
-		entData.ExtractValue( "parentname", parentName );
-		if ( targetName[0] != '\0' || parentName[0] != '\0' )
-		{
-			//simply skip
-		}
-		else
-		{
-			// always force clientside entities placed in maps
-			CSprite* pEntity = new CSprite();
-
-			if ( pEntity )
-			{
-				// Set up keyvalues.
-				pEntity->ParseMapData(&entData);
-
-				if ( !pEntity->InitializeClientside() )
-					pEntity->Release();
-
-				return entData.CurrentBufferPosition();
-			}
-		}
-	}
-
-
-	// Just skip past all the keys.
-	char keyName[MAPKEY_MAXLENGTH];
-	char value[MAPKEY_MAXLENGTH];
-	if ( entData.GetFirstKey(keyName, value) )
-	{
-		do 
-		{
-		} 
-		while ( entData.GetNextKey(keyName, value) );
-	}
-
-	//
-	// Return the current parser position in the data block
-	//
-	return entData.CurrentBufferPosition();
-}
-
-bool CSprite::KeyValue( const char *szKeyName, const char *szValue ) 
-{
-	if ( FStrEq( szKeyName, "scale" ) )
-	{
-		m_flSpriteScale = atof(szValue);		
-	}
-	else if ( FStrEq( szKeyName, "framerate" ) )
-	{
-		m_flSpriteFramerate = atof(szValue);		
-	}
-	else if ( FStrEq( szKeyName, "GlowProxySize" ) )
-	{
-		m_flGlowProxySize = atof(szValue);		
-	}
-	else if ( FStrEq( szKeyName, "frame" ) )
-	{
-		m_flFrame = atof(szValue);		
-	}
-	else if ( FStrEq( szKeyName, "HDRColorScale" ) )
-	{
-		m_flHDRColorScale = atof(szValue);		
-	}
-	else if ( FStrEq( szKeyName, "rendermode" ) )
-	{
-		SetRenderMode( (RenderMode_t) atoi( szValue ) );
-	}
-	else if ( FStrEq( szKeyName, "model" ) )
-	{
-		SetModelName( AllocPooledString( szValue ) );
-	}
-	else if ( FStrEq( szKeyName, "spritecontroller" ) )
-	{
-		m_iszSpriteControllerName = AllocPooledString( szValue );
-	}
-	else if ( ( FStrEq( szKeyName, "targetname" ) || FStrEq( szKeyName, "parentname" ) ) && *szValue )
-	{
-		Warning( "LEVEL DESIGN ERROR: env_sprite_clientside has %s '%s' - use env_sprite instead.\n", szKeyName, szValue );
-	}
-	else
-	{
-		return BaseClass::KeyValue( szKeyName, szValue );
-	}
-
-	return true;
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: Only called on BSP load. Parses and spawns all the entities in the BSP.
-// Input  : pMapData - Pointer to the entity data block to parse.
-//-----------------------------------------------------------------------------
-void CSprite::ParseAllClientsideEntities(const char *pMapData)
-{
-	int nEntities = 0;
-
-	char szTokenBuffer[MAPKEY_MAXLENGTH];
-
-	//
-	//  Loop through all entities in the map data, creating each.
-	//
-	for ( ; true; pMapData = MapEntity_SkipToNextEntity( pMapData, szTokenBuffer ) )
-	{
-		//
-		// Parse the opening brace.
-		//
-		char token[MAPKEY_MAXLENGTH];
-		pMapData = MapEntity_ParseToken( pMapData, token );
-
-		//
-		// Check to see if we've finished or not.
-		//
-		if ( !pMapData )
-			break;
-
-		if ( token[0] != '{' )
-		{
-			Error( "CSprite::ParseAllEntities: found %s when expecting {", token);
-			continue;
-		}
-
-		//
-		// Parse the entity and add it to the spawn list.
-		//
-
-		pMapData = ParseClientsideEntity( pMapData );
-
-		nEntities++;
-	}
-}

src/game/client/cdll_client_int.cpp

@@ -100,7 +100,6 @@
 #include "GameStats.h"
 #include "videocfg/videocfg.h"
 #include "tier2/tier2_logging.h"
-#include "Sprite.h"
 #include "vscript/ivscript.h"
 #include "activitylist.h"
 #include "eventlist.h"
@@ -1886,7 +1885,6 @@ void CHLClient::LevelInitPostEntity( )
 
 	IGameSystem::LevelInitPostEntityAllSystems();
 	C_PhysPropClientside::RecreateAll();
-	C_Sprite::RecreateAllClientside();
 
 	for ( int hh = 0; hh < MAX_SPLITSCREEN_PLAYERS; ++hh )
 	{
@@ -1929,7 +1927,6 @@ void CHLClient::LevelShutdown( void )
 	// First do the pre-entity shutdown of all systems
 	IGameSystem::LevelShutdownPreEntityAllSystems();
 
-	C_Sprite::DestroyAllClientside();
 	C_PhysPropClientside::DestroyAll();
 
 	modemanager->LevelShutdown();

src/game/client/cdll_util.cpp

@@ -342,24 +342,6 @@ void UTIL_Tracer( const Vector &vecStart, const Vector &vecEnd, int iEntIndex, i
 	}
 }
 
-// Tried to include this in the actual trace function, but ran into
-// linker issues.  Just dropped it here instead.  Michael Dorgan
-
-static bool HasValidDirection(trace_t *pTrace)
-{
-	if(pTrace->fraction <= 0.0001f)
-	{
-		// Ok, there is a very, very strong chance our vectors are out of wack
-		// Add a direct check against the actual start and end points to be sure.
-		if( VectorsAreEqual( pTrace->startpos, pTrace->endpos, 0.0001f ) )
-		{
-			return false;
-		}
-	}
-
-	return true;
-}
-
 //------------------------------------------------------------------------------
 // Purpose : Creates both an decal and any associated impact effects (such
 //			 as flecks) for the given iDamageType and the trace's end position
@@ -374,12 +356,7 @@ void UTIL_ImpactTrace( trace_t *pTrace, int iDamageType, char *pCustomImpactName
 	if ( !pEntity || (pTrace->surface.flags & SURF_SKY) )
 		return;
 
-	if (pTrace->fraction >= 1.0f)
-		return;
-
-	// Very, very, very close range shots cause all sorts of issues with normal and correct
-	// decal orientation.  Just skip them to prevent heartache.
-	if ( !HasValidDirection(pTrace) )
+	if (pTrace->fraction == 1.0f)
 		return;
 
 	// don't decal nodraw surfaces

src/game/client/swarm/asw_client_entities.cpp

@@ -9,6 +9,7 @@
 #include "tier0/vprof.h"
 #include "asw_client_entities.h"
 #include "c_asw_camera_volume.h"
+#include "Sprite.h"
 #include "c_asw_snow_volume.h"
 #include "c_asw_scanner_noise.h"
 
@@ -23,14 +24,14 @@ void CASW_Client_Entities::LevelInitPostEntity()
 {
 	//C_ASW_Camera_Volume::RecreateAll();
 	C_ASW_Snow_Volume::RecreateAll();
-	//C_Sprite::RecreateAll();
+	C_Sprite_ClientSide::RecreateAll();
 	C_ASW_Scanner_Noise::RecreateAll();
 }
 
 void CASW_Client_Entities::LevelShutdownPreEntity()
 {
-	//C_ASW_Camera_Volume::DestroyAll();	
-	C_ASW_Snow_Volume::DestroyAll();	
-	//C_Sprite::DestroyAll();
+	//C_ASW_Camera_Volume::DestroyAll();
+	C_ASW_Snow_Volume::DestroyAll();
+	C_Sprite_ClientSide::DestroyAll();
 	C_ASW_Scanner_Noise::DestroyAll();
 }

src/game/server/baseentity.cpp

@@ -6948,15 +6948,6 @@ void CBaseEntity::UpdateCell()
 	m_cellX = CellFromCoord( cellwidth, m_vecOrigin.GetX() );
 	m_cellY = CellFromCoord( cellwidth, m_vecOrigin.GetY() );
 	m_cellZ	= CellFromCoord( cellwidth, m_vecOrigin.GetZ() );
-
-
-    // PRB TODO : HACK fix for hostage warping.
-    // Somehow the above code does not flag the network vars as modified, but below does... 
-    // Needs revisiting, but at this stage it fixes our bug
-
-    m_cellX.GetForModify();
-    m_cellY.GetForModify();
-    m_cellZ.GetForModify();
 }
 
 //-----------------------------------------------------------------------------