aboutsummaryrefslogtreecommitdiff
path: root/src/util/enriched_string.cpp
diff options
context:
space:
mode:
authorMinetest-j45 <55553015+Minetest-j45@users.noreply.github.com>2021-08-30 15:22:40 +0100
committerGitHub <noreply@github.com>2021-08-30 15:22:40 +0100
commit7824a4956bf489b4e2cc35e0c97272eee06be6ba (patch)
tree70243765dc1743a83596f9c6eec122fb417ef92c /src/util/enriched_string.cpp
parent607add326feb44e078b843464ce4a8de09f28743 (diff)
parent35445d24f425c6291a0580b468919ca83de716fd (diff)
downloaddragonfireclient-7824a4956bf489b4e2cc35e0c97272eee06be6ba.tar.xz
Merge pull request #1 from EliasFleckenstein03/master
update
Diffstat (limited to 'src/util/enriched_string.cpp')
-rw-r--r--src/util/enriched_string.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/util/enriched_string.cpp b/src/util/enriched_string.cpp
index 762d094eb..b1f95215e 100644
--- a/src/util/enriched_string.cpp
+++ b/src/util/enriched_string.cpp
@@ -65,12 +65,14 @@ void EnrichedString::operator=(const wchar_t *str)
addAtEnd(translate_string(std::wstring(str)), m_default_color);
}
-void EnrichedString::addAtEnd(const std::wstring &s, const SColor &initial_color)
+void EnrichedString::addAtEnd(const std::wstring &s, SColor initial_color)
{
SColor color(initial_color);
bool use_default = (m_default_length == m_string.size() &&
color == m_default_color);
+ m_colors.reserve(m_colors.size() + s.size());
+
size_t i = 0;
while (i < s.length()) {
if (s[i] != L'\x1b') {
@@ -200,12 +202,6 @@ const std::wstring &EnrichedString::getString() const
return m_string;
}
-void EnrichedString::setDefaultColor(const irr::video::SColor &color)
-{
- m_default_color = color;
- updateDefaultColor();
-}
-
void EnrichedString::updateDefaultColor()
{
sanity_check(m_default_length <= m_colors.size());