mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Also dismount DLZ rocket/rideroid if respawning for any reason
This commit is contained in:
parent
f2de83843b
commit
e88c162161
2 changed files with 3 additions and 2 deletions
|
|
@ -196,6 +196,7 @@ void Obj_playerDLZRocket(player_t *p)
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((p->dlzrocket > 10 && (P_IsObjectOnGround(p->mo) || p->mo->eflags & MFE_JUSTBOUNCEDWALL))
|
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);
|
Obj_DLZRocketDismount(p);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -314,7 +314,7 @@ void Obj_RideroidThink(mobj_t *mo)
|
||||||
|
|
||||||
|
|
||||||
// if we hit a wall or get hit, get off of the rideroid.
|
// 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);
|
Obj_explodeRideroid(mo);
|
||||||
return;
|
return;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue