diff --git a/src/d_main.c b/src/d_main.c index 90625f903..0dfe67a8a 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -448,7 +448,7 @@ static boolean D_Display(void) if (rendermode == render_soft && !splitscreen) { - R_InterpolateViewRollAngle(R_GetTimeFrac(RTF_LEVEL)); + R_InterpolateViewRollAngle(R_GetTimeFrac(RTF_CAMERA)); R_CheckViewMorph(); } diff --git a/src/k_hud.c b/src/k_hud.c index 81656718f..5328cea10 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -1073,7 +1073,7 @@ static void K_initKartHUD(void) // K_GetScreenCoords needs the right view* variables R_SetViewContext(stplyrnum); - R_InterpolateView(R_GetTimeFrac(RTF_LEVEL), !cv_uncappedhud.value); + R_InterpolateView(R_GetTimeFrac(RTF_CAMERA), !cv_uncappedhud.value); } UINT8 K_GetHudColor(void) diff --git a/src/r_fps.c b/src/r_fps.c index d0ae1b67e..d38d3fa8a 100644 --- a/src/r_fps.c +++ b/src/r_fps.c @@ -113,11 +113,11 @@ boolean R_UsingFrameInterpolation(void) // just for the sake of the intermission background... fixed_t R_GetTimeFrac(timefrac_e level) { - // level interp. pauses if level isn't ticking - if (level <= RTF_LEVEL && gamestate != GS_LEVEL) // !G_GamestateUsesLevel() + // level interp. pauses if level isn't active + if ((level <= RTF_LEVEL || level == RTF_CAMERA) && gamestate != GS_LEVEL) // !G_GamestateUsesLevel() return FRACUNIT; - // intermission interp. keeps interp even if level isn't ticking, but pauses if game is paused + // intermission interp. pauses if game is paused if (level <= RTF_INTER && (paused || P_AutoPause())) return FRACUNIT; diff --git a/src/r_fps.h b/src/r_fps.h index 5302da6d1..9a73230d4 100644 --- a/src/r_fps.h +++ b/src/r_fps.h @@ -34,6 +34,7 @@ typedef enum { RTF_LEVEL, RTF_INTER, + RTF_CAMERA, RTF_MENU, } timefrac_e; diff --git a/src/r_main.cpp b/src/r_main.cpp index 0a7596fa3..674583a17 100644 --- a/src/r_main.cpp +++ b/src/r_main.cpp @@ -1088,7 +1088,7 @@ static void R_SetupCommonFrame(player_t * player, sector_t * sector) else newview->sector = R_PointInSubsectorFast(newview->x, newview->y)->sector; - R_InterpolateView(R_GetTimeFrac(RTF_LEVEL), false); + R_InterpolateView(R_GetTimeFrac(RTF_CAMERA), false); } static void R_SetupAimingFrame(player_t *player, camera_t *thiscam)