From bb1e927c46b8efc05f2f6ae7e9e472f7dfbe7bd1 Mon Sep 17 00:00:00 2001 From: Major Cooke Date: Wed, 17 May 2017 11:54:42 -0500 Subject: [PATCH] Give the parameter a better name to associate by. --- src/p_map.cpp | 4 ++-- wadsrc/static/zscript/actor.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/p_map.cpp b/src/p_map.cpp index 5ff4619d2a..66becf1fe5 100644 --- a/src/p_map.cpp +++ b/src/p_map.cpp @@ -4726,11 +4726,11 @@ DEFINE_ACTION_FUNCTION(AActor, LineAttack) PARAM_CLASS(puffType, AActor); PARAM_INT_DEF(flags); PARAM_POINTER_DEF(victim, FTranslatedLineTarget); - PARAM_FLOAT_DEF(sz); + PARAM_FLOAT_DEF(offsetz); int acdmg; if (puffType == nullptr) puffType = PClass::FindActor("BulletPuff"); // P_LineAttack does not work without a puff to take info from. - auto puff = P_LineAttack(self, angle, distance, pitch, damage, damageType, puffType, flags, victim, &acdmg, sz); + auto puff = P_LineAttack(self, angle, distance, pitch, damage, damageType, puffType, flags, victim, &acdmg, offsetz); if (numret > 0) ret[0].SetObject(puff); if (numret > 1) ret[1].SetInt(acdmg), numret = 2; return numret; diff --git a/wadsrc/static/zscript/actor.txt b/wadsrc/static/zscript/actor.txt index 008a05d41d..49d2944650 100644 --- a/wadsrc/static/zscript/actor.txt +++ b/wadsrc/static/zscript/actor.txt @@ -585,7 +585,7 @@ class Actor : Thinker native native virtual int DamageMobj(Actor inflictor, Actor source, int damage, Name mod, int flags = 0, double angle = 0); native void PoisonMobj (Actor inflictor, Actor source, int damage, int duration, int period, Name type); native double AimLineAttack(double angle, double distance, out FTranslatedLineTarget pLineTarget = null, double vrange = 0., int flags = 0, Actor target = null, Actor friender = null); - native Actor, int LineAttack(double angle, double distance, double pitch, int damage, Name damageType, class pufftype, int flags = 0, out FTranslatedLineTarget victim = null, double sz = 0.); + native Actor, int LineAttack(double angle, double distance, double pitch, int damage, Name damageType, class pufftype, int flags = 0, out FTranslatedLineTarget victim = null, double offsetz = 0.); native bool CheckSight(Actor target, int flags = 0); native bool IsVisible(Actor other, bool allaround, LookExParams params = null); native bool HitFriend();