X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=view.c;h=73acc74efdb06f04cc2e5647136ad61ed7b482c6;hb=7977ef74dc79b00067952417dd4252ed3ebcbadb;hp=cf4513648ab969958376bc76d640489921082a30;hpb=5bd42a1b347e5d2d03c8d0b96910aa883133331c;p=xonotic%2Fdarkplaces.git diff --git a/view.c b/view.c index cf451364..73acc74e 100644 --- a/view.c +++ b/view.c @@ -70,7 +70,7 @@ cvar_t chase_active = {CVAR_SAVE, "chase_active", "0", "enables chase cam"}; cvar_t chase_stevie = {0, "chase_stevie", "0", "chase cam view from above (used only by GoodVsBad2)"}; cvar_t v_deathtilt = {0, "v_deathtilt", "1", "whether to use sideways view when dead"}; -cvar_t v_deathtiltangle = {0, "v_deathtilt", "80", "what roll angle to use when tilting the view while dead"}; +cvar_t v_deathtiltangle = {0, "v_deathtiltangle", "80", "what roll angle to use when tilting the view while dead"}; float v_dmg_time, v_dmg_roll, v_dmg_pitch; @@ -406,7 +406,7 @@ void V_CalcRefdef (void) chase_dest[0] = vieworg[0] + forward[0] * dist; chase_dest[1] = vieworg[1] + forward[1] * dist; chase_dest[2] = vieworg[2] + forward[2] * dist + camup; - trace = CL_TraceBox(vieworg, vec3_origin, vec3_origin, chase_dest, true, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_SKY, false); + trace = CL_TraceBox(vieworg, vec3_origin, vec3_origin, chase_dest, true, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY, false); VectorMAMAM(1, trace.endpos, 8, forward, 4, trace.plane.normal, vieworg); } else @@ -430,7 +430,7 @@ void V_CalcRefdef (void) { double xyspeed, bob; - xyspeed = sqrt(cl.velocity[0]*cl.velocity[0] + cl.velocity[1]*cl.velocity[1]); + xyspeed = sqrt(cl.movement_velocity[0]*cl.movement_velocity[0] + cl.movement_velocity[1]*cl.movement_velocity[1]); if (cl_bob.value && cl_bobcycle.value) { float cycle;