OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- implemented State as an actual native struct, so that its fields can be accessed from scripts.

Browse source 
- refactored state bitfield members into a flag word because the address of a bitfield cannot be taken, making such variables inaccessible to scripts.
- actually use PNativeStruct for representing native structs defined in a script.
This commit is contained in:
Christoph Oelckers 2016-11-21 21:34:34 +01:00
commit 135cfcf016
12 changed files with 102 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -416,7 +416,10 @@ void ZCCCompiler::CreateStructTypes()
for(auto s : Structs)
{
s->Outer = s->OuterDef == nullptr? nullptr : s->OuterDef->CType();
s->strct->Type = NewStruct(s->NodeName(), s->Outer);
if (s->strct->Flags & ZCC_Native)
s->strct->Type = NewNativeStruct(s->NodeName(), nullptr);
else
s->strct->Type = NewStruct(s->NodeName(), s->Outer);
s->strct->Symbol = new PSymbolType(s->NodeName(), s->Type());
GlobalSymbols.AddSymbol(s->strct->Symbol);
@ -2568,11 +2571,12 @@ void ZCCCompiler::CompileStates()
Error(sl, "Duration is not a constant");
}
}
state.Fullbright = sl->bBright;
state.Fast = sl->bFast;
state.Slow = sl->bSlow;
state.CanRaise = sl->bCanRaise;
if ((state.NoDelay = sl->bNoDelay))
if (sl->bBright) state.StateFlags |= STF_FULLBRIGHT;
if (sl->bFast) state.StateFlags |= STF_FAST;
if (sl->bSlow) state.StateFlags |= STF_SLOW;
if (sl->bCanRaise) state.StateFlags |= STF_CANRAISE;
if (sl->bNoDelay) state.StateFlags |= STF_NODELAY;
if (sl->bNoDelay)
{
if (statedef.GetStateLabelIndex(NAME_Spawn) != statedef.GetStateCount())
{