diff --git a/src/d_clisrv.c b/src/d_clisrv.c index c58491cfa..a4049db9c 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -136,7 +136,7 @@ static UINT8 gamestate_resend_counter[MAXNETNODES]; #endif // kart, true when a player is connecting or disconnecting so that the gameplay has stopped in its tracks -UINT8 hu_stopped = 0; +boolean hu_stopped = false; // Client specific static ticcmd_t localcmds; diff --git a/src/d_clisrv.h b/src/d_clisrv.h index cc123b1d2..197f3b794 100644 --- a/src/d_clisrv.h +++ b/src/d_clisrv.h @@ -656,7 +656,7 @@ extern UINT8 hu_resynching; #ifdef SATURNSYNCH extern UINT8 hu_redownloadinggamestate; #endif -extern UINT8 hu_stopped; // kart, true when the game is stopped for players due to a disconnecting or connecting player +extern boolean hu_stopped; // kart, true when the game is stopped for players due to a disconnecting or connecting player typedef struct rewind_s { UINT8 savebuffer[(768*1024)]; diff --git a/src/d_main.c b/src/d_main.c index 9ca370c2a..471d29fa2 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -654,7 +654,7 @@ static boolean D_Display(void) // ========================================================================= tic_t rendergametic; -static int menuInputDelayTimer = 0; +static SINT8 menuInputDelayTimer = 0; void D_SRB2Loop(void) { @@ -792,9 +792,10 @@ void D_SRB2Loop(void) event_t myev; myev.type = ev_keydown; - menuInputDelayTimer++; + if (menuInputDelayTimer < 19) + menuInputDelayTimer++; - if (menuInputDelayTimer >= 19) // TICRATE * ( (k+2) (1 - [wz + h + j - q]^2 - [(gk + 2g + k + 1)(h + j) + h - z]^2 - [16(k + 1)^3(k + 2)(n + 1)^2 + 1 - f^2]^2 calculated by my butt + if (menuInputDelayTimer == 19) // TICRATE * ( (k+2) (1 - [wz + h + j - q]^2 - [(gk + 2g + k + 1)(h + j) + h - z]^2 - [16(k + 1)^3(k + 2)(n + 1)^2 + 1 - f^2]^2 calculated by my butt { if (DPADUPSCROLL) DPADSCROLLINPUT(KEY_UPARROW) @@ -825,11 +826,14 @@ void D_SRB2Loop(void) { rendertimefrac = FRACUNIT; } + + rendertimefrac_unpaused = (!hu_stopped) ? g_time.timefrac : FRACUNIT; } else { renderdeltatics = realtics * FRACUNIT; rendertimefrac = FRACUNIT; + rendertimefrac_unpaused = FRACUNIT; } if ((interp || doDisplay) && !frameskip) @@ -853,7 +857,7 @@ void D_SRB2Loop(void) LUA_Step(); #ifdef HAVE_DISCORDRPC - if (! dedicated) + if (!dedicated) { Discord_RunCallbacks(); } diff --git a/src/doomstat.h b/src/doomstat.h index 35ae67d1b..01d98fd4e 100644 --- a/src/doomstat.h +++ b/src/doomstat.h @@ -192,7 +192,7 @@ extern struct quake // camera offsets and duration fixed_t x,y,z; angle_t roll; - UINT16 time; + tic_t time; // location, radius, and intensity... mappoint_t *epicenter; diff --git a/src/f_finale.c b/src/f_finale.c index 7f86303c0..18eab51eb 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -170,8 +170,8 @@ static void F_SkyScroll(INT32 scrollspeed) w = (vid.width / vid.dupx)<width)*16))<width)<width)*16))<width)*16))<width)<width)*16))<= 20) V_DrawSmallScaledPatch(84, 87, 0, ttkart); else if (finalecount >= 10) - V_DrawSciencePatch((84<cmd.angleturn; + + P_ResetCamera(player, &camera[view - 1]); + + // Make sure the viewport doesn't interpolate at all into + // its new position -- just snap instantly into place. + + // Why does it need to be done twice? + R_ResetViewInterpolation(view); + R_ResetViewInterpolation(view); +} + // // G_ResetView // Correct a viewpoint to playernum or the next available, wraps forward. @@ -2003,7 +2026,6 @@ void G_ResetView(UINT8 viewnum, INT32 playernum, boolean onlyactive) UINT8 viewd; INT32 *displayplayerp; - camera_t *camerap; INT32 olddisplayplayer; INT32 playersviewable; @@ -2040,30 +2062,20 @@ void G_ResetView(UINT8 viewnum, INT32 playernum, boolean onlyactive) /* Focus our target view first so that we don't take its player. */ (*displayplayerp) = playernum; - if ((*displayplayerp) != olddisplayplayer) - { - camerap = &camera[viewnum-1]; - P_ResetCamera(&players[(*displayplayerp)], camerap); - - // Make sure the viewport doesn't interpolate at all into - // its new position -- just snap instantly into place. - R_ResetViewInterpolation(viewnum); - } + /* If a viewpoint changes, reset the camera to clear uninitialized memory. */ if (viewnum > splits) { - for (viewd = splits+1; viewd < viewnum; ++viewd) + for (viewd = splits+1; viewd <= viewnum; ++viewd) { - displayplayerp = (&displayplayers[viewd-1]); - camerap = &camera[viewd]; - - (*displayplayerp) = G_FindView(0, viewd, onlyactive, false); - - P_ResetCamera(&players[(*displayplayerp)], camerap); - - // Make sure the viewport doesn't interpolate at all into - // its new position -- just snap instantly into place. - R_ResetViewInterpolation(viewd); + G_FixCamera(viewd); + } + } + else + { + if ((*displayplayerp) != olddisplayplayer) + { + G_FixCamera(viewnum); } } diff --git a/src/k_kart.c b/src/k_kart.c index 44497b0f2..a96a6bbda 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -2686,8 +2686,7 @@ void K_ExplodePlayer(player_t *player, mobj_t *source, mobj_t *inflictor) // A b if (P_IsLocalPlayer(player)) { - quake.intensity = 64*FRACUNIT; - quake.time = 5; + P_StartQuake(5, 64<kartstuff[k_instashield] = 15; diff --git a/src/lua_baselib.c b/src/lua_baselib.c index 3fbfd463d..1e60863ef 100644 --- a/src/lua_baselib.c +++ b/src/lua_baselib.c @@ -1553,8 +1553,9 @@ static int lib_pSetSkyboxMobj(lua_State *L) // Shhh, neither does P_StartQuake. static int lib_pStartQuake(lua_State *L) { + tic_t q_time = (tic_t)luaL_checkinteger(L, 2); fixed_t q_intensity = luaL_checkinteger(L, 1); - UINT16 q_time = (UINT16)luaL_checkinteger(L, 2); + fixed_t q_radius = luaL_optinteger(L, 4, 512<player) // only players have views return; @@ -2499,6 +2500,18 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) P_SetTarget(&mo->player->awayviewmobj, altview); mo->player->awayviewtics = P_AproxDistance(line->dx, line->dy)>>FRACBITS; + if (gamestate == GS_LEVEL) + { + for (i = 0; i <= splitscreen; i++) + { + if (displayplayers[i] == (mo->player - players)) + { + R_ResetViewInterpolation(i + 1); + R_ResetViewInterpolation(i + 1); + } + } + } + if (line->flags & ML_NOCLIMB) // lets you specify a vertical angle { INT32 aim; @@ -2836,17 +2849,19 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) case 444: // Earthquake camera { - quake.intensity = sides[line->sidenum[0]].textureoffset; - quake.radius = sides[line->sidenum[0]].rowoffset; - quake.time = P_AproxDistance(line->dx, line->dy)>>FRACBITS; + fixed_t intensity = sides[line->sidenum[0]].textureoffset; + fixed_t radius = sides[line->sidenum[0]].rowoffset; + tic_t time = P_AproxDistance(line->dx, line->dy)>>FRACBITS; quake.epicenter = NULL; /// \todo // reasonable defaults. - if (!quake.intensity) - quake.intensity = 8< 0) + { + quake.radius = FixedMul(radius, mapobjectscale); + } +} + static void P_SearchForDisableLinedefs(void) { size_t i; diff --git a/src/p_spec.h b/src/p_spec.h index 477dd4950..7612ac657 100644 --- a/src/p_spec.h +++ b/src/p_spec.h @@ -454,4 +454,6 @@ void P_CalcHeight(player_t *player); sector_t *P_ThingOnSpecial3DFloor(mobj_t *mo); +void P_StartQuake(tic_t time, fixed_t intensity, fixed_t radius); + #endif diff --git a/src/p_telept.c b/src/p_telept.c index a7cef7b1d..ceed7dc93 100644 --- a/src/p_telept.c +++ b/src/p_telept.c @@ -166,6 +166,7 @@ boolean P_Teleport(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle P_ResetCamera(thing->player, &camera[i]); R_ResetViewInterpolation(i + 1); + break; } // don't run in place after a teleport diff --git a/src/p_tick.c b/src/p_tick.c index 9dbdd7ed5..7405792d0 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -397,6 +397,36 @@ void P_RunChaseCameras(void) } } +static inline void P_RunQuakes(void) +{ + fixed_t ir; + + if (quake.time <= 0) + { + quake.x = quake.y = quake.z = quake.roll = 0; + return; + } + + ir = quake.intensity>>1; + + /// \todo Calculate distance from epicenter if set and modulate the intensity accordingly based on radius. + quake.x = M_RandomRange(-ir,ir); + quake.y = M_RandomRange(-ir,ir); + quake.z = M_RandomRange(-ir,ir); + + ir >>= 2; + ir = M_RandomRange(-ir,ir); + + if (ir < 0) + ir = ANGLE_MAX - FixedAngle(-ir); + else + ir = FixedAngle(ir); + + quake.roll = ir; + + --quake.time; +} + // // P_Ticker // @@ -429,6 +459,8 @@ void P_Ticker(boolean run) if (demo.rewinding && leveltime > 0) { leveltime = (leveltime-1) & ~3; + if (timeinmap > 0) + timeinmap = (timeinmap-1) & ~3; G_PreviewRewind(leveltime); } else if (demo.freecam && democam.cam) // special case: allow freecam to MOVE during pause! @@ -587,24 +619,7 @@ void P_Ticker(boolean run) K_CalculateBattleWanted(); } - if (quake.time) - { - fixed_t ir = quake.intensity>>1; - /// \todo Calculate distance from epicenter if set and modulate the intensity accordingly based on radius. - quake.x = M_RandomRange(-ir,ir); - quake.y = M_RandomRange(-ir,ir); - quake.z = M_RandomRange(-ir,ir); - ir >>= 2; - ir = M_RandomRange(-ir,ir); - if (ir < 0) - ir = ANGLE_MAX - FixedAngle(-ir); - else - ir = FixedAngle(ir); - quake.roll = ir; - --quake.time; - } - else - quake.x = quake.y = quake.z = quake.roll = 0; + P_RunQuakes(); if (metalplayback) G_ReadMetalTic(metalplayback); @@ -668,8 +683,10 @@ void P_Ticker(boolean run) { player_t *player = &players[displayplayers[i]]; boolean isSkyVisibleForPlayer = skyVisiblePerPlayer[i]; + if (!player->mo) continue; + if (isSkyVisibleForPlayer && skyboxmo[0] && cv_skybox.value) { R_SkyboxFrame(player); @@ -683,8 +700,6 @@ void P_Ticker(boolean run) if (demo.playback) G_StoreRewindInfo(); - -// Z_CheckMemCleanup(); } // Abbreviated ticker for pre-loading, calls thinkers and assorted things diff --git a/src/r_main.c b/src/r_main.c index 25394a2e3..f61753a19 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -75,6 +75,7 @@ line_t *portalclipline; INT32 portalclipstart, portalclipend; fixed_t rendertimefrac; +fixed_t rendertimefrac_unpaused; fixed_t renderdeltatics; boolean renderisnewtic; @@ -458,6 +459,11 @@ INT32 R_GetHudUncap(void) return cv_uncappedhud.value ? rendertimefrac & FRACMASK : 0; } +INT32 R_GetMenuUncap(void) +{ + return cv_uncappedhud.value ? rendertimefrac_unpaused & FRACMASK : 0; +} + // // R_ScaleFromGlobalAngle // Returns the texture mapping scale for the current line (horizontal span) @@ -1353,7 +1359,7 @@ void R_SkyboxFrame(player_t *player) // newview->sin = FINESINE(viewangle>>ANGLETOFINESHIFT); // newview->cos = FINECOSINE(viewangle>>ANGLETOFINESHIFT); - R_InterpolateView(R_UsingFrameInterpolation() ? rendertimefrac : FRACUNIT, false); + R_InterpolateView(R_UsingFrameInterpolation() ? rendertimefrac_unpaused : FRACUNIT, false); } void R_SetupFrame(player_t *player, boolean skybox) @@ -1361,51 +1367,35 @@ void R_SetupFrame(player_t *player, boolean skybox) camera_t *thiscam; boolean chasecam = false; +#define SETUPCAM(num, var, context)\ + thiscam = &camera[num];\ + chasecam = (var.value != 0);\ + R_SetViewContext(context);\ + if (thiscam->reset)\ + {\ + R_ResetViewInterpolation(num+1);\ + thiscam->reset = false;\ + } + if (splitscreen > 2 && player == &players[displayplayers[3]]) { - thiscam = &camera[3]; - chasecam = (cv_chasecam4.value != 0); - R_SetViewContext(VIEWCONTEXT_PLAYER4); - if (thiscam->reset) - { - R_ResetViewInterpolation(4); - thiscam->reset = false; - } + SETUPCAM(3, cv_chasecam4, VIEWCONTEXT_PLAYER4) } else if (splitscreen > 1 && player == &players[displayplayers[2]]) { - thiscam = &camera[2]; - chasecam = (cv_chasecam3.value != 0); - R_SetViewContext(VIEWCONTEXT_PLAYER3); - if (thiscam->reset) - { - R_ResetViewInterpolation(3); - thiscam->reset = false; - } + SETUPCAM(2, cv_chasecam3, VIEWCONTEXT_PLAYER3) } else if (splitscreen && player == &players[displayplayers[1]]) { - thiscam = &camera[1]; - chasecam = (cv_chasecam2.value != 0); - R_SetViewContext(VIEWCONTEXT_PLAYER2); - if (thiscam->reset) - { - R_ResetViewInterpolation(2); - thiscam->reset = false; - } + SETUPCAM(1, cv_chasecam2, VIEWCONTEXT_PLAYER2) } else { - thiscam = &camera[0]; - chasecam = (cv_chasecam.value != 0); - R_SetViewContext(VIEWCONTEXT_PLAYER1); - if (thiscam->reset) - { - R_ResetViewInterpolation(1); - thiscam->reset = false; - } + SETUPCAM(0, cv_chasecam, VIEWCONTEXT_PLAYER1) } +#undef SETUPCAM + if (player->spectator) // no spectator chasecam chasecam = false; // force chasecam off else if (player->playerstate == PST_DEAD || player->exiting) @@ -1425,20 +1415,40 @@ void R_SetupFrame(player_t *player, boolean skybox) // cut-away view stuff viewmobj = player->awayviewmobj; // should be a MT_ALTVIEWMAN I_Assert(viewmobj != NULL); + + newview->x = viewmobj->x; + newview->y = viewmobj->y; newview->z = viewmobj->z + 20*FRACUNIT; newview->aim = player->awayviewaiming; newview->angle = viewmobj->angle; + + newview->x += quake.x; + newview->y += quake.y; + + if (!P_MobjWasRemoved(viewmobj) && viewmobj->subsector && thiscam && thiscam->subsector->sector) + newview->sector = viewmobj->subsector->sector; + else + newview->sector = R_PointInSubsector(newview->x, newview->y)->sector; } - else if (!player->spectator && (thiscam && chasecam)) - // use outside cam view + else if (!player->spectator && (thiscam && chasecam)) // use outside cam view { viewmobj = NULL; + + newview->x = thiscam->x; + newview->y = thiscam->y; newview->z = thiscam->z + (thiscam->height>>1); newview->aim = thiscam->aiming; newview->angle = thiscam->angle; + + newview->x += quake.x; + newview->y += quake.y; + + if (thiscam->subsector && thiscam->subsector->sector) + newview->sector = thiscam->subsector->sector; + else + newview->sector = R_PointInSubsector(newview->x, newview->y)->sector; } - else - // use the player's eyes view + else // use the player's eyes view { newview->z = player->viewz; @@ -1470,40 +1480,13 @@ void R_SetupFrame(player_t *player, boolean skybox) } } } + newview->roll = R_ViewRollAngle(player); newview->z += quake.z; newview->player = player; - if ((thiscam && chasecam) && !player->awayviewtics && !player->spectator) - { - newview->x = thiscam->x; - newview->y = thiscam->y; - newview->x += quake.x; - newview->y += quake.y; - - if (thiscam->subsector && thiscam->subsector->sector) - newview->sector = thiscam->subsector->sector; - else - newview->sector = R_PointInSubsector(newview->x, newview->y)->sector; - } - else - { - newview->x = viewmobj->x; - newview->y = viewmobj->y; - newview->x += quake.x; - newview->y += quake.y; - - if (!P_MobjWasRemoved(viewmobj) && viewmobj->subsector && thiscam && thiscam->subsector->sector) - newview->sector = viewmobj->subsector->sector; - else - newview->sector = R_PointInSubsector(newview->x, newview->y)->sector; - } - - // newview->sin = FINESINE(viewangle>>ANGLETOFINESHIFT); - // newview->cos = FINECOSINE(viewangle>>ANGLETOFINESHIFT); - - R_InterpolateView(R_UsingFrameInterpolation() ? rendertimefrac : FRACUNIT, false); + R_InterpolateView(R_UsingFrameInterpolation() ? rendertimefrac_unpaused : FRACUNIT, false); } #define ANGLED_PORTALS diff --git a/src/r_main.h b/src/r_main.h index 8766ea65c..2d7503ea7 100644 --- a/src/r_main.h +++ b/src/r_main.h @@ -33,6 +33,8 @@ extern size_t validcount, linecount, loopcount, framecount; // The fraction of a tic being drawn (for interpolation between two tics) extern fixed_t rendertimefrac; +// Same as rendertimefrac but not suspended when the game is paused +extern fixed_t rendertimefrac_unpaused; // Evaluated delta tics for this frame (how many tics since the last frame) extern fixed_t renderdeltatics; // The current render is a new logical tic @@ -172,4 +174,6 @@ void R_RegisterEngineStuff(void); // return multiplier for HUD uncap INT32 R_GetHudUncap(void); +// same as above but keeps interpolation during pause +INT32 R_GetMenuUncap(void); #endif