From 0bf9ad85c1e42b3739eb8ce8bd608da7d9ec769f Mon Sep 17 00:00:00 2001 From: toaster Date: Tue, 31 Oct 2023 20:13:50 +0000 Subject: [PATCH] Obj_OrbinautJawzCollide: Orbinauts, Jawz, and Gachabom will die on collision with MF_PAIN objects --- src/objects/orbinaut.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/objects/orbinaut.c b/src/objects/orbinaut.c index 4e9483b98..631b6f79e 100644 --- a/src/objects/orbinaut.c +++ b/src/objects/orbinaut.c @@ -255,6 +255,12 @@ boolean Obj_OrbinautJawzCollide(mobj_t *t1, mobj_t *t2) P_DamageMobj(t2, t1, t1->target, 1, DMG_NORMAL); damageitem = true; } + else if (t2->flags & MF_PAIN) + { + // Hazard blocks + P_SpawnMobj(t2->x/2 + t1->x/2, t2->y/2 + t1->y/2, t2->z/2 + t1->z/2, MT_ITEMCLASH); + damageitem = true; + } if (t1->type == MT_GARDENTOP) {