Merge remote-tracking branch 'origin/serverstuttertest' into Saturn-Testing
Rather not have this cause dumb issues like every single other time interp and ticking was touched, so just behave like vanilla
This commit is contained in:
commit
b10a502b0e
1 file changed
+13
-17
+13
-17
@@ -6492,21 +6492,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
|
||||
@@ -6811,14 +6809,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)
|
||||
{
|
||||
@@ -6867,6 +6857,14 @@ void NetUpdate(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
if (realtics > 5)
|
||||
{
|
||||
if (server)
|
||||
realtics = 1;
|
||||
else
|
||||
realtics = 5;
|
||||
}
|
||||
|
||||
gametime = nowtime;
|
||||
|
||||
UpdatePingTable();
|
||||
@@ -6965,8 +6963,6 @@ void NetUpdate(void)
|
||||
Net_AckTicker();
|
||||
HandleNodeTimeouts();
|
||||
|
||||
nowtime /= NEWTICRATERATIO;
|
||||
|
||||
if (nowtime > resptime)
|
||||
{
|
||||
resptime = nowtime;
|
||||
|
||||
Reference in new issue
Block a user