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 'wpz-fix-take2' into 'master'

Browse source 
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:
Oni VelocitOni 2025-05-18 19:27:35 +00:00
commit 3399f446a8
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/objects/wpzturbine.c
View file

@ -206,13 +206,19 @@ void Obj_playerWPZTurbine(player_t *p)
fixed_t momz; 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->turbine = false;
P_SetTarget(&pmo->tracer, NULL); P_SetTarget(&pmo->tracer, NULL);
return; // wtf happened return; // wtf happened
} }
if (t->type != MT_WATERPALACETURBINE)
{
p->turbine = false;
return;
}
mt = t->spawnpoint; mt = t->spawnpoint;
opt1 = (mt->thing_args[0] != 0); opt1 = (mt->thing_args[0] != 0);