OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added rclamp(<int>,<int>).

Browse source 
- Usable for DECORATE expressions. Chooses one of the two numbers placed in the field.
This commit is contained in:
MajorCooke 2014-12-13 15:08:18 -06:00
commit 8c5a8c54f0
6 changed files with 130 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

83
src/thingdef/thingdef_expression.cpp
View file

@ -1691,6 +1691,89 @@ ExpVal FxRandom::EvalExpression (AActor *self)
return val;
}
//==========================================================================
//
//
//
//==========================================================================
FxRClamp::FxRClamp(FRandom * r, FxExpression *mi, FxExpression *ma, const FScriptPosition &pos)
: FxExpression(pos)
{
if (mi != NULL && ma != NULL)
{
min = new FxIntCast(mi);
max = new FxIntCast(ma);
}
else min = max = NULL;
rng = r;
ValueType = VAL_Int;
}
//==========================================================================
//
//
//
//==========================================================================
FxRClamp::~FxRClamp()
{
SAFE_DELETE(min);
SAFE_DELETE(max);
}
//==========================================================================
//
//
//
//==========================================================================
FxExpression *FxRClamp::Resolve(FCompileContext &ctx)
{
CHECKRESOLVED();
if (min && max)
{
RESOLVE(min, ctx);
RESOLVE(max, ctx);
ABORT(min && max);
}
return this;
};
//==========================================================================
//
//
//
//==========================================================================
ExpVal FxRClamp::EvalExpression(AActor *self)
{
ExpVal val;
val.Type = VAL_Int;
if (min != NULL && max != NULL)
{
int minval = min->EvalExpression(self).GetInt();
int maxval = max->EvalExpression(self).GetInt();
if (maxval < minval)
{
swapvalues(maxval, minval);
}
val.Int = (*rng)(2); //rng->operator()(2); //(maxval - minval + 1) + minval;
if (val.Int > 0)
val.Int = maxval;
else
val.Int = minval;
}
else
{
val.Int = (*rng)();
}
return val;
}
//==========================================================================
//
//