stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-15 17:21:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Attempt to not let the camera into thok barriers"

Browse source 
This reverts commit 9f42e74fe2.
This commit is contained in:
TehRealSalt 2018-10-04 20:08:29 -04:00
parent 738ee90d8a
commit 376656343a
2 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/p_map.c
View file

@ -2181,12 +2181,6 @@ boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
mapcampointer = thiscam; mapcampointer = thiscam;
#ifdef NOCLIPCAM
if (newsubsec->sector->floorheight >= newsubsec->sector->ceilingheight
|| newsubsec->sector->ceilingheight <= newsubsec->sector->floorheight)
return false;
#endif
if (GETSECSPECIAL(newsubsec->sector->special, 4) == 12) if (GETSECSPECIAL(newsubsec->sector->special, 4) == 12)
{ // Camera noclip on entire sector. { // Camera noclip on entire sector.
tmfloorz = tmdropoffz = thiscam->z; tmfloorz = tmdropoffz = thiscam->z;
@ -2384,15 +2378,12 @@ boolean P_TryCameraMove(fixed_t x, fixed_t y, camera_t *thiscam)
fixed_t tryx = thiscam->x; fixed_t tryx = thiscam->x;
fixed_t tryy = thiscam->y; fixed_t tryy = thiscam->y;
#ifdef NOCLIPCAM #ifndef NOCLIPCAM
if (!(s->sector->floorheight >= s->sector->ceilingheight
|| s->sector->ceilingheight <= s->sector->floorheight))
#else
if ((thiscam == &camera && (players[displayplayer].pflags & PF_NOCLIP)) if ((thiscam == &camera && (players[displayplayer].pflags & PF_NOCLIP))
|| (thiscam == &camera2 && (players[secondarydisplayplayer].pflags & PF_NOCLIP)) || (thiscam == &camera2 && (players[secondarydisplayplayer].pflags & PF_NOCLIP))
|| (thiscam == &camera3 && (players[thirddisplayplayer].pflags & PF_NOCLIP)) || (thiscam == &camera3 && (players[thirddisplayplayer].pflags & PF_NOCLIP))
|| (thiscam == &camera4 && (players[fourthdisplayplayer].pflags & PF_NOCLIP)) || (thiscam == &camera4 && (players[fourthdisplayplayer].pflags & PF_NOCLIP))
|| (leveltime < introtime)) || (leveltime < introtime))
#endif #endif
{ // Noclipping player camera noclips too!! { // Noclipping player camera noclips too!!
floatok = true; floatok = true;

2
src/p_mobj.c
View file

@ -3702,7 +3702,6 @@ boolean P_CameraThinker(player_t *player, camera_t *thiscam, boolean resetcalled
{ {
if (!P_TryCameraMove(thiscam->x + thiscam->momx, thiscam->y + thiscam->momy, thiscam)) if (!P_TryCameraMove(thiscam->x + thiscam->momx, thiscam->y + thiscam->momy, thiscam))
{ // Never fails for 2D mode. { // Never fails for 2D mode.
#ifndef NOCLIPCAM
mobj_t dummy; mobj_t dummy;
dummy.thinker.function.acp1 = (actionf_p1)P_MobjThinker; dummy.thinker.function.acp1 = (actionf_p1)P_MobjThinker;
dummy.subsector = thiscam->subsector; dummy.subsector = thiscam->subsector;
@ -3713,7 +3712,6 @@ boolean P_CameraThinker(player_t *player, camera_t *thiscam, boolean resetcalled
if (!resetcalled && !(player->pflags & PF_NOCLIP || leveltime < introtime) && !P_CheckSight(&dummy, player->mo)) // TODO: "P_CheckCameraSight" instead. if (!resetcalled && !(player->pflags & PF_NOCLIP || leveltime < introtime) && !P_CheckSight(&dummy, player->mo)) // TODO: "P_CheckCameraSight" instead.
P_ResetCamera(player, thiscam); P_ResetCamera(player, thiscam);
else else
#endif
P_SlideCameraMove(thiscam); P_SlideCameraMove(thiscam);
if (resetcalled) // Okay this means the camera is fully reset. if (resetcalled) // Okay this means the camera is fully reset.
return true; return true;