aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMachiavelli <none@none>2009-10-11 12:27:50 +0200
committerMachiavelli <none@none>2009-10-11 12:27:50 +0200
commitd19ecaa817d79c7ae4355fe3c2117dee51579adb (patch)
treee6abb1007d6662d969ddc97bb7196f482f5f3435
parent0e419d0083c75d31817c72c12e1f6214f0e556f5 (diff)
Fix CONFIG_OUTDOORPVP_WINTERGRASP_ENABLED by doing a check in OPvPWintergrasp::Update as well as SetupOutDoorPvP
--HG-- branch : trunk
-rw-r--r--src/game/Wintergrasp.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/game/Wintergrasp.cpp b/src/game/Wintergrasp.cpp
index fed7c6088a7..97d0d74e6c6 100644
--- a/src/game/Wintergrasp.cpp
+++ b/src/game/Wintergrasp.cpp
@@ -851,6 +851,9 @@ void OPvPWintergrasp::UpdateClock()
bool OPvPWintergrasp::Update(uint32 diff)
{
+ if(!sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_ENABLED))
+ return false;
+
if (m_timer > diff)
{
m_timer -= diff;