zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-19 16:11:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow FindFunctionPointer to return non-virtual methods

Browse source
This commit is contained in:
Ricardo Luís Vaz Silva 2023-10-11 13:01:57 -03:00 committed by Christoph Oelckers
parent d9a88d7080
commit 0e9135132d
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/common/scripting/interface/vmnatives.cpp
View file

@ -54,6 +54,7 @@
#include "i_time.h" #include "i_time.h"
#include "maps.h" #include "maps.h"
#include "types.h"
static ZSMap<FName, DObject*> AllServices; static ZSMap<FName, DObject*> AllServices;
@ -1352,7 +1353,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(_QuatStruct, Inverse, QuatInverse)
PFunction * FindFunctionPointer(PClass * cls, int fn_name) PFunction * FindFunctionPointer(PClass * cls, int fn_name)
{ {
auto fn = dyn_cast<PFunction>(cls->FindSymbol(ENamedName(fn_name), true)); auto fn = dyn_cast<PFunction>(cls->FindSymbol(ENamedName(fn_name), true));
return (fn && fn->GetImplicitArgs() == 0) ? fn : nullptr; return (fn && (fn->Variants[0].Flags & (VARF_Action | VARF_Virtual)) == 0 ) ? fn : nullptr;
} }
DEFINE_ACTION_FUNCTION_NATIVE(DObject, FindFunction, FindFunctionPointer) DEFINE_ACTION_FUNCTION_NATIVE(DObject, FindFunction, FindFunctionPointer)