diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-06-13 00:43:25 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-06-13 00:43:25 +0300 |
commit | 9233c3936657f6dc4ca9c73d84ea8c045b3fc09d (patch) | |
tree | a7def2f0e6c8fcdaefd6f0f330da7e7eb6c9c0b0 /src/net/tmwa/npchandler.cpp | |
parent | d3af59b8eedae98a49367e2ac37f2ab1b79c0557 (diff) | |
download | manaplus-9233c3936657f6dc4ca9c73d84ea8c045b3fc09d.tar.gz manaplus-9233c3936657f6dc4ca9c73d84ea8c045b3fc09d.tar.bz2 manaplus-9233c3936657f6dc4ca9c73d84ea8c045b3fc09d.tar.xz manaplus-9233c3936657f6dc4ca9c73d84ea8c045b3fc09d.zip |
move npc dialogs array from netcode.
Diffstat (limited to 'src/net/tmwa/npchandler.cpp')
-rw-r--r-- | src/net/tmwa/npchandler.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index 36eca01aa..ddbc6a220 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -129,15 +129,15 @@ void NpcHandler::closeDialog(const int npcId) MessageOut outMsg(CMSG_NPC_CLOSE); outMsg.writeInt32(npcId); - const NpcDialogs::iterator it = mNpcDialogs.find(npcId); - if (it != mNpcDialogs.end()) + const NpcDialogs::iterator it = NpcDialog::mNpcDialogs.find(npcId); + if (it != NpcDialog::mNpcDialogs.end()) { NpcDialog *const dialog = (*it).second; if (dialog) dialog->close(); if (dialog == mDialog) mDialog = nullptr; - mNpcDialogs.erase(it); + NpcDialog::mNpcDialogs.erase(it); } } @@ -214,10 +214,10 @@ int NpcHandler::getNpc(Net::MessageIn &msg, const bool haveLength) const int npcId = msg.readInt32(); - const NpcDialogs::const_iterator diag = mNpcDialogs.find(npcId); + const NpcDialogs::const_iterator diag = NpcDialog::mNpcDialogs.find(npcId); mDialog = nullptr; - if (diag == mNpcDialogs.end()) + if (diag == NpcDialog::mNpcDialogs.end()) { // Empty dialogs don't help if (msg.getId() == SMSG_NPC_CLOSE) @@ -236,7 +236,7 @@ int NpcHandler::getNpc(Net::MessageIn &msg, const bool haveLength) mDialog->saveCamera(); if (player_node) player_node->stopWalking(false); - mNpcDialogs[npcId] = mDialog; + NpcDialog::mNpcDialogs[npcId] = mDialog; } } else |