diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-12-25 01:36:11 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-12-25 01:36:11 +0300 |
commit | 02d2f61628927de7b86bba2f9455dcf05c37f78d (patch) | |
tree | 6695cc67764a94d2f3a0fd36afafb2bd06976089 /src/gui/windows | |
parent | e31bec39543cf616daac1be9b0d700a72a46b648 (diff) | |
download | manaplus-02d2f61628927de7b86bba2f9455dcf05c37f78d.tar.gz manaplus-02d2f61628927de7b86bba2f9455dcf05c37f78d.tar.bz2 manaplus-02d2f61628927de7b86bba2f9455dcf05c37f78d.tar.xz manaplus-02d2f61628927de7b86bba2f9455dcf05c37f78d.zip |
dont show over head text if text ignored or going to trade tab.
Diffstat (limited to 'src/gui/windows')
-rw-r--r-- | src/gui/windows/chatwindow.cpp | 11 | ||||
-rw-r--r-- | src/gui/windows/chatwindow.h | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index ea7a372d4..d658ae183 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -1452,7 +1452,7 @@ std::string ChatWindow::autoCompleteHistory(const std::string &partName) const return autoComplete(nameList, partName); } -void ChatWindow::resortChatLog(std::string line, Own own, +bool ChatWindow::resortChatLog(std::string line, Own own, const std::string &channel, const bool ignoreRecord, const bool tryRemoveColors) @@ -1470,7 +1470,7 @@ void ChatWindow::resortChatLog(std::string line, Own own, { tradeChatTab->chatLog(prefix + line, own, ignoreRecord, tryRemoveColors); - return; + return false; } size_t idx2 = line.find(": "); @@ -1481,11 +1481,11 @@ void ChatWindow::resortChatLog(std::string line, Own own, { // ignore special message formats. if (line.find(": \302\202\302") != std::string::npos) - return; + return false; line = line.erase(idx + 2, 2); tradeChatTab->chatLog(prefix + line, own, ignoreRecord, tryRemoveColors); - return; + return false; } } @@ -1502,7 +1502,7 @@ void ChatWindow::resortChatLog(std::string line, Own own, { tradeChatTab->chatLog(prefix + line, own, ignoreRecord, tryRemoveColors); - return; + return false; } } } @@ -1533,6 +1533,7 @@ void ChatWindow::resortChatLog(std::string line, Own own, { localChatTab->chatLog(line, own, ignoreRecord, tryRemoveColors); } + return true; } void ChatWindow::battleChatLog(const std::string &line, Own own, diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h index d93e2ce94..a1a7d77ee 100644 --- a/src/gui/windows/chatwindow.h +++ b/src/gui/windows/chatwindow.h @@ -233,7 +233,7 @@ class ChatWindow final : public Window, void ignoreAllWhispers(); - void resortChatLog(std::string line, Own own, + bool resortChatLog(std::string line, Own own, const std::string &channel, const bool ignoreRecord, const bool tryRemoveColors); |