From d7a4988bffc489e9584def3ce65ebe2b8f4ca0b0 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 17 Feb 2015 13:32:56 +0300
Subject: eathena: add pet talk command

Changed client version to 6.
---
 src/actions/pets.cpp | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'src/actions/pets.cpp')

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;
 }
 
-- 
cgit v1.2.3-60-g2f50