* Allow the initialization of the Wintergrasp OutdoorPvP enviroment to be disabled if configured.

--HG--
branch : trunk

src/game/Wintergrasp.cpp

@@ -75,6 +75,9 @@ typedef std::list<const AreaPOIEntry *> AreaPOIList;
 
 bool OPvPWintergrasp::SetupOutdoorPvP()
 {
+    if(!sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_ENABLED))
+        return false;
+
     m_defender = TeamId(rand()%2);
     m_changeDefender = false;
 

src/game/World.cpp

@@ -1168,6 +1168,8 @@ void World::LoadConfigSettings(bool reload)
     m_configs[CONFIG_PVP_TOKEN_COUNT] = sConfig.GetIntDefault("PvPToken.ItemCount", 1);
     if (m_configs[CONFIG_PVP_TOKEN_COUNT] < 1)
         m_configs[CONFIG_PVP_TOKEN_COUNT] = 1;
+        
+    m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_ENABLED]        = sConfig.GetBoolDefault("OutdoorPvP.Wintergrasp.Enabled", true);
     m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_START_TIME]     = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.StartTime", 30);
     m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_BATTLE_TIME]    = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.BattleTime", 30); 
     m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_INTERVAL]       = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.Interval", 150);

src/game/World.h

@@ -237,6 +237,7 @@ enum WorldConfigs
     CONFIG_PVP_TOKEN_MAP_TYPE,
     CONFIG_PVP_TOKEN_ID,
     CONFIG_PVP_TOKEN_COUNT,
+    CONFIG_OUTDOORPVP_WINTERGRASP_ENABLED,
     CONFIG_OUTDOORPVP_WINTERGRASP_START_TIME,
     CONFIG_OUTDOORPVP_WINTERGRASP_BATTLE_TIME,
     CONFIG_OUTDOORPVP_WINTERGRASP_INTERVAL,

src/trinitycore/Main.cpp

@@ -40,7 +40,7 @@
 // Format is YYYYMMDDRR where RR is the change in the conf file
 // for that day.
 #ifndef _TRINITY_CORE_CONFVER
-# define _TRINITY_CORE_CONFVER 2009092701
+# define _TRINITY_CORE_CONFVER 2009100601
 #endif //_TRINITY_CORE_CONFVER
 
 #ifdef WIN32

src/trinitycore/trinitycore.conf.dist

@@ -1,7 +1,7 @@
 ##########################################
 # Trinity Core worldd configuration file #
 ##########################################
-ConfVersion=2009092701
+ConfVersion=2009100601
 
 ###################################################################################################################
 # CONNECTIONS AND DIRECTORIES
@@ -1899,6 +1899,9 @@ Ra.Secure = 1
 #       Default: 0 = Only 1 Guild Master per guild
 #                1 = Allow more than one Guild Master
 #
+#   OutdoorPvP.Wintergrasp.Enabled = 1
+#       Determines whether the Wintergrasp battle is enabled or not.
+#
 #   OutdoorPvP.Wintergrasp.StartTime = 30
 #       The start time of the first battle after server starts (default: 30 minutes)
 #
@@ -1977,6 +1980,7 @@ PvPToken.MapAllowType = 4
 PvPToken.ItemID = 29434
 PvPToken.ItemCount = 1
 Guild.AllowMultipleGuildMaster = 0
+OutdoorPvP.Wintergrasp.Enabled = 1
 OutdoorPvP.Wintergrasp.StartTime = 30
 OutdoorPvP.Wintergrasp.BattleTime = 30
 OutdoorPvP.Wintergrasp.Interval = 150