diff --git a/src/r_main.c b/src/r_main.c index 6e13786a1..78644cc24 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -1115,6 +1115,7 @@ void R_SkyboxFrame(int s) { player_t *player = &players[displayplayers[s]]; camera_t *thiscam = &camera[s]; + subsector_t * subsector = NULL; R_SetViewContext(VIEWCONTEXT_SKY1 + s); @@ -1122,7 +1123,7 @@ void R_SkyboxFrame(int s) newview->sky = true; viewmobj = skyboxmo[0]; #ifdef PARANOIA - if (!viewmobj) + if (P_MobjWasRemoved(viewmobj)) { const size_t playeri = (size_t)(player - players); I_Error("R_SkyboxFrame: viewmobj null (player %s)", sizeu1(playeri)); @@ -1201,7 +1202,10 @@ void R_SkyboxFrame(int s) } #undef SETUPSKYVIEW - R_SetupCommonFrame(player, viewmobj->subsector); + if (!P_MobjWasRemoved(viewmobj)) + subsector = viewmobj->subsector; + + R_SetupCommonFrame(player, subsector); } void R_SetupFrame(int s, boolean skybox) @@ -1209,6 +1213,7 @@ void R_SetupFrame(int s, boolean skybox) player_t *player = &players[displayplayers[s]]; camera_t *thiscam = &camera[s]; boolean chasecam = (cv_chasecam[s].value != 0); + subsector_t * subsector = NULL; R_SetViewContext(VIEWCONTEXT_PLAYER1 + s); if (thiscam->reset) @@ -1243,7 +1248,10 @@ void R_SetupFrame(int s, boolean skybox) newview->y = viewmobj->y; newview->z = viewmobj->z + 20*FRACUNIT; - R_SetupCommonFrame(player, viewmobj->subsector); + if (!P_MobjWasRemoved(viewmobj)) + subsector = viewmobj->subsector; + + R_SetupCommonFrame(player, subsector); } else if (!player->spectator && (thiscam && chasecam)) // use outside cam view { @@ -1264,7 +1272,10 @@ void R_SetupFrame(int s, boolean skybox) newview->y = viewmobj->y; newview->z = player->viewz; - R_SetupCommonFrame(player, viewmobj->subsector); + if (!P_MobjWasRemoved(viewmobj)) + subsector = viewmobj->subsector; + + R_SetupCommonFrame(player, subsector); } } diff --git a/src/r_things.c b/src/r_things.c index 20603cbc8..821ecaf7b 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -2836,7 +2836,7 @@ boolean R_ThingVisible (mobj_t *thing) if (thing->sprite == SPR_NULL || thing->flags2 & MF2_DONTDRAW) return false; - if (viewmobj && (thing == viewmobj)) + if (!P_MobjWasRemoved(viewmobj) && (thing == viewmobj)) return false; if (splitscreen)