Merge

--HG-- branch : trunk
2009-01-26 19:44:03 -05:00
parent 91d49437bd 8dd98a1a12
commit 79cd8138cd
3 changed files with 0 additions and 27 deletions
@@ -527,11 +527,6 @@ void World::LoadConfigSettings(bool reload)

    ///- Read other configuration items from the config file

-	///- Do we allow flying mounts in Azeroth/Outland and others (others being instances, BGs, arenas)?
-    m_configs[CONFIG_FLYING_MOUNTS_AZEROTH] = sConfig.GetBoolDefault("FlyingMounts.Azeroth", false);
-    m_configs[CONFIG_FLYING_MOUNTS_OUTLAND] = sConfig.GetBoolDefault("FlyingMounts.Outland", true);
-    m_configs[CONFIG_FLYING_MOUNTS_OTHERS] = sConfig.GetBoolDefault("FlyingMounts.Others", false);
-
    m_configs[CONFIG_COMPRESSION] = sConfig.GetIntDefault("Compression", 1);
    if(m_configs[CONFIG_COMPRESSION] < 1 || m_configs[CONFIG_COMPRESSION] > 9)
    {
@@ -184,10 +184,6 @@ enum WorldConfigs
    CONFIG_ARENA_AUTO_DISTRIBUTE_INTERVAL_DAYS,
    CONFIG_BATTLEGROUND_PREMATURE_FINISH_TIMER,

-	CONFIG_FLYING_MOUNTS_AZEROTH,
-    CONFIG_FLYING_MOUNTS_OUTLAND,
-    CONFIG_FLYING_MOUNTS_OTHERS,
-
    CONFIG_MAX_WHO,
    CONFIG_BG_START_MUSIC,
    CONFIG_START_ALL_SPELLS,