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

Fix brightmaps on midtextures not working

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/r_segs.cpp
View file

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

11
src/screen.h
View file

@ -118,17 +118,6 @@ struct vmode_t
#define NUMSPECIALMODES 4 #define NUMSPECIALMODES 4
extern vmode_t specialmodes[NUMSPECIALMODES]; 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 // screen variables
// ---------------- // ----------------