summaryrefslogtreecommitdiffstats
path: root/src/GroupManager.cpp
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-07-22 19:30:31 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-07-22 19:30:31 +0200
commit18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2 (patch)
tree089b3be905aa030367925762c58bd30b08f5f3f6 /src/GroupManager.cpp
parentMerge branch 'master' into saplingsandleaves (diff)
parentUpdated prefabs to current Gallery content. (diff)
downloadcuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar
cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar.gz
cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar.bz2
cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar.lz
cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar.xz
cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar.zst
cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.zip
Diffstat (limited to 'src/GroupManager.cpp')
-rw-r--r--src/GroupManager.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/GroupManager.cpp b/src/GroupManager.cpp
index 135a1636a..32c2f1c97 100644
--- a/src/GroupManager.cpp
+++ b/src/GroupManager.cpp
@@ -27,7 +27,7 @@ struct cGroupManager::sGroupManagerState
cGroupManager::~cGroupManager()
{
- for( GroupMap::iterator itr = m_pState->Groups.begin(); itr != m_pState->Groups.end(); ++itr )
+ for (GroupMap::iterator itr = m_pState->Groups.begin(); itr != m_pState->Groups.end(); ++itr)
{
delete itr->second;
itr->second = NULL;
@@ -43,7 +43,7 @@ cGroupManager::~cGroupManager()
cGroupManager::cGroupManager()
- : m_pState( new sGroupManagerState )
+ : m_pState( new sGroupManagerState)
{
LOGD("-- Loading Groups --");
@@ -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
{
@@ -198,20 +198,20 @@ bool cGroupManager::LoadGroups()
-bool cGroupManager::ExistsGroup( const AString & a_Name )
+bool cGroupManager::ExistsGroup( const AString & a_Name)
{
- GroupMap::iterator itr = m_pState->Groups.find( a_Name );
- return ( itr != m_pState->Groups.end() );
+ GroupMap::iterator itr = m_pState->Groups.find( a_Name);
+ return ( itr != m_pState->Groups.end());
}
-cGroup* cGroupManager::GetGroup( const AString & a_Name )
+cGroup* cGroupManager::GetGroup( const AString & a_Name)
{
- GroupMap::iterator itr = m_pState->Groups.find( a_Name );
- if( itr != m_pState->Groups.end() )
+ GroupMap::iterator itr = m_pState->Groups.find( a_Name);
+ if (itr != m_pState->Groups.end())
{
return itr->second;
}