diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-05-30 21:45:19 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-05-30 21:45:19 +0300 |
| commit | 2fdb687596ed775862b5a12c154bf6328e4cd7f7 (patch) | |
| tree | d7c7a0a33f1ec88e23b4ccf4cfe66b7f619b851f | |
| parent | e7d913aca1cc6fef85253962c39366e9b8fb721f (diff) | |
| download | manaplus-2fdb687596ed775862b5a12c154bf6328e4cd7f7.tar.gz manaplus-2fdb687596ed775862b5a12c154bf6328e4cd7f7.tar.bz2 manaplus-2fdb687596ed775862b5a12c154bf6328e4cd7f7.tar.xz manaplus-2fdb687596ed775862b5a12c154bf6328e4cd7f7.zip | |
fix uninitialised values in npc dialog constructor.
| -rw-r--r-- | src/gui/windows/npcdialog.cpp | 4 | ||||
| -rw-r--r-- | 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<Image *> mImages; ExtendedListBox *mItemList A_NONNULLPOINTER; ScrollArea *mListScrollArea A_NONNULLPOINTER; Container *mSkinContainer A_NONNULLPOINTER; ScrollArea *mSkinScrollArea A_NONNULLPOINTER; - StringVect mItems; - std::vector<Image *> mImages; ItemLinkHandler *mItemLinkHandler A_NONNULLPOINTER; // Used for string and integer input |