summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-07-19 20:12:34 +0200
committerarchshift <admin@archshift.com>2014-07-19 20:12:34 +0200
commitd5b163bd3d731ac88780e9042c39eed28982edc2 (patch)
tree6d297c5bd857bc6c01e7994920fb0a4a8f7c15f0 /src
parentRefactored cChatColor (diff)
downloadcuberite-d5b163bd3d731ac88780e9042c39eed28982edc2.tar
cuberite-d5b163bd3d731ac88780e9042c39eed28982edc2.tar.gz
cuberite-d5b163bd3d731ac88780e9042c39eed28982edc2.tar.bz2
cuberite-d5b163bd3d731ac88780e9042c39eed28982edc2.tar.lz
cuberite-d5b163bd3d731ac88780e9042c39eed28982edc2.tar.xz
cuberite-d5b163bd3d731ac88780e9042c39eed28982edc2.tar.zst
cuberite-d5b163bd3d731ac88780e9042c39eed28982edc2.zip
Diffstat (limited to 'src')
-rw-r--r--src/Entities/Player.cpp2
-rw-r--r--src/GroupManager.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 698f77bf6..808b74023 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -1524,7 +1524,7 @@ AString cPlayer::GetColor(void) const
{
if ( m_Color != '-' )
{
- return cChatColor::Color + m_Color;
+ return cChatColor::Delimiter + m_Color;
}
if ( m_Groups.size() < 1 )
diff --git a/src/GroupManager.cpp b/src/GroupManager.cpp
index 135a1636a..a1cc396cf 100644
--- a/src/GroupManager.cpp
+++ b/src/GroupManager.cpp
@@ -153,7 +153,7 @@ bool cGroupManager::LoadGroups()
AString Color = IniFile.GetValue(KeyName, "Color", "-");
if ((Color != "-") && (Color.length() >= 1))
{
- Group->SetColor(cChatColor::Color + Color[0]);
+ Group->SetColor(cChatColor::Delimiter + Color[0]);
}
else
{