diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-08-12 19:43:51 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-08-12 20:07:04 -0600 |
| commit | 2293b1c5ef0bb7378140bf73f1fef03a4504bdd2 (patch) | |
| tree | b3df7512fd0e48e8b1b3a0ed3cbd6d5e9d149ad2 /src/being.cpp | |
| parent | 71595e5db41f503f06401c59090748b46e9731f0 (diff) | |
| download | mana-client-2293b1c5ef0bb7378140bf73f1fef03a4504bdd2.tar.gz mana-client-2293b1c5ef0bb7378140bf73f1fef03a4504bdd2.tar.bz2 mana-client-2293b1c5ef0bb7378140bf73f1fef03a4504bdd2.tar.xz mana-client-2293b1c5ef0bb7378140bf73f1fef03a4504bdd2.zip | |
Replace most of Net::NpcHandler with events
Reviewed-by: Chuck Miller
Diffstat (limited to 'src/being.cpp')
| -rw-r--r-- | src/being.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/being.cpp b/src/being.cpp index 9be5986c..9c56dec3 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -26,7 +26,7 @@ #include "client.h" #include "configuration.h" #include "effectmanager.h" -#include "event.h" +#include "eventmanager.h" #include "graphics.h" #include "guild.h" #include "localplayer.h" @@ -48,7 +48,6 @@ #include "net/charhandler.h" #include "net/gamehandler.h" #include "net/net.h" -#include "net/npchandler.h" #include "net/playerhandler.h" #include "resources/beinginfo.h" @@ -1199,7 +1198,9 @@ bool Being::canTalk() void Being::talkTo() { - Net::getNpcHandler()->talk(mId); + Mana::Event event("doTalk"); + event.setInt("npcId", mId); + Mana::EventManager::trigger("NPC", event); } void Being::event(const std::string &channel, const Mana::Event &event) |