diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-09-17 00:55:22 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-09-17 00:55:22 +0300 |
commit | 3a7313c027407e3b35360a021c72fe78f181d81d (patch) | |
tree | bb313b81c7feb42c2a0b5855c1eca00ef2d7c1b1 /src/actions | |
parent | 1307b14ff24f3935fa58aef405ffb246c0741336 (diff) | |
download | mv-3a7313c027407e3b35360a021c72fe78f181d81d.tar.gz mv-3a7313c027407e3b35360a021c72fe78f181d81d.tar.bz2 mv-3a7313c027407e3b35360a021c72fe78f181d81d.tar.xz mv-3a7313c027407e3b35360a021c72fe78f181d81d.zip |
Remove getter for chatHandler.
Diffstat (limited to 'src/actions')
-rw-r--r-- | src/actions/actions.cpp | 6 | ||||
-rw-r--r-- | src/actions/chat.cpp | 4 | ||||
-rw-r--r-- | src/actions/commands.cpp | 14 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index d087f39e7..6175ec904 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -649,7 +649,7 @@ impHandler(where) impHandler0(who) { - Net::getChatHandler()->who(); + chatHandler->who(); return true; } @@ -946,13 +946,13 @@ impHandler0(dump) impHandler0(serverIgnoreAll) { - Net::getChatHandler()->ignoreAll(); + chatHandler->ignoreAll(); return true; } impHandler0(serverUnIgnoreAll) { - Net::getChatHandler()->unIgnoreAll(); + chatHandler->unIgnoreAll(); return true; } diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp index 3d12d99e1..3c6b4f7fc 100644 --- a/src/actions/chat.cpp +++ b/src/actions/chat.cpp @@ -53,7 +53,7 @@ static void outString(const ChatTab *const tab, { if (!tab) { - Net::getChatHandler()->me(def, GENERAL_CHANNEL); + chatHandler->me(def, GENERAL_CHANNEL); return; } @@ -85,7 +85,7 @@ static void outString(const ChatTab *const tab, break; } default: - Net::getChatHandler()->me(def, GENERAL_CHANNEL); + chatHandler->me(def, GENERAL_CHANNEL); break; } } diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp index c7e12af88..a1ae6b32c 100644 --- a/src/actions/commands.cpp +++ b/src/actions/commands.cpp @@ -630,7 +630,7 @@ impHandler(testParticle) impHandler(talkRaw) { - Net::getChatHandler()->talkRaw(event.args); + chatHandler->talkRaw(event.args); return true; } @@ -638,21 +638,21 @@ impHandler(talkPet) { // in future probably need add channel detection if (!localPlayer->getPets().empty()) - Net::getChatHandler()->talkPet(event.args, GENERAL_CHANNEL); + chatHandler->talkPet(event.args, GENERAL_CHANNEL); else - Net::getChatHandler()->talk(event.args, GENERAL_CHANNEL); + chatHandler->talk(event.args, GENERAL_CHANNEL); return true; } impHandler(gm) { - Net::getChatHandler()->talk("@wgm " + event.args, GENERAL_CHANNEL); + chatHandler->talk("@wgm " + event.args, GENERAL_CHANNEL); return true; } impHandler(hack) { - Net::getChatHandler()->sendRaw(event.args); + chatHandler->sendRaw(event.args); return true; } @@ -676,7 +676,7 @@ impHandler(serverIgnoreWhisper) if (args.empty()) return false; - Net::getChatHandler()->ignore(args); + chatHandler->ignore(args); return true; } @@ -686,7 +686,7 @@ impHandler(serverUnIgnoreWhisper) if (args.empty()) return false; - Net::getChatHandler()->unIgnore(args); + chatHandler->unIgnore(args); return true; } |