diff --git a/src/g_game.c b/src/g_game.c index 1ea75844d..e1380e3a7 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -2367,11 +2367,6 @@ void G_Ticker(boolean run) F_TextPromptTicker(); AM_Ticker(); HU_Ticker(); - if (run) - { - R_UpdateViewInterpolation(); - } - break; @@ -2426,14 +2421,8 @@ void G_Ticker(boolean run) case GS_TITLESCREEN: if (titlemapinaction) - { P_Ticker(run); - if (run) - { - R_UpdateViewInterpolation(); - } // then intentionally fall through - } /* FALLTHRU */ case GS_WAITINGPLAYERS: F_MenuPresTicker(run); diff --git a/src/p_setup.c b/src/p_setup.c index 00030b944..afbd0f48e 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -7678,9 +7678,6 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate) P_MapEnd(); // just in case MapLoad modifies tmthing } - R_ResetViewInterpolation(); - R_ResetViewInterpolation(); - // No render mode or reloading gamestate, stop here. if (rendermode == render_none || reloadinggamestate) return true; diff --git a/src/p_tick.c b/src/p_tick.c index 8a2e70ac7..10270107f 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -770,6 +770,7 @@ void P_Ticker(boolean run) if (run) { R_UpdateLevelInterpolators(); + R_UpdateViewInterpolation(); } P_MapEnd(); @@ -833,6 +834,8 @@ void P_PreTicker(INT32 frames) LUA_HOOK(PostThinkFrame); R_UpdateLevelInterpolators(); + R_UpdateViewInterpolation(); + R_ResetViewInterpolation(); P_MapEnd(); }