thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-20 06:53:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge public master

Browse source
This commit is contained in:
Eidolon 2025-02-13 22:52:03 -06:00
commit 1ae570443d
3 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_hud.cpp
View file

@ -5674,7 +5674,7 @@ static void K_drawKartFirstPerson(void)
fixed_t scale; fixed_t scale;
UINT8 *colmap = NULL; UINT8 *colmap = NULL;
if (stplyr->spectator || !stplyr->mo || (stplyr->mo->renderflags & RF_DONTDRAW)) if (stplyr->spectator || !stplyr->mo || (stplyr->mo->renderflags & RF_DONTDRAW || stplyr->mo->state == &states[S_KART_DEAD]))
return; return;
{ {

17
src/p_user.c
View file

@ -4091,6 +4091,9 @@ Quaketilt (player_t *player)
static void static void
DoABarrelRoll (player_t *player) DoABarrelRoll (player_t *player)
{ {
UINT8 viewnum = R_GetViewNumber();
camera_t *cam = &camera[viewnum];
angle_t slope; angle_t slope;
angle_t delta; angle_t delta;
@ -4119,9 +4122,17 @@ DoABarrelRoll (player_t *player)
slope = 0; slope = 0;
} }
if (AbsAngle(slope) > ANGLE_45) if (cam->chase)
{ {
slope = slope & ANGLE_180 ? InvAngle(ANGLE_45) : ANGLE_45; if (AbsAngle(slope) > ANGLE_45)
{
slope = slope & ANGLE_180 ? InvAngle(ANGLE_45) : ANGLE_45;
}
} else {
if (AbsAngle(slope) > ANGLE_90)
{
slope = slope & ANGLE_180 ? InvAngle(ANGLE_90) : ANGLE_90;
}
} }
slope -= Quaketilt(player); slope -= Quaketilt(player);
@ -4129,7 +4140,7 @@ DoABarrelRoll (player_t *player)
delta = slope - player->tilt; delta = slope - player->tilt;
smoothing = FixedDiv(AbsAngle(slope), ANGLE_45); smoothing = FixedDiv(AbsAngle(slope), ANGLE_45);
delta = FixedDiv(delta, 33 * delta = FixedDiv(delta, (cam->chase ? 33 : 11) *
FixedDiv(FRACUNIT, FRACUNIT + smoothing)); FixedDiv(FRACUNIT, FRACUNIT + smoothing));
if (delta) if (delta)

12
src/r_main.cpp
View file

@ -308,8 +308,18 @@ angle_t R_PointToAnglePlayer(player_t *player, fixed_t x, fixed_t y)
{ {
refx = cam->x; refx = cam->x;
refy = cam->y; refy = cam->y;
}
// Bandaid for two very specific bugs that arise with chasecam off.
// 1: Camera tilt from slopes wouldn't apply correctly in first person.
// 2: Trick pies would appear strangely in first person.
if (player->mo)
{
if ((!cam->chase) && player->mo->x == x && player->mo->y == y)
{
return player->mo->angle;
}
}
}
return R_PointToAngle2(refx, refy, x, y); return R_PointToAngle2(refx, refy, x, y);
} }