From cdd3516f0b363ae9540a9d2ffa5c5d0cfc66bd8c Mon Sep 17 00:00:00 2001 From: NepDisk Date: Thu, 13 Mar 2025 01:46:37 -0400 Subject: [PATCH] Remove CLIENTBACKUPTICS Removes the second part added by https://git.do.srb2.org/KartKrew/RingRacers/-/commit/6e7adedaa0378678f2303e0357e98f948d67209b This is to be closer to kart and to remove some freezes I sometimes feel --- src/d_clisrv.c | 10 +++++----- src/d_clisrv.h | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index c9edef5c3..8d9cd3c21 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -4902,8 +4902,8 @@ static void HandlePacketFromPlayer(SINT8 node) txtpak = (UINT8 *)&netbuffer->u.serverpak.cmds[netbuffer->u.serverpak.numslots * netbuffer->u.serverpak.numtics]; - if (realend > gametic + CLIENTBACKUPTICS) - realend = gametic + CLIENTBACKUPTICS; + if (realend > gametic + BACKUPTICS) + realend = gametic + BACKUPTICS; cl_packetmissed = realstart > neededtic; if (realstart <= neededtic && realend > neededtic) @@ -5349,10 +5349,10 @@ static void SV_SendTics(void) { // assert supposedtics[n]>=nettics[n] realfirsttic = supposedtics[n]; + lasttictosend = maketic; - lasttictosend = nettics[n] + CLIENTBACKUPTICS; - if (lasttictosend > maketic) - lasttictosend = maketic; + if (lasttictosend - nettics[n] >= BACKUPTICS) + lasttictosend = nettics[n] + BACKUPTICS-1; if (realfirsttic >= lasttictosend) { diff --git a/src/d_clisrv.h b/src/d_clisrv.h index e1c74b722..6eb7bae29 100644 --- a/src/d_clisrv.h +++ b/src/d_clisrv.h @@ -43,7 +43,6 @@ applications may follow different packet versions. // Networking and tick handling related. #define BACKUPTICS 512 // more than enough for most timeouts.... -#define CLIENTBACKUPTICS 32 #define MAXTEXTCMD 512 // No. of tics your controls can be delayed by.