From 1e1f619b9ae5aa26058c499c988f45d1fb1b6d53 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Sat, 9 Apr 2011 00:11:54 +0200 Subject: Moved Channels to Mana::Event::Channel Acked-by: Jared Adams --- src/localplayer.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/localplayer.cpp') diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 1e1d5de0..1ed65cd6 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -85,7 +85,7 @@ LocalPlayer::LocalPlayer(int id, int subtype): mAfkTime(0), mAwayMode(false) { - listen(CHANNEL_ATTRIBUTES); + listen(Mana::Event::AttributesChannel); mAwayListener = new AwayListener(); @@ -93,8 +93,8 @@ LocalPlayer::LocalPlayer(int id, int subtype): setShowName(config.getValue("showownname", 1)); - listen(CHANNEL_CONFIG); - listen(CHANNEL_ACTORSPRITE); + listen(Mana::Event::ConfigChannel); + listen(Mana::Event::ActorSpriteChannel); } LocalPlayer::~LocalPlayer() @@ -1105,9 +1105,9 @@ void LocalPlayer::addMessageToQueue(const std::string &message, int color) mMessages.push_back(MessagePair(message, color)); } -void LocalPlayer::event(Channels channel, const Mana::Event &event) +void LocalPlayer::event(Mana::Event::Channel channel, const Mana::Event &event) { - if (channel == CHANNEL_ACTORSPRITE) + if (channel == Mana::Event::ActorSpriteChannel) { if (event.getType() == Mana::Event::Destroyed) { @@ -1120,7 +1120,7 @@ void LocalPlayer::event(Channels channel, const Mana::Event &event) mTarget = 0; } } - else if (channel == CHANNEL_ATTRIBUTES) + else if (channel == Mana::Event::AttributesChannel) { if (event.getType() == Mana::Event::UpdateAttribute) { @@ -1133,7 +1133,7 @@ void LocalPlayer::event(Channels channel, const Mana::Event &event) } } } - else if (channel == CHANNEL_CONFIG) + else if (channel == Mana::Event::ConfigChannel) { if (event.getType() == Mana::Event::ConfigOptionChanged && event.getString("option") == "showownname") -- cgit v1.2.3-70-g09d2