aboutsummaryrefslogtreecommitdiff
path: root/src/game/World.cpp
diff options
context:
space:
mode:
authorQAston <none@none>2009-05-15 18:00:50 +0200
committerQAston <none@none>2009-05-15 18:00:50 +0200
commita796012723dd2410a150264a4f32f00bc570ef76 (patch)
treed55cada7db3c9c752815c79d9d164069acd99edc /src/game/World.cpp
parentae461a4158d6376e28e7bc53d3f7ad5690a5064e (diff)
parentad92f5e210b7a2c0584cdabd30560fe723d160be (diff)
*Merge some fixes from tc1
--HG-- branch : trunk
Diffstat (limited to 'src/game/World.cpp')
-rw-r--r--src/game/World.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/game/World.cpp b/src/game/World.cpp
index fa44e527da5..665fb6d4bdc 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -792,7 +792,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.",