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

Merge branch 'horizontal-springs' into 'master'

Browse source 
Always force player camera direction for springs with horizontal thrust component.

See merge request STJr/SRB2Internal!330
This commit is contained in:
Nev3r 2019-09-15 12:18:22 -04:00
commit 77f2be12eb
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/p_map.c
View file

@ -345,17 +345,14 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
if (horizspeed) if (horizspeed)
{ {
object->player->drawangle = spring->angle; object->player->drawangle = spring->angle;
if (vertispeed || (object->player->cmd.forwardmove == 0 && object->player->cmd.sidemove == 0)) object->angle = spring->angle;
{
object->angle = spring->angle;
if (!demoplayback || P_AnalogMove(object->player)) if (!demoplayback || P_AnalogMove(object->player))
{ {
if (object->player == &players[consoleplayer]) if (object->player == &players[consoleplayer])
localangle = spring->angle; localangle = spring->angle;
else if (object->player == &players[secondarydisplayplayer]) else if (object->player == &players[secondarydisplayplayer])
localangle2 = spring->angle; localangle2 = spring->angle;
}
} }
} }