summaryrefslogtreecommitdiffstats
path: root/src/GroupManager.cpp
diff options
context:
space:
mode:
authorAlexander Harkness <bearbin@gmail.com>2013-12-24 16:55:15 +0100
committerAlexander Harkness <bearbin@gmail.com>2013-12-24 16:55:15 +0100
commitf2d2b4fecbb09150332d390412e55161e247b89b (patch)
tree85c19a2161f493efce0efee36f7f7569b644a143 /src/GroupManager.cpp
parentMerge pull request #466 from Sxw1212/master (diff)
parentremoved the function def also (diff)
downloadcuberite-f2d2b4fecbb09150332d390412e55161e247b89b.tar
cuberite-f2d2b4fecbb09150332d390412e55161e247b89b.tar.gz
cuberite-f2d2b4fecbb09150332d390412e55161e247b89b.tar.bz2
cuberite-f2d2b4fecbb09150332d390412e55161e247b89b.tar.lz
cuberite-f2d2b4fecbb09150332d390412e55161e247b89b.tar.xz
cuberite-f2d2b4fecbb09150332d390412e55161e247b89b.tar.zst
cuberite-f2d2b4fecbb09150332d390412e55161e247b89b.zip
Diffstat (limited to 'src/GroupManager.cpp')
-rw-r--r--src/GroupManager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/GroupManager.cpp b/src/GroupManager.cpp
index 1ffe3812f..792acc2c3 100644
--- a/src/GroupManager.cpp
+++ b/src/GroupManager.cpp
@@ -79,11 +79,11 @@ cGroupManager::cGroupManager()
Group->SetName( KeyName );
char Color = IniFile.GetValue( KeyName, "Color", "-" )[0];
if( Color != '-' )
- Group->SetColor( cChatColor::MakeColor(Color) );
+ Group->SetColor( cChatColor::Color + Color );
else
Group->SetColor( cChatColor::White );
- std::string Commands = IniFile.GetValue( KeyName, "Commands", "" );
+ AString Commands = IniFile.GetValue( KeyName, "Commands", "" );
if( Commands.size() > 0 )
{
AStringVector Split = StringSplit( Commands, "," );
@@ -93,7 +93,7 @@ cGroupManager::cGroupManager()
}
}
- std::string Permissions = IniFile.GetValue( KeyName, "Permissions", "" );
+ AString Permissions = IniFile.GetValue( KeyName, "Permissions", "" );
if( Permissions.size() > 0 )
{
AStringVector Split = StringSplit( Permissions, "," );