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/host.cpp
+24 -27
View File
@@ -333,8 +333,8 @@ void SV_ClientPrintf(const char *fmt, ...) {
q_vsnprintf(string, sizeof(string), fmt, argptr);
va_end(argptr);
MSG_WriteByte(&host_client->message, svc_print);
MSG_WriteString(&host_client->message, string);
host_client->message.write_byte(svc_print);
host_client->message.write_string(string);
}
/*
@@ -355,8 +355,8 @@ void SV_BroadcastPrintf(const char *fmt, ...) {
for (i = 0; i < svs.maxclients; i++) {
if (svs.clients[i].active && svs.clients[i].spawned) {
MSG_WriteByte(&svs.clients[i].message, svc_print);
MSG_WriteString(&svs.clients[i].message, string);
svs.clients[i].message.write_byte(svc_print);
svs.clients[i].message.write_string(string);
}
}
}
@@ -376,8 +376,8 @@ void Host_ClientCommands(const char *fmt, ...) {
q_vsnprintf(string, sizeof(string), fmt, argptr);
va_end(argptr);
MSG_WriteByte(&host_client->message, svc_stufftext);
MSG_WriteString(&host_client->message, string);
host_client->message.write_byte(svc_stufftext);
host_client->message.write_string(string);
}
/*
@@ -396,8 +396,8 @@ void SV_DropClient(bool crash) {
if (!crash) {
// send any final messages (don't check for errors)
if (NET_CanSendMessage(host_client->netconnection)) {
MSG_WriteByte(&host_client->message, svc_disconnect);
NET_SendMessage(host_client->netconnection, &host_client->message);
host_client->message.write_byte(svc_disconnect);
NET_SendMessage(host_client->netconnection, host_client->message);
}
if (host_client->edict && host_client->spawned) {
@@ -426,15 +426,15 @@ void SV_DropClient(bool crash) {
for (i = 0, client = svs.clients; i < svs.maxclients; i++, client++) {
if (!client->active)
continue;
MSG_WriteByte(&client->message, svc_updatename);
MSG_WriteByte(&client->message, host_client - svs.clients);
MSG_WriteString(&client->message, "");
MSG_WriteByte(&client->message, svc_updatefrags);
MSG_WriteByte(&client->message, host_client - svs.clients);
MSG_WriteShort(&client->message, 0);
MSG_WriteByte(&client->message, svc_updatecolors);
MSG_WriteByte(&client->message, host_client - svs.clients);
MSG_WriteByte(&client->message, 0);
client->message.write_byte(svc_updatename);
client->message.write_byte(host_client - svs.clients);
client->message.write_string("");
client->message.write_byte(svc_updatefrags);
client->message.write_byte(host_client - svs.clients);
client->message.write_short(0);
client->message.write_byte(svc_updatecolors);
client->message.write_byte(host_client - svs.clients);
client->message.write_byte(0);
}
}
@@ -448,8 +448,7 @@ This only happens at the end of a game, not between levels
void Host_ShutdownServer(bool crash) {
int i;
int count;
sizebuf_t buf;
byte message[4];
net::msg msg{};
double start;
if (!sv.active)
@@ -466,10 +465,10 @@ void Host_ShutdownServer(bool crash) {
do {
count = 0;
for (i = 0, host_client = svs.clients; i < svs.maxclients; i++, host_client++) {
if (host_client->active && host_client->message.cursize) {
if (host_client->active && !host_client->message.empty()) {
if (NET_CanSendMessage(host_client->netconnection)) {
NET_SendMessage(host_client->netconnection, &host_client->message);
SZ_Clear(&host_client->message);
NET_SendMessage(host_client->netconnection, host_client->message);
host_client->message.clear();
} else {
NET_GetMessage(host_client->netconnection);
count++;
@@ -481,11 +480,9 @@ void Host_ShutdownServer(bool crash) {
} while (count);
// make sure all the clients know we're disconnecting
buf.data = message;
buf.maxsize = 4;
buf.cursize = 0;
MSG_WriteByte(&buf, svc_disconnect);
count = NET_SendToAll(&buf, 5.0);
msg.write_byte(svc_disconnect);
count = NET_SendToAll(msg, 5.0);
if (count)
console::info("Host_ShutdownServer: NET_SendToAll failed for %u clients\n", count);