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

- handle state label resolution in a non-actor cpntext more gracefully.

Browse source 
Note that this is merely a hotfix. Properly handling this to allow universal use of state scopes will require more work in cases where a scoped state is being accessed through a non-self pointer.
This commit is contained in:
Christoph Oelckers 2017-08-12 10:04:06 +02:00
parent 0db79f8dec
commit b4fa95ab15
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/scripting/backend/codegen.cpp
View file

@ -11101,7 +11101,7 @@ ExpEmit FxRuntimeStateIndex::Emit(VMFunctionBuilder *build)
// //
//========================================================================== //==========================================================================
FxMultiNameState::FxMultiNameState(const char *_statestring, const FScriptPosition &pos) FxMultiNameState::FxMultiNameState(const char *_statestring, const FScriptPosition &pos, PClassActor *checkclass)
:FxExpression(EFX_MultiNameState, pos) :FxExpression(EFX_MultiNameState, pos)
{ {
FName scopename; FName scopename;
@ -11119,7 +11119,7 @@ FxMultiNameState::FxMultiNameState(const char *_statestring, const FScriptPositi
} }
names = MakeStateNameList(statestring); names = MakeStateNameList(statestring);
names.Insert(0, scopename); names.Insert(0, scopename);
scope = nullptr; scope = checkclass;
} }
//========================================================================== //==========================================================================
@ -11135,8 +11135,8 @@ FxExpression *FxMultiNameState::Resolve(FCompileContext &ctx)
int symlabel; int symlabel;
auto vclass = PType::toClass(ctx.Class); auto vclass = PType::toClass(ctx.Class);
assert(vclass != nullptr); //assert(vclass != nullptr);
auto clstype = ValidateActor(vclass->Descriptor); auto clstype = vclass == nullptr? nullptr : ValidateActor(vclass->Descriptor);
if (names[0] == NAME_None) if (names[0] == NAME_None)
{ {

2
src/scripting/backend/codegen.h
View file

@ -2089,7 +2089,7 @@ class FxMultiNameState : public FxExpression
TArray<FName> names; TArray<FName> names;
public: public:
FxMultiNameState(const char *statestring, const FScriptPosition &pos); FxMultiNameState(const char *statestring, const FScriptPosition &pos, PClassActor *checkclass = nullptr);
FxExpression *Resolve(FCompileContext&); FxExpression *Resolve(FCompileContext&);
}; };