*sigh*, got a little too eager.

This commit is contained in:
Bill Currie 2004-01-19 02:54:31 +00:00
parent de7a4e326e
commit fa6916cedd
3 changed files with 3 additions and 18 deletions

View File

@ -258,9 +258,6 @@ extern struct cvar_s *cl_autofire;
extern struct cvar_s *cl_shownet; extern struct cvar_s *cl_shownet;
extern struct cvar_s *cl_nolerp; extern struct cvar_s *cl_nolerp;
extern struct cvar_s *cl_particle_hack;
extern struct cvar_s *cl_particle_blood;
extern struct cvar_s *hud_sbar; extern struct cvar_s *hud_sbar;
extern struct cvar_s *cl_pitchdriftspeed; extern struct cvar_s *cl_pitchdriftspeed;

View File

@ -63,9 +63,6 @@ cvar_t *cl_writecfg;
cvar_t *cl_shownet; cvar_t *cl_shownet;
cvar_t *cl_nolerp; cvar_t *cl_nolerp;
cvar_t *cl_particle_hack;
cvar_t *cl_particle_blood;
cvar_t *cl_cshift_bonus; cvar_t *cl_cshift_bonus;
cvar_t *cl_cshift_contents; cvar_t *cl_cshift_contents;
cvar_t *cl_cshift_damage; cvar_t *cl_cshift_damage;
@ -128,10 +125,6 @@ CL_InitCvars (void)
"show network packets. 0=off, 1=basic, 2=verbose"); "show network packets. 0=off, 1=basic, 2=verbose");
cl_nolerp = Cvar_Get ("cl_nolerp", "0", CVAR_NONE, NULL, cl_nolerp = Cvar_Get ("cl_nolerp", "0", CVAR_NONE, NULL,
"linear motion interpolation"); "linear motion interpolation");
cl_particle_blood = Cvar_Get ("cl_particle_blood", "3", CVAR_ARCHIVE, NULL, "Amount of blood");
cl_particle_hack = Cvar_Get ("cl_particle_hack", "1", CVAR_ARCHIVE, NULL, "Make netquake "
"blood/explosions look better (some mods may look "
"weird with this on)");
lookspring = Cvar_Get ("lookspring", "0", CVAR_ARCHIVE, NULL, "Snap view " lookspring = Cvar_Get ("lookspring", "0", CVAR_ARCHIVE, NULL, "Snap view "
"to center when moving and no mlook/klook"); "to center when moving and no mlook/klook");
m_pitch = Cvar_Get ("m_pitch", "0.022", CVAR_ARCHIVE, NULL, m_pitch = Cvar_Get ("m_pitch", "0.022", CVAR_ARCHIVE, NULL,

View File

@ -46,7 +46,6 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "QF/msg.h" #include "QF/msg.h"
#include "QF/sound.h" #include "QF/sound.h"
#include "QF/sys.h" #include "QF/sys.h"
#include "QF/cvar.h"
#include "client.h" #include "client.h"
#include "compat.h" #include "compat.h"
@ -552,12 +551,8 @@ CL_ParseParticleEffect (void)
count = MSG_ReadByte (net_message); count = MSG_ReadByte (net_message);
color = MSG_ReadByte (net_message); color = MSG_ReadByte (net_message);
if (count == 255) { // have to keep this because it's id :/ if (count == 255)
R_ParticleExplosion(org); R_ParticleExplosion (org);
} else if (color == 73 && cl_particle_hack->int_val) { else
if (cl_particle_blood->value)
R_BloodPuffEffect (org, count * cl_particle_blood->value);
} else {
R_RunParticleEffect (org, dir, color, count); R_RunParticleEffect (org, dir, color, count);
}
} }