diff options
| author | Machiavelli <none@none> | 2009-10-06 20:46:58 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2009-10-06 20:46:58 +0200 |
| commit | 43b3f834cfa7403bbfe1ff9a25169278ba4a7259 (patch) | |
| tree | 35e5faea5052cb894942fd29d3b0dbcbc9a1a7e6 /src/trinitycore | |
| parent | 3bbc0d3324fe5b3101fea689d71e266433bae169 (diff) | |
* Allow the initialization of the Wintergrasp OutdoorPvP enviroment to be disabled if configured.
--HG--
branch : trunk
Diffstat (limited to 'src/trinitycore')
| -rw-r--r-- | src/trinitycore/Main.cpp | 2 | ||||
| -rw-r--r-- | src/trinitycore/trinitycore.conf.dist | 6 |
2 files changed, 6 insertions, 2 deletions
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 |