1 files changed, 46 insertions, 14 deletions

diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
index 43d0722f..c84de015 100644
--- a/src/gui/npcstringdialog.cpp
+++ b/src/gui/npcstringdialog.cpp
@@ -1,9 +1,8 @@
 /*
- *  Aethyra
+ *  The Mana World
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of Aethyra based on original code
- *  from The Mana World.
+ *  This file is part of The Mana World.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,6 +20,7 @@
  */
 
 #include "button.h"
+#include "npc_text.h"
 #include "npcstringdialog.h"
 #include "textfield.h"
 
@@ -29,25 +29,38 @@
 #include "../npc.h"
 
 #include "../net/messageout.h"
-#include "../net/protocol.h"
+#ifdef EATHENA_SUPPORT
+#include "../net/ea/protocol.h"
+#endif
 
 #include "../utils/gettext.h"
-
-NpcStringDialog::NpcStringDialog(Network *network):
-    Window(_("NPC Text Request")), mNetwork(network)
+#include "../utils/strprintf.h"
+
+#ifdef TMWSERV_SUPPORT
+NpcStringDialog::NpcStringDialog()
+#else
+NpcStringDialog::NpcStringDialog(Network *network)
+#endif
+    : Window(_("NPC Text Request"))
+#ifdef EATHENA_SUPPORT
+    , mNetwork(network)
+#endif
 {
-    setWindowName("NPCInput");
+    setWindowName("NPCString");
     mValueField = new TextField("");
 
     setDefaultSize(175, 75, ImageRect::CENTER);
 
-    okButton = new Button(_("OK"), "ok", this);
-    cancelButton = new Button(_("Cancel"), "cancel", this);
+    gcn::Button *okButton = new Button(_("OK"), "ok", this);
+    gcn::Button *cancelButton = new Button(_("Cancel"), "cancel", this);
 
     place(0, 0, mValueField, 3);
     place(1, 1, cancelButton);
     place(2, 1, okButton);
+    reflowLayout(175, 0);
 
+    center();
+    setDefaultSize();
     loadWindowState();
 }
 
@@ -59,27 +72,36 @@ std::string NpcStringDialog::getValue()
 void NpcStringDialog::setValue(const std::string &value)
 {
     mValueField->setText(value);
+    mDefault = value;
 }
 
 void NpcStringDialog::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "cancel")
-        mValueField->setText("");
+    {
+        mValueField->setText(mDefault);
+        npcTextDialog->addText(_("\n> Cancel\n"));
+    }
+    else
+    {
+        npcTextDialog->addText(strprintf("\n> \"%s\"\n",
+                                          mValueField->getText().c_str()));
+    }
 
     setVisible(false);
-    NPC::mTalking = false;
+    NPC::isTalking = false;
 
     std::string text = mValueField->getText();
     mValueField->setText("");
 
+#ifdef EATHENA_SUPPORT
     MessageOut outMsg(mNetwork);
     outMsg.writeInt16(CMSG_NPC_STR_RESPONSE);
     outMsg.writeInt16(text.length() + 9);
     outMsg.writeInt32(current_npc);
     outMsg.writeString(text, text.length());
     outMsg.writeInt8(0);
-
-    current_npc = 0;
+#endif
 }
 
 bool NpcStringDialog::isInputFocused()
@@ -91,3 +113,13 @@ void NpcStringDialog::requestFocus()
 {
     mValueField->requestFocus();
 }
+
+void NpcStringDialog::setVisible(bool visible)
+{
+    if (visible) {
+        npcTextDialog->setVisible(true);
+        requestFocus();
+    }
+
+    Window::setVisible(visible);
+}