OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Remove WallSpriteTile global

Browse source
This commit is contained in:
Magnus Norddahl 2017-01-09 14:51:34 +01:00
commit bb2806c9ca
6 changed files with 8 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/swrenderer/things/r_decal.cpp
View file

@ -115,7 +115,7 @@ namespace swrenderer
}
}
WallSpriteTile = TexMan(decal->PicNum, true);
FTexture *WallSpriteTile = TexMan(decal->PicNum, true);
flipx = (BYTE)(decal->RenderFlags & RF_XFLIP);
if (WallSpriteTile == NULL || WallSpriteTile->UseType == FTexture::TEX_Null)
@ -290,7 +290,7 @@ namespace swrenderer
{ // calculate lighting
R_SetColorMapLight(usecolormap, light, wallshade);
}
R_DecalColumn(x, maskedScaleY, sprflipvert, mfloorclip, mceilingclip);
R_DecalColumn(x, WallSpriteTile, maskedScaleY, sprflipvert, mfloorclip, mceilingclip);
light += lightstep;
x++;
}
@ -311,7 +311,7 @@ namespace swrenderer
WallC = savecoord;
}
void R_DecalColumn(int x, float maskedScaleY, bool sprflipvert, const short *mfloorclip, const short *mceilingclip)
void R_DecalColumn(int x, FTexture *WallSpriteTile, float maskedScaleY, bool sprflipvert, const short *mfloorclip, const short *mceilingclip)
{
float iscale = swall[x] * maskedScaleY;
double spryscale = 1 / iscale;