Merge branch 'agz-bulb-arg' into 'master'

Add thing argument to discard player momentum to AGZ Bulb Launcher

See merge request KartKrew/Kart!2078
This commit is contained in:
James R. 2024-03-11 00:15:59 +00:00
commit 10d85bd831

View file

@ -256,8 +256,14 @@ void Obj_BulbTouched(mobj_t *special, mobj_t *toucher)
toucher->player->tulip = 8*2 +1;
fixed_t spd = FixedHypot(toucher->momx, toucher->momy);
angle_t ang = R_PointToAngle2(0, 0, toucher->momx, toucher->momy);
fixed_t spd = 0;
angle_t ang = 0;
if (!special->spawnpoint || special->spawnpoint->thing_args[0] == 0)
{
spd = FixedHypot(toucher->momx, toucher->momy);
ang = R_PointToAngle2(0, 0, toucher->momx, toucher->momy);
}
P_InstaThrust(toucher, 0, 0);
P_MoveOrigin(toucher, special->x, special->y, special->z);