Make capsule bubbles semibright, & fix ring capsule caps not being semibright

This commit is contained in:
lachablock 2021-06-15 15:16:59 +10:00
parent e981de3c33
commit 04ed130d24
2 changed files with 5 additions and 5 deletions

View file

@ -1916,7 +1916,7 @@ void K_MatchGenericExtraFlags(mobj_t *mo, mobj_t *master)
K_FlipFromObject(mo, master); K_FlipFromObject(mo, master);
// visibility (usually for hyudoro) // visibility (usually for hyudoro)
mo->renderflags = (master->renderflags & RF_DONTDRAW); mo->renderflags = (mo->renderflags & ~RF_DONTDRAW) | (master->renderflags & RF_DONTDRAW);
} }
// same as above, but does not adjust Z height when flipping // same as above, but does not adjust Z height when flipping
@ -1927,7 +1927,7 @@ void K_GenericExtraFlagsNoZAdjust(mobj_t *mo, mobj_t *master)
mo->flags2 = (mo->flags2 & ~MF2_OBJECTFLIP)|(master->flags2 & MF2_OBJECTFLIP); mo->flags2 = (mo->flags2 & ~MF2_OBJECTFLIP)|(master->flags2 & MF2_OBJECTFLIP);
// visibility (usually for hyudoro) // visibility (usually for hyudoro)
mo->renderflags = (master->renderflags & RF_DONTDRAW); mo->renderflags = (mo->renderflags & ~RF_DONTDRAW) | (master->renderflags & RF_DONTDRAW);
} }

View file

@ -14672,12 +14672,12 @@ void P_RefreshItemCapsuleParts(mobj_t *mobj)
// update invincibility properties // update invincibility properties
if (itemType == KITEM_INVINCIBILITY) if (itemType == KITEM_INVINCIBILITY)
{ {
mobj->renderflags |= RF_FULLBRIGHT; mobj->renderflags = (mobj->renderflags & ~RF_BRIGHTMASK) | RF_FULLBRIGHT;
mobj->colorized = true; mobj->colorized = true;
} }
else else
{ {
mobj->renderflags &= ~RF_FULLBRIGHT; mobj->renderflags = (mobj->renderflags & ~RF_BRIGHTMASK) | RF_SEMIBRIGHT;
mobj->color = SKINCOLOR_NONE; mobj->color = SKINCOLOR_NONE;
mobj->colorized = false; mobj->colorized = false;
} }
@ -14768,7 +14768,7 @@ void P_RefreshItemCapsuleParts(mobj_t *mobj)
part = part->hnext; part = part->hnext;
part->color = color; part->color = color;
part->colorized = colorized; part->colorized = colorized;
part->renderflags = (part->renderflags & ~RF_SEMIBRIGHT) | newRenderFlags; part->renderflags = (part->renderflags & ~RF_BRIGHTMASK) | newRenderFlags;
} }
} }