From b46bfc8766007eff6febcfb73b2f43ca9b5ec6d4 Mon Sep 17 00:00:00 2001 From: James R Date: Tue, 15 Aug 2023 00:42:30 -0700 Subject: [PATCH] Obj_JawzThrown: chase UFO Catcher immediately Done here so Jawz fulfills water running condition during K_SpawnKartMissile. --- src/objects/jawz.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/objects/jawz.c b/src/objects/jawz.c index 0f952551a..562e6848b 100644 --- a/src/objects/jawz.c +++ b/src/objects/jawz.c @@ -255,12 +255,14 @@ void Obj_JawzThink(mobj_t *th) void Obj_JawzThrown(mobj_t *th, fixed_t finalSpeed, SINT8 dir) { INT32 lastTarg = -1; + player_t *owner = NULL; if (jawz_owner(th) != NULL && P_MobjWasRemoved(jawz_owner(th)) == false && jawz_owner(th)->player != NULL) { lastTarg = jawz_owner(th)->player->lastjawztarget; jawz_retcolor(th) = jawz_owner(th)->player->skincolor; + owner = jawz_owner(th)->player; } else { @@ -297,6 +299,14 @@ void Obj_JawzThrown(mobj_t *th, fixed_t finalSpeed, SINT8 dir) P_SetTarget(&jawz_chase(th), tryPlayer->mo); } } + + // Sealed Star: target the UFO immediately. I don't + // wanna fuck with the lastjawztarget stuff, so just + // do this if a target wasn't set. + if (jawz_chase(th) == NULL || P_MobjWasRemoved(jawz_chase(th)) == true) + { + P_SetTarget(&jawz_chase(th), K_FindJawzTarget(th, owner, ANGLE_90)); + } } S_StartSound(th, th->info->activesound);