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 'swingstuff' into 'master'

Browse source 
Maces now have their fadeytrails again

See merge request KartKrew/Kart!418
This commit is contained in:
Sal 2021-04-16 20:34:04 -04:00
commit f131cda6e6
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/p_mobj.c
View file

@ -5035,6 +5035,10 @@ static void P_MobjSceneryThink(mobj_t *mobj)
case MT_HIDDEN_SLING: case MT_HIDDEN_SLING:
P_MaceSceneryThink(mobj); P_MaceSceneryThink(mobj);
break; break;
case MT_SMALLMACE:
case MT_BIGMACE:
P_SpawnGhostMobj(mobj)->tics = 8;
break;
case MT_HOOP: case MT_HOOP:
if (mobj->fuse > 1) if (mobj->fuse > 1)
P_MoveHoop(mobj); P_MoveHoop(mobj);
@ -8749,15 +8753,15 @@ void P_MobjThinker(mobj_t *mobj)
{ {
if (mobj->flags2 & MF2_BOSSNOTRAP) // "fast" flag if (mobj->flags2 & MF2_BOSSNOTRAP) // "fast" flag
{ {
if ((signed)((mobj->frame & FF_TRANSMASK) >> FF_TRANSSHIFT) < (NUMTRANSMAPS-1) - (2*mobj->fuse)/3) if ((signed)((mobj->renderflags & RF_TRANSMASK) >> RF_TRANSSHIFT) < (NUMTRANSMAPS-1) - (2*mobj->fuse)/3)
// fade out when nearing the end of fuse... // fade out when nearing the end of fuse...
mobj->frame = (mobj->frame & ~FF_TRANSMASK) | (((NUMTRANSMAPS-1) - (2*mobj->fuse)/3) << FF_TRANSSHIFT); mobj->renderflags = (mobj->renderflags & ~RF_TRANSMASK) | (((NUMTRANSMAPS-1) - (2*mobj->fuse)/3) << RF_TRANSSHIFT);
} }
else else
{ {
if ((signed)((mobj->frame & FF_TRANSMASK) >> FF_TRANSSHIFT) < (NUMTRANSMAPS-1) - mobj->fuse / 2) if ((signed)((mobj->renderflags & RF_TRANSMASK) >> RF_TRANSSHIFT) < (NUMTRANSMAPS-1) - mobj->fuse / 2)
// fade out when nearing the end of fuse... // fade out when nearing the end of fuse...
mobj->frame = (mobj->frame & ~FF_TRANSMASK) | (((NUMTRANSMAPS-1) - mobj->fuse / 2) << FF_TRANSSHIFT); mobj->renderflags = (mobj->frame & ~RF_TRANSMASK) | (((NUMTRANSMAPS-1) - mobj->fuse / 2) << RF_TRANSSHIFT);
} }
} }