incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bring bubble renderflag stuff out of bubblecool conditional

Browse source
This commit is contained in:
minenice55 2025-11-01 02:18:41 -04:00
parent 8616d26833
commit 6d18483ffd
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/p_mobj.c
View file

@ -9173,6 +9173,12 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
}
fixed_t scale = 5*player->mo->scale/4;
if (cv_kartbubble_defense_canidle.value && player->bubbleblowup == 0 && player->bubblecool > 0)
mobj->renderflags |= RF_GHOSTLY;
else if ((!cv_kartbubble_defense_canidle.value) && !K_IsBubbleDefending(player))
mobj->renderflags |= (RF_TRANS40 | RF_FULLBRIGHT);
else
mobj->renderflags &= ~RF_GHOSTLYMASK;
if (player->bubblecool)
{
@ -9183,12 +9189,6 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
P_SetMobjState(mobj, S_BUBBLESHIELDBLOWUP);
mobj->angle += ANGLE_22h;
if (cv_kartbubble_defense_canidle.value && player->bubbleblowup == 0 && player->bubblecool > 0)
mobj->renderflags |= RF_GHOSTLY;
else if ((!cv_kartbubble_defense_canidle.value) && !K_IsBubbleDefending(player))
mobj->renderflags |= RF_GHOSTLY;
else
mobj->renderflags &= ~RF_GHOSTLYMASK;
fixed_t stretch = 0;
if (player->bubblecool >= bubbletime) // overcharge
@ -9240,7 +9240,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
else
{
mobj->angle = player->mo->angle;
mobj->renderflags &= ~RF_GHOSTLYMASK;
// mobj->renderflags &= ~RF_GHOSTLYMASK;
mobj->colorized = false;
mobj->color = SKINCOLOR_BLUE;