summaryrefslogtreecommitdiff
path: root/src/actions
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-17 13:32:56 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-17 13:33:33 +0300
commitd7a4988bffc489e9584def3ce65ebe2b8f4ca0b0 (patch)
tree3aded6c870558c63e06761e69745c91abbfed1f9 /src/actions
parentfa1edb2eff191d3c1ab7366d3918a57769379c57 (diff)
downloadmanaverse-d7a4988bffc489e9584def3ce65ebe2b8f4ca0b0.tar.gz
manaverse-d7a4988bffc489e9584def3ce65ebe2b8f4ca0b0.tar.bz2
manaverse-d7a4988bffc489e9584def3ce65ebe2b8f4ca0b0.tar.xz
manaverse-d7a4988bffc489e9584def3ce65ebe2b8f4ca0b0.zip
eathena: add pet talk command
Changed client version to 6.
Diffstat (limited to 'src/actions')
-rw-r--r--src/actions/pets.cpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/actions/pets.cpp b/src/actions/pets.cpp
index 7d3e4c672..fa413227f 100644
--- a/src/actions/pets.cpp
+++ b/src/actions/pets.cpp
@@ -67,17 +67,9 @@ impHandler(talkPet)
return false;
std::string args = event.args;
- // in future probably need add channel detection
- if (!localPlayer->getPets().empty())
- {
- if (findCutFirst(args, "/me "))
- args = textToMe(args);
- chatHandler->talkPet(args, GENERAL_CHANNEL);
- }
- else
- {
- chatHandler->talk(args, GENERAL_CHANNEL);
- }
+ if (findCutFirst(args, "/me "))
+ args = textToMe(args);
+ chatHandler->talkPet(args, GENERAL_CHANNEL);
return true;
}