From 115eea3828467bae694a13e70a45664f2772700c Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 17 Feb 2025 20:40:22 +0100 Subject: [PATCH] revert all the server ticking stuff --- src/d_clisrv.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 107597223..16fc0e187 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -6394,21 +6394,19 @@ boolean TryRunTics(tic_t realtics) } #endif - ticking = neededtic > gametic; - - if (ticking) + if (neededtic > gametic) { - if (realtics) - hu_stopped = false; + hu_stopped = false; } if (player_joining) { - if (realtics) - hu_stopped = true; + hu_stopped = true; return false; } + ticking = neededtic > gametic; + if (ticking) { // run the count * tics @@ -6668,14 +6666,6 @@ void NetUpdate(void) if (realtics <= 0) // nothing new to update return; - if (realtics > 5) - { - if (server) - realtics = 1; - else - realtics = 5; - } - #ifdef DEDICATEDIDLETIME if (server && dedicated && gamestate == GS_LEVEL) { @@ -6724,6 +6714,14 @@ void NetUpdate(void) } #endif + if (realtics > 5) + { + if (server) + realtics = 1; + else + realtics = 5; + } + gametime = nowtime; UpdatePingTable(); @@ -6817,8 +6815,6 @@ void NetUpdate(void) Net_AckTicker(); HandleNodeTimeouts(); - nowtime /= NEWTICRATERATIO; - if (nowtime > resptime) { resptime = nowtime;