fix compile failure in crypto.c

[xonotic/darkplaces.git] / sv_user.c

diff --git a/sv_user.c b/sv_user.c
index b545b8b9d8489073929092532ca563d987f2af9d..548a1298dd62eafa2469e84d2c283d64201c81a3 100644 (file)
--- a/sv_user.c
+++ b/sv_user.c
@@ -553,8 +553,8 @@ void SV_ReadClientMove (void)
                        if(host_client->movement_highestsequence_seen)
                        {
                                // mark moves in between as lost
-                               if(move->sequence - host_client->movement_highestsequence_seen < NETGRAPH_PACKETS)
-                                       for(i = host_client->movement_highestsequence_seen; i < move->sequence; ++i)
+                               if(move->sequence - host_client->movement_highestsequence_seen - 1 < NETGRAPH_PACKETS)
+                                       for(i = host_client->movement_highestsequence_seen + 1; i < move->sequence; ++i)
                                                host_client->movement_count[i % NETGRAPH_PACKETS] = -1;
                                else
                                        memset(host_client->movement_count, -1, sizeof(host_client->movement_count));
@@ -620,8 +620,19 @@ void SV_ExecuteClientMoves(void)
                                // discard (treat like lost) moves with too low distance from
                                // the previous one to prevent hacks using float inaccuracy
                                // clients will see this as packet loss in the netgraph
+                               // this should also apply if a move cannot get
+                               // executed because it came too late and
+                               // already was performed serverside
                                if(moveframetime < 0.0005)
+                               {
+                                       // count the move as LOST if we don't
+                                       // execute it but it has higher
+                                       // sequence count
+                                       if(host_client->movesequence)
+                                               if(move->sequence > host_client->movesequence)
+                                                       host_client->movement_count[(move->sequence) % NETGRAPH_PACKETS] = -1;
                                        continue;
+                               }
 
                                //Con_Printf("movesequence = %i (%i lost), moveframetime = %f\n", move->sequence, move->sequence ? move->sequence - host_client->movesequence - 1 : 0, moveframetime);
                                host_client->cmd = *move;
@@ -696,6 +707,7 @@ void SV_ApplyClientMove (void)
 {
        prvm_eval_t *val;
        usercmd_t *move = &host_client->cmd;
+       int j, movementloss, packetloss;
 
        if (!move->receivetime)
                return;
@@ -714,6 +726,18 @@ void SV_ApplyClientMove (void)
                host_client->edict->fields.server->impulse = move->impulse;
        // only send the impulse to qc once
        move->impulse = 0;
+
+       movementloss = packetloss = 0;
+       if(host_client->netconnection)
+       {
+               for (j = 0;j < NETGRAPH_PACKETS;j++)
+                       if (host_client->netconnection->incoming_netgraph[j].unreliablebytes == NETGRAPH_LOSTPACKET)
+                               packetloss++;
+               for (j = 0;j < NETGRAPH_PACKETS;j++)
+                       if (host_client->movement_count[j] < 0)
+                               movementloss++;
+       }
+
        VectorCopy(move->viewangles, host_client->edict->fields.server->v_angle);
        if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button3))) val->_float = ((move->buttons >> 2) & 1);
        if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button4))) val->_float = ((move->buttons >> 3) & 1);
@@ -738,6 +762,8 @@ void SV_ApplyClientMove (void)
        if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.cursor_trace_endpos))) VectorCopy(move->cursor_impact, val->vector);
        if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.cursor_trace_ent))) val->edict = PRVM_EDICT_TO_PROG(PRVM_EDICT_NUM(move->cursor_entitynumber));
        if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.ping))) val->_float = host_client->ping * 1000.0;
+       if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.packetloss))) val->_float = packetloss / (float) NETGRAPH_PACKETS;
+       if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.movementloss))) val->_float = movementloss / (float) NETGRAPH_PACKETS;
 }
 
 void SV_FrameLost(int framenum)
@@ -805,7 +831,9 @@ void SV_ReadClientMessage(void)
                switch (cmd)
                {
                default:
-                       Con_Printf("SV_ReadClientMessage: unknown command char %i\n", cmd);
+                       Con_Printf("SV_ReadClientMessage: unknown command char %i (at offset 0x%x)\n", cmd, msg_readcount);
+                       if (developer_networking.integer)
+                               Com_HexDumpToConsole(net_message.data, net_message.cursize);
                        SV_DropClient (false);
                        return;
 
@@ -851,7 +879,7 @@ void SV_ReadClientMessage(void)
 
 clc_stringcmd_invalid:
                        Con_Printf("Received invalid stringcmd from %s\n", host_client->name);
-                       if(developer.integer)
+                       if(developer.integer > 0)
                                Com_HexDumpToConsole((unsigned char *) s, strlen(s));
                        break;