OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- converted scale variables in AActor, FMapThing and skin to float.

Browse source
This commit is contained in:
Christoph Oelckers 2016-03-20 12:13:00 +01:00
commit ada5097e34
33 changed files with 112 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/thingdef/thingdef_codeptr.cpp
View file

@ -2310,8 +2310,7 @@ static bool InitSpawnedItem(AActor *self, AActor *mo, int flags)
}
if (flags & SIXF_TRANSFERSCALE)
{
mo->scaleX = self->scaleX;
mo->scaleY = self->scaleY;
mo->Scale = self->Scale;
}
if (flags & SIXF_TRANSFERAMBUSHFLAG)
{
@ -2884,8 +2883,8 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_FadeTo)
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetScale)
{
PARAM_ACTION_PROLOGUE;
PARAM_FIXED (scalex);
PARAM_FIXED_OPT (scaley) { scaley = scalex; }
PARAM_FLOAT (scalex);
PARAM_FLOAT_OPT (scaley) { scaley = scalex; }
PARAM_INT_OPT (ptr) { ptr = AAPTR_DEFAULT; }
PARAM_BOOL_OPT (usezero) { usezero = false; }
@ -2897,8 +2896,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetScale)
{
scaley = scalex;
}
ref->scaleX = scalex;
ref->scaleY = scaley;
ref->Scale = { scalex, scaley };
}
return 0;
}