stock sbar and hud seem to be working in nq (fps back, too:)

This commit is contained in:
Bill Currie 2003-05-08 21:22:33 +00:00
parent c81b1b549d
commit 4bb1095951
4 changed files with 795 additions and 431 deletions

View file

@ -259,7 +259,6 @@ extern struct cvar_s *cl_shownet;
extern struct cvar_s *cl_nolerp;
extern struct cvar_s *cl_sbar;
extern struct cvar_s *cl_hudswap;
extern struct cvar_s *cl_pitchdriftspeed;
extern struct cvar_s *lookspring;

View file

@ -62,7 +62,6 @@ cvar_t *cl_writecfg;
cvar_t *cl_shownet;
cvar_t *cl_nolerp;
cvar_t *cl_hudswap;
cvar_t *cl_cshift_bonus;
cvar_t *cl_cshift_contents;
@ -80,7 +79,6 @@ cvar_t *show_fps;
cvar_t *show_time;
int fps_count;
qboolean hudswap;
client_static_t cls;
client_state_t cl;
@ -91,15 +89,6 @@ cl_entity_state_t cl_baselines[MAX_EDICTS];
entity_t cl_static_entities[MAX_STATIC_ENTITIES];
static void
cl_hudswap_f (cvar_t *var)
{
if (cl_hudswap)
hudswap = cl_hudswap->int_val;
else
hudswap = 0;
}
void
CL_InitCvars (void)
{
@ -136,8 +125,6 @@ CL_InitCvars (void)
"show network packets. 0=off, 1=basic, 2=verbose");
cl_nolerp = Cvar_Get ("cl_nolerp", "0", CVAR_NONE, NULL,
"linear motion interpolation");
cl_hudswap = Cvar_Get ("cl_hudswap", "0", CVAR_ARCHIVE, cl_hudswap_f,
"new HUD on left side?");
lookspring = Cvar_Get ("lookspring", "0", CVAR_ARCHIVE, NULL, "Snap view "
"to center when moving and no mlook/klook");
m_pitch = Cvar_Get ("m_pitch", "0.022", CVAR_ARCHIVE, NULL,

File diff suppressed because it is too large Load diff

View file

@ -121,7 +121,7 @@ static void
cl_hudswap_f (cvar_t *var)
{
hudswap = var->int_val;
if (hudswap) {
if (var->int_val) {
hud_armament_view->gravity = grav_southwest;
stuff_view->gravity = grav_southeast;
} else {
@ -882,7 +882,7 @@ draw_status (view_t *view)
draw_num (view, 24, 0, 666, 3, 1);
} else {
draw_num (view, 24, 0, cl.stats[STAT_ARMOR], 3,
cl.stats[STAT_ARMOR] <= 25);
cl.stats[STAT_ARMOR] <= 25);
if (cl.stats[STAT_ITEMS] & IT_ARMOR3)
draw_pic (view, 0, 0, sb_armor[2]);
else if (cl.stats[STAT_ITEMS] & IT_ARMOR2)