make DP compile with C++ again

[xonotic/darkplaces.git] / cl_input.c

diff --git a/cl_input.c b/cl_input.c
index b33a96032fc1ccabfe6c358118337a3f9caf946d..6edee3efd5fd73bcfb3d74ba8b88e7b081eef49d 100644 (file)
--- a/cl_input.c
+++ b/cl_input.c
@@ -428,7 +428,7 @@ cvar_t cl_movement_stopspeed = {0, "cl_movement_stopspeed", "100", "speed below
 cvar_t cl_movement_friction = {0, "cl_movement_friction", "4", "how fast you slow down (should match sv_friction)"};
 cvar_t cl_movement_wallfriction = {0, "cl_movement_wallfriction", "1", "how fast you slow down while sliding along a wall (should match sv_wallfriction)"};
 cvar_t cl_movement_waterfriction = {0, "cl_movement_waterfriction", "-1", "how fast you slow down (should match sv_waterfriction), if less than 0 the cl_movement_friction variable is used instead"};
-cvar_t cl_movement_edgefriction = {0, "cl_movement_edgefriction", "2", "how much to slow down when you may be about to fall off a ledge (should match edgefriction)"};
+cvar_t cl_movement_edgefriction = {0, "cl_movement_edgefriction", "1", "how much to slow down when you may be about to fall off a ledge (should match edgefriction)"};
 cvar_t cl_movement_stepheight = {0, "cl_movement_stepheight", "18", "how tall a step you can step in one instant (should match sv_stepheight)"};
 cvar_t cl_movement_accelerate = {0, "cl_movement_accelerate", "10", "how fast you accelerate (should match sv_accelerate)"};
 cvar_t cl_movement_airaccelerate = {0, "cl_movement_airaccelerate", "-1", "how fast you accelerate while in the air (should match sv_airaccelerate), if less than 0 the cl_movement_accelerate variable is used instead"};
@@ -1283,11 +1283,11 @@ void QW_MSG_WriteDeltaUsercmd(sizebuf_t *buf, usercmd_t *from, usercmd_t *to)
        if (bits & QW_CM_ANGLE3)
                MSG_WriteAngle16i(buf, to->viewangles[2]);
        if (bits & QW_CM_FORWARD)
-               MSG_WriteShort(buf, to->forwardmove);
+               MSG_WriteShort(buf, (short) to->forwardmove);
        if (bits & QW_CM_SIDE)
-               MSG_WriteShort(buf, to->sidemove);
+               MSG_WriteShort(buf, (short) to->sidemove);
        if (bits & QW_CM_UP)
-               MSG_WriteShort(buf, to->upmove);
+               MSG_WriteShort(buf, (short) to->upmove);
        if (bits & QW_CM_BUTTONS)
                MSG_WriteByte(buf, to->buttons);
        if (bits & QW_CM_IMPULSE)