thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Follower-mimicing emblems: Permit them to just sit there if their defined bobamp is 0

Browse source 
This is unlike audience members, which have a minimum jump height
This commit is contained in:
toaster 2023-04-21 17:42:11 +01:00
parent af288571bd
commit 91f4169212
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/objects/audience.c
View file

@ -97,7 +97,7 @@ Obj_AudienceInit
return; return;
// The following is derived from the default bobamp // 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; audience_bobamp(mobj) = 4*mobj->scale;
} }
@ -260,6 +260,11 @@ Obj_AudienceThink
// Skipped frames at spawn for offset in jumping // Skipped frames at spawn for offset in jumping
audience_animoffset(mobj)--; audience_animoffset(mobj)--;
} }
else if (audience_bobamp(mobj) == 0)
{
// Just sit there
;
}
else if (mobj->flags2 & MF2_OBJECTFLIP) else if (mobj->flags2 & MF2_OBJECTFLIP)
{ {
if (mobj->z + mobj->height >= mobj->ceilingz) if (mobj->z + mobj->height >= mobj->ceilingz)