Add next/close buttons for NPCs

And keep the text dialog open for the whole transaction, logging user
input and keep a full record of text from the NPC (for the current
transaction only).

1 files changed, 10 insertions, 1 deletions

diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
index 02f4e4b9..dc5893f8 100644
--- a/src/gui/npcstringdialog.cpp
+++ b/src/gui/npcstringdialog.cpp
@@ -20,15 +20,19 @@
  */
 
 #include "button.h"
+#include "npc_text.h"
 #include "npcstringdialog.h"
 #include "textfield.h"
 
 #include "../npc.h"
 
 #include "../utils/gettext.h"
+#include "../utils/strprintf.h"
 
 #include "widgets/layout.h"
 
+extern NpcTextDialog *npcTextDialog;
+
 NpcStringDialog::NpcStringDialog():
     Window(_("NPC Text Request"))
 {
@@ -60,11 +64,16 @@ void NpcStringDialog::action(const gcn::ActionEvent &event)
     if (event.getId() == "cancel")
     {
         mValueField->setText("");
+        npcTextDialog->addText(_("\n> Cancel\n"));
+    }
+    else
+    {
+        npcTextDialog->addText(strprintf("\n> \"%s\"\n",
+                                          mValueField->getText().c_str()));
     }
 
     setVisible(false);
     current_npc->stringInput(mValueField->getText());
-    current_npc = 0;
     mValueField->setText("");
 }