split model->DrawShadowVolume into CompileShadowVolume and DrawShadowVolume to simpli...

[xonotic/darkplaces.git] / sv_user.c

diff --git a/sv_user.c b/sv_user.c
index ef51038a78dc5b1306245d75e5ee824edd00cd05..8f85c2f543fb18ef576a6052ea9f5f3e6cbe7f9f 100644 (file)
--- a/sv_user.c
+++ b/sv_user.c
@@ -25,6 +25,7 @@ cvar_t sv_edgefriction = {0, "edgefriction", "2"};
 cvar_t sv_deltacompress = {0, "sv_deltacompress", "1"};
 cvar_t sv_idealpitchscale = {0, "sv_idealpitchscale","0.8"};
 cvar_t sv_maxspeed = {CVAR_NOTIFY, "sv_maxspeed", "320"};
+cvar_t sv_maxairspeed = {0, "sv_maxairspeed", "30"};
 cvar_t sv_accelerate = {0, "sv_accelerate", "10"};
 
 static usercmd_t cmd;
@@ -176,8 +177,8 @@ void SV_AirAccelerate (vec3_t wishveloc)
        float addspeed, wishspd, accelspeed, currentspeed;
 
        wishspd = VectorNormalizeLength (wishveloc);
-       if (wishspd > 30)
-               wishspd = 30;
+       if (wishspd > sv_maxairspeed.value)
+               wishspd = sv_maxairspeed.value;
        currentspeed = DotProduct (host_client->edict->fields.server->velocity, wishveloc);
        addspeed = wishspd - currentspeed;
        if (addspeed <= 0)
@@ -603,6 +604,7 @@ SV_ReadClientMove
 ===================
 */
 extern void SV_Physics_Entity (prvm_edict_t *ent, qboolean runmove);
+void SV_ApplyClientMove (void);
 void SV_ReadClientMove (void)
 {
        int i;
@@ -649,9 +651,7 @@ void SV_ReadClientMove (void)
        if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
 
        // read impulse
-       i = MSG_ReadByte ();
-       if (i)
-               move->impulse = i;
+       move->impulse = MSG_ReadByte ();
        if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
 
        // PRYDON_CLIENTCURSOR
@@ -683,6 +683,8 @@ void SV_ReadClientMove (void)
                memset(move, 0, sizeof(*move));
        else
        {
+               // apply the latest accepted move to the entity fields
+               SV_ApplyClientMove();
                host_client->movesequence = move->sequence;
                if (host_client->movesequence)
                {
@@ -699,22 +701,28 @@ void SV_ReadClientMove (void)
 
 void SV_ApplyClientMove (void)
 {
+#ifdef NUM_PING_TIMES
        int i;
-       prvm_eval_t *val;
        float total;
+#endif
+       prvm_eval_t *val;
        usercmd_t *move = &host_client->cmd;
 
        // calculate average ping time
+       host_client->ping = move->receivetime - move->time;
+#ifdef NUM_PING_TIMES
        host_client->ping_times[host_client->num_pings % NUM_PING_TIMES] = move->receivetime - move->time;
        host_client->num_pings++;
        for (i=0, total = 0;i < NUM_PING_TIMES;i++)
                total += host_client->ping_times[i];
        host_client->ping = total / NUM_PING_TIMES;
+#endif
 
        // set the edict fields
        host_client->edict->fields.server->button0 = move->buttons & 1;
        host_client->edict->fields.server->button2 = (move->buttons & 2)>>1;
-       host_client->edict->fields.server->impulse = move->impulse;
+       if (move->impulse)
+               host_client->edict->fields.server->impulse = move->impulse;
        VectorCopy(move->viewangles, host_client->edict->fields.server->v_angle);
        if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_button3))) val->_float = ((move->buttons >> 2) & 1);
        if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_button4))) val->_float = ((move->buttons >> 3) & 1);