OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed issues with Dehacked's ad-hoc script code generation

Browse source 
* The functions had no prototype and caused crashes.
* even after creating a prototype it didn't work because CreateAnonymousFunction was set up incorrectly for the case where a known return type was given.
This commit is contained in:
Christoph Oelckers 2018-12-03 12:24:55 +01:00
commit 40a67b8c9a
2 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/scripting/thingdef.cpp
View file

@ -208,7 +208,7 @@ void SetImplicitArgs(TArray<PType *> *args, TArray<uint32_t> *argflags, TArray<F
PFunction *CreateAnonymousFunction(PContainerType *containingclass, PType *returntype, int flags)
{
TArray<PType *> rets(1);
TArray<PType *> rets;
TArray<PType *> args;
TArray<uint32_t> argflags;
TArray<FName> argnames;
@ -220,7 +220,7 @@ PFunction *CreateAnonymousFunction(PContainerType *containingclass, PType *retur
// (just give them VARF_Play, whatever)
fflags |= VARF_Play;
rets[0] = returntype != nullptr? returntype : TypeError; // Use TypeError as placeholder if we do not know the return type yet.
if (returntype) rets.Push(returntype);
SetImplicitArgs(&args, &argflags, &argnames, containingclass, fflags, flags);
PFunction *sym = Create<PFunction>(containingclass, NAME_None); // anonymous functions do not have names.