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

Browse source 
Orbfterimages.

Closes #173

See merge request KartKrew/Kart!435
This commit is contained in:
Sal 2021-04-27 17:08:56 -04:00
commit ae3cfc690b
3 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_kart.c
View file

@ -6425,7 +6425,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
ghost->extravalue1 = player->numboosts+1; ghost->extravalue1 = player->numboosts+1;
ghost->extravalue2 = (leveltime % ghost->extravalue1); ghost->extravalue2 = (leveltime % ghost->extravalue1);
ghost->fuse = ghost->extravalue1; ghost->fuse = ghost->extravalue1;
ghost->frame |= FF_FULLBRIGHT; ghost->renderflags |= RF_FULLBRIGHT;
ghost->colorized = true; ghost->colorized = true;
//ghost->color = player->skincolor; //ghost->color = player->skincolor;
//ghost->momx = (3*player->mo->momx)/4; //ghost->momx = (3*player->mo->momx)/4;

2
src/p_enemy.c
View file

@ -11044,7 +11044,7 @@ void A_FadeOverlay(mobj_t *actor)
return; return;
fade = P_SpawnGhostMobj(actor); fade = P_SpawnGhostMobj(actor);
fade->frame = actor->frame; fade->renderflags = actor->renderflags;
if (!(locvar1 & 1)) if (!(locvar1 & 1))
{ {

13
src/p_mobj.c
View file

@ -8507,17 +8507,14 @@ void P_MobjThinker(mobj_t *mobj)
} }
} }
} }
else if (mobj->flags2 & MF2_BOSSNOTRAP) // "fast" flag
{
if ((signed)((mobj->renderflags & RF_TRANSMASK) >> RF_TRANSSHIFT) < (NUMTRANSMAPS-1) - (2*mobj->fuse)/3)
// fade out when nearing the end of fuse...
mobj->renderflags = (mobj->renderflags & ~RF_TRANSMASK) | (((NUMTRANSMAPS-1) - (2*mobj->fuse)/3) << RF_TRANSSHIFT);
}
else else
{ {
if ((signed)((mobj->renderflags & RF_TRANSMASK) >> RF_TRANSSHIFT) < (NUMTRANSMAPS-1) - mobj->fuse / 2) INT32 dur = (mobj->flags2 & MF2_BOSSNOTRAP)
? (2*mobj->fuse)/3
: mobj->fuse/2;
if (((mobj->renderflags & RF_TRANSMASK) >> RF_TRANSSHIFT) < ((NUMTRANSMAPS-1) - dur))
// fade out when nearing the end of fuse... // fade out when nearing the end of fuse...
mobj->renderflags = (mobj->frame & ~RF_TRANSMASK) | (((NUMTRANSMAPS-1) - mobj->fuse / 2) << RF_TRANSSHIFT); mobj->renderflags = (mobj->renderflags & ~RF_TRANSMASK) | (((NUMTRANSMAPS-1) - dur) << RF_TRANSSHIFT);
} }
} }