qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-17 01:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

map changes now work through a proxy

Browse source
This commit is contained in:
Bill Currie 2010-01-13 06:52:15 +00:00 committed by Jeff Teunissen
parent 3a3b55f15b
commit 37e52bad71
5 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qtv/include/client.h
View file

@ -73,7 +73,7 @@ typedef struct challenge_s {
void Client_Init (void); void Client_Init (void);
void Client_NewConnection (void); void Client_NewConnection (void);
void Client_SendMessages (client_t *cl);
void Client_New (client_t *cl); void Client_New (client_t *cl);
void Client_Frame (void); void Client_Frame (void);

4
qtv/include/server.h
View file

@ -110,7 +110,9 @@ void Server_Frame (void);
void Server_List (void); void Server_List (void);
void Server_Connect (const char *name, struct client_s *client); void Server_Connect (const char *name, struct client_s *client);
void Server_Disconnect (struct client_s *client); void Server_Disconnect (struct client_s *client);
void Server_Broadcast (server_t *sv, int reliable, byte *msg, int len); void Server_Broadcast (server_t *sv, int reliable, int all, const byte *msg,
int len);
void Server_BroadcastCommand (server_t *sv, const char *cmd);
struct qmsg_s; struct qmsg_s;
void sv_parse (server_t *sv, struct msg_s *msg, int reliable); void sv_parse (server_t *sv, struct msg_s *msg, int reliable);

14
qtv/source/client.c
View file

@ -86,8 +86,12 @@ client_drop (client_t *cl)
static void static void
cl_new_f (client_t *cl, void *unused) cl_new_f (client_t *cl, void *unused)
{ {
qtv_printf ("\"cmd list\" for a list of servers\n"); if (!cl->server) {
qtv_printf ("\"cmd connect <servername>\" to connect to a server\n"); qtv_printf ("\"cmd list\" for a list of servers\n");
qtv_printf ("\"cmd connect <servername>\" to connect to a server\n");
} else {
Client_New (cl);
}
} }
static void static void
@ -1051,8 +1055,8 @@ write_players (client_t *client, sizebuf_t *msg)
} }
} }
static void void
cl_send_messages (client_t *cl) Client_SendMessages (client_t *cl)
{ {
byte buf[MAX_DATAGRAM]; byte buf[MAX_DATAGRAM];
sizebuf_t msg; sizebuf_t msg;
@ -1266,7 +1270,7 @@ Client_Frame (void)
continue; continue;
} }
if (cl->send_message) { if (cl->send_message) {
cl_send_messages (cl); Client_SendMessages (cl);
cl->send_message = false; cl->send_message = false;
} }
c = &(*c)->clnext; c = &(*c)->clnext;

14
qtv/source/server.c
View file

@ -601,7 +601,8 @@ Server_Disconnect (struct client_s *client)
} }
void void
Server_Broadcast (server_t *sv, int reliable, byte *msg, int len) Server_Broadcast (server_t *sv, int reliable, int all, const byte *msg,
int len)
{ {
client_t *cl; client_t *cl;
byte svc; byte svc;
@ -611,7 +612,8 @@ Server_Broadcast (server_t *sv, int reliable, byte *msg, int len)
svc = *msg++; svc = *msg++;
len--; len--;
for (cl = sv->clients; cl; cl = cl->next) { for (cl = sv->clients; cl; cl = cl->next) {
if ((sv->player_mask != ~0u) && !(sv->player_mask & cl->spec_track)) if (!all && (sv->player_mask != ~0u)
&& !(sv->player_mask & cl->spec_track))
continue; continue;
if (reliable) { if (reliable) {
MSG_ReliableWrite_Begin (&cl->backbuf, svc, len + 1); MSG_ReliableWrite_Begin (&cl->backbuf, svc, len + 1);
@ -621,3 +623,11 @@ Server_Broadcast (server_t *sv, int reliable, byte *msg, int len)
} }
} }
} }
void
Server_BroadcastCommand (server_t *sv, const char *cmd)
{
const char *msg = va ("%c%s", svc_stufftext, cmd);
int len = strlen (msg) + 1;
Server_Broadcast (sv, 1, 1, (const byte *) msg, len);
}

8
qtv/source/sv_parse.c
View file

@ -211,16 +211,22 @@ sv_skins_f (server_t *sv)
sv->frames[i].entities.entities = sv->entity_states[i]; sv->frames[i].entities.entities = sv->entity_states[i];
sv->frames[i].players.players = sv->player_states[i]; sv->frames[i].players.players = sv->player_states[i];
} }
Server_BroadcastCommand (sv, "reconnect\n");
} }
static void static void
sv_changing_f (server_t *sv) sv_changing_f (server_t *sv)
{ {
client_t *cl;
sv->connected = 1; sv->connected = 1;
sv->num_signon_buffers = 0; sv->num_signon_buffers = 0;
qtv_printf ("Changing map...\n"); qtv_printf ("Changing map...\n");
MSG_WriteByte (&sv->netchan.message, qtv_nop); MSG_WriteByte (&sv->netchan.message, qtv_nop);
sv->next_run = realtime; sv->next_run = realtime;
Server_BroadcastCommand (sv, "changing\n");
for (cl = sv->clients; cl; cl = cl->next)
Client_SendMessages (cl);
} }
static void static void
@ -1062,7 +1068,7 @@ sv_parse (server_t *sv, qmsg_t *msg, int reliable)
} }
if (send) { if (send) {
bc_len = msg->readcount - bc_len; bc_len = msg->readcount - bc_len;
Server_Broadcast (sv, reliable, bc_data, bc_len); Server_Broadcast (sv, reliable, 0, bc_data, bc_len);
} }
} }
} }