mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge branch 'wpz-fix-take2' into 'master'
Try to ensure this fix doesn't affect whatever might be using tracer See merge request kart-krew-dev/ring-racers-internal!2549
This commit is contained in:
commit
3399f446a8
1 changed files with 7 additions and 1 deletions
|
|
@ -206,13 +206,19 @@ void Obj_playerWPZTurbine(player_t *p)
|
|||
fixed_t momz;
|
||||
|
||||
|
||||
if (!t || P_MobjWasRemoved(t) || t->type != MT_WATERPALACETURBINE || !t->spawnpoint || p->respawn.state != RESPAWNST_NONE)
|
||||
if (!t || P_MobjWasRemoved(t) || p->respawn.state != RESPAWNST_NONE)
|
||||
{
|
||||
p->turbine = false;
|
||||
P_SetTarget(&pmo->tracer, NULL);
|
||||
return; // wtf happened
|
||||
}
|
||||
|
||||
if (t->type != MT_WATERPALACETURBINE)
|
||||
{
|
||||
p->turbine = false;
|
||||
return;
|
||||
}
|
||||
|
||||
mt = t->spawnpoint;
|
||||
|
||||
opt1 = (mt->thing_args[0] != 0);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue