diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-02-05 20:08:10 +0100 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-02-05 20:08:10 +0100 |
| commit | 9015e56c604b2ad3ce47ddae8e9556187fe8978e (patch) | |
| tree | 60b23762504cfb9eb4cba9758f15c0e5fab46123 /src/GroupManager.cpp | |
| parent | Modified automatic test for boundingBox (diff) | |
| parent | Merge pull request #645 from mc-server/GroupsPermissions (diff) | |
| download | cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar.gz cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar.bz2 cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar.lz cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar.xz cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar.zst cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/GroupManager.cpp | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/GroupManager.cpp b/src/GroupManager.cpp index d5567d91e..723b86f94 100644 --- a/src/GroupManager.cpp +++ b/src/GroupManager.cpp @@ -44,6 +44,18 @@ cGroupManager::cGroupManager() : m_pState( new sGroupManagerState ) { LOGD("-- Loading Groups --"); + + LoadGroups(); + + LOGD("-- Groups Successfully Loaded --"); +} + + + + + +void cGroupManager::LoadGroups() +{ cIniFile IniFile; if (!IniFile.ReadFile("groups.ini")) { @@ -71,8 +83,10 @@ cGroupManager::cGroupManager() unsigned int NumKeys = IniFile.GetNumKeys(); for (size_t i = 0; i < NumKeys; i++) { - std::string KeyName = IniFile.GetKeyName( i ); + AString KeyName = IniFile.GetKeyName( i ); cGroup* Group = GetGroup( KeyName.c_str() ); + + Group->ClearPermission(); // Needed in case the groups are reloaded. LOGD("Loading group: %s", KeyName.c_str() ); @@ -107,7 +121,7 @@ cGroupManager::cGroupManager() } } - std::string Groups = IniFile.GetValue(KeyName, "Inherits", ""); + AString Groups = IniFile.GetValue(KeyName, "Inherits", ""); if (!Groups.empty()) { AStringVector Split = StringSplitAndTrim(Groups, ","); @@ -117,7 +131,6 @@ cGroupManager::cGroupManager() } } } - LOGD("-- Groups Successfully Loaded --"); } |