diff options
| author | raczman <none@none> | 2009-05-15 21:06:58 +0200 |
|---|---|---|
| committer | raczman <none@none> | 2009-05-15 21:06:58 +0200 |
| commit | 5d78a9c6bdac0ec6f24327d3dc86ea6c63aec917 (patch) | |
| tree | 386f11c4c0705cea4fc7427288c934571061d621 /src/game/World.cpp | |
| parent | ad552d272dc79413a428c766b9e6ce0c6e38163e (diff) | |
| parent | b5b9f281176a728599ff7a00b9927f478ee9ce90 (diff) | |
merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/World.cpp')
| -rw-r--r-- | src/game/World.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/game/World.cpp b/src/game/World.cpp index 7517fb0b96d..d1f5490ba55 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -768,7 +768,9 @@ void World::LoadConfigSettings(bool reload) m_configs[CONFIG_GM_IN_GM_LIST] = sConfig.GetBoolDefault("GM.InGMList",false); m_configs[CONFIG_GM_IN_WHO_LIST] = sConfig.GetBoolDefault("GM.InWhoList",false); m_configs[CONFIG_GM_LOG_TRADE] = sConfig.GetBoolDefault("GM.LogTrade", false); - m_configs[CONFIG_START_GM_LEVEL] = sConfig.GetIntDefault("GM.StartLevel", 1); + m_configs[CONFIG_START_GM_LEVEL] = sConfig.GetIntDefault("GM.StartLevel", 1); + m_configs[CONFIG_ALLOW_GM_GROUP] = sConfig.GetBoolDefault("GM.AllowInvite", false); + m_configs[CONFIG_ALLOW_GM_FRIEND] = sConfig.GetBoolDefault("GM.AllowFriend", false); if(m_configs[CONFIG_START_GM_LEVEL] < m_configs[CONFIG_START_PLAYER_LEVEL]) { sLog.outError("GM.StartLevel (%i) must be in range StartPlayerLevel(%u)..%u. Set to %u.", |