From 0dcbc02cd7cdb54e5504fa82115d0810a62391ad Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 22 Dec 2018 16:07:30 +0100 Subject: [PATCH] - renamed back arguments of A_FireProjectile. --- wadsrc/static/zscript/inventory/stateprovider.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wadsrc/static/zscript/inventory/stateprovider.txt b/wadsrc/static/zscript/inventory/stateprovider.txt index f8c1b1036..e274c0ea3 100644 --- a/wadsrc/static/zscript/inventory/stateprovider.txt +++ b/wadsrc/static/zscript/inventory/stateprovider.txt @@ -190,7 +190,7 @@ class StateProvider : Inventory // //========================================================================== - action Actor A_FireProjectile(class ti, double spawnangle = 0, bool useammo = true, double spawnofs_xy = 0, double spawnheight = 0, int flags = 0, double pitch = 0) + action Actor A_FireProjectile(class missiletype, double angle = 0, bool useammo = true, double spawnofs_xy = 0, double spawnheight = 0, int flags = 0, double pitch = 0) { let player = self.player; if (!player) return null; @@ -206,18 +206,18 @@ class StateProvider : Inventory return null; // out of ammo } - if (ti) + if (missiletype) { - double ang = Angle - 90; + double ang = self.Angle - 90; Vector2 ofs = AngleToVector(ang, spawnofs_xy); - double shootangle = Angle; + double shootangle = self.Angle; - if (flags & FPF_AIMATANGLE) shootangle += spawnangle; + if (flags & FPF_AIMATANGLE) shootangle += angle; // Temporarily adjusts the pitch double saved_player_pitch = self.Pitch; self.Pitch += pitch; - let misl = SpawnPlayerMissile (ti, shootangle, ofs.X, ofs.Y, spawnheight, t, NULL, false, (flags & FPF_NOAUTOAIM) != 0); + let misl = SpawnPlayerMissile (missiletype, shootangle, ofs.X, ofs.Y, spawnheight, t, NULL, false, (flags & FPF_NOAUTOAIM) != 0); self.Pitch = saved_player_pitch; // automatic handling of seeker missiles