From cd45bca84840609f034a8c7878cceeca95d28407 Mon Sep 17 00:00:00 2001 From: MascaraSnake <jonassauer27@gmail.com> Date: Sun, 29 Sep 2019 19:51:27 +0200 Subject: [PATCH] Pterabyte: Don't drop off player in the first ten tics after grabbing --- src/p_user.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/p_user.c b/src/p_user.c index ec431a86a4..54429c8f86 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -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; } -- GitLab