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

10
src/r_segs.cpp
View file

@ -2302,7 +2302,7 @@ static void R_RenderDecal (side_t *wall, DBaseDecal *decal, drawseg_t *clipper,
int t = 256-WallTX1;
WallTX1 = 256-WallTX2;
WallTX2 = t;
swap (WallTY1, WallTY2);
swapvalues (WallTY1, WallTY2);
}
if (WallTX1 >= -WallTY1)
@ -2433,11 +2433,11 @@ static void R_RenderDecal (side_t *wall, DBaseDecal *decal, drawseg_t *clipper,
goto done;
}
swap (x1, WallSX1);
swap (x2, WallSX2);
swapvalues (x1, WallSX1);
swapvalues (x2, WallSX2);
PrepWall (swall, lwall, WallSpriteTile->GetWidth() << FRACBITS);
swap (x1, WallSX1);
swap (x2, WallSX2);
swapvalues (x1, WallSX1);
swapvalues (x2, WallSX2);
if (flipx)
{