From 91f4169212299e554ecd073d37e7db5ddf06fa2b Mon Sep 17 00:00:00 2001 From: toaster Date: Fri, 21 Apr 2023 17:42:11 +0100 Subject: [PATCH] Follower-mimicing emblems: Permit them to just sit there if their defined bobamp is 0 This is unlike audience members, which have a minimum jump height --- src/objects/audience.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/objects/audience.c b/src/objects/audience.c index aba436013..2218e744a 100644 --- a/src/objects/audience.c +++ b/src/objects/audience.c @@ -97,7 +97,7 @@ Obj_AudienceInit return; // The following is derived from the default bobamp - if (!(mobj->flags & MF_NOGRAVITY) && followers[followerpick].bobamp < 4*FRACUNIT) + if (mobj->type != MT_EMBLEM && !(mobj->flags & MF_NOGRAVITY) && followers[followerpick].bobamp < 4*FRACUNIT) { audience_bobamp(mobj) = 4*mobj->scale; } @@ -260,6 +260,11 @@ Obj_AudienceThink // Skipped frames at spawn for offset in jumping audience_animoffset(mobj)--; } + else if (audience_bobamp(mobj) == 0) + { + // Just sit there + ; + } else if (mobj->flags2 & MF2_OBJECTFLIP) { if (mobj->z + mobj->height >= mobj->ceilingz)