diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-06-12 23:38:04 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-06-12 23:38:04 +0300 |
| commit | d3af59b8eedae98a49367e2ac37f2ab1b79c0557 (patch) | |
| tree | 5c004058a74022e2a1cb33d497b2533bf3e9b085 /src/net/ea | |
| parent | 77a5341118e27572c9b9db90d42120c84d204d77 (diff) | |
| download | manaplus-d3af59b8eedae98a49367e2ac37f2ab1b79c0557.tar.gz manaplus-d3af59b8eedae98a49367e2ac37f2ab1b79c0557.tar.bz2 manaplus-d3af59b8eedae98a49367e2ac37f2ab1b79c0557.tar.xz manaplus-d3af59b8eedae98a49367e2ac37f2ab1b79c0557.zip | |
remove npc dialog wrapper.
Diffstat (limited to 'src/net/ea')
| -rw-r--r-- | src/net/ea/npchandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/ea/npchandler.h | 6 |
2 files changed, 2 insertions, 6 deletions
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; }; |