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

Tightened some restrictions on Tails carry because right now the looseness leads to edge case noise spam when trying to pick up a player off a rope hang, for example.

Browse source
This commit is contained in:
toasterbabe 2016-09-24 12:38:37 +01:00
parent 41b4d9c565
commit eb64e4ccd9
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/p_map.c
View file

@ -302,9 +302,9 @@ static void P_DoTailsCarry(player_t *sonic, player_t *tails)
INT32 p;
fixed_t zdist; // z distance between the two players' bottoms
if (tails->powers[pw_carry] == CR_PLAYER)// && tails->mo->tracer == sonic->mo) <-- why was this here?
if (tails->powers[pw_carry])// && tails->mo->tracer == sonic->mo) <-- why was this here?
return;
if (sonic->powers[pw_carry] == CR_PLAYER && sonic->mo->tracer == tails->mo)
if (sonic->powers[pw_carry])
return;
if (tails->charability != CA_FLY && tails->charability != CA_SWIM)
@ -319,9 +319,6 @@ static void P_DoTailsCarry(player_t *sonic, player_t *tails)
if (sonic->pflags & PF_NIGHTSMODE)
return;
if (sonic->mo->tracer && sonic->powers[pw_carry] == CR_ZOOMTUBE)
return; // don't steal players from zoomtubes!
if ((sonic->mo->eflags & MFE_VERTICALFLIP) != (tails->mo->eflags & MFE_VERTICALFLIP))
return; // Both should be in same gravity