now shows status messages in join game menu when a server is typed in manually (it...

[xonotic/darkplaces.git] / view.c

diff --git a/view.c b/view.c
index b47112d6fa3eb69f09c683bea9c75cee066d06a2..060464ac7d2f72dfdba61068782e2566379f628b 100644 (file)
--- a/view.c
+++ b/view.c
@@ -214,7 +214,7 @@ void V_ParseDamage (void)
 
        armor = MSG_ReadByte ();
        blood = MSG_ReadByte ();
-       MSG_ReadVector(from);
+       MSG_ReadVector(from, cl.protocol);
 
        count = blood*0.5 + armor*0.5;
        if (count < 10)
@@ -334,11 +334,17 @@ void V_CalcRefdef (void)
                        VectorCopy(cl.viewangles, viewangles);
 
                        // stair smoothing
+                       //Con_Printf("cl.onground %i oldz %f newz %f\n", cl.onground, oldz, vieworg[2]);
                        if (cl.onground && oldz < vieworg[2])
                        {
                                oldz += (cl.time - cl.oldtime) * cl_stairsmoothspeed.value;
                                oldz = vieworg[2] = bound(vieworg[2] - 16, oldz, vieworg[2]);
                        }
+                       else if (cl.onground && oldz > vieworg[2])
+                       {
+                               oldz -= (cl.time - cl.oldtime) * cl_stairsmoothspeed.value;
+                               oldz = vieworg[2] = bound(vieworg[2], oldz, vieworg[2] + 16);
+                       }
                        else
                                oldz = vieworg[2];