qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 15:22:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

a bit more netchan cleanup

Browse source
This commit is contained in:
Bill Currie 2004-02-19 23:06:47 +00:00
parent 029257f5d0
commit 0e1a9e5082
5 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/netchan.h
View file

@ -138,6 +138,7 @@ typedef struct
extern int net_drop; // packets dropped before this one
extern int net_nochoke; // don't choke packets
extern int net_blocksend; // don't send packets (used by client for demos)
extern double *net_realtime;
void Netchan_Init (void);
void Netchan_Init_Cvars (void);

19
libs/net/net_chan.c
View file

@ -106,6 +106,7 @@ static __attribute__ ((unused)) const char rcsid[] =
int net_drop;
int net_nochoke;
int net_blocksend;
double *net_realtime;
cvar_t *showpackets;
cvar_t *showdrop;
cvar_t *qport;
@ -193,7 +194,7 @@ Netchan_Setup (netchan_t *chan, netadr_t adr, int qport, int flags)
memset (chan, 0, sizeof (*chan));
chan->remote_address = adr;
chan->last_received = realtime;
chan->last_received = *net_realtime;
chan->message.data = chan->message_buf;
chan->message.allowoverflow = true;
@ -215,7 +216,7 @@ Netchan_Setup (netchan_t *chan, netadr_t adr, int qport, int flags)
qboolean
Netchan_CanPacket (netchan_t *chan)
{
if (chan->cleartime < realtime + MAX_BACKUP * chan->rate)
if (chan->cleartime < *net_realtime + MAX_BACKUP * chan->rate)
return true;
return false;
}
@ -301,18 +302,18 @@ Netchan_Transmit (netchan_t *chan, int length, byte *data)
// send the datagram
i = chan->outgoing_sequence & (MAX_LATENT - 1);
chan->outgoing_size[i] = send.cursize;
chan->outgoing_time[i] = realtime;
chan->outgoing_time[i] = *net_realtime;
// zoid, no input in demo playback mode
if (!net_blocksend)
Netchan_SendPacket (send.cursize, send.data, chan->remote_address);
if (chan->cleartime < realtime)
chan->cleartime = realtime + send.cursize * chan->rate;
if (chan->cleartime < *net_realtime)
chan->cleartime = *net_realtime + send.cursize * chan->rate;
else
chan->cleartime += send.cursize * chan->rate;
if (net_nochoke)
chan->cleartime = realtime;
chan->cleartime = *net_realtime;
if (showpackets->int_val)
Con_Printf ("--> s=%i(%i) a=%i(%i) %i\n", chan->outgoing_sequence,
@ -362,7 +363,7 @@ Netchan_Process (netchan_t *chan)
double time, rate;
i = sequence_ack & (MAX_LATENT - 1);
time = realtime - chan->outgoing_time[i];
time = *net_realtime - chan->outgoing_time[i];
time -= 0.1; // subtract 100 ms
if (time <= 0) { // gotta be a digital link for <100
// ms ping
@ -420,10 +421,10 @@ Netchan_Process (netchan_t *chan)
chan->frame_latency = chan->frame_latency * OLD_AVG
+ (chan->outgoing_sequence - sequence_ack) * (1.0 - OLD_AVG);
chan->frame_rate = chan->frame_rate * OLD_AVG
+ (realtime - chan->last_received) * (1.0 - OLD_AVG);
+ (*net_realtime - chan->last_received) * (1.0 - OLD_AVG);
chan->good_count += 1;
chan->last_received = realtime;
chan->last_received = *net_realtime;
return true;
}

3
qtv/source/qtv.c
View file

@ -55,12 +55,9 @@ static plugin_list_t server_plugin_list[] = {
SERVER_PLUGIN_LIST
};
double realtime;
cvar_t *net_packetlog;
void Log_Outgoing_Packet (const char *p, int len, int has_sequence);
void Log_Incoming_Packet (const char *p, int len, int has_sequence);
void Log_Outgoing_Packet (const char *p, int len, int has_sequence) { }
void Log_Incoming_Packet (const char *p, int len, int has_sequence) { }
cbuf_t *qtv_cbuf;

1
qw/source/cl_main.c
View file

@ -1723,6 +1723,7 @@ Host_Init (void)
NET_Init (cl_port->int_val);
Netchan_Init ();
net_realtime = &realtime;
{
static const char *sound_precache[MAX_MODELS];
int i;

1
qw/source/sv_main.c
View file

@ -2416,6 +2416,7 @@ SV_InitNet (void)
NET_Init (port);
Netchan_Init ();
net_realtime = &realtime;
Net_Log_Init (sv.sound_precache);