From a397ef953aeefe2db443ba4959162159b8289a5c Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Wed, 19 Jun 2002 19:58:36 +0000 Subject: [PATCH] Nuke Netchan_AckPacket because it didn't really achieve its goal ('twas a server bug anyway), broke qizmo (not that I really care: that's still qizmo's bug) and (most importantly) broke recording demos across map changes. (Closes: #14) --- qw/include/net.h | 1 - qw/source/cl_parse.c | 6 ------ qw/source/cl_skin.c | 3 --- qw/source/net_chan.c | 11 ----------- 4 files changed, 21 deletions(-) diff --git a/qw/include/net.h b/qw/include/net.h index b126ca181..56e80f2bf 100644 --- a/qw/include/net.h +++ b/qw/include/net.h @@ -129,7 +129,6 @@ void Netchan_OutOfBand (netadr_t adr, int length, byte *data); void Netchan_OutOfBandPrint (netadr_t adr, const char *format, ...) __attribute__((format(printf,2,3))); qboolean Netchan_Process (netchan_t *chan); void Netchan_Setup (netchan_t *chan, netadr_t adr, int qport); -void Netchan_AckPacket (netchan_t *chan); qboolean Netchan_CanPacket (netchan_t *chan); qboolean Netchan_CanReliable (netchan_t *chan); diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c index fef91f3b0..6cead7f8a 100644 --- a/qw/source/cl_parse.c +++ b/qw/source/cl_parse.c @@ -268,9 +268,6 @@ Model_NextDownload (void) return; // started a download } - if (!cls.demoplayback) - Netchan_AckPacket (&cls.netchan); - for (i = 1; i < MAX_MODELS; i++) { char *info_key = 0; @@ -352,9 +349,6 @@ Sound_NextDownload (void) return; // started a download } - if (!cls.demoplayback) - Netchan_AckPacket (&cls.netchan); - for (i = 1; i < MAX_SOUNDS; i++) { if (!cl.sound_name[i][0]) break; diff --git a/qw/source/cl_skin.c b/qw/source/cl_skin.c index 43b9ec0f3..f41532c63 100644 --- a/qw/source/cl_skin.c +++ b/qw/source/cl_skin.c @@ -80,9 +80,6 @@ Skin_NextDownload (void) return; // started a download } - if (!cls.demoplayback) - Netchan_AckPacket (&cls.netchan); - cls.downloadtype = dl_none; // now load them in for real diff --git a/qw/source/net_chan.c b/qw/source/net_chan.c index f91d94cda..6c72661a9 100644 --- a/qw/source/net_chan.c +++ b/qw/source/net_chan.c @@ -433,14 +433,3 @@ Netchan_Process (netchan_t *chan) return true; } - -/* - Netchan_AckPacket - - Send a nop packet so that any unacked reliable packets get acked. -*/ -void -Netchan_AckPacket (netchan_t *chan) -{ - Netchan_Transmit (chan, 1, (byte*)"\001"); -}