diff options
| author | Chuck Miller <shadowmil@gmail.com> | 2009-05-03 17:18:31 -0400 |
|---|---|---|
| committer | Chuck Miller <shadowmil@gmail.com> | 2009-05-03 17:18:31 -0400 |
| commit | 05cd6e178814ccbab62e593a79332ab7aa95a963 (patch) | |
| tree | 676736079c828eb238f1f03386775ab26887f09b /src/gui/npcdialog.h | |
| parent | a93a723db62ba2ad445b0fff26be5c51aefcda78 (diff) | |
| parent | 8222f5bc57bd9da1db8fa18bddcb80da87f6fba4 (diff) | |
| download | mana-05cd6e178814ccbab62e593a79332ab7aa95a963.tar.gz mana-05cd6e178814ccbab62e593a79332ab7aa95a963.tar.bz2 mana-05cd6e178814ccbab62e593a79332ab7aa95a963.tar.xz mana-05cd6e178814ccbab62e593a79332ab7aa95a963.zip | |
Merge branch 'master' of git://gitorious.org/tmw/mainline
Diffstat (limited to 'src/gui/npcdialog.h')
| -rw-r--r-- | src/gui/npcdialog.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/npcdialog.h b/src/gui/npcdialog.h index f49976dc..7741f35c 100644 --- a/src/gui/npcdialog.h +++ b/src/gui/npcdialog.h @@ -151,6 +151,9 @@ class NpcDialog : public Window, public gcn::ActionListener, int mNpcId; + int mDefaultInt; + std::string mDefaultString; + // Used for the main input area gcn::ScrollArea *mScrollArea; TextBox *mTextBox; @@ -167,6 +170,9 @@ class NpcDialog : public Window, public gcn::ActionListener, // Used for the button Button *mButton; + + // Will reset the text and integer input to the provided default + Button *mResetButton; enum NPCInputState { NPC_INPUT_NONE, |