diff options
| -rw-r--r-- | src/game/Wintergrasp.cpp | 3 | ||||
| -rw-r--r-- | src/game/World.cpp | 2 | ||||
| -rw-r--r-- | src/game/World.h | 1 | ||||
| -rw-r--r-- | src/trinitycore/Main.cpp | 2 | ||||
| -rw-r--r-- | src/trinitycore/trinitycore.conf.dist | 6 |
5 files changed, 12 insertions, 2 deletions
diff --git a/src/game/Wintergrasp.cpp b/src/game/Wintergrasp.cpp index 3948e516f4e..fed7c6088a7 100644 --- a/src/game/Wintergrasp.cpp +++ b/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; diff --git a/src/game/World.cpp b/src/game/World.cpp index 0150b8fca12..706400652b0 100644 --- a/src/game/World.cpp +++ b/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); diff --git a/src/game/World.h b/src/game/World.h index c5cf0d23366..02fd7a6cf22 100644 --- a/src/game/World.h +++ b/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, diff --git a/src/trinitycore/Main.cpp b/src/trinitycore/Main.cpp index 152f2ceb05e..64ebdfa1bb8 100644 --- a/src/trinitycore/Main.cpp +++ b/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 diff --git a/src/trinitycore/trinitycore.conf.dist b/src/trinitycore/trinitycore.conf.dist index 97d25cdd13f..ebb817bd2df 100644 --- a/src/trinitycore/trinitycore.conf.dist +++ b/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 |