eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

r_rockettrail/r_grenadetrail 0 disables

Browse source 
both cvars marked as semicheats
switched faithful for highfps in presets.. need a faithful preset probably


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1596 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2005-11-26 23:23:03 +00:00
parent 8728f3abbb
commit 88098ab5d3
3 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
engine/client/cl_ents.c
View file

@ -1728,14 +1728,19 @@ void CL_LinkPacketEntities (void)
} }
for (i=0 ; i<3 ; i++) for (i=0 ; i<3 ; i++)
{
if ( abs(old_origin[i] - ent->origin[i]) > 128) if ( abs(old_origin[i] - ent->origin[i]) > 128)
{ // no trail if too far { // no trail if too far
VectorCopy (ent->origin, old_origin); VectorCopy (ent->origin, old_origin);
break; break;
} }
}
if (P_ParticleTrail (old_origin, ent->origin, model->particletrail, &(le->trailstate))) if (model->particletrail >= 0)
P_ParticleTrailIndex(old_origin, ent->origin, model->traildefaultindex, 0, &(le->trailstate)); {
if (P_ParticleTrail (old_origin, ent->origin, model->particletrail, &(le->trailstate)))
P_ParticleTrailIndex(old_origin, ent->origin, model->traildefaultindex, 0, &(le->trailstate));
}
{ {
extern cvar_t gl_part_flame; extern cvar_t gl_part_flame;
@ -2029,14 +2034,19 @@ void CL_LinkPacketEntities (void)
} }
for (i=0 ; i<3 ; i++) for (i=0 ; i<3 ; i++)
{
if ( abs(old_origin[i] - ent->origin[i]) > 128) if ( abs(old_origin[i] - ent->origin[i]) > 128)
{ // no trail if too far { // no trail if too far
VectorCopy (ent->origin, old_origin); VectorCopy (ent->origin, old_origin);
break; break;
} }
}
if (P_ParticleTrail (old_origin, ent->origin, model->particletrail, &cl.lerpents[s1->number].trailstate)) if (model->particletrail >= 0)
P_ParticleTrailIndex(old_origin, ent->origin, model->traildefaultindex, 0, &cl.lerpents[s1->number].trailstate); {
if (P_ParticleTrail (old_origin, ent->origin, model->particletrail, &cl.lerpents[s1->number].trailstate))
P_ParticleTrailIndex(old_origin, ent->origin, model->traildefaultindex, 0, &cl.lerpents[s1->number].trailstate);
}
{ {
extern cvar_t gl_part_flame; extern cvar_t gl_part_flame;

2
engine/client/m_options.c
View file

@ -365,7 +365,7 @@ typedef struct {
presetinfo_t preset[] = presetinfo_t preset[] =
{ {
{"r_presetname", {"286", "fast", "default", "nice", "realtime"}}, {"r_presetname", {"286", "fast", "default", "nice", "realtime"}},
{"r_particlesdesc", {"none", "faithful", "spikeset", "spikeset", "spikeset"}}, {"r_particlesdesc", {"none", "highfps", "spikeset", "spikeset", "spikeset"}},
{"r_stains", {"0", "0", "1", "1", "1"}}, {"r_stains", {"0", "0", "1", "1", "1"}},
{"r_drawflat", {"1", "0", "0", "0", "0"}}, {"r_drawflat", {"1", "0", "0", "0", "0"}},
{"r_nolerp", {"1", "1", "0", "0", "0"}}, {"r_nolerp", {"1", "1", "0", "0", "0"}},

9
engine/client/r_part.c
View file

@ -126,8 +126,8 @@ cvar_t r_particlesdesc = {"r_particlesdesc", "spikeset", NULL, CVAR_LATCH|CVAR_S
cvar_t r_part_rain_quantity = {"r_part_rain_quantity", "1"}; cvar_t r_part_rain_quantity = {"r_part_rain_quantity", "1"};
cvar_t r_rockettrail = {"r_rockettrail", "1"}; cvar_t r_rockettrail = {"r_rockettrail", "1", NULL, CVAR_SEMICHEAT};
cvar_t r_grenadetrail = {"r_grenadetrail", "1"}; cvar_t r_grenadetrail = {"r_grenadetrail", "1", NULL, CVAR_SEMICHEAT};
cvar_t r_particle_tracelimit = {"r_particle_tracelimit", "250"}; cvar_t r_particle_tracelimit = {"r_particle_tracelimit", "250"};
cvar_t r_part_sparks = {"r_part_sparks", "1"}; cvar_t r_part_sparks = {"r_part_sparks", "1"};
@ -1038,7 +1038,7 @@ void P_SelectableTrail(model_t *model, cvar_t *selection, int mdleffect, int mdl
switch (select) switch (select)
{ {
case 0: // check for string case 0: // check for string, otherwise no trail
{ {
int effect = P_FindParticleType(selection->string); int effect = P_FindParticleType(selection->string);
@ -1049,6 +1049,9 @@ void P_SelectableTrail(model_t *model, cvar_t *selection, int mdleffect, int mdl
break; break;
} }
} }
model->particletrail = -1;
break;
case 1: // default model effect case 1: // default model effect
default: default:
model->particletrail = mdleffect; model->particletrail = mdleffect;