diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-12-25 15:23:14 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-12-25 15:23:14 +0300 |
| commit | 3b8e75c9e1ed6f9647849f855cc069287c31c291 (patch) | |
| tree | 53a51b30eeabcd6d13efa85367519c096455a9ba | |
| parent | 25d24557ed6410ce607fe3ee4560816625170c3d (diff) | |
| download | manaplus-3b8e75c9e1ed6f9647849f855cc069287c31c291.tar.gz manaplus-3b8e75c9e1ed6f9647849f855cc069287c31c291.tar.bz2 manaplus-3b8e75c9e1ed6f9647849f855cc069287c31c291.tar.xz manaplus-3b8e75c9e1ed6f9647849f855cc069287c31c291.zip | |
Allow close npc dialog if server script working incorrectly.
| -rw-r--r-- | src/gui/npcdialog.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp index 66a30c8a7..1b0193c65 100644 --- a/src/gui/npcdialog.cpp +++ b/src/gui/npcdialog.cpp @@ -48,7 +48,7 @@ #include "debug.h" -#define CAPTION_WAITING _("Waiting for server") +#define CAPTION_WAITING _("Stop waiting") #define CAPTION_NEXT _("Next") #define CAPTION_CLOSE _("Close") #define CAPTION_SUBMIT _("Submit") @@ -222,7 +222,8 @@ void NpcDialog::action(const gcn::ActionEvent &event) nextDialog(); addText(_("> Next"), false); } - else if (mActionState == NPC_ACTION_CLOSE) + else if (mActionState == NPC_ACTION_CLOSE + || mActionState == NPC_ACTION_WAIT) { closeDialog(); } @@ -501,8 +502,6 @@ void NpcDialog::buildLayout() Layout &layout = getLayout(); layout.setRowHeight(0, Layout::AUTO_SET); - mButton->setEnabled(mActionState != NPC_ACTION_WAIT); - redraw(); mScrollArea->setVerticalScrollAmount(mScrollArea->getVerticalMaxScroll()); |