iikorni/quakespasm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Big net::msg conversion

Browse Source
This commit is contained in:
iikorni
2026-08-30 12:38:12 -05:00
parent 216dd1aecd
commit df2b863d72
36 changed files with 2860 additions and 2764 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Quake/net_main.cpp
+9 -10
View File
@@ -55,7 +55,7 @@ static void Slist_Poll(void *);
static PollProcedure slistSendProcedure = {NULL, 0.0, Slist_Send};
static PollProcedure slistPollProcedure = {NULL, 0.0, Slist_Poll};
sizebuf_t net_message;
net::msg net_message{};
int net_activeconnections = 0;
int messagesSent = 0;
@@ -550,7 +550,7 @@ returns 1 if the message was sent properly
returns -1 if the connection died
==================
*/
int NET_SendMessage(qsocket_t *sock, sizebuf_t *data) {
int NET_SendMessage(qsocket_t *sock, net::msg &msg) {
int r;
if (!sock)
@@ -562,7 +562,7 @@ int NET_SendMessage(qsocket_t *sock, sizebuf_t *data) {
}
SetNetTime();
r = sfunc.QSendMessage(sock, data);
r = sfunc.QSendMessage(sock, msg);
if (r == 1 && !IS_LOOP_DRIVER(sock->driver))
messagesSent++;
@@ -570,7 +570,7 @@ int NET_SendMessage(qsocket_t *sock, sizebuf_t *data) {
}
int NET_SendUnreliableMessage(qsocket_t *sock, sizebuf_t *data) {
int NET_SendUnreliableMessage(qsocket_t *sock, net::msg &msg) {
int r;
if (!sock)
@@ -582,7 +582,7 @@ int NET_SendUnreliableMessage(qsocket_t *sock, sizebuf_t *data) {
}
SetNetTime();
r = sfunc.SendUnreliableMessage(sock, data);
r = sfunc.SendUnreliableMessage(sock, msg);
if (r == 1 && !IS_LOOP_DRIVER(sock->driver))
unreliableMessagesSent++;
@@ -611,7 +611,7 @@ bool NET_CanSendMessage(qsocket_t *sock) {
}
int NET_SendToAll(sizebuf_t *data, double blocktime) {
int NET_SendToAll(net::msg &msg, double blocktime) {
double start;
int i;
int count = 0;
@@ -626,7 +626,7 @@ int NET_SendToAll(sizebuf_t *data, double blocktime) {
*/
if (host_client->netconnection && host_client->active) {
if (IS_LOOP_DRIVER(host_client->netconnection->driver)) {
NET_SendMessage(host_client->netconnection, data);
NET_SendMessage(host_client->netconnection, msg);
msg_init[i] = true;
msg_sent[i] = true;
continue;
@@ -647,7 +647,7 @@ int NET_SendToAll(sizebuf_t *data, double blocktime) {
if (!msg_init[i]) {
if (NET_CanSendMessage(host_client->netconnection)) {
msg_init[i] = true;
NET_SendMessage(host_client->netconnection, data);
NET_SendMessage(host_client->netconnection, msg);
} else {
NET_GetMessage(host_client->netconnection);
}
@@ -713,8 +713,7 @@ void NET_Init(void) {
}
// allocate space for network message buffer
SZ_Alloc(&net_message, NET_MAXMESSAGE);
net_message = net::msg{};
net_messagetimeout.inscribe();
hostname.inscribe();