move camera slidemove stuff behind ifndef NOCLIPCAM

dont think this is needed at all with camera noclip
This commit is contained in:
Alug committed 2025-08-18 17:56:05 +02:00
1 parent 1ef0909204
commit 650a50278a
3 files changed
+10 -1

No files matched your search

+2
View File
@@ -174,7 +174,9 @@ fixed_t P_GetPlayerSpinHeight(player_t *player);
void P_AddPlayerScore(player_t *player, UINT32 amount);
void P_ResetCamera(player_t *player, camera_t *thiscam);
boolean P_TryCameraMove(fixed_t x, fixed_t y, camera_t *thiscam);
#ifndef NOCLIPCAM
void P_SlideCameraMove(camera_t *thiscam);
#endif
//void P_DemoCameraMovement(camera_t *cam, UINT8 num);
boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcalled);
void P_ResetLocalCamAiming(player_t *player);
+6
View File
@@ -2689,6 +2689,7 @@ static fixed_t tmxmove, tmymove;
//
// P_HitCameraSlideLine
//
#ifndef NOCLIPCAM
static void P_HitCameraSlideLine(line_t *ld, camera_t *thiscam)
{
INT32 side;
@@ -2728,6 +2729,7 @@ static void P_HitCameraSlideLine(line_t *ld, camera_t *thiscam)
tmxmove = FixedMul(newlen, FINECOSINE(lineangle));
tmymove = FixedMul(newlen, FINESINE(lineangle));
}
#endif
//
// P_HitSlideLine
@@ -2847,6 +2849,7 @@ static void P_HitBounceLine(line_t *ld)
//
// PTR_SlideCameraTraverse
//
#ifndef NOCLIPCAM
static boolean PTR_SlideCameraTraverse(intercept_t *in)
{
line_t *li;
@@ -2893,6 +2896,7 @@ isblocking:
return false; // stop
}
#endif
//
// PTR_SlideTraverse
@@ -2963,6 +2967,7 @@ isblocking:
//
// Tries to slide the camera along a wall.
//
#ifndef NOCLIPCAM
void P_SlideCameraMove(camera_t *thiscam)
{
fixed_t leadx, leady, trailx, traily, newx, newy;
@@ -3056,6 +3061,7 @@ stairstep:
if (!retval)
goto retry;
}
#endif
//
// P_SlideMove
+2 -1
View File
@@ -3284,9 +3284,10 @@ boolean P_CameraThinker(player_t *player, camera_t *thiscam, boolean resetcalled
if (!resetcalled && !(player->pflags & PF_NOCLIP || leveltime < introtime) && !P_CheckSightFast(&dummy, player->mo)) // TODO: "P_CheckCameraSight" instead.
P_ResetCamera(player, thiscam);
#ifndef NOCLIPCAM
else
P_SlideCameraMove(thiscam);
#endif
if (resetcalled) // Okay this means the camera is fully reset.
return true;
}