From 6dd38f001ab7222e525957ce73389a92b50ba102 Mon Sep 17 00:00:00 2001 From: James R Date: Mon, 21 Mar 2022 13:05:01 -0700 Subject: [PATCH] Fix boss flash in opengl --- src/hardware/hw_main.c | 4 +++- src/hardware/hw_md2.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 1d3f1785a..bbaf26e99 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -5444,10 +5444,11 @@ static void HWR_ProjectSprite(mobj_t *thing) vis->mobj = thing; //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); } + /* 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) @@ -5457,6 +5458,7 @@ static void HWR_ProjectSprite(mobj_t *thing) else vis->colormap = R_GetTranslationColormap(TC_BOSS, 0, GTC_CACHE); } + */ else if (thing->color) { // New colormap stuff for skins Tails 06-07-2002 diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c index 38b151d91..45379dfcb 100644 --- a/src/hardware/hw_md2.c +++ b/src/hardware/hw_md2.c @@ -1499,10 +1499,11 @@ boolean HWR_DrawModel(gl_vissprite_t *spr) { INT32 skinnum = TC_DEFAULT; - if (spr->mobj->hitlag > 0 && (spr->mobj->eflags & MFE_DAMAGEHITLAG)) + if (R_ThingIsFlashing(spr->mobj)) { 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" { if (spr->mobj->type == MT_CYBRAKDEMON || spr->mobj->colorized) @@ -1512,6 +1513,7 @@ boolean HWR_DrawModel(gl_vissprite_t *spr) else skinnum = TC_BOSS; } + */ else if ((skincolornum_t)spr->mobj->color != SKINCOLOR_NONE) { if (spr->mobj->colorized)