Fix flipcam playerflag sticking
This commit is contained in:
parent
c8d5ef46be
commit
04d3cea9e6
3 changed files with 2 additions and 5 deletions
|
|
@ -1895,7 +1895,7 @@ void WeaponPref_Parse(UINT8 **cp, INT32 playernum)
|
||||||
|
|
||||||
UINT8 prefs = READUINT8(*cp);
|
UINT8 prefs = READUINT8(*cp);
|
||||||
|
|
||||||
player->pflags &= ~(PF_KICKSTARTACCEL|PF_SHRINKME);
|
player->pflags &= ~(PF_KICKSTARTACCEL|PF_SHRINKME|PF_FLIPCAM);
|
||||||
|
|
||||||
if (prefs & WP_KICKSTARTACCEL)
|
if (prefs & WP_KICKSTARTACCEL)
|
||||||
player->pflags |= PF_KICKSTARTACCEL;
|
player->pflags |= PF_KICKSTARTACCEL;
|
||||||
|
|
|
||||||
|
|
@ -2545,9 +2545,6 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
|
||||||
starposttime = players[player].starposttime;
|
starposttime = players[player].starposttime;
|
||||||
prevcheck = players[player].prevcheck;
|
prevcheck = players[player].prevcheck;
|
||||||
prevcheck = players[player].nextcheck;
|
prevcheck = players[player].nextcheck;
|
||||||
|
|
||||||
pflags |= (players[player].pflags & (PF_STASIS|PF_ELIMINATED|PF_NOCONTEST|PF_LOSTLIFE|PF_FLIPCAM));
|
|
||||||
|
|
||||||
lastsafelap = players[player].lastsafelap;
|
lastsafelap = players[player].lastsafelap;
|
||||||
lastsafestarpost = players[player].lastsafestarpost;
|
lastsafestarpost = players[player].lastsafestarpost;
|
||||||
bigwaypointgap = players[player].bigwaypointgap;
|
bigwaypointgap = players[player].bigwaypointgap;
|
||||||
|
|
|
||||||
|
|
@ -3558,7 +3558,7 @@ void P_DestroyRobots(void)
|
||||||
// the below is chasecam only, if you're curious. check out P_CalcPostImg in p_user.c for first person
|
// the below is chasecam only, if you're curious. check out P_CalcPostImg in p_user.c for first person
|
||||||
void P_CalcChasePostImg(player_t *player, camera_t *thiscam)
|
void P_CalcChasePostImg(player_t *player, camera_t *thiscam)
|
||||||
{
|
{
|
||||||
const boolean flipcam = (player->pflags & PF_FLIPCAM && player->mo->eflags & MFE_VERTICALFLIP);
|
const boolean flipcam = ((player->pflags & PF_FLIPCAM) && (player->mo->eflags & MFE_VERTICALFLIP));
|
||||||
UINT8 postimgtype = 0;
|
UINT8 postimgtype = 0;
|
||||||
|
|
||||||
// This can happen when joining
|
// This can happen when joining
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue