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

Fix controllable flight ending when player hits the ground while being carried by Tailsbot

This commit is contained in:
lachwright 2019-11-18 15:55:55 +08:00
parent bb67b24143
commit f682de3f1b
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/b_bot.c
View File

@ -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) if (player->powers[pw_carry] == CR_PLAYER && sonic->tracer == tails)
{ {
flymode = 2; flymode = 2;
player->pflags &= ~PF_JUMPED;
} }
} }
// Read player inputs while carrying // 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) else if (!jump_last)
jump = true; jump = true;
// End flymode // End flymode
if (player->powers[pw_carry] != CR_PLAYER if (player->powers[pw_carry] != CR_PLAYER)
|| P_IsObjectOnGround(sonic))
{ {
flymode = 0; flymode = 0;
} }

2
src/p_user.c
View File

@ -8367,7 +8367,7 @@ static void P_MovePlayer(player_t *player)
// Tails Put-Put noise // Tails Put-Put noise
if (player->charability == CA_FLY if (player->charability == CA_FLY
&& player->bot != 1 && (player->pflags & PF_CANCARRY)
&& !(player->mo->eflags & MFE_UNDERWATER) && !(player->mo->eflags & MFE_UNDERWATER)
&& leveltime % 10 == 0 && leveltime % 10 == 0
&& !player->spectator) && !player->spectator)