From 4f35eaebd50481d081e78bf968cb32a2603f03d2 Mon Sep 17 00:00:00 2001 From: balrok Date: Tue, 29 Sep 2009 19:16:34 +0200 Subject: [PATCH] [8566] avoid singleton-lock when accessing BattleGroundMGR::isBGWeekend() proposed by vladimir --- src/game/BattleGroundAB.cpp | 2 +- src/game/BattleGroundEY.cpp | 2 +- src/game/BattleGroundWS.cpp | 2 +- src/shared/revision_nr.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/game/BattleGroundAB.cpp b/src/game/BattleGroundAB.cpp index ea10e3dee..19d592ae1 100644 --- a/src/game/BattleGroundAB.cpp +++ b/src/game/BattleGroundAB.cpp @@ -469,7 +469,7 @@ void BattleGroundAB::Reset() } m_IsInformedNearVictory = false; - bool isBGWeekend = sBattleGroundMgr.IsBGWeekend(GetTypeID()); + bool isBGWeekend = BattleGroundMgr::IsBGWeekend(GetTypeID()); m_HonorTics = (isBGWeekend) ? BG_AB_ABBGWeekendHonorTicks : BG_AB_NotABBGWeekendHonorTicks; m_ReputationTics = (isBGWeekend) ? BG_AB_ABBGWeekendReputationTicks : BG_AB_NotABBGWeekendReputationTicks; diff --git a/src/game/BattleGroundEY.cpp b/src/game/BattleGroundEY.cpp index d9855e150..6f8be6c17 100644 --- a/src/game/BattleGroundEY.cpp +++ b/src/game/BattleGroundEY.cpp @@ -430,7 +430,7 @@ void BattleGroundEY::Reset() m_DroppedFlagGUID = 0; m_PointAddingTimer = 0; m_TowerCapCheckTimer = 0; - bool isBGWeekend = sBattleGroundMgr.IsBGWeekend(GetTypeID()); + bool isBGWeekend = BattleGroundMgr::IsBGWeekend(GetTypeID()); m_HonorTics = (isBGWeekend) ? BG_EY_EYWeekendHonorTicks : BG_EY_NotEYWeekendHonorTicks; for(uint8 i = 0; i < BG_EY_NODES_MAX; ++i) diff --git a/src/game/BattleGroundWS.cpp b/src/game/BattleGroundWS.cpp index 704facdc1..21766e146 100644 --- a/src/game/BattleGroundWS.cpp +++ b/src/game/BattleGroundWS.cpp @@ -534,7 +534,7 @@ void BattleGroundWS::Reset() m_FlagState[i] = BG_WS_FLAG_STATE_ON_BASE; m_TeamScores[i] = 0; } - bool isBGWeekend = sBattleGroundMgr.IsBGWeekend(GetTypeID()); + bool isBGWeekend = BattleGroundMgr::IsBGWeekend(GetTypeID()); m_ReputationCapture = (isBGWeekend) ? 45 : 35; m_HonorWinKills = (isBGWeekend) ? 3 : 1; m_HonorEndKills = (isBGWeekend) ? 4 : 2; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 841279f54..027fd85f7 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8565" + #define REVISION_NR "8566" #endif // __REVISION_NR_H__