diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-04-16 22:57:39 +0200 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-04-16 22:57:39 +0200 |
| commit | 576972fb768b0e43d41bada49ad88c6431494f10 (patch) | |
| tree | 755420a6c566a748233c06310062ea2cdfa280da /src/gui/widgets/chattab.cpp | |
| parent | c6b4edf8cc635ddcb2a8b3c0cef38dd88fa73768 (diff) | |
| parent | a0f7bc231d9c348ba86248dd8d0adfddbce453f7 (diff) | |
| download | mana-576972fb768b0e43d41bada49ad88c6431494f10.tar.gz mana-576972fb768b0e43d41bada49ad88c6431494f10.tar.bz2 mana-576972fb768b0e43d41bada49ad88c6431494f10.tar.xz mana-576972fb768b0e43d41bada49ad88c6431494f10.zip | |
Merge branch '0.0.29'
Diffstat (limited to 'src/gui/widgets/chattab.cpp')
| -rw-r--r-- | src/gui/widgets/chattab.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index 44840423..01d8b62b 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -125,11 +125,11 @@ void ChatTab::chatLog(std::string line, int own, bool ignoreRecord) } break; case BY_PLAYER: - tmp.nick += CAT_NORMAL; + tmp.nick += ": "; lineColor = "##Y"; break; case BY_OTHER: - tmp.nick += CAT_NORMAL; + tmp.nick += ": "; lineColor = "##C"; break; case BY_SERVER: @@ -148,7 +148,6 @@ void ChatTab::chatLog(std::string line, int own, bool ignoreRecord) lineColor = "##W"; break; case ACT_IS: - tmp.nick += CAT_IS; lineColor = "##I"; break; case BY_LOGGER: @@ -207,8 +206,9 @@ void ChatTab::chatLog(std::string line, int own, bool ignoreRecord) void ChatTab::chatLog(const std::string &nick, const std::string &msg) { - chatLog(nick + CAT_NORMAL + msg, nick == player_node->getName() ? - BY_PLAYER : BY_OTHER, false); + chatLog(nick + ": " + msg, + nick == player_node->getName() ? BY_PLAYER : BY_OTHER, + false); } void ChatTab::chatInput(std::string &msg) @@ -270,7 +270,8 @@ void ChatTab::clearText() mTextOutput->clearRows(); } -void ChatTab::handleInput(const std::string &msg) { +void ChatTab::handleInput(const std::string &msg) +{ Net::getChatHandler()->talk(msg); } |