Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/game/client/clientsideeffects_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,11 @@ void FX_PlayerTracer( Vector& start, Vector& end )

//Randomly place the tracer along this line, with a random length
VectorMA( start, TRACER_BASE_OFFSET + random->RandomFloat( -24.0f, 64.0f ), shotDir, dStart );
#ifdef NEO
VectorMA( dStart, ( length * random->RandomFloat( 0.1f, 1.6f ) ), shotDir, dEnd );
#else
VectorMA( dStart, ( length * random->RandomFloat( 0.1f, 0.6f ) ), shotDir, dEnd );
#endif

//Create the line
CFXStaticLine *t;
Expand All @@ -164,7 +168,11 @@ void FX_PlayerTracer( Vector& start, Vector& end )
//materialName = ( random->RandomInt( 0, 1 ) ) ? "effects/tracer_middle" : "effects/tracer_middle2";
materialName = "effects/spark";

#ifdef NEO
t = new CFXStaticLine( "Tracer", dStart, dEnd, random->RandomFloat( 2.5f, 2.75f ), 0.01f, materialName, 0 );
#else
t = new CFXStaticLine( "Tracer", dStart, dEnd, random->RandomFloat( 0.5f, 0.75f ), 0.01f, materialName, 0 );
#endif
assert( t );

//Throw it into the list
Expand Down
4 changes: 3 additions & 1 deletion src/game/client/fx_tracer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,12 @@ void TracerCallback( const CEffectData &data )

#ifdef NEO
if ( bPlayerFirstperson )
{
FX_PlayerTracer(vecStart, (Vector&)data.m_vOrigin);
#else
int iEntIndex = data.entindex();

if ( iEntIndex && iEntIndex == player->index )
#endif
{
Vector foo = data.m_vStart;
QAngle vangles;
Expand All @@ -141,6 +142,7 @@ void TracerCallback( const CEffectData &data )
foo[2] -= 0.5f;

FX_PlayerTracer( foo, (Vector&)data.m_vOrigin );
#endif
return;
}

Expand Down