From 3cd6fe4e341c5f95832b4aba08641be8d8d083f8 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 20 May 2025 16:14:50 +0200 Subject: [PATCH] tic_frequency --- src/d_clisrv.c | 4 ++-- src/d_net.c | 2 +- src/i_system.h | 2 +- src/sdl/i_system.c | 6 +++++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 846fd598f..8b8a1695d 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -6544,8 +6544,8 @@ boolean TryRunTics(tic_t realtics, tic_t entertic) } precise_t now = I_GetPreciseTime(); - double frame = ((double)now / frame_frequency); - netUpdateFudge = (((double)now/ frame_frequency) - frame); // record the timefudge where the net update typically occurs + double frame = ((double)now / tic_frequency); + netUpdateFudge = (((double)now / tic_frequency) - frame); // record the timefudge where the net update typically occurs NetUpdate(); diff --git a/src/d_net.c b/src/d_net.c index 5cdbf1c9e..b434a6e48 100644 --- a/src/d_net.c +++ b/src/d_net.c @@ -1213,7 +1213,7 @@ boolean HGetPacket(void) extern double netUpdateFudge; -#define gettime ((double)I_GetPreciseTime() / frame_frequency) +#define gettime (I_GetPreciseTime() / tic_frequency) void TimeFudge(void) { // you can use SDL_GetPerformanceFrequency() instead of tic_frequency to get more precise timings diff --git a/src/i_system.h b/src/i_system.h index c5d560d60..c9dd899bd 100644 --- a/src/i_system.h +++ b/src/i_system.h @@ -21,7 +21,7 @@ #pragma interface #endif -extern double frame_frequency; +extern double tic_frequency; extern double elapsed_frames; /** \brief max quit functions diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c index cd728ffef..f68b63568 100644 --- a/src/sdl/i_system.c +++ b/src/sdl/i_system.c @@ -1710,6 +1710,8 @@ double frame_frequency; static UINT64 frame_epoch; double elapsed_frames; +double tic_frequency; + static void I_InitFrameTime(const UINT64 now, const UINT32 cap) { frame_rate = cap; @@ -1789,7 +1791,7 @@ void I_SetTime(tic_t tic, int fudge, boolean useAbsoluteFudge) tic = max(tic, SDL_GetTicks()); if (useAbsoluteFudge) - elapsed_frames = elapsed_frames + ((double)fudge / 100) * frame_frequency; + elapsed_frames = elapsed_frames + ((double)fudge / 100) * tic_frequency; } // @@ -1801,6 +1803,8 @@ void I_StartupTimer(void) I_InitFrameTime(0, R_GetFramerateCap()); elapsed_frames = 0.0; + + tic_frequency = timer_frequency / (double)NEWTICRATE; } void I_Sleep(UINT32 ms)