diff options
| author | Chuck Miller <shadowmil@gmail.com> | 2010-11-12 20:58:30 -0500 |
|---|---|---|
| committer | Chuck Miller <shadowmil@gmail.com> | 2010-11-12 21:16:08 -0500 |
| commit | 009cfa4b2959bf89370e9d271f2244ef5446f3a0 (patch) | |
| tree | 88f9185140a636b8c6fc3badfdec55cfee826290 /src/being.cpp | |
| parent | 9ac7645f10d1e419703bdd35b276ce6e4eaf8152 (diff) | |
| download | mana-009cfa4b2959bf89370e9d271f2244ef5446f3a0.tar.gz mana-009cfa4b2959bf89370e9d271f2244ef5446f3a0.tar.bz2 mana-009cfa4b2959bf89370e9d271f2244ef5446f3a0.tar.xz mana-009cfa4b2959bf89370e9d271f2244ef5446f3a0.zip | |
Change NPC handling in the net code
Instead of using events to invoke netcode,
invoke netcode directly and have it send events
Reviewed-by: Freeyorp
Diffstat (limited to 'src/being.cpp')
| -rw-r--r-- | src/being.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/being.cpp b/src/being.cpp index a9790246..47410620 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -49,6 +49,7 @@ #include "net/gamehandler.h" #include "net/net.h" #include "net/playerhandler.h" +#include "net/npchandler.h" #include "resources/beinginfo.h" #include "resources/colordb.h" @@ -1208,9 +1209,7 @@ bool Being::canTalk() void Being::talkTo() { - Mana::Event event(EVENT_DOTALK); - event.setInt("npcId", mId); - event.trigger(CHANNEL_NPC); + Net::getNpcHandler()->talk(mId); } void Being::event(Channels channel, const Mana::Event &event) |