stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-22 10:52:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Pterabyte: Don't drop off player in the first ten tics after grabbing

Browse source
This commit is contained in:
MascaraSnake 2019-09-29 19:51:27 +02:00
parent c00144a4f8
commit cd45bca848
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_user.c
View file

@ -11930,7 +11930,7 @@ void P_PlayerAfterThink(player_t *player)
if (ptera->health <= 0)
goto dropoff;
if (P_MobjAboveLava(ptera))
if (P_MobjAboveLava(ptera) && ptera->movefactor <= 3*TICRATE - 10)
goto dropoff;
if (player->mo->eflags & MFE_VERTICALFLIP)
@ -11939,7 +11939,7 @@ void P_PlayerAfterThink(player_t *player)
&& (ptera->eflags & MFE_VERTICALFLIP)) // Reverse gravity check for the carrier - Flame
player->mo->z = ptera->z + ptera->height + FixedMul(FRACUNIT, player->mo->scale);
if (ptera->ceilingz - ptera->z > spawnpoint->ceilingz - spawnpoint->z + 512*FRACUNIT)
if (ptera->ceilingz - ptera->z > spawnpoint->ceilingz - spawnpoint->z + 512*FRACUNIT && ptera->movefactor <= 3 * TICRATE - 10)
goto dropoff;
}
else
@ -11948,7 +11948,7 @@ void P_PlayerAfterThink(player_t *player)
&& !(ptera->eflags & MFE_VERTICALFLIP)) // Correct gravity check for the carrier - Flame
player->mo->z = ptera->z - player->mo->height - FixedMul(FRACUNIT, player->mo->scale);
if (ptera->z - ptera->floorz > spawnpoint->z - spawnpoint->floorz + 512 * FRACUNIT)
if (ptera->z - ptera->floorz > spawnpoint->z - spawnpoint->floorz + 512 * FRACUNIT && ptera->movefactor <= 3 * TICRATE - 10)
goto dropoff;
}