Clean up some diff noise.

This commit is contained in:
Bill Currie 2012-05-21 22:00:58 +09:00
parent 96785ccec7
commit e7c3ae911f
3 changed files with 5 additions and 10 deletions

View file

@ -90,7 +90,7 @@ SCR_CShift (void)
}
static SCR_Func scr_funcs_normal[] = {
0, //Draw_Crosshair
0, //Draw_Crosshair,
0, //SCR_DrawRam,
SCR_DrawNet,
0, //SCR_DrawTurtle,

View file

@ -1,5 +1,5 @@
/*
r_view.c
cl_view.c
player eye positioning
@ -50,7 +50,6 @@
especially when crossing a water boudnary.
*/
cvar_t *scr_ofsx;
cvar_t *scr_ofsy;
cvar_t *scr_ofsz;
@ -80,7 +79,6 @@ cvar_t *v_idlescale;
float v_dmg_time, v_dmg_roll, v_dmg_pitch;
cshift_t cshift_empty = { {130, 80, 50}, 0};
cshift_t cshift_water = { {130, 80, 50}, 128};
cshift_t cshift_slime = { {0, 25, 5}, 150};
@ -303,6 +301,7 @@ V_BonusFlash_f (void)
if (!cl_cshift_bonus->int_val
&& !(cl.sv_cshifts & INFO_CSHIFT_BONUS))
return;
cl.cshifts[CSHIFT_BONUS] = cshift_bonus;
}
@ -584,7 +583,6 @@ V_CalcViewRoll (void)
r_data->refdef->viewangles[ROLL] = 80; // dead view angle
return;
}
}
static void

View file

@ -80,7 +80,6 @@ cvar_t *v_idlescale;
float v_dmg_time, v_dmg_roll, v_dmg_pitch;
frame_t *view_frame;
player_state_t *view_message;
@ -91,12 +90,11 @@ cshift_t cshift_lava = { {255, 80, 0}, 150};
cshift_t cshift_bonus = { {215, 186, 60}, 50};
float
V_CalcRoll (const vec3_t angles, const vec3_t velocity)
{
float side, sign, value;
vec3_t forward, right, up;
float side, sign, value;
vec3_t forward, right, up;
AngleVectors (angles, forward, right, up);
side = DotProduct (velocity, right);
@ -608,7 +606,6 @@ V_CalcRefdef (void)
// refresh position from simulated origin
VectorCopy (cl.simorg, r_data->refdef->vieworg);
r_data->refdef->vieworg[2] += bob;
// never let it sit exactly on a node line, because a water plane can