From: divverent Date: Fri, 16 Jul 2010 22:24:29 +0000 (+0000) Subject: More progress, still nothing considerable X-Git-Tag: xonotic-v0.1.0preview~332 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=09b8cea5d74ad1eeeea3311be101ac10423fd13b;p=xonotic%2Fdarkplaces.git More progress, still nothing considerable From: MirceaKitsune git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10339 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=64832afd3bbc0e242cc37c6f65c6413da73a0bb9 --- diff --git a/client.h b/client.h index 266a99df..6123587b 100644 --- a/client.h +++ b/client.h @@ -975,6 +975,7 @@ typedef struct client_state_s float bob2_smooth; float ground_hit_speed; + float ground_hit_target; // don't change view angle, full screen, etc int intermission; diff --git a/view.c b/view.c index 81a448fe..0cd7b478 100644 --- a/view.c +++ b/view.c @@ -716,15 +716,17 @@ void V_CalcRefdef (void) // TEST!!! - float ground_hit_target; // get the speed while in the air, apply it while we're not if (!cl.onground) - cl.ground_hit_speed = bound(0, cl.velocity[2] * 0.1, 400); // replace 0.1 with cvar + { + cl.ground_hit_speed = 0; + cl.ground_hit_target = cl.velocity[2] * 0.1; // replace 0.1 with cvar + } else { - if(cl.ground_hit_speed > ground_hit_target) + if(cl.ground_hit_speed > cl.ground_hit_target) cl.ground_hit_speed -= 0.1; // replace 0.1 with cvar - if(cl.ground_hit_speed < ground_hit_target) + if(cl.ground_hit_speed < cl.ground_hit_target) cl.ground_hit_speed += 0.1; // replace 0.1 with cvar vieworg[2] += cl.ground_hit_speed;