summaryrefslogtreecommitdiff
path: root/src/gui/npcdialog.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-05-16 23:26:43 +0300
committerAndrei Karas <akaras@inbox.ru>2013-05-17 01:10:09 +0300
commit46dd47b2652d0928bc414b12685a89effe41e9ef (patch)
tree3bacd592cf08ff3eab1a3fae41688e8f4410047f /src/gui/npcdialog.h
parent5a3724fea17bb1d1059207eb6c1d1e18dac20aa3 (diff)
downloadplus-46dd47b2652d0928bc414b12685a89effe41e9ef.tar.gz
plus-46dd47b2652d0928bc414b12685a89effe41e9ef.tar.bz2
plus-46dd47b2652d0928bc414b12685a89effe41e9ef.tar.xz
plus-46dd47b2652d0928bc414b12685a89effe41e9ef.zip
improve npcdialog class.
allow set avatar size in avatars.xml.
Diffstat (limited to 'src/gui/npcdialog.h')
-rw-r--r--src/gui/npcdialog.h10
1 files changed, 6 insertions, 4 deletions
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