diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-05-24 22:31:47 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-05-24 22:31:47 +0300 |
commit | 7da1fab7ee72517bf2359a184d544734e92be6a9 (patch) | |
tree | 02b48427edcbdf55924d65d4dfe91beaff8c2b0c /src/gui/windows | |
parent | 7ae8a11e0e99ab28730a8ca98388a6ec0ea1923e (diff) | |
download | manaplus-7da1fab7ee72517bf2359a184d544734e92be6a9.tar.gz manaplus-7da1fab7ee72517bf2359a184d544734e92be6a9.tar.bz2 manaplus-7da1fab7ee72517bf2359a184d544734e92be6a9.tar.xz manaplus-7da1fab7ee72517bf2359a184d544734e92be6a9.zip |
From ChatTab::chatLog removed default parameter for message owner type.
Diffstat (limited to 'src/gui/windows')
-rw-r--r-- | src/gui/windows/chatwindow.cpp | 14 | ||||
-rw-r--r-- | src/gui/windows/socialwindow.cpp | 24 |
2 files changed, 25 insertions, 13 deletions
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 178f41c7e..f4641670d 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -963,7 +963,8 @@ void ChatWindow::statChanged(const int id, if (change != 0) { battleChatLog(std::string("+").append(toString( - change)).append(" job")); + change)).append(" job"), + ChatMsgType::BY_SERVER); } } @@ -983,12 +984,14 @@ void ChatWindow::attributeChanged(const int id, if (change != 0) { battleChatLog(std::string("+").append(toString( - change)).append(" xp")); + change)).append(" xp"), + ChatMsgType::BY_SERVER); } break; } case Attributes::LEVEL: - battleChatLog(std::string("Level: ").append(toString(newVal))); + battleChatLog(std::string("Level: ").append(toString(newVal)), + ChatMsgType::BY_SERVER); break; default: break; @@ -1068,7 +1071,7 @@ void ChatWindow::addWhisper(const std::string &restrict nick, } else if (own == ChatMsgType::BY_SERVER) { - tab->chatLog(mes); + tab->chatLog(mes, ChatMsgType::BY_SERVER); } else { @@ -1109,7 +1112,8 @@ void ChatWindow::addWhisper(const std::string &restrict nick, // TRANSLATORS: chat message localChatTab->chatLog(strprintf(_("Whispering to %s: %s"), - nick.c_str(), mes.c_str()), ChatMsgType::BY_PLAYER); + nick.c_str(), mes.c_str()), + ChatMsgType::BY_PLAYER); } else { diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index 83935ed49..4f453e576 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -269,7 +269,8 @@ void SocialWindow::action(const ActionEvent &event) localChatTab->chatLog( // TRANSLATORS: chat message strprintf(_("Accepted party invite from %s."), - mPartyInviter.c_str())); + mPartyInviter.c_str()), + ChatMsgType::BY_SERVER); } partyHandler->inviteResponse(mPartyInviter, mPartyId, true); } @@ -280,7 +281,8 @@ void SocialWindow::action(const ActionEvent &event) localChatTab->chatLog( // TRANSLATORS: chat message strprintf(_("Rejected party invite from %s."), - mPartyInviter.c_str())); + mPartyInviter.c_str()), + ChatMsgType::BY_SERVER); } partyHandler->inviteResponse(mPartyInviter, mPartyId, false); } @@ -297,7 +299,8 @@ void SocialWindow::action(const ActionEvent &event) localChatTab->chatLog( // TRANSLATORS: chat message strprintf(_("Accepted guild invite from %s."), - mPartyInviter.c_str())); + mPartyInviter.c_str()), + ChatMsgType::BY_SERVER); } #ifdef TMWA_SUPPORT if (!guildManager || !GuildManager::getEnableGuildBot()) @@ -315,7 +318,8 @@ void SocialWindow::action(const ActionEvent &event) localChatTab->chatLog( // TRANSLATORS: chat message strprintf(_("Rejected guild invite from %s."), - mPartyInviter.c_str())); + mPartyInviter.c_str()), + ChatMsgType::BY_SERVER); } #ifdef TMWA_SUPPORT if (!guildManager || !GuildManager::getEnableGuildBot()) @@ -359,7 +363,8 @@ void SocialWindow::action(const ActionEvent &event) { // TRANSLATORS: chat message localChatTab->chatLog(strprintf(_("Creating guild called %s."), - name.c_str()), ChatMsgType::BY_SERVER); + name.c_str()), + ChatMsgType::BY_SERVER); } mGuildCreateDialog = nullptr; @@ -380,7 +385,8 @@ void SocialWindow::action(const ActionEvent &event) { // TRANSLATORS: chat message localChatTab->chatLog(strprintf(_("Creating party called %s."), - name.c_str()), ChatMsgType::BY_SERVER); + name.c_str()), + ChatMsgType::BY_SERVER); } mPartyCreateDialog = nullptr; @@ -413,7 +419,8 @@ void SocialWindow::showGuildInvite(const std::string &restrict guildName, { // TRANSLATORS: chat message localChatTab->chatLog(_("Received guild request, but one already " - "exists."), ChatMsgType::BY_SERVER); + "exists."), + ChatMsgType::BY_SERVER); } return; } @@ -445,7 +452,8 @@ void SocialWindow::showPartyInvite(const std::string &restrict partyName, { // TRANSLATORS: chat message localChatTab->chatLog(_("Received party request, but one already " - "exists."), ChatMsgType::BY_SERVER); + "exists."), + ChatMsgType::BY_SERVER); } return; } |