From 0c4f983eb5f589087f40de0c8a3237f594fb5bba Mon Sep 17 00:00:00 2001
From: Louis-Antoine <lamr@free.fr>
Date: Mon, 11 May 2020 23:48:35 +0200
Subject: [PATCH] Fix crash with rollout rock
---
src/p_user.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/p_user.c b/src/p_user.c
index 02417ccff..f5c8caf72 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -4429,13 +4429,16 @@ void P_DoJump(player_t *player, boolean soundandstate)
else if (player->powers[pw_carry] == CR_ROLLOUT)
{
player->mo->momz = 9*FRACUNIT;
- if (P_MobjFlip(player->mo->tracer)*player->mo->tracer->momz > 0)
- player->mo->momz += player->mo->tracer->momz;
- if (!P_IsObjectOnGround(player->mo->tracer))
- P_SetObjectMomZ(player->mo->tracer, -9*FRACUNIT, true);
+ if (player->mo->tracer)
+ {
+ if (P_MobjFlip(player->mo->tracer)*player->mo->tracer->momz > 0)
+ player->mo->momz += player->mo->tracer->momz;
+ if (!P_IsObjectOnGround(player->mo->tracer))
+ P_SetObjectMomZ(player->mo->tracer, -9*FRACUNIT, true);
+ player->mo->tracer->flags |= MF_PUSHABLE;
+ P_SetTarget(&player->mo->tracer->tracer, NULL);
+ }
player->powers[pw_carry] = CR_NONE;
- player->mo->tracer->flags |= MF_PUSHABLE;
- P_SetTarget(&player->mo->tracer->tracer, NULL);
P_SetTarget(&player->mo->tracer, NULL);
}
else if (player->mo->eflags & MFE_GOOWATER)