From e064c7a01a7bc10ce763decaecfee7474be1248b Mon Sep 17 00:00:00 2001 From: RaveYard Date: Sat, 29 Oct 2022 23:34:29 +0200 Subject: [PATCH] Fix uninitialized args in struct IntLineDef --- src/level/doomdata.h | 14 +++++++------- src/level/level_udmf.cpp | 3 --- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/level/doomdata.h b/src/level/doomdata.h index 849a709..d70d661 100644 --- a/src/level/doomdata.h +++ b/src/level/doomdata.h @@ -96,17 +96,17 @@ struct IntSector; struct IntLineDef { - uint32_t v1; - uint32_t v2; - int flags; - int special; - int args[5]; - uint32_t sidenum[2]; + uint32_t v1 = NO_INDEX; + uint32_t v2 = NO_INDEX; + int flags = 0; + int special = 0; + int args[5] = {}; + uint32_t sidenum[2] = {NO_INDEX, NO_INDEX}; TArray props; TArray ids; - IntSector *frontsector, *backsector; + IntSector *frontsector = nullptr, *backsector = nullptr; }; struct MapSector diff --git a/src/level/level_udmf.cpp b/src/level/level_udmf.cpp index 1d73a72..e7541cf 100644 --- a/src/level/level_udmf.cpp +++ b/src/level/level_udmf.cpp @@ -243,9 +243,6 @@ void FProcessor::ParseLinedef(IntLineDef *ld) { std::vector moreids; SC_MustGetStringName("{"); - ld->v1 = ld->v2 = ld->sidenum[0] = ld->sidenum[1] = NO_INDEX; - ld->flags = 0; - ld->special = 0; while (!SC_CheckString("}")) { const char *value;