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/ea/npchandler.cpp | 2 +-
 src/net/ea/npchandler.h   | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/net/ea')

diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp
index 427415f51..78a46f630 100644
--- a/src/net/ea/npchandler.cpp
+++ b/src/net/ea/npchandler.cpp
@@ -55,7 +55,7 @@ void NpcHandler::clearDialogs()
     const NpcDialogs::iterator it_end = mNpcDialogs.end();
     while (it != it_end)
     {
-        delete (*it).second.dialog;
+        delete (*it).second;
         ++ it;
     }
     mNpcDialogs.clear();
diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h
index c87cb0ce3..9fe07f531 100644
--- a/src/net/ea/npchandler.h
+++ b/src/net/ea/npchandler.h
@@ -66,11 +66,7 @@ class NpcHandler : public Net::NpcHandler
         void processNpcStrInput(Net::MessageIn &msg);
 
     protected:
-        typedef struct
-        {
-            NpcDialog* dialog;
-        } Wrapper;
-        typedef std::map<int, Wrapper> NpcDialogs;
+        typedef std::map<int, NpcDialog*> NpcDialogs;
         NpcDialogs mNpcDialogs;
         NpcDialog *mDialog;
 };
-- 
cgit v1.2.3-60-g2f50