add a little extra safety here ig
this crashed on levelload once so idk maybe player was null ig
This commit is contained in:
1 parent
b77673550e
commit
bbe9d29d5c
2 files changed
+14
-9
No files matched your search
+2
-2
@@ -487,11 +487,11 @@ static boolean D_Display(void)
|
||||
{
|
||||
PS_START_TIMING(ps_rendercalltime);
|
||||
|
||||
R_ApplyLevelInterpolators(R_UsingFrameInterpolation() ? rendertimefrac : FRACUNIT);
|
||||
R_ApplyLevelInterpolators(rendertimefrac);
|
||||
|
||||
for (i = 0; i <= splitscreen; i++)
|
||||
{
|
||||
if (players[displayplayers[i]].mo || players[displayplayers[i]].playerstate == PST_DEAD)
|
||||
if (!P_MobjWasRemoved(players[displayplayers[i]].mo) || players[displayplayers[i]].playerstate == PST_DEAD)
|
||||
{
|
||||
viewssnum = i;
|
||||
|
||||
|
||||
+12
-7
@@ -1061,11 +1061,13 @@ void R_Init(void)
|
||||
|
||||
mobj_t *viewmobj;
|
||||
|
||||
static void
|
||||
R_SetupCommonFrame
|
||||
( player_t * player,
|
||||
subsector_t * subsector)
|
||||
static void R_SetupCommonFrame(player_t * player, subsector_t * subsector)
|
||||
{
|
||||
if (!player)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
newview->player = player;
|
||||
|
||||
newview->x += quake.x;
|
||||
@@ -1074,7 +1076,7 @@ R_SetupCommonFrame
|
||||
|
||||
newview->roll = R_ViewRollAngle(player);
|
||||
|
||||
if (subsector)
|
||||
if (subsector != NULL)
|
||||
newview->sector = subsector->sector;
|
||||
else
|
||||
newview->sector = R_PointInSubsector(newview->x, newview->y)->sector;
|
||||
@@ -1215,7 +1217,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);
|
||||
boolean chasecam = (cv_chasecam[s].value);
|
||||
subsector_t * subsector = NULL;
|
||||
|
||||
R_SetViewContext(VIEWCONTEXT_PLAYER1 + s);
|
||||
@@ -1269,7 +1271,10 @@ void R_SetupFrame(int s, boolean skybox)
|
||||
newview->y = thiscam->y;
|
||||
newview->z = thiscam->z + (thiscam->height>>1);
|
||||
|
||||
R_SetupCommonFrame(player, thiscam->subsector);
|
||||
if (thiscam != NULL)
|
||||
subsector = thiscam->subsector;
|
||||
|
||||
R_SetupCommonFrame(player, subsector);
|
||||
}
|
||||
else // use the player's eyes view
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user