zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-05-31 00:51:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

- scriptified the Sigil. This isn't fully tested yet.

Browse source
This commit is contained in:
Christoph Oelckers 2016-11-28 14:39:25 +01:00
parent c9a4087c18
commit 8551a4f6e1
19 changed files with 450 additions and 494 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/scripting/zscript/zcc_compile.cpp
View file

@ -2408,7 +2408,7 @@ static bool CheckRandom(ZCC_Expression *duration)
// Sets up the action function call
//
//==========================================================================
FxExpression *ZCCCompiler::SetupActionFunction(PClass *cls, ZCC_TreeNode *af)
FxExpression *ZCCCompiler::SetupActionFunction(PClass *cls, ZCC_TreeNode *af, int StateFlags)
{
// We have 3 cases to consider here:
// 1. A function without parameters. This can be called directly
@ -2436,7 +2436,9 @@ FxExpression *ZCCCompiler::SetupActionFunction(PClass *cls, ZCC_TreeNode *af)
// We can use this function directly without wrapping it in a caller.
auto selfclass = dyn_cast<PClass>(afd->Variants[0].SelfClass);
assert(selfclass != nullptr); // non classes are not supposed to get here.
if ((afd->Variants[0].Flags & VARF_Action) || !cls->IsDescendantOf(RUNTIME_CLASS(AStateProvider)) || !selfclass->IsDescendantOf(RUNTIME_CLASS(AStateProvider)))
int comboflags = afd->Variants[0].UseFlags & StateFlags;
if (comboflags == StateFlags) // the function must satisfy all the flags the state requires
{
return new FxVMFunctionCall(new FxSelf(*af), afd, argumentlist, *af, false);
}
@ -2627,7 +2629,7 @@ void ZCCCompiler::CompileStates()
if (sl->Action != nullptr)
{
auto code = SetupActionFunction(static_cast<PClassActor *>(c->Type()), sl->Action);
auto code = SetupActionFunction(static_cast<PClassActor *>(c->Type()), sl->Action, state.UseFlags);
if (code != nullptr)
{
auto funcsym = CreateAnonymousFunction(c->Type(), nullptr, state.UseFlags);

2
src/scripting/zscript/zcc_compile.h
View file

@ -108,7 +108,7 @@ private:
void InitFunctions();
void CompileStates();
FxExpression *SetupActionFunction(PClass *cls, ZCC_TreeNode *sl);
FxExpression *SetupActionFunction(PClass *cls, ZCC_TreeNode *sl, int stateflags);
bool SimplifyingConstant;
TArray<ZCC_ConstantDef *> Constants;