From 55f17fa90c38edf77f25633d8de506a966b15e30 Mon Sep 17 00:00:00 2001 From: Major Cooke Date: Tue, 6 Nov 2018 18:31:43 -0600 Subject: [PATCH] Changed A_RaiseActor to just RaiseActor. --- src/p_actionfunctions.cpp | 4 ++-- wadsrc/static/zscript/actor.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/p_actionfunctions.cpp b/src/p_actionfunctions.cpp index 8ac2b5665b..60771a469c 100644 --- a/src/p_actionfunctions.cpp +++ b/src/p_actionfunctions.cpp @@ -4566,11 +4566,11 @@ DEFINE_ACTION_FUNCTION(AActor, A_RaiseSelf) //=========================================================================== // -// A_RaiseActor +// RaiseActor // // Generalized version that allows passing pointers for ZScript's sake. //=========================================================================== -DEFINE_ACTION_FUNCTION(AActor, A_RaiseActor) +DEFINE_ACTION_FUNCTION(AActor, RaiseActor) { PARAM_SELF_PROLOGUE(AActor); PARAM_OBJECT(other, AActor); diff --git a/wadsrc/static/zscript/actor.txt b/wadsrc/static/zscript/actor.txt index 34ed24ad11..7f9cd5afde 100644 --- a/wadsrc/static/zscript/actor.txt +++ b/wadsrc/static/zscript/actor.txt @@ -1092,7 +1092,7 @@ class Actor : Thinker native native void A_RaiseChildren(int flags = 0); native void A_RaiseSiblings(int flags = 0); native bool A_RaiseSelf(int flags = 0); - native bool A_RaiseActor(Actor other, int flags = 0); + native bool RaiseActor(Actor other, int flags = 0); native bool CanRaise(); native void Revive(); action native bool, Actor A_ThrowGrenade(class itemtype, double zheight = 0, double xyvel = 0, double zvel = 0, bool useammo = true);