From d3af59b8eedae98a49367e2ac37f2ab1b79c0557 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 12 Jun 2013 23:38:04 +0300
Subject: remove npc dialog wrapper.

---
 src/net/eathena/npchandler.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/net/eathena/npchandler.cpp')

diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp
index 4730067fd..fc5744bfd 100644
--- a/src/net/eathena/npchandler.cpp
+++ b/src/net/eathena/npchandler.cpp
@@ -133,7 +133,7 @@ void NpcHandler::closeDialog(const int npcId)
     const NpcDialogs::iterator it = mNpcDialogs.find(npcId);
     if (it != mNpcDialogs.end())
     {
-        NpcDialog *const dialog = (*it).second.dialog;
+        NpcDialog *const dialog = (*it).second;
         if (dialog)
             dialog->close();
         if (dialog == mDialog)
@@ -227,14 +227,12 @@ int NpcHandler::getNpc(Net::MessageIn &msg, const bool haveLength)
             mDialog->saveCamera();
             if (player_node)
                 player_node->stopWalking(false);
-            Wrapper wrap;
-            wrap.dialog = mDialog;
-            mNpcDialogs[npcId] = wrap;
+            mNpcDialogs[npcId] = mDialog;
         }
     }
     else
     {
-        NpcDialog *const dialog = diag->second.dialog;
+        NpcDialog *const dialog = diag->second;
         if (mDialog && mDialog != dialog)
             mDialog->restoreCamera();
         mDialog = dialog;
-- 
cgit v1.2.3-60-g2f50