* Made Sprite into an interface implemented by both FloorItem and Being, which

  hook themselves into the map on construction. The improved fringe layer is
  working as expected now.
* Made sure TMW compiles without warnings even when using "-Wconversion
  -Wshadow -Wcast-qual -Wwrite-strings -ansi -pedantic", lots of cleanups.
* Added two new small tilesets that contain the desert tiles that are twice and
  three times the height of a normal tile. One well in new_3-1 has been
  converted to use the new double tiles for testing purposes.

1 files changed, 9 insertions, 6 deletions

diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 9896f08e..2e0b0837 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -80,10 +80,13 @@ NpcTextDialog::addText(const std::string &text)
 void
 NpcTextDialog::action(const std::string& eventId)
 {
-    MessageOut outMsg;
-    outMsg.writeShort(CMSG_NPC_NEXT_REQUEST);
-    outMsg.writeLong(current_npc);
-    setText("");
-    setVisible(false);
-    current_npc = 0;
+    if (eventId == "ok")
+    {
+        MessageOut outMsg;
+        outMsg.writeShort(CMSG_NPC_NEXT_REQUEST);
+        outMsg.writeLong(current_npc);
+        setText("");
+        setVisible(false);
+        current_npc = 0;
+    }
 }