diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-02-23 06:47:44 -0700 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-02-23 06:47:44 -0700 |
| commit | 208e4cfad44dd5bf1d0409d1c2227a1a5eae3a2e (patch) | |
| tree | a655be86ef9ac68ee540a66587e2177a37668bfc /src | |
| parent | ebe59b84ab4c378bc0c203d7f22e1196058a15d2 (diff) | |
| download | Mana-208e4cfad44dd5bf1d0409d1c2227a1a5eae3a2e.tar.gz Mana-208e4cfad44dd5bf1d0409d1c2227a1a5eae3a2e.tar.bz2 Mana-208e4cfad44dd5bf1d0409d1c2227a1a5eae3a2e.tar.xz Mana-208e4cfad44dd5bf1d0409d1c2227a1a5eae3a2e.zip | |
Clear text from NpcTextDialog when character dies
Also hid the integer and string dialogs
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/npc_text.cpp | 5 | ||||
| -rw-r--r-- | src/net/playerhandler.cpp | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp index e6f039a0..be67fb6e 100644 --- a/src/gui/npc_text.cpp +++ b/src/gui/npc_text.cpp @@ -73,6 +73,11 @@ void NpcTextDialog::addText(const std::string &text) mScrollArea->setVerticalScrollAmount(mScrollArea->getVerticalMaxScroll()); } +void NpcTextDialog::clearText() +{ + setText(""); +} + void NpcTextDialog::showNextButton() { mButton->setCaption(_("Next")); diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp index fc3506fb..ee1b2fd9 100644 --- a/src/net/playerhandler.cpp +++ b/src/net/playerhandler.cpp @@ -32,8 +32,10 @@ #include "../gui/buy.h" #include "../gui/chat.h" #include "../gui/gui.h" -#include "../gui/npclistdialog.h" #include "../gui/npc_text.h" +#include "../gui/npcintegerdialog.h" +#include "../gui/npclistdialog.h" +#include "../gui/npcstringdialog.h" #include "../gui/ok_dialog.h" #include "../gui/sell.h" #include "../gui/skill.h" @@ -46,7 +48,9 @@ OkDialog *weightNotice = NULL; OkDialog *deathNotice = NULL; +extern NpcIntegerDialog *npcIntegerDialog; extern NpcListDialog *npcListDialog; +extern NpcStringDialog *npcStringDialog; extern NpcTextDialog *npcTextDialog; extern BuyDialog *buyDialog; extern SellDialog *sellDialog; @@ -81,7 +85,10 @@ namespace { { player_node->revive(); deathNotice = NULL; + npcIntegerDialog->setVisible(false); npcListDialog->setVisible(false); + npcStringDialog->setVisible(false); + npcTextDialog->clearText(); npcTextDialog->setVisible(false); buyDialog->setVisible(false); sellDialog->setVisible(false); |