diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-12-11 19:10:19 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-12-11 19:10:19 +0300 |
| commit | ee1fc0b63cb7f27df85c43474497b805df6e31f5 (patch) | |
| tree | d233f17e1bfd751b6939646a24f1253ae8d14796 /src/being | |
| parent | a80f4ac5c1c3ef4d3ac5f026591b16074d0bf451 (diff) | |
| download | manaplus-ee1fc0b63cb7f27df85c43474497b805df6e31f5.tar.gz manaplus-ee1fc0b63cb7f27df85c43474497b805df6e31f5.tar.bz2 manaplus-ee1fc0b63cb7f27df85c43474497b805df6e31f5.tar.xz manaplus-ee1fc0b63cb7f27df85c43474497b805df6e31f5.zip | |
Remove default parameters from ChatTab::chatLog.
Diffstat (limited to 'src/being')
| -rw-r--r-- | src/being/being.cpp | 8 | ||||
| -rw-r--r-- | src/being/localplayer.cpp | 17 |
2 files changed, 19 insertions, 6 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index 429201cf2..618989bd5 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -751,7 +751,9 @@ void Being::takeDamage(Being *restrict const attacker, { ChatWindow::battleChatLog(strprintf("%s : Hit you -%d", attacker->getName().c_str(), amount), - ChatMsgType::BY_OTHER); + ChatMsgType::BY_OTHER, + IgnoreRecord_false, + TryRemoveColors_true); } } else if (attacker == localPlayer && (amount != 0)) @@ -760,7 +762,9 @@ void Being::takeDamage(Being *restrict const attacker, attacker->mName.c_str(), mName.c_str(), amount), - ChatMsgType::BY_PLAYER); + ChatMsgType::BY_PLAYER, + IgnoreRecord_false, + TryRemoveColors_true); } } if (font != nullptr && particleEngine != nullptr) diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index 94fa39a1f..3eb2a32af 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -924,8 +924,14 @@ void LocalPlayer::pickedUp(const ItemInfo &itemInfo, msg = N_("Unknown problem picking up item."); break; } - if ((localChatTab != nullptr) && config.getBoolValue("showpickupchat")) - localChatTab->chatLog(gettext(msg), ChatMsgType::BY_SERVER); + if (localChatTab != nullptr && + config.getBoolValue("showpickupchat")) + { + localChatTab->chatLog(gettext(msg), + ChatMsgType::BY_SERVER, + IgnoreRecord_false, + TryRemoveColors_true); + } if ((mMap != nullptr) && config.getBoolValue("showpickupparticle")) { @@ -954,7 +960,9 @@ void LocalPlayer::pickedUp(const ItemInfo &itemInfo, localChatTab->chatLog(strprintf(ngettext("You picked up %d " "[@@%d|%s@@].", "You picked up %d [@@%d|%s@@].", amount), amount, itemInfo.getId(), str.c_str()), - ChatMsgType::BY_SERVER); + ChatMsgType::BY_SERVER, + IgnoreRecord_false, + TryRemoveColors_true); } if ((mMap != nullptr) && config.getBoolValue("showpickupparticle")) @@ -2038,7 +2046,8 @@ void LocalPlayer::afkRespond(ChatTab *const tab, const std::string &nick) localChatTab->chatLog(std::string(mName).append( " : ").append(msg), ChatMsgType::ACT_WHISPER, - IgnoreRecord_false); + IgnoreRecord_false, + TryRemoveColors_true); } } else |