Fix brightmaps on midtextures not working

Fixes Lost Colony (again)
This commit is contained in:
Sally Coolatta 2023-12-30 20:23:13 -05:00 committed by James R
parent 7415b5ef2f
commit cc2c19bcff
2 changed files with 18 additions and 13 deletions

View file

@ -136,13 +136,29 @@ static void R_Render2sidedMultiPatchColumn(drawcolumndata_t* dc, column_t *colum
drawcolumndata_t dc_copy = *dc;
coldrawfunc_t* colfunccopy = colfunc;
// FIXME: do something better to look these up WITHOUT affecting global state...
if (R_CheckColumnFunc(BASEDRAWFUNC) == true)
{
colfunccopy = colfuncs[COLDRAWFUNC_TWOSMULTIPATCH];
if (brightmap != NULL)
{
colfunccopy = colfuncs_bm[COLDRAWFUNC_TWOSMULTIPATCH];
}
else
{
colfunccopy = colfuncs[COLDRAWFUNC_TWOSMULTIPATCH];
}
}
else if (R_CheckColumnFunc(COLDRAWFUNC_FUZZY) == true)
{
colfunccopy = colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS];
if (brightmap != NULL)
{
colfunccopy = colfuncs_bm[COLDRAWFUNC_TWOSMULTIPATCHTRANS];
}
else
{
colfunccopy = colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS];
}
}
colfunccopy(const_cast<drawcolumndata_t*>(&dc_copy));

View file

@ -118,17 +118,6 @@ struct vmode_t
#define NUMSPECIALMODES 4
extern vmode_t specialmodes[NUMSPECIALMODES];
// -----
// CPUID
// -----
extern boolean R_ASM;
extern boolean R_486;
extern boolean R_586;
extern boolean R_MMX;
extern boolean R_3DNow;
extern boolean R_MMXExt;
extern boolean R_SSE2;
// ----------------
// screen variables
// ----------------