From 75bd1b00b406f429357779e1d5e57ea5e59054ee Mon Sep 17 00:00:00 2001 From: Tommy Nguyen Date: Tue, 23 Oct 2018 13:19:10 -0400 Subject: [PATCH] - use value initialization for secspecial_t --- src/p_ceiling.cpp | 4 ++-- src/p_floor.cpp | 4 ++-- src/p_spec.h | 4 ++-- src/r_defs.h | 10 ---------- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/p_ceiling.cpp b/src/p_ceiling.cpp index 5eb8157f5..0f37e3379 100644 --- a/src/p_ceiling.cpp +++ b/src/p_ceiling.cpp @@ -428,7 +428,7 @@ bool P_CreateCeiling(sector_t *sec, DCeiling::ECeiling type, line_t *line, int t switch (change & 3) { case 1: // type is zeroed - ceiling->m_NewSpecial.Clear(); + ceiling->m_NewSpecial = {}; ceiling->m_Type = DCeiling::genCeilingChg0; break; case 2: // type is copied @@ -447,7 +447,7 @@ bool P_CreateCeiling(sector_t *sec, DCeiling::ECeiling type, line_t *line, int t switch (change & 3) { case 1: // type is zeroed - ceiling->m_NewSpecial.Clear(); + ceiling->m_NewSpecial = {}; ceiling->m_Type = DCeiling::genCeilingChg0; break; case 2: // type is copied diff --git a/src/p_floor.cpp b/src/p_floor.cpp index d0b6cb077..7141a842e 100644 --- a/src/p_floor.cpp +++ b/src/p_floor.cpp @@ -229,7 +229,7 @@ void DFloor::SetFloorChangeType (sector_t *sec, int change) switch (change & 3) { case 1: - m_NewSpecial.Clear(); + m_NewSpecial = {}; m_Type = DFloor::genFloorChg0; break; case 2: @@ -828,7 +828,7 @@ bool EV_DoDonut (int tag, line_t *line, double pillarspeed, double slimespeed) floor->m_Speed = slimespeed; floor->m_Instant = false; floor->m_Texture = s3->GetTexture(sector_t::floor); - floor->m_NewSpecial.Clear(); + floor->m_NewSpecial = {}; height = s3->FindHighestFloorPoint (&spot); floor->m_FloorDestDist = s2->floorplane.PointToDist (spot, height); floor->StartFloorSound (); diff --git a/src/p_spec.h b/src/p_spec.h index 6dc118658..61cc7b2f0 100644 --- a/src/p_spec.h +++ b/src/p_spec.h @@ -439,7 +439,7 @@ protected: // [RH] Need these for BOOM-ish transferring ceilings FTextureID m_Texture; - secspecial_t m_NewSpecial; + secspecial_t m_NewSpecial{}; // ID int m_Tag; @@ -536,7 +536,7 @@ public: bool m_Hexencrush; bool m_Instant; int m_Direction; - secspecial_t m_NewSpecial; + secspecial_t m_NewSpecial{}; FTextureID m_Texture; double m_FloorDestDist; double m_Speed; diff --git a/src/r_defs.h b/src/r_defs.h index ffe526969..d319e6dd7 100644 --- a/src/r_defs.h +++ b/src/r_defs.h @@ -588,16 +588,6 @@ struct secspecial_t short damageinterval; // Interval for damage application short leakydamage; // chance of leaking through radiation suit int Flags; - - secspecial_t() - { - Clear(); - } - - void Clear() - { - memset(this, 0, sizeof(*this)); - } }; FSerializer &Serialize(FSerializer &arc, const char *key, secspecial_t &spec, secspecial_t *def);