diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-02-13 15:04:58 -0700 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-02-13 15:08:54 -0700 |
| commit | 8bc425ff48b7a874ca0fb9d2285044c75f3010ab (patch) | |
| tree | 5904c7f53cde9ffbe7df2a63f088561141e06b66 /src/gui/popupmenu.cpp | |
| parent | 28c9cec5d39c9a1b98694eba9a28281cf111e34a (diff) | |
| download | mana-8bc425ff48b7a874ca0fb9d2285044c75f3010ab.tar.gz mana-8bc425ff48b7a874ca0fb9d2285044c75f3010ab.tar.bz2 mana-8bc425ff48b7a874ca0fb9d2285044c75f3010ab.tar.xz mana-8bc425ff48b7a874ca0fb9d2285044c75f3010ab.zip | |
Make NPC dialogs instance instead of global
This change allows players to talk to multiple NPCs at a time (if the server agrees). Manaserv's netcode allows multiple commerce instances too. eAthena's is limited to one commerce instance, due to protocol limitations.
Diffstat (limited to 'src/gui/popupmenu.cpp')
| -rw-r--r-- | src/gui/popupmenu.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 75259dda..878ba7b8 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -205,9 +205,7 @@ void PopupMenu::handleLink(const std::string &link) // Talk To action if (link == "talk" && - being && - being->getType() == Being::NPC && - current_npc == 0) + being && being->getType() == Being::NPC) { dynamic_cast<NPC*>(being)->talk(); } |