Skip to content

Commit e8cc977

Browse files
committed
Fix lightsaber wallmark FPS dependency
1 parent 2c53ac4 commit e8cc977

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

codemp/cgame/cg_players.c

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7164,9 +7164,14 @@ void CG_AddSaberBlade( centity_t *cent, centity_t *scent, refEntity_t *saber, in
71647164
{
71657165
if ( trace.entityNum == ENTITYNUM_WORLD || cg_entities[trace.entityNum].currentState.eType == ET_TERRAIN || (cg_entities[trace.entityNum].currentState.eFlags & EF_PERMANENT) )
71667166
{//only put marks on architecture
7167-
// Let's do some cool burn/glowing mark bits!!!
7168-
CG_CreateSaberMarks( client->saber[saberNum].blade[bladeNum].trail.oldPos[i], trace.endpos, trace.plane.normal );
7169-
7167+
float markDistance = Distance(client->saber[saberNum].blade[bladeNum].trail.oldPos[i], trace.endpos);
7168+
if (markDistance > 8.0f)
7169+
{ // Let's do some cool burn/glowing mark bits!!!
7170+
CG_CreateSaberMarks( client->saber[saberNum].blade[bladeNum].trail.oldPos[i], trace.endpos, trace.plane.normal );
7171+
// stash point so we can connect-the-dots later
7172+
VectorCopy(trace.endpos, client->saber[saberNum].blade[bladeNum].trail.oldPos[i]);
7173+
VectorCopy(trace.plane.normal, client->saber[saberNum].blade[bladeNum].trail.oldNormal[i]);
7174+
}
71707175
//make a sound
71717176
if ( cg.time - client->saber[saberNum].blade[bladeNum].hitWallDebounceTime >= 100 )
71727177
{//ugh, need to have a real sound debouncer... or do this game-side
@@ -7181,12 +7186,11 @@ void CG_AddSaberBlade( centity_t *cent, centity_t *scent, refEntity_t *saber, in
71817186
client->saber[saberNum].blade[bladeNum].trail.haveOldPos[i] = qtrue;
71827187
// CG_ImpactMark( cgs.media.rivetMarkShader, client->saber[saberNum].blade[bladeNum].trail.oldPos[i], client->saber[saberNum].blade[bladeNum].trail.oldNormal[i],
71837188
// 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, qfalse, 1.1f, qfalse );
7189+
// stash point so we can connect-the-dots later
7190+
VectorCopy( trace.endpos, client->saber[saberNum].blade[bladeNum].trail.oldPos[i] );
7191+
VectorCopy( trace.plane.normal, client->saber[saberNum].blade[bladeNum].trail.oldNormal[i] );
71847192
}
71857193
}
7186-
7187-
// stash point so we can connect-the-dots later
7188-
VectorCopy( trace.endpos, client->saber[saberNum].blade[bladeNum].trail.oldPos[i] );
7189-
VectorCopy( trace.plane.normal, client->saber[saberNum].blade[bladeNum].trail.oldNormal[i] );
71907194
}
71917195
else
71927196
{

0 commit comments

Comments
 (0)