OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code 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
commit bd889cc8f1
4 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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());
}
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
{
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.)