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

6
src/r_translate.cpp
View file

@ -312,8 +312,8 @@ void FRemapTable::AddIndexRange(int start, int end, int pal1, int pal2)
if (start > end)
{
swap (start, end);
swap (pal1, pal2);
swapvalues (start, end);
swapvalues (pal1, pal2);
}
else if (start == end)
{
@ -354,7 +354,7 @@ void FRemapTable::AddColorRange(int start, int end, int _r1,int _g1, int _b1, in
if (start > end)
{
swap (start, end);
swapvalues (start, end);
r = r2;
g = g2;
b = b2;