* Some singleton renames for consistency:

accmgr -> AccountMgr
objmgr -> ObjectMgr
auctionmgr -> sAuctionMgr
spellmgr -> sSpellMgr
CreatureEAI_Mgr -> sEventAIMgr
achievementmgr -> sAchievementMgr
gameeventmgr -> sGameEventMgr
sInstanceSaveManager -> sInstanceSaveMgr
poolhandler -> sPoolMgr

--HG--
branch : trunk
This commit is contained in:
XTZGZoReX
2010-08-08 05:25:45 +02:00
parent 93fc24ece9
commit 9083271a2f
97 changed files with 1354 additions and 1353 deletions
@@ -144,20 +144,20 @@ void BattlegroundWS::Update(uint32 diff)
m_FlagSpellForceTimer += diff;
if (m_FlagDebuffState == 0 && m_FlagSpellForceTimer >= 600000) //10 minutes
{
if (Player * plr = objmgr.GetPlayer(m_FlagKeepers[0]))
if (Player * plr = sObjectMgr.GetPlayer(m_FlagKeepers[0]))
plr->CastSpell(plr,WS_SPELL_FOCUSED_ASSAULT,true);
if (Player * plr = objmgr.GetPlayer(m_FlagKeepers[1]))
if (Player * plr = sObjectMgr.GetPlayer(m_FlagKeepers[1]))
plr->CastSpell(plr,WS_SPELL_FOCUSED_ASSAULT,true);
m_FlagDebuffState = 1;
}
else if (m_FlagDebuffState == 1 && m_FlagSpellForceTimer >= 900000) //15 minutes
{
if (Player * plr = objmgr.GetPlayer(m_FlagKeepers[0]))
if (Player * plr = sObjectMgr.GetPlayer(m_FlagKeepers[0]))
{
plr->RemoveAurasDueToSpell(WS_SPELL_FOCUSED_ASSAULT);
plr->CastSpell(plr,WS_SPELL_BRUTAL_ASSAULT,true);
}
if (Player * plr = objmgr.GetPlayer(m_FlagKeepers[1]))
if (Player * plr = sObjectMgr.GetPlayer(m_FlagKeepers[1]))
{
plr->RemoveAurasDueToSpell(WS_SPELL_FOCUSED_ASSAULT);
plr->CastSpell(plr,WS_SPELL_BRUTAL_ASSAULT,true);