From 46dd47b2652d0928bc414b12685a89effe41e9ef Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 16 May 2013 23:26:43 +0300 Subject: improve npcdialog class. allow set avatar size in avatars.xml. --- src/gui/npcdialog.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/gui/npcdialog.h') diff --git a/src/gui/npcdialog.h b/src/gui/npcdialog.h index f8c50ddff..b0208755b 100644 --- a/src/gui/npcdialog.h +++ b/src/gui/npcdialog.h @@ -51,8 +51,10 @@ class TextField; * * \ingroup Interface */ -class NpcDialog final : public Window, public gcn::ActionListener, - public ExtendedListModel, public ConfigListener +class NpcDialog final : public Window, + public gcn::ActionListener, + public ExtendedListModel, + public ConfigListener { public: /** @@ -158,7 +160,7 @@ class NpcDialog final : public Window, public gcn::ActionListener, void move(const int amount); - void setVisible(bool visible); + void setVisible(bool visible) override; void optionChanged(const std::string &name) override; @@ -215,7 +217,6 @@ class NpcDialog final : public Window, public gcn::ActionListener, void placeIntInputControls(); int mNpcId; - bool mLogInteraction; int mDefaultInt; std::string mDefaultString; @@ -272,6 +273,7 @@ class NpcDialog final : public Window, public gcn::ActionListener, PlayerBox *mPlayerBox; Being *mAvatarBeing; bool mShowAvatar; + bool mLogInteraction; }; #endif // NPCDIALOG_H -- cgit v1.2.3-70-g09d2