thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'conveyor-camera-jitter' into 'master'

Browse source 
Fix camera jitter after leaving a conveyor

See merge request KartKrew/Kart!245
This commit is contained in:
Sal 2020-05-03 21:28:02 -04:00
commit 25ba7e386f
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/p_user.c
View file

@ -7184,6 +7184,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
UINT8 timeover; UINT8 timeover;
mobj_t *mo; mobj_t *mo;
fixed_t f1, f2; fixed_t f1, f2;
fixed_t speed;
#ifndef NOCLIPCAM #ifndef NOCLIPCAM
boolean cameranoclip; boolean cameranoclip;
subsector_t *newsubsec; subsector_t *newsubsec;
@ -7418,8 +7419,11 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
// sets ideal cam pos // sets ideal cam pos
dist = camdist; dist = camdist;
if (player->speed > K_GetKartSpeed(player, false)) /* player->speed subtracts conveyors, janks up the camera */
dist += 4*(player->speed - K_GetKartSpeed(player, false)); speed = R_PointToDist2(0, 0, player->mo->momx, player->mo->momy);
if (speed > K_GetKartSpeed(player, false))
dist += 4*(speed - K_GetKartSpeed(player, false));
dist += abs(thiscam->momz)/4; dist += abs(thiscam->momz)/4;
if (player->karthud[khud_boostcam]) if (player->karthud[khud_boostcam])