From e01306d4037ca72daf0d87b4ce611c2d4eeacd2d Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 6 Dec 2018 00:17:07 +0100 Subject: [PATCH] - missed one definition for adding a direct native call. --- src/g_shared/a_action.cpp | 8 -------- src/scripting/vmthunks_actors.cpp | 10 +++++++++- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/g_shared/a_action.cpp b/src/g_shared/a_action.cpp index 5ad79e8e63c..4ff0439be7a 100644 --- a/src/g_shared/a_action.cpp +++ b/src/g_shared/a_action.cpp @@ -82,14 +82,6 @@ void A_Unblock(AActor *self, bool drop) } } -DEFINE_ACTION_FUNCTION(AActor, A_NoBlocking) -{ - PARAM_SELF_PROLOGUE(AActor); - PARAM_BOOL(drop); - A_Unblock(self, drop); - return 0; -} - //---------------------------------------------------------------------------- // // CorpseQueue Routines (used by Hexen) diff --git a/src/scripting/vmthunks_actors.cpp b/src/scripting/vmthunks_actors.cpp index 07c458d968f..97e5066fb1b 100644 --- a/src/scripting/vmthunks_actors.cpp +++ b/src/scripting/vmthunks_actors.cpp @@ -1290,7 +1290,7 @@ static void SetOrigin(AActor *self, double x, double y, double z, bool moving) self->SetOrigin(x, y, z, moving); } -DEFINE_ACTION_FUNCTION(AActor, SetOrigin) +DEFINE_ACTION_FUNCTION_NATIVE(AActor, SetOrigin, SetOrigin) { PARAM_SELF_PROLOGUE(AActor); PARAM_FLOAT(x); @@ -1540,6 +1540,14 @@ DEFINE_ACTION_FUNCTION_NATIVE(AActor, GetSpawnableType, P_GetSpawnableType) ACTION_RETURN_POINTER(P_GetSpawnableType(num)); } +DEFINE_ACTION_FUNCTION_NATIVE(AActor, A_NoBlocking, A_Unblock) +{ + PARAM_SELF_PROLOGUE(AActor); + PARAM_BOOL(drop); + A_Unblock(self, drop); + return 0; +} + //===================================================================================== // // Inventory exports