diff options
| author | Neo2003 <none@none> | 2008-10-09 08:42:22 -0500 |
|---|---|---|
| committer | Neo2003 <none@none> | 2008-10-09 08:42:22 -0500 |
| commit | f736567a374e718574763f545b9cdea5d97d9ce0 (patch) | |
| tree | 5b0a617c7ef4e5c6bd4aa1df6a9c7afe31757a46 /src/game/World.cpp | |
| parent | e3079a1ba63ebe13a19e85db3f4e1e1a392a04ed (diff) | |
[svn] * Updated to 6743 and 685
Moved language id used by Arena to a higher place to solve conflicts
Added the empty script folders
--HG--
branch : trunk
rename : 6731-680 => 6743-685
Diffstat (limited to 'src/game/World.cpp')
| -rw-r--r-- | src/game/World.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/game/World.cpp b/src/game/World.cpp index 9ce6888a08a..b195e394f36 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -642,11 +642,14 @@ void World::LoadConfigSettings(bool reload) m_configs[CONFIG_MIN_PETITION_SIGNS] = 9;
}
- m_configs[CONFIG_GM_WISPERING_TO] = sConfig.GetBoolDefault("GM.WhisperingTo",false);
- 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_LOGIN_STATE] = sConfig.GetIntDefault("GM.LoginState",2);
- m_configs[CONFIG_GM_LOG_TRADE] = sConfig.GetBoolDefault("GM.LogTrade", false);
+ m_configs[CONFIG_GM_LOGIN_STATE] = sConfig.GetIntDefault("GM.LoginState",2);
+ m_configs[CONFIG_GM_ACCEPT_TICKETS] = sConfig.GetIntDefault("GM.AcceptTickets",2);
+ m_configs[CONFIG_GM_CHAT] = sConfig.GetIntDefault("GM.Chat",2);
+ m_configs[CONFIG_GM_WISPERING_TO] = sConfig.GetIntDefault("GM.WhisperingTo",2);
+
+ 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_GROUP_VISIBILITY] = sConfig.GetIntDefault("Visibility.GroupMode",0);
|