OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- added Firebrand's patch to rename 'swap' due to naming conflicts in newer MSVC compilers.

Browse source 
SVN r2449 (trunk)
This commit is contained in:
Christoph Oelckers 2010-07-23 21:19:59 +00:00
commit 545a892faa
28 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/win32/fb_d3d9.cpp
View file

@ -2967,7 +2967,7 @@ void STACK_ARGS D3DFB::DrawTextureV (FTexture *img, double x, double y, uint32 t
if (parms.flipX)
{
swap(u0, u1);
swapvalues(u0, u1);
}
if (parms.windowleft > 0 || parms.windowright < parms.texwidth)
{
@ -3640,7 +3640,7 @@ bool D3DFB::SetStyle(D3DTex *tex, DrawParms &parms, D3DCOLOR &color0, D3DCOLOR &
if (quad.Flags & BQF_InvertSource)
{
quad.Flags &= ~BQF_InvertSource;
swap(start, end);
swapvalues(start, end);
}
quad.ShaderNum = BQS_SpecialColormap;
color0 = D3DCOLOR_RGBA(DWORD(start[0]/2*255), DWORD(start[1]/2*255), DWORD(start[2]/2*255), color0 >> 24);