From a93296be80a8061d82ed4c9e9d819e31ce6fcf12 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 31 Mar 2016 21:20:45 +0200 Subject: [PATCH] - removed most of the deleted function declarations. --- src/actor.h | 3 +-- src/m_bbox.h | 4 ---- src/p_local.h | 1 - src/r_defs.h | 1 - 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/actor.h b/src/actor.h index 0c7d34d50..dbd2d67e4 100644 --- a/src/actor.h +++ b/src/actor.h @@ -931,7 +931,7 @@ public: { SetOrigin(Pos() + vel, true); } - void SetOrigin(double x, double y, double z, bool moving); + virtual void SetOrigin(double x, double y, double z, bool moving); void SetOrigin(const DVector3 & npos, bool moving) { SetOrigin(npos.X, npos.Y, npos.Z, moving); @@ -1164,7 +1164,6 @@ public: void LinkToWorld (bool spawningmapthing=false, sector_t *sector = NULL); void UnlinkFromWorld (); void AdjustFloorClip (); - void SetOrigin(fixed_t x, fixed_t y, fixed_t z, bool moving = false) = delete; bool InStateSequence(FState * newstate, FState * basestate); int GetTics(FState * newstate); bool SetState (FState *newstate, bool nofunction=false); diff --git a/src/m_bbox.h b/src/m_bbox.h index 98f7abcf6..71728b851 100644 --- a/src/m_bbox.h +++ b/src/m_bbox.h @@ -37,10 +37,6 @@ public: ClearBox(); } - FBoundingBox(fixed_t left, fixed_t bottom, fixed_t right, fixed_t top) = delete; - FBoundingBox(fixed_t x, fixed_t y, fixed_t radius) = delete; - void Set(int index, fixed_t value) = delete; - FBoundingBox(double left, double bottom, double right, double top) { m_Box[BOXTOP] = top; diff --git a/src/p_local.h b/src/p_local.h index 677bc1099..4a68c236c 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -261,7 +261,6 @@ enum void P_FindFloorCeiling (AActor *actor, int flags=0); bool P_ChangeSector (sector_t* sector, int crunch, double amt, int floorOrCeil, bool isreset); -inline bool P_ChangeSector(sector_t* sector, int crunch, int amt, int floorOrCeil, bool isreset) = delete; DAngle P_AimLineAttack(AActor *t1, DAngle angle, double distance, FTranslatedLineTarget *pLineTarget = NULL, DAngle vrange = 0., int flags = 0, AActor *target = NULL, AActor *friender = NULL); diff --git a/src/r_defs.h b/src/r_defs.h index dba6d3c5d..4aa0f9d53 100644 --- a/src/r_defs.h +++ b/src/r_defs.h @@ -1555,7 +1555,6 @@ struct visstyle_t // //---------------------------------------------------------------------------------- subsector_t *P_PointInSubsector(double x, double y); -sector_t *P_PointInSector(fixed_t x, fixed_t y) = delete; inline sector_t *P_PointInSector(const DVector2 &pos) {