From 04ed130d244f37a7e59585a60c48cec0e45e28b6 Mon Sep 17 00:00:00 2001 From: lachablock Date: Tue, 15 Jun 2021 15:16:59 +1000 Subject: [PATCH] Make capsule bubbles semibright, & fix ring capsule caps not being semibright --- src/k_kart.c | 4 ++-- src/p_enemy.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index f2a2fe9d2..0a06d9542 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -1916,7 +1916,7 @@ void K_MatchGenericExtraFlags(mobj_t *mo, mobj_t *master) K_FlipFromObject(mo, master); // 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 @@ -1927,7 +1927,7 @@ void K_GenericExtraFlagsNoZAdjust(mobj_t *mo, mobj_t *master) mo->flags2 = (mo->flags2 & ~MF2_OBJECTFLIP)|(master->flags2 & MF2_OBJECTFLIP); // visibility (usually for hyudoro) - mo->renderflags = (master->renderflags & RF_DONTDRAW); + mo->renderflags = (mo->renderflags & ~RF_DONTDRAW) | (master->renderflags & RF_DONTDRAW); } diff --git a/src/p_enemy.c b/src/p_enemy.c index d40e449bc..61e25c153 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -14672,12 +14672,12 @@ void P_RefreshItemCapsuleParts(mobj_t *mobj) // update invincibility properties if (itemType == KITEM_INVINCIBILITY) { - mobj->renderflags |= RF_FULLBRIGHT; + mobj->renderflags = (mobj->renderflags & ~RF_BRIGHTMASK) | RF_FULLBRIGHT; mobj->colorized = true; } else { - mobj->renderflags &= ~RF_FULLBRIGHT; + mobj->renderflags = (mobj->renderflags & ~RF_BRIGHTMASK) | RF_SEMIBRIGHT; mobj->color = SKINCOLOR_NONE; mobj->colorized = false; } @@ -14768,7 +14768,7 @@ void P_RefreshItemCapsuleParts(mobj_t *mobj) part = part->hnext; part->color = color; part->colorized = colorized; - part->renderflags = (part->renderflags & ~RF_SEMIBRIGHT) | newRenderFlags; + part->renderflags = (part->renderflags & ~RF_BRIGHTMASK) | newRenderFlags; } }