try just passing the sector + add 50 trillion extra checks

idk anymore but this is literally now how vanilla kart behaved
This commit is contained in:
Alug committed 2025-01-22 19:08:03 +01:00
1 parent f0df97589f
commit b14b913d0a
1 file changed
+15 -15
+15 -15
View File
@@ -1055,7 +1055,7 @@ void R_Init(void)
mobj_t *viewmobj;
static void R_SetupCommonFrame(player_t * player, subsector_t * subsector)
static void R_SetupCommonFrame(player_t * player, sector_t * sector)
{
newview->player = player;
@@ -1065,8 +1065,8 @@ static void R_SetupCommonFrame(player_t * player, subsector_t * subsector)
newview->roll = R_ViewRollAngle(player);
if (subsector && subsector->sector)
newview->sector = subsector->sector;
if (sector != NULL)
newview->sector = sector;
else
newview->sector = R_PointInSubsector(newview->x, newview->y)->sector;
@@ -1196,10 +1196,10 @@ void R_SkyboxFrame(int s)
}
#undef SETUPSKYVIEW
if (!P_MobjWasRemoved(viewmobj))
if (!P_MobjWasRemoved(viewmobj) && viewmobj->subsector && viewmobj->subsector->sector)
subsector = viewmobj->subsector;
R_SetupCommonFrame(player, subsector);
R_SetupCommonFrame(player, subsector->sector);
}
void R_SetupFrame(int s, boolean skybox)
@@ -1207,7 +1207,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);
subsector_t * subsector = NULL;
sector_t * sector = NULL;
R_SetViewContext(VIEWCONTEXT_PLAYER1 + s);
if (thiscam->reset)
@@ -1247,10 +1247,10 @@ void R_SetupFrame(int s, boolean skybox)
newview->y = viewmobj->y;
newview->z = viewmobj->z + 20*FRACUNIT;
if (!P_MobjWasRemoved(viewmobj))
subsector = viewmobj->subsector;
if (!P_MobjWasRemoved(viewmobj) && viewmobj->subsector && viewmobj->subsector->sector)
sector = viewmobj->subsector->sector;
R_SetupCommonFrame(player, subsector);
R_SetupCommonFrame(player, sector);
}
else if (thiscam && chasecam) // use outside cam view
{
@@ -1260,10 +1260,10 @@ void R_SetupFrame(int s, boolean skybox)
newview->y = thiscam->y;
newview->z = thiscam->z + (thiscam->height>>1);
if (thiscam != NULL)
subsector = thiscam->subsector;
if (thiscam != NULL && thiscam->subsector && thiscam->subsector->sector)
sector = thiscam->subsector->sector;
R_SetupCommonFrame(player, subsector);
R_SetupCommonFrame(player, sector);
}
else // use the player's eyes view
{
@@ -1274,10 +1274,10 @@ void R_SetupFrame(int s, boolean skybox)
newview->y = viewmobj->y;
newview->z = player->viewz;
if (!P_MobjWasRemoved(viewmobj))
subsector = viewmobj->subsector;
if (!P_MobjWasRemoved(viewmobj) && viewmobj->subsector && viewmobj->subsector->sector)
sector = viewmobj->subsector->sector;
R_SetupCommonFrame(player, subsector);
R_SetupCommonFrame(player, sector);
}
}