thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-28 04:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix boss flash in opengl

Browse source
This commit is contained in:
James R 2022-03-21 13:05:01 -07:00
parent fbe3106890
commit 6dd38f001a
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/hardware/hw_main.c
View file

@ -5444,10 +5444,11 @@ static void HWR_ProjectSprite(mobj_t *thing)
vis->mobj = thing; vis->mobj = thing;
//Hurdler: 25/04/2000: now support colormap in hardware mode //Hurdler: 25/04/2000: now support colormap in hardware mode
if (vis->mobj->hitlag > 0 && (vis->mobj->eflags & MFE_DAMAGEHITLAG)) if (R_ThingIsFlashing(vis->mobj))
{ {
vis->colormap = R_GetTranslationColormap(TC_HITLAG, 0, GTC_CACHE); vis->colormap = R_GetTranslationColormap(TC_HITLAG, 0, GTC_CACHE);
} }
/*
else if ((vis->mobj->flags & (MF_ENEMY|MF_BOSS)) && (vis->mobj->flags2 & MF2_FRET) && !(vis->mobj->flags & MF_GRENADEBOUNCE) && (leveltime & 1)) // Bosses "flash" else if ((vis->mobj->flags & (MF_ENEMY|MF_BOSS)) && (vis->mobj->flags2 & MF2_FRET) && !(vis->mobj->flags & MF_GRENADEBOUNCE) && (leveltime & 1)) // Bosses "flash"
{ {
if (vis->mobj->type == MT_CYBRAKDEMON || vis->mobj->colorized) if (vis->mobj->type == MT_CYBRAKDEMON || vis->mobj->colorized)
@ -5457,6 +5458,7 @@ static void HWR_ProjectSprite(mobj_t *thing)
else else
vis->colormap = R_GetTranslationColormap(TC_BOSS, 0, GTC_CACHE); vis->colormap = R_GetTranslationColormap(TC_BOSS, 0, GTC_CACHE);
} }
*/
else if (thing->color) else if (thing->color)
{ {
// New colormap stuff for skins Tails 06-07-2002 // New colormap stuff for skins Tails 06-07-2002

4
src/hardware/hw_md2.c
View file

@ -1499,10 +1499,11 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
{ {
INT32 skinnum = TC_DEFAULT; INT32 skinnum = TC_DEFAULT;
if (spr->mobj->hitlag > 0 && (spr->mobj->eflags & MFE_DAMAGEHITLAG)) if (R_ThingIsFlashing(spr->mobj))
{ {
skinnum = TC_HITLAG; skinnum = TC_HITLAG;
} }
/*
else if ((spr->mobj->flags & (MF_ENEMY|MF_BOSS)) && (spr->mobj->flags2 & MF2_FRET) && !(spr->mobj->flags & MF_GRENADEBOUNCE) && (leveltime & 1)) // Bosses "flash" else if ((spr->mobj->flags & (MF_ENEMY|MF_BOSS)) && (spr->mobj->flags2 & MF2_FRET) && !(spr->mobj->flags & MF_GRENADEBOUNCE) && (leveltime & 1)) // Bosses "flash"
{ {
if (spr->mobj->type == MT_CYBRAKDEMON || spr->mobj->colorized) if (spr->mobj->type == MT_CYBRAKDEMON || spr->mobj->colorized)
@ -1512,6 +1513,7 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
else else
skinnum = TC_BOSS; skinnum = TC_BOSS;
} }
*/
else if ((skincolornum_t)spr->mobj->color != SKINCOLOR_NONE) else if ((skincolornum_t)spr->mobj->color != SKINCOLOR_NONE)
{ {
if (spr->mobj->colorized) if (spr->mobj->colorized)