Fix NPC handling to not need a handle on the NPC

The Being ID is used instead, as that is all that was ever really
needed.

1 files changed, 13 insertions, 3 deletions

diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
index 679c93e5..7ed05288 100644
--- a/src/gui/npcstringdialog.cpp
+++ b/src/gui/npcstringdialog.cpp
@@ -28,13 +28,16 @@
 
 #include "../npc.h"
 
+#include "../net/messageout.h"
+#include "../net/protocol.h"
+
 #include "../utils/gettext.h"
 #include "../utils/strprintf.h"
 
 extern NpcTextDialog *npcTextDialog;
 
-NpcStringDialog::NpcStringDialog():
-    Window(_("NPC Text Request"))
+NpcStringDialog::NpcStringDialog(Network *network):
+    Window(_("NPC Text Request")), mNetwork(network)
 {
     mValueField = new TextField("");
 
@@ -74,8 +77,15 @@ void NpcStringDialog::action(const gcn::ActionEvent &event)
     }
 
     setVisible(false);
-    current_npc->stringInput(mValueField->getText());
+    std::string text = mValueField->getText();
     mValueField->setText("");
+
+    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);
 }
 
 bool NpcStringDialog::isInputFocused()