From 148d75251f4f999113bc18a3334963c237e7c21c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 5 Dec 2018 17:41:25 +0100 Subject: [PATCH] - fix it --- src/p_effect.cpp | 10 ---------- src/scripting/vmthunks_actors.cpp | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/p_effect.cpp b/src/p_effect.cpp index 527436b6b..aeb5b0ec8 100644 --- a/src/p_effect.cpp +++ b/src/p_effect.cpp @@ -567,16 +567,6 @@ void P_DrawSplash (int count, const DVector3 &pos, DAngle angle, int kind) } } -DEFINE_ACTION_FUNCTION(AActor, DrawSplash) -{ - PARAM_SELF_PROLOGUE(AActor); - PARAM_INT(count); - PARAM_FLOAT(angle); - PARAM_INT(kind); - P_DrawSplash(count, self->Pos(), angle, kind); - return 0; -} - void P_DrawSplash2 (int count, const DVector3 &pos, DAngle angle, int updown, int kind) { int color1, color2, zadd; diff --git a/src/scripting/vmthunks_actors.cpp b/src/scripting/vmthunks_actors.cpp index 8484f3183..de1349a12 100644 --- a/src/scripting/vmthunks_actors.cpp +++ b/src/scripting/vmthunks_actors.cpp @@ -532,12 +532,12 @@ DEFINE_ACTION_FUNCTION_NATIVE(AActor, Vec3Offset, Vec3Offset) ACTION_RETURN_VEC3(self->Vec3Offset(x, y, z, absolute)); } -static void PosRelative(AActor *self, sector_t *sec, DVector3 *result) +static void ZS_PosRelative(AActor *self, sector_t *sec, DVector3 *result) { *result = self->PosRelative(sec); } -DEFINE_ACTION_FUNCTION_NATIVE(AActor, PosRelative, PosRelative) +DEFINE_ACTION_FUNCTION_NATIVE(AActor, PosRelative, ZS_PosRelative) { PARAM_SELF_PROLOGUE(AActor); PARAM_POINTER(sec, sector_t);