summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-06-12 23:38:04 +0300
committerAndrei Karas <akaras@inbox.ru>2013-06-12 23:38:04 +0300
commitd3af59b8eedae98a49367e2ac37f2ab1b79c0557 (patch)
tree5c004058a74022e2a1cb33d497b2533bf3e9b085 /src/net/eathena
parent77a5341118e27572c9b9db90d42120c84d204d77 (diff)
downloadmv-d3af59b8eedae98a49367e2ac37f2ab1b79c0557.tar.gz
mv-d3af59b8eedae98a49367e2ac37f2ab1b79c0557.tar.bz2
mv-d3af59b8eedae98a49367e2ac37f2ab1b79c0557.tar.xz
mv-d3af59b8eedae98a49367e2ac37f2ab1b79c0557.zip
remove npc dialog wrapper.
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/npchandler.cpp8
1 files changed, 3 insertions, 5 deletions
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;