zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-11 07:12:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added a VM handler for PostBeginPlay.

Browse source 
- made a few changes to let the templates compile again on Linux.
This commit is contained in:
Christoph Oelckers 2016-11-12 00:57:21 +01:00
parent 696af7d7e5
commit 5bc89e7efc
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/virtual.h
View file

@ -34,6 +34,7 @@
VMEXPORTED_NATIVES_START VMEXPORTED_NATIVES_START
VMEXPORTED_NATIVES_FUNC(Destroy) VMEXPORTED_NATIVES_FUNC(Destroy)
VMEXPORTED_NATIVES_FUNC(Tick) VMEXPORTED_NATIVES_FUNC(Tick)
VMEXPORTED_NATIVES_FUNC(PostBeginPlay)
VMEXPORTED_NATIVES_FUNC(DropInventory) VMEXPORTED_NATIVES_FUNC(DropInventory)
VMEXPORTED_NATIVES_END VMEXPORTED_NATIVES_END
@ -71,9 +72,9 @@ private:
public: public:
void Destroy() void Destroy()
{ {
if (ObjectFlags & OF_SuperCall) if (this->ObjectFlags & OF_SuperCall)
{ {
ObjectFlags &= OF_SuperCall; this->ObjectFlags &= OF_SuperCall;
ExportedNatives<T>::Get()->template Destroy<void, T>(this); ExportedNatives<T>::Get()->template Destroy<void, T>(this);
} }
else else
@ -90,13 +91,19 @@ public:
// Without the type cast this picks the 'void *' assignment... // Without the type cast this picks the 'void *' assignment...
VMValue params[1] = { (DObject*)this }; VMValue params[1] = { (DObject*)this };
VMFrameStack stack; VMFrameStack stack;
stack.Call(GetClass()->Virtuals[VIndex], params, 1, nullptr, 0, nullptr); stack.Call(this->GetClass()->Virtuals[VIndex], params, 1, nullptr, 0, nullptr);
} }
} }
void Tick() void Tick()
{ {
ExportedNatives<T>::Get()->template Tick<void, T>(this); ExportedNatives<T>::Get()->template Tick<void, T>(this);
} }
void PostBeginPlay()
{
ExportedNatives<T>::Get()->template PostBeginPlay<void, T>(this);
}
AInventory *DropInventory(AInventory *item) AInventory *DropInventory(AInventory *item)
{ {
return ExportedNatives<T>::Get()->template DropInventory<AInventory *, T>(this, item); return ExportedNatives<T>::Get()->template DropInventory<AInventory *, T>(this, item);
@ -124,7 +131,8 @@ VMEXPORT_NATIVES_END(DObject)
VMEXPORT_NATIVES_START(DThinker, DObject) VMEXPORT_NATIVES_START(DThinker, DObject)
VMEXPORT_NATIVES_FUNC(Tick) VMEXPORT_NATIVES_FUNC(Tick)
VMEXPORT_NATIVES_END(DThinker) VMEXPORT_NATIVES_FUNC(PostBeginPlay)
VMEXPORT_NATIVES_END(DThinker)
VMEXPORT_NATIVES_START(AActor, DThinker) VMEXPORT_NATIVES_START(AActor, DThinker)
VMEXPORT_NATIVES_FUNC(DropInventory) VMEXPORT_NATIVES_FUNC(DropInventory)