zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-26 13:51:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed various virtualscope oddities; set scope for DECORATE classes to play.

Browse source
This commit is contained in:
ZZYZX 2017-03-12 04:44:22 +02:00 committed by Christoph Oelckers
parent 23130678a1
commit bd889cc8f1
4 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8815,12 +8815,9 @@ ExpEmit FxVMFunctionCall::Emit(VMFunctionBuilder *build)
if (outerside == FScopeBarrier::Side_Virtual) if (outerside == FScopeBarrier::Side_Virtual)
outerside = FScopeBarrier::SideFromObjectFlags(CallingFunction->OwningClass->ObjectFlags); outerside = FScopeBarrier::SideFromObjectFlags(CallingFunction->OwningClass->ObjectFlags);
if (selfside != outerside && (selfside == FScopeBarrier::Side_Play || selfside == FScopeBarrier::Side_UI)) // if the self pointer and the calling functions have the same scope the check here is not needed.
{
// Check the self object against the calling function's flags at run time // Check the self object against the calling function's flags at run time
build->Emit(OP_SCOPE, selfemit.RegNum, outerside + 1, build->GetConstantAddress(vmfunc, ATAG_OBJECT)); build->Emit(OP_SCOPE, selfemit.RegNum, outerside + 1, build->GetConstantAddress(vmfunc, ATAG_OBJECT));
} }
}
if (selfemit.Fixed && selfemit.Target) if (selfemit.Fixed && selfemit.Target)
{ {

6
src/scripting/decorate/thingdef_parse.cpp
View file

@ -97,6 +97,12 @@ PClassActor *DecoDerivedClass(const FScriptPosition &sc, PClassActor *parent, FN
sc.Message(MSG_FATAL, "Tried to define class '%s' more than twice in the same file.", typeName.GetChars()); sc.Message(MSG_FATAL, "Tried to define class '%s' more than twice in the same file.", typeName.GetChars());
} }
} }
else
{
// [ZZ] DECORATE classes are always play
type->ObjectFlags = FScopeBarrier::ChangeSideInObjectFlags(type->ObjectFlags, FScopeBarrier::Side_Play);
}
return type; return type;
} }

4
src/scripting/vm/vmexec.h
View file

@ -650,8 +650,8 @@ begin:
NEXTOP; NEXTOP;
OP(SCOPE): OP(SCOPE):
{ {
ASSERTA(a); ASSERTA(C); ASSERTA(a); ASSERTKA(C);
FScopeBarrier::ValidateCall(((DObject*)konsta[a].v)->GetClass(), (VMFunction*)konsta[C].v, B - 1); FScopeBarrier::ValidateCall(((DObject*)reg.a[a])->GetClass(), (VMFunction*)konsta[C].v, B - 1);
} }
NEXTOP; NEXTOP;

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

@ -658,12 +658,12 @@ void ZCCCompiler::CreateClassTypes()
{ {
Error(c->cls, "Can't change class scope in class %s", c->NodeName().GetChars()); Error(c->cls, "Can't change class scope in class %s", c->NodeName().GetChars());
} }
c->Type()->ObjectFlags = (c->Type()->ObjectFlags & ~(OF_UI | OF_Play)) | (parent->ObjectFlags & (OF_UI | OF_Play)); c->Type()->ObjectFlags = FScopeBarrier::ChangeSideInObjectFlags(c->Type()->ObjectFlags, FScopeBarrier::SideFromObjectFlags(parent->ObjectFlags));
} }
} }
else else
{ {
c->Type()->ObjectFlags = (c->Type()->ObjectFlags&~OF_UI) | OF_Play; c->Type()->ObjectFlags = FScopeBarrier::ChangeSideInObjectFlags(c->Type()->ObjectFlags, FScopeBarrier::Side_Play);
} }
c->Type()->bExported = true; // this class is accessible to script side type casts. (The reason for this flag is that types like PInt need to be skipped.) c->Type()->bExported = true; // this class is accessible to script side type casts. (The reason for this flag is that types like PInt need to be skipped.)