OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Fixed Vector2/3 out parameters in the ZScript compiler.

Browse source
This commit is contained in:
Chronos Ouroboros 2019-10-21 16:29:54 -03:00
commit 4fa6678fc5
3 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/scripting/backend/vmbuilder.cpp
View file

@ -884,9 +884,20 @@ void FFunctionBuildList::Build()
sfunc->NumArgs = 0;
// NumArgs for the VMFunction must be the amount of stack elements, which can differ from the amount of logical function arguments if vectors are in the list.
// For the VM a vector is 2 or 3 args, depending on size.
for (auto s : item.Func->Variants[0].Proto->ArgumentTypes)
auto funcVariant = item.Func->Variants[0];
for (unsigned int i = 0; i < funcVariant.Proto->ArgumentTypes.Size(); i++)
{
sfunc->NumArgs += s->GetRegCount();
auto argType = funcVariant.Proto->ArgumentTypes[i];
auto argFlags = funcVariant.ArgFlags[i];
if (argFlags & VARF_Out)
{
auto argPointer = NewPointer(argType);
sfunc->NumArgs += argPointer->GetRegCount();
}
else
{
sfunc->NumArgs += argType->GetRegCount();
}
}
if (dump != nullptr)