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/r_anim.cpp
View file

@ -202,7 +202,7 @@ void R_InitPicAnims (void)
// [RH] Allow for backward animations as well as forward.
if (pic1 > pic2)
{
swap (pic1, pic2);
swapvalues (pic1, pic2);
animtype = FAnimDef::ANIM_Backward;
}
@ -548,7 +548,7 @@ static void ParseRangeAnim (FScanner &sc, FTextureID picnum, int usetype, bool m
{
type = FAnimDef::ANIM_Backward;
TexMan[framenum]->bNoDecals = TexMan[picnum]->bNoDecals;
swap (framenum, picnum);
swapvalues (framenum, picnum);
}
if (sc.GetString())
{