mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-15 09:11:48 +00:00
Fix controllable flight ending when player hits the ground while being carried by Tailsbot
This commit is contained in:
parent
bb67b24143
commit
f682de3f1b
2 changed files with 2 additions and 4 deletions
|
@ -181,7 +181,6 @@ static inline void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cm
|
|||
if (player->powers[pw_carry] == CR_PLAYER && sonic->tracer == tails)
|
||||
{
|
||||
flymode = 2;
|
||||
player->pflags &= ~PF_JUMPED;
|
||||
}
|
||||
}
|
||||
// Read player inputs while carrying
|
||||
|
@ -197,8 +196,7 @@ static inline void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cm
|
|||
else if (!jump_last)
|
||||
jump = true;
|
||||
// End flymode
|
||||
if (player->powers[pw_carry] != CR_PLAYER
|
||||
|| P_IsObjectOnGround(sonic))
|
||||
if (player->powers[pw_carry] != CR_PLAYER)
|
||||
{
|
||||
flymode = 0;
|
||||
}
|
||||
|
|
|
@ -8367,7 +8367,7 @@ static void P_MovePlayer(player_t *player)
|
|||
|
||||
// Tails Put-Put noise
|
||||
if (player->charability == CA_FLY
|
||||
&& player->bot != 1
|
||||
&& (player->pflags & PF_CANCARRY)
|
||||
&& !(player->mo->eflags & MFE_UNDERWATER)
|
||||
&& leveltime % 10 == 0
|
||||
&& !player->spectator)
|
||||
|
|
Loading…
Reference in a new issue