From bc86ec4c5167f0226a0b61a140ba4344a905033c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 25 Nov 2018 01:14:50 +0100 Subject: [PATCH] - removed the less-parameters versions of P_SpawnPlayerMissile, because there was only one native call left to them. --- src/d_net.cpp | 2 +- src/p_local.h | 3 --- src/p_mobj.cpp | 14 -------------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/d_net.cpp b/src/d_net.cpp index 4c86a664d..4c9f09fb3 100644 --- a/src/d_net.cpp +++ b/src/d_net.cpp @@ -2335,7 +2335,7 @@ void Net_DoCommand (int type, uint8_t **stream, int player) { if (GetDefaultByType (typeinfo)->flags & MF_MISSILE) { - P_SpawnPlayerMissile (source, typeinfo); + P_SpawnPlayerMissile (source, 0, 0, 0, typeinfo, source->Angles.Yaw); } else { diff --git a/src/p_local.h b/src/p_local.h index 26d6f8b64..dcc682807 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -131,9 +131,6 @@ AActor *P_SpawnMissileAngleZSpeed(AActor *source, double z, PClassActor *type, D AActor *P_SpawnMissileZAimed(AActor *source, double z, AActor *dest, PClassActor *type); -AActor *P_SpawnPlayerMissile (AActor* source, PClassActor *type); -AActor *P_SpawnPlayerMissile (AActor *source, PClassActor *type, DAngle angle); - AActor *P_SpawnPlayerMissile (AActor *source, double x, double y, double z, PClassActor *type, DAngle angle, FTranslatedLineTarget *pLineTarget = NULL, AActor **MissileActor = NULL, bool nofreeaim = false, bool noautoaim = false, int aimflags = 0); diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp index a82342d5f..089fd1972 100644 --- a/src/p_mobj.cpp +++ b/src/p_mobj.cpp @@ -7287,20 +7287,6 @@ DEFINE_ACTION_FUNCTION(AActor, SpawnSubMissile) ================ */ -AActor *P_SpawnPlayerMissile (AActor *source, PClassActor *type) -{ - if (source == NULL) - { - return NULL; - } - return P_SpawnPlayerMissile (source, 0, 0, 0, type, source->Angles.Yaw); -} - -AActor *P_SpawnPlayerMissile (AActor *source, PClassActor *type, DAngle angle) -{ - return P_SpawnPlayerMissile (source, 0, 0, 0, type, angle); -} - AActor *P_SpawnPlayerMissile (AActor *source, double x, double y, double z, PClassActor *type, DAngle angle, FTranslatedLineTarget *pLineTarget, AActor **pMissileActor, bool nofreeaim, bool noautoaim, int aimflags)