diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-04-09 00:11:54 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-04-09 17:54:12 +0200 |
| commit | 1e1f619b9ae5aa26058c499c988f45d1fb1b6d53 (patch) | |
| tree | 1fe58c53388054ced122b5327e33fc2851a0606a /src/being.cpp | |
| parent | 30d4b0adf4f17f05d1d62fc3428c896ef1079b6b (diff) | |
| download | mana-1e1f619b9ae5aa26058c499c988f45d1fb1b6d53.tar.gz mana-1e1f619b9ae5aa26058c499c988f45d1fb1b6d53.tar.bz2 mana-1e1f619b9ae5aa26058c499c988f45d1fb1b6d53.tar.xz mana-1e1f619b9ae5aa26058c499c988f45d1fb1b6d53.zip | |
Moved Channels to Mana::Event::Channel
Acked-by: Jared Adams
Diffstat (limited to 'src/being.cpp')
| -rw-r--r-- | src/being.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/being.cpp b/src/being.cpp index 53bcf7d3..fa9bd4f5 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -109,8 +109,8 @@ Being::Being(int id, Type type, int subtype, Map *map): setShowName(true); updateColors(); - listen(CHANNEL_CONFIG); - listen(CHANNEL_CHAT); + listen(Mana::Event::ConfigChannel); + listen(Mana::Event::ChatChannel); } Being::~Being() @@ -1226,9 +1226,9 @@ void Being::talkTo() Net::getNpcHandler()->talk(mId); } -void Being::event(Channels channel, const Mana::Event &event) +void Being::event(Mana::Event::Channel channel, const Mana::Event &event) { - if (channel == CHANNEL_CHAT && + if (channel == Mana::Event::ChatChannel && (event.getType() == Mana::Event::Being || event.getType() == Mana::Event::Player) && event.getInt("permissions") & PlayerRelation::SPEECH_FLOAT) @@ -1243,7 +1243,7 @@ void Being::event(Channels channel, const Mana::Event &event) catch (Mana::BadEvent badEvent) {} } - else if (channel == CHANNEL_CONFIG && + else if (channel == Mana::Event::ConfigChannel && event.getType() == Mana::Event::ConfigOptionChanged) { if (getType() == PLAYER && event.getString("option") == "visiblenames") |