OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Implemented implicit 'protected' inheritance in virtual functions

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

3
src/scripting/vm/vmframe.cpp
View file

@ -48,7 +48,6 @@ TArray<VMFunction *> VMFunction::AllFunctions;
VMScriptFunction::VMScriptFunction(FName name)
{
Native = false;
Name = name;
LineInfo = nullptr;
Code = NULL;
@ -438,7 +437,7 @@ int VMFrameStack::Call(VMFunction *func, VMValue *params, int numparams, VMRetur
bool allocated = false;
try
{
if (func->Native)
if (func->VarFlags & VARF_Native)
{
return static_cast<VMNativeFunction *>(func)->NativeCall(params, func->DefaultArgs, numparams, results, numresults);
}