add a little bit of safety to R_SetupFrame

This commit is contained in:
Alug committed 2024-09-04 23:31:54 +02:00
1 parent ff9b35ab45
commit b7d887d610
2 files changed
+12 -13

No files matched your search

+7 -8
View File
@@ -5685,17 +5685,16 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
{
const boolean skybox = (skyboxmo[0] && cv_skybox.value); // True if there's a skybox object and skyboxes are on
FRGBAFloat ClearColor;
ClearColor.red = 0.0f;
ClearColor.green = 0.0f;
ClearColor.blue = 0.0f;
ClearColor.alpha = 1.0f;
// Clear the color buffer, stops HOMs. Also seems to fix the skybox issue on Intel GPUs.
if (viewnumber == 0) // Only do it if it's the first screen being rendered
{
FRGBAFloat ClearColor;
ClearColor.red = 0.0f;
ClearColor.green = 0.0f;
ClearColor.blue = 0.0f;
ClearColor.alpha = 1.0f;
HWD.pfnClearBuffer(true, false, false, &ClearColor);
}
if (cv_grshaders.value)
HWD.pfnSetShaderInfo(HWD_SHADERINFO_LEVELTIME, (INT32)leveltime); // The water surface shader needs the leveltime.
+5 -5
View File
@@ -1468,12 +1468,12 @@ void R_SetupFrame(player_t *player, boolean skybox)
else if (player->playerstate == PST_DEAD || player->exiting)
chasecam = true; // force chasecam on
if (chasecam && !thiscam->chase)
if (chasecam && (thiscam && !thiscam->chase))
{
P_ResetCamera(player, thiscam);
thiscam->chase = true;
}
else if (!chasecam)
else if (thiscam && !chasecam)
thiscam->chase = false;
newview->sky = !skybox;
@@ -1486,7 +1486,7 @@ void R_SetupFrame(player_t *player, boolean skybox)
newview->aim = player->awayviewaiming;
newview->angle = viewmobj->angle;
}
else if (!player->spectator && chasecam)
else if (!player->spectator && (thiscam && chasecam))
// use outside cam view
{
viewmobj = NULL;
@@ -1532,7 +1532,7 @@ void R_SetupFrame(player_t *player, boolean skybox)
newview->player = player;
if (chasecam && !player->awayviewtics && !player->spectator)
if ((thiscam && chasecam) && !player->awayviewtics && !player->spectator)
{
newview->x = thiscam->x;
newview->y = thiscam->y;
@@ -1551,7 +1551,7 @@ void R_SetupFrame(player_t *player, boolean skybox)
newview->x += quake.x;
newview->y += quake.y;
if (viewmobj->subsector && thiscam->subsector->sector)
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;