Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable STAT_MATCHSTARTTIME sync if gameclock counts down #983

Merged
merged 1 commit into from
Jan 4, 2025
Merged

Disable STAT_MATCHSTARTTIME sync if gameclock counts down #983

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/cl_parse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3310,6 +3310,7 @@ void CL_ParseStufftext (void)
void CL_SetStat (int stat, int value)
{
int j;
extern cvar_t scr_gameclock;

if (stat < 0 || stat >= MAX_CL_STATS) {
Host_Error("CL_SetStat: %i is invalid", stat);
Expand Down Expand Up @@ -3361,7 +3362,12 @@ void CL_SetStat (int stat, int value)
cl.servertime = cl.stats[STAT_TIME] * 0.001;
}

if (cl.stats[STAT_MATCHSTARTTIME])
// Since the server doesn't include overtime data, we can't rely on
// the STAT_MATCHSTARTTIME data when using a game clock that counts
// down. Instead, we'll have to wait for a "[X] minutes remaining"
// message to sync the game clock. Without this, during overtime, the
// clock will start counting up instead of down.
if (cl.stats[STAT_MATCHSTARTTIME] && scr_gameclock.value != 2 && scr_gameclock.value != 4)
{
cl.gamestarttime = Sys_DoubleTime() - cl.servertime + ((double)cl.stats[STAT_MATCHSTARTTIME])/1000 - cl.gamepausetime;
if (cls.mvdplayback && cl.servertime_works && !cl.gametime) {
Expand Down
Loading