OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Remove basecolormap global

Browse source
This commit is contained in:
Magnus Norddahl 2017-01-12 21:29:19 +01:00
commit 9e940b4287
37 changed files with 140 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/v_draw.cpp
View file

@ -189,10 +189,11 @@ void DCanvas::DrawTextureParms(FTexture *img, DrawParms &parms)
fixedcolormap = dc_fcolormap;
bool visible;
FDynamicColormap *basecolormap = nullptr;
if (r_swtruecolor)
visible = R_SetPatchStyle(parms.style, parms.Alpha, -1, parms.fillcolor);
visible = R_SetPatchStyle(parms.style, parms.Alpha, -1, parms.fillcolor, basecolormap);
else
visible = R_SetPatchStyle(parms.style, parms.Alpha, 0, parms.fillcolor);
visible = R_SetPatchStyle(parms.style, parms.Alpha, 0, parms.fillcolor, basecolormap);
BYTE *destorgsave = dc_destorg;
int destheightsave = dc_destheight;
@ -287,7 +288,6 @@ void DCanvas::DrawTextureParms(FTexture *img, DrawParms &parms)
CenterY = centeryback;
}
R_FinishSetPatchStyle ();
dc_destorg = destorgsave;
dc_destheight = destheightsave;