added sv_waterfriction, sv_airaccelerate, sv_wateraccelerate cvars (and corresponding...

[xonotic/darkplaces.git] / netconn.c

diff --git a/netconn.c b/netconn.c
index 8e9652151e35a878fb9a80416fde303edaabc419..22f4e749d9f8ec55c7584d47e3010ac8a0b059cb 100755 (executable)
--- a/netconn.c
+++ b/netconn.c
@@ -504,6 +504,8 @@ int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data, protocolvers
                {
                        *((short *)(sendbuffer + 8)) = LittleShort(cls.qw_qport);
                        packetLen += 2;
+                       // also update cls.qw_outgoing_sequence
+                       cls.qw_outgoing_sequence = conn->qw.outgoing_sequence;
                }
                if (packetLen + (sendreliable ? conn->sendMessageLength : 0) > 1400)
                {
@@ -890,6 +892,8 @@ static int NetConn_ReceivedMessage(netconn_t *conn, unsigned char *data, int len
                        reliableMessagesReceived++;
                }
                conn->qw.incoming_sequence = sequence;
+               if (conn == cls.netcon)
+                       cls.qw_incoming_sequence = conn->qw.incoming_sequence;
                conn->qw.incoming_acknowledged = sequence_ack;
                conn->qw.incoming_reliable_acknowledged = reliable_ack;
                if (reliable_message)
@@ -2241,7 +2245,7 @@ void NetConn_QueryMasters(qboolean querydp, qboolean queryqw)
                                                        Con_Printf("Querying master %s (resolved from %s)\n", lookupstring, sv_qwmasters[masternum].string);
                                                }
                                                masterquerycount++;
-                                               NetConn_Write(cl_sockets[i], request, strlen(request) + 1, &masteraddress);
+                                               NetConn_Write(cl_sockets[i], request, (int)strlen(request) + 1, &masteraddress);
                                        }
                                }
                        }