diff --git a/src/d_main.c b/src/d_main.c index 198a341b7..176d11293 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -952,7 +952,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) { diff --git a/src/r_main.cpp b/src/r_main.cpp index 4c21a76c7..044aa918a 100644 --- a/src/r_main.cpp +++ b/src/r_main.cpp @@ -1079,28 +1079,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 (P_IsLocalPlayer(player) && !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; - } - } - } } }