lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'horizontal-springs' into 'master' 

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
parent 00d64c380d 9771087554
commit 7fe0636463
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/p_map.c
View File

@ -345,8 +345,6 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
if (horizspeed)
{
object->player->drawangle = spring->angle;
if (vertispeed || (object->player->cmd.forwardmove == 0 && object->player->cmd.sidemove == 0))
{
object->angle = spring->angle;
if (!demoplayback || P_AnalogMove(object->player))
@ -357,7 +355,6 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
localangle2 = spring->angle;
}
}
}
pflags = object->player->pflags & (PF_STARTJUMP|PF_JUMPED|PF_NOJUMPDAMAGE|PF_SPINNING|PF_THOKKED|PF_BOUNCING); // I still need these.
secondjump = object->player->secondjump;