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

@ -1667,7 +1667,7 @@ ExpVal FxRandom::EvalExpression (AActor *self)
if (maxval < minval)
{
swap (maxval, minval);
swapvalues (maxval, minval);
}
val.Int = (*rng)(maxval - minval + 1) + minval;
@ -1714,7 +1714,7 @@ ExpVal FxFRandom::EvalExpression (AActor *self)
if (maxval < minval)
{
swap (maxval, minval);
swapvalues (maxval, minval);
}
val.Float = frandom * (maxval - minval) + minval;

2
src/thingdef/thingdef_properties.cpp
View file

@ -1861,7 +1861,7 @@ DEFINE_CLASS_PROPERTY_PREFIX(player, colorrange, I_I, PlayerPawn)
PROP_INT_PARM(end, 1);
if (start > end)
swap (start, end);
swapvalues (start, end);
info->Class->Meta.SetMetaInt (APMETA_ColorRange, (start & 255) | ((end & 255) << 8));
}