From 3af15ce7f3e8e7953a4482a8dd159fa6efc57327 Mon Sep 17 00:00:00 2001 From: Lach Date: Mon, 11 Mar 2024 09:49:34 +1100 Subject: [PATCH] Add thing argument to discard player momentum to AGZ Bulb Launcher --- src/objects/cloud.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/objects/cloud.c b/src/objects/cloud.c index 7eeaed95a..475e24bd4 100644 --- a/src/objects/cloud.c +++ b/src/objects/cloud.c @@ -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);