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

Merge branch 'eid-sonic-boom-color' into 'master'

Browse source 
Fix sonic boom colorization

Closes ring-racers#378

See merge request kart-krew-dev/ring-racers-internal!2971
This commit is contained in:
Eidolon 2025-10-26 16:50:22 -05:00
commit 5f0121cca8
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/p_mobj.c
View file

@ -8208,6 +8208,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
invinc_rotation_delay = 8; invinc_rotation_delay = 8;
} }
boolean updatecolor = false;
if ((trans >= NUMTRANSMAPS) || mobj->target->player->flamedash || mobj->target->player->tripwirePass < TRIPWIRE_BOOST) if ((trans >= NUMTRANSMAPS) || mobj->target->player->flamedash || mobj->target->player->tripwirePass < TRIPWIRE_BOOST)
{ {
// never show for flameshield dash, below tripwire minimum or transparency invalid // never show for flameshield dash, below tripwire minimum or transparency invalid
@ -8227,6 +8228,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
// < 150% flickering normally // < 150% flickering normally
mobj->renderflags |= RF_DONTDRAW; mobj->renderflags |= RF_DONTDRAW;
} }
updatecolor = true;
} }
else else
{ {
@ -8239,6 +8241,24 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
} }
mobj->renderflags |= (mobj->target->renderflags & RF_DONTDRAW); mobj->renderflags |= (mobj->target->renderflags & RF_DONTDRAW);
updatecolor = true;
if (blastermode == !(mobj->flags2 & MF2_AMBUSH))
{
mobj->flags2 ^= MF2_AMBUSH;
if (blastermode)
{
P_SetMobjState(mobj, (mobj->extravalue1) ? S_TRIPWIREBOOST_BLAST_BOTTOM : S_TRIPWIREBOOST_BLAST_TOP);
}
else
{
P_SetMobjState(mobj, (mobj->extravalue1) ? S_TRIPWIREBOOST_BOTTOM : S_TRIPWIREBOOST_TOP);
}
}
}
if (updatecolor)
{
if (mobj->target->player->invincibilitytimer > 0) if (mobj->target->player->invincibilitytimer > 0)
{ {
if (mobj->target->player->invincibilitytimer > itemtime+(2*TICRATE)) if (mobj->target->player->invincibilitytimer > itemtime+(2*TICRATE))
@ -8261,19 +8281,6 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
mobj->color = SKINCOLOR_NONE; mobj->color = SKINCOLOR_NONE;
mobj->colorized = false; mobj->colorized = false;
} }
if (blastermode == !(mobj->flags2 & MF2_AMBUSH))
{
mobj->flags2 ^= MF2_AMBUSH;
if (blastermode)
{
P_SetMobjState(mobj, (mobj->extravalue1) ? S_TRIPWIREBOOST_BLAST_BOTTOM : S_TRIPWIREBOOST_BLAST_TOP);
}
else
{
P_SetMobjState(mobj, (mobj->extravalue1) ? S_TRIPWIREBOOST_BOTTOM : S_TRIPWIREBOOST_TOP);
}
}
} }
} }