From 6e7b45d15c8e7f2069921ff544a7e778824a33d6 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 9 Jun 2025 22:28:43 +0200 Subject: [PATCH 1/3] simplify R_SetupAimingFrame --- src/r_main.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/r_main.c b/src/r_main.c index 490d6eda4..33ed77b90 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -1068,28 +1068,20 @@ static void R_SetupAimingFrame(player_t *player, camera_t *thiscam) newview->aim = player->awayviewaiming; newview->angle = player->awayviewmobj->angle; } - else if (thiscam->chase) + else if (thiscam && thiscam->chase) { newview->aim = thiscam->aiming; newview->angle = thiscam->angle; } + else if (!demo.playback && player->playerstate != PST_DEAD) + { + newview->aim = localaiming[viewssnum]; + newview->angle = localangle[viewssnum]; + } else { newview->aim = player->aiming; newview->angle = player->mo->angle; - - if (!demo.playback && player->playerstate != PST_DEAD) - { - for (UINT8 i = 0; i <= splitscreen; i++) - { - if (player == (i == 0 ? &players[consoleplayer] : &players[displayplayers[i]])) - { - newview->angle = localangle[i]; - newview->aim = localaiming[i]; - break; - } - } - } } } From 4bd02ad3256941deb07d51e46b72695542455b2a Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 18 Jun 2025 09:13:58 +0200 Subject: [PATCH 2/3] check if player is local here --- src/r_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/r_main.c b/src/r_main.c index 33ed77b90..459ad6883 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -1073,7 +1073,7 @@ static void R_SetupAimingFrame(player_t *player, camera_t *thiscam) newview->aim = thiscam->aiming; newview->angle = thiscam->angle; } - else if (!demo.playback && player->playerstate != PST_DEAD) + else if (P_IsLocalPlayer(player) && !demo.playback && player->playerstate != PST_DEAD) { newview->aim = localaiming[viewssnum]; newview->angle = localangle[viewssnum]; From 9f770993d4942dc1894a26ada3cd69a3a9af5e8d Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 1 Jun 2025 01:35:14 +0200 Subject: [PATCH 3/3] proper init enterprecise --- src/d_main.c | 2 +- src/i_time.c | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index a47c8b756..9664cb876 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -926,7 +926,7 @@ void D_SRB2Loop(void) if ((elapsed > 0) && ((INT64)capbudget > elapsed) && !vsync_with_match_refresh) { - I_SleepDuration(capbudget - (finishprecise - enterprecise)); + I_SleepDuration(capbudget - elapsed); } } // Capture the time once more to get the real delta time. diff --git a/src/i_time.c b/src/i_time.c index 2d136f27e..da6bc3882 100644 --- a/src/i_time.c +++ b/src/i_time.c @@ -37,18 +37,20 @@ tic_t I_GetTime(void) void I_InitializeTime(void) { - g_time.time = 0; - g_time.timefrac = 0; - - enterprecise = 0; - oldenterprecise = 0; - tictimer = 0.0; - CV_RegisterVar(&cv_timescale); // I_StartupTimer is preserved for potential subsystems that need to setup // timing information for I_GetPreciseTime and sleeping I_StartupTimer(); + + g_time.time = 0; + g_time.timefrac = 0; + + enterprecise = I_GetPreciseTime(); + oldenterprecise = enterprecise; + entertic = 0; + oldentertics = 0; + tictimer = 0.0; } void I_UpdateTime(fixed_t timescale) @@ -61,7 +63,7 @@ void I_UpdateTime(fixed_t timescale) ticratescaled = (double)TICRATE * FixedToFloat(timescale); enterprecise = I_GetPreciseTime(); - elapsedseconds = (double)((INT64)enterprecise - oldenterprecise) / I_GetPrecisePrecision(); + elapsedseconds = (double)(enterprecise - oldenterprecise) / I_GetPrecisePrecision(); tictimer += elapsedseconds; while (tictimer > 1.0/ticratescaled) {