diff options
| author | Chuck Miller <shadowmil@gmail.com> | 2010-11-11 21:55:25 -0500 |
|---|---|---|
| committer | Chuck Miller <shadowmil@gmail.com> | 2010-11-11 22:45:58 -0500 |
| commit | 5727a2d9eeb0688a16e5b7fe32f6d9836c4f7a4e (patch) | |
| tree | 994cdeb1187a94996ca38c5e274aabaa5f1fec76 /src/being.cpp | |
| parent | 3dd1baab3fb00a3aa99447430f16a431a205c614 (diff) | |
| download | mana-5727a2d9eeb0688a16e5b7fe32f6d9836c4f7a4e.tar.gz mana-5727a2d9eeb0688a16e5b7fe32f6d9836c4f7a4e.tar.bz2 mana-5727a2d9eeb0688a16e5b7fe32f6d9836c4f7a4e.tar.xz mana-5727a2d9eeb0688a16e5b7fe32f6d9836c4f7a4e.zip | |
Have the event system channels use enums instead of strings
Reviewed-by: Freeyorp
Diffstat (limited to 'src/being.cpp')
| -rw-r--r-- | src/being.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/being.cpp b/src/being.cpp index 95f2ecdd..c749d8ce 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -115,7 +115,7 @@ Being::Being(int id, Type type, int subtype, Map *map): setShowName(true); updateColors(); - listen("Chat"); + listen(CHANNEL_CHAT); } Being::~Being() @@ -1210,12 +1210,12 @@ void Being::talkTo() { Mana::Event event("doTalk"); event.setInt("npcId", mId); - event.trigger("NPC"); + event.trigger(CHANNEL_NPC); } -void Being::event(const std::string &channel, const Mana::Event &event) +void Being::event(Channels channel, const Mana::Event &event) { - if (channel == "Chat" && + if (channel == CHANNEL_CHAT && (event.getName() == "Being" || event.getName() == "Player") && event.getInt("permissions") & PlayerRelation::SPEECH_FLOAT) { |