From 2fdb687596ed775862b5a12c154bf6328e4cd7f7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 30 May 2017 21:45:19 +0300 Subject: fix uninitialised values in npc dialog constructor. --- src/gui/windows/npcdialog.cpp | 4 ++-- src/gui/windows/npcdialog.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index e1b139bd8..a6c7fe857 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -107,6 +107,8 @@ NpcDialog::NpcDialog(const BeingId npcId) : "npc_textbackground.xml")), mText(), mNewText(), + mItems(), + mImages(), mItemList(CREATEWIDGETR(ExtendedListBox, this, this, "extendedlistbox.xml")), mListScrollArea(new ScrollArea(this, mItemList, @@ -116,8 +118,6 @@ NpcDialog::NpcDialog(const BeingId npcId) : mSkinScrollArea(new ScrollArea(this, mSkinContainer, fromBool(getOptionBool("showlistbackground"), Opaque), "npc_listbackground.xml")), - mItems(), - mImages(), mItemLinkHandler(new ItemLinkHandler), mTextField(new TextField(this, "")), mIntField(new IntTextField(this)), diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h index 61b505fb1..0c16c7df2 100644 --- a/src/gui/windows/npcdialog.h +++ b/src/gui/windows/npcdialog.h @@ -278,12 +278,12 @@ class NpcDialog final : public Window, std::string mNewText; // Used for choice input + StringVect mItems; + std::vector mImages; ExtendedListBox *mItemList A_NONNULLPOINTER; ScrollArea *mListScrollArea A_NONNULLPOINTER; Container *mSkinContainer A_NONNULLPOINTER; ScrollArea *mSkinScrollArea A_NONNULLPOINTER; - StringVect mItems; - std::vector mImages; ItemLinkHandler *mItemLinkHandler A_NONNULLPOINTER; // Used for string and integer input -- cgit v1.2.3-60-g2f50