OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Removed BarrierSide from VMFunction, since it's obsolete with addition of VarFlags

Browse source
This commit is contained in:
ZZYZX 2017-03-05 01:31:23 +02:00 • committed by Christoph Oelckers
commit 3eafc13b08
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/scripting/vm/vm.h
View file

@ -707,7 +707,6 @@ class VMFunction
public:
bool Unsafe = false;
int VarFlags = 0; // [ZZ] this replaces 5+ bool fields
int BarrierSide = 0; // [ZZ] FScopeBarrier::Side
BYTE ImplicitArgs = 0; // either 0 for static, 1 for method or 3 for action
unsigned VirtualIndex = ~0u;
FName Name;
@ -940,7 +939,7 @@ class VMNativeFunction : public VMFunction
public:
typedef int (*NativeCallType)(VMValue *param, TArray<VMValue> &defaultparam, int numparam, VMReturn *ret, int numret);
// 8 is VARF_Native.
// 8 is VARF_Native. I can't write VARF_Native because of circular references between this and dobject/dobjtype.
VMNativeFunction() : NativeCall(NULL) { VarFlags = 8; }
VMNativeFunction(NativeCallType call) : NativeCall(call) { VarFlags = 8; }
VMNativeFunction(NativeCallType call, FName name) : VMFunction(name), NativeCall(call) { VarFlags = 8; }