stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

ensure the new flag is cleared properly

Browse source
This commit is contained in:
katsy 2020-12-05 23:17:01 -05:00
parent 8541409329
commit 3dbb44e7b1
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_user.c
View file

@ -1085,6 +1085,9 @@ void P_ResetPlayer(player_t *player)
player->powers[pw_carry] = CR_NONE; player->powers[pw_carry] = CR_NONE;
} }
if (player->powers[pw_carry] == CR_MACESPIN || player->powers[pw_carry] == CR_GENERIC)
player->mo->flags &= ~MF_NOCLIPHEIGHT;
if (!(player->powers[pw_carry] == CR_NIGHTSMODE || player->powers[pw_carry] == CR_NIGHTSFALL || player->powers[pw_carry] == CR_BRAKGOOP || player->powers[pw_carry] == CR_MINECART)) if (!(player->powers[pw_carry] == CR_NIGHTSMODE || player->powers[pw_carry] == CR_NIGHTSFALL || player->powers[pw_carry] == CR_BRAKGOOP || player->powers[pw_carry] == CR_MINECART))
player->powers[pw_carry] = CR_NONE; player->powers[pw_carry] = CR_NONE;
@ -4426,6 +4429,8 @@ void P_DoJump(player_t *player, boolean soundandstate)
if (!(player->mo->tracer->flags & MF_MISSILE)) // Missiles remember their owner! if (!(player->mo->tracer->flags & MF_MISSILE)) // Missiles remember their owner!
P_SetTarget(&player->mo->tracer->target, NULL); P_SetTarget(&player->mo->tracer->target, NULL);
P_SetTarget(&player->mo->tracer, NULL); P_SetTarget(&player->mo->tracer, NULL);
player->mo->flags &= ~MF_NOCLIPHEIGHT;
} }
else if (player->powers[pw_carry] == CR_ROPEHANG) else if (player->powers[pw_carry] == CR_ROPEHANG)
{ {
@ -5257,6 +5262,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
player->powers[pw_carry] = CR_NONE; player->powers[pw_carry] = CR_NONE;
P_SetTarget(&player->mo->tracer, NULL); P_SetTarget(&player->mo->tracer, NULL);
player->powers[pw_flashing] = TICRATE/4; player->powers[pw_flashing] = TICRATE/4;
player->mo->flags &= ~MF_NOCLIPHEIGHT;
} }
// can't jump while in air, can't jump while jumping // can't jump while in air, can't jump while jumping
else if (onground || player->climbing || player->powers[pw_carry]) else if (onground || player->climbing || player->powers[pw_carry])