From 19b82b4dad9b66418a4e7d0ed0ba23d0cab17216 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 16 Dec 2017 02:19:08 +0300 Subject: Remove default parameters from Being::setSpeech. --- src/being/being.cpp | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'src/being/being.cpp') diff --git a/src/being/being.cpp b/src/being/being.cpp index 61826f494..8cd80d4dc 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -564,19 +564,11 @@ void Being::setPath(const Path &restrict path) restrict2 } } -void Being::setSpeech(const std::string &restrict text, - const std::string &restrict channel, - int time) restrict2 +void Being::setSpeech(const std::string &restrict text) restrict2 { if (userPalette == nullptr) return; - if (!channel.empty() && - ((langChatTab == nullptr) || langChatTab->getChannelName() != channel)) - { - return; - } - // Remove colors mSpeech = removeColors(text); @@ -591,12 +583,10 @@ void Being::setSpeech(const std::string &restrict text, if (mSpeech.empty()) return; - if (time == 0) - { - const size_t sz = mSpeech.size(); - if (sz < 200) - time = CAST_S32(SPEECH_TIME - 300 + (3 * sz)); - } + const size_t sz = mSpeech.size(); + int time = 0; + if (sz < 200) + time = CAST_S32(SPEECH_TIME - 300 + (3 * sz)); if (time < CAST_S32(SPEECH_MIN_TIME)) time = CAST_S32(SPEECH_MIN_TIME); -- cgit v1.2.3-60-g2f50