From e88c162161f6ad69bf1efd5f73bc58a8f0767cf1 Mon Sep 17 00:00:00 2001 From: toaster Date: Thu, 2 May 2024 00:45:28 +0100 Subject: [PATCH] Also dismount DLZ rocket/rideroid if respawning for any reason --- src/objects/dlzrocket.c | 3 ++- src/objects/rideroid.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/objects/dlzrocket.c b/src/objects/dlzrocket.c index e91f420e5..36547c369 100644 --- a/src/objects/dlzrocket.c +++ b/src/objects/dlzrocket.c @@ -196,6 +196,7 @@ void Obj_playerDLZRocket(player_t *p) } if ((p->dlzrocket > 10 && (P_IsObjectOnGround(p->mo) || p->mo->eflags & MFE_JUSTBOUNCEDWALL)) - || p->spinouttimer || p->wipeoutslow || p->tumbleBounces) + || p->spinouttimer || p->wipeoutslow || p->tumbleBounces + || p->respawn.state != RESPAWNST_NONE) Obj_DLZRocketDismount(p); } diff --git a/src/objects/rideroid.c b/src/objects/rideroid.c index 4492212fa..7670944bd 100644 --- a/src/objects/rideroid.c +++ b/src/objects/rideroid.c @@ -314,7 +314,7 @@ void Obj_RideroidThink(mobj_t *mo) // if we hit a wall or get hit, get off of the rideroid. - if (pmo->eflags & MFE_JUSTBOUNCEDWALL || P_PlayerInPain(p)) + if (pmo->eflags & MFE_JUSTBOUNCEDWALL || P_PlayerInPain(p) || p->respawn.state != RESPAWNST_NONE) { Obj_explodeRideroid(mo); return;