Removed myself from all the todo items. I no longer mind if none of these are ever...

[xonotic/darkplaces.git] / view.c

diff --git a/view.c b/view.c
index 72806f5901428acaf07d285eb907467e0ecc3cd7..9c3512286b4c11dd4f65f9043b781a8c3defe88e 100644 (file)
--- a/view.c
+++ b/view.c
@@ -155,7 +155,7 @@ void V_DriftPitch (void)
                if ( fabs(cl.cmd.forwardmove) < cl_forwardspeed.value)
                        cl.driftmove = 0;
                else
-                       cl.driftmove += cl.frametime;
+                       cl.driftmove += cl.realframetime;
 
                if ( cl.driftmove > v_centermove.value)
                {
@@ -172,8 +172,8 @@ void V_DriftPitch (void)
                return;
        }
 
-       move = cl.frametime * cl.pitchvel;
-       cl.pitchvel += cl.frametime * v_centerspeed.value;
+       move = cl.realframetime * cl.pitchvel;
+       cl.pitchvel += cl.realframetime * v_centerspeed.value;
 
        if (delta > 0)
        {
@@ -230,7 +230,7 @@ void V_ParseDamage (void)
 
        cl.faceanimtime = cl.time + 0.2;                // put sbar face into pain frame
 
-       cl.cshifts[CSHIFT_DAMAGE].percent += (int)(3*count);
+       cl.cshifts[CSHIFT_DAMAGE].percent += 3*count;
        if (cl.cshifts[CSHIFT_DAMAGE].percent < 0)
                cl.cshifts[CSHIFT_DAMAGE].percent = 0;
        if (cl.cshifts[CSHIFT_DAMAGE].percent > 150)
@@ -276,10 +276,10 @@ V_cshift_f
 */
 static void V_cshift_f (void)
 {
-       v_cshift.destcolor[0] = atoi(Cmd_Argv(1));
-       v_cshift.destcolor[1] = atoi(Cmd_Argv(2));
-       v_cshift.destcolor[2] = atoi(Cmd_Argv(3));
-       v_cshift.percent = atoi(Cmd_Argv(4));
+       v_cshift.destcolor[0] = atof(Cmd_Argv(1));
+       v_cshift.destcolor[1] = atof(Cmd_Argv(2));
+       v_cshift.destcolor[2] = atof(Cmd_Argv(3));
+       v_cshift.percent = atof(Cmd_Argv(4));
 }
 
 
@@ -421,7 +421,7 @@ void V_CalcRefdef (void)
                                {
                                        viewangles[ROLL] += v_dmg_time/v_kicktime.value*v_dmg_roll;
                                        viewangles[PITCH] += v_dmg_time/v_kicktime.value*v_dmg_pitch;
-                                       v_dmg_time -= cl.frametime;
+                                       v_dmg_time -= cl.realframetime;
                                }
                                // origin
                                VectorAdd(vieworg, cl.punchvector, vieworg);
@@ -511,11 +511,11 @@ void V_CalcRefdef (void)
 void V_FadeViewFlashs(void)
 {
        // drop the damage value
-       cl.cshifts[CSHIFT_DAMAGE].percent -= (int)((cl.time - cl.oldtime)*150);
+       cl.cshifts[CSHIFT_DAMAGE].percent -= (cl.time - cl.oldtime)*150;
        if (cl.cshifts[CSHIFT_DAMAGE].percent <= 0)
                cl.cshifts[CSHIFT_DAMAGE].percent = 0;
        // drop the bonus value
-       cl.cshifts[CSHIFT_BONUS].percent -= (int)((cl.time - cl.oldtime)*100);
+       cl.cshifts[CSHIFT_BONUS].percent -= (cl.time - cl.oldtime)*100;
        if (cl.cshifts[CSHIFT_BONUS].percent <= 0)
                cl.cshifts[CSHIFT_BONUS].percent = 0;
 }
@@ -559,7 +559,7 @@ void V_CalcViewBlend(void)
                                cl.cshifts[CSHIFT_CONTENTS].destcolor[1] = 80;
                                cl.cshifts[CSHIFT_CONTENTS].destcolor[2] = 50;
                        }
-                       cl.cshifts[CSHIFT_CONTENTS].percent = 150 >> 1;
+                       cl.cshifts[CSHIFT_CONTENTS].percent = 150 * 0.5;
                }
                else
                {