aboutsummaryrefslogtreecommitdiff
path: root/src/trinitycore
diff options
context:
space:
mode:
authormaximius <none@none>2009-09-12 22:33:24 -0700
committermaximius <none@none>2009-09-12 22:33:24 -0700
commitc61bb37a0e80aae1dc24618782647c43d2feb174 (patch)
tree2d259b0f5526d82cd663ef665c0b15d67df7172e /src/trinitycore
parent726cdb7b8fa1ceb69cffa69ce039977418b92cc6 (diff)
*Config option to allow multiple Guild Masters by MrSmite
--HG-- branch : trunk
Diffstat (limited to 'src/trinitycore')
-rw-r--r--src/trinitycore/Main.cpp2
-rw-r--r--src/trinitycore/trinitycore.conf.dist9
2 files changed, 9 insertions, 2 deletions
diff --git a/src/trinitycore/Main.cpp b/src/trinitycore/Main.cpp
index 9d1a9f3321c..c62ada9ab6f 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 2009091101
+# define _TRINITY_CORE_CONFVER 2009091201
#endif //_TRINITY_CORE_CONFVER
#ifdef WIN32
diff --git a/src/trinitycore/trinitycore.conf.dist b/src/trinitycore/trinitycore.conf.dist
index fa21ced5e08..ae8ad473a37 100644
--- a/src/trinitycore/trinitycore.conf.dist
+++ b/src/trinitycore/trinitycore.conf.dist
@@ -1,7 +1,7 @@
##########################################
# Trinity Core worldd configuration file #
##########################################
-ConfVersion=2009091101
+ConfVersion=2009091201
###################################################################################################################
# CONNECTIONS AND DIRECTORIES
@@ -1892,6 +1892,12 @@ Ra.Secure = 1
# NoResetTalentsCost
# Enable or disable no cost when reseting talents
#
+# Guild.AllowMultipleGuildMaster
+# Allow override of 1 Guild Master limit. Additional Guild Masters must
+# be set using the ".guild rank" command, not through the UI
+# Default: 0 = Only 1 Guild Master per guild
+# 1 = Allow more than one Guild Master
+#
# OutdoorPvP.Wintergrasp.StartTime = 30
# The start time of the first battle after server starts (default: 30 minutes)
#
@@ -1969,6 +1975,7 @@ PvPToken.Enable = 0
PvPToken.MapAllowType = 4
PvPToken.ItemID = 29434
PvPToken.ItemCount = 1
+Guild.AllowMultipleGuildMaster = 0
OutdoorPvP.Wintergrasp.StartTime = 30
OutdoorPvP.Wintergrasp.BattleTime = 30
OutdoorPvP.Wintergrasp.Interval = 150