VM_stringtokeynum: return a float, not an int

[xonotic/darkplaces.git] / view.c

diff --git a/view.c b/view.c
index fd362e5c3c39776c86abaa3836e1234f7a692280..d058112c1464e14fbd62b8a3974b80f560935d05 100644 (file)
--- a/view.c
+++ b/view.c
@@ -42,8 +42,8 @@ cvar_t cl_bobup = {CVAR_SAVE, "cl_bobup","0.5", "view bobbing adjustment that ma
 cvar_t cl_bob2 = {CVAR_SAVE, "cl_bob2","0", "sideways view bobbing amount"};
 cvar_t cl_bob2cycle = {CVAR_SAVE, "cl_bob2cycle","0.6", "sideways view bobbing speed"};
 cvar_t cl_bob2smooth = {CVAR_SAVE, "cl_bob2smooth","0.05", "how fast the view goes back when you stop touching the ground"};
-cvar_t cl_bobfall = {CVAR_SAVE, "cl_bobfall","0.05", "how much the view swings down when falling (influenced by the speed you hit the ground with)"};
-cvar_t cl_bobfallcycle = {CVAR_SAVE, "cl_bobfallcycle","0.025", "speed of the bobfall swing"};
+cvar_t cl_bobfall = {CVAR_SAVE, "cl_bobfall","0", "how much the view swings down when falling (influenced by the speed you hit the ground with)"};
+cvar_t cl_bobfallcycle = {CVAR_SAVE, "cl_bobfallcycle","3", "speed of the bobfall swing"};
 cvar_t cl_bobfallminspeed = {CVAR_SAVE, "cl_bobfallminspeed","200", "necessary amount of speed for bob-falling to occur"};
 cvar_t cl_bobmodel = {CVAR_SAVE, "cl_bobmodel", "1", "enables gun bobbing"};
 cvar_t cl_bobmodel_side = {CVAR_SAVE, "cl_bobmodel_side", "0.15", "gun bobbing sideways sway amount"};
@@ -590,7 +590,7 @@ void V_CalcRefdef (void)
                                VectorAdd(vieworg, cl.punchvector, vieworg);
                                if (cl.stats[STAT_HEALTH] > 0)
                                {
-                                       double xyspeed, bob;
+                                       double xyspeed, bob, bobfall;
                                        float cycle;
                                        vec_t frametime;
 
@@ -731,12 +731,13 @@ void V_CalcRefdef (void)
                                                else
                                                {
                                                        if(cl.bobfall_swing > 0)
-                                                               cl.bobfall_swing -= bound(0, cl_bobfallcycle.value, 1);
+                                                               cl.bobfall_swing -= bound(0, cl_bobfallcycle.value * frametime, 1);
                                                        else
                                                                cl.bobfall_swing = 0;
 
-                                                       vieworg[2] += sin(M_PI + M_PI * cl.bobfall_swing) * -cl.bobfall_speed;
-                                                       gunorg[2] += sin(M_PI + M_PI * cl.bobfall_swing) * -cl.bobfall_speed;
+                                                       bobfall = sin(M_PI + M_PI * cl.bobfall_swing) * -cl.bobfall_speed;
+                                                       vieworg[2] += bobfall;
+                                                       gunorg[2] += bobfall;
                                                }
                                        }