thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 20:11:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix missing bubbles on underwater WPZ turbines

Browse source
This commit is contained in:
Lat 2023-09-24 17:08:59 +02:00
parent b1c1b658da
commit 0aa6d8c86b
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/objects/wpzturbine.c
View file

@ -94,7 +94,7 @@ static void Obj_WPZTurbineUpdate(mobj_t *mo)
} }
// bubbles if we're underwater // bubbles if we're underwater
if (mo->eflags & MFE_UNDERWATER && leveltime%(TICRATE/2) == 0) if (mo->z < mo->watertop && leveltime%10 == 0)
{ {
INT32 dradius = TURBINE_SPIN; INT32 dradius = TURBINE_SPIN;
@ -106,7 +106,7 @@ static void Obj_WPZTurbineUpdate(mobj_t *mo)
if (mt->thing_args[7]) if (mt->thing_args[7])
dradius = mt->thing_args[7]; dradius = mt->thing_args[7];
bubbleradius = P_RandomRange(PR_FUZZ, dradius/4, dradius); bubbleradius = P_RandomRange(PR_FUZZ, dradius/4, (dradius*3)/2);
bubbleang = P_RandomRange(PR_FUZZ, 0, 359)*ANG1; bubbleang = P_RandomRange(PR_FUZZ, 0, 359)*ANG1;
bx = mo->x + FixedMul(mapobjectscale, bubbleradius*FINECOSINE(bubbleang>>ANGLETOFINESHIFT)); bx = mo->x + FixedMul(mapobjectscale, bubbleradius*FINECOSINE(bubbleang>>ANGLETOFINESHIFT));
@ -357,13 +357,13 @@ void Obj_WPZBubbleThink(mobj_t *mo)
return; return;
} }
mt = mo->spawnpoint; mt = t->spawnpoint;
if (!mt) if (!mt)
return; return;
mo->momz = mapobjectscale*16; mo->momz = mapobjectscale*16;
tx = mo->tracer->x + FixedMul(mapobjectscale, mo->movefactor*FINECOSINE(ang>>ANGLETOFINESHIFT)); tx = t->x + FixedMul(mapobjectscale, mo->movecount*FINECOSINE(ang>>ANGLETOFINESHIFT));
ty = mo->tracer->y + FixedMul(mapobjectscale, mo->movefactor*FINESINE(ang>>ANGLETOFINESHIFT)); ty = t->y + FixedMul(mapobjectscale, mo->movecount*FINESINE(ang>>ANGLETOFINESHIFT));
mo->momx = (tx - mo->x)/24; mo->momx = (tx - mo->x)/24;
mo->momy = (ty - mo->y)/24; mo->momy = (ty - mo->y)/24;
@ -382,4 +382,7 @@ void Obj_WPZBubbleThink(mobj_t *mo)
} }
mo->angle += 3*ANG1 * (mt->thing_args[0] ? -1 : 1); mo->angle += 3*ANG1 * (mt->thing_args[0] ? -1 : 1);
if (mo->z > mo->watertop || mo->z > mo->ceilingz)
P_RemoveMobj(mo);
} }