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

Corrected multiple oversights with swimming players dropping their friends when they shouldn't.

This commit is contained in:
toasterbabe 2016-09-08 14:38:57 +01:00
parent df7b375f05
commit 941bf8eb03
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/p_map.c
View File

@ -307,7 +307,10 @@ static void P_DoTailsCarry(player_t *sonic, player_t *tails)
if ((sonic->pflags & PF_CARRIED) && sonic->mo->tracer == tails->mo)
return;
if (!tails->powers[pw_tailsfly] && !(tails->charability == CA_FLY && tails->mo->state-states == S_PLAY_FLY_TIRED))
if (tails->charability != CA_FLY && tails->charability != CA_SWIM)
return;
if (!tails->powers[pw_tailsfly] && tails->mo->state-states != S_PLAY_FLY_TIRED)
return;
if (tails->bot == 1)

2
src/p_user.c
View File

@ -9405,7 +9405,7 @@ void P_PlayerAfterThink(player_t *player)
player->mo->height = FixedDiv(P_GetPlayerHeight(player), FixedDiv(14*FRACUNIT,10*FRACUNIT));
if (player->mo->tracer->player
&& player->mo->tracer->state-states != S_PLAY_FLY
&& !player->mo->tracer->player->powers[pw_tailsfly]
&& player->mo->tracer->state-states != S_PLAY_FLY_TIRED)
player->pflags &= ~PF_CARRIED;