Merge branch 'dlz-rockabilly' into 'master'

Dismount DLZ Rocket and Rideroid properly

Closes #1338 and #1357

See merge request KartKrew/Kart!2337

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->tumbleHeight)
+	|| p->spinouttimer || p->wipeoutslow || p->tumbleBounces
+	|| p->respawn.state != RESPAWNST_NONE)
 		Obj_DLZRocketDismount(p);
 }

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;