thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dlz-rockabilly' into 'master'

Browse source 
Dismount DLZ Rocket and Rideroid properly

Closes #1338 and #1357

See merge request KartKrew/Kart!2337
This commit is contained in:
Oni 2024-05-02 02:14:46 +00:00
commit d994b7068d
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/objects/dlzrocket.c
View file

@ -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);
}

2
src/objects/rideroid.c
View file

@ -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;